Release 'live' 02-11-2021 (#2587)

* Fixing Bug in NumberInput example (#2548) Co-authored-by: Jonathan Fingold <[email protected]> * Grammar/formatting updates - bot-builder-howto-add-media-attachments.md (#2526) * Grammer/formatting updates. Stopped the grammar pass, this article needs a technical review and updates. * Update bot-builder-howto-add-media-attachments.md * Update articles/v4sdk/bot-builder-howto-add-media-attachments.md Co-authored-by: Jonathan Fingold <[email protected]> * Update articles/v4sdk/bot-builder-howto-add-media-attachments.md Co-authored-by: Jonathan Fingold <[email protected]> * Update articles/v4sdk/bot-builder-howto-add-media-attachments.md Co-authored-by: Jonathan Fingold <[email protected]> * Update articles/v4sdk/bot-builder-howto-add-media-attachments.md Co-authored-by: Jonathan Fingold <[email protected]> * Update bot-builder-howto-add-media-attachments.md Co-authored-by: Jonathan Fingold <[email protected]> * mm-wht-doc-cleanup-02 (#2528) * Update bot-service-encryption.md Starting cleanup PR. * Update bot-service-encryption.md Fornatted text. * Update bot-builder-dialog-manage-conversation-flow.md Fixed style, removed "we" a subject. * Update bot-builder-concept-identity-providers.md Added link * Update bot-builder-concept-adaptive-dialog-generators.md Reorganized into * Apply suggestions from code review Co-authored-by: Emily Olshefski <[email protected]> * Fixed based on feedback * Fixed bassed on feedback * Update auth-aad-v2-settings.md Fixed based on feedback * Copyedits * Copyedits * Apply suggestions from code review Co-authored-by: Emily Olshefski <[email protected]> * Fixed based on feedback Co-authored-by: Emily Olshefski <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Grammar Pass for QnA how to, design nav and security articles. (#2538) Co-authored-by: Jonathan Fingold <[email protected]> * Fixed code tags. (#2550) Co-authored-by: Jonathan Fingold <[email protected]> * zxyanliu/grammarcheck/(3/4+4/4) (#2540) * Update bot-builder-concept-adaptive-dialog-interruptions.md * Update bot-service-channel-additional-channels.md * Update bot-service-channel-additional-channels.md * Update bot-builder-concept-adaptive-dialog-Actions.md * Update bot-service-channel-connect-directlinespeech.md * Update bot-builder-howto-bf-cli-deploy-luis.md * Update bot-builder-skills-overview.md * Update bot-service-overview-introduction.md * Update bot-framework-rest-direct-line-1-1-start-conversation.md * grammar spelling check Co-authored-by: Jonathan Fingold <[email protected]> * Policy: References for Bot Service (#2541) * Policy: References for Bot Service * Update articles/policy-reference.md Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Apply suggestions from code review Co-authored-by: Emily Olshefski <[email protected]> * mm-bot-deployment-issue (#2547) * Fixing issue https://github.com/MicrosoftDocs/bot-docs/issues/1972 * Upfdate content and fixed warnings * Added link to CLI doc set * Fixed warnings * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Apply suggestions from code review Co-authored-by: Emily Olshefski <[email protected]> Co-authored-by: zxyanliu <[email protected]> * Update the glossary (1/13) (#2542) * Update the glossary * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md * Update bot-framework-glossary.md Co-authored-by: Emily Olshefski <[email protected]> * mm-landing-page-links (#2555) * Update index.yml Fixed VA and Java links * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> * Update index.yml Restored old link * Update articles/index.yml Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Update FB channel topic per Artur's request (#2558) * Update FB channel topic per Artur's request * Correct casing of Messenger. * Fix JavaScript section of the Teams activity handler article (#2559) * WIP * Finish updating file. * Apply suggestions from code review Co-authored-by: Emily Olshefski <[email protected]> Co-authored-by: Emily Olshefski <[email protected]> * mm-faq-auth (#2552) * Update bot-service-resources-faq-security.yml Added FAQ entry. * Update bot-service-resources-faq-security.yml Fixed content. * Update bot-service-resources-faq-security.yml Rebuild * Fixed content * Update bot-service-resources-faq-security.yml Minor fix. * Fixed content, added links to the teh FAQ entries. * Update bot-service-resources-faq-security.yml Fixed content. * Update bot-service-resources-bot-framework-faq.md Fixed date * Update bot-service-resources-faq-security.yml Fixed content. * Update bot-service-resources-faq-security.yml Co-authored-by: Kyle Delaney <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Initialize Docs repository: https://github.com/MicrosoftDocs/bot-docs-pr of branch master * Test a writer's dashboard (#2560) * Create writer-dashboard.md * Retire and rewrite article(s) linking to Virtual Assistant (#2557) * Begin retirement and rewrite of article(s) linking to Virtual Assistant * Finish retire/rewrite * Update .openpublishing.redirection.json * Policy: Refs for 2021-01-25 (#2561) Co-authored-by: Jonathan Fingold <[email protected]> * Update writer-dashboard.md (#2563) * Update writer-dashboard.md * Update writer-dashboard.md * Update writer-dashboard.md * Update writer-dashboard.md * Update .openpublishing.publish.config.json (#2564) * Update glossary (#2567) * Update bot-framework-glossary.md * Update contributor-guide/bot-framework-glossary.md Co-authored-by: Emily Olshefski <[email protected]> Co-authored-by: Emily Olshefski <[email protected]> * Add to the writer's dashboard template (#2568) * Tweak. Add a couple more links. * Update writer-dashboard.md * Added missing content, fixed grammar and naming (#2566) * Issue 1976 - PR review and new article checklists (#2532) * Create pr-checklists.md * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> * Added review feedback * Update pr-checklists.md * Create pr-checklists.md * Update pr-checklists.md * Update pr-checklists.md * Update pr-checklists.md * Update pr-checklists.md * Update pr-checklists.md Co-authored-by: Jonathan Fingold <[email protected]> * Update bot-builder-howto-proactive-message.md (#2554) * Update bot-builder-howto-proactive-message.md * Update articles/v4sdk/bot-builder-howto-proactive-message.md Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * mm-bot-app-registration (#2571) * Fixed multi-tenant selection value * Deleted duplicated link. * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * mm-writers-help (#2562) * Create writers-help.md Starting article. * Update writers-help.md Added content * Update writers-help.md Added content * Update writers-help.md Added content * Update writers-help.md Fixed column size * Update writers-help.md resized column * Update writers-help.md Resized * Update writers-help.md Resize * Update writers-help.md Resized * Update writers-help.md Commented out WIP * Update writers-help.md Added content * Update writers-help.md Added more content. * Update writers-help.md Added links * Added content and reorganized it * Update writers-help.md Fixed format * Moved and renamed * Update writer-help.md Rebuild * Update writer-help.md Removed a link reorganized content. * Added images and fixed content * Update writer-help.md Fixed image link * Update writer-help.md Fixed image link * Update writer-help.md Fixed image link * Update writer-help.md Set table col sisze * Update writer-help.md Fixed col size * Update writer-help.md Using tables for links * Update writer-help.md Added content. * Update writer-help.md Fixed links * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Emily Olshefski <[email protected]> * Deleted image and fixed content based on feedback * Update writer-help.md Fixed metadata, removed image link, fixed typo. * Update writer-help.md Added missing info, organized links section. * Update writer-help.md Added API reference documentation process and links * Update writer-help.md Fixed format * Update writer-help.md Fixed headings * Update writer-help.md Fixed header * Update writer-help.md Fixed header * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> * Added image, fixed RAS access instructions Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Emily Olshefski <[email protected]> * Andreo/cortana retirement (#2573) * Changed cortana retirement message and remove Cortana from channel reference * Changed cortana retirement message and remove Cortana from channel reference * more cleanup Co-authored-by: Jonathan Fingold <[email protected]> * Policy: Refs for 2021-02-04 (#2576) * Policy: Refs for 2021-02-04 * Update articles/policy-reference.md Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Add to the glossary (#2574) * Update bot-framework-glossary.md * Update contributor-guide/bot-framework-glossary.md Co-authored-by: Emily Olshefski <[email protected]> * Update bot-framework-glossary.md * Update bot-framework-glossary.md * fix link Co-authored-by: Emily Olshefski <[email protected]> * updates to the write directly to storage article (#2569) * Updates to bot-builder-howto-v4-storage * Code snippit updates for C# and JS. Question: For the Cosmos DB primary key image, should I use **cosmos-db-keys-legend.png** or revert back to **cosmos-db-keys.png** ? * Updates for Python code examples for Cosmos DB * Update to images * Update bot-builder-howto-v4-storage.md * Update bot-builder-howto-v4-storage.md * Updates to the JavaSctript example code. * Update bot-builder-howto-v4-storage.md * Create create-blob-transcript-container.png * Update articles/v4sdk/bot-builder-howto-v4-storage.md Co-authored-by: Jonathan Fingold <[email protected]> * Update articles/v4sdk/bot-builder-howto-v4-storage.md Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * mm-dl-broken-link (#2575) * Update bot-service-design-pattern-embed-web-site.md Fixed broken link * Apply suggestions from code review Co-authored-by: Jonathan Fingold <[email protected]> Co-authored-by: Jonathan Fingold <[email protected]> * Update channels info (#2577) * Channels updates - Update [retired] Cortana article. - Add new [preview] Telephony article. * Update bot-service-manage-channels.md * Update bot-service-channel-connect-cortana.md * copy edits * Incorporate Artur's feedback * mm-dl-broken-link2 (#2582) * Update snippet-backchannel.md Fixed broken link * Update snippet-backchannel.md Fixed link * Update bot-service-resources-faq-security.yml (#2586) Removed Cortana from allow-list URLs in that firewall. : Co-authored-by: WashingtonKayaker <[email protected]> Co-authored-by: Michael Miele <[email protected]> Co-authored-by: Emily Olshefski <[email protected]> Co-authored-by: Jason Martinez <[email protected]> Co-authored-by: zxyanliu <[email protected]> Co-authored-by: David Coulter <[email protected]> Co-authored-by: Kyle Delaney <[email protected]> Co-authored-by: v-alje <[email protected]> Co-authored-by: Andrea-Orimoto <[email protected]>
MicrosoftDocs · openpublishbuild · Nov 24, 2020 · Nov 24, 2020 · Nov 25, 2020 · Nov 25, 2020
commit 22a92bc07c85f899b3b1dca4f19421bc302db23f
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -125,6 +125,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "botbuilder-java",
+      "url": "https://github.com/microsoft/botbuilder-java",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "botframework-sdk",
       "url": "https://github.com/microsoft/botframework-sdk",

diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -2091,6 +2091,16 @@
       "source_path": "articles/v4sdk/bot-builder-tutorial-basic-deploy.md",
       "redirect_url": "/azure/bot-service/bot-builder-tutorial-create-basic-bot",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/v4sdk/bot-builder-virtual-assistant-template.md",
+      "redirect_url": "/azure/bot-service/bot-builder-virtual-assistant-introduction",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/v4sdk/bot-builder-skills-overview.md",
+      "redirect_url": "/azure/bot-service/bot-builder-virtual-assistant-introduction",
+      "redirect_document_id": false
     }
   ]
 }
diff --git a/articles/TOC.yml b/articles/TOC.yml
@@ -276,7 +276,7 @@
         href: bot-service-manage-channels.md
       - name: Implement channel-specific functionality
         href: v4sdk/bot-builder-channeldata.md
-      - name: Cortana
+      - name: Cortana (retired)
         href: bot-service-channel-connect-cortana.md
       - name: Direct Line
         items:
@@ -321,6 +321,8 @@
         href: bot-service-channel-connect-slack.md
       - name: Telegram
         href: bot-service-channel-connect-telegram.md
+      - name: Telephony
+        href: bot-service-channel-connect-telephony.md
       - name: Twilio
         href: bot-service-channel-connect-twilio.md
       - name: WeChat
@@ -543,13 +545,7 @@
     - name: Transcript schema
       href: https://aka.ms/botSpecs-transcripts
   - name: Virtual Assistant
-    items:
-    - name: Overview
-      href: v4sdk/bot-builder-virtual-assistant-introduction.md
-    - name: Template Introduction
-      href: v4sdk/bot-builder-virtual-assistant-template.md
-    - name: Virtual Assistant Skills
-      href: v4sdk/bot-builder-skills-overview.md
+    href: v4sdk/bot-builder-virtual-assistant-introduction.md
   - name: WebChat
     items:
     - name: Overview

diff --git a/articles/bot-service-channel-connect-cortana.md b/articles/bot-service-channel-connect-cortana.md
@@ -1,120 +1,20 @@
 ---
 title: Connect a bot to Cortana - Bot Service
-description: Learn how to add speech functionality to bots by connecting them to Cortana, a speech-enabled channel. See how to publish bots as Cortana skills.
+description: The Cortana channel was retired for all customers on January 31, 2021.
 keywords: cortana, bot channel, configure cortana
 author: RobStand
 ms.author: kamrani
 manager: kamrani
 ms.topic: article
 ms.service: bot-service
-ms.date: 10/06/2020
+ms.date: 02/05/2021
 ---
 
 # Connect a bot to Cortana
 
 [!INCLUDE [applies-to-v4](includes/applies-to-v4-current.md)]
 
 > [!IMPORTANT]
-> **The Cortana channel has been retired for third-party developers on September 7, 2020.**
->
-> The Cortana skills kit for Consumer has been retired and it stopped accepting new bots on September 7, 2020. The Cortana skills kit for Enterprise is currently still available for TAP customers only.  [Learn more](https://docs.microsoft.com/cortana/skills/third-party-deprecation).
+> The Cortana channel was retired for all customers on January 31, 2021.
 
-Cortana is a speech-enabled channel that can send and receive voice messages in addition to textual conversation. A bot intended to connect to Cortana should be designed for speech as well as text. A Cortana *skill* is a bot that can be invoked using a Cortana client. Publishing a bot adds the bot to the list of available skills.
-
-To add the Cortana channel, open the bot in the [Azure Portal](https://portal.azure.com/), click the **Channels** blade, and then click **Cortana**.
-
-![Add Cortana channel](~/media/channels/cortana-addchannel.png)
-
-## Configure Cortana
-
-When connecting your bot with the Cortana channel, some basic information about your bot will be pre-filled into the registration form. Review this information carefully. This form consists of the following fields.
-
-| Field | Description |
-|------|------|
-| **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.|
-
-![Default settings](~/media/channels/cortana-defaultsettings.png)
-
-> [!NOTE]
-> Cortana doesn't currently support the use of Azure Active Directory account authentication. You'll need to use a Microsoft account to successfully publish your bot to Cortana.
-
-## 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. A Bot must be published to Azure before it can be connected to Cortana.
-
-![Manage user identity, part 1](~/media/channels/cortana-manageidentity-1.png)
-![Manage user identity, part 2](~/media/channels/cortana-manageidentity-2.png)
-
-### When should Cortana prompt for a user to sign in
-
-Select **Sign in at invocation** if you want Cortana to sign in the user at the time they invoke 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
-
-The name of your skill that you want displayed when the user signs in to your skill.
-
-### Client ID for third-party services
-
-Your bot's application ID. You received the ID when you registered your bot.
-
-### Space-separated list of scopes
-
-Specify the scopes that the service requires (see the service's documentation).
-
-### Authorization URL
-
-Set to `https://login.microsoftonline.com/common/oauth2/v2.0/authorize`.
-
-### Token options
-
-Select **POST**.
-
-### Grant type
-
-Select **Authorization code** to use the code grant flow, or select **Implicit** to use the implicit flow.
-
-### Token URL
-
-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**.
-
-### Internet access required to authenticate users
-
-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."
-
-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.
-
-### Deploy on 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 is deployed as a Cortana skill to your account.
-
-Next, you need to enable and authorize the Bot skill to connect to your account. In your Cortana app, say or type "ask *Invocation Name*" where the "Invocation Name" is what you configured in the Cortana Channel in the Azure portal. Cortana will then prompt you to allow your Bot Skill to connect. If you choose "Yes" to allow this, the skill will now work and show up in Cortana's skill list.
-
-## Next steps
-
-* [Cortana Skills Kit](/cortana/skills/overview)
-* [Enable debugging](bot-service-debug-cortana-skill.md)
-* [Publish a Cortana skill][publish]
-
-[invocation]: https://docs.microsoft.com/cortana/skills/cortana-invocation-guidelines
-[publish]: https://docs.microsoft.com/cortana/skills/publish-skill
-[CortanaEntity]: /cortana/skills/cortana-channel-data
+See [Connect a bot to channels](bot-service-manage-channels.md) for a list of supported channels.
diff --git a/articles/bot-service-channel-connect-facebook.md b/articles/bot-service-channel-connect-facebook.md
@@ -59,12 +59,12 @@ The bot is accessed through a Facebook Page.
 
 1. In the page bottom right, select **Save Changes**.
 
-### Enable messenger
+### Enable Messenger
 
 1. In the left pane, select **Dashboard**.
 1. In the right pane, scroll down to the **Messenger** box and select **Set Up**. The Messenger entry is displayed under the **PRODUCTS** section in the left pane.
 
-    ![Enable messenger](media/channels/fb-messenger-bot-enable-messenger.png)
+    ![Enable Messenger](media/channels/fb-messenger-bot-enable-messenger.png)
 
 ### Add pages and generate tokens
 
@@ -188,13 +188,11 @@ Please refer to the **Connect a bot to Facebook Messenger** section for details.
 
 ### Setting the API version
 
-If you receive a notification from Facebook about deprecation of a certain version of the Graph API, go to [Facebook developers page](https://developers.facebook.com). Navigate to your bot's **App Settings** and go to **Settings** > **Advanced** > **Upgrade API version**, then switch **Upgrade All Calls** to 3.0.
-
-![API version upgrade](media/channels/fb-version-upgrade.png)
+If you receive a notification from Facebook about deprecation of a certain version of the Graph API, go to [Facebook developers page](https://developers.facebook.com). Navigate to your bot's **App Settings** and go to **Settings** > **Advanced** > **Upgrade API version**, then switch **Upgrade All Calls** to version 4.0.
 
 ## 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.
+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][JS Workplace Adapter] and [C#/.NET][CS Workplace 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 Echo bot sample to connect it to Facebook.
@@ -222,7 +220,7 @@ The instructions below cover the C# implementation of the Facebook adapter. For
 
 1. You now need to associate your new app with a Facebook page&mdash;to create a page if you do not have an existing page you want to use, select **Create New Page** in the **Access Tokens** section. Select **Add or Remove Pages**, choose the page you want to associated with your app, and select **Next**. Leave the **Manage and access Page conversations on Messenger** setting enabled and select **Done**.
 
-![Set up messenger](media/bot-service-channel-connect-facebook/app-page-permissions.png)
+![Set up Messenger](media/bot-service-channel-connect-facebook/app-page-permissions.png)
 
 1. Once you have associated your page, select **Generate Token** to generate a page access token. Make a note of this token as you will need it in a later step when configuring your bot application.
 

diff --git a/articles/bot-service-channel-connect-telephony.md b/articles/bot-service-channel-connect-telephony.md
@@ -0,0 +1,18 @@
+---
+title: Connect a bot to Telephony - Bot Service
+description: Learn how to add support to your bot for the Telephony channel, a speech-enabled channel.
+author: JonathanFingold
+ms.author: kamrani
+manager: kamrani
+ms.topic: article
+ms.service: bot-service
+ms.date: 02/08/2021
+---
+
+# Connect a bot to Telephony (Preview)
+
+[!INCLUDE [applies-to-v4](includes/applies-to-v4-current.md)]
+
+The Telephony channel leverages the power of the Microsoft Bot Framework, in combination with Azure Communication Services and Microsoft Speech services, to enable phone calling capabilities in a bot.
+
+See the [Bot Framework Telephony project](https://github.com/microsoft/botframework-telephony#readme) for details.