Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into dtl1

Author: v-thepet

.openpublishing.redirection.active-directory.json

@@ -4240,6 +4240,26 @@
             "redirect_url": "/azure/active-directory/governance/review-your-access",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/azure/active-directory/governance/review-your-access.md",
+            "redirect_url": "/azure/active-directory/governance/self-access-review",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/azure/active-directory/governance/entitlement-management-access-reviews-self-review.md",
+            "redirect_url": "/azure/active-directory/governance/self-access-review",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/azure/active-directory/governance/manage-guest-access-with-access-reviews.md",
+            "redirect_url": "/azure/active-directory/governance/manage-access-review",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/azure/active-directory/governance/manage-user-access-with-access-reviews.md",
+            "redirect_url": "/azure/active-directory/governance/manage-access-review",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/cloud-provisioning/what-is-cloud-provisioning.md",
             "redirect_url": "/azure/active-directory/cloud-sync/what-is-cloud-sync",

.openpublishing.redirection.json

@@ -4358,6 +4358,11 @@
       "redirect_url": "/azure/app-service/tutorial-auth-aad",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/app-service/app-service-web-tutorial-connect-msi.md",
+      "redirect_url": "/azure/app-service/tutorial-connect-msi-sql-database",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/app-service/containers/tutorial-auth-aad.md",
       "redirect_url": "/azure/app-service/tutorial-auth-aad?pivots=platform-linux",
@@ -4588,6 +4593,11 @@
       "redirect_url": "/azure/app-service-web/",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/app-service/app-service-migration-assistant.md",
+      "redirect_url": "/azure/app-service/app-service-asp-net-migration",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/architecture-overview.md",
       "redirect_url": "/azure/architecture",
@@ -5268,6 +5278,11 @@
       "redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/automation/automation-intro.md",
+      "redirect_url": "/azure/automation/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/automation/automation-quickstart-create-account.md",
       "redirect_url": "/azure/automation/quickstarts/create-account-portal",
@@ -10493,6 +10508,11 @@
       "redirect_url": "/azure/azure-resource-manager/templates/common-deployment-errors",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/common-deployment-errors.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/common-deployment-errors",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/complete-mode-deletion.md",
       "redirect_url": "/azure/azure-resource-manager/templates/complete-mode-deletion",
@@ -10663,6 +10683,21 @@
       "redirect_url": "/azure/azure-resource-manager/templates/deployment-quota-exceeded",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/deployment-quota-exceeded.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/deployment-quota-exceeded",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-invalid-template.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-invalid-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-job-size-exceeded.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-job-size-exceeded",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/templates/template-tutorial-create-linked-templates.md",
       "redirect_url": "/azure/azure-resource-manager/templates/deployment-tutorial-linked-template",
@@ -10743,41 +10778,81 @@
       "redirect_url": "/azure/azure-resource-manager/templates/error-not-found",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-not-found.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-not-found",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-parent-resource-errors.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-parent-resource",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-parent-resource.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-parent-resource",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-policy-requestdisallowedbypolicy-error.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-policy-requestdisallowedbypolicy",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-policy-requestdisallowedbypolicy.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-policy-requestdisallowedbypolicy",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-register-provider-errors.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-register-resource-provider",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-register-resource-provider.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-register-resource-provider",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-reserved-resource-name.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-reserved-resource-name",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-reserved-resource-name.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-reserved-resource-name",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-quota-errors.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-resource-quota",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-resource-quota.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-resource-quota",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-sku-not-available-errors.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-sku-not-available",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-sku-not-available.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-sku-not-available",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-storage-account-name-errors.md",
       "redirect_url": "/azure/azure-resource-manager/templates/error-storage-account-name",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/error-storage-account-name.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/error-storage-account-name",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/export-template-portal.md",
       "redirect_url": "/azure/azure-resource-manager/templates/export-template-portal",
@@ -11178,6 +11253,11 @@
       "redirect_url": "/azure/azure-resource-manager/templates/template-tutorial-troubleshoot",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/templates/template-tutorial-troubleshoot.md",
+      "redirect_url": "/azure/azure-resource-manager/troubleshooting/quickstart-troubleshoot-arm-deployment",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-resource-manager/resource-manager-tutorial-use-azure-pipelines.md",
       "redirect_url": "/azure/azure-resource-manager/templates/template-tutorial-use-azure-pipelines",
@@ -20324,29 +20404,54 @@
       "redirect_document_id": true
     },
     {
-      "source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-ask-a-question-you-can-answer-with-data.md",
-      "redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-ask-a-question-you-can-answer-with-data",
+      "source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-ask-a-question-you-can-answer-with-data.md",
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-copy-other-peoples-work-to-do-data-science.md",
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-is-your-data-ready-for-data-science.md",
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-predict-an-answer-with-a-simple-model.md",
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-the-5-questions-data-science-answers.md",
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-ask-a-question-you-can-answer-with-data.md",
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-copy-other-peoples-work-to-do-data-science.md",
-      "redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-copy-other-peoples-work-to-do-data-science",
-      "redirect_document_id": true
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-is-your-data-ready-for-data-science.md",
-      "redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-is-your-data-ready-for-data-science",
-      "redirect_document_id": true
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-predict-an-answer-with-a-simple-model.md",
-      "redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-predict-an-answer-with-a-simple-model",
-      "redirect_document_id": true
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-the-5-questions-data-science-answers.md",
-      "redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-the-5-questions-data-science-answers",
-      "redirect_document_id": true
+      "redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/studio/convert-training-experiment-to-scoring-experiment.md",
@@ -27943,6 +28048,16 @@
       "redirect_url": "/azure/storage/blobs/concurrency-manage",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/storage/blobs/manage-access-tier.md",
+      "redirect_url": "/azure/storage/blobs/access-tiers-online-manage",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/storage/common/manage-account-default-access-tier.md",
+      "redirect_url": "/azure/storage/blobs/access-tiers-online-manage",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/storage/blobs/data-lake-storage-quickstart-create-databricks-account.md",
       "redirect_url": "/azure/storage/blobs/data-lake-storage-use-databricks-spark",
@@ -36775,7 +36890,7 @@
     },
     {
       "source_path_from_root": "/articles/active-directory-domain-services/contact-us.md",
-      "redirect_url": "https://feedback.azure.com/forums/169401-azure-active-directory?category_id=160593",
+      "redirect_url": "/azure/active-directory/fundamentals/support-help-options",
       "redirect_document_id": false
     },
     {
@@ -46394,7 +46509,12 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/aks/open-service-mesh-deploy-add-on.md",
+      "source_path_from_root": "/articles/aks/open-service-mesh-customize-add-on-experience.md",
+      "redirect_url": "/azure/aks/open-service-mesh-binary",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/aks/open-service-mesh-disable-add-on.md",
       "redirect_url": "/azure/aks/open-service-mesh-deploy-addon-az-cli",
       "redirect_document_id": false
     },
@@ -46567,6 +46687,11 @@
       "source_path_from_root": "/articles/app-service/web-sites-integrate-with-vnet.md",
       "redirect_url": "/azure/app-service/overview-vnet-integration",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/mariadb/concepts-performance-recommendations.md",
+      "redirect_url": "/azure/mariadb/overview",
+      "redirect_document_id": false
     }
   ]
-}
+}

articles/active-directory-b2c/aad-sspr-technical-profile.md

@@ -23,7 +23,7 @@ Azure Active Directory B2C (Azure AD B2C) provides support for verifying an emai
 This technical profile:
 
 - Doesn't provide an interface to interact with the user. Instead, the user interface is called from a [self-asserted](self-asserted-technical-profile.md) technical profile, or a [display control](display-controls.md) as a [validation technical profile](validation-technical-profile.md).
-- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.  
+- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.
 - Validates an email address via a verification code.
 
 [!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
@@ -38,7 +38,7 @@ Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, C
 
 The following example shows an Azure AD SSPR technical profile:
 
-```XML
+```xml
 <TechnicalProfile Id="AadSspr-SendCode">
   <DisplayName>Send Code</DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -57,7 +57,6 @@ The **InputClaims** element contains a list of claims to send to Azure AD SSPR.
 | --------- | -------- | ----------- |
 | emailAddress | Yes | The identifier for the user who owns the email address. The `PartnerClaimType` property of the input claim must be set to `emailAddress`. |
 
-
 The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending to the Azure AD SSPR service.
 
 ### Output claims
@@ -81,12 +80,11 @@ The following metadata can be used to configure the error messages displayed upo
 | UserMessageIfInternalError | No | User error message if the server has encountered an internal error. |
 | UserMessageIfThrottled| No | User error message if a request has been throttled.|
 
-
 ### Example: send an email
 
 The following example shows an Azure AD SSPR technical profile that is used to send a code via email.
 
-```XML
+```xml
 <TechnicalProfile Id="AadSspr-SendCode">
   <DisplayName>Send Code</DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -142,7 +140,7 @@ The following metadata can be used to configure the error messages displayed upo
 
 The following example shows an Azure AD SSPR technical profile used to verify the code.
 
-```XML
+```xml
 <TechnicalProfile Id="AadSspr-VerifyCode">
   <DisplayName>Verify Code</DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -154,4 +152,4 @@ The following example shows an Azure AD SSPR technical profile used to verify th
     <InputClaim ClaimTypeReferenceId="email" PartnerClaimType="emailAddress"/>
   </InputClaims>
 </TechnicalProfile>
-```
+```

articles/active-directory-b2c/access-tokens.md

@@ -62,7 +62,7 @@ If the **response_type** parameter in an `/authorize` request includes `token`,
 
 To request an access token, you need an authorization code. Below is an example of a request to the `/authorize` endpoint for an authorization code. Custom domains are not supported for use with access tokens. Use your tenant-name.onmicrosoft.com domain in the request URL.
 
-In the following example, you replace these values:
+In the following example, you replace these values in the query string:
 
 - `<tenant-name>` - The name of your Azure AD B2C tenant.
 - `<policy-name>` - The name of your custom policy or user flow.
@@ -86,7 +86,7 @@ The response with the authorization code should be similar to this example:
 https://jwt.ms/?code=eyJraWQiOiJjcGltY29yZV8wOTI1MjAxNSIsInZlciI6IjEuMC...
 ```
 
-After successfully receiving the authorization code, you can use it to request an access token:
+After successfully receiving the authorization code, you can use it to request an access token. Note that the parameters are in the body of the HTTP POST request:
 
 ```http
 POST <tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token HTTP/1.1
@@ -100,7 +100,7 @@ grant_type=authorization_code
 &redirect_uri=https://jwt.ms
 &client_secret=2hMG2-_:y12n10vwH...
 ```
-
+ 
 You should see something similar to the following response:
 
 ```json