Merge pull request #78625 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 93f6e6f6f33c · 2019-06-04T09:36:34.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/app-service/containers/tutorial-javascript-vscode-create-registry.md b/articles/app-service/containers/tutorial-javascript-vscode-create-registry.md
@@ -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**.
 
diff --git a/articles/app-service/containers/tutorial-javascript-vscode-deploy-container.md b/articles/app-service/containers/tutorial-javascript-vscode-deploy-container.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
 
diff --git a/articles/app-service/containers/tutorial-javascript-vscode-get-started.md b/articles/app-service/containers/tutorial-javascript-vscode-get-started.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).
 
diff --git a/articles/app-service/tutorial-javascript-vscode-deploy-app.md b/articles/app-service/tutorial-javascript-vscode-deploy-app.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.
 
diff --git a/articles/app-service/tutorial-javascript-vscode-get-started.md b/articles/app-service/tutorial-javascript-vscode-get-started.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.
 
diff --git a/articles/azure-functions/tutorial-javascript-vscode-create-app.md b/articles/azure-functions/tutorial-javascript-vscode-create-app.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)
 
diff --git a/articles/azure-functions/tutorial-javascript-vscode-deploy-app.md b/articles/azure-functions/tutorial-javascript-vscode-deploy-app.md
@@ -10,7 +10,7 @@ ms.devlang: javascript
 ---
 # Deploy your App using Azure Functions
 
-If you don't have an Azure account, [sign up today](https://azure.microsoft.com/en-us/free/serverless?utm_source=campaign&utm_campaign=vscode-tutorial-functions-extension&mktingSource=vscode-tutorial-functions-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/serverless?utm_source=campaign&utm_campaign=vscode-tutorial-functions-extension&mktingSource=vscode-tutorial-functions-extension) for a free account with $200 in Azure credits to try out any combination of services.
 
 Once created, sign in to your Azure account - in the Activity Bar, click on the Azure logo to show the **Azure Functions** explorer. Click **Sign in to Azure...** and choose your account in the browser.
 
@@ -29,7 +29,7 @@ From here, follow the prompts. Choose the directory that you currently have open
 
 2. Choose **Create New Resource Group**, type a Resource Group name, like 'myResourceGroup' and press ENTER.
 
-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 **Create New Storage Account**, type a globally unique name of the new storage account used by your function app and press Enter. Storage account names must be between 3 and 24 characters in length and may contain numbers and lowercase letters only.
 
diff --git a/articles/azure-functions/tutorial-javascript-vscode-get-started.md b/articles/azure-functions/tutorial-javascript-vscode-get-started.md
@@ -14,7 +14,7 @@ This tutorial walks you through creating and deploying a JavaScript Azure Functi
 
 ## 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), the Node.js package manager.
 
diff --git a/articles/azure-functions/tutorial-javascript-vscode-run-app.md b/articles/azure-functions/tutorial-javascript-vscode-run-app.md
@@ -20,7 +20,7 @@ The default HTTP template parses a `name` query parameter to customize the respo
 
 ![Hello Matt](./media/tutorial-javascript-vscode/functions-test-local-browser.png)
 
-Now that your Function is running locally, make some changes and set a breakpoint to see how Functions works. Learn more about the bindings that are available on [docs](https://docs.microsoft.com/en-us/azure/azure-functions/functions-triggers-bindings#supported-bindings). Keep in mind that all available bindings will run within the Azure Functions extension. This includes triggers from other services such as Azure Storage, as seen below.
+Now that your Function is running locally, make some changes and set a breakpoint to see how Functions works. Learn more about the bindings that are available on [docs](https://docs.microsoft.com/azure/azure-functions/functions-triggers-bindings#supported-bindings). Keep in mind that all available bindings will run within the Azure Functions extension. This includes triggers from other services such as Azure Storage, as seen below.
 
 ![Functions Debugging](./media/tutorial-javascript-vscode/function-debugging.png)
 
diff --git a/articles/azure-monitor/platform/monitoring-classic-retirement.md b/articles/azure-monitor/platform/monitoring-classic-retirement.md
@@ -16,7 +16,7 @@ Azure Monitor has now become a unified full stack monitoring service, which now
 With the new Azure monitoring and alerting platform in place, we will be retiring the "classic" monitoring and alerting platform  - hosted within *view classic alerts* section of Azure alerts, **will be deprecated by August 2019 in Azure public clouds**. [Azure Government cloud](../../azure-government/documentation-government-welcome.md) will not be affected.
 
 > [!NOTE]
-> Due to delay in roll-out of migration tool, the retirement date for classic alerts migration has been [extended to August 31st, 2019](https://azure.microsoft.com/updates/azure-monitor-classic-alerts-retirement-date-extended-to-august-31st-2019/) from the originally announced date of August 30th, 2019.
+> Due to delay in roll-out of migration tool, the retirement date for classic alerts migration has been [extended to August 31st, 2019](https://azure.microsoft.com/updates/azure-monitor-classic-alerts-retirement-date-extended-to-august-31st-2019/) from the originally announced date of June 30th, 2019.
 
  ![Classic alert in Azure portal](media/monitoring-classic-retirement/monitor-alert-screen2.png) 
 
diff --git a/articles/cognitive-services/QnAMaker/Concepts/best-practices.md b/articles/cognitive-services/QnAMaker/Concepts/best-practices.md
@@ -67,6 +67,9 @@ Make sure you are making the best use of the ranking features QnA Maker supports
 ### Choosing a threshold
 The default confidence score that is used as a threshold is 50, however you can change it for your KB based on your needs. Since every KB is different, you should test and choose the threshold that is best suited for your KB. Read more about the [confidence score](../Concepts/confidence-score.md). 
 
+### Choosing Ranker type
+By default, QnA Maker searches through questions and answers. If you want to search through questions only, to generate an answer, use the `RankerType=QuestionOnly` in the POST body of the GenerateAnswer request.
+
 ### Add alternate questions
 [Alternate questions](../How-To/edit-knowledge-base.md) improve the likelihood of a match with a user query. Alternate questions are useful when there are multiple ways in which the same question may be asked. This can include changes in the sentence structure and word-style.
 
diff --git a/articles/cognitive-services/QnAMaker/How-To/metadata-generateanswer-usage.md b/articles/cognitive-services/QnAMaker/How-To/metadata-generateanswer-usage.md
@@ -115,7 +115,7 @@ A successful response returns a status of 200 and a JSON response.
 |source|The name of the source from which the answer was extracted or saved in the knowledge base.|
 |metadata|The metadata associated with the answer.|
 |metadata.name|Metadata name. (string, max Length: 100, required)|
-|metadata.value: Metadata value. (string, max Length: 100, required)|
+|metadata.value|Metadata value. (string, max Length: 100, required)|
 
 
 ```json
@@ -168,7 +168,7 @@ Since results are required only for the restaurant "Paradise", you can set a fil
 }
 ```
 
-<name="keep-context"></a>
+<a name="keep-context"></a>
 
 ## Use question and answer results to keep conversation context
 
diff --git a/articles/hdinsight/hdinsight-component-versioning.md b/articles/hdinsight/hdinsight-component-versioning.md
@@ -74,7 +74,7 @@ The following table lists the versions of HDInsight that are available in the Az
 | HDInsight version | HDP version | VM OS | Release date | Support expiration date | Retirement date | High availability |  Availability on the Azure portal | 
 | --- | --- | --- | --- | --- | --- | --- | --- |
 | HDInsight 4.0 |HDP 3.0 |Ubuntu 16.0.4 LTS |September 24, 2018 | | |Yes |Yes |
-| HDInsight 3.6 |HDP 2.6 |Ubuntu 16.0.4 LTS |April 4, 2017 | | |Yes |Yes |
+| HDInsight 3.6 |HDP 2.6 |Ubuntu 16.0.4 LTS |April 4, 2017 | June 30th, 2020 |December 31st, 2020 |Yes |Yes |
 
 
 > [!NOTE]  
diff --git a/articles/machine-learning/service/how-to-create-register-datasets.md b/articles/machine-learning/service/how-to-create-register-datasets.md
@@ -36,7 +36,7 @@ To create and work with datasets, you need:
 
 * An Azure subscription. If you don’t have an Azure subscription, create a free account before you begin. Try the [free or paid version of Azure Machine Learning service](https://aka.ms/AMLFree) today.
 
-* An [Azure Machine Learning service workspace Azure Machine Learning service workspace](https://docs.microsoft.com/azure/machine-learning/service/setup-create-workspace)
+* An [Azure Machine Learning service workspace](https://docs.microsoft.com/azure/machine-learning/service/setup-create-workspace)
 
 * The [Azure Machine Learning SDK for Python installed](https://docs.microsoft.com/python/api/overview/azure/ml/install?view=azure-ml-py), which includes the azureml-datasets package.
 
