Merge community content (MicrosoftDocs#748)

Author: Kaiqb

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

@@ -154,7 +154,7 @@ msbot connect service-type
 | Service type | Description |
 | ------ | ----------- |
 | azure  |connect your bot to an Azure Bot Service registration|
-|localhost| connect your bot to a localhost endpoint|
+|endpoint| connect your bot to an endpoint such as localhost|
 |luis     | connect your bot to a LUIS application |
 | qna     |connect your bot to a QnA Knowledgebase|
 |help [cmd]  |display help for [cmd]|

articles/bot-service-manage-channels.md

@@ -13,7 +13,7 @@ ms.date: 12/13/2017
 
 # Connect a bot to channels
 
-A channel is the connection between the Bot Framework and communication apps. You configure a bot to connect to the channels you want it to be available on. For example, a bot connected to the Skype channel can be added to a contact list and people can interact with it in Skype. 
+A channel is a connection between the Bot Framework and communication apps. You configure a bot to connect to the channels you want it to be available on. For example, a bot connected to the Skype channel can be added to a contact list and people can interact with it in Skype. 
 
 The channels include many popular services, such as [Cortana](bot-service-channel-connect-cortana.md), [Facebook Messenger](bot-service-channel-connect-facebook.md), [Kik](bot-service-channel-connect-kik.md), and [Slack](bot-service-channel-connect-slack.md), as well as several others. [Skype](https://dev.skype.com/bots) and Web Chat are pre-configured for you. 
 

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

@@ -91,9 +91,9 @@ Note: The SDK v4 is being actively developed and should therefore be used for ex
 To get the samples, clone the [botbuilder-dotnet](https://github.com/Microsoft/botbuilder-dotnet) GitHub repository using Git.
 ```cmd
 git clone https://github.com/Microsoft/botbuilder-dotnet.git
-cd samples
+cd botbuilder-dotnet\samples-final
 ```
-The sample bots built with the Bot Builder SDK for .NET are organized in the **samples** directory.
+The sample bots built with the Bot Builder SDK for .NET are organized in the **samples-final** directory.
 
 
 ::: moniker-end

articles/includes/code/dotnet-input-hints.cs

@@ -22,31 +22,31 @@ public async Task OnTurn(ITurnContext context)
             if (context.Activity.Type == ActivityTypes.Message)
             {
                 {
-                    // <Accepting>
+                    // <Accepting input>
                     var reply = MessageFactory.Text(
                         "This is the text that will be displayed.",
                         "This is the text that will be spoken.",
                         InputHints.AcceptingInput);
                     await context.SendActivity(reply).ConfigureAwait(false);
-                    // </Accepting>
+                    // </Accepting input>
                 }
                 {
-                    // <Expecting>
+                    // <Expecting input>
                     var reply = MessageFactory.Text(
                         "This is the text that will be displayed.",
                         "This is the text that will be spoken.",
                         InputHints.ExpectingInput);
                     await context.SendActivity(reply).ConfigureAwait(false);
-                    // </Expecting>
+                    // </Expecting input>
                 }
                 {
-                    // <Ignoring>
+                    // <Ignoring input>
                     var reply = MessageFactory.Text(
                         "This is the text that will be displayed.",
                         "This is the text that will be spoken.",
                         InputHints.IgnoringInput);
                     await context.SendActivity(reply).ConfigureAwait(false);
-                    // </Ignoring>
+                    // </Ignoring input>
                 }
             }
         }

articles/javascript/bot-builder-javascript-quickstart.md

@@ -28,6 +28,7 @@ This quickstart walks you through building a bot by using the Yeoman Bot Builder
 > For some installations the install step for restify is giving an error related to node-gyp.
 > If this is the case try running `npm install -g windows-build-tools`.
 
+
 The Bot Builder SDK for JavaScript consists of a series of [packages](https://github.com/Microsoft/botbuilder-js/tree/master/libraries) which can be installed from NPM using a special `@preview` tag.
 
 # Create a bot

articles/nodejs/bot-builder-nodejs-message-create.md

@@ -12,7 +12,7 @@ monikerRange: 'azure-bot-service-3.0'
 # Create messages
 Communication between the bot and the user is through messages. Your bot will send message activities to communicate information to users, and likewise, will also receive message activities from users. Some messages may simply consist of plain text, while others may contain richer content such as text to be spoken, suggested actions, media attachments, rich cards, and channel-specific data.
 
-This article describes some of the commonly-used message methods you can use to enhanced your user experience.
+This article describes some of the commonly-used message methods you can use to enhance your user experience.
 
 ## Default message handler
 

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

@@ -75,7 +75,7 @@ LUIS apps recognize intent by classifying an utterance into one of multiple cate
 One way of reducing the number of intents is to use a hierarchical design. Consider the case of a personal assistant bot that has three intents related to weather, three intents related to home automation, and three other utility intents which are Help, Cancel and Greeting. If you put all the intents in the same LUIS app, you already have 9, and as you add features to the bot, you could end up with dozens. Instead, you can use a dispatcher LUIS app to determine whether the user's request is for weather, home automation, or utility, then call the LUIS app for the category that the dispatcher determines. In this case each of the LUIS apps only starts with 3 intents. 
 
 ### Use a None intent 
-It's often the case that users of your bot will say something unexpected or unrelated to the current conversation flow. The None intent is provided for handling those messages. If you don't train an intent for handling the fallback, default or "none of the above" cases, your LUIS app can only classify messages into the into intents it has defined. So for example, let's say you have a LUIS app with two intents: `HomeAutomation.TurnOn` and `HomeAutomation.TurnOff`. If those are the only intents, and the input is something unrelated like "schedule an appointment on Friday", your LUIS app has no choice but to classify that message as either HomeAutomation.TurnOn or HomeAutomation.TurnOff. If your LUIS app has a `None` intent with a few examples, you can provide some fallback logic in your bot to handle unexpected utterances.  
+It's often the case that users of your bot will say something unexpected or unrelated to the current conversation flow. The None intent is provided for handling those messages. If you don't train an intent for handling the fallback, default or "none of the above" cases, your LUIS app can only classify messages into the intents it has defined. So for example, let's say you have a LUIS app with two intents: `HomeAutomation.TurnOn` and `HomeAutomation.TurnOff`. If those are the only intents, and the input is something unrelated like "schedule an appointment on Friday", your LUIS app has no choice but to classify that message as either HomeAutomation.TurnOn or HomeAutomation.TurnOff. If your LUIS app has a `None` intent with a few examples, you can provide some fallback logic in your bot to handle unexpected utterances.  
 
 ### Review the utterances that LUIS app receives
 LUIS apps provide a feature for improving your app performance, by reviewing messages that users sent to it. See [Review suggested utterances](https://docs.microsoft.com/en-us/azure/cognitive-services/LUIS/label-suggested-utterances) for a step-by-step walkthrough.

articles/v4sdk/bot-builder-howto-qna.md

@@ -91,15 +91,15 @@ public void ConfigureServices(IServiceCollection services)
         options.CredentialProvider = new ConfigurationCredentialProvider(Configuration);
 
         var endpoint = new QnAMakerEndpoint
-            {
-                knowledgebaseId = "YOUR-KB-ID",
-                // Get the Host from the HTTP request example at https://www.qnamaker.ai
-                // For GA services: https://<Service-Name>.azurewebsites.net/qnamaker
-                // For Preview services: https://westus.api.cognitive.microsoft.com/qnamaker/v2.0
-                Host = "YOUR-HTTP-REQUEST-HOST",
-                EndpointKey = "YOUR-QNA-MAKER-SUBSCRIPTION-KEY"
-            };
-        options.Middleware.Add(new QnAMakerMiddleware(new QnAMakerEndpoint(endpoint)));
+        {
+           KnowledgeBaseId = "YOUR-KB-ID",
+           // Get the Host from the HTTP request example at https://www.qnamaker.ai
+           // For GA services: https://<Service-Name>.azurewebsites.net/qnamaker
+           // For Preview services: https://westus.api.cognitive.microsoft.com/qnamaker/v2.0           
+           Host = "YOUR-HTTP-REQUEST-HOST",
+           EndpointKey = "YOUR-QNA-MAKER-SUBSCRIPTION-KEY"
+        };
+        options.Middleware.Add(new QnAMakerMiddleware(endpoint));
     });
 }
 ```

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

@@ -195,7 +195,7 @@ public async Task OnTurn(ITurnContext context)
             // context object for the next turn of the conversation can check haveAskedName
             convo.haveAskedNameFlag = true;
         }
-        else if (convo.haveAskedNumberFlag)
+        else if (!convo.haveAskedNumberFlag)
         {
             // Save the name.
             var name = context.Activity.AsMessageActivity().Text;
@@ -219,7 +219,7 @@ public async Task OnTurn(ITurnContext context)
 }
 ```
 
-To set up user state so that it can be returned by `ConversationState<ConversationInfo>.Get(context)`, 
+To set up user state so that it can be returned by `UserState<UserInfo>.Get(context)`, 
 you add user state middleware. For example, in `Startup.cs` of the ASP .NET Core EchoBot, changing the code in ConfigureServices.cs:
 
 ```csharp
@@ -231,6 +231,7 @@ public void ConfigureServices(IServiceCollection services)
 
         IStorage dataStore = new MemoryStorage();
         options.Middleware.Add(new ConversationState<ConversationInfo>(dataStore));
+        options.Middleware.Add(new UserState<UserInfo>(dataStore));
     });
 }
 ```

articles/v4sdk/bot-builder-prompts.md

@@ -362,10 +362,12 @@ using Microsoft.Recognizers.Text;
 using System.Collections.Generic;
 ```
 
+
 When we use the **ChoicePrompt** to ask the user to choose between a set of options, we have to provide the prompt with that set of options, provided within a **ChoicePromptOptions** object. Here, we use the **ChoiceFactory** to convert a list of options into an appropriate format.
 
 We are also using a **SuggestedActions** activity as the reprompt, as a way of providing the input options to the user again.
 
+
 ```csharp
 /// <summary>Defines a dialog that asks for a choice of color.</summary>
 public class MyDialog : DialogSet