merge live 1-10-19 (#1250)

* Release 'live' 12-11-2018 (#1190) (#1193)

* Updated values in #update-the-.bot-file (#1191)

* bot deploy clarity (#1196)

* Updated dispatch content (#1142)

* Update docfx.json

* Update docfx.json

* Update Deployment steps (#1205)

* Fix deployment (MicrosoftDocs#1206)

* Update bot-builder-deploy-az-cli.md

* Add deployment (#1209)

* Add the MSA account instructions back in with some modifications. (#1208)

* Update bot-service-resources-bot-framework-faq.md (#1212)

* Updates to deploying samples article (MicrosoftDocs#1215)

* Updates to deploying samples article

* Update per feedback

* Fix copy-paste error, some formatting.

* enteprise bot updates to include chitchat in qna (MicrosoftDocs#1218)

* Fixes for various bot-docs issues (#1217)

* wip

* Addresses bot-docs issue 628

* Fix for bot-docs issue [624](https://github.com/MicrosoftDocs/bot-docs/issues/624)

* Fix for Microsoft/bot-docs#655.

* copy edit

* Fix for [bot-docs 630](https://github.com/MicrosoftDocs/bot-docs/issues/630)

* Fix for (Microsoft/bot-docs#612).

* Add Troubleshoot bot configuration issues

* Add second troubleshooting article, fix warnings in the first.

* fix moniker range.

* fix metadata keywords in second topic.

* Experimental fix.

* Fix markup

* Minor correction.

* Fixes welcome user sample code pointers (#1221)

* Fixed aka.ms sample code pointers

Somehow these changed to point to the wrong sample, not the one documented step-by-step in our article.

* added Ivor's aka.ms link

* corrected my "author" name and date

* fixed author name again!

* Various issue fixes. (#1224)

* Fix link to point to the new article.

* Remove transparency, expand border.

* Remove transparency from images.

* Update screenshot per (Microsoft/bot-docs#603)

* makes it clearer how you train and publish the LUIS dispatch app (#1225)

* Issues fixes 12-20 (#1222)

* update dotnet emulator screenshot

* update screenshot for dotnet project

* fix sentence from issue 607

* make manage toc alphabetic

* Issues fixes - samples links, redirect fixes (MicrosoftDocs#1227)

* Added reference to the BotFramework-Samples directory

* attempted fix at redirect url

* Update bot-builder-enterprise-template-deployment.md (MicrosoftDocs#1232)

Update to remove "az extension" step. Latest msbot version no longer requires the botservice extension.

* Update bot-service-quickstart.md (#1242)

* Update bot-service-quickstart.md

* Update bot-service-quickstart.md

* Update bot-service-quickstart.md (#1244)

* Updated ET PowerBI doc to point users to the Conversational AI Telemetry doc on Microsoft/AI repo & updated telemetry properties. (#1214)

* Fix java (#1246)

* Fix for bot-docs (#684)[Microsoft/bot-docs#684] (MicrosoftDocs#1235)

* Fix for bot-docs (#684)[https://github.com/MicrosoftDocs/bot-docs/issues/684]

* Attempt to fix markdown

* Continue to try to fix markdown

* yet one more fix

* Add instruction to create resource group before using az bot create

* Fix for bot-docs issue 685

* Fix for bot-docs 685

* Update the --proj-name description for JS

* include a fix from loc folks.

* Update Slack channel doc and bing speech (#1249)

* Update Slack channel doc

* Update text

* tweak wording

* remove bing speech from v3 docs

Author: ivorb

articles/bot-builder-deploy-az-cli.md

@@ -8,7 +8,7 @@ manager: kamrani
 ms.topic: get-started-article
 ms.service: bot-service
 ms.subservice: abs
-ms.date: 12/14/2018
+ms.date: 01/07/2019
 ---
 
 # Deploy your bot using Azure CLI
@@ -19,17 +19,21 @@ After you have created your bot and tested it locally, you can deploy it to Azur
 
 In this article, we'll show you how to deploy C# and JavaScript bots to Azure using `az` and `msbot` cli. It would be useful to read this article before following the steps, so that you fully understand what is involved in deploying a bot.
 
-
 ## Prerequisites
+
 - If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
 - Install the latest version of the [Azure cli tool](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest).
-- Install the latest `botservice` extension for the `az` tool.
-  - First, remove the old version using `az extension remove -n botservice` command. Next, use the `az extension add -n botservice` command to install the latest version.
 - Install latest version of the [MSBot](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/MSBot) tool.
 - Install latest released version of the [Bot Framework Emulator](https://aka.ms/Emulator-wiki-getting-started).
 - Install and configure [ngrok](https://github.com/Microsoft/BotFramework-Emulator/wiki/Tunneling-%28ngrok%29).
 - Knowledge of [.bot](v4sdk/bot-file-basics.md) file.
 
+With msbot 4.3.2 and later, you need Azure CLI version 2.0.53 or later. If you installed the botservice extension, remove it with this command.
+
+```cmd
+az extension remove --name botservice
+```
+
 ## Deploy JavaScript and C# bots using az cli
 
 You've already created and tested a bot locally, and now you want to deploy it to Azure. These steps assume that you have created the required Azure resources.
@@ -60,7 +64,18 @@ cd <local-bot-folder>
 
 ### Create a Web App Bot
 
-Create the bot resource into which you will publish your bot.
+If you don't already have a resource group to which to publish your bot, create one:
+
+```cmd
+az group create --name <resource-group-name> --location <geographic-location> --verbose
+```
+
+| Option | Description |
+|:---|:---|
+| --name | A unique name for the resource group. DO NOT include spaces or underscores in the name. |
+| --location | Geographic location used to create the resource group. For example, `eastus`, `westus`, `westus2`, and so on. Use `az account list-locations` for a list of locations. |
+
+Then, create the bot resource into which you will publish your bot.
 
 Before proceeding, read the instructions that apply to you based on the type of email account you use to log in to Azure.
 
@@ -181,15 +196,13 @@ At this point, your bot should work the same way it did with the old .bot file.
 Publish your local bot to Azure. This step might take a while.
 
 ```cmd
-az bot publish --name <bot-resource-name> --proj-file "<project-file-name>" --resource-group <resource-group-name> --code-dir <directory-path> --verbose --version v4
+az bot publish --name <bot-resource-name> --proj-name "<project-file-name>" --resource-group <resource-group-name> --code-dir <directory-path> --verbose --version v4
 ```
 
-<!-- Question: What should --proj-file be for a Node project? -->
-
 | Option | Description |
 |:---|:---|
 | --name | The resource name of the bot in Azure. |
-| --proj-file | The startup project file name (without the .csproj) that needs to be published. For example: EnterpriseBot. |
+| --proj-name | For C#, use the startup project file name (without the .csproj) that needs to be published. For example: `EnterpriseBot`. For Node.js, use the main entry point for the bot. For example, `index.js`. |
 | --resource-group | Name of resource group. |
 | --code-dir | The directory to upload bot code from. |
 

articles/bot-builder-deploy-samples.md

@@ -31,15 +31,19 @@ It would be useful to read this article once through before following the steps,
 - If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
 - Install [.NET Core SDK](https://dotnet.microsoft.com/download) >= v2.2. Use `dotnet --version` to see what version you have.
 - Install the latest version of the [Azure cli tool](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest). Use `az --version` to see what version you have.
-- Install the latest `botservice` extension for the `az` tool.
-  - First, remove the old version using `az extension remove -n botservice` command. Next, use the `az extension add -n botservice` command to install the latest version.
 - Install latest version of the [MSBot](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/MSBot) tool.
   - You'll need [LUIS CLI](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/LUIS#installation) if the the clone operation includes LUIS or Dispatch resources.
   - You'll need [QnA Maker CLI](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/QnAMaker#as-a-cli) if the clone operation includes QnA Maker resources.
 - Install [Bot Framework Emulator](https://aka.ms/Emulator-wiki-getting-started).
 - Install and configure [ngrok](https://github.com/Microsoft/BotFramework-Emulator/wiki/Tunneling-%28ngrok%29).
 - Knowledge of [.bot](v4sdk/bot-file-basics.md) files.
 
+With msbot 4.3.2 and later, you need Azure CLI version 2.0.53 or later. If you installed the botservice extension, remove it with this command.
+
+```cmd
+az extension remove --name botservice
+```
+
 ### C\#
 
  `msbot clone services` does not upload your code files to Azure, just the DLL and a few other files. You need to compile the sample before running this command.
@@ -148,13 +152,13 @@ In the emulator, use production endpoint to test your app. If you want to test i
 DO NOT use `msbot clone services` command to update the bot code in Azure. You must use the `az bot publish` command as shown below:
 
 ```cmd
-az bot publish --name "<your-azure-bot-name>" --proj-file "<your-proj-file>" --resource-group "<azure-resource-group>" --code-dir "<folder>" --verbose --version v4
+az bot publish --name "<your-azure-bot-name>" --proj-name "<your-proj-name>" --resource-group "<azure-resource-group>" --code-dir "<folder>" --verbose --version v4
 ```
 
 | Arguments        | Description |
 |----------------  |-------------|
 | `name`      | The name you used when the bot was first deployed to Azure.|
-| `proj-file` | For C# bot, it is the .csproj file. For JS/TS bot, it is the startup project file name (e.g. index.js or index.ts) of your local bot.|
+| `proj-name` | For C#, use the startup project file name (without the .csproj) that needs to be published. For example: `EnterpriseBot`. For Node.js, use the main entry point for the bot. For example, `index.js`. |
 | `resource-group` | The Azure resource group that `msbot clone services` command used.|
 | `code-dir`  | Points to the local bot folder.|
 

articles/bot-builder-tools.md

@@ -55,7 +55,6 @@ user: thanks
 bot:
 Here's a form for you
 [Attachment=card.json adaptivecard]
-
 ```
 
 ### Create a transcript file from .chat file
@@ -93,30 +92,33 @@ For example, you can create multiple LUIS intents in a single .lu file as follow
 
 The .lu file format supports also QnA pairs using the following notation: 
 
-```LUDown
+~~~LUDown
 > comment
 ### ? question ?
   ```markdown
     answer
   ```
+~~~
 
 The LUDown tool will automatically separate question and answers into a qnamaker JSON file that you can then use to create your new [QnaMaker.ai](http://qnamaker.ai) knowledge base.
 
-```LUDown
+~~~LUDown
 ### ? How do I change the default message for QnA Maker?
   ```markdown
   You can change the default message if you use the QnAMakerDialog. 
-  See [this link](https://docs.botframework.com/en-us/azure-bot-service/templates/qnamaker/#navtitle) for details. 
+  See [this link](https://docs.botframework.com/en-us/azure-bot-service/templates/qnamaker/#navtitle) for details.
   ```
+~~~
 
 You can also add multiple questions to the same answer by simply adding new lines of variations of questions for a single answer.
 
-```LUDown
+~~~LUDown
 ### ? What is your name?
 - What should I call you?
   ```markdown
     I'm the echoBot! Nice to meet you.
   ```
+~~~
 
 ### Generate .json models with LUDown
 
@@ -227,21 +229,37 @@ The Bot Framework [Emulator](bot-service-debug-emulator.md) is a desktop applica
 
 ## Publish
 
-You can use the Azure CLI to create, download, and publish your bot to Azure Bot Service. Install the bot extension via: 
+You can use the Azure CLI to create, download, and publish your bot to Azure Bot Service.
+
+With msbot 4.3.2 and later, you need Azure CLI version 2.0.53 or later. If you installed the botservice extension, remove it with this command.
+
 ```shell
-az extension add -n botservice
+az extension remove --name botservice
 ```
 
 ### Create Azure Bot Service bot
 
-Note: You must use the latest version of the `az cli`. Please upgrade it, so that az cli can work with MSBot tool. 
+Note: You must use the latest version of the `az cli`. Please upgrade it, so that az cli can work with MSBot tool.
+
+Login to your azure account via
 
-Login to your azure account via 
 ```shell
 az login
 ```
 
-Once you are loged in, you can create a new Azure Bot Service bot using: 
+If you don't already have a resource group to which to publish your bot, create one:
+
+```shell
+az group create --name <resource-group-name> --location <geographic-location> --verbose
+```
+
+| Option | Description |
+|:---|:---|
+| --name | A unique name for the resource group. DO NOT include spaces or underscores in the name. |
+| --location | Geographic location used to create the resource group. For example, `eastus`, `westus`, `westus2`, and so on. Use `az account list-locations` for a list of locations. |
+
+Then, create the bot resource into which you will publish your bot.
+
 ```shell
 az bot create [options]
 ```

articles/bot-service-channel-connect-slack.md

@@ -2,13 +2,13 @@
 title: Connect a bot to Slack | Microsoft Docs
 description: Learn how to configure a bot's connection to Slack.
 keywords: connect a bot, bot channel, Slack bot, Slack messaging app
-author: RobStand
-ms.author: kamrani
+author: JonathanFingold
+ms.author: v-jofing
 manager: kamrani
 ms.topic: article
 ms.service: bot-service
 ms.subservice: sdk
-ms.date: 12/13/2017
+ms.date: 01/09/2019
 ---
 
 # Connect a bot to Slack
@@ -65,9 +65,11 @@ Follow these steps to subscribe to six particular bot events. By subscribing to
 
 1. Select the **Event Subscriptions** tab.
 2. Click **Enable Events** to **On**.
-3. In **Request URL**, enter this URL, but replace `{YourBotHandle}` with your bot handle. The bot handle used in this tutorial is testChannels.
-        `https://slack.botframework.com/api/Events/{YourBotHandle}`
-4. In **Subscribe to Workspace Events**, click **Add Workspace Event**.
+3. In **Request URL**, enter `https://slack.botframework.com/api/Events/{YourBotHandle}`, where `{YourBotHandle}` is your bot handle, without the braces. The bot handle used in this example is **ContosoBot**.
+
+   ![Subscribe Events: top](~/media/channels/slack-SubscribeEvents-a.png)
+
+4. In **Subscribe to Bot Events**, click **Add Bot User Event**.
 5. In the list of events, select these six event types:
     * `member_joined_channel`
     * `member_left_channel`
@@ -76,9 +78,12 @@ Follow these steps to subscribe to six particular bot events. By subscribing to
     * `message.im`
     * `message.mpim`
 
-![Subscribe Events](~/media/channels/slack-SubscribeEvents.png)
+   ![Subscribe Events: middle](~/media/channels/slack-SubscribeEvents-b.png)
+
 6. Click **Save Changes**.
 
+   ![Subscribe Events: bottom](~/media/channels/slack-SubscribeEvents-c.png)
+
 ## Add and Configure Interactive Messages (optional)
 
 If your bot will use Slack-specific functionality such as buttons, follow these steps:

articles/bot-service-channel-connect-webchat-speech.md

@@ -61,7 +61,7 @@ To enable the speech functionality in Web Chat, you need to customize the JavaSc
 The customization allows you to add speech functionality in any of the following ways:
 
 * **Browser-provided speech** - Use speech functionality built into the web browser. At this time, this functionality is only available on the Chrome browser.
-* **Use Bing Speech service** - You can use the Bing Speech service to provide speech recognition and synthesis. This way of access speech functionality is supported by a variety of browsers. In this case, the processing is done on a server instead of on the browser.
+<!--* **Use Bing Speech service** - You can use the Bing Speech service to provide speech recognition and synthesis. This way of access speech functionality is supported by a variety of browsers. In this case, the processing is done on a server instead of on the browser.-->
 * **Create a custom speech service** - You can create your own custom speech recognition and voice synthesis components.
 
 ### Browser-provided speech
@@ -75,7 +75,7 @@ The following code instantiates speech recognizer and speech synthesis component
 
 [!code-js[Specify speech options to use in-browser speech (JavaScript)](./includes/code/bot-service-channel-connect-webchat-speech.js#BrowserSpeech)]
 
-### Bing Speech service
+<!--### Bing Speech service
 
 The following code instantiates speech recognizer and speech synthesis components that use the Bing Speech service. The recognition and generation of speech is performed on the server. This mechanism is supported in multiple browsers. 
 
@@ -91,7 +91,7 @@ You also have the option to enable Cognitive Services speech recognition using a
 The following example code shows how the token fetch is done from a secure back end to avoid exposing the API key.
 
 [!code-js[Fetch a token to use with the Bing Speech API (JavaScript)](./includes/code/bot-service-channel-connect-webchat-speech.js#FetchToken)]
-
+-->
 ### Custom Speech service
 
 You can also provide your own custom speech recognition that implements ISpeechRecognizer or speech synthesis that implements ISpeechSynthesis. 

articles/bot-service-troubleshoot-bot-configuration.md

@@ -23,7 +23,7 @@ The first step in troubleshooting a bot is to test it in Web Chat. This will all
 
 ![Test In Web Chat](./media/test-in-webchat.png)
 
-If the bot responds with the expected output, go to [Bot does not work in Web Chat](#bot-does-not-work-in-web-chat). Otherwise, go to [Bot works in Web Chat but not in other channels](#bot-works-in-web-chat-but-not-in-other-channels).
+If the bot does not respond with the expected output, go to [Bot does not work in Web Chat](#bot-does-not-work-in-web-chat). Otherwise, go to [Bot works in Web Chat but not in other channels](#bot-works-in-web-chat-but-not-in-other-channels).
 
 ## Bot does not work in Web Chat