Merge pull request #197610 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 79572ab65186 · 2022-05-10T09:56:23.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory/saas-apps/uniflow-online-tutorial.md b/articles/active-directory/saas-apps/uniflow-online-tutorial.md
@@ -75,16 +75,19 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 	| **Identifier** |
 	|---------|
 	| `https://<tenant_domain_name>.eu.uniflowonline.com` |
+	| `https://<tenant_domain_name>.uk.uniflowonline.com` |
 	| `https://<tenant_domain_name>.us.uniflowonline.com` |
 	| `https://<tenant_domain_name>.sg.uniflowonline.com` |
 	| `https://<tenant_domain_name>.jp.uniflowonline.com` |
 	| `https://<tenant_domain_name>.au.uniflowonline.com` |
+	
 
 	b. In the **Sign on URL** text box, type a URL using one of the following patterns:
 
 	| **Sign on URL** |
 	|---------|
 	| `https://<tenant_domain_name>.eu.uniflowonline.com` |
+	| `https://<tenant_domain_name>.uk.uniflowonline.com` |
 	| `https://<tenant_domain_name>.us.uniflowonline.com` |
 	| `https://<tenant_domain_name>.sg.uniflowonline.com` |
 	| `https://<tenant_domain_name>.jp.uniflowonline.com` |
diff --git a/articles/application-gateway/how-to-troubleshoot-application-gateway-session-affinity-issues.md b/articles/application-gateway/how-to-troubleshoot-application-gateway-session-affinity-issues.md
@@ -19,7 +19,7 @@ Learn how to diagnose and resolve session affinity issues with Azure Application
 
 ## Overview
 
-The cookie-based session affinity feature is useful when you want to keep a user session on the same server. By using gateway-managed cookies, the Application Gateway can direct subsequent traffic from a user session to the same server for processing. This is important in cases where session state is saved locally on the server for a user session.
+The cookie-based session affinity feature is useful to keep a user session on the same server. By using gateway-managed cookies, the Application Gateway can direct subsequent traffic from a user session to the same server for processing. This is important in cases where session state is saved locally on the server for a user session. Session affinity is also known as sticky sessions.
 
 > [!NOTE]
 > Application Gateway v1 issues a cookie called ARRAffinity, which is used to direct traffic to the same backend pool member.  In Application Gateway v2, this cookie has been renamed to ApplicationGatewayAffinity.  For the purposes of this document, ApplicationGatewayAffinity will be used as an example, ARRAffinity can be substituted in where applicable for Application Gateway v1 instances.
diff --git a/articles/applied-ai-services/form-recognizer/service-limits.md b/articles/applied-ai-services/form-recognizer/service-limits.md
@@ -23,6 +23,7 @@ For the usage with [Form Recognizer SDK](quickstarts/try-v3-csharp-sdk.md), [For
 | **Concurrent Request limit** | 1 | 15 (default value) |
 | Adjustable | No<sup>2</sup> | Yes<sup>2</sup> |
 | **Compose Model limit** | 5 | 100 (default value) |
+| Adjustable | No<sup>2</sup> | No<sup>2</sup> |
 | **Custom neural model train** | 10 per month | 10 per month |
 | Adjustable | No<sup>2</sup> | Yes<sup>2</sup> |
 
diff --git a/articles/azure-monitor/alerts/alerts-log-api-switch.md b/articles/azure-monitor/alerts/alerts-log-api-switch.md
@@ -60,7 +60,7 @@ armclient PUT /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>
 You can also use [Azure CLI](/cli/azure/reference-index#az-rest) tool:
 
 ```bash
-az rest --method post --url /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>/alertsversion?api-version=2017-04-26-preview --body '{"scheduledQueryRulesEnabled": true}'
+az rest --method put --url /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>/alertsversion?api-version=2017-04-26-preview --body '{"scheduledQueryRulesEnabled": true}'
 ```
 
 If the switch is successful, the response is:
diff --git a/articles/azure-monitor/app/nodejs.md b/articles/azure-monitor/app/nodejs.md
@@ -175,7 +175,7 @@ appInsights.start();
 
 ### Automatic web snippet injection (Preview)
 
-Automatic web snippet injection allows you to enable [Application Insights Usage Experiences](usage-overview.md) and Browser Diagnostic Experiences with a simple configuration. It provides an easier alternative to manually adding the JavaScript snippet or NPM package to your JavaScript web code. For node server with configuration, set `enableAutoWebSnippetInjection` to `true` or alternatively set environment variable `APPLICATIONINSIGHTS_WEB_SNIPPET_ENABLED = true`. Automatic web snippet injection is available in Application Insights Node.js SDK version 2.3.0 or greater. See [Application Insights Node.js Github Readme](https://github.com/microsoft/ApplicationInsights-node.js#automatic-web-snippet-injectionpreview) for more information.
+Automatic web snippet injection allows you to enable [Application Insights Usage Experiences](usage-overview.md) and Browser Diagnostic Experiences with a simple configuration. It provides an easier alternative to manually adding the JavaScript snippet or NPM package to your JavaScript web code. For node server with configuration, set `enableAutoWebSnippetInjection` to `true` or alternatively set environment variable `APPLICATIONINSIGHTS_WEB_SNIPPET_ENABLED = true`. Automatic web snippet injection is available in Application Insights Node.js SDK version 2.3.0 or greater. See [Application Insights Node.js GitHub Readme](https://github.com/microsoft/ApplicationInsights-node.js#automatic-web-snippet-injectionpreview) for more information.
 
 ### Automatic third-party instrumentation
 
diff --git a/articles/azure-resource-manager/bicep/bicep-functions-resource.md b/articles/azure-resource-manager/bicep/bicep-functions-resource.md
@@ -651,7 +651,7 @@ The identifier is returned in the following format:
 
 You use this function to get the resource ID for resources that are [deployed to the management group](deploy-to-management-group.md) rather than a resource group. The returned ID differs from the value returned by the [resourceId](#resourceid) function by not including a subscription ID and a resource group value.
 
-### managementGrouopResourceID example
+### managementGroupResourceID example
 
 The following template creates a policy definition, and assign the policy defintion. It uses the `managementGroupResourceId` function to get the resource ID for policy definition.
 
diff --git a/articles/azure-resource-manager/bicep/conditional-resource-deployment.md b/articles/azure-resource-manager/bicep/conditional-resource-deployment.md
@@ -94,10 +94,10 @@ resource vmName_omsOnboarding 'Microsoft.Compute/virtualMachines/extensions@2017
     typeHandlerVersion: '1.0'
     autoUpgradeMinorVersion: true
     settings: {
-      workspaceId: ((!empty(logAnalytics)) ? reference(logAnalytics, '2015-11-01-preview').customerId : json('null'))
+      workspaceId: ((!empty(logAnalytics)) ? reference(logAnalytics, '2015-11-01-preview').customerId : null)
     }
     protectedSettings: {
-      workspaceKey: ((!empty(logAnalytics)) ? listKeys(logAnalytics, '2015-11-01-preview').primarySharedKey : json('null'))
+      workspaceKey: ((!empty(logAnalytics)) ? listKeys(logAnalytics, '2015-11-01-preview').primarySharedKey : null)
     }
   }
 }
diff --git a/articles/azure-vmware/configure-storage-policy.md b/articles/azure-vmware/configure-storage-policy.md
@@ -118,6 +118,11 @@ You'll run the `Set-LocationStoragePolicy` cmdlet to Modify vSAN based storage p
 
 You'll run the `Set-ClusterDefaultStoragePolicy` cmdlet to specify default storage policy for a cluster,
 
+
+>[!NOTE]
+>Changing the storage policy of the default management cluster (Cluster-1) isn't allowed.
+
+
 1. Select **Run command** > **Packages** > **Set-ClusterDefaultStoragePolicy**.
 
 1. Provide the required values or change the default values, and then select **Run**.
diff --git a/articles/cognitive-services/QnAMaker/Overview/language-support.md b/articles/cognitive-services/QnAMaker/Overview/language-support.md
@@ -32,7 +32,7 @@ Consider the following:
 
 ## Supporting multiple languages in one QnA Maker resource
 
-This functionality is not supported in our current Generally Available (GA) stable release. Check out QnA Maker managed to test out this functionality. 
+This functionality is not supported in our current Generally Available (GA) stable release. Check out [question answering](https://docs.microsoft.com/azure/cognitive-services/language-service/question-answering/overview) to test out this functionality. 
 
 ## Supporting multiple languages in one knowledge base
 
diff --git a/articles/governance/resource-graph/samples/advanced.md b/articles/governance/resource-graph/samples/advanced.md
@@ -435,7 +435,7 @@ az graph query -q "Resources | where type == 'microsoft.compute/virtualmachines'
 # [Azure PowerShell](#tab/azure-powershell)
 
 ```azurepowershell-interactive
-Search-AzGraph -Query "Resources | where type == 'microsoft.compute/virtualmachines' | extend JoinID = toupper(id), OSName = tostring(properties.osProfile.computerName), OSType = tostring(properties.storageProfile.osDisk.osType), VMSize = tostring(properties.hardwareProfile.vmSize) | join kind=leftouter( Resources | where type == 'microsoft.compute/virtualmachines/extensions' | extend VMId = toupper(substring(id, 0, indexof(id, '/extensions'))), ExtensionName = name ) on $left.JoinID == $right.VMId | summarize Extensions = make_list(ExtensionName) by id, OSName, OSType, VMSize | order by tolower(OSName) asc"
+Search-AzGraph -Query "Resources | where type == 'microsoft.compute/virtualmachines' | extend JoinID = toupper(id), OSName = tostring(properties.osProfile.computerName), OSType = tostring(properties.storageProfile.osDisk.osType), VMSize = tostring(properties.hardwareProfile.vmSize) | join kind=leftouter( Resources | where type == 'microsoft.compute/virtualmachines/extensions' | extend VMId = toupper(substring(id, 0, indexof(id, '/extensions'))), ExtensionName = name ) on `$left.JoinID == `$right.VMId | summarize Extensions = make_list(ExtensionName) by id, OSName, OSType, VMSize | order by tolower(OSName) asc"
 ```
 
 # [Portal](#tab/azure-portal)
diff --git a/articles/machine-learning/tutorial-automated-ml-forecast.md b/articles/machine-learning/tutorial-automated-ml-forecast.md
@@ -194,11 +194,11 @@ For this experiment, deployment to a web service means that the bike share compa
 
 Once the run is complete, navigate back to parent run page by selecting **Run 1** at the top of your screen.
 
-In the **Best model summary** section, **StackEnsemble** is considered the best model in the context of this experiment, based on the **Normalized root mean squared error** metric.  
+In the **Best model summary** section, the best model in the context of this experiment, is selected based on the **Normalized root mean squared error metric.** 
 
 We deploy this model, but be advised, deployment takes about 20 minutes to complete. The deployment process entails several steps including registering the model, generating resources, and configuring them for the web service.
 
-1. Select **StackEnsemble** to open the model-specific page.
+1. Select **the best model** to open the model-specific page.
 
 1. Select the **Deploy** button located in the top-left area of the screen.
 
diff --git a/articles/migrate/troubleshoot-dependencies.md b/articles/migrate/troubleshoot-dependencies.md
@@ -28,7 +28,7 @@ If your Azure Migrate project has private endpoint connectivity, the request to
 
 ## Common agentless dependency analysis errors
 
-Azure Migrate supports agentless dependency analysis by using Azure Migrate: Discovery and assessment.[Learn more](how-to-create-group-machine-dependencies-agentless.md) about how to perform agentless dependency analysis.
+Azure Migrate supports agentless dependency analysis by using Azure Migrate: Discovery and assessment. [Learn more](how-to-create-group-machine-dependencies-agentless.md) about how to perform agentless dependency analysis.
 
 For VMware VMs, agentless dependency analysis is performed by connecting to the servers via the vCenter Server using the VMware APIs. For Hyper-V VMs and physical servers, agentless dependency analysis is performed by directly connecting to Windows servers using PowerShell remoting on port 5985 (HTTP) and to Linux servers using SSH connectivity on port 22 (TCP).
 
diff --git a/articles/security/fundamentals/physical-security.md b/articles/security/fundamentals/physical-security.md
@@ -61,7 +61,7 @@ Microsoft requires visitors to surrender badges upon departure from any Microsof
 Periodically, we conduct physical security reviews of the facilities, to ensure the datacenters properly address Azure security requirements. The datacenter hosting provider personnel do not provide Azure service management. Personnel can't sign in to Azure systems and don't have physical access to the Azure collocation room and cages.
 
 ## Data bearing devices
-Microsoft uses best practice procedures and a wiping solution that is [NIST 800-88 compliant](https://csrc.nist.gov/publications/detail/sp/800-88/archive/2006-09-01). For hard drives that can’t be wiped, we use a destruction process that destroys it and renders the recovery of information impossible. This destruction process can be to disintegrate, shred, pulverize, or incinerate. We determine the means of disposal according to the asset type. We retain records of the destruction.  
+Microsoft uses best practice procedures and a wiping solution that is [NIST 800-88 compliant](https://csrc.nist.gov/publications/detail/sp/800-88/rev-1/final). For hard drives that can’t be wiped, we use a destruction process that destroys it and renders the recovery of information impossible. This destruction process can be to disintegrate, shred, pulverize, or incinerate. We determine the means of disposal according to the asset type. We retain records of the destruction.  
 
 ## Equipment disposal
 Upon a system's end-of-life, Microsoft operational personnel follow rigorous data handling and hardware disposal procedures to assure that hardware containing your data is not made available to untrusted parties. We use a secure erase approach for hard drives that support it. For hard drives that can’t be wiped, we use a destruction process that destroys the drive and renders the recovery of information impossible. This destruction process can be to disintegrate, shred, pulverize, or incinerate. We determine the means of disposal according to the asset type. We retain records of the destruction. All Azure services use approved media storage and disposal management services.
diff --git a/articles/spring-cloud/how-to-github-actions.md b/articles/spring-cloud/how-to-github-actions.md
@@ -225,7 +225,7 @@ jobs:
     runs-on: ubuntu-latest
     name: deploy to production with artifact
     steps:
-      - name: Checkout Github Action
+      - name: Checkout GitHub Action
         uses: actions/checkout@v2
         
       - name: Set up JDK 1.8
@@ -267,7 +267,7 @@ jobs:
     runs-on: ubuntu-latest
     name: deploy to production with soruce code
     steps:
-      - name: Checkout Github Action
+      - name: Checkout GitHub Action
         uses: actions/checkout@v2
 
       - name: Login via Azure CLI
diff --git a/articles/storage/common/storage-use-azcopy-files.md b/articles/storage/common/storage-use-azcopy-files.md
@@ -183,7 +183,7 @@ This section contains the following examples:
 > - Download specific files
 
 > [!TIP]
-> You can tweak your download operation by using optional flags. Here's a few examples.
+> You can tweak your download operation by using optional flags. Here are a few examples:
 >
 > |Scenario|Flag|
 > |---|---|
@@ -535,4 +535,4 @@ See these articles to configure settings, optimize performance, and troubleshoot
 
 - [AzCopy configuration settings](storage-ref-azcopy-configuration-settings.md)
 - [Optimize the performance of AzCopy](storage-use-azcopy-optimize.md)
-- [Troubleshoot AzCopy V10 issues in Azure Storage by using log files](storage-use-azcopy-configure.md)
+- [Troubleshoot AzCopy V10 issues in Azure Storage by using log files](storage-use-azcopy-configure.md)

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,10 @@ resource vmName_omsOnboarding 'Microsoft.Compute/virtualMachines/extensions@2017`
`94`	`94`	`typeHandlerVersion: '1.0'`
`95`	`95`	`autoUpgradeMinorVersion: true`
`96`	`96`	`settings: {`
`97`		`- workspaceId: ((!empty(logAnalytics)) ? reference(logAnalytics, '2015-11-01-preview').customerId : json('null'))`
	`97`	`+ workspaceId: ((!empty(logAnalytics)) ? reference(logAnalytics, '2015-11-01-preview').customerId : null)`
`98`	`98`	`}`
`99`	`99`	`protectedSettings: {`
`100`		`- workspaceKey: ((!empty(logAnalytics)) ? listKeys(logAnalytics, '2015-11-01-preview').primarySharedKey : json('null'))`
	`100`	`+ workspaceKey: ((!empty(logAnalytics)) ? listKeys(logAnalytics, '2015-11-01-preview').primarySharedKey : null)`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`}`