Merge pull request #177647 from aahill/release-cogsvcs-language-service

[DIRTY PR] Fix for merge conflicts

Author: ShannonLeavitt

.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",
@@ -4592,7 +4597,7 @@
       "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",
@@ -10631,6 +10636,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",
@@ -10801,6 +10811,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",
@@ -10881,41 +10906,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",
@@ -11316,6 +11381,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",
@@ -36973,7 +37043,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
     },
     {
@@ -46772,4 +46842,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

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

articles/active-directory-b2c/add-ropc-policy.md

@@ -37,7 +37,7 @@ The following flows are not supported:
 
 When using the ROPC flow, consider the following:
 
-- ROPC doesn’t work when there is any interruption to the authentication flow that needs user interaction. For example, when a password has expired or needs to be changed, [multi-factor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
+- ROPC doesn’t work when there is any interruption to the authentication flow that needs user interaction. For example, when a password has expired or needs to be changed, [multifactor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
 - ROPC supports local accounts only. Users can’t sign in with [federated identity providers](add-identity-provider.md) like Microsoft, Google+, Twitter, AD-FS, or Facebook.
 - [Session Management](session-behavior.md), including [keep me signed-in (KMSI)](session-behavior.md#enable-keep-me-signed-in-kmsi), is not applicable.
 
@@ -67,6 +67,9 @@ When using the ROPC flow, consider the following:
 
 ::: zone pivot="b2c-custom-policy"
 
+## Pre-requisite 
+If you've not done so, learn about custom policy starter pack in [Get started with custom policies in Active Directory B2C](tutorial-create-user-flows.md).
+
 ##  Create a resource owner policy
 
 1. Open the *TrustFrameworkExtensions.xml* file.

articles/active-directory-b2c/configure-authentication-sample-spa-app.md

@@ -7,7 +7,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 09/15/2021
+ms.date: 10/25/2021
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"

articles/active-directory-b2c/configure-user-input.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 10/15/2021
+ms.date: 10/22/2021
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -32,6 +32,10 @@ In this article, you collect a new attribute during your sign-up journey in Azur
 
 ## Add user attributes your user flow
 
+1. Sign in to the [Azure portal](https://portal.azure.com/).
+1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
+1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. Under  **Azure services**, select  **Azure AD B2C**. Or use the search box to find and select  **Azure AD B2C**.
 1. In your Azure AD B2C tenant, select **User flows**.
 1. Select your policy (for example, "B2C_1_SignupSignin") to open it.
 1. Select **User attributes** and then select the user attribute (for example, "City"). 
@@ -63,7 +67,7 @@ To provide a set list of values for the city attribute:
 1. [Enable language customization on the user flow](language-customization.md#support-requested-languages-for-ui_locales)
 1. Select your policy (for example, "B2C_1_SignupSignin") to open it.
 1. On the **Languages** page for the user flow, select the language that you want to customize.
-1. Under **Page-level-resources files**, select **Local account sign up page**.
+1. Under **Page-level resources files**, select **Local account sign up page**.
 1. Select **Download defaults** (or **Download overrides** if you have previously edited this language).
 1. Create a `LocalizedCollections` attribute.
 
@@ -107,7 +111,7 @@ The `LocalizedCollections` is an array of `Name` and `Value` pairs. The order fo
 1. Select **User flows** and select your policy (for example, "B2C_1_SignupSignin") to open it.
 1. Select **Languages**.
 1. Select the language that you want to translate to.
-1. Select the **Local account sign up page**.
+1. Under **Page-level-resources files**, select **Local account sign up page**.
 1. Select the folder icon, and select the JSON file to upload. The changes are saved to your user flow automatically.
 
 ## Test your user flow

articles/active-directory-b2c/identity-provider-azure-ad-single-tenant.md

@@ -47,10 +47,10 @@ To enable sign-in for users with an Azure AD account from a specific Azure AD or
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Make sure you're using the directory that contains your organizational Azure AD tenant (for example, Contoso). Select the **Directories + subscriptions** icon in the portal toolbar.
 1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
-1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
+1. Under **Azure services**, select **App registrations** or search for and select **App registrations**.
 1. Select **New registration**.
 1. Enter a **Name** for your application. For example, `Azure AD B2C App`.
-1. Accept the default selection of **Accounts in this organizational directory only** for this application.
+1. Accept the default selection of **Accounts in this organizational directory only (Default Directory only - Single tenant)** for this application.
 1. For the **Redirect URI**, accept the value of **Web**, and enter the following URL in all lowercase letters, where `your-B2C-tenant-name` is replaced with the name of your Azure AD B2C tenant.
 
     ```

articles/active-directory-b2c/language-customization.md

@@ -458,7 +458,7 @@ Microsoft is committed to providing the most up-to-date translations for your us
 
 ### Support for right-to-left languages
 
-Microsoft currently doesn't provide support for right-to-left languages. You can accomplish this by using custom locales and using CSS to change the way the strings are displayed. If you need this feature, please vote for it on [Azure Feedback](https://feedback.azure.com/forums/169401-azure-active-directory/suggestions/19393000-provide-language-support-for-right-to-left-languag).
+Microsoft currently doesn't provide support for right-to-left languages. You can accomplish this by using custom locales and using CSS to change the way the strings are displayed. If you need this feature, please vote for it on [Azure Feedback](https://feedback.azure.com/d365community/idea/10a7e89c-c325-ec11-b6e6-000d3a4f0789).
 
 ### Social identity provider translations
 

articles/active-directory-b2c/media/tutorial-create-tenant/show-menu-icon.png

@@ -313,10 +313,10 @@ For SAML apps, you need to configure several properties in the application regis
 
 When your SAML application makes a request to Azure AD B2C, the SAML AuthN request includes an `Issuer` attribute. The value of this attribute is typically the same as the application's metadata `entityID` value. Azure AD B2C uses this value to look up the application registration in the directory and read the configuration. For this lookup to succeed, `identifierUri` in the application registration must be populated with a value that matches the `Issuer` attribute.
 
-In the registration manifest, find the `identifierURIs` parameter and add the appropriate value. This value will be the same value that's configured in the SAML AuthN requests for `EntityId` at the application, and the `entityID` value in the application's metadata. You will also need to find the `accessTokenAcceptedVersion` paramater and set the value to `2`.
+In the registration manifest, find the `identifierURIs` parameter and add the appropriate value. This value will be the same value that's configured in the SAML AuthN requests for `EntityId` at the application, and the `entityID` value in the application's metadata. You will also need to find the `accessTokenAcceptedVersion` parameter and set the value to `2`.
 
 > [!IMPORTANT]
-> If you do not update the `accessTokenAcceptedVersion` to `2` you will recive an error message requiring a verfied domain.
+> If you do not update the `accessTokenAcceptedVersion` to `2` you will recieve an error message requiring a verified domain.
 
 The following example shows the `entityID` value in the SAML metadata: