Resolve syncing conflicts from live-sync-work to live

.gitignore

@@ -13,4 +13,4 @@ _samples/
 articles/directories.txt
 _themes*/
 
-.openpublishing.buildcore.ps1
+.openpublishing.buildcore.ps1

.openpublishing.publish.config.json

@@ -1,152 +1,148 @@
 {
-  "docsets_to_publish": [
-	  {
-	    "docset_name": "bot-framework",
-	    "build_source_folder": "articles",
-	    "build_output_subfolder": "bot-framework",
-	    "locale": "en-us",
-	    "monikers": [],
-	    "moniker_ranges": [
-	      ">= azure-bot-service-3.0",
-	      ">= botbuilder-3.12.2.4",
-	      ">= skypebotsmedia-1.5.0.1177-alpha",
-	      ">= botconnector-3.11.1"
-	    ],
-	    "open_to_public_contributors": true,
-	     "type_mapping": {
-		"Conceptual": "Content",
-		"ManagedReference": "Content",
-		"RestApi": "Content"
-	     },
-	     "build_entry_point": "docs",
-	     "template_folder": "_themes"
-	     },
-	     {
-	       "docset_name": "bot-framework-rest-api",
-	       "build_source_folder": "rest",
-	       "build_output_subfolder": "bot-framework-rest-api",
-	       "locale": "en-us",
-	       "monikers": [],
-	       "open_to_public_contributors": false,
-		"type_mapping": {
-		   "Conceptual": "Content",
-		   "ContextObject": "Toc",
-		   "ManagedReference": "Content",
-		   "RestApi": "Content"
-		},
-		"build_entry_point": "docs",
-		"template_folder": "_themes",
-		"version": 0
-		},
-		{
-		 "docset_name": "bot-framework-dotnet-api",
-		 "build_source_folder": "dotnet",
-		 "build_output_subfolder": "bot-framework-dotnet-api",
-		 "locale": "en-us",
-		 "open_to_public_contributors": true,
-		 "type_mapping": {
-		    "Conceptual": "Content",
-		    "ManagedReference": "Content",
-		    "RestApi": "Content"
-		},
-		 "build_entry_point": "docs",			
-		 "template_folder": "_themes",
-		  "customized_tasks": {
-		   "docset_postbuild": [
-		     "_dependentPackages/ECMA2Yaml/tools/PostBuild.ps1"
-		  ],
-		  "docset_prebuild": [
-		   "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
-		   "_dependentPackages/CommonPlugins/tools/SplitTOC.ps1",
-		   "_dependentPackages/CommonPlugins/tools/DiffFolder.ps1"
-		  ]
-		},
-		"customized_template_paths": [
-		  "_dependentPackages/memberpage.plugins/content"
-		  ]
-	     }
-	],
-	"notification_subscribers": [
-		"3b0e6dd6.microsoft.com@amer.teams.ms",
-		"botframeworkcontentteam@service.microsoft.com"
-	],
-	"sync_notification_subscribers": [],
-	"branches_to_filter": [],
-	"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/bot-docs",
-	"git_repository_branch_open_to_public_contributors": "live",
-	"skip_source_output_uploading": false,
-	"need_preview_pull_request": true,
-	"contribution_branch_mappings": {},
-    "dependent_repositories": [
-        {
-            "path_to_root": "_themes",
-            "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_mapping": {}
-        },
-        {
-            "path_to_root": "botbuilder-samples",
-            "url": "https://github.com/Microsoft/BotBuilder-Samples",
-            "branch": "master",
-            "branch_mapping": {}
-        }
-    ],
-	"branch_target_mapping": {
-		"live": [
-		   "Publish",
-		   "Pdf"
-		],
-		"master": [
-		   "Publish",
-		   "Pdf"
-	       ]
-	},
-	"need_generate_pdf_url_template": true,
-	"Targets": {
-	    "Pdf": {
-	    "template_folder": "_themes.pdf"
+   "docsets_to_publish":[
+      {
+         "docset_name":"bot-framework",
+         "build_source_folder":"articles",
+         "build_output_subfolder":"bot-framework",
+         "locale":"en-us",
+         "monikers":[],
+         "moniker_ranges":[
+            ">= azure-bot-service-3.0",
+            ">= botbuilder-3.12.2.4",
+            ">= skypebotsmedia-1.5.0.1177-alpha",
+            ">= botconnector-3.11.1"
+         ],
+         "open_to_public_contributors":true,
+         "type_mapping":{
+            "Conceptual":"Content",
+            "ManagedReference":"Content",
+            "RestApi":"Content"
+         },
+         "build_entry_point":"docs",
+         "template_folder":"_themes"
+      },
+      {
+         "docset_name":"bot-framework-rest-api",
+         "build_source_folder":"rest",
+         "build_output_subfolder":"bot-framework-rest-api",
+         "locale":"en-us",
+         "monikers":[],
+         "open_to_public_contributors":false,
+         "type_mapping":{
+            "Conceptual":"Content",
+            "ContextObject":"Toc",
+            "ManagedReference":"Content",
+            "RestApi":"Content"
+         },
+         "build_entry_point":"docs",
+         "template_folder":"_themes",
+         "version":0
+      },
+      {
+         "docset_name":"bot-framework-dotnet-api",
+         "build_source_folder":"dotnet",
+         "build_output_subfolder":"bot-framework-dotnet-api",
+         "locale":"en-us",
+         "open_to_public_contributors":true,
+         "type_mapping":{
+            "Conceptual":"Content",
+            "ManagedReference":"Content",
+            "RestApi":"Content",
+            "NetEnum":"Content",
+            "NetDelegate":"Content",
+            "NetNamespace":"Content",
+            "NetMember":"Content",
+            "NetType":"Content"
+         },
+         "build_entry_point":"docs",
+         "template_folder":"_themes",
+         "customized_tasks":{
+            "docset_postbuild":[
+               "_dependentPackages/ECMA2Yaml/tools/PostBuild.ps1"
+            ],
+            "docset_prebuild":[
+               "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
+               "_dependentPackages/CommonPlugins/tools/SplitTOC.ps1",
+               "_dependentPackages/CommonPlugins/tools/DiffFolder.ps1"
+            ]
          }
-	},
-	"need_generate_intellisense": false,
-	"template_folder": "_themes",
-	"dependent_packages": [
-		{
-		 "path_to_root": "_dependentPackages/CommonPlugins",
-		 "target_framework": "net45",
-		 "version": "latest",
-		 "id": "Microsoft.OpenPublishing.CommonPlugins",
-		  "nuget_feed": "https://www.myget.org/F/op/api/v2"
-		},
-		{
-		 "id": "Microsoft.DocAsCode.ECMA2Yaml",
-		 "nuget_feed": "https://www.myget.org/F/op/api/v2",
-		 "path_to_root": "_dependentPackages/ECMA2Yaml",
-		 "target_framework": "net45",
-		 "version": "latest"
-		},
-		{
-		   "path_to_root": "_dependentPackages/memberpage.plugins",
-		   "target_framework": "net45",
-		   "version": "latest",
-		   "id": "memberpage.plugins",
-		   "nuget_feed": "https://www.myget.org/F/docfx/api/v2"
-		}
-	],
-	"ECMA2Yaml": {
-		"SourceXmlFolder": "dotnet/xml",
-		"OutputYamlFolder": "dotnet/api",
-		"Flatten": true
-	},
-	"DiffFolder": [
-		"dotnet/api"
-	],
-	"SplitTOC": [
-		"dotnet/api/toc.yml"
-	]
+      }
+   ],
+   "notification_subscribers":[
+      "3b0e6dd6.microsoft.com@amer.teams.ms",
+      "botframeworkcontentteam@service.microsoft.com"
+   ],
+   "sync_notification_subscribers":[],
+   "branches_to_filter":[],
+   "git_repository_url_open_to_public_contributors":"https://github.com/MicrosoftDocs/bot-docs",
+   "git_repository_branch_open_to_public_contributors":"live",
+   "skip_source_output_uploading":false,
+   "need_preview_pull_request":true,
+   "contribution_branch_mappings":{},
+   "dependent_repositories":[
+      {
+         "path_to_root":"_themes",
+         "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_mapping":{}
+      },
+      {
+         "path_to_root":"botbuilder-samples",
+         "url":"https://github.com/Microsoft/BotBuilder-Samples",
+         "branch":"master",
+         "branch_mapping":{}
+      }
+   ],
+   "branch_target_mapping":{
+      "live":[
+         "Publish",
+         "Pdf"
+      ],
+      "master":[
+         "Publish",
+         "Pdf"
+      ]
+   },
+   "need_generate_pdf_url_template":true,
+   "Targets":{
+      "Pdf":{
+         "template_folder":"_themes.pdf"
+      }
+   },
+   "need_generate_intellisense":false,
+   "template_folder":"_themes",
+   "dependent_packages":[
+      {
+         "path_to_root":"_dependentPackages/CommonPlugins",
+         "target_framework":"net45",
+         "version":"latest",
+         "id":"Microsoft.OpenPublishing.CommonPlugins",
+         "nuget_feed":"https://www.myget.org/F/op/api/v2"
+      },
+      {
+         "id":"Microsoft.DocAsCode.ECMA2Yaml",
+         "nuget_feed":"https://www.myget.org/F/op/api/v2",
+         "path_to_root":"_dependentPackages/ECMA2Yaml",
+         "target_framework":"net45",
+         "version":"latest"
+      }
+   ],
+   "ECMA2Yaml":{
+      "SourceXmlFolder":"dotnet/xml",
+      "OutputYamlFolder":"dotnet/api",
+      "Flatten":true,
+      "SDPMode":true
+   },
+   "DiffFolder":[
+      "dotnet/api"
+   ],
+   "SplitTOC":[
+      "dotnet/api/toc.yml"
+   ]
 }

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/bot-service-quickstart.md",
+      "redirect_url": "https://docs.microsoft.com/azure/bot-service/abs-quickstart",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/azure-bot-service-build-options.md",
       "redirect_url": "https://docs.microsoft.com/azure/bot-service/bot-service-build-online-code-editor",
@@ -701,4 +706,4 @@
       "redirect_document_id": true   
     }
   ]
-}
+}

.vscode/docfx-assistant/topic-cache.json

@@ -0,0 +1 @@
+[]

art-source/nomnoml/13.core-bot.md

@@ -3,6 +3,7 @@ Diagrams for sample 13.core-bot, used in **Add natural language understanding to
 ## JavaScript
 
 ```nomnoml
+
 #font: Segoe UI
 #fontSize: 9
 #lineWidth: 1
@@ -18,31 +19,30 @@ Diagrams for sample 13.core-bot, used in **Add natural language understanding to
     userState
     |
     [onMessage]
-    [onDialog]
-    ]
+]
 
 [mainDialog]
 
-[bookingDialog|
-    [destinationStep]->[originStep]
-    [originStep]->[travelDateStep]
-    [travelDateStep]->[confirmStep]
-    [confirmStep]->[finalStep]
-]
+[bookingDialog]
 
 [bookingDetails|
     destination
     origin
     travelDate
 ]
 
+[FlightBookingRecognizer]
+
 [dialogAndWelcomeBot|
     [onMembersAdded]
     [CardFactory]
     [onMembersAdded]->[CardFactory]
 ]
 
 [dialogBot]->[mainDialog]
+[mainDialog]->[FlightBookingRecognizer]
 [mainDialog]->[bookingDialog]
 [bookingDialog]--[bookingDetails]
+[FlightBookingRecognizer]--[bookingDetails]
+
 ```