Merge pull request #185499 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)

Author: huypub

articles/active-directory/develop/sample-v2-code.md

@@ -72,7 +72,7 @@ The following samples show how to protect a web API with the Microsoft identity
 
 ## Desktop
 
-The following samples show public client desktop applications that access the Microsoft Graph API, or your own web API in the name of the user. Apart from the _Desktop (Console) with Workspace Application Manager (WAM)_ sample, all these client applications use the Microsoft Authentication Library (MSAL).
+The following samples show public client desktop applications that access the Microsoft Graph API, or your own web API in the name of the user. Apart from the _Desktop (Console) with Web Authentication Manager (WAM)_ sample, all these client applications use the Microsoft Authentication Library (MSAL).
 
 > [!div class="mx-tdCol2BreakAll"]
 > | Language/<br/>Platform | Code sample(s) <br/> on GitHub | Auth<br/> libraries | Auth flow |  

articles/active-directory/develop/v2-oauth2-auth-code-flow.md

@@ -40,7 +40,7 @@ The `spa` redirect type is backwards compatible with the implicit flow. Apps cur
 
 If you attempt to use the authorization code flow and see this error:
 
-`access to XMLHttpRequest at 'https://login.microsoftonline.com/common/v2.0/oauth2/token' from origin 'yourApp.com' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.`
+`access to XMLHttpRequest at 'https://login.microsoftonline.com/common/oauth2/v2.0/token' from origin 'yourApp.com' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.`
 
 Then, visit your app registration and update the redirect URI for your app to type `spa`.
 

articles/app-service/environment/how-to-migrate.md

@@ -95,7 +95,7 @@ Once you get a status of "Ready", migration is done and you have an App Service
 Get the details of your new environment by running the following command or by navigating to the [Azure portal](https://portal.azure.com).
 
 ```azurecli
-az appservice ase show --name $ASE_NAME --resource group $ASE_RG
+az appservice ase show --name $ASE_NAME --resource-group $ASE_RG
 ```
 
 ## Next steps

articles/azure-functions/functions-bindings-storage-blob-output.md

@@ -398,7 +398,7 @@ The following table explains the binding configuration properties that you set i
 |**name** | n/a | The name of the variable that represents the blob in function code.  Set to `$return` to reference the function return value.|
 |**path** |**BlobPath** | The path to the blob container. |
 |**connection** |**Connection**| The name of an app setting or setting collection that specifies how to connect to Azure Blobs. See [Connections](#connections).|
-|n/a | **Access** | Indicates whether you will be reading or writing. |
+|**Access** | n/a | Indicates whether you will be reading or writing. |
 
 [!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
 

articles/azure-resource-manager/management/lock-resources.md

@@ -58,6 +58,8 @@ Applying locks can lead to unexpected results because some operations that don't
 
 - A cannot-delete lock on a **resource group** prevents **Azure Machine Learning** from autoscaling [Azure Machine Learning compute clusters](../../machine-learning/concept-compute-target.md#azure-machine-learning-compute-managed) to remove unused nodes.
 
+- A read-only lock on a **Log Analytics workspace** prevents **User and Entity Behavior Analytics (UEBA)** from being enabled.
+
 - A read-only lock on a **subscription** prevents **Azure Advisor** from working correctly. Advisor is unable to store the results of its queries.
 
 - A read-only lock on an **Application Gateway** prevents you from getting the backend health of the application gateway. That [operation uses POST](/rest/api/application-gateway/application-gateways/backend-health), which is blocked by the read-only lock.

articles/cognitive-services/LUIS/luis-language-support.md

@@ -31,6 +31,7 @@ LUIS understands utterances in the following languages:
 | *[Chinese](#chinese-support-notes) |`zh-CN` | ✔ | ✔ |✔|-|
 | Dutch |`nl-NL` |✔|-|-|✔|
 | English (United States) |`en-US` | ✔ | ✔  |✔|✔|
+| English (Brtish) |`en-GB` | ✔ | ✔  |✔|✔|
 | French (Canada) |`fr-CA` |-|-|-|✔|
 | French (France) |`fr-FR` |✔| ✔ |✔ |✔|
 | German |`de-DE` |✔| ✔ |✔ |✔|
@@ -85,6 +86,7 @@ To perform machine learning, LUIS breaks an utterance into [tokens](luis-glossar
 |Chinese||✔||
 |Dutch|✔||✔|
 |English (en-us)|✔ |||
+|English (en-GB)|✔ |||
 |French (fr-FR)|✔|||
 |French (fr-CA)|✔|||
 |German|✔||✔|
@@ -219,4 +221,4 @@ Tokenizer JSON for version 1.0.1. Notice the property value for  `tokenizerVersi
 
 Tokenization happens at the app level. There is no support for version-level tokenization.
 
-[Import the file as a new app](luis-how-to-start-new-app.md), instead of a version. This action means the new app has a different app ID but uses the tokenizer version specified in the file.
+[Import the file as a new app](luis-how-to-start-new-app.md), instead of a version. This action means the new app has a different app ID but uses the tokenizer version specified in the file.

articles/cognitive-services/LUIS/luis-reference-prebuilt-entities.md

@@ -30,6 +30,7 @@ Unless otherwise noted, prebuilt entities are available in all LUIS application
 |Chinese|[zh-CN](#chinese-entity-support)||
 |Dutch|[nl-NL](#dutch-entity-support)||
 |English|[en-US (American)](#english-american-entity-support)||
+|English|[en-GB (British)](#english-british-entity-support)||
 |French|[fr-CA (Canada)](#french-canadian-entity-support), [fr-FR (France)](#french-france-entity-support), ||
 |German|[de-DE](#german-entity-support)||
 |Italian|[it-IT](#italian-entity-support)||
@@ -109,6 +110,28 @@ The following entities are supported:
 [Temperature](luis-reference-prebuilt-temperature.md):<br>fahrenheit<br>kelvin<br>rankine<br>delisle<br>celsius   |    V2, V3   |
 [URL](luis-reference-prebuilt-url.md)   |    V2, V3   |
 
+## English (British) entity support
+
+The following entities are supported:
+
+| Prebuilt entity | en-GB |
+| --------------- | :---: |
+[Age](luis-reference-prebuilt-age.md):<br>year<br>month<br>week<br>day   |    V2, V3   |
+[Currency (money)](luis-reference-prebuilt-currency.md):<br>dollar<br>fractional unit (ex: penny)  |    V2, V3   |
+[DatetimeV2](luis-reference-prebuilt-datetimev2.md):<br>date<br>daterange<br>time<br>timerange   |    V2, V3   |
+[Dimension](luis-reference-prebuilt-dimension.md):<br>volume<br>area<br>weight<br>information (ex: bit/byte)<br>length (ex: meter)<br>speed (ex: mile per hour)  |    V2, V3   |
+[Email](luis-reference-prebuilt-email.md)   |    V2, V3   |
+[GeographyV2](luis-reference-prebuilt-geographyV2.md)   |    V2, V3   |
+[KeyPhrase](luis-reference-prebuilt-keyphrase.md)   |    V2, V3   |
+[Number](luis-reference-prebuilt-number.md)   |    V2, V3   |
+[Ordinal](luis-reference-prebuilt-ordinal.md)   |    V2, V3   |
+[OrdinalV2](luis-reference-prebuilt-ordinal-v2.md)   |    V2, V3   |
+[Percentage](luis-reference-prebuilt-percentage.md)   |    V2, V3   |
+[PersonName](luis-reference-prebuilt-person.md)   |    V2, V3   |
+[Phonenumber](luis-reference-prebuilt-phonenumber.md)   |    V2, V3   |
+[Temperature](luis-reference-prebuilt-temperature.md):<br>fahrenheit<br>kelvin<br>rankine<br>delisle<br>celsius   |    V2, V3   |
+[URL](luis-reference-prebuilt-url.md)   |    V2, V3   |
+
 ## French (France) entity support
 
 The following entities are supported:

articles/data-factory/data-flow-assert.md

@@ -41,7 +41,7 @@ Select ```fail data flow``` if you wish to have your data flow activity fail imm
 
 ### Assert ID
 
-Assert ID is a property where you will enter a (string) name for your assertion. You will be able to use the identifier later downstream in your data flow using ```hasError()``` or to output the assertion failure code.
+Assert ID is a property where you will enter a (string) name for your assertion. You will be able to use the identifier later downstream in your data flow using ```hasError()``` or to output the assertion failure code. Assert IDs must be unique within each dataflow.
 
 ### Assert description
 

articles/devtest-labs/devtest-lab-concepts.md

@@ -13,7 +13,7 @@ This article lists key DevTest Labs concepts and definitions:
 A lab is the infrastructure that encompasses a group of resources, such as Virtual Machines (VMs), that lets you better manage those resources by specifying limits and quotas.
 
 ## Virtual machine
-An Azure VM is one type of [on-demand, scalable computing resources](/azure/architecture/guide/technology-choices/compute-decision-tree) that Azure offers. Azure VMs give you the flexibility of virtualization without having to buy and maintain the physical hardware that runs it.
+An Azure VM is one type of [on-demand, scalable computing resource](/azure/architecture/guide/technology-choices/compute-decision-tree) that Azure offers. Azure VMs give you the flexibility of virtualization without having to buy and maintain the physical hardware that runs it.
 
 [Overview of Windows virtual machines in Azure](../virtual-machines/windows/overview.md) gives you information to consider before you create a VM, how you create it, and how you manage it.
 
@@ -26,7 +26,7 @@ A VM that is claimable isn't initially assigned to any particular user, but will
 In DevTest Labs, an environment refers to a collection of Azure resources in a lab. [Create an environment](./devtest-lab-create-environment-from-arm.md) discusses how to create multi-VM environments from your Azure Resource Manager templates.
 
 ## Base images
-Base images are VM images with all the tools and settings preinstalled and configured. You can create a VM by picking an existing base and adding an artifact to install your test agent. The use of bases images reduces VM creation time.
+Base images are VM images with all the tools and settings preinstalled and configured. You can create a VM by picking an existing base and adding an artifact to install your test agent. The use of base images reduces VM creation time.
 
 ## Artifacts
 Artifacts are used to deploy and configure your application after a VM is provisioned. Artifacts can be:
@@ -68,9 +68,9 @@ Within the scope of DevTest Labs, there are two types of roles to define user pe
 |Lab Owner| Has access to any resources within the lab. A lab owner can modify policies, read and write any VMs, change the virtual network, and so on.|
 |Lab User | Can view all lab resources, such as VMs, policies, and virtual networks, but can't modify policies or any VMs created by other users.|
 
-To see how to create custom roles in DevTest Labs, refer to the article, [Grant user permissions to specific lab policies](devtest-lab-grant-user-permissions-to-specific-lab-policies.md).
+To see how to create custom roles in DevTest Labs, refer to the article [Grant user permissions to specific lab policies](devtest-lab-grant-user-permissions-to-specific-lab-policies.md).
 
-Since scopes are hierarchical, when a user has permissions at a certain scope, they also have permissions at every lower-level scope. Subscription owners have access to all resources in a subscription, which include virtual machines, virtual networks, and labs. A subscription owner automatically inherits the role of lab owner. However, the opposite isn't true. A lab owner has access to a lab, which is a lower scope than the subscription level. So, a lab owner can't see virtual machines or virtual networks or any resources that are outside of the lab.
+Since scopes are hierarchical, when a user has permissions at a certain scope, they also have permissions at every lower-level scope. Subscription owners have access to all resources in a subscription, which include virtual machines, virtual networks, and labs. A subscription owner automatically inherits the role of lab owner. However, the opposite isn't true; a lab owner has access to a lab, which is a lower scope than the subscription level. So, a lab owner can't see virtual machines or virtual networks or any resources that are outside of the lab.
 
 ## Azure Resource Manager templates
 The concepts discussed in this article can be configured by using Azure Resource Manager (ARM) templates. ARM templates let you define the infrastructure/configuration of your Azure solution and repeatedly deploy it in a consistent state.
@@ -79,4 +79,4 @@ The concepts discussed in this article can be configured by using Azure Resource
 
 ## Next steps
 
-[Create a lab in DevTest Labs](devtest-lab-create-lab.md)
+[Create a lab in DevTest Labs](devtest-lab-create-lab.md)

articles/dms/tutorial-mysql-azure-mysql-offline-portal.md

@@ -19,7 +19,7 @@ ms.date: 04/11/2021
 You can use Azure Database Migration Service to perform a one-time full database migration on-premises MySQL instance to [Azure Database for MySQL](../mysql/index.yml) with high speed data migration capability. In this tutorial, we will migrate a sample database from an on-premises instance of MySQL 5.7 to Azure Database for MySQL (v5.7) by using an offline migration activity in Azure Database Migration Service. Although the articles assumes the source to be a MySQL database instance and target to be Azure Database for MySQL, it can be used to migrate from one Azure Database for MySQL to another just by changing the source server name and credentials. Also, migration from lower version MySQL servers (v5.6 and above) to higher versions is also supported.
 
 > [!IMPORTANT]
-> For online migrations, you can use open-source tools such as [MyDumper/MyLoader](https://centminmod.com/mydumper.html) with [data-in replication](../mysql/concepts-data-in-replication.md). 
+> For online migrations, you can use open-source tools such as [MyDumper/MyLoader](https://github.com/maxbube/mydumper) with [data-in replication](../mysql/concepts-data-in-replication.md). 
 
 > [!NOTE]
 > For a PowerShell-based scriptable version of this migration experience, see [scriptable offline migration to Azure Database for MySQL](./migrate-mysql-to-azure-mysql-powershell.md).