Resolve syncing conflicts from live-sync-work to live

articles/adaptive-dialog/adaptive-dialog-prebuilt-inputs.md

@@ -260,7 +260,7 @@ var ConfirmationDialog = new AdaptiveDialog("ConfirmationDialog") {
                     // text is read from a specific memory location. The caller of this dialog needs to
                     // set the prompt string to that location before calling the "ConfirmationDialog".
                     // All prompts support rich language generation based resolution for output generation.
-                    // See https://aka.ms/language-generation-file-format to learn more about the LG
+                    // See https://docs.microsoft.com/azure/bot-service/file-format/bot-builder-lg-file-format to learn more about the LG
                     // template format used in the ActivityTemplate object.
                     Prompt = new ActivityTemplate("${turn.contoso.travelBot.confirmPromptMessage}")
                 }
@@ -590,8 +590,8 @@ The following links provide generalized information on the topic of authenticati
 * [Add authentication to a bot][add-authentication]
 
 <!-- links -->
-[authentication]:https://aka.ms/azure-bot-authentication
-[add-authentication]:https://aka.ms/azure-bot-add-authentication
+[authentication]:../v4sdk/bot-builder-concept-authentication.md
+[add-authentication]:../v4sdk/bot-builder-authentication.md
 [recognizers]:../v4sdk/bot-builder-concept-adaptive-dialog-recognizers.md
 [adaptive-expressions]:../v4sdk/bot-builder-concept-adaptive-expressions.md
 [interruptions]: ../v4sdk/bot-builder-concept-adaptive-dialog-interruptions.md

articles/adaptive-dialog/adaptive-dialog-prebuilt-recognizers.md

@@ -429,16 +429,16 @@ If language is included, the example config should be like this:
 
 <!-- Footnote-style links -->
 [1]:../v4sdk/bot-builder-concept-adaptive-dialog-generators.md
-[2]:https://aka.ms/regular-expression-language-reference
+[2]:/dotnet/standard/base-types/regular-expression-language-quick-reference
 [3]:https://github.com/microsoft/botbuilder/blob/master/specs/botframework-activity/botframework-activity.md#locale
 [4]:https://luis.ai
-[5]:https://aka.ms/luis-what-is-luis
+[5]:/azure/cognitive-services/luis/what-is-luis
 [6]:https://aka.ms/botbuilder-luis-concept?view=azure-bot-service-4.0
 [7]:../file-format/bot-builder-lu-file-format.md
 [8]:../v4sdk/bot-builder-concept-adaptive-expressions.md
 [9]:https://aka.ms/luis-concept-data-extraction?tabs=v2
-[10]:https://aka.ms/bot-service-add-luis-to-bot
-[11]:https://aka.ms/luis-create-new-app-in-luis-portal
+[10]:../v4sdk/bot-builder-howto-v4-luis.md
+[11]:/azure/cognitive-services/luis/luis-how-to-start-new-app
 [12]:https://qnamaker.ai
 [13]:https://azure.microsoft.com/services/cognitive-services/
 [cross-train-concepts]: ../v4sdk/bot-builder-concept-cross-train.md

articles/bot-service-adapter-connect-webex.md

@@ -47,7 +47,7 @@ Before you can complete the configuration of our Webex app, you need to wire up
 
 ### Install the Webex adapter NuGet package
 
-Add  the [Microsoft.Bot.Builder.Adapters.Webex](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Webex/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](https://aka.ms/install-manage-packages-vs)
+Add  the [Microsoft.Bot.Builder.Adapters.Webex](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Webex/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](/nuget/tools/package-manager-ui)
 
 ### Create a Webex adapter class
 
@@ -89,7 +89,7 @@ Once added, your ***ConfigureServices*** method should look like this.
 
 Now that you have created a Webex app and wired up the adapter in your bot project, the final steps are to configure a Webex webhook, point it to the correct endpoint on your bot, and subscribe your app to ensure your bot receives messages and attachments. To do this your bot must be running, so that Webex can verify the URL to the endpoint is valid.
 
-1. 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. Your Webex messaging endpoint is the URL for your bot, which will be the URL of your deployed application (or ngrok endpoint), plus '/api/webex' (for example, `https://yourbotapp.azurewebsites.net/api/webex`).
+1. To complete this step, [deploy your bot to Azure](./bot-builder-deploy-az-cli.md) and make a note of the URL to your deployed bot. Your Webex messaging endpoint is the URL for your bot, which will be the URL of your deployed application (or ngrok endpoint), plus '/api/webex' (for example, `https://yourbotapp.azurewebsites.net/api/webex`).
 
     > [!NOTE]
     > If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Webex 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.

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

@@ -110,10 +110,10 @@ Next, you need to enable and authorize the Bot skill to connect to your account.
 
 ## Next steps
 
-* [Cortana Skills Kit](https://aka.ms/CortanaSkillsKitOverview)
+* [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]: https://aka.ms/cortana-channel-data
+[CortanaEntity]: /cortana/skills/cortana-channel-data

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

@@ -17,7 +17,7 @@ ms.author: v-mimiel
 
 This article describes how to connect a bot to the **Direct Line Speech channel**. Use this channel to allow users to interact with a bot via voice.
 
-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.
+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](/azure/cognitive-services/speech-service/). 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](/azure/cognitive-services/Speech-Service/voice-assistants) page.
 
 ## Prerequisites
 
@@ -77,7 +77,7 @@ With the Direct Line Speech channel connected to your bot, you now need to enabl
 
 1. Click `Save` at the top of the configuration page.
 
-1. The Bot Framework Protocol Streaming Extensions are now enabled for your bot. You are now ready to update your bot code and [integrate Streaming Extensions support](https://aka.ms/botframework/addstreamingprotocolsupport) to an existing bot project.
+1. The Bot Framework Protocol Streaming Extensions are now enabled for your bot. You are now ready to update your bot code and [integrate Streaming Extensions support](directline-speech-bot.md) to an existing bot project.
 
 ## Example
 
@@ -92,4 +92,4 @@ The following picture shows the client application interface when communicating
 > [!NOTE]
 > The following step is only needed for bots built before the release of the 4.8 SDKs.
 
-With the Direct Line Speech channel connected and support for the Bot Framework Protocol Streaming Extensions enabled, all that's left is to add code to your bot to support the optimized communication. Follow the instructions on [adding Streaming Extensions support to your bot](https://aka.ms/botframework/addstreamingprotocolsupport) to ensure full compatibility with Direct Line Speech.
+With the Direct Line Speech channel connected and support for the Bot Framework Protocol Streaming Extensions enabled, all that's left is to add code to your bot to support the optimized communication. Follow the instructions on [adding Streaming Extensions support to your bot](directline-speech-bot.md) to ensure full compatibility with Direct Line Speech.

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

@@ -251,7 +251,7 @@ Now that you have your Facebook app, page and credentials, you need to configure
 
 #### Install the Facebook adapter NuGet package
 
-Add  the [Microsoft.Bot.Builder.Adapters.Facebook](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Facebook/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](https://aka.ms/install-manage-packages-vs).
+Add  the [Microsoft.Bot.Builder.Adapters.Facebook](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Facebook/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](/nuget/tools/package-manager-ui).
 
 #### Create a Facebook adapter class
 
@@ -338,7 +338,7 @@ public void ConfigureServices(IServiceCollection services)
 
 Now that you have wired up the adapter in your bot project, you need to provide to Facebook the correct endpoint for your application, so that your bot will receive messages. You also need this URL to complete configuration of your bot application.
 
-To complete this step, [deploy your bot to Azure](https://aka.ms/bot-builder-deploy-az-cli) and make a note of the URL of your deployed bot.
+To complete this step, [deploy your bot to Azure](bot-builder-deploy-az-cli.md) and make a note of the URL of your deployed bot.
 
 > [!NOTE]
 > If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Facebook 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.

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

@@ -19,4 +19,4 @@ 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://aka.ms/channel-connect-teams).
+> 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](channel-connect-teams.md).

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

@@ -171,7 +171,7 @@ Once your app is created, collect the following information. You will need this
 
 #### Install the Slack adapter NuGet package
 
-Add  the [Microsoft.Bot.Builder.Adapters.Slack](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Slack/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](https://aka.ms/install-manage-packages-vs)
+Add  the [Microsoft.Bot.Builder.Adapters.Slack](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Slack/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](/nuget/tools/package-manager-ui)
 
 #### Create a Slack adapter class
 
@@ -270,7 +270,7 @@ public void ConfigureServices(IServiceCollection services)
 
 Now that you have created a Slack app and wired up the adapter in your bot project, the final step is to point the Slack app to the correct endpoint on your bot and subscribe your app to ensure your bot receives messages.  To do this your bot must be running, so that Slack can verify the URL to the endpoint is valid.
 
-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.
+To complete this step, [deploy your bot to Azure](bot-builder-deploy-az-cli.md) 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.
@@ -307,4 +307,4 @@ Navigate back to the [Slack API dashboard](https://api.slack.com/apps) and selec
 
     ![app testing](~/media/channels/slack-echobotapp-test.png)
 
-You can also test this feature using the [sample bot for the Slack adapter](https://aka.ms/csharp-60-slack-adapter-sample) by populating the appSettings.json file with the same values described in the steps above. This sample has additional steps described in the README file to show examples of link sharing, receiving attachments, and sending interactive messages.
+You can also test this feature using the [sample bot for the Slack adapter](https://aka.ms/csharp-60-slack-adapter-sample) by populating the appSettings.json file with the same values described in the steps above. This sample has additional steps described in the README file to show examples of link sharing, receiving attachments, and sending interactive messages.

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

@@ -94,7 +94,7 @@ Now that you have your Twilio number and account credentials, you need to config
 
 #### Install the Twilio adapter NuGet package
 
-Add  the [Microsoft.Bot.Builder.Adapters.Twilio](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Twilio/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](https://aka.ms/install-manage-packages-vs).
+Add  the [Microsoft.Bot.Builder.Adapters.Twilio](https://www.nuget.org/packages/Microsoft.Bot.Builder.Adapters.Twilio/) NuGet package. For more information on using NuGet, see [Install and manage packages in Visual Studio](/nuget/tools/package-manager-ui).
 
 #### Create a Twilio adapter class
 
@@ -181,7 +181,7 @@ public void ConfigureServices(IServiceCollection services)
 
 Now that you have wired up the adapter in your bot project, you need to identify the correct endpoint to provide to Twilio in order to ensure your bot receives messages. You also require this URL to complete configuration of your bot application.
 
-To complete this step, [deploy your bot to Azure](https://aka.ms/bot-builder-deploy-az-cli) and make a note of the URL of your deployed bot.
+To complete this step, [deploy your bot to Azure](bot-builder-deploy-az-cli.md) and make a note of the URL of your deployed bot.
 
 > [!NOTE]
 > If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Twilio 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. 

articles/bot-service-channels-reference.md

@@ -260,9 +260,9 @@ The following table shows the maximum number of Suggested Actions and Card Actio
 
 For more information about the numbers shown in the above table, refer to channel support code listed [here](https://aka.ms/channelactions). 
 
-For more information on _Suggested Actions_, refer to the [Use button for input](https://aka.ms/howto-add-buttons) article.
+For more information on _Suggested Actions_, refer to the [Use button for input](./v4sdk/bot-builder-howto-add-suggested-actions.md) article.
 
-For more information on _Card Actions_, refer to the [Send a hero card](https://aka.ms/howto-add-media#send-a-hero-card) section of the _Add media to messages_ article.
+For more information on _Card Actions_, refer to the [Send a hero card](./v4sdk/bot-builder-howto-add-media-attachments.md?view=azure-bot-service-4.0#send-a-hero-card) section of the _Add media to messages_ article.
 
 ## Card Support by Channel
 

articles/bot-service-resources-faq-availability.md

@@ -75,7 +75,7 @@ We highly recommend that you start migrating your V3 bots to V4. In order to sup
 3.    We do not prevent anyone from running old tools to manage their V3 bots.
 
 For more information please refer to the following references:
-* [Essential Migration Guidance](https://aka.ms/bf-migration-overview)
+* [Essential Migration Guidance](./v4sdk/migration/migration-overview.md)
 * Primary V4 Repositories to develop Bot Framework bots
   * [Botbuilder for dotnet](https://github.com/microsoft/botbuilder-dotnet)
   * [Botbuilder for JS](https://github.com/microsoft/botbuilder-js)

articles/bot-service-troubleshoot-500-errors.md

@@ -23,7 +23,7 @@ For AppInsights samples, see the luis-with-appinsights [C# sample](https://aka.m
 
  <!-- qna-with-appinsights ([C# sample](https://aka.ms/qna-with-appinsights) / [JS sample](https://aka.ms/js-qna-with-appinsights-sample)) samples demonstrate bots that support Azure Application Insights.-->
 
-See [conversation analytics telemetry](https://aka.ms/botframeworkanalytics) for information about how to add Application Insights to an existing bot.
+See [conversation analytics telemetry](./v4sdk/bot-builder-telemetry.md) for information about how to add Application Insights to an existing bot.
 
 ## Enable Application Insights on ASP.Net
 

articles/directline-speech-bot.md

@@ -160,4 +160,4 @@ protected override async Task OnMessageActivityAsync(ITurnContext<IMessageActivi
 
 - For a complete example of creating and using a voice enabled bot, see [Tutorial: Voice-enable your bot using the Speech SDK](https://docs.microsoft.com/azure/cognitive-services/speech-service/tutorial-voice-enable-your-bot-speech-sdk).
 
-- For more information on working with activities, see [how bots work](https://aka.ms/how-bots-work) and [how to send and receive text messages](https://aka.ms/bot-service-send-receive-text-messages).
+- For more information on working with activities, see [how bots work](./v4sdk/bot-builder-basics.md) and [how to send and receive text messages](./v4sdk/bot-builder-howto-send-messages.md).

articles/includes/bot-service-debug-bot/csharp-consumption.md

@@ -6,7 +6,7 @@ The Consumption plan serverless C\# environment in Bot Service has more in commo
 
 Before you can debug your Consumption plan C# bot, you must complete these tasks.
 
-- Download the source code for your bot (from Azure), as described in [Set up continuous deployment](https://aka.ms/bot-framework-emulator-publish-continuous-deployment).
+- Download the source code for your bot (from Azure), as described in [Set up continuous deployment](../../bot-service-build-continuous-deployment.md).
 - Download and install the [Bot Framework Emulator](https://aka.ms/Emulator-wiki-getting-started).
 - Install the <a href="https://www.npmjs.com/package/azure-functions-cli" target="_blank">Azure Functions CLI</a>.
 - Install the <a href="https://github.com/dotnet/cli" target="_blank">DotNet CLI</a>.

articles/includes/bot-service-debug-bot/python-vscode.md

@@ -16,4 +16,4 @@ In Visual Studio Code, you can set breakpoints and run the bot in debug mode to
 
    ![Debug Python in VS Code](~/media/bot-service-debug-bot/bot-debug-python-breakpoint-caught.png)
 
-For more information, see [Debug your Python code](https://aka.ms/bot-debug-python).
+For more information, see [Debug your Python code](/visualstudio/python/debugging-python-in-visual-studio).