MicrosoftDocs · RobStand · Aug 7, 2017 · Jul 7, 2017 · Jul 7, 2017 · Jul 8, 2017
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -74,7 +74,7 @@
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/bot-framework-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_branch_open_to_public_contributors": "live",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "dependent_repositories": [
@@ -125,4 +125,4 @@
     "dotnet/api"
   ],
   "toc_path_need_to_split": "dotnet/api/toc.yml"
-}
+}
diff --git a/articles/azure/azure-bot-service-continuous-integration.md b/articles/azure/azure-bot-service-continuous-integration.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/azure/azure-bot-service-debug-bot.md b/articles/azure/azure-bot-service-debug-bot.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/azure/azure-bot-service-overview.md b/articles/azure/azure-bot-service-overview.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/azure/azure-bot-service-quickstart.md b/articles/azure/azure-bot-service-quickstart.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 # Create a bot with the Azure Bot Service

diff --git a/articles/azure/azure-bot-service-template-form.md b/articles/azure/azure-bot-service-template-form.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/azure/azure-bot-service-template-question-and-answer.md b/articles/azure/azure-bot-service-template-question-and-answer.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/azure/azure-bot-service-templates.md b/articles/azure/azure-bot-service-templates.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-builder-overview-getstarted.md b/articles/bot-builder-overview-getstarted.md
@@ -6,8 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: get-started-article
 ms.prod: bot-framework
-ms.date: 
----
+ms.date: 08/04/2017
 
 # Start building bots with the Bot Framework
 

diff --git a/articles/bot-design-conversation-flow.md b/articles/bot-design-conversation-flow.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-first-interaction.md b/articles/bot-design-first-interaction.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-navigation.md b/articles/bot-design-navigation.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-pattern-embed-app.md b/articles/bot-design-pattern-embed-app.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-pattern-embed-web-site.md b/articles/bot-design-pattern-embed-web-site.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-pattern-handoff-human.md b/articles/bot-design-pattern-handoff-human.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-pattern-knowledge-base.md b/articles/bot-design-pattern-knowledge-base.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-pattern-task-automation.md b/articles/bot-design-pattern-task-automation.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-principles.md b/articles/bot-design-principles.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/bot-design-user-experience.md b/articles/bot-design-user-experience.md
@@ -6,7 +6,7 @@ ms.author: mateusv
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/cognitive-services-bot-intelligence-overview.md b/articles/cognitive-services-bot-intelligence-overview.md
@@ -6,7 +6,7 @@ ms.author: rstand
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer:
 ---
 

diff --git a/articles/debug-bots-locally-vscode.md b/articles/debug-bots-locally-vscode.md
@@ -6,7 +6,7 @@ ms.author: v-demak
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/deploy-bot-github.md b/articles/deploy-bot-github.md
@@ -6,7 +6,7 @@ ms.author: rstand
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/deploy-bot-local-git.md b/articles/deploy-bot-local-git.md
@@ -6,71 +6,101 @@ ms.author: rstand
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
-ms.reviewer: 
+ms.date: 08/04/2017
 ---
 
 # Deploy a bot to Azure from a local git repository
 
 Azure allows continuous integration of your Git repository with your Azure deployment.
 With continuous integration, when you change and build your bot's code, the bot will automatically deploy to Azure.
-This tutorial shows you how to deploy a bot to Azure via continuous integration from local Git.
+This tutorial shows you how to deploy a bot to Azure via continuous integration from a local Git repository.
 
 > [!NOTE]
 > If you created a bot with the Azure Bot Service, your bot deployment was part of the Azure Bot Service bot 
 > creation process.
 
 ## Prerequisites
 
-You must have a Microsoft Azure subscription before you can deploy a bot to Azure. If you do not already have a subscription, you can register for a <a href="https://azure.microsoft.com/en-us/free/" target="_blank">free trial</a>. Additionally, the process described by this article requires <a href="https://git-scm.com/downloads" target="_blank">Git</a>.
+You must have a Microsoft Azure subscription before you can deploy a bot to Azure. If you do not already have a subscription, you can register for a <a href="https://azure.microsoft.com/en-us/free/" target="_blank">free trial</a>. You will also need <a href="https://git-scm.com/downloads" target="_blank">Git</a>.
 
 [!include[Pre-deployment considerations](~/includes/snippet-deploy-considerations.md)]
 
 ## Step 1: Install the Azure CLI
 
-Install the Azure CLI by following the instructions <a href="https://docs.microsoft.com/en-us/azure/xplat-cli-install" target="_blank">here</a>.
+Download and <a href="https://docs.microsoft.com/en-us/azure/xplat-cli-install" target="_blank">install the Azure CLI</a>. 
 
 ## Step 2: Create and configure an Azure site
 
-Login to your Azure account by running this command at the command prompt and following the instructions:
+Open a command prompt, Powershell, or other console and log in to your Azure account using the following command:
 
+```azurecli
+az login
 ```
-azure login
+
+Afer you log in, run the following command to create a resource group. Specify the name of the resource group you want to create and the location, such as *westus*, where your bot will be deployed.
+
+```azurecli
+az group create --location <Location> --name <MyResourceGroup>
 ```
 
-Next, run the following command to create a new Azure site and configure it for Git (where *\<appname\>* is the name of the site that you want to create):
+Run the following command to create a plan. Specify a name for the plan and the resource group name you specified in the previous step.
 
+```azurecli
+az appservice plan create --name <MyPlan> --resource-group <MyResourceGroup> --sku FREE
 ```
-azure site create --git <appname>
+
+The next step is to create a new Azure site. Find your bot's handle in the [Bot Framework Portal](https://dev.botframework.com/) on your bot's **SETTINGS** page. Run the following command with your bot's handle, the name of the resource group, and the name of your plan:
+
+```azurecli
+az webapp create --name <MyBotHandle> --resource-group <MyResourceGroup> --plan <MyPlan>
+```
+
+Git requires a user name-password pair to deploy a bot. The user name and password are account-level. They are different from your Azure subscription credentials. The user name must be unique, and the password must be at least eight characters long, with two of the following three elements: letters, numbers, symbols. You create this deployment user only once and you can use it for all your Azure deployments. Record the user name and password. You need them to deploy the bot later. 
+
+Create a deployment account with the following command with a user name and a password:
+
+```azurecli
+az webapp deployment user set --user-name <UserName> --password <Password>
 ```
 
 > [!TIP]
-> The URL of the site that is created will be in the following format: *https://appname.azurewebsites.net*.
+> If you get a **'Conflict'. Details: 409 error**, change the user name. If you get a **'Bad Request'. Details: 400 error**, 
+> use a stronger password. 
+
+Find the URL where Git will push your source code changes by running the following command:
+
+```azurecli
+az webapp deployment source config-local-git --name <MyBotHandle> --resource-group <MyResourceGroup> --query url --output tsv
+```
+
+Your URL will look similar to `https://<UserName>@<MyBotHandle>.scm.azurewebsites.net/<MyBotHandle>.git`.
+
+Connect your local Git repository to the bot hosted on Azure. A dialog will appear where you must provide the user name and password credentials you created earlier.
+
+```cli
+cd <MyGitRepo>
+git remote add azure <URLResultFromLastStep>
+git push azure master
+``` 
 
 ## Step 3: Commit changes to Git and push to the Azure site
 
 To update the site with your latest changes, run the following commands to commit the changes and push those changes to the Azure site:
 
-```
+```cli
 git add .
 git commit -m "<your commit message>"
 git push azure master
 ```
 
-You will be prompted to enter your deployment credentials.
-If you don't yet have them, you can configure them on the Azure Portal by following these steps:
-
-1. Login to the <a href="http://portal.azure.com" target="_blank">Azure Portal</a>
-2. Click the site that you've just created
-3. Open the **Settings** blade
-4. In the **PUBLISHING** section, click **Deployment credentials**, specify a username and password, and click save  
-![Deployment credentials](~/media/publishing-your-bot-deployment-credentials.png)
-5. Return to the command prompt and provide the deployment credentials as requested
-
-After you've entered your deployment credentials at the command prompt, your bot will be deployed to the Azure site.
+A dialog will appear where you must provide the user name and password credentials you created earlier.
 
 ## Step 4: Test the connection to your bot
 
 [!include[Verify connection to your bot](~/includes/snippet-verify-deployment-using-emulator.md)]
 
-[!include[Post-deployment next steps](~/includes/snippet-deploy-next-steps.md)]
+> [!NOTE]
+> Because your bot runs on Azure, you must enter its **app ID** and **password** into the emulator to connect, and because it's running remotely, you might need to provide the emulator with a path to **ngrok** tunneling software on your computer.
+
+
+[!include[Post-deployment next steps](~/includes/snippet-deploy-next-steps.md)]
diff --git a/articles/deploy-bot-overview.md b/articles/deploy-bot-overview.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer:
 ---
 # Deploy a bot to the cloud

diff --git a/articles/deploy-bot-visual-studio.md b/articles/deploy-bot-visual-studio.md
@@ -6,7 +6,7 @@ ms.author: rstand
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date:
+ms.date: 08/04/2017
 ms.reviewer: 
 ---
 

diff --git a/articles/docfx.json b/articles/docfx.json
@@ -34,7 +34,7 @@
             "breadcrumb_path": "/bot-framework/breadcrumb/TOC.json",
             "author": "RobStand",
             "ms.prod": "bot-framework",
-            "searchScope": ["Bot Framework"],
+            "searchScope": ["BotFramework"],
             "ms.date": "05/10/2017",
             "titleSuffix": "Bot Framework"
         },
@@ -55,4 +55,4 @@
         "template": [],
         "dest": "bot-framework"
     }
-}
+}
diff --git a/articles/dotnet/bot-builder-dotnet-activities.md b/articles/dotnet/bot-builder-dotnet-activities.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer:
 ---
 

diff --git a/articles/dotnet/bot-builder-dotnet-audio-calls.md b/articles/dotnet/bot-builder-dotnet-audio-calls.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer:
 ---
 

diff --git a/articles/dotnet/bot-builder-dotnet-channeldata.md b/articles/dotnet/bot-builder-dotnet-channeldata.md
@@ -6,7 +6,7 @@ ms.author: kibrandl
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 
+ms.date: 08/04/2017
 ms.reviewer:
 ---