Merge pull request #78691 from MicrosoftDocs/master

6/04 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -31374,6 +31374,11 @@
       "redirect_url": "/azure/azure-maps/supported-search-categories",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-tutorial-speech-to-intent.md",
+      "redirect_url": "/azure/cognitive-services//speech-service/how-to-recognize-intents-from-speech-csharp",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-concept-intro-to-luis.md",
       "redirect_url": "/azure/cognitive-services/LUIS/home",

articles/active-directory/manage-apps/plan-sso-deployment.md

@@ -74,7 +74,11 @@
       - name: Configure SAML token encryption (Preview)
         href: howto-saml-token-encryption.md
     - name: Single sign-on
-      href: what-is-single-sign-on.md
+      items: 
+      - name: What is single sign-on
+        href: what-is-single-sign-on.md
+      - name: Planning a single sign-on deployment
+        href: plan-sso-deployment.md
     - name: End-user portals
       href: end-user-experiences.md
   - name: How-to guides

articles/active-directory/manage-apps/toc.yml

@@ -14,7 +14,7 @@ You need a container registry to push your app image to once the image is built.
 
 ## Using Azure Container Registry
 
-[Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/) (ACR) is a private, secure, hosted registry for your images. ACR is used in this tutorial, but the steps are the same for other registry services.
+[Azure Container Registry](https://azure.microsoft.com/services/container-registry/) (ACR) is a private, secure, hosted registry for your images. ACR is used in this tutorial, but the steps are the same for other registry services.
 
 Create an Azure Container Registry by signing in to the [Azure portal](https://portal.azure.com) then selecting **Create a resource** > **Containers** > **Container Registry**.
 

articles/app-service/containers/tutorial-javascript-vscode-create-registry.md

@@ -10,7 +10,7 @@ ms.devlang: javascript
 ---
 # Deploy the image to Azure App Service
 
-Now that you have your app image built and pushed to a registry, you can deploy to [Azure App Service](https://azure.microsoft.com/en-us/services/app-service/) directly from the Docker extension explorer.
+Now that you have your app image built and pushed to a registry, you can deploy to [Azure App Service](https://azure.microsoft.com/services/app-service/) directly from the Docker extension explorer.
 
 ## Deploy the image
 

articles/app-service/containers/tutorial-javascript-vscode-deploy-container.md

@@ -10,11 +10,11 @@ ms.devlang: javascript
 ---
 # Deploy to Azure using Docker
 
-This quickstart shows you how to containerize an existing Node.js application using [Docker](https://www.docker.com/), then use Visual Studio Code to push the app image to a Docker registry and deploy it to [Azure Web App for Containers](https://azure.microsoft.com/en-us/services/app-service/containers/).
+This quickstart shows you how to containerize an existing Node.js application using [Docker](https://www.docker.com/), then use Visual Studio Code to push the app image to a Docker registry and deploy it to [Azure Web App for Containers](https://azure.microsoft.com/services/app-service/containers/).
 
 ## Prerequisites
 
-If you don't have an Azure account, [sign up today](https://azure.microsoft.com/en-us/free/?utm_source=campaign&utm_campaign=vscode-tutorial-docker-extension&mktingSource=vscode-tutorial-docker-extension) for a free account with $200 in Azure credits to try out any combination of services.
+If you don't have an Azure account, [sign up today](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-docker-extension&mktingSource=vscode-tutorial-docker-extension) for a free account with $200 in Azure credits to try out any combination of services.
 
 You need [Visual Studio Code](https://code.visualstudio.com/) installed along with [Node.js and npm](https://nodejs.org/en/download) and [Docker](https://www.docker.com/community-edition).
 

articles/app-service/containers/tutorial-javascript-vscode-get-started.md

@@ -25,7 +25,7 @@ In the **AZURE APP SERVICE** explorer, click the blue up arrow icon to deploy yo
 
 2. Type a globally unique name for your Web App and press ENTER. Valid characters for an app name are 'a-z', '0-9', and '-'.
 
-3. Choose a location in a [region](https://azure.microsoft.com/en-us/regions/) near you or near other services you may need to access.
+3. Choose a location in a [region](https://azure.microsoft.com/regions/) near you or near other services you may need to access.
 
 4. Choose your **Node.js version**, LTS is recommended.
 

articles/app-service/tutorial-javascript-vscode-deploy-app.md

@@ -14,7 +14,7 @@ This tutorial walks you through deploying a Node.js application to Azure using t
 
 ## Prerequisites
 
-If you don't have an Azure account, [sign up today](https://azure.microsoft.com/en-us/free/?utm_source=campaign&utm_campaign=vscode-tutorial-app-service-extension&mktingSource=vscode-tutorial-app-service-extension) for a free account with $200 in Azure credits to try out any combination of services.
+If you don't have an Azure account, [sign up today](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-app-service-extension&mktingSource=vscode-tutorial-app-service-extension) for a free account with $200 in Azure credits to try out any combination of services.
 
 You need [Visual Studio Code](https://code.visualstudio.com/) installed along with [Node.js and npm](https://nodejs.org/en/download), the Node.js package manager.
 

articles/app-service/tutorial-javascript-vscode-get-started.md

@@ -5,7 +5,7 @@ services: application-gateway
 author: vhorne
 ms.service: application-gateway
 ms.topic: article
-ms.date: 6/1/2019
+ms.date: 6/5/2019
 ms.author: victorh
 ---
 
@@ -149,7 +149,7 @@ Here are a few scenarios where your current application gateway (Standard) may r
 
   * If you use public IP addresses on your application gateway, you can do a controlled, granular migration using a Traffic Manager profile to incrementally route traffic (weighted traffic routing method) to the new v2 gateway.
 
-    You can do this by adding the DNS labels of both the v1 and v2 application gateways to the Traffic Manager profile, and CNAMEing your custom DNS record (for example, www.contoso.com) to the Traffic Manager domain (for example, contoso.trafficmanager.net).
+    You can do this by adding the DNS labels of both the v1 and v2 application gateways to the [Traffic Manager profile](../traffic-manager/traffic-manager-routing-methods.md#weighted-traffic-routing-method), and CNAMEing your custom DNS record (for example, www.contoso.com) to the Traffic Manager domain (for example, contoso.trafficmanager.net).
   * Or, you can update your custom domain DNS record to point to the DNS label of the new v2 application gateway. Depending on the TTL configured on your DNS record, it may take a while for all your client traffic to migrate to your new v2 gateway.
 * **Your clients connect to the frontend IP address of your application gateway**.
 

articles/application-gateway/migrate-v1-v2.md

@@ -26,7 +26,7 @@ When prompted, choose HTTP trigger, enter `HttpTriggerJS` as the name, and choos
 
 ![Choose Authentication](./media/tutorial-javascript-vscode/create-function-anonymous-auth.png)
 
-Upon completion, a new directory is created within your Function app named `HttpTriggerJS` that includes `index.js`and `functions.json` files. The `index.js` file contains the source code that responds to the HTTP request and `functions.json` contains the [binding configuration](https://docs.microsoft.com/en-us/azure/azure-functions/functions-triggers-bindings) for the HTTP trigger.
+Upon completion, a new directory is created within your Function app named `HttpTriggerJS` that includes `index.js`and `functions.json` files. The `index.js` file contains the source code that responds to the HTTP request and `functions.json` contains the [binding configuration](https://docs.microsoft.com/azure/azure-functions/functions-triggers-bindings) for the HTTP trigger.
 
 ![Completed Project](./media/tutorial-javascript-vscode/functions-vscode-intro.png)