resolve conflicts from master to live feb.13

Jiayue Hu (Beyondsoft Consulting Inc) · Jiayue Hu (Beyondsoft Consulting Inc) · commit 7ad62cbf1413 · 2018-02-13T16:01:16.000-08:00
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -34,7 +34,7 @@
   "notification_subscribers": [],
   "branches_to_filter": [],
   "skip_source_output_uploading": false,
-  "need_preview_pull_request": false,
+  "need_preview_pull_request": true,
   "git_repository_branch_open_to_public_contributors": "master",
   "dependent_repositories": [
     {
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -1,5 +1,10 @@
 {
     "redirections": [
+    {
+      "source_path": "api/index.md",
+      "redirect_url": "/javascript/api/overview/azure",
+      "redirect_document_id": false
+    },
      {
       "source_path": "index.md",
       "redirect_url": "/javascript/azure",
@@ -9,6 +14,10 @@
       "source_path": "node-sdk-azure-install.md",
       "redirect_url": "/javascript/node-sdk-azure-get-started",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "node-howto-e2e.md",
+      "redirect_url": "https://code.visualstudio.com/docs/nodejs/nodejs-deployment",
+      "redirect_document_id": false
     }
-    ]
-}
+]}
diff --git a/docs-ref-mapping/reference.yml b/docs-ref-mapping/reference.yml

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"notification_subscribers": [],`
`35`	`35`	`"branches_to_filter": [],`
`36`	`36`	`"skip_source_output_uploading": false,`
`37`		`- "need_preview_pull_request": false,`
	`37`	`+ "need_preview_pull_request": true,`
`38`	`38`	`"git_repository_branch_open_to_public_contributors": "master",`
`39`	`39`	`"dependent_repositories": [`
`40`	`40`	`{`