From 5cb4b1b385f2b755eba9ee3af7bb5e6c8c96efeb Mon Sep 17 00:00:00 2001 From: fenxu Date: Tue, 25 Apr 2017 04:39:45 +0000 Subject: [PATCH 01/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 20 +++++++++++++--- windows/keep-secure/docfx.json | 37 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 windows/keep-secure/docfx.json diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index d9783442a2..868dd2f9a6 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -43,7 +43,6 @@ "ManagedReference": "Content", "RestApi": "Content" }, - "build_entry_point": "docs", "template_folder": "_themes", "version": 0 @@ -293,6 +292,22 @@ "build_entry_point": "docs", "template_folder": "_themes", "version": 0 + }, + { + "docset_name": "keep-secure", + "build_source_folder": "windows/keep-secure", + "build_output_subfolder": "keep-secure", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 } ], "notification_subscribers": [ @@ -314,5 +329,4 @@ } ], "need_generate_pdf_url_template": false -} - +} \ No newline at end of file diff --git a/windows/keep-secure/docfx.json b/windows/keep-secure/docfx.json new file mode 100644 index 0000000000..8d60cf1552 --- /dev/null +++ b/windows/keep-secure/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "**/includes/**", + "README.md", + "LICENSE", + "LICENSE-CODE", + "ThirdPartyNotices" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "keep-secure" + } +} \ No newline at end of file From cf9646e66e741cdb7c5a88df55fc93cb0882bf0e Mon Sep 17 00:00:00 2001 From: fenxu Date: Tue, 25 Apr 2017 04:41:19 +0000 Subject: [PATCH 02/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 16 +++++++++++++ windows/manage/docfx.json | 37 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 windows/manage/docfx.json diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 868dd2f9a6..beeb3a5c8d 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -308,6 +308,22 @@ "build_entry_point": "docs", "template_folder": "_themes", "version": 0 + }, + { + "docset_name": "windows-manage", + "build_source_folder": "windows/manage", + "build_output_subfolder": "windows-manage", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 } ], "notification_subscribers": [ diff --git a/windows/manage/docfx.json b/windows/manage/docfx.json new file mode 100644 index 0000000000..628f06503d --- /dev/null +++ b/windows/manage/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "**/includes/**", + "README.md", + "LICENSE", + "LICENSE-CODE", + "ThirdPartyNotices" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "windows-manage" + } +} \ No newline at end of file From e19d21e82acd0f62f68537044c15752ae76e162a Mon Sep 17 00:00:00 2001 From: fenxu Date: Tue, 25 Apr 2017 04:42:53 +0000 Subject: [PATCH 03/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 16 +++++++++++++ windows/plan/docfx.json | 37 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 windows/plan/docfx.json diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index beeb3a5c8d..fbe09cbddf 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -324,6 +324,22 @@ "build_entry_point": "docs", "template_folder": "_themes", "version": 0 + }, + { + "docset_name": "windows-plan", + "build_source_folder": "windows/plan", + "build_output_subfolder": "windows-plan", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 } ], "notification_subscribers": [ diff --git a/windows/plan/docfx.json b/windows/plan/docfx.json new file mode 100644 index 0000000000..289552ee34 --- /dev/null +++ b/windows/plan/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "**/includes/**", + "README.md", + "LICENSE", + "LICENSE-CODE", + "ThirdPartyNotices" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "windows-plan" + } +} \ No newline at end of file From 2c0f14f14c42cadf7612c4a7141d944110a5e1f9 Mon Sep 17 00:00:00 2001 From: fenxu Date: Tue, 25 Apr 2017 04:44:40 +0000 Subject: [PATCH 04/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 16 +++++++++++++ windows/update/docfx.json | 37 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 windows/update/docfx.json diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index fbe09cbddf..da6327bcc9 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -340,6 +340,22 @@ "build_entry_point": "docs", "template_folder": "_themes", "version": 0 + }, + { + "docset_name": "windows-update", + "build_source_folder": "windows/update", + "build_output_subfolder": "windows-update", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 } ], "notification_subscribers": [ diff --git a/windows/update/docfx.json b/windows/update/docfx.json new file mode 100644 index 0000000000..21e6f12fb6 --- /dev/null +++ b/windows/update/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "**/includes/**", + "README.md", + "LICENSE", + "LICENSE-CODE", + "ThirdPartyNotices" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "windows-update" + } +} \ No newline at end of file From 3fd3e39107b92d8b4a4941e6157621ab59119018 Mon Sep 17 00:00:00 2001 From: fenxu Date: Tue, 25 Apr 2017 04:46:12 +0000 Subject: [PATCH 05/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 16 +++++++++++++ windows/deploy/docfx.json | 37 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 windows/deploy/docfx.json diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index da6327bcc9..a4498d83a5 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -356,6 +356,22 @@ "build_entry_point": "docs", "template_folder": "_themes", "version": 0 + }, + { + "docset_name": "windows-deploy", + "build_source_folder": "windows/deploy", + "build_output_subfolder": "windows-deploy", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 } ], "notification_subscribers": [ diff --git a/windows/deploy/docfx.json b/windows/deploy/docfx.json new file mode 100644 index 0000000000..446c7aa4f2 --- /dev/null +++ b/windows/deploy/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "**/includes/**", + "README.md", + "LICENSE", + "LICENSE-CODE", + "ThirdPartyNotices" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "windows-deploy" + } +} \ No newline at end of file From 8f51ba67d0f7dfd49de43534d0fe967256194c4e Mon Sep 17 00:00:00 2001 From: fenxu Date: Tue, 25 Apr 2017 15:52:08 +0000 Subject: [PATCH 06/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 16 +++++++++++++ windows/configure/docfx.json | 37 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 windows/configure/docfx.json diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index a4498d83a5..e38381852e 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -372,6 +372,22 @@ "build_entry_point": "docs", "template_folder": "_themes", "version": 0 + }, + { + "docset_name": "windows-configure", + "build_source_folder": "windows/configure", + "build_output_subfolder": "windows-configure", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 } ], "notification_subscribers": [ diff --git a/windows/configure/docfx.json b/windows/configure/docfx.json new file mode 100644 index 0000000000..fa97b029d7 --- /dev/null +++ b/windows/configure/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "**/includes/**", + "README.md", + "LICENSE", + "LICENSE-CODE", + "ThirdPartyNotices" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "windows-configure" + } +} \ No newline at end of file From 29a773f07041e21a2ed28f16bd580a2ed34cf824 Mon Sep 17 00:00:00 2001 From: Sandra Aldana Date: Tue, 25 Apr 2017 11:02:14 -0700 Subject: [PATCH 07/15] Remove windows in .openpublishing.publish.config.json under live branch. --- .openpublishing.publish.config.json | 808 ++++++++++++++-------------- 1 file changed, 397 insertions(+), 411 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index e38381852e..77e4cb1ee7 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -1,412 +1,398 @@ -{ - "build_entry_point": "", - "need_generate_pdf": false, - "need_generate_intellisense": false, - "docsets_to_publish": [ - { - "docset_name": "education", - "build_source_folder": "education", - "build_output_subfolder": "education", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "internet-explorer", - "build_source_folder": "browsers/internet-explorer", - "build_output_subfolder": "browsers/internet-explorer", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "itpro-hololens", - "build_source_folder": "devices/hololens", - "build_output_subfolder": "devices/hololens", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "mdop", - "build_source_folder": "mdop", - "build_output_subfolder": "mdop", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "microsoft-edge", - "build_source_folder": "browsers/edge", - "build_output_subfolder": "browsers/edge", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "smb", - "build_source_folder": "smb", - "build_output_subfolder": "smb", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "store-for-business", - "build_source_folder": "store-for-business", - "build_output_subfolder": "store-for-business", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "surface", - "build_source_folder": "devices/surface", - "build_output_subfolder": "devices/surface", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "surface-hub", - "build_source_folder": "devices/surface-hub", - "build_output_subfolder": "devices/surface-hub", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-access-protection", - "build_source_folder": "windows/access-protection", - "build_output_subfolder": "win-access-protection", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-app-management", - "build_source_folder": "windows/application-management", - "build_output_subfolder": "win-app-management", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-client-management", - "build_source_folder": "windows/client-management", - "build_output_subfolder": "win-client-management", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-configuration", - "build_source_folder": "windows/configuration", - "build_output_subfolder": "win-configuration", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-development", - "build_source_folder": "windows/deployment", - "build_output_subfolder": "win-development", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-device-security", - "build_source_folder": "windows/device-security", - "build_output_subfolder": "win-device-security", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows", - "build_source_folder": "windows", - "build_output_subfolder": "windows", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows-hub", - "build_source_folder": "windows/hub", - "build_output_subfolder": "windows-hub", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-threat-protection", - "build_source_folder": "windows/threat-protection", - "build_output_subfolder": "win-threat-protection", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "win-whats-new", - "build_source_folder": "windows/whats-new", - "build_output_subfolder": "win-whats-new", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "keep-secure", - "build_source_folder": "windows/keep-secure", - "build_output_subfolder": "keep-secure", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows-manage", - "build_source_folder": "windows/manage", - "build_output_subfolder": "windows-manage", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows-plan", - "build_source_folder": "windows/plan", - "build_output_subfolder": "windows-plan", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows-update", - "build_source_folder": "windows/update", - "build_output_subfolder": "windows-update", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows-deploy", - "build_source_folder": "windows/deploy", - "build_output_subfolder": "windows-deploy", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - }, - { - "docset_name": "windows-configure", - "build_source_folder": "windows/configure", - "build_output_subfolder": "windows-configure", - "locale": "en-us", - "monikers": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes", - "version": 0 - } - ], - "notification_subscribers": [ - "brianlic@microsoft.com" - ], - "branches_to_filter": [ - "" - ], - "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs", - "git_repository_branch_open_to_public_contributors": "master", - "skip_source_output_uploading": false, - "need_preview_pull_request": true, - "dependent_repositories": [ - { - "path_to_root": "_themes", - "url": "https://github.com/Microsoft/templates.docs.msft", - "branch": "master", - "branch_mapping": {} - } - ], - "need_generate_pdf_url_template": false +{ + "build_entry_point": "", + "need_generate_pdf": false, + "need_generate_intellisense": false, + "docsets_to_publish": [ + { + "docset_name": "education", + "build_source_folder": "education", + "build_output_subfolder": "education", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "internet-explorer", + "build_source_folder": "browsers/internet-explorer", + "build_output_subfolder": "browsers/internet-explorer", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "itpro-hololens", + "build_source_folder": "devices/hololens", + "build_output_subfolder": "devices/hololens", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "mdop", + "build_source_folder": "mdop", + "build_output_subfolder": "mdop", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "microsoft-edge", + "build_source_folder": "browsers/edge", + "build_output_subfolder": "browsers/edge", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "smb", + "build_source_folder": "smb", + "build_output_subfolder": "smb", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "store-for-business", + "build_source_folder": "store-for-business", + "build_output_subfolder": "store-for-business", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "surface", + "build_source_folder": "devices/surface", + "build_output_subfolder": "devices/surface", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "surface-hub", + "build_source_folder": "devices/surface-hub", + "build_output_subfolder": "devices/surface-hub", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-access-protection", + "build_source_folder": "windows/access-protection", + "build_output_subfolder": "win-access-protection", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-app-management", + "build_source_folder": "windows/application-management", + "build_output_subfolder": "win-app-management", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-client-management", + "build_source_folder": "windows/client-management", + "build_output_subfolder": "win-client-management", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-configuration", + "build_source_folder": "windows/configuration", + "build_output_subfolder": "win-configuration", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-development", + "build_source_folder": "windows/deployment", + "build_output_subfolder": "win-development", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-device-security", + "build_source_folder": "windows/device-security", + "build_output_subfolder": "win-device-security", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "windows-hub", + "build_source_folder": "windows/hub", + "build_output_subfolder": "windows-hub", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-threat-protection", + "build_source_folder": "windows/threat-protection", + "build_output_subfolder": "win-threat-protection", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "win-whats-new", + "build_source_folder": "windows/whats-new", + "build_output_subfolder": "win-whats-new", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": true, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "keep-secure", + "build_source_folder": "windows/keep-secure", + "build_output_subfolder": "keep-secure", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "windows-manage", + "build_source_folder": "windows/manage", + "build_output_subfolder": "windows-manage", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "windows-plan", + "build_source_folder": "windows/plan", + "build_output_subfolder": "windows-plan", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "windows-update", + "build_source_folder": "windows/update", + "build_output_subfolder": "windows-update", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "windows-deploy", + "build_source_folder": "windows/deploy", + "build_output_subfolder": "windows-deploy", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + }, + { + "docset_name": "windows-configure", + "build_source_folder": "windows/configure", + "build_output_subfolder": "windows-configure", + "locale": "en-us", + "monikers": [], + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "docs", + "template_folder": "_themes", + "version": 0 + } + ], + "notification_subscribers": [ + "brianlic@microsoft.com" + ], + "branches_to_filter": [ + "" + ], + "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs", + "git_repository_branch_open_to_public_contributors": "master", + "skip_source_output_uploading": false, + "need_preview_pull_request": true, + "dependent_repositories": [ + { + "path_to_root": "_themes", + "url": "https://github.com/Microsoft/templates.docs.msft", + "branch": "master", + "branch_mapping": {} + } + ], + "need_generate_pdf_url_template": false } \ No newline at end of file From fb4b41bddc37840c5abf48ecdd46e65417079849 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 4 May 2017 14:38:48 -0700 Subject: [PATCH 08/15] Fixed duplicate text --- browsers/edge/available-policies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browsers/edge/available-policies.md b/browsers/edge/available-policies.md index 8c8984005a..3289a9892e 100644 --- a/browsers/edge/available-policies.md +++ b/browsers/edge/available-policies.md @@ -357,7 +357,7 @@ Microsoft Edge works with these Group Policy settings (`Computer Configuration\A https://fabrikam.com/opensearch.xml - - If you disable this setting, the policy-set default search engine is removed. If this is also the current in-use default, the engine changes to the Microsoft Edge specified engine for the market.

If you don't configure this setting, the default search engine is set to the one specified in App settings. + - If you disable this setting, the policy-set default search engine is removed. If this is also the current in-use default, the engine changes to the Microsoft Edge specified engine for the market. - If you don't configure this setting (default), the default search engine is set to the one specified in App settings. From 98a8dd86255211e50b8270551f987123179d9478 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 4 May 2017 14:40:02 -0700 Subject: [PATCH 09/15] enable PDF download --- .openpublishing.publish.config.json | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 4b026cfdc9..9a990acba8 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -3,6 +3,10 @@ "need_generate_pdf": false, "need_generate_intellisense": false, "enable_incremental_build": true, + "branch_target_mapping": { + "live": ["Publish","Pdf"], + "master": ["Publish", "Pdf"] + }, "docsets_to_publish": [ { "docset_name": "education", @@ -377,23 +381,32 @@ "version": 0 } ], + "Targets": { + "Pdf": { + "template_folder": "_themes.pdf" + } + }, "notification_subscribers": [ "brianlic@microsoft.com" ], - "branches_to_filter": [ - "" - ], + "branches_to_filter": [""], "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs", "git_repository_branch_open_to_public_contributors": "master", "skip_source_output_uploading": false, "need_preview_pull_request": true, "dependent_repositories": [ - { + { + "path_to_root": "_themes.pdf", + "url": "https://github.com/Microsoft/templates.docs.msft.pdf", + "branch": "master", + "branch_mapping": {} + }, + { "path_to_root": "_themes", "url": "https://github.com/Microsoft/templates.docs.msft", "branch": "master", "branch_mapping": {} } ], - "need_generate_pdf_url_template": false + "need_generate_pdf_url_template": true } \ No newline at end of file From 35b34ce81930067bae3ea9c6a170c0cb4d6d9deb Mon Sep 17 00:00:00 2001 From: Liza Poggemeyer Date: Thu, 4 May 2017 14:46:03 -0700 Subject: [PATCH 10/15] Removed erroneous reference to SQL Server 2012 R1. --- windows/deployment/windows-10-poc-sc-config-mgr.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md index 0ce8558c9c..4e36256cae 100644 --- a/windows/deployment/windows-10-poc-sc-config-mgr.md +++ b/windows/deployment/windows-10-poc-sc-config-mgr.md @@ -4,8 +4,7 @@ description: Deploy Windows 10 in a test lab using System Center Configuration M ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library -ms.pagetype: deploy -keywords: deployment, automate, tools, configure, sccm, configuration manager +ms.pagetype: deploykeywords: deployment, automate, tools, configure, sccm, configuration manager localizationpriority: high author: greg-lindsay --- @@ -15,7 +14,6 @@ author: greg-lindsay **Applies to** - Windows 10 - **Important**: This guide leverages the proof of concept (PoC) environment, and some settings that are configured in the following guides: - [Step by step guide: Deploy Windows 10 in a test lab](windows-10-poc.md) - [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md) @@ -26,7 +24,6 @@ The PoC environment is a virtual network running on Hyper-V with three virtual m - **DC1**: A contoso.com domain controller, DNS server, and DHCP server. - **SRV1**: A dual-homed contoso.com domain member server, DNS server, and default gateway providing NAT service for the PoC network. - **PC1**: A contoso.com member computer running Windows 7, Windows 8, or Windows 8.1 that has been cloned from a physical computer on your corporate network for testing purposes. - This guide leverages the Hyper-V server role to perform procedures. If you do not complete all steps in a single session, consider using [checkpoints](https://technet.microsoft.com/library/dn818483.aspx) and [saved states](https://technet.microsoft.com/library/ee247418.aspx) to pause, resume, or restart your work. >Multiple features and services are installed on SRV1 in this guide. This is not a typical installation, and is only done to set up a lab environment with a bare minimum of resources. However, if less than 4 GB of RAM is allocated to SRV1 in the Hyper-V console, some procedures will be extremely slow to complete. If resources are limited on the Hyper-V host, consider reducing RAM allocation on DC1 and PC1, and then increasing the RAM allocation on SRV1. You can adjust RAM allocation for a VM by right-clicking the VM in the Hyper-V Manager console, clicking **Settings**, clicking **Memory**, and modifying the value next to **Maximum RAM**. @@ -38,7 +35,6 @@ This guide provides end-to-end instructions to install and configure System Cent Topics and procedures in this guide are summarized in the following table. An estimate of the time required to complete each procedure is also provided. Time required to complete procedures will vary depending on the resources available to the Hyper-V host and assigned to VMs, such as processor speed, memory allocation, disk speed, and network speed.

-
TopicDescriptionTime @@ -48,8 +44,7 @@ Topics and procedures in this guide are summarized in the following table. An es
[Prepare for Zero Touch installation](#prepare-for-zero-touch-installation)Prerequisite procedures to support Zero Touch installation.60 minutes
[Create a boot image for Configuration Manager](#create-a-boot-image-for-configuration-manager)Use the MDT wizard to create the boot image in Configuration Manager.20 minutes
[Create a Windows 10 reference image](#create-a-windows-10-reference-image)This procedure can be skipped if it was done previously, otherwise instructions are provided to create a reference image.0-60 minutes -
[Add a Windows 10 operating system image](#add-a-windows-10-operating-system-image)Add a Windows 10 operating system image and distribute it.10 minutes -
[Create a task sequence](#create-a-task-sequence)Create a Configuration Manager task sequence with MDT integration using the MDT wizard15 minutes +
[Add a Windows 10 operating system image](#add-a-windows-10-operating-system-image)Add a Windows 10 operating system image and distribute it.10 minutes
[Create a task sequence](#create-a-task-sequence)Create a Configuration Manager task sequence with MDT integration using the MDT wizard15 minutes
[Finalize the operating system configuration](#finalize-the-operating-system-configuration)Enable monitoring, configure rules, and distribute content.30 minutes
[Deploy Windows 10 using PXE and Configuration Manager](#deploy-windows-10-using-pxe-and-configuration-manager)Deploy Windows 10 using Configuration Manager deployment packages and task sequences.60 minutes
[Replace a client with Windows 10 using Configuration Manager](#replace-a-client-with-windows-10-using-configuration-manager)Replace a client computer with Windows 10 using Configuration Manager.90 minutes @@ -60,7 +55,6 @@ Topics and procedures in this guide are summarized in the following table. An es ## Install prerequisites - 1. Before installing System Center Configuration Manager, we must install prerequisite services and features. Type the following command at an elevated Windows PowerShell prompt on SRV1: ``` @@ -78,7 +72,7 @@ Topics and procedures in this guide are summarized in the following table. An es This command mounts the .ISO file to drive D on SRV1. -4. Type the following command at an elevated Windows PowerShell prompt on SRV1 to install SQL Server 2012 SP2: +4. Type the following command at an elevated Windows PowerShell prompt on SRV1 to install SQL Server: ``` D:\setup.exe /q /ACTION=Install /ERRORREPORTING="False" /FEATURES=SQLENGINE,RS,IS,SSMS,TOOLS,ADV_SSMS,CONN /INSTANCENAME=MSSQLSERVER /INSTANCEDIR="C:\Program Files\Microsoft SQL Server" /SQLSVCACCOUNT="NT AUTHORITY\System" /SQLSYSADMINACCOUNTS="BUILTIN\ADMINISTRATORS" /SQLSVCSTARTUPTYPE=Automatic /AGTSVCACCOUNT="NT AUTHORITY\SYSTEM" /AGTSVCSTARTUPTYPE=Automatic /RSSVCACCOUNT="NT AUTHORITY\System" /RSSVCSTARTUPTYPE=Automatic /ISSVCACCOUNT="NT AUTHORITY\System" /ISSVCSTARTUPTYPE=Disabled /ASCOLLATION="Latin1_General_CI_AS" /SQLCOLLATION="SQL_Latin1_General_CP1_CI_AS" /TCPENABLED="1" /NPENABLED="1" /IAcceptSQLServerLicenseTerms From a0d25eb11c3c416b509ffe3919c6df32cb8e706f Mon Sep 17 00:00:00 2001 From: Joey Caparas Date: Thu, 4 May 2017 15:12:00 -0700 Subject: [PATCH 11/15] remove repeated line --- ...custom-ti-api-windows-defender-advanced-threat-protection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md index 3f71267756..c801b3feab 100644 --- a/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md +++ b/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md @@ -27,7 +27,7 @@ You can define custom alert definitions and indicators of compromise (IOC) using Before creating custom alerts, you'll need to enable the threat intelligence application in Azure Active Directory and generate access tokens. For more information, see [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md). ### Use the threat intelligence REST API to create custom threat intelligence alerts -You can call and specify the resource URLs using one of the following operations to access and manipulate a threat intelligence resource, you call and specify the resource URLs using one of the following operations: +You can call and specify the resource URLs using one of the following operations to access and manipulate a threat intelligence resource: - GET - POST From 46b824f160e1e06c66a0de46004c059c33688575 Mon Sep 17 00:00:00 2001 From: brianlic-msft Date: Thu, 4 May 2017 22:13:39 +0000 Subject: [PATCH 12/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 34 ++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 9a990acba8..cff4ca1859 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -2,11 +2,6 @@ "build_entry_point": "", "need_generate_pdf": false, "need_generate_intellisense": false, - "enable_incremental_build": true, - "branch_target_mapping": { - "live": ["Publish","Pdf"], - "master": ["Publish", "Pdf"] - }, "docsets_to_publish": [ { "docset_name": "education", @@ -381,32 +376,41 @@ "version": 0 } ], - "Targets": { - "Pdf": { - "template_folder": "_themes.pdf" - } - }, "notification_subscribers": [ "brianlic@microsoft.com" ], - "branches_to_filter": [""], + "branches_to_filter": [ + "" + ], "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs", "git_repository_branch_open_to_public_contributors": "master", "skip_source_output_uploading": false, "need_preview_pull_request": true, + "enable_incremental_build": true, "dependent_repositories": [ - { + { "path_to_root": "_themes.pdf", "url": "https://github.com/Microsoft/templates.docs.msft.pdf", "branch": "master", "branch_mapping": {} - }, - { + }, + { "path_to_root": "_themes", "url": "https://github.com/Microsoft/templates.docs.msft", "branch": "master", "branch_mapping": {} } ], - "need_generate_pdf_url_template": true + "branch_target_mapping": { + "live": [ + "Publish", + "Pdf" + ] + }, + "need_generate_pdf_url_template": true, + "Targets": { + "Pdf": { + "template_folder": "_themes.pdf" + } + } } \ No newline at end of file From bdf95d618a23bc4fd16fa05888d77430a6254847 Mon Sep 17 00:00:00 2001 From: brianlic-msft Date: Thu, 4 May 2017 22:13:39 +0000 Subject: [PATCH 13/15] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch master --- .openpublishing.publish.config.json | 34 ++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 9a990acba8..cff4ca1859 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -2,11 +2,6 @@ "build_entry_point": "", "need_generate_pdf": false, "need_generate_intellisense": false, - "enable_incremental_build": true, - "branch_target_mapping": { - "live": ["Publish","Pdf"], - "master": ["Publish", "Pdf"] - }, "docsets_to_publish": [ { "docset_name": "education", @@ -381,32 +376,41 @@ "version": 0 } ], - "Targets": { - "Pdf": { - "template_folder": "_themes.pdf" - } - }, "notification_subscribers": [ "brianlic@microsoft.com" ], - "branches_to_filter": [""], + "branches_to_filter": [ + "" + ], "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs", "git_repository_branch_open_to_public_contributors": "master", "skip_source_output_uploading": false, "need_preview_pull_request": true, + "enable_incremental_build": true, "dependent_repositories": [ - { + { "path_to_root": "_themes.pdf", "url": "https://github.com/Microsoft/templates.docs.msft.pdf", "branch": "master", "branch_mapping": {} - }, - { + }, + { "path_to_root": "_themes", "url": "https://github.com/Microsoft/templates.docs.msft", "branch": "master", "branch_mapping": {} } ], - "need_generate_pdf_url_template": true + "branch_target_mapping": { + "live": [ + "Publish", + "Pdf" + ] + }, + "need_generate_pdf_url_template": true, + "Targets": { + "Pdf": { + "template_folder": "_themes.pdf" + } + } } \ No newline at end of file From d4925a487c43972cb33717c69fabe780b93fcbe1 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 4 May 2017 15:21:00 -0700 Subject: [PATCH 14/15] adding master branch pdf target mapping --- .openpublishing.publish.config.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index cff4ca1859..006a4bbd17 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -402,11 +402,9 @@ } ], "branch_target_mapping": { - "live": [ - "Publish", - "Pdf" - ] - }, + "live": ["Publish","Pdf"], + "master": ["Publish", "Pdf"] + }, "need_generate_pdf_url_template": true, "Targets": { "Pdf": { From af7c78b7f137096efa7717399a268021bb4e3cca Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 4 May 2017 16:09:39 -0700 Subject: [PATCH 15/15] last redirect fixes --- .openpublishing.redirection.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index cdd94c4cbb..e5b91868f9 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -1471,6 +1471,11 @@ "redirect_document_id": true }, { +"source_path": "windows/manage/windows-spotlight.md", +"redirect_url": "/windows/configuration/windows-spotlight", +"redirect_document_id": true +}, +{ "source_path": "windows/deploy/activate-forest-by-proxy-vamt.md", "redirect_url": "/windows/deployment/volume-activation/activate-forest-by-proxy-vamt", "redirect_document_id": true @@ -8214,6 +8219,21 @@ "source_path": "education/get-started/index.md", "redirect_url": "/education/get-started/get-started-with-microsoft-education", "redirect_document_id": true +}, +{ +"source_path": "windows/keep-secure/windows-10-enterprise-security-guides.md", +"redirect_url": "/windows/windows-10/index", +"redirect_document_id": true +}, +{ +"source_path": "windows/keep-secure/change-history-for-keep-windows-10-secure.md", +"redirect_url": "/windows/windows-10/index", +"redirect_document_id": true +}, +{ +"source_path": "windows/manage/change-history-for-manage-and-update-windows-10.md", +"redirect_url": "/windows/windows-10/index", +"redirect_document_id": true } ] } \ No newline at end of file