Merge upstream changes

.openpublishing.publish.config.json

@@ -13,7 +13,7 @@
       "build_output_subfolder": "bot-framework",
       "locale": "en-us",
       "monikers": [
-        "botbuilder-3.8",
+        "botbuilder-3.11.0",
         "skypebotsmedia-1.5.0.1177-alpha"
       ],
       "open_to_public_contributors": true,
@@ -47,7 +47,7 @@
       "build_output_subfolder": "bot-framework-dotnet-api",
       "locale": "en-us",
       "monikers": [
-        "botbuilder-3.8",
+        "botbuilder-3.11.0",
         "skypebotsmedia-1.5.0.1177-alpha"
       ],
       "open_to_public_contributors": true,

ThirdPartyNotices

@@ -7,7 +7,7 @@ see the [LICENSE](LICENSE) file, and grant you a license to any code in the repo
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
 may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
 The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+Microsoft's general trademark guidelines can be found at https://go.microsoft.com/fwlink/?LinkID=254653.
 
 Privacy information can be found at https://privacy.microsoft.com/en-us/
 

articles/channel-connect-bing.md

@@ -102,7 +102,7 @@ Publishing to the Bing channel makes the bot discoverable by the widest possible
 
 ![Bing website search results](~/media/channels/bing-contosoWeb.png)
 
-[conduct]: http://aka.ms/bf-conduct
-[practices]: http://docs.botframework.com/directory/best-practices/
-[review]: http://docs.botframework.com/directory/review-guidelines/
+[conduct]: https://aka.ms/bf-conduct
+[practices]: https://docs.botframework.com/directory/best-practices/
+[review]: https://docs.botframework.com/directory/review-guidelines/
 [terms]: https://aka.ms/bf-terms

articles/channel-connect-facebook.md

@@ -76,7 +76,7 @@ On the Bot Framework Portal, paste the **Page ID**, **App ID**, **App Secret**,
 
 ## Submit for review
 
-Facebook requires a Privacy Policy URL and Terms of Service URL on its basic app settings page. The [Code of Conduct](http://aka.ms/bf-conduct) page contains third party resource links to help create a privacy policy. The [Terms of Use](https://aka.ms/bf-terms) page contains sample terms to help create an appropriate Terms of Service document.
+Facebook requires a Privacy Policy URL and Terms of Service URL on its basic app settings page. The [Code of Conduct](https://aka.ms/bf-conduct) page contains third party resource links to help create a privacy policy. The [Terms of Use](https://aka.ms/bf-terms) page contains sample terms to help create an appropriate Terms of Service document.
 
 After the bot is finished, Facebook has its own [review process](https://developers.facebook.com/docs/messenger-platform/app-review) for apps that are published to Messenger. The bot will be tested to ensure it is compliant with Facebook's [Platform Policies](https://developers.facebook.com/docs/messenger-platform/policy-overview).
 

articles/channel-connect-slack.md

@@ -96,7 +96,7 @@ The Client ID, Client Secret, and Verification Token required for configuration
 
 ## Submit credentials
 
-In a separate browser window, return to the Bot Framework site at `http://dev.botframework.com/`.
+In a separate browser window, return to the Bot Framework site at `https://dev.botframework.com/`.
 
 1. Select **My bots** and choose the Bot that you want to connect to Slack.
 2. In the **Add a channel** section, click the Slack icon.

articles/channel-connect-webchat-speech.md

@@ -6,7 +6,7 @@ ms.author: v-demak
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 09/22/2017
+ms.date: 10/19/2017
 ---
 
 # How to enable speech in Web Chat
@@ -16,25 +16,43 @@ You can enable a voice interface in the Web Chat control. Users interact with th
 
 If the user types instead of speaking a response, Web Chat turns off the speech functionality and the bot gives only a textual response instead of speaking out loud. To re-enable the spoken response, the user can use the microphone to respond to the bot the next time. If the microphone is accepting input, it appears dark or filled-in. If it's grayed out, the user clicks on it to enable it.
 
+## Prerequisites
+
+  Before you run the sample, you need to have a Direct Line secret or token for the bot that you want to run using the Web Chat control. 
+  * See [Connect a bot to Direct Line](https://docs.microsoft.com/en-us/bot-framework/channel-connect-directline) for information on getting a Direct Line secret associated with your bot.
+  * See [Generate a Direct Line token](https://docs.microsoft.com/en-us/bot-framework/rest-api/bot-framework-rest-direct-line-3-0-authentication) for information on exchanging the secret for a token.
+
 ## Customizing Web Chat for speech
-To enable the speech functionality in Web Chat, you need to customize the JavaScript code that invokes the Web Chat control. You can try out voice-enabled Web Chat locally using the following steps: 
-
-1. Clone the <a href="https://github.com/Microsoft/BotFramework-WebChat/">Web Chat GitHub repository</a>.
-2. Run `npm install`.
-3. Run `npm run build` to build the dependencies and stylesheets that Web Chat requires.
-4. Edit the code in `/samples/speech/index.html` according to the type of speech support you want to add. The types of speech implementations are described in [Enable speech services](#enable-speech-services). 
-5. Start a web server: `npm run start`
-6. Aim your browser at `http://localhost:8000/samples?parameters`. For example, `http://localhost:8000/samples?s=YOURDIRECTLINESECRET` invokes the bot using a Direct Line secret. The parameters can be set in the query string and are described in the following list:
-
-   * s = Direct Line secret.
-   * t = Direct Line token. Obtain the token by calling Direct Line's Generate Token.
-   * domain = optional URL of an alternate Direct Line endpoint.
-   * webSocket = 'true' to use WebSocket to receive messages. The default value is false.
-   * userid, username = ID (and optionally name) of the bot user.
-   * botid, botname = ID (and optionally name) of the bot.
+To enable the speech functionality in Web Chat, you need to customize the JavaScript code that invokes the Web Chat control. You can try out voice-enabled Web Chat locally using the following steps.
+
+1. Download the [sample index.html](https://aka.ms/web-chat-speech-sample). <!-- this aka.ms link needs to be updated if the sample location changes -->
+2. Edit the code in `index.html` according to the type of speech support you want to add. The types of speech implementations are described in [Enable speech services](#enable-speech-services). 
+3. Start a web server. One way to do so is to use `npm http-server` at a Node.js command prompt.
+
+    * To install `http-server` globally so it can be run from the command line, run this command:
+
+    ```
+    npm install http-server- -g
+    ```
+
+    * To start a web server using port 8000, from the directory that contains `index.html`, run this command:
+
+    ```
+    http-server -p 8000
+    ```
+4. Aim your browser at `http://localhost:8000/samples?parameters`. For example, `http://localhost:8000/samples?s=YOURDIRECTLINESECRET` invokes the bot using a Direct Line secret. The parameters that can be set in the query string are described in the following table:
+
+  | Parameter | Description |
+  |-----------|-------------|
+  | s | Direct Line secret. See [Connect a bot to Direct Line](https://docs.microsoft.com/en-us/bot-framework/channel-connect-directline) for information on getting a Direct Line secret. |
+  | t | Direct Line token. See [Generate a Direct Line token](https://docs.microsoft.com/en-us/bot-framework/rest-api/bot-framework-rest-direct-line-3-0-authentication) for info on how to generate this token. |
+  | domain | Optional. The URL of an alternate Direct Line endpoint.  |
+  | webSocket | Optional. Set to 'true' to use WebSocket to receive messages. Default is `false`. |
+  | userid | Optional. The ID of the bot user.  |
+  | username | Optional. The user name of the bot's user.  |
+  | botid | Optional. ID of the bot. |
+  | botname | Optional. Name of the bot. |
 
-> [!TIP]
-> For more information on how to obtain the Direct Line secret and token, see [Authentication](https://docs.microsoft.com/en-us/bot-framework/rest-api/bot-framework-rest-direct-line-3-0-authentication).
 
 ## Enable speech services
 The customization allows you to add speech functionality in any of the following ways:
@@ -48,7 +66,7 @@ The customization allows you to add speech functionality in any of the following
 The following code instantiates speech recognizer and speech synthesis components that come with the browser. This method of adding speech is not supported by all browsers. 
 
 > [!NOTE] 
-> Google Chrome supports the browser speech recognizer. However, Chrome blocks the microphone in the following cases:
+> Google Chrome supports the browser speech recognizer. However, Chrome may block the microphone in the following cases:
 > * If the URL of the page that contains Web Chat begins with `http://` instead of `https://`.
 > * If the URL is a local file using the `file://` protocol instead of `http://localhost:8000`.
 
@@ -83,6 +101,7 @@ The following code passes the speech options to the Web Chat control:
 
 [!code-js[Pass speech options to Web Chat (JavaScript)](./includes/code/channel-connect-webchat-speech.js#PassSpeechOptionsToWebChat)]
 
+
 ## Next steps
 Now that you can enable voice interaction with Web Chat, learn how your bot constructs spoken messages and adjusts the state of the microphone:
 * [Add speech to messages (C#)](https://docs.microsoft.com/en-us/bot-framework/dotnet/bot-builder-dotnet-text-to-speech)

articles/conversation-designer/TOC.md

@@ -1,7 +1,9 @@
 # [Conversation Designer Overview](index.md)
 ## [Create a bot](conversation-designer-create-bot.md)
+## [Sample bots](conversation-designer-sample-bots.md)
 ## [Save bot](conversation-designer-save-bot.md)
 ## [Test bot](conversation-designer-debug-bot.md)
+## [Export and import bot](conversation-designer-export-import-bot.md)
 ## [Tasks](conversation-designer-tasks.md)
 ### [LUIS recognizer](conversation-designer-luis.md)
 ### [Code recognizer](conversation-designer-code-recognizer.md)

articles/conversation-designer/conversation-designer-context-object.md

@@ -38,9 +38,9 @@ The custom script callback functions you create may take many forms. While you c
 | ---- | ---- | ---- | ---- |
 | Before response function | context | **void** or **promise** | Function that is executed before a response is given. |
 | Process function | context | **void** or **promise** | Function that performs business logic. |
-| Decision function | context | **string** or **promise** | Function that makes decisions and conditional response based on business logic. |
-| Code recognizer function | context | **boolean** or **promise** | Custom business logic that gets run when a **Script trigger** occurs. |
-| Prompt function | context | **boolean** or **promise** | Function that executes as part of a prompt. |
+| Decision function | context | **string** or **promise** | Function that makes decisions based on business logic. The return string should match a condition from a [decision](conversation-designer-dialogues.md#decision-state) block. |
+| Code recognizer function | context | **boolean** or **promise** | Custom business logic that gets run when a **Script trigger** occurs. Return `true` to indicate a match. Otherwise, return `false` to cancel the match. |
+| onRecognize function | context | **boolean** or **promise** | Function that executes only if there is a match from a LUIS recognizer. Use this callback function to process LUIS entities and return an appropriate **boolean** value. Return `true` to indicate a match. Otherwise, return `false` to cancel the match. |
 
 ## IConversationContext interface
 
@@ -51,8 +51,6 @@ The `context` object exposes the following properties.
 
 | Name |  Code | Description |
 | ---- | ---- | ---- |
-| `contextEntities` | `context.contextEntities["entityName"][index].value` | Read-only. The **contextEntities** property persists until explicitly cleared or until the bot receives a new conversation (conversation update activity). |
-| `taskEntities` | `context.taskEntities["entityName"][index].value` | Read-only. The **taskEntities** property are cleared at the end of the current task execution. |
 | `request` | `context.request` | Get the request object that contains the bot's activity.  |
 | | `context.request.attachment` | An attachment activity that may contains an adaptive card. |
 | | `context.request.text` | A text activity that contains the incoming text message from the client. |
@@ -61,28 +59,16 @@ The `context` object exposes the following properties.
 | `responses` | `context.responses` | Maintains an array of activities that will be sent back to the client at the end of the current state or code behind execution. |
 | | `context.responses.push` | Add an activity to the response. |
 | `global` | `context.global` | A JavaScript object that contains conversational data you defined. This object persists throughout the conversation. |
+| `local` | `context.local` | A JavaScript object that contains task data you defined. This object persists for the duration of a specific task. LUIS intents are always returned to the local context. If you want to persist LUIS results, consider copying it to the `context.global` context. |
+| | `context.local['@description']` | Returns the raw Entities received from LUIS. |
 | `sticky` | `context.sticky` | Indicates the current task name |
+| `currentTemplate` | `context.currentTemplate` | A [conditional response template](conversation-designer-response-templates.md#conditional-response-templates) that is called for both the display and speak evaluations. This object contains three properties: <br/>1. **name**: The name of the current template. <br/>2. **modalityDisplay**: A boolean that indicates the modality is associated with a display evaluation. <br/>3. **modalitySpeak**: A boolean that indicates the modality is associated with a speak evaluation. |
 
 ## Context methods
 The `context` object exposes the following methods.
 | Name | Return type | Code | Description |
 | ---- | ---- | ---- | ---- |
-| `addTaskEntity` | **IConversationContext** | `context.addTaskEntity("entityName", "entityValue");` | Add a task entity. Task entities are cleared at the end of the current task execution. |
-| `containsTaskEntity` | **boolean** | `context.containsTaskEntity("entityName", "entityValue");` | Indicates if **taskEntities** contains the entity. |
-| `getCurrentTurn` | **number**| `context.getCurrentTurn();` | Get the turn from the Frame on top of the stack if you are executing a reprompt. |
-| `removeTaskEntity` | **IConversationContext** | `context.removeTaskEntity("entityName");` | Remove a task entity. |
-## Entity interface
-
-The **Entity** interface exposes the following **read-only** properties.
-
-| Name | Return type | Description |
-| ---- | ---- | ---- |
-| `type` | **string** | The entity type (e.g.: color, city, sport, etc...). |
-| `value` | **string** | The value of the entity extracted from the utterance (e.g.: red, Seattle, Football). |
-| `startIndex` | **number** | The starting index of the entity extracted from the utterance. |
-| `endIndex` | **number** | The ending index of the entity extracted from the utterance. |
-| `score` | **number** | The confidence score of an entity (e.g.: range between 0 to 1). |
-| `resolution` | **EntityResolution** | A property bag with more information about an entity. Look at [builtin.datetime](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/pre-builtentities) for an example of how the **score** is used. |
+| `getCurrentTurn` | **number** | `context.getCurrentTurn();` | Get the turn from the Frame on top of the stack if you are executing a reprompt. |
 
 ## Next step
 > [!div class="nextstepaction"]

articles/conversation-designer/conversation-designer-create-bot.md

@@ -1,7 +1,7 @@
 ---
-title: Create a bot | Microsoft Docs
+title: Create a Conversation Designer bot | Microsoft Docs
 description: Learn how to create a new bot using Conversation Designer.
-author: vkannan
+author: v-ducvo
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
@@ -14,34 +14,40 @@ ROBOTS: NoIndex, NoFollow
 > Conversation Designer is not available to all customers yet. More details on
 > availability of Conversation Designer will come later this year.
 
-This tutorial walks you through step-by-step instructions for creating a new bot. 
+This tutorial walks you through step-by-step instructions for creating a new Conversation Designer bot. 
 
 ## Prerequisites
 
-- An [Azure subscription](https://azure.microsoft.com/en-us/)
+- Conversation Designer requires an Azure subscription. You can get started <a href="https://azure.microsoft.com/en-us/" target="_blank">here</a>
+- If you haven't done so already, make sure you sign in to the [LUIS portal](https://luis.ai) at least once after you created an account with them.
 - Familiarity with JavaScript programming. Custom script functions are written in JavaScript.
-- Microsoft Edge, Google Chrome
+- Microsoft Edge or Google Chrome
 
-## Setting up the environment 
+## Create a Conversation Designer bot
 
-To set up the environment, use the email address you provided to Microsoft Corporation to participate in this private preview release.
-1. Go to https://dev.botframework.com/, and sign in.
-2. Click **CREATE A BOT OR SKILL** in the top navigation panel. 
-3. Click **Create** to create a bot with the Conversation Designer.
-4. On the next page, complete all fields, and then click **Create bot** – it takes about 2 minutes for bot provisioning to complete. 
+To create a Conversation Designer bot, follow these steps:
+1. Go to https://dev.botframework.com/, and sign in. Use the email address you provided to Microsoft Corporation to participate in this private preview release.
+2. Click **Create a bot** in the top-right navigation panel. 
+3. Click **Create** to *Create a bot with the Conversation Designer*.
+4. Select from one of the many [sample bots](conversation-designer-sample-bots.md) to start with. Click **Next**. If you are not sure which **sample bot** to use, just choose the one you think is the closest to a bot you want to build. You can later switch to a different **sample bot**.
+5. Complete all fields and click **Create bot** – it takes about 2 minutes for bot provisioning to complete. 
 
 ## Bot Provisioning
 
-The following Azure features are automatically provisioned: 
+The following Azure features are automatically provisioned when you create a Conversation Designer bot: 
 
-1. Azure resource group with the bot name you specified 
+1. Azure resource group with the bot name you specified
 2. Azure App service
 3. Azure App Service plan 
 4. Azure Storage account
 5. Application Insights 
-6. Cognitive Services subscription for [LUIS.ai](http://luis.ai)
+6. Cognitive Services subscription for [LUIS.ai](https://luis.ai). A LUIS app is created with the **Bot handle** (plus a randomly generated string) as the app name.
 7. Microsoft Account single app. [Learn more](https://apps.dev.microsoft.com/#/appList)
 
+## Welcome message
+
+Once the bot is provisioned, Conversation Designer will open the bot's **Build** page. A welcome message appears with information to help you get started. Explore those options or close the message and start working on your bot. You can get back to the welcome message by clicking the ellipses (**...**) from the top-left navigation panel, and then choosing the **Welcome...** option.
+
 ## Next step
 > [!div class="nextstepaction"]
 > [Save bot](conversation-designer-save-bot.md)

articles/conversation-designer/conversation-designer-debug-bot.md

@@ -38,6 +38,6 @@ module.exports.Respond_beforeResponse = function(context) {
 ## Runtime Output
 Errors or exceptions generated by the runtime are displayed here. For example, if your bot is failing to respond, look at the output to investigate what caused the exception or error. If there are too many messages in the output window, you can click **Clear all**, and then test your bot again by sending the bot a message to see the error details. 
 
- ## Next step
+## Next step
 > [!div class="nextstepaction"]
-> [Tasks](conversation-designer-tasks.md)
+> [Import and export bot](conversation-designer-export-import-bot.md)