Merging changes synced from https://github.com/MicrosoftDocs/bot-docs-pr (branch live)

Author: openpublishbuild

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

@@ -129,6 +129,9 @@ You can use the msbot tool to generate a new secret and encrypt the .bot file be
 msbot secret --bot <name-of-bot-file> --new
 ```
 
+> [!TIP]
+> In the file properties for your .bot file, inside Visual Studio, make sure the **Copy to Output Directory** is set to *Copy always*.
+
 ### Setup a repository
 
 To support continuous deployment, create a git repository using your favorite git source control provider. Commit your code into the repository.

articles/bot-service-channels-reference.md

@@ -66,7 +66,7 @@ Event.*                    | :white_large_square: | :white_check_mark: | :white_
 Event.CreateConversation   | :white_large_square: | :white_large_square: | :white_large_square:   | :white_large_square: | :white_large_square:  | :white_large_square: | :white_large_square: | :white_large_square:  | :white_large_square:  | :white_large_square:  | :white_large_square:           | :white_large_square:     | :white_large_square:  
 Event.ContinueConversation | :white_large_square: | :white_large_square: | :white_large_square:   | :white_large_square: | :white_large_square:  | :white_large_square: | :white_large_square: | :white_large_square:  | :white_large_square:  | :white_large_square:  | :white_large_square:           | :white_large_square:     | :white_large_square:  
 
-- Event Activities are an extensibility mechanism in Direct Line (_aka Direct Line_).
+- Event Activities are an extensibility mechanism in Direct Line (_aka Web Chat_).
 - An application that owns both the client and server may chose to tunnel their own events through the service using this Event Activity.
 
 
@@ -80,7 +80,7 @@ Invoke.ComposeResponse     | :x:      | :x:          | :x: | :x:   | :x:       |
 
 - Along with a number of the other typed Activities, Microsoft Teams defines a few Teams specific Invoke Activities.
 - Invoke Activities are specific to an application and not something a client would define.
-- There is no general notion of Invoke only specific subtypes of the Activity.
+- There is no general notion of Invoke specific subtypes of the activity.
 - Invoke is currently the only Activity that triggers a request-reply behavior on the bot.
 
 This is very important: if using Dialogs for the OAuth Prompt to work the Invoke.TeamsVerification Activity must be forwarded to the Dialog.

articles/dotnet/bot-builder-dotnet-middleware.md

@@ -7,7 +7,7 @@ manager: kamrani
 ms.topic: article
 ms.service: bot-service
 ms.subservice: sdk
-ms.date: 12/13/2017
+ms.date: 03/01/2019
 monikerRange: 'azure-bot-service-3.0'
 ---
 # Intercept messages
@@ -57,9 +57,9 @@ Although this example simply prints some information about each message, you can
 
 ## Sample code 
 
-For a complete sample that shows how to intercept and log messages using the Bot Framework SDK for .NET, see the <a href="https://github.com/Microsoft/BotBuilder-Samples/tree/master/CSharp/core-Middleware" target="_blank">Middleware sample</a> in GitHub. 
+For a complete sample that shows how to intercept and log messages using the Bot Framework SDK for .NET, see the <a href="https://github.com/Microsoft/BotBuilder-Samples/tree/v3-sdk-samples/CSharp/core-Middleware" target="_blank">Middleware sample</a> in GitHub. 
 
 ## Additional resources
 
 - <a href="/dotnet/api/?view=botbuilder-3.11.0" target="_blank">Bot Framework SDK for .NET Reference</a>
-- <a href="https://github.com/Microsoft/BotBuilder-Samples/tree/master/CSharp/core-Middleware" target="_blank">Middleware sample (GitHub)</a>
+- <a href="https://github.com/Microsoft/BotBuilder-Samples/tree/v3-sdk-samples/CSharp/core-Middleware" target="_blank">Middleware sample (GitHub)</a>

articles/v4sdk/bot-builder-concept-state.md

@@ -52,7 +52,7 @@ These state properties are lumped into scoped "buckets", which are just collecti
 
 All of these buckets are subclasses of the *bot state* class, which can be derived to define other types of buckets with different scopes.
 
-These predifined buckets are scoped to a certain visibility, depending on the bucket:
+These predefined buckets are scoped to a certain visibility, depending on the bucket:
 
 - User state is available in any turn that the bot is conversing with that user on that channel, regardless of the conversation
 - Conversation state is available in any turn in a specific conversation, regardless of user (i.e. group conversations)

articles/v4sdk/bot-builder-howto-v4-storage.md

@@ -153,18 +153,6 @@ public async Task OnTurnAsync(ITurnContext turnContext, CancellationToken cancel
 const { BotFrameworkAdapter, ConversationState, MemoryStorage } = require('botbuilder');
 const restify = require('restify');
 
-// Create server.
-// let server = restify.createServer();
-// server.listen(process.env.port || process.env.PORT || 3978, function () {
-//    console.log(`${server.name} listening to ${server.url}`);
-// });
-
-// Create adapter.
-// const adapter = new BotFrameworkAdapter({
-//    appId: process.env.MICROSOFT_APP_ID,
-//    appPassword: process.env.MICROSOFT_APP_PASSWORD
-//  });
-
 // Add memory storage.
 var storage = new MemoryStorage();
 

articles/v4sdk/bot-file-basics.md

@@ -8,7 +8,7 @@ manager: kamrani
 ms.topic: article
 ms.service: bot-service
 ms.subservice: sdk
-ms.date: 11/23/2018
+ms.date: 03/11/2018
 monikerRange: 'azure-bot-service-4.0'
 ---
 
@@ -25,7 +25,7 @@ With a .bot file, you can register services like:
 * [**Azure Bot Service**](https://azure.microsoft.com/en-us/services/bot-service/) Azure Bot Service registrations.
 * [**LUIS.AI**](https://www.luis.ai/) LUIS gives your bot the ability to communicate with people using natural language.. 
 * [**QnA Maker**](https://qnamaker.ai/) Build, train and publish a simple question and answer bot based on FAQ URLs, structured documents or editorial content in minutes.
-* [**Dispatch**](https://github.com/Microsoft/botbuilder-tools/tree/master/Dispatch) models for dispatching across multiple services.
+* [**Dispatch**](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/Dispatch) models for dispatching across multiple services.
 * [**Azure Application Insights**](https://azure.microsoft.com/en-us/services/application-insights/) for insights and bot analytics.
 * [**Azure Blob Storage**](https://azure.microsoft.com/en-us/services/storage/blobs/) for bot state persistence. 
 * [**Azure Cosmos DB**](https://azure.microsoft.com/en-us/services/cosmos-db/) - globally distributed, multi-model database service to persist bot state.