Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-issue31198

Author: davidsmatlak

articles/ansible/ansible-aks-configure-rbac.md

@@ -151,7 +151,7 @@ subjects:
   name: <your-aad-account>
 ```
 
-Replace the `&lt;your-aad-account>` placeholder with your Azure AD tenant [Object ID](#get-the-azure-ad-object-id).
+Replace the `<your-aad-account>` placeholder with your Azure AD tenant [Object ID](#get-the-azure-ad-object-id).
 
 Save the following playbook - that deploys your new role to AKS - as `aks-kube-deploy.yml`:
 

articles/azure-functions/functions-networking-options.md

@@ -131,7 +131,7 @@ When running in a Premium plan, you can connect non-HTTP trigger functions to se
 You can also enable virtual network triggers using the following Azure CLI command:
 
 ```azurecli-interactive
-az resource update -g <resource_group> -n <premium_plan_name> --set properties.functionsRuntimeScaleMonitoringEnabled=1
+az resource update -g <resource_group> -n <function_app_name>/config/web --set properties.functionsRuntimeScaleMonitoringEnabled=1 --resource-type Microsoft.Web/sites
 ```
 
 Virtual network triggers are supported in version 2.x and above of the Functions runtime. The following non-HTTP trigger types are supported.

articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md

@@ -1,16 +1,8 @@
 ---
 title: "Tutorial: Create, publish, and answer in QnA Maker"
-titleSuffix: Azure Cognitive Services
 description: This tutorial shows how to create a new knowledge base with questions and answers from a public web-based FAQ. Save, train, and publish the knowledge base. After the knowledge base is published, send a question and receive an answer with a cURL command. Then create a bot, and test the bot with the same question.
-services: cognitive-services
-author: diberry
-manager: nitinme
-ms.custom: seodec18
-ms.service: cognitive-services
-ms.subservice: qna-maker
 ms.topic: tutorial
-ms.date: 10/14/2019
-ms.author: diberry
+ms.date: 01/28/2020
 #Customer intent: As an model designer, new to the QnA Maker service, I want to understand all the process requirements to create a knowledge base and generate an answer from that knowledge base.
 ---
 
@@ -41,7 +33,8 @@ This tutorial requires an existing [QnA Maker service](../How-To/set-up-qnamaker
 
 1. Select **Create a knowledge base** from the top menu.
 
-    ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-1.png)
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-1.png)
 
 1. Skip the first step, because you will use your existing QnA Maker service.
 
@@ -52,32 +45,40 @@ This tutorial requires an existing [QnA Maker service](../How-To/set-up-qnamaker
     |Microsoft Azure Directory ID|This ID is associated with the account you use to sign into the Azure portal and the QnA Maker portal. |
     |Azure Subscription name|The billing account in which you created the QnA Maker resource.|
     |Azure QnA Service|Your existing QnA Maker resource.|
+    |Language|Language used for all knowledge bases in service. Do not mix languages in a single resource. That will harm answer quality.|
 
-    ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-2.png)
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-2.png)
 
 1. Enter your knowledge base name, `My Tutorial kb`.
 
-    ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-3.png)
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-3.png)
 
 1. Populate your knowledge base with the following settings:
 
     |Setting name|Setting value|Purpose|
     |--|--|--|
+    |Enable multi-turn extraction|Checked|Allows for follow-up prompts.|
+    |Default answer text|`No good answer was found.`|Returned when there is no match to the question.|
     |URL|`https://docs.microsoft.com/azure/cognitive-services/qnamaker/faqs` |The contents of the FAQ at that URL are formatted with a question followed by an answer. QnA Maker can interpret this format to extract questions and the associated answers.|
     |File |_not used in this tutorial_|This uploads files for questions and answers. |
     |Chit-chat personality|Friendly|This gives a friendly and casual [personality](../Concepts/best-practices.md#chit-chat) to common questions and answers. You can edit these questions and answers later. |
 
-    ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-4.png)
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-4.png)
 
 1. Select **Create your KB** to finish the creation process.
 
-    ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-5.png)
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-5.png)
 
 ## Review, save, and train the knowledge base
 
 1. Review the questions and answers. The first page is questions and answers from the URL.
 
-    ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/save-and-train-kb.png)
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of QnA Maker portal](../media/qnamaker-tutorial-create-publish-query-in-portal/save-and-train-kb.png)
 
 1. Select the last page of questions and answers from the bottom of the table. The page shows questions and answers from the Chit-chat personality.
 

articles/cognitive-services/QnAMaker/media/qnamaker-tutorial-create-publish-query-in-portal/create-kb-step-1.png

@@ -11,7 +11,7 @@ ms.author: banders
 
 # What are Azure Reservations?
 
-Azure Reservations help you save money by committing to one-year or three-years plans for virtual machines, Azure Blob storage or Azure Data Lake Storage Gen2, SQL Database compute capacity, Azure Cosmos DB throughput, or other Azure resources. Committing allows you to get a discount on the resources you use. Reservations can significantly reduce your resource costs up to 72% on pay-as-you-go prices. Reservations provide a billing discount and don't affect the runtime state of your resources.
+Azure Reservations help you save money by committing to one-year or three-years plans for virtual machines, Azure Blob storage or Azure Data Lake Storage Gen2, SQL Database compute capacity, Azure Disk Storage, Azure Cosmos DB throughput, or other Azure resources. Committing allows you to get a discount on the resources you use. Reservations can significantly reduce your resource costs up to 72% on pay-as-you-go prices. Reservations provide a billing discount and don't affect the runtime state of your resources.
 
 You can pay for a reservation up front or monthly. The total cost of up-front and monthly reservations is the same and you don't pay any extra fees when you choose to pay monthly. Monthly payment is available for Azure reservations, not third party products.
 
@@ -27,6 +27,7 @@ Service plans:
 
 - **Reserved Virtual Machine Instance** - A reservation only covers the virtual machine compute costs. It doesn't cover additional software, networking, or storage charges.
 - **Azure Storage reserved capacity** - A reservation covers storage capacity for standard storage accounts for Blob storage or Azure Data Lake Gen2 storage. The reservation does not cover bandwidth or transaction rates.
+- **Azure Disk Storage reservations** - A reservation only covers premium SSDs of P30 size or greater. It does not cover any other disk types or sizes smaller than P30.
 - **Azure Cosmos DB reserved capacity** - A reservation covers throughput provisioned for your resources. It doesn't cover the storage and networking charges.
 - **SQL Database reserved vCore** - Only the compute costs are included with a reservation. The license is billed separately.
 - **SQL Data Warehouse** - A reservation covers cDWU usage. It doesn't cover storage or networking charges associated with the SQL Data Warehouse usage.
@@ -35,7 +36,6 @@ Service plans:
 - Azure Database for PostgreSQL
 - Azure Database for MariaDB
 - Azure Data Explorer
-- Premium SSD Managed Disks
 
 
 For Windows virtual machines and SQL Database, you can cover the licensing costs with [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/).