Merge pull request #213002 from MicrosoftDocs/repo_sync_working_branch

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

Author: huypub

articles/active-directory/develop/apple-sso-plugin.md

@@ -90,7 +90,6 @@ Common settings:
   - `https://sts.windows.net`
   - `https://login.partner.microsoftonline.cn`
   - `https://login.chinacloudapi.cn`
-  - `https://login.microsoftonline.de`
   - `https://login.microsoftonline.us`
   - `https://login.usgovcloudapi.net`
   - `https://login-us.microsoftonline.com`

articles/api-management/api-management-advanced-policies.md

@@ -858,7 +858,7 @@ This policy can be used in the following policy [sections](./api-management-howt
 
 ## <a name="SetHttpProxy"></a> Set HTTP proxy
 
-The `proxy` policy allows you to route requests forwarded to backends via an HTTP proxy. Only HTTP (not HTTPS) is supported between the gateway and the proxy. Basic and NTLM authentication only.
+The `proxy` policy allows you to route requests forwarded to backends via an HTTP proxy. Only HTTP (not HTTPS) is supported between the gateway and the proxy. Basic and NTLM authentication only. To route the send-request via HTTP proxy, you must place the set HTTP proxy policy inside the send-request policy block.
 
 [!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
 

articles/app-service/configure-connect-to-azure-storage.md

@@ -37,7 +37,7 @@ This guide shows how to mount Azure Storage Files as a network share in a Window
 - Make static content like video and images readily available for your App Service app. 
 - Write application log files or archive older application log to Azure File shares.  
 - Share content across multiple apps or with other Azure services.
-- Mount Azure Storage in a Windows container in a Standard tier or higher plan, including Isolated ([App Service environment v3](environment/overview.md)).
+- Mount Azure Storage in a Windows container, including Isolated ([App Service environment v3](environment/overview.md)).
 
 The following features are supported for Windows containers:
 

articles/azure-functions/functions-identity-access-azure-sql-with-managed-identity.md

@@ -79,6 +79,9 @@ To enable system-assigned managed identity in the Azure portal:
 
 For information on enabling system-assigned managed identity through Azure CLI or PowerShell, check out more information on [using managed identities with Azure Functions](../app-service/overview-managed-identity.md?tabs=dotnet&toc=%2fazure%2fazure-functions%2ftoc.json#add-a-system-assigned-identity).
 
+> [!TIP]
+> For user-assigned managed identity, switch to the User Assigned tab. Click Add and select a Managed Identity. For more information on creating user-assigned managed identity, see the [Manage user-assigned managed identities](../active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md).
+ 
 
 ## Grant SQL database access to the managed identity
 
@@ -114,8 +117,11 @@ In the application settings of our Function App the SQL connection string settin
 
 *testdb* is the name of the database we're connecting to and *demo.database.windows.net* is the name of the server we're connecting to.
 
+>[!TIP]
+>For user-assigned managed identity, use `Server=demo.database.windows.net; Authentication=Active Directory Managed Identity; User Id=ClientIdOfManagedIdentity; Database=testdb`.
+
 ## Next steps
 
 - [Read data from a database (Input binding)](./functions-bindings-azure-sql-input.md)
 - [Save data to a database (Output binding)](./functions-bindings-azure-sql-output.md)
-- [Review ToDo API sample with Azure SQL bindings](/samples/azure-samples/azure-sql-binding-func-dotnet-todo/todo-backend-dotnet-azure-sql-bindings-azure-functions/)
+- [Review ToDo API sample with Azure SQL bindings](/samples/azure-samples/azure-sql-binding-func-dotnet-todo/todo-backend-dotnet-azure-sql-bindings-azure-functions/)

articles/azure-monitor/app/app-insights-overview.md

@@ -60,7 +60,7 @@ To use the SDK, you install a small instrumentation package in your app and then
 
 ### [.NET](#tab/net)
 
-Integrated Auto-instrumentation is available for [Azure App Service .NET](azure-web-apps-net.md), [Azure App Service .NET Core](azure-web-apps-net-core.md), [Azure Functions](../../azure-functions/functions-monitoring.md#monitor-executions-in-azure-functions), and [Azure Virtual Machines](azure-vm-vmss-apps.md).
+Integrated Auto-instrumentation is available for [Azure App Service .NET](azure-web-apps-net.md), [Azure App Service .NET Core](azure-web-apps-net-core.md), [Azure Functions](../../azure-functions/functions-monitoring.md), and [Azure Virtual Machines](azure-vm-vmss-apps.md).
 
 [Azure Monitor Application Insights Agent](status-monitor-v2-overview.md) is available for workloads running in on-premises virtual machines.
 
@@ -72,9 +72,9 @@ A preview [Open Telemetry](opentelemetry-enable.md?tabs=net) offering is also av
 
 ### [Java](#tab/java)
 
-Auto-instrumentation is available for any environment using [Azure Monitor OpenTelemetry-based auto-instrumentation for Java applications](java-in-process-agent.md).
+Integrated Auto-Instrumentation is available for Java Apps hosted on [Azure App Service](azure-web-apps-java.md) and [Azure Functions](monitor-functions.md).
 
-Integrated Auto-Instrumentation is available for Java Apps hosted on [Azure App Service](azure-web-apps-java.md) and [Azure Functions](monitor-functions.md#distributed-tracing-for-java-applications-public-preview).
+Auto-instrumentation is available for any environment using [Azure Monitor OpenTelemetry-based auto-instrumentation for Java applications](java-in-process-agent.md).
 
 ### [Node.js](#tab/nodejs)
 

articles/azure-monitor/containers/container-insights-cost.md

@@ -79,7 +79,7 @@ The following list is the eight metrics per container collected:
 
 The following list is the cluster inventory data collected by default:
 
-- KubePodInventory – 1 per minute per container
+- KubePodInventory – 1 per pod per minute
 - KubeNodeInventory – 1 per node per minute
 - KubeServices – 1 per service per minute
 - ContainerInventory – 1 per container per minute

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

@@ -42,13 +42,14 @@ Use the expression builder to set the source for your parsing. This can be as si
   * Expression: ```(level as string, registration as long)```
 
 * Source Nested JSON data: ```{"car" : {"model" : "camaro", "year" : 1989}, "color" : "white", "transmission" : "v8"}```
-* Expression: ```(car as (model as string, year as integer), color as string, transmission as string)```
+  * Expression: ```(car as (model as string, year as integer), color as string, transmission as string)```
 
 * Source XML data: ```<Customers><Customer>122</Customer><CompanyName>Great Lakes Food Market</CompanyName></Customers>```
   * Expression: ```(Customers as (Customer as integer, CompanyName as string))```
 
 * Source XML with Attribute data: ```<cars><car model="camaro"><year>1989</year></car></cars>```
-* Expression: ```(cars as (car as ({@model} as string, year as integer)))```
+  * Expression: ```(cars as (car as ({@model} as string, year as integer)))```
+
 * Note: If you run into errors extracting attributes (i.e. @model) from a complex type, a workaround is to convert the complex type to a string, remove the @ symbol (i.e. replace(toString(your_xml_string_parsed_column_name.cars.car),'@','')
 ), and then use the parse JSON transformation activity. 
 

articles/dms/known-issues-azure-sql-db-managed-instance-online.md

@@ -18,7 +18,7 @@ ms.date: 02/20/2020
 Known issues and limitations that are associated with online migrations from SQL Server to Azure SQL Managed Instance are described below.
 
 > [!IMPORTANT]
-> With online migrations of SQL Server to Azure SQL Database, migration of SQL_variant data types is not supported.
+> With online migrations of SQL Server to Azure SQL Managed Instance, migration of SQL_variant data types is not supported.
 
 ## Backup requirements
 

articles/key-vault/managed-hsm/quick-create-powershell.md

@@ -17,6 +17,8 @@ In this quickstart, you will create and activate an Azure Key Vault Managed HSM
 
 If you do not have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
 
+The service is available in limited regions – To learn more about availability, please see [Azure Dedicated HSM purshase options](https://azure.microsoft.com/pricing/details/azure-dedicated-hsm).
+
 [!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
 
 If you choose to install and use PowerShell locally, this tutorial requires Azure PowerShell module version 1.0.0 or later. Type `$PSVersionTable.PSVersion` to find the version. If you need to upgrade, see [Install Azure PowerShell module](/powershell/azure/install-az-ps). If you are running PowerShell locally, you also need to run `Login-AzAccount` to create a connection with Azure.
@@ -27,10 +29,10 @@ Login-AzAccount
 
 ## Create a resource group
 
-A resource group is a logical container into which Azure resources are deployed and managed. Use the Azure PowerShell [New-AzResourceGroup](/powershell/module/az.resources/new-azresourcegroup) cmdlet to create a resource group named *myResourceGroup* in the *westus3* location. 
+A resource group is a logical container into which Azure resources are deployed and managed. Use the Azure PowerShell [New-AzResourceGroup](/powershell/module/az.resources/new-azresourcegroup) cmdlet to create a resource group named *myResourceGroup* in the *eastus* location. 
 
 ```azurepowershell-interactive
-New-AzResourceGroup -Name "myResourceGroup" -Location "westus3"
+New-AzResourceGroup -Name "myResourceGroup" -Location "eastus"
 ```
 
 ## Get your principal ID
@@ -63,7 +65,7 @@ Use the Azure PowerShell [New-AzKeyVaultManagedHsm](/powershell/module/az.keyvau
 - Your principal ID: Pass the Azure Active Directory principal ID that you obtained in the last section to the "Administrator" parameter. 
 
 ```azurepowershell-interactive
-New-AzKeyVaultManagedHsm -Name "<your-unique-managed-hsm-name>" -ResourceGroupName "myResourceGroup" -Location "westus3" -Administrator "<your-principal-ID>"
+New-AzKeyVaultManagedHsm -Name "<your-unique-managed-hsm-name>" -ResourceGroupName "myResourceGroup" -Location "eastus" -Administrator "<your-principal-ID>"
 ```
 > [!NOTE]
 > The create command can take a few minutes. Once it returns successfully you are ready to activate your HSM.

articles/machine-learning/reference-yaml-overview.md

@@ -76,7 +76,8 @@ The Azure Machine Learning CLI (v2), an extension to the Azure CLI, often uses a
 
 | Reference | URI |
 | - | - |
-| [Online (real-time)](reference-yaml-endpoint-online.md) | https://azuremlschemas.azureedge.net/latest/managedOnlineEndpoint.schema.json |
+| [Managed online (real-time)](reference-yaml-endpoint-online.md) | https://azuremlschemas.azureedge.net/latest/managedOnlineEndpoint.schema.json |
+| [Kubernetes online (real-time)](reference-yaml-endpoint-online.md) | https://azuremlschemas.azureedge.net/latest/kubernetesOnlineEndpoint.schema.json |
 | [Batch](reference-yaml-endpoint-batch.md) | https://azuremlschemas.azureedge.net/latest/batchEndpoint.schema.json |
 
 ## Deployment