Incorporate fixes from bot-docs PRs. (#2543)

* Incorporate fixes from bot-docs PRs. * Finish porting majority of public PRs to the private repo.
MicrosoftDocs · openpublishbuild · Nov 24, 2020 · Nov 24, 2020 · Nov 25, 2020 · Nov 25, 2020
commit cf132ae4cfeb9f7ed99bd47973b70f1ee1c0d357
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -1,4 +1,5 @@
 {
+  "xref_query_tags": ["/dotnet", "/uwp/api"],
   "docsets_to_publish": [
     {
       "docset_name": "bot-framework",
@@ -108,18 +109,6 @@
       "version": "latest"
     }
   ],
-  "ECMA2Yaml": {
-    "SourceXmlFolder": "dotnet/xml",
-    "OutputYamlFolder": "dotnet/api",
-    "Flatten": true,
-    "SDPMode": true
-  },
-  "DiffFolder": [
-    "dotnet/api"
-  ],
-  "SplitTOC": [
-    "dotnet/api/toc.yml"
-  ],
   "docs_build_engine": {
     "name": "docfx_v3"
   }

diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -2082,6 +2082,11 @@
       "redirect_url": "api/conversations",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/v4sdk/bot-builder-dialogs-greeting.md",
+      "redirect_url": "/azure/bot-service/bot-builder-send-welcome-message",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/v4sdk/bot-builder-tutorial-basic-deploy.md",
       "redirect_url": "/azure/bot-service/bot-builder-tutorial-create-basic-bot",

diff --git a/articles/bot-service-build-continuous-deployment.md b/articles/bot-service-build-continuous-deployment.md
@@ -38,7 +38,7 @@ To enable continuous deployment with GitHub, navigate to the **App Service** pag
 
 1. Click **Deployment Center** > **GitHub** > **Authorize**.
 
-   ![Continous deployment](~/media/azure-bot-build/azure-deployment.png)
+   ![Continuos deployment](~/media/azure-bot-build/azure-deployment.png)
 
    1. In the browser window that opens up, click **Authorize AzureAppService**.
 

diff --git a/articles/bot-service-channel-connect-twilio.md b/articles/bot-service-channel-connect-twilio.md
@@ -68,7 +68,7 @@ When you have completed these steps, your bot will be successfully configured to
 As well as the channel available in the Azure Bot Service to connect your bot with Twilio, you can also use the Twilio adapter. In this article you will learn how to connect a bot to Twilio using the adapter.  This article will walk you through modifying the EchoBot sample to connect it to Twilio.
 
 > [!NOTE]
-> The instructions below cover the C# implementation of the Twilio adapter. For instructions on using the JS adapter, part of the BotKit libraries, [see the BotKit Twilio documentation](https://botkit.ai/docs/v4/platforms/twilio.html).
+> The instructions below cover the C# implementation of the Twilio adapter. For instructions on using the JS adapter, part of the BotKit libraries, [see the BotKit Twilio documentation](https://botkit.ai/docs/v4/platforms/twilio-sms.html).
 
 ### Prerequisites
 

diff --git a/articles/bot-service-troubleshoot-500-errors.md b/articles/bot-service-troubleshoot-500-errors.md
@@ -25,7 +25,7 @@ For AppInsights samples, see the luis-with-appinsights [C# sample](https://aka.m
 
 See [conversation analytics telemetry](./v4sdk/bot-builder-telemetry.md) for information about how to add Application Insights to an existing bot.
 
-## Enable Application Insights on ASP.Net
+## Enable Application Insights on ASP.NET
 
 For basic Application Insights support, see how to [set up Application Insights for your ASP.NET website](https://docs.microsoft.com/azure/application-insights/app-insights-asp-net). The Bot Framework (starting with v4.2) provides an additional level of Application Insights telemetry, but it is not required for diagnosing HTTP 500 errors.
 
@@ -148,7 +148,7 @@ Ensure there's an Application Insights key included in your config file.
 
 ### Check logs
 
-Bot ASP.Net and Node will emit logs at the server level that can be inspected.
+Bot ASP.NET and Node will emit logs at the server level that can be inspected.
 
 #### Set up a browser to watch your logs
 

diff --git a/articles/bot-service-troubleshoot-index.md b/articles/bot-service-troubleshoot-index.md
@@ -54,7 +54,7 @@ In case you don't find the answer you're looking for, you can post your question
 
 ## HTTP 500 Errors
 
-- [Enable Application Insights on ASP.Net](bot-service-troubleshoot-500-errors.md#enable-application-insights-on-aspnet)
+- [Enable Application Insights on ASP.NET](bot-service-troubleshoot-500-errors.md#enable-application-insights-on-aspnet)
 - [Enable Application Insights on Node.js](bot-service-troubleshoot-500-errors.md#enable-application-insights-on-nodejs)
 - [Query for exceptions](bot-service-troubleshoot-500-errors.md#query-for-exceptions)
 - [No Application Insights events](bot-service-troubleshoot-500-errors.md#no-application-insights-events)

diff --git a/articles/includes/deploy/snippet-ARM-existing-resource-group.md b/articles/includes/deploy/snippet-ARM-existing-resource-group.md
@@ -32,9 +32,9 @@ az deployment group create --resource-group "<name-of-resource-group>" --templat
 | location |Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`. |
 | parameters | Deployment parameters, provided as a list of key=value pairs. Enter the following parameter values:
 
-- `appId` - The `appId` value generated by the [3.1 create the application registration](https://docs.microsoft.com/azure/bot-service/bot-builder-deploy-az-cli?view=azure-bot-service-4.0&tabs=csharp#3-create-the-application-registration) step.
-- `appSecret` - The password you provided in the the [3.1 create the application registration](https://docs.microsoft.com/azure/bot-service/bot-builder-deploy-az-cli?view=azure-bot-service-4.0&tabs=csharp#3-create-the-application-registration) step.
+- `appId` - The `appId` value generated by the [3.1 create the application registration](../../bot-builder-deploy-az-cli.md#3-create-the-application-registration) step.
+- `appSecret` - The password you provided in the the [3.1 create the application registration](../../bot-builder-deploy-az-cli.md#3-create-the-application-registration) step.
 - `botId` - A name for the  Bot Channels Registration resource to create. It must be globally unique. It is used as the immutable bot ID. It is also used as the default display name, which is mutable.
 - `newWebAppName` - A name for the bot application service.
 - `newAppServicePlanName` - A name for the application service plan resource to create.
-- `newAppServicePlanLocation` - The location of the application service plan.
+- `appServicePlanLocation` - The location of the application service plan.
diff --git a/articles/rest-api/bot-framework-rest-connector-add-input-hints.md b/articles/rest-api/bot-framework-rest-connector-add-input-hints.md
@@ -1,6 +1,6 @@
 ---
 title: Add input hints to messages - Bot Service
-description: Learn how to add input hints to bot messages. See how to use the Bot Connector service to specify whether a bot is accepting, expecting, or ignoring user input.
+description: Learn how to add input hints to bot messages. See how to use the Bot Framework Connector service to specify whether a bot is accepting, expecting, or ignoring user input.
 author: RobStand
 ms.author: kamrani
 manager: kamrani
@@ -15,7 +15,7 @@ By specifying an input hint for a message, you can indicate whether your bot is
 
 ## Accepting input
 
-To indicate that your bot is passively ready for input but is not awaiting a response from the user, set the `inputHint` property to **acceptingInput** within the [Activity][] object that represents your message. On many channels, this will cause the client's input box to be enabled and microphone to be closed, but still accessible to the user. For example, Cortana will open the microphone to accept input from the user if the user holds down the microphone button. 
+To indicate that your bot is passively ready for input but is not awaiting a response from the user, set the `inputHint` property to **acceptingInput** within the [Activity][] object that represents your message. On many channels, this will cause the client's input box to be enabled and microphone to be closed, but still accessible to the user. For example, Cortana will open the microphone to accept input from the user if the user holds down the microphone button.
 
 The following example shows a request that sends a message and specifies that the bot is accepting input. In this example request, Direct Line represents the base URI; the base URI for requests that your bot issues may be different. For details about setting the base URI, see [API Reference](bot-framework-rest-connector-api-reference.md#base-uri).
 
@@ -48,7 +48,7 @@ Content-Type: application/json
 
 ## Expecting input
 
-To indicate that your bot is actively awaiting a response from the user, set the `inputHint` property to **expectingInput** within the [Activity][] object that represents your message. On channels that support it, this will cause the client's input box to be enabled and microphone to be open. 
+To indicate that your bot is actively awaiting a response from the user, set the `inputHint` property to **expectingInput** within the [Activity][] object that represents your message. On channels that support it, this will cause the client's input box to be enabled and microphone to be open.
 
 The following example shows a request that sends a message and specifies that the bot is expecting input. In this example request, Direct Line represents the base URI; the base URI for requests that your bot issues may be different. For details about setting the base URI, see [API Reference](bot-framework-rest-connector-api-reference.md#base-uri).
 
@@ -80,8 +80,8 @@ Content-Type: application/json
 ```
 
 ## Ignoring input
- 
-To indicate that your bot is not ready to receive input from the user, set the `inputHint` property to **ignoringInput** within the [Activity][] object that represents your message. On channels that support it, this will cause the client's input box to be disabled and microphone to be closed. 
+
+To indicate that your bot is not ready to receive input from the user, set the `inputHint` property to **ignoringInput** within the [Activity][] object that represents your message. On channels that support it, this will cause the client's input box to be disabled and microphone to be closed.
 
 The following example shows a request that sends a message and specifies that the bot is ignoring input. In this example request, Direct Line represents the base URI; the base URI for requests that your bot issues may be different. For details about setting the base URI, see [API Reference](bot-framework-rest-connector-api-reference.md#base-uri).
 

diff --git a/articles/rest-api/bot-framework-rest-connector-concepts.md b/articles/rest-api/bot-framework-rest-connector-concepts.md
@@ -1,6 +1,6 @@
 ---
 title: Key concepts in the Bot Connector and Bot State services - Bot Service
-description: Understand key concepts in the Bot Framework's Bot Connector service and Bot State service. 
+description: Understand key concepts in the Bot Framework Connector service and Bot State service. 
 author: RobStand
 ms.author: kamrani
 manager: kamrani
@@ -15,34 +15,34 @@ Bot Framework and the Azure Bot service allow your bot to communicate with users
 
 ## Bot Framework Channels
 
-Bot Framework Channels enable your bot to exchange messages with channels configured in the [Azure Portal](https://portal.azure.com). It uses industry-standard REST and JSON over HTTPS and enables authentication with JWT Bearer tokens. For detailed information about how to use the Bot Connector service, see [Authentication](bot-framework-rest-connector-authentication.md) and the remaining articles in this section.
+Bot Framework channels enable your bot to exchange messages with channels configured in the [Azure Portal](https://portal.azure.com). It uses industry-standard REST and JSON over HTTPS and enables authentication with JWT Bearer tokens. For detailed information about how to use the Bot Connector service, see [Authentication](bot-framework-rest-connector-authentication.md) and the remaining articles in this section.
 
 ### Activity
 
-The Bot Connector service exchanges information between between bot and channel (user) by passing an [Activity][Activity] object. The most common type of activity is **message**, but there are other activity types that can be used to communicate various types of information to a bot or channel. For details about Activities in the Bot Connector service, see [Activities overview](https://aka.ms/botSpecs-activitySchema).
+The Connector service exchanges information between between bot and channel (user) by passing an [Activity][Activity] object. The most common type of activity is **message**, but there are other activity types that can be used to communicate various types of information to a bot or channel. For details about Activities in the Bot Connector service, see [Activities overview](https://aka.ms/botSpecs-activitySchema).
 
 ## Authentication
 
-Bot Framework Services use JWT Bearer tokens for authentication. For detailed information about how to authenticate outbound requests that your bot sends to the Bot Framework, how to authenticate inbound requests that your bot receives from the Bot Framework, and more, see [Authentication](bot-framework-rest-connector-authentication.md). 
+Bot Framework Services use JWT Bearer tokens for authentication. For detailed information about how to authenticate outbound requests that your bot sends to the Bot Framework, how to authenticate inbound requests that your bot receives from the Bot Framework, and more, see [Authentication](bot-framework-rest-connector-authentication.md).
 
 ## Client libraries
 
 The Bot Framework provides client libraries that can be used to build bots in either C#, JavaScript, and Python.
 
-- To build a bot using C#, use the [Bot Framework SDK for C#](../dotnet/bot-builder-dotnet-overview.md). 
-- To build a bot using Node.js, use the [Bot Framework SDK for Node.js](../nodejs/index.md). 
+- To build a bot using C#, use the [Bot Framework SDK for C#](../dotnet/bot-builder-dotnet-overview.md).
+- To build a bot using Node.js, use the [Bot Framework SDK for Node.js](../nodejs/index.md).
 
-In addition to simplifying calls to Bot Framework REST APIs, each Bot Framework SDK also provides a powerful system for building dialogs that encapsulate conversational logic, built-in prompts for simple things such as Yes/No, strings, numbers, and enumerations, built-in support for powerful AI frameworks such as <a href="https://www.luis.ai/" target="_blank">LUIS</a>, and more. 
+In addition to simplifying calls to Bot Framework REST APIs, each Bot Framework SDK also provides a powerful system for building dialogs that encapsulate conversational logic, built-in prompts for simple things such as Yes/No, strings, numbers, and enumerations, built-in support for powerful AI frameworks such as [LUIS](https://www.luis.ai/), and more.
 
 > [!NOTE]
-> As an alternative to using the SDK, you can generate your own client library in the language of your choice by using the <a href="https://aka.ms/connector-swagger-file" target="_blank">Bot Connector Swagger file</a> or code direct to its REST API.
+> As an alternative to using the SDK, you can generate your own client library in the language of your choice by using the [Bot Connector Swagger file](https://aka.ms/connector-swagger-file) or code direct to its REST API.
 
 ## Bot State service
 
 The Microsoft Bot Framework State service is retired as of March 30, 2018. Previously, bots built on the Azure Bot Service or the Bot Builder SDK had a default connection to this service hosted by Microsoft to store bot state data. Bots will need to be updated to use their own state storage.
 
 ## Additional resources
 
-Learn more about building bots using the Bot Connector service by reviewing articles throughout this section, beginning with [Authentication](bot-framework-rest-connector-authentication.md). If you encounter problems or have suggestions regarding the Bot Connector service, see [Support](../bot-service-resources-links-help.md) for a list of available resources. 
+Learn more about building bots using the Connector service by reviewing articles throughout this section, beginning with [Authentication](bot-framework-rest-connector-authentication.md). If you encounter problems or have suggestions regarding the Connector service, see [Support](../bot-service-resources-links-help.md) for a list of available resources.
 
 [Activity]: bot-framework-rest-connector-api-reference.md#activity-object
diff --git a/articles/rest-api/bot-framework-rest-direct-line-3-0-concepts.md b/articles/rest-api/bot-framework-rest-direct-line-3-0-concepts.md
@@ -11,7 +11,7 @@ ms.date: 01/06/2019
 
 # Key concepts in Direct Line API 3.0
 
-You can enable communication between your bot and your own client application by using the Direct Line API. This article introduces key concepts in Direct Line API 3.0 and provides information about relevant developer resources. You can build a client using the SDK, REST API, or Web Chat. 
+You can enable communication between your bot and your own client application by using the Direct Line API. This article introduces key concepts in Direct Line API 3.0 and provides information about relevant developer resources. You can build a client using the SDK, REST API, or Web Chat.
 
 ## Authentication
 

diff --git a/articles/rest-api/bot-framework-rest-direct-line-3-0-end-conversation.md b/articles/rest-api/bot-framework-rest-direct-line-3-0-end-conversation.md
@@ -11,9 +11,9 @@ ms.date: 12/13/2017
 
 # End a conversation in Direct Line API 3.0
 
-The **endOfConversation** [activity](https://aka.ms/botSpecs-activitySchema) means the channel or bot has ended the conversation. 
+The **endOfConversation** [activity](https://aka.ms/botSpecs-activitySchema) means the channel or bot has ended the conversation.
 
-> [!NOTE] 
+> [!NOTE]
 > While the **endOfConversation** event is only sent by very few channels, the Cortana channel is the only one that accepts it. Other channels, including Direct Line, do not implement this functionality and instead drop or forward the activity on; each channel determines how to react to an endOfConversation activity.
 
 ## Send an endOfConversation activity

diff --git a/articles/rest-api/bot-framework-rest-state.md b/articles/rest-api/bot-framework-rest-state.md
@@ -11,8 +11,8 @@ ms.date: 02/20/2020
 
 # Manage state data with the REST API
 
-Bots typically use storage to keep track of a user's place in the conversation or details relevant to their relationship with the bot. The Bot Framework SDK manages user and conversation state automatically for bot developers. 
+Bots typically use storage to keep track of a user's place in the conversation or details relevant to their relationship with the bot. The Bot Framework SDK manages user and conversation state automatically for bot developers.
 
-Originally, Bot Framework shipped with a state service for storing this data, but most modern bots (and all recent releases of the Bot Framework SDK) use storage controlled directly by the bot developer instead of this centrally managed service. 
+Originally, Bot Framework shipped with a state service for storing this data, but most modern bots (and all recent releases of the Bot Framework SDK) use storage controlled directly by the bot developer instead of this centrally managed service.
 
 The central Bot Framework State service is retired as of March 30, 2018. For more information, see [Reminder: The Bot Framework State service has been retired – what you need to know](https://blog.botframework.com/2018/04/02/reminder-the-bot-framework-state-service-has-been-retired-what-you-need-to-know/).
diff --git a/articles/v4sdk/abs-quickstart.md b/articles/v4sdk/abs-quickstart.md
@@ -81,13 +81,16 @@ A manual registration is necessary for situations like:
 
 See [FAQ - App Registration](~/bot-service-resources-faq-azure.md#how-do-i-create-my-own-app-registration).
 
-
 ## Download code
+
 You can download the code to work on it locally.
+
 1. In the **Bot Management** section, click **Build**.
 1. Click on **Download Bot source code** link in the right-pane.
 1. Follow the prompts to download the code, and then unzip the folder.
-    1. [!INCLUDE [download keys snippet](../includes/snippet-abs-key-download.md)]
+
+    [!INCLUDE [download keys snippet](../includes/snippet-abs-key-download.md)]
 
 ## Next steps
-After you download the code, you can continue to develop the bot locally on your machine. Once you test your bot and are ready to upload the bot code to the Azure portal, follow the instructions listed under [set up continous deployment](../bot-service-build-continuous-deployment.md) topic to automatically update code after you make changes.
+
+After you download the code, you can continue to develop the bot locally on your machine. Once you test your bot and are ready to upload the bot code to the Azure portal, follow the instructions listed under [set up continuos deployment](../bot-service-build-continuous-deployment.md) topic to automatically update code after you make changes.