Skip to content

Commit 54a4382

Browse files
authored
Release 'live' 03-28-2019 (#1389)
1 parent 4139ef7 commit 54a4382

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

articles/TOC.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
### [.NET](dotnet/bot-builder-dotnet-sdk-quickstart.md)
88
### [JavaScript](javascript/bot-builder-javascript-quickstart.md)
99
# Tutorials
10-
## [Create and deploy a basic bot](v4sdk/bot-builder-tutorial-basic-deploy.md)
11-
## [Add QnA Maker and redeploy a bot](v4sdk/bot-builder-tutorial-add-qna.md)
10+
## [1. Create and deploy a basic bot](v4sdk/bot-builder-tutorial-basic-deploy.md)
11+
## [2. Add QnA Maker and redeploy a bot](v4sdk/bot-builder-tutorial-add-qna.md)
1212
## [Add authentication to your bot](bot-builder-tutorial-authentication.md)
1313
# Samples
1414
## [botbuilder-samples repo on GitHub](https://github.com/Microsoft/BotBuilder-Samples/blob/master/README.md)

articles/bot-service-migrate-bot.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ manager: kamrani
77
ms.topic: article
88
ms.service: bot-service
99
ms.subservice: abs
10-
ms.date: 6/22/2017
10+
ms.date: 3/22/2019
1111
monikerRange: 'azure-bot-service-3.0'
1212
---
1313

1414
# Migrate your bot to Azure
1515

16-
17-
1816
All **Azure Bot Service (Preview)** bots created in the [Bot Framework Portal](http://dev.botframework.com) must migrate to the new Bot Service in Azure. The service was made generally available (GA) in December 2017.
1917

2018
Note that, registration bots connected only to the following channels are *not* required to migrate: **Teams**, **Skype**, or **Cortana**. For example, a registration bot connected to **Facebook** and **Skype** *is required* to migrate but a registration bot connected to **Skype** and **Cortana** *is not required* to migrate.
@@ -50,7 +48,7 @@ to `module.exports = connector.listen();`
5048
6. Test your bot locally by running the Functions bot using the Bot Framework Emulator. More info on how to run the *funcpack* bot [here](https://github.com/Azure/azure-functions-pack#how-to-run).
5149
7. Upload your code back to Azure. Make sure the `.funcpack` directory is uploaded. You do not need to upload the **node_modules** directory.
5250
8. Test your remote bot to make sure it responds as expected.
53-
9. [Migrate your bot](#migrate-your-bot-to-azure) using the steps above.
51+
9. Migrate your bot using the steps above.
5452

5553
## Migration under the hood
5654

articles/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: landing-page
88
layout: LandingPage
99
ms.service: bot-service
1010
ms.subservice: sdk
11-
ms.date: 01/16/2019
11+
ms.date: 03/28/2019
1212
---
1313
::: moniker range="azure-bot-service-3.0"
1414

@@ -97,8 +97,8 @@ ms.date: 01/16/2019
9797
</div>
9898

9999
<h2 style="margin-top: 36px">Step-by-Step Tutorials</h2>
100-
<p><a href="/bot-framework/bot-builder-tutorial-basic-deploy">Create and deploy a basic bot</a></p>
101-
<p><a href="/bot-framework/bot-builder-tutorial-add-qna">Add QnA Maker and redeploy a bot</a></p>
100+
<p><a href="/bot-framework/bot-builder-tutorial-basic-deploy">1. Create and deploy a basic bot</a></p>
101+
<p><a href="/bot-framework/bot-builder-tutorial-add-qna">2. Add QnA Maker and redeploy a bot</a></p>
102102
<h2 style="margin-top: 36px">Reference</h2>
103103
<ul class="panelContent cardsD">
104104
<li>

articles/v4sdk/bot-builder-concept-dialog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ You can use the dialog context to begin, continue, replace, or end a dialog. You
116116

117117
Dialogs can be thought of as a programmatic stack, which we call the *dialog stack*, with the turn handler as the one directing it and serving as the fallback if the stack is empty. The topmost item on that stack is considered the *active dialog*, and the dialog context directs all input to the active dialog.
118118

119-
When a dialog begins, it is pushed onto the stack, and is now the active dialog. It remains the active dialog until it either ends, it is removed by the [replace dialog](#repeating-a-dialog) method, or another dialog is pushed onto the stack (by either the turn handler or active dialog itself) and becomes the active dialog. When that new dialog ends, it is popped off the stack and the next dialog down becomes the active dialog again. This allows for [branching and looping](#looping-and-branching), discussed below.
119+
When a dialog begins, it is pushed onto the stack, and is now the active dialog. It remains the active dialog until it either ends, it is removed by the [replace dialog](#repeating-a-dialog) method, or another dialog is pushed onto the stack (by either the turn handler or active dialog itself) and becomes the active dialog. When that new dialog ends, it is popped off the stack and the next dialog down becomes the active dialog again. This allows for branching and looping, discussed below.
120120

121121
### Create the dialog context
122122

0 commit comments

Comments
 (0)