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

Author: DennisLee-DennisLee

.openpublishing.redirection.json

@@ -7949,6 +7949,11 @@
             "redirect_url": "/azure/container-instances/container-instances-jenkins",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/jenkins/java-deploy-webapp-tutorial.md",
+            "redirect_url": "/azure/jenkins/tutorial-jenkins-deploy-web-app-azure-app-service",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/container-service/dcos-swarm/container-service-deployment.md",
             "redirect_url": "/azure/container-service/dcos-swarm",
@@ -30720,6 +30725,41 @@
             "source_path":  "articles/monitoring/monitoring-vminsights-optout.md",
             "redirect_url":  "/azure/azure-monitor/insights/vminsights-optout",
             "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-data-sources.md",
+            "redirect_url":  "/azure/azure-monitor/platform/data-sources",
+            "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-data-collection.md",
+            "redirect_url":  "/azure/azure-monitor/platform/data-collection",
+            "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-overview-azure-agents.md",
+            "redirect_url":  "/azure/azure-monitor/platform/agents-overview",
+            "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-runbook-datacollect.md",
+            "redirect_url":  "/azure/azure-monitor/platform/runbook-datacollect",
+            "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-service-map.md",
+            "redirect_url":  "/azure/azure-monitor/insights/service-map",
+            "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-service-map-configure.md",
+            "redirect_url":  "/azure/azure-monitor/insights/service-map-configure",
+            "redirect_document_id":  "false"
+        },
+        {
+            "source_path":  "articles/monitoring/monitoring-service-map-scom.md",
+            "redirect_url":  "/azure/azure-monitor/insights/service-map-scom",
+            "redirect_document_id":  "false"
         }
     ]
 }

articles/active-directory-b2c/claim-resolver-overview.md

@@ -29,10 +29,10 @@ In the following example, a claim type named `correlationId` is defined with a *
 </ClaimType>
 ```
 
-In the technical profile, map the claim resolver to the claim type. Azure AD B2C populates the value of the claim resolver `{context:corelationId}` into the claim `correlationId` and sends the claim to the technical profile.
+In the technical profile, map the claim resolver to the claim type. Azure AD B2C populates the value of the claim resolver `{Context:CorrelationId}` into the claim `correlationId` and sends the claim to the technical profile.
 
 ```XML
-<InputClaim ClaimTypeReferenceId="correlationId" DefaultValue="{context:corelationId}" />
+<InputClaim ClaimTypeReferenceId="correlationId" DefaultValue="{Context:CorrelationId}" />
 ```
 
 ## Claim resolver types

articles/active-directory/develop/azure-ad-endpoint-comparison.md

@@ -60,10 +60,10 @@ When the terms of service and privacy statement are ready, you can add links to
 
 Follow these steps if you registered your app in the Azure portal.
 
-1. Sign in to the [Azure portal](https://portal.azure.com/).
-2. Navigate to the **App Registrations** section and select your app.
-3. Open the **Properties** section of the app.
-4. Fill out the **Terms of Service URL** and **Privacy Statement URL** fields.
+1. Sign in to the [Azure portal](https://portal.azure.com/).
+2. Navigate to the **App Registrations** section and select your app.
+3. Open the **Properties** section of the app.
+4. Fill out the **Terms of Service URL** and **Privacy Statement URL** fields.
 5. Save your changes.
 
     ![App properties section with terms of service and privacy statement URLs](./media/howto-add-terms-of-service-privacy-statement/azure-portal-terms-service-privacy-statement-urls.png)
@@ -72,9 +72,9 @@ Follow these steps if you registered your app in the Azure portal.
 
 Follow these steps if you registered your app in the Application Registration Portal or Dev Center.
 
-1. Sign in to the [Application Registration Portal](https://apps.dev.microsoft.com/).
-2. Select your app and scroll to the **Profile** section.
-3. Fill out the **Terms of Service URL** and **Privacy Statement URL** fields.
+1. Sign in to the [Application Registration Portal](https://apps.dev.microsoft.com/).
+2. Select your app and scroll to the **Profile** section.
+3. Fill out the **Terms of Service URL** and **Privacy Statement URL** fields.
 4. Save your changes.
 
     ![App profile section with terms of service and privacy statement URLs](./media/howto-add-terms-of-service-privacy-statement/app-registration-portal-profile-terms-service-privacy-statement-urls.png)
@@ -110,4 +110,4 @@ PATCH https://graph.microsoft.com/beta/applications/{application id}
 
 > [!NOTE]
 > * Be careful not to overwrite any pre-existing values you have assigned to any of these fields: `supportUrl`, `marketingUrl`, and `logoUrl`
-> * The MSGraph beta REST API will only work when you sign in with an Azure AD account. Personal Microsoft accounts are not supported.
+> * The MSGraph beta REST API will only work when you sign in with an Azure AD account. Personal Microsoft accounts are not supported.

articles/active-directory/develop/howto-add-terms-of-service-privacy-statement.md

@@ -119,6 +119,6 @@ When no longer needed, delete the test user, the Tor Browser and disable the sig
 
 - If you don't know how to delete an Azure AD user, see [How to add or delete users](../fundamentals/add-users-azure-active-directory.md#delete-a-user).
 
-- For instructions to remove the Tor Browser, see [Uninstalling](https://tb-manual.torproject.org/en-US/uninstalling.html).
+- For instructions to remove the Tor Browser, see [Uninstalling](https://tb-manual.torproject.org/uninstalling/).
 
 

articles/active-directory/identity-protection/quickstart-sign-in-risk-policy.md

@@ -72,4 +72,4 @@ sections:
     - title: Command-Line
       html: <p><a href="/powershell/module/azurerm.managedserviceidentity#managed_service_identity">Azure PowerShell</a></p><p><a href="/cli/azure/identity">Azure CLI</a></p>
     - title: Languages
-      html: <p><a href="/dotnet/api/microsoft.azure.management.resourcemanager.fluent.authentication#azure-dotnet">.NET</a></p><p><a href="https://github.com/Azure/azure-libraries-for-java#ready-to-run-code-samples-for-virtual-machines">Java</a></p><p><a href="/javascript/api/ms-rest-azure">Node​.js</a></p><p><a href="/python/api/azure.mgmt.msi">Python</a></p></p><a href="https://rubygems.org/gems/azure_mgmt_msi">Ruby</a></p></p><a href="https://godoc.org/github.com/Azure/azure-sdk-for-go/services/msi/mgmt/2015-08-31-preview/msi">Go</a></p>
+      html: <p><a href="/dotnet/api/microsoft.azure.management.resourcemanager.fluent.authentication#azure-dotnet">.NET</a></p><p><a href="https://github.com/Azure/azure-libraries-for-java#ready-to-run-code-samples-for-virtual-machines">Java</a></p><p><a href="/javascript/api/ms-rest-azure">Node​.js</a></p><p><a href="/python/api/azure.mgmt.msi">Python</a></p></p><a href="https://rubygems.org/gems/azure_mgmt_msi">Ruby</a></p></p><a href="https://godoc.org/github.com/Azure/azure-sdk-for-go/services/preview/msi/mgmt/2015-08-31-preview/msi">Go</a></p>

articles/active-directory/managed-identities-azure-resources/index.yml

@@ -1,4 +1,4 @@
----
+---
 title: 'Tutorial: Azure Active Directory integration with Kantega SSO for Bamboo | Microsoft Docs'
 description: Learn how to configure single sign-on between Azure Active Directory and Kantega SSO for Bamboo.
 services: active-directory
@@ -120,7 +120,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
 	In the **Sign-on URL** textbox, type a URL using the following pattern: `https://<server-base-url>/plugins/servlet/no.kantega.saml/sp/<uniqueid>/login`
 	 
 	> [!NOTE] 
-	> These values are not real. Update these values with the actual Identifier, Reply URL, and Sign-On URL. These values are recieved during the configuration of Bamboo plugin which is explained later in the tutorial.
+	> These values are not real. Update these values with the actual Identifier, Reply URL, and Sign-On URL. These values are received during the configuration of Bamboo plugin which is explained later in the tutorial.
 
 1. On the **SAML Signing Certificate** section, click **Metadata XML** and then save the metadata file on your computer.
 

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

@@ -120,7 +120,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
 	In the **Sign-on URL** textbox, type a URL using the following pattern: `https://<server-base-url>/plugins/servlet/no.kantega.saml/sp/<uniqueid>/login`
 
 	> [!NOTE] 
-	> These values are not real. Update these values with the actual Identifier, Reply URL, and Sign-On URL. These values are recieved during the configuration of Bitbucket plugin which is explained later in the tutorial.
+	> These values are not real. Update these values with the actual Identifier, Reply URL, and Sign-On URL. These values are received during the configuration of Bitbucket plugin which is explained later in the tutorial.
 
 1. On the **SAML Signing Certificate** section, click **Metadata XML** and then save the metadata file on your computer.
 

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

@@ -1,4 +1,4 @@
----
+---
 title: 'Tutorial: Azure Active Directory integration with Kantega SSO for FishEye/Crucible | Microsoft Docs'
 description: Learn how to configure single sign-on between Azure Active Directory and Kantega SSO for FishEye/Crucible.
 services: active-directory
@@ -120,7 +120,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
     In the **Sign-on URL** textbox, type a URL using the following pattern: `https://<server-base-url>/plugins/servlet/no.kantega.saml/sp/<uniqueid>/login`
 	 
 	> [!NOTE] 
-	> These values are not real. Update these values with the actual Identifier, Reply URL, and Sign-On URL. These values are recieved during the configuration of FishEye/Crucible plugin which is explained later in the tutorial.
+	> These values are not real. Update these values with the actual Identifier, Reply URL, and Sign-On URL. These values are received during the configuration of FishEye/Crucible plugin which is explained later in the tutorial.
 
 1. On the **SAML Signing Certificate** section, click **Metadata XML** and then save the metadata file on your computer.
 

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

@@ -1,4 +1,4 @@
----
+---
 title: 'Tutorial: Azure Active Directory integration with Leapsome | Microsoft Docs'
 description: Learn how to configure single sign-on between Azure Active Directory and Leapsome.
 services: active-directory
@@ -173,7 +173,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
 
 	b. Copy the **Login URL (point your users here to start login)** value and paste it into the **Sign-on URL** textbox in **Leapsome Domain and URLs** section on Azure portal.
 
-	c. Copy the **Reply URL (recieves response from your identity provider)** value and paste it into the **Reply URL** textbox in  **Leapsome Domain and URLs** section on Azure portal.
+	c. Copy the **Reply URL (receives response from your identity provider)** value and paste it into the **Reply URL** textbox in  **Leapsome Domain and URLs** section on Azure portal.
 
 	d. In the **SSO Login URL (provided by identity provider)** textbox, paste the value of **SAML Single Sign-On Service URL**, which you copied from the Azure portal.