Merge pull request #96885 from diberry/diberry/1121-qna-fresh-postman

[Cogsvcs] QnA Maker - qs - postman - curl

Author: Jak-MS

.openpublishing.redirection.json

@@ -532,6 +532,16 @@
       "redirect_url": "/azure/machine-learning",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-postman.md",
+      "redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-curl.md",
+      "redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
+      "redirect_document_id": false
+    }, 
     {
       "source_path": "articles/cognitive-services/LUIS/luis-how-to-add-example-utterances.md",
       "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",

articles/cognitive-services/QnAMaker/How-To/metadata-generateanswer-usage.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: qna-maker
 ms.topic: conceptual
-ms.date: 10/12/2019
+ms.date: 11/22/2019
 ms.author: diberry
 ---
 
@@ -252,7 +252,7 @@ You can search through the published kb, using `isTest=false`, or in the test kb
 
 ## Next steps
 
-The **Publish** page also provides information to generate an answer with [Postman](../Quickstarts/get-answer-from-kb-using-postman.md) and [cURL](../Quickstarts/get-answer-from-kb-using-curl.md). 
+The **Publish** page also provides information to [generate an answer](../Quickstarts/get-answer-from-knowledge-base-using-url-tool.md) with Postman or cURL.
 
 > [!div class="nextstepaction"]
 > [Create a knowledge base bot](../tutorials/integrate-qnamaker-luis.md)

articles/cognitive-services/QnAMaker/Overview/overview.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: qna-maker
 ms.topic: overview
-ms.date: 08/01/2019
+ms.date: 11/22/2019
 ms.author: diberry
 #customer intent: As a developer, I want to know how to use QnA Maker for my FAQs and product manuals so that I can enable conversational question and answer sessions for my customers.
 ---
@@ -77,7 +77,7 @@ QnA Maker provides authoring, training, and publishing along with collaboration
 
 **Step 2**: Create a knowledge base in the [QnA Maker](https://www.qnamaker.ai) portal. Add [files and URLs](../concepts/data-sources-supported.md) to create the knowledge base.  
 
-**Step 3**: Publish your knowledge base and test from your custom endpoint using [cURL](../quickstarts/get-answer-from-kb-using-curl.md) or [Postman](../quickstarts/get-answer-from-kb-using-postman.md). 
+**Step 3**: Publish your knowledge base and test from your custom endpoint using [cURL or Postman](../Quickstarts/get-answer-from-knowledge-base-using-url-tool.md). 
 
 **Step 4**: From your client application, programmatically call your knowledge base's endpoint and read the JSON response show the best answer to the user.  
 

articles/cognitive-services/QnAMaker/Quickstarts/add-question-metadata-portal.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: qna-maker
 ms.topic: quickstart
-ms.date: 10/01/2019
+ms.date: 11/22/2019
 ms.author: diberry
 ---
 
@@ -171,4 +171,4 @@ If you want to clean up and remove a Cognitive Services subscription, you can de
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Get answer with Postman](get-answer-from-kb-using-postman.md)
+> [Get answer with Postman or cURL](get-answer-from-knowledge-base-using-url-tool.md)

articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool.md

@@ -0,0 +1,34 @@
+---
+title: "Quickstart: Use URL tool to get answer from knowledge base - QnA Maker"
+titleSuffix: Azure Cognitive Services 
+description: This quickstart walks you through getting an answer from your knowledge base using a URL test tool such as cURL or Postman.
+services: cognitive-services
+author: diberry
+manager: nitinme
+ms.service: cognitive-services
+ms.subservice: qna-maker
+zone_pivot_groups: URL-test-interface
+ms.topic: quickstart
+ms.date: 11/21/2019
+ms.author: diberry
+#Customer intent: As an knowledge base manager new to the QnA Maker service, I want to get an answer from a published knowledge base using a URL tool such as Postman or cURL. 
+---
+
+# Quickstart: Get an answer from knowledge base
+
+::: zone pivot="url-test-tool-curl"
+
+[!INCLUDE [Get answer using cURL](../includes/quickstart-test-tool-curl.md)]
+
+::: zone-end
+
+::: zone pivot="url-test-tool-postman"
+
+[!INCLUDE [Get answer using Postman](../includes/quickstart-test-tool-Postman.md)]
+
+::: zone-end
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Use metadata while generating an answer](create-new-kb-csharp.md)

articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-curl.md renamed to articles/cognitive-services/QnAMaker/includes/quickstart-test-tool-curl.md

@@ -1,19 +1,17 @@
 ---
-title: "Quickstart: Use cURL to get answer from knowledge base - QnA Maker"
-titleSuffix: Azure Cognitive Services
-description: This quickstart walks you through getting an answer from your knowledge base using cURL.
+title: include file
+description: include file 
 services: cognitive-services
 author: diberry
 manager: nitinme
 ms.service: cognitive-services
-ms.subservice: qna-maker
-ms.topic: quickstart
-ms.date: 10/01/2019
+ms.subservice: luis
+ms.topic: include
+ms.custom: include file
+ms.date: 11/20/2019
 ms.author: diberry
 ---
 
-# Quickstart: Get answer from knowledge base using cURL
-
 This cURL-based quickstart walks you through getting an answer from your knowledge base.
 
 ## Prerequisites
@@ -70,9 +68,4 @@ If you want to get an answer from the staging endpoint, use the `isTest` body pr
 isTest:true
 ```
 
-## Next steps
-
-The publish page also provides information to [generate an answer](get-answer-from-kb-using-postman.md) with Postman. 
 
-> [!div class="nextstepaction"]
-> [Use metadata while generating an answer](../How-to/metadata-generateanswer-usage.md)

articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-postman.md renamed to articles/cognitive-services/QnAMaker/includes/quickstart-test-tool-postman.md

@@ -1,21 +1,17 @@
 ---
-title: "Quickstart: Use Postman to get answer from knowledge base - QnA Maker"
-titleSuffix: Azure Cognitive Services 
-description: This quickstart walks you through getting an answer from your knowledge base using Postman.
+title: include file
+description: include file 
 services: cognitive-services
 author: diberry
 manager: nitinme
-
 ms.service: cognitive-services
-ms.subservice: qna-maker
-ms.topic: quickstart
-ms.date: 01/01/2019
+ms.subservice: luis
+ms.topic: include
+ms.custom: include file
+ms.date: 11/20/2019
 ms.author: diberry
-#Customer intent: As an knowledge base manager new to the QnA Maker service, I want to get an answer from a published knowledge base using Postman. 
 ---
 
-# Quickstart: Get an answer from knowledge base using Postman
-
 This Postman-based quickstart walks you through getting an answer from your knowledge base.
 
 ## Prerequisites
@@ -69,10 +65,3 @@ To generate an answer with Postman, complete the following steps:
 ## Use staging endpoint
 
 If you want to get an answer from the staging endpoint, append the URL with the `isTest` body property.
-
-## Next steps
-
-The publish page also provides information to [generate an answer](get-answer-from-kb-using-curl.md) with cURL. 
-
-> [!div class="nextstepaction"]
-> [Use metadata while generating an answer](../How-to/metadata-generateanswer-usage.md)

articles/cognitive-services/QnAMaker/index.yml

@@ -64,10 +64,8 @@ landingContent:
     linkLists:
       - linkListType: get-started
         links:
-          - text: "Quickstart: Using Postman"
-            url: quickstarts/get-answer-from-kb-using-postman.md
-          - text: "Quickstart: Using cURL"
-            url: quickstarts/get-answer-from-kb-using-curl.md  
+          - text: "Quickstart: With Postman or cURL"
+            url: quickstarts/get-answer-from-knowledge-base-using-url-tool.md
           - text: "Quickstart: Using REST and C#"
             url: quickstarts/get-answer-from-knowledge-base-csharp.md     
           - text: "Quickstart: Using NuGet and C#"

articles/cognitive-services/QnAMaker/toc.yml

@@ -12,12 +12,8 @@
     href: quickstarts/create-publish-knowledge-base.md
   - name: Add questions with metadata
     href: quickstarts/add-question-metadata-portal.md
-  - name: Get answer
-    items:
-    - name: Using Postman
-      href: Quickstarts/get-answer-from-kb-using-postman.md
-    - name: Using cURL
-      href: Quickstarts/get-answer-from-kb-using-cURL.md  
+  - name: Get answer with Postman or cURL
+    href: Quickstarts/get-answer-from-knowledge-base-using-url-tool.md  
   - name: Using REST APIs
     items:
     - name: Create a new knowledge base

articles/cognitive-services/authentication.md

@@ -7,7 +7,7 @@ author: erhopf
 manager: nitinme
 ms.service: cognitive-services
 ms.topic: conceptual
-ms.date: 07/24/2019
+ms.date: 11/22/2019
 ms.author: erhopf
 ---
 
@@ -114,7 +114,7 @@ Some Azure Cognitive Services accept, and in some cases require, an authenticati
 * Speech Services: Text-to-speech REST API
 
 >[!NOTE]
-> QnA Maker also uses the Authorization header, but requires an endpoint key. For more information, see [QnA Maker: Get answer from knowledge base](./qnamaker/quickstarts/get-answer-from-kb-using-curl.md).
+> QnA Maker also uses the Authorization header, but requires an endpoint key. For more information, see [QnA Maker: Get answer from knowledge base](./qnamaker/quickstarts/get-answer-from-knowledge-base-using-url-tool.md).
 
 >[!WARNING]
 > The services that support authentication tokens may change over time, please check the API reference for a service before using this authentication method.