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

Author: rolyon

.openpublishing.redirection.json

@@ -740,6 +740,31 @@
       "redirect_url": "/azure/machine-learning/service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-get-started-java-get-intent.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-get-intent-from-rest",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-get-started-cs-get-intent.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-get-intent-from-rest",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-get-started-go-get-intent.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-get-intent-from-rest",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-get-started-python-get-intent.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-get-intent-from-rest",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-get-started-node-get-intent.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-get-intent-from-rest",
+      "redirect_document_id": false
+    },                
     {
       "source_path": "articles/cognitive-services/LUIS/luis-concept-collaborator.md",
       "redirect_url": "/azure/cognitive-services/LUIS/luis-concept-keys",
@@ -1885,6 +1910,11 @@
       "redirect_url": "/azure/cosmos-db/sql-api-get-started",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/search/knowledge-store-howto.md",
+      "redirect_url": "/azure/search/knowledge-store-create-rest",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/search/search-fiddler.md",
       "redirect_url": "/azure/search/search-get-started-postman",
@@ -42056,6 +42086,16 @@
       "redirect_url": "/azure/sql-database/sql-database-instance-pools",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machines/windows/tutorial-monitoring.md",
+      "redirect_url": "/azure/virtual-machines/windows/tutorial-monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-machines/linux/tutorial-monitoring.md",
+      "redirect_url": "/azure/virtual-machines/linux/tutorial-monitor",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/mysql/reference-data-in-stored-procedures.md",
       "redirect_url": "/azure/mysql/reference-stored-procedures",
@@ -42075,6 +42115,21 @@
       "source_path": "articles/cloudfoundry/use-osba-pcf-app.md",
       "redirect_url": "/azure/cloudfoundry",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/compliance/azure-services-in-fedramp-auditscope.md",
+      "redirect_url": "/azure/azure-government/compliance/azure-services-in-fedramp-auditscope",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/compliance/compliance-tic.md",
+      "redirect_url": "/azure/azure-government/compliance/compliance-tic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/compliance/secure-azure-computing-architecture.md",
+      "redirect_url": "/azure/azure-government/compliance/secure-azure-computing-architecture",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

@@ -184,6 +184,8 @@ Open a browser and navigate to the URL. Make sure you type the correct URL and t
 
 ## Create an Azure AD B2C application
 
+Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
+
 [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 ### Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-goog-idp.md

@@ -155,6 +155,8 @@ Now that you have a button in place, you need to link it to an action. The actio
 
 ## Create an Azure AD B2C application
 
+Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
+
 [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 ## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-li-idp.md

@@ -213,6 +213,8 @@ Now that you have a button in place, you need to link it to an action. The actio
 
 ## Create an Azure AD B2C application
 
+Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
+
 [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 ## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-msa-idp.md

@@ -161,6 +161,8 @@ Now that you have a button in place, you need to link it to an action. The actio
 
 ## Create an Azure AD B2C application
 
+Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
+
 [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 ## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-twitter-idp.md

@@ -150,6 +150,8 @@ Now that you have a button in place, you need to link it to an action. The actio
 
 ## Create an Azure AD B2C application
 
+Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
+
 [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 ## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-devquickstarts-graph-dotnet.md

@@ -39,32 +39,17 @@ Once you have an Azure AD B2C tenant, you need to register your management appli
 
 ### Register application in Azure Active Directory
 
-To use the Azure AD Graph API with your B2C tenant, you need to register an application by using the Azure Active Directory **App registrations** workflow.
+To use the Azure AD Graph API with your B2C tenant, you need to register an application by using the Azure Active Directory application registration workflow.
 
-1. Sign in to the [Azure portal](https://portal.azure.com) and switch to the directory that contains your Azure AD B2C tenant.
-1. Select **Azure Active Directory** (*not* Azure AD B2C) in the left menu. Or, select **All services** and then search for and select **Azure Active Directory**.
-1. Under **Manage** in the left menu, select **App registrations (Legacy)**.
-1. Select **New application registration**
-1. Enter a name for the application. For example, *Management App*.
-1. Enter any valid URL in **Sign-on URL**. For example, *https://localhost*. This endpoint does not need to be reachable, but needs to be a valid URL.
-1. Select **Create**.
-1. Record the **Application ID** that appears on the **Registered app** overview page. You use this value for configuration in a later step.
+[!INCLUDE [active-directory-b2c-appreg-mgmt](../../includes/active-directory-b2c-appreg-mgmt.md)]
 
 ### Assign API access permissions
 
-1. On the **Registered app** overview page, select **Settings**.
-1. Under **API ACCESS**, select **Required permissions**.
-1. Select **Windows Azure Active Directory**.
-1. Under **APPLICATION PERMISSIONS**, select **Read and write directory data**.
-1. Select **Save**.
-1. Select **Grant permissions**, and then select **Yes**. It might take a few minutes to for the permissions to fully propagate.
+[!INCLUDE [active-directory-b2c-permissions-directory](../../includes/active-directory-b2c-permissions-directory.md)]
 
 ### Create client secret
 
-1. Under **API ACCESS**, select **Keys**.
-1. Enter a description for the key in the **Key description** box. For example, *Management Key*.
-1. Select a validity **Duration** and then select **Save**.
-1. Record the key's **VALUE**. You use this value for configuration in a later step.
+[!INCLUDE [active-directory-b2c-client-secret](../../includes/active-directory-b2c-client-secret.md)]
 
 You now have an application that has permission to *create*, *read*, and *update* users in your Azure AD B2C tenant. Continue to the next section to add user *delete* and *password update* permissions.
 
@@ -79,7 +64,7 @@ If you want to give your application the ability to delete users or update passw
 1. Under **Manage**, select **Roles and administrators**.
 1. Select the **User administrator** role.
 1. Select **Add assignment**.
-1. In the **Select** text box, enter the name of the application you registered earlier, for example, *Management App*. Select your application when it appears in the search results.
+1. In the **Select** text box, enter the name of the application you registered earlier, for example, *managementapp1*. Select your application when it appears in the search results.
 1. Select **Add**. It might take a few minutes to for the permissions to fully propagate.
 
 Your Azure AD B2C application now has the additional permissions required to delete users or update their passwords in your B2C tenant.

articles/active-directory-b2c/active-directory-b2c-guide-troubleshooting-custom.md

@@ -52,13 +52,11 @@ Common validation errors include the following:
 
 ## Troubleshoot the runtime
 
-* Use **Run now** and `https://jwt.ms` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON Web Token (JWT) that is generated by your Azure AD B2C policy. To create a test application, navigate to **Azure AD B2C** \> **Applications** in the Azure portal and add an application with the following values:
+* Use **Run now** and `https://jwt.ms` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON web token (JWT) that is generated by your Azure AD B2C policy.
 
-  * **Name**: TestApp
-  * **Web App/Web API**: No
-  * **Native client**: No
+    To create a test application that can redirect to `https://jwt.ms` for token inspection:
 
-  Then, add `https://jwt.ms` as a **Reply URL**.
+    [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 * To trace the exchange of messages between your client browser and Azure AD B2C, use [Fiddler](https://www.telerik.com/fiddler). It can help you get an indication of where your user journey is failing in your orchestration steps.
 

articles/active-directory-b2c/active-directory-b2c-reference-audit-logs.md

@@ -90,30 +90,25 @@ To allow script- or application-based access to the Azure AD reporting API, you
 
 You can enable these permissions on an existing Azure Active Directory application registration within your B2C tenant, or create a new one specifically for use with audit log automation.
 
-To create a new application, assign the required API permissions, and create a client secret, perform the following steps:
-
-1. Register application in Azure Active Directory
-    1. Sign in to the [Azure portal](https://portal.azure.com) and switch to the directory that contains your Azure AD B2C tenant.
-    1. Select **Azure Active Directory** (*not* Azure AD B2C) from the left menu. Or, select **All services**, then search for and select **Azure Active Directory**.
-    1. Under **Manage** in the left menu, select **App registrations (Legacy)**.
-    1. Select **New application registration**
-    1. Enter a name for the application. For example, *Audit Log App*.
-    1. Enter any valid URL in **Sign-on URL**. For example, *https://localhost*. This endpoint does not need to be reachable, but needs to be a valid URL.
-    1. Select **Create**.
-    1. Record the **Application ID** that appears on the **Registered app** page. You need this value for authentication in automation scripts like the example PowerShell script shown in a later section.
-1. Assign API access permissions
-    1. On the **Registered app** overview page, select **Settings**.
-    1. Under **API ACCESS**, select **Required permissions**.
-    1. Select **Add**, and then **Select an API**.
-    1. Select **Microsoft Graph**, and then **Select**.
-    1. Under **APPLICATION PERMISSIONS**, select **Read all audit log data**.
-    1. Select the **Select** button, and then select **Done**.
-    1. Select **Grant permissions**, and then select **Yes**.
-1. Create client secret
-    1. Under **API ACCESS**, select **Keys**.
-    1. Enter a description for the key in the **Key description** box. For example, *Audit Log Key*.
-    1. Select a validity **Duration**, then select **Save**.
-    1. Record the key's **VALUE**. You need this value for authentication in automation scripts like the example PowerShell script shown in a later section.
+Follow these steps register an application, grant it the required Microsoft Graph API permissions, and then create a client secret.
+
+### Register application in Azure Active Directory
+
+[!INCLUDE [active-directory-b2c-appreg-mgmt](../../includes/active-directory-b2c-appreg-mgmt.md)]
+
+### Assign API access permissions
+
+1. On the **Registered app** overview page, select **Settings**.
+1. Under **API ACCESS**, select **Required permissions**.
+1. Select **Add**, and then **Select an API**.
+1. Select **Microsoft Graph**, and then **Select**.
+1. Under **APPLICATION PERMISSIONS**, select **Read all audit log data**.
+1. Select the **Select** button, and then select **Done**.
+1. Select **Grant permissions**, and then select **Yes**.
+
+### Create client secret
+
+[!INCLUDE [active-directory-b2c-client-secret](../../includes/active-directory-b2c-client-secret.md)]
 
 You now have an application with the required API access, an application ID, and a key that you can use in your automation scripts. See the PowerShell script section later in this article for an example of how you can get activity events with a script.
 

articles/active-directory-b2c/active-directory-b2c-setup-aad-custom.md

@@ -175,6 +175,8 @@ Now that you have a button in place, you need to link it to an action. The actio
 
 ## Create an Azure AD B2C application
 
+Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
+
 [!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
 
 ## Update and test the relying party file