Fix git push error for protected CLA branch

articles/TOC.md

@@ -18,7 +18,10 @@
 ## [Managing state](v4sdk/bot-builder-concept-state.md)
 ## [Dialogs library](v4sdk/bot-builder-concept-dialog.md)
 ## [Middleware](v4sdk/bot-builder-concept-middleware.md)
-## [User authentication](v4sdk/bot-builder-concept-authentication.md)
+## Authentication
+### [Bot authentication](v4sdk/bot-builder-concept-authentication.md)
+### [Identity providers](v4sdk/bot-builder-concept-identity-providers.md)
+### [Single sign on](v4sdk/bot-builder-concept-sso.md)
 ## [Manage bot resources](v4sdk/bot-file-basics.md)
 ## [How bots for Microsoft Teams work](v4sdk/bot-builder-basics-teams.md)
 ## [About skills](v4sdk/skills-conceptual.md)
@@ -31,15 +34,15 @@
 ### [Enterprise Productivity bot](bot-service-scenario-enterprise-productivity.md)
 ### [Information bot](bot-service-scenario-informational.md)
 ### [Internet of Things bot](bot-service-scenario-internet-things.md)
-# How-To 
+# How-To
 ## [Design](design/TOC.md)
 ## Develop
 <!-- ## [Best practice for welcoming the user](v4sdk/bot-builder-welcome-user.md) -->
 ### [Send and receive text message](v4sdk/bot-builder-howto-send-messages.md)
 ### [Add media to messages](v4sdk/bot-builder-howto-add-media-attachments.md)
 ### [Add buttons to guide user action](v4sdk/bot-builder-howto-add-suggested-actions.md)
-### [Save user and conversation data](v4sdk/bot-builder-howto-v4-state.md) 
-### [Prompt users for input](v4sdk/bot-builder-primitive-prompts.md) 
+### [Save user and conversation data](v4sdk/bot-builder-howto-v4-state.md)
+### [Prompt users for input](v4sdk/bot-builder-primitive-prompts.md)
 ### [Send welcome message to users](v4sdk/bot-builder-send-welcome-message.md)
 ### [Send proactive notifications to users](v4sdk/bot-builder-howto-proactive-message.md)
 ### [Implement sequential conversation flow](v4sdk/bot-builder-dialog-manage-conversation-flow.md)
@@ -51,7 +54,7 @@
 <!--#### [Implement a greeting dialog](v4sdk/bot-builder-dialogs-greeting.md)--TODO: Add once there's a sample.-->
 ### [Handle user interruptions](v4sdk/bot-builder-howto-handle-user-interrupt.md)
 ### [Write directly to storage](v4sdk/bot-builder-howto-v4-storage.md)
-### [Add authentication to your bot](v4sdk/bot-builder-authentication.md)
+### [Add authentication to a bot](v4sdk/bot-builder-authentication.md)
 ### [Implement custom storage for your bot](v4sdk/bot-builder-custom-storage.md)
 ### Skills
 #### [Implement a skill](v4sdk/skill-implement-skill.md)

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

@@ -17,7 +17,7 @@ ms.author: travisw
 
 You can configure your bot to allow client applications to communicate with it through the Direct Line Speech channel.
 
-Once you have built your bot, onboarding it with Direct Line Speech will enable low latency, high reliability connection with client applications using the [Speech SDK](https://aka.ms/speech/sdk). These connections are optimized for voice in, voice out conversational experiences. For more information on Direct Line Speech and how to build client applications, visit the [custom voice-first virtual assistant](https://aka.ms/bots/speech/va) page. 
+Once you have built your bot, onboarding it with Direct Line Speech will enable low latency, high reliability connection with client applications using the [Speech SDK](https://aka.ms/speech-service-docs). These connections are optimized for voice in, voice out conversational experiences. For more information on Direct Line Speech and how to build client applications, visit the [custom voice-first virtual assistant](https://aka.ms/cognitive-services-voice-assistants) page.
 
 ## Add the Direct Line Speech channel
 
@@ -29,9 +29,20 @@ Once you have built your bot, onboarding it with Direct Line Speech will enable
 
     ![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-connectspeechchannel.png "connecting Direct Line Speech")
 
-1. Direct Line Speech Channel requires a Cognitive Services resource. You can either use an existing resource or create a new Cognitive Services resource following the [instructions](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account). 
+1. Configure the Direct Line Speech as shown in the picture below.
 
-    ![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-cognitivesericesaccount-selection.png "selecting Cogntive Services resource")
+    ![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-cognitivesericesaccount-selection.png "selecting Cognitive Services resource")
+
+    The Direct Line Speech Channel requires a Cognitive Services resource, specifically a **speech** cognitive service resource. You can either use an existing resource or create a new one. To create a new speech resource follow these steps:
+
+    - Go to the [Azure portal create resources](https://ms.portal.azure.com/#create/hub).
+    - Search for *Speech* and select it from the drop-down list. The following is displayed:
+
+        ![create speech cognitive resource](media/voice-first-virtual-assistants/create-speech-cognitive-resource.PNG "Create speech cognitive resource")
+
+    - Follow the wizard steps.
+
+    For additional information, see [Create a Cognitive Services resource](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account).
 
 1. Once you've reviewed the terms of use, click `Save` to confirm your channel selection.
 
@@ -41,7 +52,7 @@ Once you have built your bot, onboarding it with Direct Line Speech will enable
 
 With the Direct Line Speech channel connected to your bot, you now need to enable Bot Framework Protocol Streaming Extensions support for optimal, low-latency interaction.
 
-1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com). 
+1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com).
 
 1. Click on **Settings** under the **Bot Management** category (right below **Channels**). Click the checkbox for **Enable Streaming Endpoint**.
 

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

@@ -131,7 +131,7 @@ Ensure that the Facebook Page associated with this bot is published. Status appe
 >
 > Facebook will only consider integrations with limited access to Workplace data (low sensitivity permissions) eligible for continued use until December 31, 2020 if such integrations have completed and passed Security RFI and if the developer reaches out before January 15, 2020 via [Direct Support](https://my.workplace.com/work/admin/direct_support) to request continued use of the app.
 >
-> Bot Framework adapters are available for [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) and [C#/.NET](https://aka.ms/bf-workplace-csharp) bots.
+> Bot Framework adapters are available for [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) and [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter) bots.
 
 Facebook Workplace is a business-oriented version of Facebook, which allows employees to easily connect and collaborate. It contains live videos, news feeds, groups, messenger, reactions, search, and trending posts. It also supports:
 
@@ -176,11 +176,11 @@ Create a [custom integration](https://developers.facebook.com/docs/workplace/cus
 
 ### Update your bot code with Facebook adapter
 
-Your bot's source code needs to be updated to include an adapter to communicate with Workplace by Facebook. Adapters are available for [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) and [C#/.NET](https://aka.ms/bf-workplace-csharp) bots.
+Your bot's source code needs to be updated to include an adapter to communicate with Workplace by Facebook. Adapters are available for [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) and [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter) bots.
 
 ### Provide Facebook credentials
 
-You will need to update appsettings.json of your bot with **Facebook App ID**, **Facebook App Secret** and **Page Access Token** values copied from the Facebook Workplace previously. Instead of a traditional pageID, use the numbers following the integrations name on its **About** page. Follow these instructions to update your bot source code in [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) or [C#/.NET](https://aka.ms/bf-workplace-csharp).
+You will need to update appsettings.json of your bot with **Facebook App ID**, **Facebook App Secret** and **Page Access Token** values copied from the Facebook Workplace previously. Instead of a traditional pageID, use the numbers following the integrations name on its **About** page. Follow these instructions to update your bot source code in [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) or [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter).
 
 ### Submit for review
 
@@ -199,7 +199,7 @@ If you receive a notification from Facebook about deprecation of a certain versi
 ## Connect a bot to Facebook using the Facebook adapter
 
 Use the Bot Framework Facebook adapter to connect your bot with Facebook Workplace. To connect to Facebook messenger, you can use the Facebook channel or the Facebook adapter.
-Facebook adapters are available for [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) and [C#/.NET](https://aka.ms/bf-workplace-csharp) bots.
+Facebook adapters are available for [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) and [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter) bots.
 
 In this article you will learn how to connect a bot to Facebook using the adapter.  This article will walk you through modifying the EchoBot sample to connect it to Facebook.
 

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

@@ -16,5 +16,5 @@ Skype for Business Online keeps you connected with co-workers and business partn
 
 > [!IMPORTANT]
 > **Skype for Business channel of Bot Framework was deprecated on June 30, 2019.**
-> 
-> Skype for Business channel stopped accepting new bots on June 30, 2019.  Existing bots continued operating through October 31, 2019.  The channel is currently being deprecated, and no production loads should be using it.  Microsoft Teams is the preferred communication tool from Microsoft.  Learn how to [connect your bot to Microsoft Teams](https://msdn.microsoft.com/microsoft-teams/bots).
+>
+> Skype for Business channel stopped accepting new bots on June 30, 2019.  Existing bots continued operating through October 31, 2019.  The channel is currently being deprecated, and no production loads should be using it.  Microsoft Teams is the preferred communication tool from Microsoft.  Learn how to [connect your bot to Microsoft Teams](https://aka.ms/channel-connect-teams).

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

@@ -19,42 +19,53 @@ There are two ways in which you can confgure Slack messaging app:
 ## [Azure Bot Service Portal](#tab/abs)
 ## Create a Slack application for your bot
 
-Log into [Slack](https://slack.com/signin) and then go to [create a Slack application](https://api.slack.com/apps) channel.
+1. In your browser, log into [Slack](https://slack.com/signin).
+1. Navigate to [create a Slack application](https://api.slack.com/apps) channel.
 
 ![Set up bot](~/media/channels/slack-NewApp.png)
 
 ## Create an app and assign a Development Slack team
 
-Enter an App Name and select a Development Slack Team. If you are not already a member of a Development Slack Team, [create or join one](https://slack.com/).
+1. Click the **Create New App** button.
+1. Enter an App Name and select a Development Slack Team.
+If you are not already a member of a Development Slack Team, [create or join one](https://slack.com/).
 
 ![Create app](~/media/channels/slack-CreateApp.png)
 
-Click **Create App**. Slack will create your app and generate a Client ID and Client Secret.
+1. Click the **Create App** button. Slack will create your app and generate a **Client ID** and **Client Secret**.
 
 ## Add a new Redirect URL
 
-Next you will add a new Redirect URL.
-
-1. Select the **OAuth & Permissions** tab.
-2. Click **Add a new Redirect URL**.
-3. Enter [https://slack.botframework.com](https://slack.botframework.com).
-4. Click **Add**.
-5. Click **Save URLs**.
+1. In the left panel, click the **OAuth & Permissions** link.
+2. In the right panel, click the **Add a new Redirect URL** button.
+3. Enter the following value `https://slack.botframework.com`.
+4. Click the **Add** button.
+5. Click the **Save URLs** button.
 
 ![Add Redirect URL](~/media/channels/slack-RedirectURL.png)
 
-## Create a Slack Bot User
+## Add bot token scopes
+<!-- Replaces add user -->
+1. In the left panel, click the **OAuth & Permissions** link.
+1. In the right panel, scroll down to **Scopes**.
+1. In the **Bot Token Scopes** section, click the **Add an OAuth Scope** button.
+1. Make sure to select the following scopes, also shown in the picture:
 
-Adding a Bot User allows you to assign a username for your bot and choose whether it is always shown as online.
+    - `app_mentions:read`
+    - `channels:history`
+    - `channels:read`
+    - `chat:write`
+    - `groups:history`
+    - `groups:read`
+    - `im:history`
+    - `mpim:history`
 
-1. Select the **Bot Users** tab.
-2. Click **Add a Bot User**.
+    ![slack bot scopes](media/channels/slack-bot-scopes.PNG)
 
-![Create bot](~/media/channels/slack-CreateBot.png)
+1. In the left panel select the **App Home** link.
+1. In the right panel, scroll down and enable **Always Show My Bot as Online**.
 
-Click **Add Bot User** to validate your settings, click **Always Show My Bot as Online** to **On**, and then click **Save Changes**.
-
-![Create bot](~/media/channels/slack-CreateApp-AddBotUser.png)
+    ![slack bot display](media/channels/slack-bot-display.PNG)
 
 ## Subscribe to Bot Events
 
@@ -73,12 +84,13 @@ Follow these steps to subscribe to six particular bot events. By subscribing to
 
 4. In **Subscribe to Bot Events**, click **Add Bot User Event**.
 5. In the list of events, select these six event types:
-    * `member_joined_channel`
-    * `member_left_channel`
-    * `message.channels`
-    * `message.groups`
-    * `message.im`
-    * `message.mpim`
+
+    - `member_joined_channel`
+    - `member_left_channel`
+    - `message.channels`
+    - `message.groups`
+    - `message.im`
+    - `message.mpim`
 
    ![Subscribe Events: middle](~/media/channels/slack-SubscribeEvents-b.png)
 
@@ -281,10 +293,10 @@ Now that you have created a Slack app and wired up the adapter in your bot proje
 To complete this step, [deploy your bot to Azure](https://aka.ms/bot-builder-deploy-az-cli) and make a note of the URL to your deployed bot.
 
 > [!NOTE]
-> If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Slack adapter, you can use a tool such as [ngrok](https://www.ngrok.com) (which you will likely already have installed if you have used the Bot Framework emulator previously) to tunnel through to your bot running locally and provide you with a publicly accessible URL for this. 
-> 
+> If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Slack adapter, you can use a tool such as [ngrok](https://www.ngrok.com) (which you will likely already have installed if you have used the Bot Framework emulator previously) to tunnel through to your bot running locally and provide you with a publicly accessible URL for this.
+>
 > If you wish create an ngrok tunnel and obtain a URL to your bot, use the following command in a terminal window (this assumes your local bot is running on port 3978, alter the port numbers in the command if your bot is not).
-> 
+>
 > ```
 > ngrok.exe http 3978 -host-header="localhost:3978"
 > ```

articles/bot-service-channel-directline-extension-net-bot.md

@@ -14,7 +14,8 @@ ms.date: 01/16/2020
 
 [!INCLUDE[applies-to-v4](includes/applies-to.md)]
 
-This article describes how to update a bot to work with **named pipes**, and how to enable the direct line app service extension in the **Azure App Service** resource where the bot is hosted.
+This article describes how to update a bot to work with **named pipes**, and how to enable the direct line app service extension in the **Azure App Service** resource where the bot is hosted. Please, also read this companion article [Create .NET Client to Connect to Direct Line App Service Extension](bot-service-channel-directline-extension-net-client.md).
+
 
 ## Prerequisites
 
@@ -79,7 +80,7 @@ This section describes how to enable the direct line app service extension using
 1. If it is not already enabled, click on the **Direct Line** channel to enable it.
 1. If it is already enabled, in the Connect to channels table click on the **Edit** link on the Direct Line row.
 1. Scroll down to the App Service Extension Keys section.
-1. Click on the **Show link** to reveal one of the keys, then copy its value.
+1. Click on the **Show link** to reveal one of the keys, then copy ad save its value. You will use this value in the next section.
 
 ![App service extension keys](./media/channels/direct-line-extension-extension-keys.png)
 
@@ -91,9 +92,11 @@ This section describes how to enable the direct line app service extension using
 
     |Name|Value|
     |---|---|
-    |DirectLineExtensionKey|<App_Service_Extension_Key_From_Section_1>|
+    |DirectLineExtensionKey|<App_Service_Extension_Key>|
     |DIRECTLINE_EXTENSION_VERSION|latest|
 
+    Where the *App_Service_Extension_Key* is the value you saved earlier.
+
 1. Within the *Configuration* section, click on the **General** settings section and turn on **Web sockets**
 1. Click on **Save** to save the settings. This restarts the Azure App Service.
 
@@ -106,3 +109,8 @@ If everything is correct, the page will return this JSON content: `{"k":true,"ib
 - **initialized** determines whether Direct Line ASE can use the App Service Extension Key to download the bot metadata from Azure Bot Service
 - **ib** determines whether Direct Line ASE can establish an inbound connection with the bot.
 - **ob** determines whether Direct Line ASE can establish an outbound connection with the bot.
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Create .NET Client](./bot-service-channel-directline-extension-net-client.md)