Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into v-dele-1666440-2

Author: DennisLee-DennisLee

.openpublishing.redirection.json

@@ -1,5 +1,120 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/virtual-network/create-virtual-network-classic.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/create-virtual-network-classic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-pportal.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-pportal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-netcfg-ps.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-netcfg-ps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-cli.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-specifying-dns-settings-in-a-service-configuration-file.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-dns-settings-in-a-service-configuration-file",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-using-network-configuration-file.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-using-network-configuration-file",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-migrate-to-regional-vnet.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-migrate-to-regional-vnet",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-create-nsg-classic-ps.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-nsg-classic-ps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-create-nsg-classic-cli.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-nsg-classic-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-network-create-udr-classic-ps.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-network-create-udr-classic-ps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-network-create-udr-classic-cli.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-network-create-udr-classic-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-network-deploy-multinic-classic-ps.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-network-deploy-multinic-classic-ps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-network-deploy-multinic-classic-cli.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-network-deploy-multinic-classic-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-reserved-public-ip.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-reserved-private-ip.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-reserved-private-ip",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-static-private-ip-classic-cli.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-static-private-ip-classic-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-instance-level-public-ip.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-instance-level-public-ip",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-acl-powershell.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-acl-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-move-vm-role-to-subnet.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-move-vm-role-to-subnet",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-sample-app.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-sample-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-network-ip-addresses-overview-classic.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-network-ip-addresses-overview-classic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/virtual-networks-acl.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-acl",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/power-bi-workspace-collections/app-token-flow.md",
       "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/app-token-flow",

articles/active-directory/develop/howto-add-app-roles-in-azure-ad-apps.md

@@ -40,7 +40,7 @@ These application roles are defined in the [Azure portal](https://portal.azure.c
 1. Edit the app manifest by locating the `appRoles` setting and adding all your Application Roles.
 
      > [!NOTE]
-     > Each app role definition in this manifest must have a different valid GUID for the `id` property. 
+     > Each app role definition in this manifest must have a different valid GUID within the context of the manifest for the `id` property.    
      > 
      > The `value` property of each app role definition should exactly match the strings that are used in the code in the application. The `value` property can't contain spaces. If it does, you'll receive an error when you save the manifest.
      

articles/active-directory/develop/scenario-desktop-acquire-token.md

@@ -410,7 +410,7 @@ To sign in a domain user on a domain or Azure AD joined machine, use Integrated
 
 - The authority passed in `PublicClientApplicationBuilder` needs to be:
   - Tenanted of the form `https://login.microsoftonline.com/{tenant}/`, where `tenant` is either the GUID that represents the tenant ID or a domain associated with the tenant.
-  - For any [work and school accounts](`https://login.microsoftonline.com/organizations/`).
+  - For any work and school accounts: `https://login.microsoftonline.com/organizations/`.
   - Microsoft personal accounts aren't supported. You can't use /common or /consumers tenants.
 
 - Because Integrated Windows Authentication is a silent flow:

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

@@ -125,9 +125,9 @@ It is typical to force a user to change their password during their first logon,
 
 The temporary password functionality helps to ensure that the transfer of ownership of the credential is completed on first use, to minimize the duration of time in which more than one individual has knowledge of that credential.
 
-To support temporary passwords in Azure AD for synchronized users, you can enable the *ForcePasswordResetOnLogonFeature* feature, by running the following command on your Azure AD Connect server:
+To support temporary passwords in Azure AD for synchronized users, you can enable the *ForcePasswordChangeOnLogOn* feature, by running the following command on your Azure AD Connect server:
 
-`Set-ADSyncAADCompanyFeature  -ForcePasswordResetOnLogonFeature $true`
+`Set-ADSyncAADCompanyFeature  -ForcePasswordChangeOnLogOn $true`
 
 > [!NOTE]
 > Forcing a user to change their password on next logon requires a password change at the same time.  AD Connect will not pick up the force password change flag by itself; it is supplemental to the detected password change that occurs during password hash sync.

articles/active-directory/saas-apps/gigya-tutorial.md

@@ -108,7 +108,7 @@ To configure Azure AD single sign-on with Gigya, perform the following steps:
     `https://fidm.gigya.com/saml/v2.0/<companyname>`
 
 	> [!NOTE]
-	> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Gigya Client support team](https://www.gigya.com/support-policy/) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+	> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Gigya Client support team](https://developers.gigya.com/display/GD/Opening+A+Support+Incident) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
 5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Base64)** from the given options as per your requirement and save it on your computer.
 

articles/azure-functions/functions-create-first-function-python.md

@@ -202,7 +202,7 @@ To deploy your function code to Azure, you need to create three resources:
 
 You use Azure CLI commands to create these items. Each command provides JSON output upon completion.
 
-1. If you haven't done so already, sign in to Azure with the [az login](/cli/azure/group#az-login) command:
+1. If you haven't done so already, sign in to Azure with the [az login](/cli/azure/reference-index#az-login) command:
 
     ```azurecli
     az login

articles/azure-functions/functions-create-function-linux-custom-image.md

@@ -285,7 +285,7 @@ To deploy your function code to Azure, you need to create three resources:
 
 You use Azure CLI commands to create these items. Each command provides JSON output upon completion.
 
-1. Sign in to Azure with the [az login](/cli/azure/group#az-login) command:
+1. Sign in to Azure with the [az login](/cli/azure/reference-index#az-login) command:
 
     ```azurecli
     az login

articles/azure-monitor/app/opencensus-python.md

@@ -133,7 +133,7 @@ Here are the exporters that OpenCensus provides mapped to the types of telemetry
 
 4. Now when you run the Python script, you should still be prompted to enter values, but only the value is being printed in the shell. The created `SpanData` will be sent to Azure Monitor. You can find the emitted span data under `dependencies`.
 
-5. For information on sampling in OpenCensus, take a look at [sampling in OpenCensus](https://docs.microsoft.com/azure/azure-monitor/app/sampling#configuring-fixed-rate-sampling-in-opencensus-python).
+5. For information on sampling in OpenCensus, take a look at [sampling in OpenCensus](sampling.md#configuring-fixed-rate-sampling-for-opencensus-python-applications).
 
 6. For details on telemetry correlation in your trace data, take a look at OpenCensus [telemetry correlation](https://docs.microsoft.com/azure/azure-monitor/app/correlation#telemetry-correlation-in-opencensus-python).
 

articles/azure-monitor/app/pricing.md

@@ -34,9 +34,9 @@ There are two approaches to address this: use of default monitoring and adaptive
 
 ### Data collection when using sampling
 
-With the ASP.NET SDK's [adaptive sampling](https://docs.microsoft.com/azure/azure-monitor/app/sampling#adaptive-sampling-in-your-aspnetaspnet-core-web-applications), the data volume is adjusted automatically to keep within a specified maximum rate of traffic for default Application Insights monitoring. If the application produces a low amount of telemetry, such as when debugging or due to low usage, items won't be dropped by the sampling processor as long as volume is below the configured events per second level. For a high volume application, with the default threshold of five events per second, adaptive sampling will limit the number of daily events to 432,000. Using a typical average event size of 1 KB, this corresponds to 13.4 GB of telemetry per 31-day month per node hosting your application (since the sampling is done local to each node.) 
+With the ASP.NET SDK's [adaptive sampling](sampling.md#adaptive-sampling), the data volume is adjusted automatically to keep within a specified maximum rate of traffic for default Application Insights monitoring. If the application produces a low amount of telemetry, such as when debugging or due to low usage, items won't be dropped by the sampling processor as long as volume is below the configured events per second level. For a high volume application, with the default threshold of five events per second, adaptive sampling will limit the number of daily events to 432,000. Using a typical average event size of 1 KB, this corresponds to 13.4 GB of telemetry per 31-day month per node hosting your application (since the sampling is done local to each node.) 
 
-For SDKs that don't support adaptive sampling, you can employ [ingestion sampling](https://docs.microsoft.com/azure/azure-monitor/app/sampling#ingestion-sampling), which samples when the data is received by Application Insights based on a percentage of data to retain, or [fixed-rate sampling for ASP.NET, ASP.NET Core, and Java websites](https://docs.microsoft.com/azure/azure-monitor/app/sampling#fixed-rate-sampling-for-aspnet-aspnet-core-java-websites-and-python-applications) to reduce the traffic sent from your web server and web browsers
+For SDKs that don't support adaptive sampling, you can employ [ingestion sampling](https://docs.microsoft.com/azure/azure-monitor/app/sampling#ingestion-sampling), which samples when the data is received by Application Insights based on a percentage of data to retain, or [fixed-rate sampling for ASP.NET, ASP.NET Core, and Java websites](sampling.md#fixed-rate-sampling) to reduce the traffic sent from your web server and web browsers
 
 ### Learn from what similar customers collect
 

articles/backup/backup-afs-cli.md

@@ -99,7 +99,7 @@ If you want to trigger an on-demand backup for your file share instead of waitin
 
 You need to define the following parameters to trigger an on-demand backup:
 
-* **--container-name** is the name of the storage account hosting the file share. To retrieve the **name** or **friendly name** of your container, use the [az backup container list](https://docs.microsoft.com/azure/backup/container?view=azure-cli-latest#az-backup-container-list) command.
+* **--container-name** is the name of the storage account hosting the file share. To retrieve the **name** or **friendly name** of your container, use the [az backup container list](/cli/azure/backup/container?view=azure-cli-latest#az-backup-container-list) command.
 * **--item-name** is the name of the file share for which you want to trigger an on-demand backup. To retrieve the **name** or **friendly name** of your backed-up item, use the [az backup item list](https://docs.microsoft.com/cli/azure/backup/item?view=azure-cli-latest#az-backup-item-list) command.
 * **--retain-until** specifies the date until when you want to retain the recovery point. The value should be set in UTC time format (dd-mm-yyyy).