Merge pull request #107973 from diberry/diberry/0317-qna-rich-text-only

[Cogsvcs] Post keynote - QnA Maker - rich-text editing (only)

Author: v-albemi

articles/cognitive-services/QnAMaker/How-To/add-sharepoint-datasources.md

@@ -27,7 +27,7 @@ You can add all QnA Maker-supported [file types](../Concepts/content-types.md) f
 
    ![Get the SharePoint file URL by selecting the file's ellipsis menu then copying the URL.](../media/add-sharepoint-datasources/get-sharepoint-file-url.png)
 
-1. In the QnA Maker portal, on the **Settings** page, [add the URL](manage-knowledge-bases.md#edit-knowledge-base) to the knowledge base.
+1. In the QnA Maker portal, on the **Settings** page, add the URL to the knowledge base.
 
 ### Images with SharePoint files
 

articles/cognitive-services/QnAMaker/How-To/edit-knowledge-base.md

@@ -2,31 +2,77 @@
 title: Edit a knowledge base - QnA Maker
 description: QnA Maker allows you to manage the content of your knowledge base by providing an easy-to-use editing experience.
 ms.topic: conceptual
-ms.date: 04/06/2020
+ms.date: 04/15/2020
 ---
-
 # Edit QnA pairs in your knowledge base
 
 QnA Maker allows you to manage the content of your knowledge base by providing an easy-to-use editing experience.
 
 QnA pairs are added from a datasource, such as a file or URL, or added as an editorial source. An editorial source indicates the QnA pair was added in the QnA portal manually. All QnA pairs are available for editing.
 
+<a name="add-an-editorial-qna-set"></a>
+
 ## Add an editorial QnA pair
+
 1. Sign in to the [QnA portal](https://www.qnamaker.ai/), then select the knowledge base to add the QnA pair to.
 1. On the **EDIT** page of the knowledge base, select **Add QnA pair** to add a new QnA pair.
 
-1. In the new QnA pair row, add the required **Question** and **Answer** fields. The other fields are optional. All fields can be changed at any time.
+    > [!div class="mx-imgBorder"]
+    > ![Add QnA pair](../media/qnamaker-how-to-edit-kb/add-qnapair.png)
 
-1. Optionally, add **alternate phrasing**. Alternate phrasing is any form of the question that is significantly different from the original question but should provide the same answer.
+1. In the new QnA pair row, add the required question and answer fields. The other fields are optional. All fields can be changed at any time.
+
+1. Optionally, add **[alternate phrasing](../Quickstarts/add-question-metadata-portal.md#add-additional-alternatively-phrased-questions)**. Alternate phrasing is any form of the question that is significantly different from the original question but should provide the same answer.
 
     When your knowledge base is published, and you have [active learning](use-active-learning.md) turned on, QnA Maker collects alternate phrasing choices for you to accept. These choices are selected in order to increase the prediction accuracy.
 
-1. Optionally, add **metadata**. To view metadata, select **View options** in the context menu. Metadata provides filters to the answers that the client application, such as a chat bot, provides.
+1. Optionally, add **[metadata](../Quickstarts/add-question-metadata-portal.md#add-metadata-to-filter-the-answers)**. To view metadata, select **View options** in the context menu. Metadata provides filters to the answers that the client application, such as a chat bot, provides.
 
-1. Optionally, add **follow-up prompts**. Follow-up prompts provide additional conversation paths to the client application to present to the user.
+1. Optionally, add **[follow-up prompts](multiturn-conversation.md)**. Follow-up prompts provide additional conversation paths to the client application to present to the user.
 
 1. Select **Save and train** to see predictions including the new QnA pair.
 
+## Rich-text editing for answer
+
+Rich-text editing of your answer text gives you markdown styling from a simple toolbar.
+
+1. Select the text area for an answer, the rich-text editor toolbar displays on the QnA pair row.
+
+    > [!div class="mx-imgBorder"]
+    > ![Screenshot of the rich-text editor with the question and answer of a QnA pair row.](../media/qnamaker-how-to-edit-kb/rich-text-control-qna-pair-row.png)
+
+    Any text already in the answer displays correctly as your user will see it from a bot.
+
+1. Edit the text. Select formatting features from the rich-text editing toolbar or use the toggle feature to switch to markdown syntax.
+
+    > [!div class="mx-imgBorder"]
+    > ![Use the rich-text editor to write and format text and save as markdown.](../media/qnamaker-how-to-edit-kb/rich-text-display-image.png)
+
+    |Rich-text editor features|Keyboard shortcut|
+    |--|--|
+    |Toggle between rich-text editor and markdown. `</>`|CTRL+M|
+    |Bold. **B**|CTR+LB|
+    |Italics, indicated with an italicized **_I_**|CTRL+I|
+    |Unordered list||
+    |Ordered list||
+    |Paragraph style||
+    |Image - add an image available from a public URL.|CTRL+G|
+    |Add link to publicly available URL.|CTRL+K|
+    |Emoticon - add from a selection of emoticons.|CTRL+E|
+    |Advanced menu - undo|CTRL+Z|
+    |Advanced menu - redo|CTRL+Y|
+
+1. Add an image to the answer using the Image icon in the rich-text toolbar. The in-place editor needs the publicly accessible image URL and the alternate text for the image.
+
+
+    > [!div class="mx-imgBorder"]
+    > ![Use the rich-text editor add a publicly accessible image and its ALT text.](../media/qnamaker-how-to-edit-kb/add-image-url-alternate-text.png)
+
+1. Add a link to a URL by either selecting the text in the answer, then selecting the Link icon in the toolbar or by selecting the Link icon in the toolbar then entering new text and the URL.
+
+    > [!div class="mx-imgBorder"]
+    > ![Use the rich-text editor add a publicly accessible image and its ALT text.](../media/qnamaker-how-to-edit-kb/add-link-to-answer-rich-text-editor.png)
+
 ## Edit a QnA pair
 
 Any field in any QnA pair can be edited, regardless of the original data source. Some fields may not be visible due to your current **View Options** settings, found in the context tool bar.
@@ -66,9 +112,15 @@ Periodically select **Save and train** after making edits to avoid losing change
 
 ![Add Metadata](../media/qnamaker-how-to-edit-kb/add-metadata.png)
 
+## When to use rich-text editing versus markdown
+
+[Rich-text editing](#add-an-editorial-qna-set) of answers allows you, as the author, to use a formatting toolbar to quickly select and format text.
+
+[Markdown](../reference-markdown-format.md) is a better tool when you need to autogenerate content to create knowledge bases to be imported as part of a CI/CD pipeline or for [batch testing](../Quickstarts/batch-testing.md).
+
 ## Next steps
 
 > [!div class="nextstepaction"]
 > [Collaborate on a knowledge base](./collaborate-knowledge-base.md)
 
-* [Manage Azure resources used by QnA Maker](set-up-qnamaker-service-azure.md)
+* [Manage Azure resources used by QnA Maker](set-up-qnamaker-service-azure.md)

articles/cognitive-services/QnAMaker/media/qnamaker-how-to-edit-kb/add-image-url-alternate-text.png

@@ -2,7 +2,7 @@
 title: Markdown format - QnA Maker
 description: Following is the list of markdown formats that you can use in QnA Maker's answer text.
 ms.topic: reference
-ms.date: 01/09/2020
+ms.date: 03/19/2020
 ---
 
 # Markdown format supported in QnA Maker answer text
@@ -11,6 +11,12 @@ QnA Maker stores answer text as markdown. There are many flavors of markdown. In
 
 Use the **[CommonMark](https://commonmark.org/help/tutorial/index.html)** tutorial to validate your Markdown. The tutorial has a **Try it** feature for quick copy/paste validation.
 
+## When to use rich-text editing versus markdown
+
+[Rich-text editing](How-To/edit-knowledge-base.md#add-an-editorial-qna-set) of answers allows you, as the author, to use a formatting toolbar to quickly select and format text.
+
+Markdown is a better tool when you need to autogenerate content to create knowledge bases to be imported as part of a CI/CD pipeline or for [batch testing](Quickstarts/batch-testing.md).
+
 ## Supported markdown format
 
 Following is the list of markdown formats that you can use in QnA Maker's answer text.