Release 'live' 08-07-2019 (MicrosoftDocs#1646)

Author: Kaiqb

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,15 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
 **Describe the bug**
+Please DO NOT use this template to ask question. For support visit [Stack Overflow](https://stackoverflow.com/questions/tagged/botframework). 
+
 A clear and concise description of what the bug is.
 
 **To Reproduce**

.openpublishing.redirection.json

@@ -706,4 +706,4 @@
       "redirect_document_id": true   
     }
   ]
-}
+}

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

@@ -7,7 +7,7 @@ ms.author: kamrani
 manager: kamrani
 ms.topic: conceptual
 ms.service: bot-service
-ms.date: 05/23/2019
+ms.date: 08/06/2019
 monikerRange: 'azure-bot-service-4.0'
 ---
 
@@ -52,6 +52,7 @@ az account set --subscription "<azure-subscription>"
 If you are not sure which subscription to use for deploying the bot, you can view the list of subscriptions for your account by using `az account list` command. Navigate to the bot folder.
 
 ### Create an App registration
+
 Registering the application means that you can use Azure AD to authenticate users and request access to user resources. Your bot requires a Registered app in Azure that provides the bot access to the Bot Framework Service for sending and receiving authenticated messages. To create register an app via the Azure CLI, perform the following command:
 
 ```cmd
@@ -66,13 +67,19 @@ az ad app create --display-name "displayName" --password "AtLeastSixteenCharacte
 
 The above command outputs JSON with the key `appId`, save the value of this key for the ARM deployment, where it will be used for the `appId` parameter. The password provided will be used for the `appSecret` parameter.
 
-You can deploy your bot in a new resource group or an exising resource group. Choose the option that works best for you.
+> [!NOTE] 
+> If you would like to use an existing App registration, you can use the command:
+> az bot create --kind webapp --resource-group "name-of-resource-group" --name "name-of-web-app" --appid "existing-app-id" --password "existing-app-password" --lang "Javascript | Csharp"_
 
-# [Deploy via ARM template (with **new** Resource Group)](#tab/newrg)
+You can deploy your bot in a new resource group or an existing resource group. Choose the option that works best for you.
 
+## Deploy via ARM template (with **new** Resource Group)
+<!--
+## [Deploy via ARM template (with **new**  Resource Group)](#tab/nerg)
+-->
 ### Create Azure resources
 
-You'll create a new resource group in Azure and then use the ARM template to create the resources specified in it. In this case, we are provding App Service Plan, Web App, and Bot Channels Registration.
+You'll create a new resource group in Azure and then use the ARM template to create the resources specified in it. In this case, we are providing App Service Plan, Web App, and Bot Channels Registration.
 
 ```cmd
 az deployment create --name "<name-of-deployment>" --template-file "template-with-new-rg.json" --location "location-name" --parameters appId="<msa-app-guid>" appSecret="<msa-app-password>" botId="<id-or-name-of-bot>" botSku=F0 newAppServicePlanName="<name-of-app-service-plan>" newWebAppName="<name-of-web-app>" groupName="<new-group-name>" groupLocation="<location>" newAppServicePlanLocation="<location>"
@@ -85,7 +92,10 @@ az deployment create --name "<name-of-deployment>" --template-file "template-wit
 | location |Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`. |
 | parameters | Provide deployment parameter values. `appId` value you got from running the `az ad app create` command. `appSecret` is the password you provided in the previous step. The `botId` parameter should be globally unique and is used as the immutable bot ID. It is also used to configure the display name of the bot, which is mutable. `botSku` is the pricing tier and can be F0 (Free) or S1 (Standard). `newAppServicePlanName` is the name of App Service Plan. `newWebAppName` is the name of the Web App you are creating. `groupName` is the name of the Azure resource group you are creating. `groupLocation` is the location of the Azure resource group. `newAppServicePlanLocation` is the location of the App Service Plan. |
 
-# [Deploy via ARM template (with **existing**  Resource Group)](#tab/erg)
+## Deploy via ARM template (with **existing**  Resource Group)
+<!--
+## [Deploy via ARM template (with **existing**  Resource Group)](#tab/erg)
+-->
 
 ### Create Azure resources
 
@@ -95,7 +105,8 @@ When using an existing resource group, you can either use an existing App Servic
 
 In this case, we are using existing App Service Plan, but creating new a Web App and Bot Channels Registration. 
 
-_Note: The botId parameter should be globally unique and is used as the immutable bot ID. Also used to configure the displayName of the bot, which is mutable._
+> [!NOTE]
+> The botId parameter should be globally unique and is used as the immutable bot ID. Also used to configure the displayName of the bot, which is mutable.
 
 ```cmd
 az group deployment create --name "<name-of-deployment>" --resource-group "<name-of-resource-group>" --template-file "template-with-preexisting-rg.json" --parameters appId="<msa-app-guid>" appSecret="<msa-app-password>" botId="<id-or-name-of-bot>" newWebAppName="<name-of-web-app>" existingAppServicePlan="<name-of-app-service-plan>" appServicePlanLocation="<location>"
@@ -121,23 +132,33 @@ az group deployment create --name "<name-of-deployment>" --resource-group "<name
 
 ### Retrieve or create necessary IIS/Kudu files
 
+### C# bots
+<!--
 ### [C# bots](#tab/csharp)
+-->
 
 ```cmd
 az bot prepare-deploy --lang Csharp --code-dir "." --proj-file-path "MyBot.csproj"
 ```
 
 You must provide the path to the .csproj file relative to --code-dir. This can be performed via the --proj-file-path argument. The command would resolve --code-dir and --proj-file-path to "./MyBot.csproj"
 
-### [JavaScript bots](#tab/javascript)
+
+### JavaScript bots
+<!--
+### [Javascript bots](#tab/javascript)
+-->
 
 ```cmd
 az bot prepare-deploy --code-dir "." --lang Javascript
 ```
 
 This command will fetch a web.config which is needed for Node.js apps to work with IIS on Azure App Services. Make sure web.config is saved to the root of your bot.
 
-### [TypeScript bots](#tab/typescript)
+### TypeScript bots
+<!--
+### [Typescript bots](#tab/typescript)
+-->
 
 ```cmd
 az bot prepare-deploy --code-dir "." --lang Typescript
@@ -187,7 +208,7 @@ az webapp deployment source config-zip --resource-group "<new-group-name>" --nam
 6. In the *Bot Channel Registration blade*, click **Test in Web Chat**.
 Alternatively, in the right panel, click the Test box.
 
-For more information about channel registration, see [Register a bot with Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-service-quickstart-registration?view=azure-bot-service-3.0).
+For more information about channel registration, see [Register a bot with Bot Service](https://docs.microsoft.com/azure/bot-service/bot-service-quickstart-registration?view=azure-bot-service-3.0).
 
 > [!NOTE]
 > A blade is the surface on which service functions or navigation elements appear when selected.
@@ -197,4 +218,4 @@ Deploying your bot to Azure will involve paying for the services you use. The [b
 
 ## Next steps
 > [!div class="nextstepaction"]
-> [Set up continous deployment](bot-service-build-continuous-deployment.md)
+> [Set up continuous deployment](bot-service-build-continuous-deployment.md)

articles/rest-api/bot-framework-rest-connector-api-reference.md

@@ -6,7 +6,8 @@ ms.author: kamrani
 manager: kamrani
 ms.topic: article
 ms.service: bot-service
-ms.date: 10/25/2018
+ms.date: 08/02/2019
+
 ---
 
 # API reference
@@ -305,83 +306,6 @@ The Microsoft Bot Framework State service is retired as of March 30, 2018. Previ
 | `Get Private Conversation Data` | Retrieves state data that has previously been stored for a specific user within the context of a specific conversation on a channel. |
 | `Delete State For User` | Deletes state data that has previously been stored for a user. |
 
-### Set User Data
-Stores state data for the specified user on the specified channel.
-```http
-POST /v3/botstate/{channelId}/users/{userId} 
-```
-
-| | |
-|----|----|
-| **Request body** | A `BotData` object |
-| **Returns** | A `BotData` object | 
-
-### Set Conversation Data
-Stores state data for the specified conversation on the specified channel.
-```http
-POST /v3/botstate/{channelId}/conversations/{conversationId}
-```
-
-| | |
-|----|----|
-| **Request body** | A `BotData` object |
-| **Returns** | A `BotData` object | 
-
-### Set Private Conversation Data
-Stores state data for the specified user within the context of the specified conversation on the specified channel.
-```http
-POST /v3/botstate/{channelId}/conversations/{conversationId}/users/{userId} 
-```
-
-| | |
-|----|----|
-| **Request body** | A `BotData` object |
-| **Returns** | A `BotData` object | 
-
-### Get User Data
-Retrieves state data that has previously been stored for the specified user across all conversations on the specified channel.
-```http
-GET /v3/botstate/{channelId}/users/{userId} 
-```
-
-| | |
-|----|----|
-| **Request body** | n/a |
-| **Returns** | A `BotData` object | 
-
-### Get Conversation Data
-Retrieves state data that has previously been stored for the specified conversation on the specified channel.
-```http
-GET /v3/botstate/{channelId}/conversations/{conversationId} 
-```
-
-| | |
-|----|----|
-| **Request body** | n/a |
-| **Returns** | A `BotData` object | 
-
-### Get Private Conversation Data
-Retrieves state data that has previously been stored for the specified user within the context of the specified conversation on the specified channel.
-```http
-GET /v3/botstate/{channelId}/conversations/{conversationId}/users/{userId} 
-```
-
-| | |
-|----|----|
-| **Request body** | n/a |
-| **Returns** | A [`BotData` object | 
-
-### Delete State For User
-Deletes state data that has previously been stored for the specified user on the specified channel by using either the [Set User Data](#set-user-data) operation or the [Set Private Conversation Data](#set-private-conversation-data) operation.
-```http
-DELETE /v3/botstate/{channelId}/users/{userId} 
-```
-
-| | |
-|----|----|
-| **Request body** | n/a |
-| **Returns** | An array of strings (IDs) | 
-
 ## Bot Framework Activity schema
 
 See the [Bot Framework Activity schema](https://aka.ms/botSpecs-activitySchema) for the objects and properties that your bot can use to communicate with a user.

articles/v4sdk/bot-builder-concept-activity-processing.md

@@ -3,11 +3,10 @@ title: Activity processing | Microsoft Docs
 description: Understand activity processing in the bot SDK.
 keywords: bot adapter, custom middleware, short circuit, fallback, event handlers
 author: jonathanfingold
-ms.author: jonathanfingold
+ms.author: kamrani
 manager: kamrani
 ms.topic: article
 ms.service: bot-service
-ms.subservice: sdk
 ms.date: 05/23/2019
 monikerRange: 'azure-bot-service-4.0'
 ---
@@ -18,7 +17,7 @@ monikerRange: 'azure-bot-service-4.0'
 
 The bot and user interact and exchange information via activities. Each activity received by your bot application is passed to a bot adapter, which passes activity information to your bot logic and ultimately sends any responses to the user. Receiving an activity, and subsequently processing it through your bot, is called a turn; this represents one complete cycle of your bot. A turn ends when all execution is done, the activity is fully processed and all the layers of the bot have completed.
 
-Activities, particularly those that [sent from a bot](#generating-responses) during a bot turn, are handled asynchronously. It's a necessary part of building a bot; if you need to brush up on how that all works, check out [async for .NET](https://docs.microsoft.com/dotnet/csharp/async) or [async for JavaScript](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/async_function) depending on your language choice.
+Activities, particularly those that are [sent from a bot](#generating-responses) during a bot turn, are handled asynchronously. It's a necessary part of building a bot; if you need to brush up on how that all works, check out [async for .NET](https://docs.microsoft.com/dotnet/csharp/async) or [async for JavaScript](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/async_function) depending on your language choice.
 
 ## The bot adapter
 

articles/v4sdk/bot-builder-howto-proactive-message.md

@@ -3,11 +3,10 @@ title: Send proactive notifications to users | Microsoft Docs
 description: Understand how to send notification messages
 keywords: proactive message, notification message, bot notification, 
 author: jonathanfingold
-ms.author: jonathanfingold
+ms.author: kamrani
 manager: kamrani
 ms.topic: article
 ms.service: bot-service
-ms.subservice: sdk
 ms.date: 05/23/2019
 monikerRange: 'azure-bot-service-4.0'
 ---
@@ -118,7 +117,7 @@ MicrosoftAppCredentials.TrustServiceUrl(serviceUrl);
 
 For proactive messaging, `serviceUrl` is the URL of the channel that the recipient of the proactive message is using and can be found in `Activity.ServiceUrl`. 
 
-You'll want to add the above code just prior to the the code that sends the proactive message. This sample has it near the end of `CreateCallback()` in `ProactiveBot.cs`, but it is commented out because it will not work in Emulator without an `appId` and `appPassword`.
+You'll want to add the above code just prior to the the code that sends the proactive message. In the [Proactive Messages Sample](https://github.com/microsoft/BotBuilder-Samples/tree/master/samples/csharp_dotnetcore/16.proactive-messages), you would put it in `NotifyController.cs` just before `await turnContext.SendActivityAsync("proactive hello");`.
 
 # [JavaScript](#tab/javascript)
 
@@ -128,7 +127,7 @@ MicrosoftAppCredentials.trustServiceUrl(serviceUrl);
 
 For proactive messaging, `serviceUrl` is the URL of the channel that the recipient of the proactive message is using and can be found in `activity.serviceUrl`.
 
-You'll want to add the above code just prior to the the code that sends the proactive message. This sample has it near the end of `completeJob()` in `bot.js`, but it is commented out because it will not work in Emulator without an `appId` and `appPassword`.
+You'll want to add the above code just prior to the the code that sends the proactive message. In the [Proactive Messages Sample](https://github.com/microsoft/BotBuilder-Samples/tree/master/samples/javascript_nodejs/16.proactive-messages), you would put it in `index.js` just before `await turnContext.sendActivity('proactive hello');`.
 
 ---
 

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

@@ -386,8 +386,8 @@ Comment out Memory Storage, replace with reference to Cosmos DB.
 **bot.js**
 ```javascript
 // initialized to access values in .env file.
-var dotenv = require('dotenv');
-dotenv.load();
+const ENV_FILE = path.join(__dirname, '.env');
+require('dotenv').config({ path: ENV_FILE });
 
 // Create local Memory Storage - commented out.
 // var storage = new MemoryStorage();
@@ -519,8 +519,8 @@ If you did not add code to load your `.env` file to implement Cosmos DB storage,
 
 ```javascript
 // initialized to access values in .env file.
-var dotenv = require('dotenv');
-dotenv.load();
+const ENV_FILE = path.join(__dirname, '.env');
+require('dotenv').config({ path: ENV_FILE });
 ```
 Now update your code to point "_storage_" to your existing Blob Storage account, by commenting out previous storage definitions and adding the following.
 

articles/v4sdk/bot-builder-telemetry.md

@@ -3,11 +3,10 @@ title: Add telemetry to your bot | Microsoft Docs
 description: Learn how to integrate your bot with the new telemetry features.
 keywords: telemetry, appinsights, monitor bot
 author: WashingtonKayaker
-ms.author: v-ivorb
+ms.author: kamrani
 manager: kamrani
 ms.topic: article
 ms.service: bot-service
-ms.subservice: sdk
 ms.date: 07/17/2019
 monikerRange: 'azure-bot-service-4.0'
 ---
@@ -383,6 +382,7 @@ There are three main components available for your bot to log telemetry, and eac
 - [*LuisRecognizer* class.](#telemetry-support-luis)  You can override for custom logging in two ways - per invocation (add/replace properties) or derived classes.
 - [*QnAMaker*  class.](#telemetry-qnamaker)  You can override for custom logging in two ways - per invocation (add/replace properties) or derived classes.
 
+
 All components log using the `IBotTelemetryClient`  (or `BotTelemetryClient` in node.js) interface which can be overridden with a custom implementation.