Resolve syncing conflicts from live-sync-work to live

.openpublishing.publish.config.json

@@ -1,6 +1,11 @@
 {
   "need_generate_pdf": false,
   "need_generate_intellisense": false,
+  "Targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
   "docsets_to_publish": [
     {
       "docset_name": "bot-framework",
@@ -83,12 +88,21 @@
       "url": "https://github.com/Microsoft/templates.docs.msft",
       "branch": "master",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes.pdf",
+      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "branch": "master"
     }
   ],
   "branch_target_mapping": {
     "live": [
       "Publish",
       "Pdf"
+    ],
+    "master": [
+      "Publish",
+      "Pdf"
     ]
   },
   "need_generate_pdf_url_template": false,

articles/azure/azure-bot-service-continuous-integration.md

@@ -1,5 +1,5 @@
 ---
-title: Set up continuous integration for a bot that is built using Azure Bot Service | Microsoft Docs
+title: Set up continuous integration for a bot using Azure Bot Service | Microsoft Docs
 description: Learn how to set up continuous integration for a bot that is built using Azure Bot Service.
 author: kbrandl
 ms.author: kibrandl

articles/bot-builder-overview-getstarted.md

@@ -7,6 +7,8 @@ manager: rstand
 ms.topic: get-started-article
 ms.prod: bot-framework
 ms.date: 08/04/2017
+---
+
 
 # Start building bots with the Bot Framework
 

articles/dotnet/bot-builder-dotnet-quickstart.md

@@ -33,14 +33,11 @@ Get started by completing the following prerequisite tasks:
 
 2. In Visual Studio, <a href="https://docs.microsoft.com/en-us/visualstudio/extensibility/how-to-update-a-visual-studio-extension" target="_blank">update all extensions</a> to their latest versions.
 
-
-4. Download the [Bot Application](http://aka.ms/bf-bc-vstemplate), [Bot Controller](http://aka.ms/bf-bc-vscontrollertemplate), and [Bot Dialog](http://aka.ms/bf-bc-vsdialogtemplate) templates
-and install the template by saving the .zip file to your Visual Studio 2017 project templates directory.  
+4. Download the [Bot Application](http://aka.ms/bf-bc-vstemplate), [Bot Controller](http://aka.ms/bf-bc-vscontrollertemplate), and [Bot Dialog](http://aka.ms/bf-bc-vsdialogtemplate) .zip files. Install the templates by copying the .zip files to your Visual Studio 2017 project templates directory.  
 
 > [!TIP]
 > The Visual Studio 2017 project templates directory is typically located at `%USERPROFILE%\Documents\Visual Studio 2017\Templates\ProjectTemplates\Visual C#\`.
 
-
 ## Create your bot
 
 Next, open Visual Studio and create a new C# project. Choose the Bot Application template for your new project.

articles/dotnet/bot-builder-dotnet-real-time-deploy-visual-studio.md

@@ -1,6 +1,6 @@
 ---
-title: Deploy a Skype real-time audio video bot from Visual Studio to Azure | Microsoft Docs
-description: Learn how to deploy a bot to Azure using Visual Studio's built-in publishing feature.
+title: Deploy a Skype real-time media bot to Azure | Microsoft Docs
+description: Learn how to deploy a Skype real-time audio-video bot to Azure using Visual Studio's built-in publishing feature.
 author: MalarGit
 ms.author: malarch
 manager: ssulzer
@@ -9,7 +9,7 @@ ms.prod: bot-framework
 ms.date: 08/04/2017
 ---
 
-# Deploy a real-time audio-video bot from Visual Studio to Azure
+# Deploy a real-time media bot from Visual Studio to Azure
 Real-time media bots can be hosted in either an "IaaS" Azure Virtual Machine or a "classic" Azure Cloud Service. This article shows how to deploy a bot, hosted in an Azure Cloud Service Worker Role, from Visual Studio using its built-in publish capability.
 
 ## Prerequisites

articles/rest-api/bot-framework-rest-connector-concepts.md

@@ -1,5 +1,5 @@
 ---
-title: Key concepts in the Bot Connector service and Bot State service  | Microsoft Docs
+title: Key concepts in the Bot Connector service and Bot State service | Microsoft Docs
 description: Understand key concepts in the Bot Framework's Bot Connector service and Bot State service. 
 author: kbrandl
 ms.author: kibrandl