Release 'live' 10-15-2018 (#1011)

Author: Kaiqb

articles/bot-service-build-download-source-code.md

@@ -57,7 +57,8 @@ After your project configured, your project changes will be published to Azure.
 
 Next, we'll take a look at downloading and redeploying code using the `az` cli.
 
-### Download code usubg Azure CLI
+### Download code using Azure CLI
+
 First, log in to the Azure portal using the az cli tool.
 
 ```azcli
@@ -80,7 +81,8 @@ After the code is downloaded, do the following:
 }
 ```
 
-- For node.js bot, dd a .env file with the following entries:
+- For node.js bot, add a .env file with the following entries:
+
 ```
 botFilePath=yourbasicBot.bot
 botFileSecret=ukxxxxxxxxxxxxs=

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

@@ -26,28 +26,23 @@ When connecting your bot with the Cortana channel, some basic information about
 | **Skill icon** | An icon that is displayed in the Cortana canvas when your skill is invoked. This is also used where skills are discoverable (like the Microsoft store). (32KB max, PNG only).|
 | **Display name** | The name of your Cortana skill is displayed to the user at the top of the visual UI. (30 character limit) |
 | **Invocation name** | This is the name users say when invoking a skill. It should be no more than three words and easy to pronounce. See the [Invocation Name Guidelines][invocation] for more information on how to choose this name.|
-| **Description** | A description of your Cortana skill. This is used where skills are discoverable (like the Microsoft store). |
-| **Short description** | A short description of your skill’s functionality, used to describe the skill in Cortana’s notebook. |
+
+![Default settings](~/media/channels/cortana-defaultsettings.png)
 
 ## General bot information
 
 Under the **Manage user identity through connected services section** press the option to enable it. Fill in the form.
 
-All fields marked with an asterisk (*) are required. Bots must be published on the Bot Framework before they can be connected to Cortana.
-
-![Provide general information](~/media/channels/cortana-details.png)
-
-### Sign in at invocation
-
-Select this option if you want Cortana to sign in the user at the time they invoke your skill.
+All fields marked with an asterisk (*) are required. A Bot must be published to Azure before it can be connected to Cortana.
 
-### Sign in when required
+![Manage user identity, part 1](~/media/channels/cortana-manageidentity-1.png)
+![Manage user identity, part 2](~/media/channels/cortana-manageidentity-2.png)
 
-Select this option if you use a Bot Framework's SignIn card to sign in the user. Typically, you use this option if you want to sign in the user only if they use a feature that requires authentication. When your skill sends a message that includes the SignIn card as an attachment, Cortana ignores the SignIn card and performs the authorization flow using the Connect Account settings.
+### When should Cortana prompt for a user to sign in
 
-### Connected service icon
+Select **Sign in at invocation** if you want Cortana to sign in the user at the time they invoke your skill.
 
-The icon that you want displayed when the user signs in to your skill.
+Select **Sign in when required** if you use a Bot Service sign-in card to sign in the user. Typically, you use this option if you want to sign in the user only if they will use a feature that requires authentication. When your skill sends a message that includes the sign-in card as an attachment, Cortana ignores the sign-in card and performs the authorization flow using the Connect Account settings.
 
 ### Account name
 
@@ -65,37 +60,41 @@ Specify the scopes that the service requires (see the service's documentation).
 
 Set to `https://login.microsoftonline.com/common/oauth2/v2.0/authorize`.
 
+### Token options
+
+Select **POST**.
+
 ### Grant type
 
-Select Authorization code to use code grant flow. Select Implicit to use implicit flow.
+Select **Authorization code** to use the code grant flow, or select **Implicit** to use the implicit flow.
 
 ### Token URL
 
-If you select Authorization code, set to `https://login.microsoftonline.com/common/oauth2/v2.0/token`.
+For the **Authorization code** grant type, set to `https://login.microsoftonline.com/common/oauth2/v2.0/token`.
 
 ### Client secret/password for third party services
 
 The bot's password. You received the password when you registered your bot.
 
 ### Client authentication scheme
 
-Select HTTP Basic.
+Select **HTTP Basic**.
 
-### Token options
+### Internet access required to authenticate users
 
-Set to POST.
+Leave this unchecked.
 
 ### Request user profile data (optional)
 
-Cortana provides access to several different types of user profile information, that you can use to customize the bot for the user. For example, if a skill has access to the user’s name and location then the skill can have custom response such as “Hello Kamran, I hope you are having a pleasant day in Bellevue, Washington.”
+Cortana provides access to several different types of user profile information, that you can use to customize the bot for the user. For example, if a skill has access to the user's name and location then the skill can have custom response such as "Hello Kamran, I hope you are having a pleasant day in Bellevue, Washington."
 
-Click the **Add a user profile request** link, then select the user profile information you want from the drop-down list. Add a friendly name to use to access this information from your bot's code.
+Click **Add a user profile request**, then select the user profile information you want from the drop-down list. Add a friendly name to use to access this information from your bot's code.
 
-### Save skill
+### Deploy on Cortana
 
-When you are done filling out the registration form for your Cortana skill, click Save to complete the connection. This brings you back to your bot's Channels blade and you should see that it is now connected to Cortana.
+When you are done filling out the registration form for your Cortana skill, click **Deploy on Cortana** to complete the connection. This brings you back to your bot's Channels blade and you should see that it is now connected to Cortana.
 
-At this point your bot has already been automatically deployed as a Cortana skill to your account.
+At this point your bot is deployed as a Cortana skill to your account.
 
 ## Next steps
 

articles/bot-service-design-pattern-knowledge-base.md

@@ -172,7 +172,7 @@ Some knowledge bots might use QnA Maker to answer basic questions in combination
 2. Call LUIS first, and if no intent meets a specific threshold score, i.e., "None" intent is triggered, then call QnA Maker. Alternatively, create a LUIS intent for QnA Maker, feeding your LUIS model with example QnA questions that map to "QnAIntent." 
 3. Call QnA Maker first, and if no answer meets a specific threshold score, then call LUIS. 
 
-The Bot Builder SDK provide built-in support for LUIS and QnA Maker. This enables you to trigger dialogs or automatically answer questions using LUIS and/or QnA Maker without having to implement custom calls to either tool. See the [bot service templates](bot-service-concept-templates.md) for more information.
+The Bot Builder SDK provide built-in support for LUIS and QnA Maker. This enables you to trigger dialogs or automatically answer questions using LUIS and/or QnA Maker without having to implement custom calls to either tool. See the [Bot Builder Dispatch Tool Tutorial](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-tutorial-dispatch?view=azure-bot-service-4.0) for more information.
 
 > [!TIP]
 > When implementing a combination of LUIS, QnA Maker, and/or Azure Search, 

articles/bot-service-quickstart.md

@@ -45,7 +45,7 @@ Log in to the [Azure portal](http://portal.azure.com).
    | **Bot template** | Basic | Choose either **C#** or **Node.js** and select the **Basic** template for this quickstart, then click **Select**. The Basic template creates an echo bot. [Learn more](bot-service-concept-templates.md) about the templates. |
    | **App service plan/Location** | Your app service plan  | Select an [app service plan](https://azure.microsoft.com/en-us/pricing/details/app-service/plans/) location. Your location choice can be any location listed, though it's often best to choose a location closest to your customer. (Not available for Functions Bot.) |
    | **Azure Storage** | Your Azure storage account | You can create a new data storage account or use an existing one. By default, the bot will use [Table Storage](/azure/storage/common/storage-introduction#table-storage). |
-   | **Application Insights** | On | Decide if you want to turn [Application Insights](/bot-framework/bot-service-manage-analytics) **On** or **Off**. If you select **On**, you must also specify a regional location. Your location choice can be any location listed, though it's often best to choose a location closest to your customer. |
+   | **Application Insights** | On | Decide if you want to turn [Application Insights](/bot-framework/bot-service-manage-analytics) **On** or **Off**. If you select **On**, you must also specify a regional location. Your location choice can be any location listed, though it's often best to choose the same location as the bot service location. |
    | **Microsoft App ID and password** | Auto create App ID and password | Use this option if you need to manually enter a Microsoft App ID and password. Otherwise, a new Microsoft App ID and password will be created for you in the bot creation process. |
 
    > [!NOTE]
@@ -103,9 +103,9 @@ Log in to the [Azure portal](http://portal.azure.com).
  | **Pricing tier** | F0 | Select a pricing tier. You may update the pricing tier at any time. For more information, see [Bot Service pricing](https://azure.microsoft.com/en-us/pricing/details/bot-service/). |
  | **App name** | A unique name | The unique URL name of the bot. For example, if you name your bot *myawesomebot*, then your bot's URL will be `http://myawesomebot.azurewebsites.net`. The name must use alphanumeric and underscore characters only. There is a 35 character limit to this field. The App name cannot be changed once the bot is created. |
  | **Bot template** | Echo bot | Choose **SDK v4**. Select either C# or Node.js for this quickstart, then click **Select**.  
- | **App service plan/Location** | Your app service plan  | Select an [app service plan](https://azure.microsoft.com/en-us/pricing/details/app-service/plans/) location. Your location choice can be any location listed, though it's often best to choose a location closest to your customer. |
+ | **App service plan/Location** | Your app service plan  | Select an [app service plan](https://azure.microsoft.com/en-us/pricing/details/app-service/plans/) location. Your location choice can be any location listed, though it's often best to choose the same location as the bot service. |
  | **Azure Storage** | Your Azure storage account | You can create a new data storage account or use an existing one. By default, the bot will use [Table Storage](/azure/storage/common/storage-introduction#table-storage). |
- | **Application Insights** | On | Decide if you want to turn [Application Insights](/bot-framework/bot-service-manage-analytics) **On** or **Off**. If you select **On**, you must also specify a regional location. Your location choice can be any location listed, though it's often best to choose a location closest to your customer. |
+ | **Application Insights** | On | Decide if you want to turn [Application Insights](/bot-framework/bot-service-manage-analytics) **On** or **Off**. If you select **On**, you must also specify a regional location. Your location choice can be any location listed, though it's often best to choose the same location as the bot service. |
  | **Microsoft App ID and password** | Auto create App ID and password | Use this option if you need to manually enter a Microsoft App ID and password. Otherwise, a new Microsoft App ID and password will be created for you in the bot creation process. |
 
 4. Click **Create** to create the service and deploy the bot to the cloud. This process may take several minutes.

articles/bot-service-scenario-enterprise-productivity.md

@@ -45,7 +45,7 @@ The Enterprise Productivity Bot uses the following components:
 Azure Active Directory (Azure AD) is Microsoft’s multi-tenant cloud based directory and identity management service. As a Bot developer, Azure AD lets you focus on building your Bot by making it fast and simple to integrate with a world class identity management solution used by millions of organizations around the world. By defining an Azure AD app, you can control who has access to your Bot and the data it exposes, without implementing your own complex authentication and authorization system.
 
 ### Graph API to Office 365
-The Microsoft Graph exposes multiple APIs from Office 365 and other Microsoft cloud services through a single endpoint at https://graph.microsoft.com. Microsoft Graph makes it easier for you and Bot to to execute queries. The API exposes data from  multiple Microsoft cloud services, including Exchange Online as part of Office 365, Azure Active Directory, SharePoint, and more. You can use the API to navigate between entities and relationships. You can use the API from your Bots using the SDK or REST endpoints as well as from your other apps with native support Android, iOS, Ruby, UWP, Xamarin and more.
+The Microsoft Graph exposes multiple APIs from Office 365 and other Microsoft cloud services through a single endpoint at https://graph.microsoft.com. Microsoft Graph makes it easier for you and Bot to execute queries. The API exposes data from  multiple Microsoft cloud services, including Exchange Online as part of Office 365, Azure Active Directory, SharePoint, and more. You can use the API to navigate between entities and relationships. You can use the API from your Bots using the SDK or REST endpoints as well as from your other apps with native support Android, iOS, Ruby, UWP, Xamarin and more.
 
 ### Dynamics CRM
 Dynamics CRM is a customer engagement platform. Using Bots and CRM's APIs, you can build rich interactive Bots that can access the rich data stored in CRM. The power of Dynamics CRM is available to your Bot to create cases, check on status, knowledge management searches and more.

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

@@ -1,6 +1,6 @@
 ---
 title: Implement channel-specific functionality | Microsoft Docs
-description: Learn how to implement channel-specific functionality using the the Bot Builder SDK for .NET.
+description: Learn how to implement channel-specific functionality using the Bot Builder SDK for .NET.
 author: RobStand
 ms.author: kamrani
 manager: kamrani

articles/dotnet/bot-builder-dotnet-formflow-pattern-language.md

@@ -1,6 +1,6 @@
 ---
 title: Customize user experience with pattern language | Microsoft Docs
-description: Learn how to to customize FormFlow prompts and override FormFlow templates by using pattern language with the Bot Builder SDK for .NET.
+description: Learn how to customize FormFlow prompts and override FormFlow templates by using pattern language with the Bot Builder SDK for .NET.
 author: RobStand
 ms.author: kamrani
 manager: kamrani

articles/dotnet/bot-builder-dotnet-sdk-quickstart.md

@@ -49,8 +49,12 @@ Next, start the emulator and then connect to your bot in the emulator:
 ## Interact with your bot
 
 Send a message to your bot, and the bot will respond back with a message.
+
 ![Emulator running](../media/emulator-v4/emulator-running.png)
 
+> [!NOTE]
+> If you see that the message can not be sent, you might need to restart your machine as ngrok didn't get the needed privileges on your system yet (only needs to be done one time).
+
 ## Next steps
 
 > [!div class="nextstepaction"]

articles/includes/code/node-send-card-buttons.js

@@ -67,4 +67,5 @@ var msg = new builder.Message(session)
                 ]
         }
     });
+session.send(msg);
 // </addAdaptiveCardAttachment>