diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index f897a39dbc..6dbc487f58 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -4,81 +4,9 @@
"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",
+ "docset_name": "mdop-VSTS",
"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",
+ "build_output_subfolder": "mdop-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
@@ -92,216 +20,12 @@
"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",
+ "docset_name": "windows-manage-VSTS",
"build_source_folder": "windows/manage",
- "build_output_subfolder": "windows-manage",
+ "build_output_subfolder": "windows-manage-VSTS",
"locale": "en-us",
"monikers": [],
- "open_to_public_contributors": false,
+ "open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@@ -312,12 +36,76 @@
"version": 0
},
{
- "docset_name": "windows-plan",
+ "docset_name": "smb-VSTS",
+ "build_source_folder": "smb",
+ "build_output_subfolder": "smb-VSTS",
+ "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-hub-VSTS",
+ "build_source_folder": "devices/surface-hub",
+ "build_output_subfolder": "surface-hub-VSTS",
+ "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": "microsoft-edge-VSTS",
+ "build_source_folder": "browsers/edge",
+ "build_output_subfolder": "microsoft-edge-VSTS",
+ "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-VSTS",
+ "build_source_folder": "windows/deployment",
+ "build_output_subfolder": "win-development-VSTS",
+ "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-plan-VSTS",
"build_source_folder": "windows/plan",
- "build_output_subfolder": "windows-plan",
+ "build_output_subfolder": "windows-plan-VSTS",
"locale": "en-us",
"monikers": [],
- "open_to_public_contributors": false,
+ "open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@@ -328,12 +116,12 @@
"version": 0
},
{
- "docset_name": "windows-update",
- "build_source_folder": "windows/update",
- "build_output_subfolder": "windows-update",
+ "docset_name": "win-client-management-VSTS",
+ "build_source_folder": "windows/client-management",
+ "build_output_subfolder": "win-client-management-VSTS",
"locale": "en-us",
"monikers": [],
- "open_to_public_contributors": false,
+ "open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@@ -344,12 +132,44 @@
"version": 0
},
{
- "docset_name": "windows-deploy",
+ "docset_name": "win-threat-protection-VSTS",
+ "build_source_folder": "windows/threat-protection",
+ "build_output_subfolder": "win-threat-protection-VSTS",
+ "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-VSTS",
+ "build_source_folder": "windows/application-management",
+ "build_output_subfolder": "win-app-management-VSTS",
+ "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-deploy-VSTS",
"build_source_folder": "windows/deploy",
- "build_output_subfolder": "windows-deploy",
+ "build_output_subfolder": "windows-deploy-VSTS",
"locale": "en-us",
"monikers": [],
- "open_to_public_contributors": false,
+ "open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@@ -360,12 +180,12 @@
"version": 0
},
{
- "docset_name": "windows-configure",
- "build_source_folder": "windows/configure",
- "build_output_subfolder": "windows-configure",
+ "docset_name": "keep-secure-VSTS",
+ "build_source_folder": "windows/keep-secure",
+ "build_output_subfolder": "keep-secure-VSTS",
"locale": "en-us",
"monikers": [],
- "open_to_public_contributors": false,
+ "open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@@ -376,9 +196,57 @@
"version": 0
},
{
- "docset_name": "bcs",
+ "docset_name": "surface-VSTS",
+ "build_source_folder": "devices/surface",
+ "build_output_subfolder": "surface-VSTS",
+ "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-VSTS",
+ "build_source_folder": "windows/hub",
+ "build_output_subfolder": "windows-hub-VSTS",
+ "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": "internet-explorer-VSTS",
+ "build_source_folder": "browsers/internet-explorer",
+ "build_output_subfolder": "internet-explorer-VSTS",
+ "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": "bcs-VSTS",
"build_source_folder": "bcs",
- "build_output_subfolder": "bcs",
+ "build_output_subfolder": "bcs-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
@@ -390,6 +258,150 @@
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
+ },
+ {
+ "docset_name": "win-access-protection-VSTS",
+ "build_source_folder": "windows/access-protection",
+ "build_output_subfolder": "win-access-protection-VSTS",
+ "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-VSTS",
+ "build_source_folder": "windows/device-security",
+ "build_output_subfolder": "win-device-security-VSTS",
+ "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": "education-VSTS",
+ "build_source_folder": "education",
+ "build_output_subfolder": "education-VSTS",
+ "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-VSTS",
+ "build_source_folder": "store-for-business",
+ "build_output_subfolder": "store-for-business-VSTS",
+ "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-VSTS",
+ "build_source_folder": "windows/configuration",
+ "build_output_subfolder": "win-configuration-VSTS",
+ "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-update-VSTS",
+ "build_source_folder": "windows/update",
+ "build_output_subfolder": "windows-update-VSTS",
+ "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-VSTS",
+ "build_source_folder": "windows/whats-new",
+ "build_output_subfolder": "win-whats-new-VSTS",
+ "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": "itpro-hololens-VSTS",
+ "build_source_folder": "devices/hololens",
+ "build_output_subfolder": "itpro-hololens-VSTS",
+ "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-configure-VSTS",
+ "build_source_folder": "windows/configure",
+ "build_output_subfolder": "windows-configure-VSTS",
+ "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
}
],
"notification_subscribers": [
@@ -398,7 +410,7 @@
"branches_to_filter": [
""
],
- "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/win-cpub-itpro-docs",
+ "git_repository_url_open_to_public_contributors": "https://cpubwin.visualstudio.com/_git/it-client",
"skip_source_output_uploading": false,
"need_preview_pull_request": true,
"dependent_repositories": [
@@ -428,9 +440,9 @@
"Publish",
"Pdf"
]
-
},
"need_generate_pdf_url_template": true,
+ "resolve_user_profile_using_github": true,
"Targets": {
"Pdf": {
"template_folder": "_themes.pdf"
diff --git a/bcs/docfx.json b/bcs/docfx.json
index 9901c08bd0..4e3f166ece 100644
--- a/bcs/docfx.json
+++ b/bcs/docfx.json
@@ -29,7 +29,13 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "TechNet.bcs"
+ }
+ }
+ },
"fileMetadata": {},
"template": [],
"dest": "bcs"
diff --git a/browsers/edge/docfx.json b/browsers/edge/docfx.json
index 7f80f4653b..a699361d13 100644
--- a/browsers/edge/docfx.json
+++ b/browsers/edge/docfx.json
@@ -20,7 +20,12 @@
"ms.technology": "microsoft-edge",
"ms.topic": "article",
"ms.author": "lizross",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.microsoft-edge"
+ }
+ }
},
"externalReference": [
],
diff --git a/browsers/internet-explorer/docfx.json b/browsers/internet-explorer/docfx.json
index c7550c36c9..056939a089 100644
--- a/browsers/internet-explorer/docfx.json
+++ b/browsers/internet-explorer/docfx.json
@@ -21,7 +21,12 @@
"author": "eross-msft",
"ms.technology": "internet-explorer",
"ms.topic": "article",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.internet-explorer"
+ }
+ }
},
"externalReference": [
],
diff --git a/devices/hololens/docfx.json b/devices/hololens/docfx.json
index b737302611..91c25a934c 100644
--- a/devices/hololens/docfx.json
+++ b/devices/hololens/docfx.json
@@ -34,7 +34,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "jdecker",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.itpro-hololens"
+ }
+ }
},
"fileMetadata": {},
"template": [
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
index 430f78295f..d6a3efaf96 100644
--- a/devices/surface-hub/docfx.json
+++ b/devices/surface-hub/docfx.json
@@ -23,7 +23,12 @@
"author": "jdeckerms",
"ms.sitesec": "library",
"ms.author": "jdecker",
- "ms.date": "05/23/2017"
+ "ms.date": "05/23/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.surface-hub"
+ }
+ }
},
"externalReference": [
],
diff --git a/devices/surface-hub/whiteboard-collaboration.md b/devices/surface-hub/whiteboard-collaboration.md
index 5873701961..7633008a2d 100644
--- a/devices/surface-hub/whiteboard-collaboration.md
+++ b/devices/surface-hub/whiteboard-collaboration.md
@@ -50,6 +50,9 @@ When the other Surface Hub receives the link, the recipient can tap on the link,
After you’re done, you can export a copy of the Whiteboard collaboration for yourself through the Share charm and leave the board for others to continue working.
+>[!TIP]
+>When you start a collaboration session, Whiteboard creates a folder named **Whiteboard App Data** in your OneDrive for Business to store your shared whiteboards. After some collaboration sessions, this folder may continue to sync or process changes indefinitely. You can fix this by choosing to not sync the **Whiteboard App Data** folder to your device. Disabling sync for this folder won't limit your ability to use Whiteboard for collaboration sessions.
+
## How to control and manage Whiteboard to Whiteboard collaboration
Whiteboard has settings that can be managed via MDM. These allow you to disable or enable collaboration functionality in case your organization can’t meet the prerequisites or you’d rather not have your organization use this feature.
diff --git a/devices/surface/docfx.json b/devices/surface/docfx.json
index ff7e999dc3..502700db32 100644
--- a/devices/surface/docfx.json
+++ b/devices/surface/docfx.json
@@ -20,7 +20,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "jdecker",
- "ms.date": "05/09/2017"
+ "ms.date": "05/09/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.surface"
+ }
+ }
},
"externalReference": [
],
diff --git a/education/docfx.json b/education/docfx.json
index edff4fd2ac..067964f4d7 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -20,7 +20,12 @@
"audience": "windows-education",
"ms.topic": "article",
"breadcrumb_path": "/education/breadcrumb/toc.json",
- "ms.date": "05/09/2017"
+ "ms.date": "05/09/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.education"
+ }
+ }
},
"externalReference": [
],
diff --git a/education/get-started/change-history-ms-edu-get-started.md b/education/get-started/change-history-ms-edu-get-started.md
index 583c85b8bf..484ed4a299 100644
--- a/education/get-started/change-history-ms-edu-get-started.md
+++ b/education/get-started/change-history-ms-edu-get-started.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: edu
author: CelesteDG
ms.author: celested
+ms.date: 06/26/2017
---
# Change history for Microsoft Education Get started
@@ -18,7 +19,7 @@ This topic lists the changes in the Microsoft Education IT admin get started.
| New or changed topic | Description |
| --- | ---- |
-| [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md) | Includes the following updates: - New configuration guidance for IT administrators to deploy Microsoft Teams. - Updated steps for School Data Sync to show the latest workflow and user experience. |
+| [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md) | Includes the following updates: - New configuration guidance for IT administrators to deploy Microsoft Teams. - Updated steps for School Data Sync to show the latest workflow and user experience. - Updated steps for Option 2: Try out Microsoft Education in a trial environment. You no longer need the SDS promo code to try SDS in a trial environment. |
## May 2017
diff --git a/education/get-started/get-started-with-microsoft-education.md b/education/get-started/get-started-with-microsoft-education.md
index a93c3a283c..78b9e46ccf 100644
--- a/education/get-started/get-started-with-microsoft-education.md
+++ b/education/get-started/get-started-with-microsoft-education.md
@@ -9,6 +9,8 @@ ms.topic: hero-article
localizationpriority: high
ms.pagetype: edu
author: CelesteDG
+ms.author: celested
+ms.date: 06/26/2017
---
# Get started: Deploy and manage a full cloud IT solution with Microsoft Education
@@ -101,25 +103,31 @@ To get started with Microsoft Education in a trial environment, follow these ste
1. [Set up a new Office 365 for Education tenant](#1-set-up-a-new-office-365-for-education-tenant).
- Wait for your tenant to be education-verified before proceeding with the next step. Verification can take up to two weeks.
+ Wait for your tenant to be education-verified before proceeding with the next step. Verification can take up to a few days.
-2. Click https://aka.ms/getsdspromocode to apply a School Data Sync trial promo code to your Office 365 education tenant.
-3. Follow the instructions in [Use School Data Sync to import student data](#2-use-school-data-sync-to-import-student-data).
-4. Follow the instructions in [Try out Intune for Education](#schooluseso365tryi4e).
+2. Once you have an education-verified tenant, click https://aka.ms/intuneforedupreviewtrial to apply the Intune for Education trial promo code.
+ 1. In the Intune for Education Trial page, on the upper right, click **Sign in** next to **Want to add this to an existing subscription?**.
+ 2. Sign in with your global admin credentials.
+
+3. Sign in to Office 365 admin portal and:
+ 1. Select **Admin > Users** and then search for your admin account.
+ 2. In the user page, select **Product licenses** and expand the **Office 365 Education** license you assigned to yourself.
+ 3. Confirm that School Data Sync is turned on.
+
+3. Skip ahead and follow the rest of the instructions in this walkthrough beginning with [2. Use School Data Sync to import student data](#2-use-school-data-sync-to-import-student-data).
### Option 3: Try out Intune for Education
Already have an Office 365 for Education verified tenant? Just sign in with your global admin credentials to apply the Intune for Education preview trial code to your tenant and follow the rest of the walkthrough.
1. Click https://aka.ms/intuneforedupreviewtrial to get started.
-2. In the **Intune for Education Trial** page, click **Sign in**.
+2. In the **Intune for Education Trial** page, on the upper right, click **Sign in** next to **Want to add this to an existing subscription?**.
**Figure 2** - Intune for Education trial sign in page

3. Enter your Office 365 global admin credentials to apply the Intune for Education trial to your tenant.
-4. Skip ahead and follow the instructions in the walkthrough beginning with [4. Configure Microsoft Store for Education](#4-configure-microsoft-store-for-education).
-
+4. If you don't already have Microsoft Teams deployed to your tenant, you can start with [3. Enable Microsoft Teams for your school](#3-enable-microsoft-teams-for-your-school) and then follow the rest of the instructions in this walkthrough.
## 1. Set up a new Office 365 for Education tenant
Schools can use Office 365 to save time and be more productive. Built with powerful tools and accessible from any device, setting it up is the first step in getting your school to the cloud.
@@ -174,21 +182,6 @@ Follow all the steps in this section to use SDS and sample CSV files in a trial
To learn more about the CSV files that are required and the info you need to include in each file, see CSV files for School Data Sync. If you run into any issues, see School Data Sync errors and troubleshooting.
-**Assign Classroom license**
-
-The Classroom application is retired, but you will need to assign the Classroom Preview license to global admin accounts that will be used to administer SDS. The single license allows global admins to access both Classroom Preview and School Data Sync.
-
-1. In the Office 365 admin center, select **Users > Active users**.
-2. Select the checkbox for your global admin account.
-3. In the account details window, under **Product licenses**, click **Edit**.
-4. In the **Product licenses** page, turn on **Microsoft Classroom** and then click **Save**.
-5. Confirm that you can access SDS. To do this:
- - Navigate to https://sds.microsoft.com and click **Sign in**. When prompted, enter your global admin username and password to access the SDS portal. Or,
- - From the Office 365 admin portal, go to **Admin centers** and click on **School Data Sync** to go to the SDS portal.
-
- > [!NOTE]
- > Only global admins can access SDS.
-
**Use SDS to import student data**
1. If you haven't done so already, go to the SDS portal, https://sds.microsoft.com.
@@ -196,7 +189,7 @@ The Classroom application is retired, but you will need to assign the Classroom
**Figure 6** - Settings for managing SDS
- 
+ 
3. Turn on **School Data Sync**. You will get a notification that it is turned on. Click **OK**.
@@ -204,7 +197,7 @@ The Classroom application is retired, but you will need to assign the Classroom
**Figure 7** - New menu options appear after SDS is turned on
- 
+ 
4. Click **+ Add Profile** from the sync dashboard or from the menu on the left to start syncing school data.
@@ -212,84 +205,93 @@ The Classroom application is retired, but you will need to assign the Classroom
**Figure 8** - New SDS profile setup wizard
- 
+ 
-6. For the new profile, in the **Before you begin...** screen:
- 1. Enter a name for your profile, such as *Contoso_Profile_1*.
- 2. Select a sync method for your profile. For this walkthrough, select **CSV Files**.
+5. For the new profile, in the **How do you want to connect to your school?** screen:
+ 1. Enter a name for your profile, such as *Contoso_Elementary_Profile*.
+ 2. Select a sync method for your profile. For this walkthrough, select **Upload CSV Files**.
+ 3. Select the type of CSV files that you're using. For this walkthrough, select **CSV files: SDS Format**.
+ 4. Click **Start**.
- Note that for any sync method that you choose, you can click the **View steps** link to get more information about the steps you need to take depending on the sync method of your choosing.
-
- 3. Click **Start**.
-
-7. In the **Sync options** screen:
- 1. In the **Select new or existing users** section, you can select either **New users** or **Existing users** based on the scenaro that applies to you. For this walkthrough, select **New users**.
-
+6. In the **Sync options** screen:
+ 1. In the **Select new or existing users** section, you can select either **Existing users** or **New users** based on the scenaro that applies to you. For this walkthrough, select **New users**.
2. In the **Import data** section:
1. Click **Upload Files** to bring up the **Select data files to be uploaded** window.
2. In the **Select data files to be uploaded** window, click **+ Add Files** and navigate to the directory where you saved the six CSV files required for data import.
3. In the File Explorer window, you will see a folder for the sample CSV files for the UK and six sample CSV files for the US. Select the CSV files that match your region/locale, and then click **Open**.
4. In the **Select data files to be uploaded** window, confirm that all six CSV files (School.csv, Section.csv, Student.csv, StudentEnrollment.csv, Teacher.csv, and TeacherRoster.csv) are listed and then click **Upload**.
- 4. After all the files are successfully uploaded, click **OK**.
+
+ > [!NOTE]
+ > After you click **Upload**, the status in the **Select data files to be uploaded** window will indicate that files are being uploaded and verified.
+
+ 5. After all the files are successfully uploaded, click **OK**.
+
3. Select the domain for the schools/sections. This domain will be used for the Section email addresses created during setup. If you have more than one domain, make sure you select the appropriate domain for the sync profile and subsequent sections being created.
4. In the **Select school and section properties** section, ensure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties, or deselect any properties, make sure you have the properties and values contained within the CSV files. For the walkthrough, you don't have to change the default.
5. In the **Sync option for Section Group Display Name**, check the box if you want to allow teachers to overwrite the section names. Otherwise, SDS will always reset the display name value for sections to the value contained within the CSV files.
- 6. In the **License Options** section, check the box to enable the Classroom Preview license for all synced students and teachers within the sync profile.
- 7. Check the **Intune for Education** checkbox to allow users to receive the Intune for Education license and to create the SDS dynamic groups and security groups, which be used within Intune for Education.
+ 6. In the **Student enrollment option** section:
+ * If you want to sync your student roster data immediately, leave the box unchecked.
+ * If you prefer to sync student enrollment/rostering data at a later date, check this box and then pick a date by clicking the empty box and selecting the appropriate date in the calendar when you would like to begin syncing your student roster data. Some schools prefer to delay syncing student roster data so they don't expose rosters before the start of the new term, semester, or school year.
+ 7. In the **License Options** section, check the box for **Intune for Education** to allow students and teachers to receive the Intune for Education license. This will also create the SDS dynamic groups and security groups, which will be used within Intune for Education.
8. Click **Next**.
**Figure 9** - Sync options for the new profile
- 
+ 
-8. In the **Teacher options** screen:
+7. In the **Teacher options** screen:
1. Select the domain for the teachers. SDS appends the selected domain suffix to the teacher's username attribute contained in the CSV file, to build the UserPrincipalName for each user in Office 365/Azure Active Directory during the account creation process. The teacher will log in to Office 365 with the UserPrincipalName once the account is created.
2. In the **Select teacher properties** section, make sure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties or deselect any properties, make sure you have the corresponding properties and values contained within the CSV files. For this walkthrough, you don't have to change the default.
- 3. In the **Teacher licenses** section, choose the SKU to assign licenses for teachers. For this walkthrough, choose **STANDARDWOFFPACK_FACULTY**.
+ 3. In the **Teacher licenses** section, choose the SKU to assign licenses for teachers. For example, **STANDARDWOFFPACK_FACULTY**.
4. Click **Next**.
**Figure 10** - Specify options for teacher mapping
- 
+ 
-9. In the **Student options** screen:
+8. In the **Student options** screen:
1. Select the domain for the students. SDS appends the selected domain suffix to the student's username attribute contained in the CSV file, to build the UserPrincipalName for each user in Office 365/Azure Active Directory during the account creation process. The student will log in to Office 365 with the UserPrincipalName once the account is created.
2. In the **Select student properties** section, make sure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties or deselect any properties, make sure you have the corresponding properties and values contained within the CSV files. For this walkthrough, you don't have to change the default.
- 3. In the **Student licenses** section, choose the SKU to assign licenses for students. For this walkthrough, choose **STANDARDWOFFPACK_STUDENT**.
+ 3. In the **Student licenses** section, choose the SKU to assign licenses for students. For example, **STANDARDWOFFPACK_STUDENT**.
4. Click **Next**.
**Figure 11** - Specify options for student mapping
- 
+ 
-10. In the profile **Review** page, review the summary and confirm that the options selected are correct. Click **Create profile**.
-
- You will see a notification that your profile is being created.
-
-11. You will see a page for your profile. The status might indicate that it's still being set up.
+9. In the profile **Review** page, review the summary and confirm that the options selected are correct.
+10. Click **Create profile**. You will see a notification that your profile is being submitted and then you will see a page for your profile.
**Figure 12** - SDS profile page
- 
+ 
-12. After the profile is created and finished **Setting up**, confirm that the status for your profile now says **Sync enabled**.
+11. After the profile is created and the status indicates as **Setting up**, refresh the page until you see the status change to **Sync in progress**. Beneath the **Sync in progress** status, you will see which of the 5 sync stages SDS is working on:
+ * Stage 1 - Validating data
+ * Stage 2 - Processing schools and sections
+ * Stage 3 - Processing students and teachers
+ * Stage 4 - Adding students and teachers into sections
+ * Stage 5 - Setting up security groups
- If the status still indicates that the profile is being set up, try refreshing the page until you see the status change to **Sync enabled**.
+ If you don't see a **Sync in progress** status on the sync profile, and receive an error message instead, this indicates that SDS has encountered data issues during the pre-sync validation check and has not started syncing your data. This gives you the opportunity to fix the errors identified by the pre-sync validation checks before continuing. Once you've fixed any errors or if you prefer to continue with the errors and begin syncing your data anyway, click the **Resume sync** button to start the sync process.
- **Figure 13** - New profile is sync enabled
+ Once you've completed all five sync stages, your profile status will update one final time.
+ * If you haven't encountered any errors, you will see a green check mark which states **Everything is ok**, and the profile status will change to **Sync complete. Ready for more data.**
+ * If SDS encountered sync errors, you will see a red status icon that indicates an error, and a profile status of **Sync complete. Profile contains multiple errors**. Download the available error report to identify and fix your sync errors. Once complete, upload new files as needed and re-sync your data until errors are resolved.
- 
+ Here are some examples of what the sync status can look like:
- > [!TIP]
- > If you get errors during the pre-sync validation process, your profile status will change to **x Error**. To continue, review or resolve any pre-sync validation errors, and then click **Resume Sync** to start the synchronization cycle.
+ **Figure 13** - New profile: Sync in progress
+
+ 
+
+ **Figure 14** - New profile: Sync complete - no errors
+
+ 
+
+ **Figure 15** - New profile: Sync complete - with errors
+
+ 
Sync times, like file download times, can vary widely depending on when you start the sync, how much data you are syncing, the complexity of your data (such as the number of users, schools, and class enrollments), overall system/network load, and other factors. Two people who start a sync at the same time may not have their syncs complete at the same time.
@@ -309,25 +311,25 @@ To get started, IT administrators need to use the Office 365 Admin Center to ena
3. Go to **Settings > Services & add-ins**.
4. On the **Services & add-ins** page, select **Microsoft Teams**.
- **Figure 14** - Select Microsoft Teams from the list of services & add-ins
+ **Figure 16** - Select Microsoft Teams from the list of services & add-ins

-5. On the Microsoft Teams settings screen, select the license that you want to configure, **Student** or **Faculty and Staff**.
+5. On the Microsoft Teams settings screen, select the license that you want to configure, **Student** or **Faculty and Staff**. Select **Faculty and Staff**.
- **Figure 15** - Select the license that you want to configure
+ **Figure 17** - Select the license that you want to configure

6. After you select the license type, set the toggle to turn on Microsoft Teams for your organization.
- **Figure 16** - Turn on Microsoft Teams for your organization
+ **Figure 18** - Turn on Microsoft Teams for your organization

7. Click **Save**.
-You can find more info about how to control which users in your school can use Microsoft Teams, turn off group creation, configure tenant-level settings, and more by reading the *Guide for IT admins** getting started guide in the Meet Microsoft Teams page.
+You can find more info about how to control which users in your school can use Microsoft Teams, turn off group creation, configure tenant-level settings, and more by reading the *Guide for IT admins* getting started guide in the Meet Microsoft Teams page.
## 4. Configure Microsoft Store for Education
You'll need to configure Microsoft Store for Education to accept the services agreement and make sure your Microsoft Store account is associated with Intune for Education.
@@ -339,20 +341,20 @@ You'll need to configure Microsoft Store for Education to accept the services ag
This will take you to the Microsoft Store for Education portal.
- **Figure 17** - Microsoft Store for Education portal
+ **Figure 19** - Microsoft Store for Education portal

3. In the Microsoft Store portal, click **Manage** to go to the Microsoft Store **Overview** page.
4. Find the **Overview** page, find the **Store settings** tile and click **Management tools**.
- **Figure 18** - Select management tools from the list of Store settings options
+ **Figure 20** - Select management tools from the list of Store settings options

4. In the **Management tools** page, find **Microsoft Intune** on the list and click **Activate** to get Intune for Education ready for use with Microsoft Store for Education.
- **Figure 19** - Activate Intune for Education as the management tool
+ **Figure 21** - Activate Intune for Education as the management tool

@@ -386,20 +388,20 @@ Intune for Education provides an **Express configuration** option so you can get
1. Log into the Intune for Education console. You will see the Intune for Education dashboard once you're logged in.
- **Figure 20** - Intune for Education dashboard
+ **Figure 22** - Intune for Education dashboard

2. On the dashboard, click **Launch Express Configuration**, or select the **Express configuration** option on the menu on the left.
3. In the **Welcome to Intune for Education** screen, click **Get started**.
- **Figure 21** - Click Get started to set up Intune for Education
+ **Figure 23** - Click Get started to set up Intune for Education

4. In the **Get school information (optional)** screen, it should indicate that SDS is already configured. Click **Next**.
- **Figure 22** - SDS is configured
+ **Figure 24** - SDS is configured

@@ -412,7 +414,7 @@ Intune for Education provides an **Express configuration** option so you can get
> [!TIP]
> At the top of the screen, did you notice the **Choose group** button change to a green check mark? This means we are done with that step. If you change your mind or need to make changes, simply click on the button to go back to that step. Try it!
>
- > **Figure 23** - Click on the buttons to go back to that step
+ > **Figure 25** - Click on the buttons to go back to that step
>
> 
@@ -425,7 +427,7 @@ Intune for Education provides an **Express configuration** option so you can get
> [!TIP]
> Web apps are pushed as links in the Windows Start menu under **All apps**. If you want apps to appear in Microsoft Edge browser tabs, use the **Homepages** setting for Microsoft Edge through **Express configuration** or **Manage Users and Devices**.
- **Figure 24** - Choose the apps that you want to install for the group
+ **Figure 26** - Choose the apps that you want to install for the group

@@ -435,7 +437,7 @@ Intune for Education provides an **Express configuration** option so you can get
8. In the **Choose settings** screen, we will set the settings to apply to the group. Click the reverse caret (downward-facing arrow) to expand the settings group and get more information about each setting in that settings group.
- **Figure 25** - Expand the settings group to get more details
+ **Figure 27** - Expand the settings group to get more details

@@ -443,20 +445,20 @@ Intune for Education provides an **Express configuration** option so you can get
- In the **Microsoft Edge settings** group, change the **Do-Not-Track headers** setting to **Require**.
- In the **App settings** group, change the **Microsoft Store for Business apps** setting to **Block**, and then set the **Require Microsoft Store for Business apps to be installed from private store** to **Require**.
- **Figure 26** - Set some additional settings
+ **Figure 28** - Set some additional settings

10. Click **Next**. In the **Review** screen, you will see a summary of the apps and settings you selected to apply.
- **Figure 27** - Review the group, apps, and settings you configured
+ **Figure 29** - Review the group, apps, and settings you configured

11. Click **Save** to end express configuration.
12. You will see the **You're done!** screen which lets you choose one of two options.
- **Figure 28** - All done with Intune for Education express configuration
+ **Figure 30** - All done with Intune for Education express configuration

@@ -473,13 +475,13 @@ Intune for Education provides an **Express configuration** option so you can get
1. In the Intune for Education console, click **Apps** from the menu on the left.
- **Figure 29** - Click on **Apps** to see the list of apps for your tenant
+ **Figure 31** - Click on **Apps** to see the list of apps for your tenant

2. In the **Store apps** section, click **+ New app**. This will take you to the Microsoft Store for Education portal and you will already be signed in.
- **Figure 30** - Select the option to add a new Store app
+ **Figure 32** - Select the option to add a new Store app

@@ -498,7 +500,7 @@ Intune for Education provides an **Express configuration** option so you can get
For example, if you bought Duolingo and Khan Academy, they will show up in your inventory along with the apps that Microsoft automatically provisioned for your education tenant.
- **Figure 31** - Apps inventory in Microsoft Store for Education
+ **Figure 33** - Apps inventory in Microsoft Store for Education

@@ -513,32 +515,32 @@ Now that you've bought the apps, use Intune for Education to specify the group t
1. In the Intune for Education console, click the **Groups** option from the menu on the left.
- **Figure 32** - Groups page in Intune for Education
+ **Figure 34** - Groups page in Intune for Education

2. In the **Groups** page, select **All Users** from the list of groups on the left, and then click **Users** in the taskbar at the top of the **All Users** page.
- **Figure 33** - List of all users in the tenant
+ **Figure 35** - List of all users in the tenant

3. In the taskbar at the top, select **Apps** and then click **Edit apps** to see a list of available apps.
- **Figure 34** - Edit apps to assign them to users
+ **Figure 36** - Edit apps to assign them to users

4. Select the apps to deploy to the group. A blue checkmark will appear next to the apps you select.
- **Figure 35** - Select the apps to deploy to the group
+ **Figure 37** - Select the apps to deploy to the group

5. Once you're done, click **Save** at the bottom of the page to deploy the selected apps to the group.
6. You'll be notified that app assignments are being updated. The updated **All Users** groups page now include the apps you selected.
- **Figure 36** - Updated list of assigned apps
+ **Figure 38** - Updated list of assigned apps

@@ -586,13 +588,13 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
1. If you don't have a Wi-Fi network configured, make sure you connect the device to the Internet through a wired or Ethernet connection.
2. Go through the Windows device setup experience. On a new or reset device, this starts with the **Let's start with region. Is this right?** screen.
- **Figure 37** - Let's start with region
+ **Figure 39** - Let's start with region

3. Continue with setup. In the **How would you like to set up?** screen, select **Set up for an organization**.
- **Figure 38** - Select setup for an organization
+ **Figure 40** - Select setup for an organization

@@ -611,7 +613,7 @@ Verify that the device is set up correctly and boots without any issues.
> [!NOTE]
> It may take some time before some apps are pushed down to your device from Intune for Education. Check again later if you don't see some of the apps you provisioned for the user.
- **Figure 39** - Sample list of apps for a user
+ **Figure 41** - Sample list of apps for a user

@@ -623,7 +625,7 @@ Let's now verify that the device is joined to your organization's Azure AD and s
2. Select **Groups** and select **All Devices**.
3. In the **All Devices** page, see the list of devices and verify that the device you're signed into appears on the list.
- **Figure 40** - List of all managed devices
+ **Figure 42** - List of all managed devices

@@ -631,7 +633,7 @@ Let's now verify that the device is joined to your organization's Azure AD and s
5. Select **Accounts > Access work or school**.
6. In the **Access work or school** page, confirm that the device is connected to the organization's Azure AD.
- **Figure 41** - Confirm that the Windows 10 device is joined to Azure AD
+ **Figure 43** - Confirm that the Windows 10 device is joined to Azure AD

@@ -647,7 +649,7 @@ If you need to make changes or updates to any of the apps or settings for the gr
2. Click **Groups** and then choose **Settings** in the taskbar at the top of the page.
3. You will see the same settings groups that you saw in express setup for Intune for Education as well as other settings categories such as **Windows Defender settings**, **Device sharing**, **Edition upgrade**, and so on.
- **Figure 42** - See the list of available settings in Intune for Education
+ **Figure 44** - See the list of available settings in Intune for Education

@@ -669,7 +671,7 @@ Follow the steps in this section to enable a single person to add many devices t
2. Configure the device settings for the school's Active Directory. To do this, go to the new Azure portal, https://portal.azure.com.
3. Select **Azure Active Directory > Users and groups > Device settings**.
- **Figure 43** - Device settings in the new Azure portal
+ **Figure 45** - Device settings in the new Azure portal

@@ -686,7 +688,7 @@ Follow the steps in this section to ensure that settings for the each user follo
3. Select **Azure Active Directory > Users and groups > Device settings**.
4. Find the setting **Users may sync settings and enterprise app data** and change the value to **All**.
- **Figure 44** - Enable settings to roam with users
+ **Figure 46** - Enable settings to roam with users

@@ -714,7 +716,7 @@ Adding a new device to your cloud-based tenant is easy. For new devices, you can
For example, if a teacher connects their personal device to the school network, they'll see the following screen after typing in their account information.
- **Figure 45** - Device is now managed by Intune for Education
+ **Figure 47** - Device is now managed by Intune for Education

@@ -724,7 +726,7 @@ Adding a new device to your cloud-based tenant is easy. For new devices, you can
5. After the user's credentails are validated, the window will refresh and will now include an entry that shows the device is now connected to the organization's MDM. This means the device is now enrolled in Intune for Education MDM and the account should have access to the organization's resources.
- **Figure 46** - Device is connected to organization's MDM
+ **Figure 48** - Device is connected to organization's MDM

diff --git a/education/get-started/images/azuread_video_thumbnail.PNG b/education/get-started/images/azuread_video_thumbnail.PNG
new file mode 100644
index 0000000000..e0723147f4
Binary files /dev/null and b/education/get-started/images/azuread_video_thumbnail.PNG differ
diff --git a/education/get-started/images/i4e_video_thumbnail.PNG b/education/get-started/images/i4e_video_thumbnail.PNG
new file mode 100644
index 0000000000..fdec163bca
Binary files /dev/null and b/education/get-started/images/i4e_video_thumbnail.PNG differ
diff --git a/education/get-started/images/i4e_video_thumbnail_app.PNG b/education/get-started/images/i4e_video_thumbnail_app.PNG
new file mode 100644
index 0000000000..f30ea26067
Binary files /dev/null and b/education/get-started/images/i4e_video_thumbnail_app.PNG differ
diff --git a/education/get-started/images/sds_add_new_profile_062017.PNG b/education/get-started/images/sds_add_new_profile_062017.PNG
new file mode 100644
index 0000000000..84340eebb8
Binary files /dev/null and b/education/get-started/images/sds_add_new_profile_062017.PNG differ
diff --git a/education/get-started/images/sds_add_new_profile_062317.PNG b/education/get-started/images/sds_add_new_profile_062317.PNG
new file mode 100644
index 0000000000..5732ad597d
Binary files /dev/null and b/education/get-started/images/sds_add_new_profile_062317.PNG differ
diff --git a/education/get-started/images/sds_portal.PNG b/education/get-started/images/sds_portal.PNG
new file mode 100644
index 0000000000..c7a47f2d7d
Binary files /dev/null and b/education/get-started/images/sds_portal.PNG differ
diff --git a/education/get-started/images/sds_profile_profilepage_062017.PNG b/education/get-started/images/sds_profile_profilepage_062017.PNG
new file mode 100644
index 0000000000..8621592542
Binary files /dev/null and b/education/get-started/images/sds_profile_profilepage_062017.PNG differ
diff --git a/education/get-started/images/sds_profile_profilepage_settingup_062317.PNG b/education/get-started/images/sds_profile_profilepage_settingup_062317.PNG
new file mode 100644
index 0000000000..90fe34dbee
Binary files /dev/null and b/education/get-started/images/sds_profile_profilepage_settingup_062317.PNG differ
diff --git a/education/get-started/images/sds_profile_reviewpage_062317.PNG b/education/get-started/images/sds_profile_reviewpage_062317.PNG
new file mode 100644
index 0000000000..676bed0efc
Binary files /dev/null and b/education/get-started/images/sds_profile_reviewpage_062317.PNG differ
diff --git a/education/get-started/images/sds_profile_status_everythingok_062317.png b/education/get-started/images/sds_profile_status_everythingok_062317.png
new file mode 100644
index 0000000000..cdb487aced
Binary files /dev/null and b/education/get-started/images/sds_profile_status_everythingok_062317.png differ
diff --git a/education/get-started/images/sds_profile_status_syncerrors_062317.PNG b/education/get-started/images/sds_profile_status_syncerrors_062317.PNG
new file mode 100644
index 0000000000..6ae7ec5a31
Binary files /dev/null and b/education/get-started/images/sds_profile_status_syncerrors_062317.PNG differ
diff --git a/education/get-started/images/sds_profile_status_syncerrors_highlighted_062317.png b/education/get-started/images/sds_profile_status_syncerrors_highlighted_062317.png
new file mode 100644
index 0000000000..2cd58a3b21
Binary files /dev/null and b/education/get-started/images/sds_profile_status_syncerrors_highlighted_062317.png differ
diff --git a/education/get-started/images/sds_profile_status_syncinprogress_062317.PNG b/education/get-started/images/sds_profile_status_syncinprogress_062317.PNG
new file mode 100644
index 0000000000..2fd6208eca
Binary files /dev/null and b/education/get-started/images/sds_profile_status_syncinprogress_062317.PNG differ
diff --git a/education/get-started/images/sds_profile_status_syncinprogress_highlighted_062317.png b/education/get-started/images/sds_profile_status_syncinprogress_highlighted_062317.png
new file mode 100644
index 0000000000..407744d066
Binary files /dev/null and b/education/get-started/images/sds_profile_status_syncinprogress_highlighted_062317.png differ
diff --git a/education/get-started/images/sds_profile_student_options_062017.PNG b/education/get-started/images/sds_profile_student_options_062017.PNG
new file mode 100644
index 0000000000..4affc4dbfd
Binary files /dev/null and b/education/get-started/images/sds_profile_student_options_062017.PNG differ
diff --git a/education/get-started/images/sds_profile_student_options_062317.PNG b/education/get-started/images/sds_profile_student_options_062317.PNG
new file mode 100644
index 0000000000..0d2102be7d
Binary files /dev/null and b/education/get-started/images/sds_profile_student_options_062317.PNG differ
diff --git a/education/get-started/images/sds_profile_sync_options_062017.PNG b/education/get-started/images/sds_profile_sync_options_062017.PNG
new file mode 100644
index 0000000000..71df6f3d24
Binary files /dev/null and b/education/get-started/images/sds_profile_sync_options_062017.PNG differ
diff --git a/education/get-started/images/sds_profile_sync_options_062317.PNG b/education/get-started/images/sds_profile_sync_options_062317.PNG
new file mode 100644
index 0000000000..1d02a0659a
Binary files /dev/null and b/education/get-started/images/sds_profile_sync_options_062317.PNG differ
diff --git a/education/get-started/images/sds_profile_teacher_options_062017.PNG b/education/get-started/images/sds_profile_teacher_options_062017.PNG
new file mode 100644
index 0000000000..7c8bdfae25
Binary files /dev/null and b/education/get-started/images/sds_profile_teacher_options_062017.PNG differ
diff --git a/education/get-started/images/sds_profile_teacher_options_062317.PNG b/education/get-started/images/sds_profile_teacher_options_062317.PNG
new file mode 100644
index 0000000000..ab9f2706b1
Binary files /dev/null and b/education/get-started/images/sds_profile_teacher_options_062317.PNG differ
diff --git a/education/get-started/images/sds_sds_on_newmenuitemsappear.PNG b/education/get-started/images/sds_sds_on_newmenuitemsappear.PNG
new file mode 100644
index 0000000000..bec27dc781
Binary files /dev/null and b/education/get-started/images/sds_sds_on_newmenuitemsappear.PNG differ
diff --git a/education/get-started/images/sds_settings_manage_sds_firstsignin.PNG b/education/get-started/images/sds_settings_manage_sds_firstsignin.PNG
new file mode 100644
index 0000000000..6298721880
Binary files /dev/null and b/education/get-started/images/sds_settings_manage_sds_firstsignin.PNG differ
diff --git a/education/index.md b/education/index.md
index 1ab087f682..4033cef903 100644
--- a/education/index.md
+++ b/education/index.md
@@ -4,6 +4,8 @@ hide_bc: true
title: Microsoft Education documentation and resources | Microsoft Docs
description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers.
author: CelesteDG
+ms.author: celested
+ms.date: ms.date: 06/12/2017
---
diff --git a/education/windows/change-history-edu.md b/education/windows/change-history-edu.md
index 1a84521c52..8cce637c8d 100644
--- a/education/windows/change-history-edu.md
+++ b/education/windows/change-history-edu.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: edu
author: CelesteDG
ms.author: celested
+ms.date: 06/19/2017
---
# Change history for Windows 10 for Education
diff --git a/education/windows/configure-windows-for-education.md b/education/windows/configure-windows-for-education.md
index c3a641c713..4cbabcfdff 100644
--- a/education/windows/configure-windows-for-education.md
+++ b/education/windows/configure-windows-for-education.md
@@ -7,6 +7,7 @@ ms.sitesec: library
localizationpriority: high
author: CelesteDG
ms.author: celested
+ms.date: 06/19/2017
---
# Windows 10 configuration recommendations for education customers
@@ -74,8 +75,8 @@ You can set all the education compliance areas through both provisioning and man
## AllowCortana
**AllowCortana** is a policy that enables or disables Cortana. It is a policy node in the Policy configuration service provider, [AllowCortana](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#experience-allowcortana).
- > [!NOTE]
- > See the [Recommended configuration](#recommended-configuration) section for recommended Cortana settings.
+> [!NOTE]
+> See the [Recommended configuration](#recommended-configuration) section for recommended Cortana settings.
Use one of these methods to set this policy.
diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md
index d5450ff204..7d76300a59 100644
--- a/education/windows/edu-deployment-recommendations.md
+++ b/education/windows/edu-deployment-recommendations.md
@@ -7,6 +7,7 @@ ms.sitesec: library
localizationpriority: high
author: CelesteDG
ms.author: celested
+ms.date: 06/19/2017
ms.prod: W10
---
diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md
index e1bb292097..bfc4179cfa 100644
--- a/education/windows/use-set-up-school-pcs-app.md
+++ b/education/windows/use-set-up-school-pcs-app.md
@@ -9,6 +9,7 @@ ms.pagetype: edu
localizationpriority: high
author: CelesteDG
ms.author: celested
+ms.date: 06/26/2017
---
# Use the Set up School PCs app
@@ -67,6 +68,7 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
> [!WARNING]
> Only use the provisioning package on PCs that you want to configure and lock down for students. After you apply the provisioning package to a student PC, the PC must be reset to remove the settings.
+ * The student PCs must be in range of the Wi-Fi network that you configured in Set up School PCs or have a wired Ethernet connection when you set them up. Otherwise, setup will fail.
* If the PC has already been set up and you want to return to the first-run experience to apply a new package, you can reset the PC to get to a clean state and get it back to the first-run experience and ready to provision again.
To do this:
@@ -91,18 +93,16 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
Learn more about what Set up School PCs does, including provisioning details, in [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md).
+## Prerequisites
-## Set up School PCs app step-by-step
+- [Download the latest Set up School PCs app from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4ls40).
+- Install the app on your work PC and make sure you're connected to your school's network.
+- You must be an administrator on Office 365 and Azure Active Directory, and have Microsoft Store for Education configured. It's best if you sign up for and configure Intune for Education before using the Set up School PCs app.
+- Have a USB drive, 1 GB or larger, to save the provisioning package. We recommend an 8 GB or larger USB drive if you're installing Office.
-What you need:
+## Set up School PCs step-by-step
-- The **Set up School PCs** app, installed on your work PC and connected to your school's network.
-
- To get started, [download the latest Set up School PCs app from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4ls40).
-
-- A USB drive, 1 GB or larger. We recommend an 8 GB or larger USB drive if you're installing Office.
-
-### Create the provisioning package in the app
+### Create the provisioning package
The **Set up School PCs** app guides you through the configuration choices for the student PCs.
@@ -193,18 +193,20 @@ The **Set up School PCs** app guides you through the configuration choices for t
3. Click **Next** or **Skip** depending on whether you want to set up Take a Test.
8. In the **Add recommended apps** page, you can choose from a set of recommended Microsoft Store apps to provision. The recommended apps include the following:
- * **Office 365 for Windows 10 S (Education Preview)** - Your student PCs must be running Windows 10 S to install this app. If you try to install this app on other editions of Windows, setup will fail.
- * **Minecraft: Education Edition** - Free trial
+ * **Office 365 for Windows 10 S (Education Preview)**
+ * Office 365 for Windows 10 S will only work on student PCs running Windows 10 S. If you try to install this app on other editions of Windows, setup will fail.
+ * When adding the Office 365 for Windows 10 S to a package, the device you use to run Set up School PCs does not have to be running Windows 10 S.
+ * **Minecraft: Education Edition** - Free trial
* Popular **STEM and Makerspace apps**
1. Select the apps that you would like to provision and then click **Next** when you're done.
2. Click **Skip** if you don't want to provision any apps.
- **Figure 6** - Select from a set of recommended Microsoft Store apps
+ **Figure 6** - Select from a set of recommended Microsoft Store apps
- 
+ 
- The set of recommended Microsoft Store for Education apps may vary from what we show here.
+ The set of recommended Microsoft Store for Education apps may vary from what we show here.
9. In the **Review package summary** page, make sure that all the settings you configured appear correctly.
1. If you need to change any of the settings, you can on the sections to go back to that page and make your changes.
diff --git a/mdop/docfx.json b/mdop/docfx.json
index 845ff81056..a9a41d5222 100644
--- a/mdop/docfx.json
+++ b/mdop/docfx.json
@@ -21,7 +21,12 @@
"ms.sitesec": "library",
"ms.topic": "article",
"ms.author": "jamiet",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.mdop"
+ }
+ }
},
"externalReference": [
],
diff --git a/smb/docfx.json b/smb/docfx.json
index 2e849d2d22..866b2b152c 100644
--- a/smb/docfx.json
+++ b/smb/docfx.json
@@ -29,9 +29,14 @@
"overwrite": [],
"externalReference": [],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/smb/breadcrumb/toc.json"
- },
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/smb/breadcrumb/toc.json",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "TechNet.smb"
+ }
+ }
+ },
"fileMetadata": {},
"template": [],
"dest": "smb"
diff --git a/store-for-business/docfx.json b/store-for-business/docfx.json
index 82310e9a78..9fe69e52a3 100644
--- a/store-for-business/docfx.json
+++ b/store-for-business/docfx.json
@@ -36,7 +36,12 @@
"ms.author": "trudyha",
"ms.technology": "windows",
"ms.topic": "article",
- "ms.date": "05/09/2017"
+ "ms.date": "05/09/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.store-for-business"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/store-for-business/update-windows-store-for-business-account-settings.md b/store-for-business/update-windows-store-for-business-account-settings.md
index 637220cb67..f844b5251a 100644
--- a/store-for-business/update-windows-store-for-business-account-settings.md
+++ b/store-for-business/update-windows-store-for-business-account-settings.md
@@ -38,9 +38,12 @@ We need an email address in case we need to contact you about your Microsoft Sto
Taxes for Microsoft Store for Business purchases are determined by your business address. Businesses in these countries can provide their VAT number or local equivalent:
- Austria
- Belgium
+- Bulgaria
- Croatia
+- Cyprus
- Czech Republic
- Denmark
+- Estonia
- Finland
- France
- Germany
@@ -48,6 +51,10 @@ Taxes for Microsoft Store for Business purchases are determined by your business
- Hungary
- Ireland
- Italy
+- Latvia
+- Liechtenstein
+- Lithuania
+- Luxembourg
- Malta
- Netherlands
- Norway
@@ -65,8 +72,10 @@ These countries can provide their VAT number or local equivalent in **Payments &
|Market| Tax identifier |
|------|----------------|
+| Australia | ABN (optional) |
| Brazil | CNPJ (required) |
| India | CST ID, VAT ID (both are optional) |
+| New Zealand | GST Registration number (optional) |
| Taiwan | VAT ID (optional) |
### Tax-exempt status
diff --git a/windows/access-protection/credential-guard/credential-guard-known-issues.md b/windows/access-protection/credential-guard/credential-guard-known-issues.md
index a3780e1d3f..d3b2ea0fff 100644
--- a/windows/access-protection/credential-guard/credential-guard-known-issues.md
+++ b/windows/access-protection/credential-guard/credential-guard-known-issues.md
@@ -17,34 +17,39 @@ author: brianlic-msft
Credential Guard has certain application requirements. Credential Guard blocks specific authentication capabilities. Therefore applications that require such capabilities will not function when Credential Guard is enabled. For further information, see [Application requirements](https://docs.microsoft.com/en-us/windows/access-protection/credential-guard/credential-guard-requirements#application-requirements).
-The following known issues have been fixed by servicing releases made available in the Cumulative Security Updates for April 2017:
+The following known issue has been fixed by servicing releases made available in the Cumulative Security Updates for April 2017:
-- KB4015217: [Credential Guard generates double bad password count on Active Directory domain-joined Windows 10 machines](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217)
+- [KB4015217 Credential Guard generates double bad password count on Active Directory domain-joined Windows 10 machines](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217)
- This issue can potentially lead to unexpected account lockouts.
-See also Knowledge Base articles [KB4015219](https://support.microsoft.com/en-us/help/4015219/windows-10-update-kb4015219) and
+ This issue can potentially lead to unexpected account lockouts. See also Microsoft® Knowledge Base articles [KB4015219](https://support.microsoft.com/en-us/help/4015219/windows-10-update-kb4015219) and
[KB4015221](https://support.microsoft.com/en-us/help/4015221/windows-10-update-kb4015221)
-The following issue is under investigation. For available workarounds, see the following Knowledge Base article:
-- [Installing AppSense Environment Manager on Windows 10 machines causes LSAiso.exe to exhibit high CPU usage when Credential Guard is enabled](http://www.appsense.com/kb/160525073917945) *
[1]
-
- *Registration required to access this article.
-
-
[1] For further technical information on LSAiso.exe, see this MSDN article: [Isolated User Mode (IUM) Processes](https://msdn.microsoft.com/library/windows/desktop/mt809132(v=vs.85).aspx)
-
The following issue affects Cisco AnyConnect Secure Mobility Client:
-- [Blue screen on Windows 10 computers running Device Guard and Credential Guard with Cisco Anyconnect 4.3.04027](https://quickview.cloudapps.cisco.com/quickview/bug/CSCvc66692)**
+- [Blue screen on Windows 10 computers running Device Guard and Credential Guard with Cisco Anyconnect 4.3.04027](https://quickview.cloudapps.cisco.com/quickview/bug/CSCvc66692) \*
-**Registration required to access this article.
+*Registration required to access this article.
-Products that connect to Virtualization Based Security (VBS) protected processes can cause Credential Guard-enabled Windows 10 clients to exhibit high CPU usage. For further information, see the following Knowledge Base article:
+The following issue affects McAfee Application and Change Control (MACC):
+- [KB88869 Windows 10 machines exhibit high CPU sage with McAfee Application and Change Control (MACC) installed when Credential Guard is enabled](https://kc.mcafee.com/corporate/index?page=content&id=KB88869)
[1]
+
-- KB88869: [Windows 10 machines exhibit high CPU usage with McAfee Application and Change Control (MACC) installed when Credential Guard is enabled](https://kc.mcafee.com/corporate/index?page=content&id=KB88869)
+The following issue affects AppSense Environment Manager.
+ For further information, see the following Knowledge Base article:
+- [Installing AppSense Environment Manager on Windows 10 machines causes LSAISO.exe to exhibit high CPU usage when Credential Guard is enabled](http://www.appsense.com/kb/160525073917945)
[1] \**
-The following issue is under investigation:
+The following issue affects Citrix applications:
+- Windows 10 machines exhibit high CPU usage with Citrix applications installed when Credential Guard is enabled.
[1]
+
+
[1] Products that connect to Virtualization Based Security (VBS) protected processes can cause Credential Guard-enabled Windows 10 or Windows Server 2016 machines to exhibit high CPU usage. For technical and troubleshooting information, see the following Microsoft Knowledge Base article:
+
+- [KB4032786 High CPU usage in the LSAISO process on Windows 10 or Windows Server 2016](https://support.microsoft.com/en-us/help/4032786)
+
+For further technical information on LSAISO.exe, see the MSDN article: [Isolated User Mode (IUM) Processes](https://msdn.microsoft.com/library/windows/desktop/mt809132(v=vs.85).aspx)
+
+
+ \** Registration is required to access this article.
-- Windows 10 machines exhibit high CPU usage with Citrix applications installed when Credential Guard is enabled.
## Vendor support
diff --git a/windows/access-protection/docfx.json b/windows/access-protection/docfx.json
index 4959e6689a..4d805de5fe 100644
--- a/windows/access-protection/docfx.json
+++ b/windows/access-protection/docfx.json
@@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.win-access-protection"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/windows/application-management/app-v/appv-auto-batch-sequencing.md b/windows/application-management/app-v/appv-auto-batch-sequencing.md
index a90e25e2eb..5de2cf686f 100644
--- a/windows/application-management/app-v/appv-auto-batch-sequencing.md
+++ b/windows/application-management/app-v/appv-auto-batch-sequencing.md
@@ -155,6 +155,7 @@ There are 3 types of log files that occur when you sequence multiple apps at the
- **Log.txt file**. Located in the **Output Package** folder. This file contains all code included in the NewAppVSequencerPackage cmdlet, including the allowed parameters.
### Related topics
+
- [Download the Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
- [How to install the App-V Sequencer](appv-install-the-sequencer.md)
diff --git a/windows/application-management/app-v/appv-auto-batch-updating.md b/windows/application-management/app-v/appv-auto-batch-updating.md
index 0430b81a0b..9dd0ce0b52 100644
--- a/windows/application-management/app-v/appv-auto-batch-updating.md
+++ b/windows/application-management/app-v/appv-auto-batch-updating.md
@@ -158,6 +158,7 @@ There are 3 types of log files that occur when you sequence multiple apps at the
- **Log.txt file**. Located in the **Output Package** folder. This file contains all code included in the NewAppVSequencerPackage cmdlet, including the allowed parameters.
### Related topics
+
- [Download the Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
- [How to install the App-V Sequencer](appv-install-the-sequencer.md)
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index 9da290da19..285dcee673 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "elizapo",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.win-app-management"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index 5b67069617..f649a5d1af 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "dongill",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.win-client-management"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/windows/client-management/mdm/activesync-csp.md b/windows/client-management/mdm/activesync-csp.md
index a395891a14..f63def3424 100644
--- a/windows/client-management/mdm/activesync-csp.md
+++ b/windows/client-management/mdm/activesync-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# ActiveSync CSP
diff --git a/windows/client-management/mdm/activesync-ddf-file.md b/windows/client-management/mdm/activesync-ddf-file.md
index 8aa90d6d7c..0ef6a1b1eb 100644
--- a/windows/client-management/mdm/activesync-ddf-file.md
+++ b/windows/client-management/mdm/activesync-ddf-file.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# ActiveSync DDF file
diff --git a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
index e1c6986fe5..da5ae04b1b 100644
--- a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
+++ b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Add an Azure AD tenant and Azure AD subscription
diff --git a/windows/client-management/mdm/alljoynmanagement-csp.md b/windows/client-management/mdm/alljoynmanagement-csp.md
index 0746ed4175..94d224ad36 100644
--- a/windows/client-management/mdm/alljoynmanagement-csp.md
+++ b/windows/client-management/mdm/alljoynmanagement-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AllJoynManagement CSP
diff --git a/windows/client-management/mdm/alljoynmanagement-ddf.md b/windows/client-management/mdm/alljoynmanagement-ddf.md
index ebc2840da3..0b2febb114 100644
--- a/windows/client-management/mdm/alljoynmanagement-ddf.md
+++ b/windows/client-management/mdm/alljoynmanagement-ddf.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AllJoynManagement DDF
diff --git a/windows/client-management/mdm/application-csp.md b/windows/client-management/mdm/application-csp.md
index 463b2e0c07..ad21866a9d 100644
--- a/windows/client-management/mdm/application-csp.md
+++ b/windows/client-management/mdm/application-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# APPLICATION configuration service provider
diff --git a/windows/client-management/mdm/applicationrestrictions-xsd.md b/windows/client-management/mdm/applicationrestrictions-xsd.md
index 312d90524e..f2b7971e0c 100644
--- a/windows/client-management/mdm/applicationrestrictions-xsd.md
+++ b/windows/client-management/mdm/applicationrestrictions-xsd.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# ApplicationRestrictions XSD
diff --git a/windows/client-management/mdm/applocker-csp.md b/windows/client-management/mdm/applocker-csp.md
index a73544002c..e1097181a3 100644
--- a/windows/client-management/mdm/applocker-csp.md
+++ b/windows/client-management/mdm/applocker-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AppLocker CSP
diff --git a/windows/client-management/mdm/applocker-ddf-file.md b/windows/client-management/mdm/applocker-ddf-file.md
index e332216b02..8212ab4928 100644
--- a/windows/client-management/mdm/applocker-ddf-file.md
+++ b/windows/client-management/mdm/applocker-ddf-file.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AppLocker DDF file
diff --git a/windows/client-management/mdm/applocker-xsd.md b/windows/client-management/mdm/applocker-xsd.md
index 1d578d006d..7b7aa1f830 100644
--- a/windows/client-management/mdm/applocker-xsd.md
+++ b/windows/client-management/mdm/applocker-xsd.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AppLocker XSD
diff --git a/windows/client-management/mdm/appv-deploy-and-config.md b/windows/client-management/mdm/appv-deploy-and-config.md
index d7f18cf787..bfbbb46f16 100644
--- a/windows/client-management/mdm/appv-deploy-and-config.md
+++ b/windows/client-management/mdm/appv-deploy-and-config.md
@@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Deploy and configure App-V apps using MDM
diff --git a/windows/client-management/mdm/assign-seats.md b/windows/client-management/mdm/assign-seats.md
index b39d6d9cdf..510be6e748 100644
--- a/windows/client-management/mdm/assign-seats.md
+++ b/windows/client-management/mdm/assign-seats.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Assign seat
diff --git a/windows/client-management/mdm/assignedaccess-csp.md b/windows/client-management/mdm/assignedaccess-csp.md
index aad87ff0e5..8c6466d2d4 100644
--- a/windows/client-management/mdm/assignedaccess-csp.md
+++ b/windows/client-management/mdm/assignedaccess-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AssignedAccess CSP
diff --git a/windows/client-management/mdm/assignedaccess-ddf.md b/windows/client-management/mdm/assignedaccess-ddf.md
index 4f2fae2306..f3cb07376f 100644
--- a/windows/client-management/mdm/assignedaccess-ddf.md
+++ b/windows/client-management/mdm/assignedaccess-ddf.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# AssignedAccess DDF
diff --git a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
index ebdb1d406e..d3ca116cea 100644
--- a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
+++ b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
diff --git a/windows/client-management/mdm/bitlocker-csp.md b/windows/client-management/mdm/bitlocker-csp.md
index 308b678f24..2007e89d95 100644
--- a/windows/client-management/mdm/bitlocker-csp.md
+++ b/windows/client-management/mdm/bitlocker-csp.md
@@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# BitLocker CSP
diff --git a/windows/client-management/mdm/bitlocker-ddf-file.md b/windows/client-management/mdm/bitlocker-ddf-file.md
index 2b0491ab35..50a36cc987 100644
--- a/windows/client-management/mdm/bitlocker-ddf-file.md
+++ b/windows/client-management/mdm/bitlocker-ddf-file.md
@@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# BitLocker DDF file
diff --git a/windows/client-management/mdm/bootstrap-csp.md b/windows/client-management/mdm/bootstrap-csp.md
index 86259803e4..50513be9bc 100644
--- a/windows/client-management/mdm/bootstrap-csp.md
+++ b/windows/client-management/mdm/bootstrap-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# BOOTSTRAP CSP
diff --git a/windows/client-management/mdm/browserfavorite-csp.md b/windows/client-management/mdm/browserfavorite-csp.md
index e762d03a4f..5e68ea5e83 100644
--- a/windows/client-management/mdm/browserfavorite-csp.md
+++ b/windows/client-management/mdm/browserfavorite-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# BrowserFavorite CSP
diff --git a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
index 3d370d247f..33f5904925 100644
--- a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
+++ b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Bulk assign and reclaim seats from users
diff --git a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
index dca0fac617..7a31519c1d 100644
--- a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
+++ b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
@@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
diff --git a/windows/client-management/mdm/cellularsettings-csp.md b/windows/client-management/mdm/cellularsettings-csp.md
index 2eb3f56669..2923939d83 100644
--- a/windows/client-management/mdm/cellularsettings-csp.md
+++ b/windows/client-management/mdm/cellularsettings-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CellularSettings CSP
diff --git a/windows/client-management/mdm/certificate-authentication-device-enrollment.md b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
index 06d6f265b6..0a2bceab37 100644
--- a/windows/client-management/mdm/certificate-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Certificate authentication device enrollment
diff --git a/windows/client-management/mdm/certificate-renewal-windows-mdm.md b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
index 03875bfea6..c281ee131a 100644
--- a/windows/client-management/mdm/certificate-renewal-windows-mdm.md
+++ b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
@@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Certificate Renewal
diff --git a/windows/client-management/mdm/certificatestore-csp.md b/windows/client-management/mdm/certificatestore-csp.md
index 20bda706fb..96b14e8fb7 100644
--- a/windows/client-management/mdm/certificatestore-csp.md
+++ b/windows/client-management/mdm/certificatestore-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CertificateStore CSP
diff --git a/windows/client-management/mdm/certificatestore-ddf-file.md b/windows/client-management/mdm/certificatestore-ddf-file.md
index dce1073030..64e0b3693f 100644
--- a/windows/client-management/mdm/certificatestore-ddf-file.md
+++ b/windows/client-management/mdm/certificatestore-ddf-file.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CertificateStore DDF file
diff --git a/windows/client-management/mdm/cleanpc-csp.md b/windows/client-management/mdm/cleanpc-csp.md
index 4f2d5cc211..87f6daf4e2 100644
--- a/windows/client-management/mdm/cleanpc-csp.md
+++ b/windows/client-management/mdm/cleanpc-csp.md
@@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CleanPC CSP
diff --git a/windows/client-management/mdm/cleanpc-ddf.md b/windows/client-management/mdm/cleanpc-ddf.md
index cfbd44cc65..82e162729b 100644
--- a/windows/client-management/mdm/cleanpc-ddf.md
+++ b/windows/client-management/mdm/cleanpc-ddf.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CleanPC DDF
diff --git a/windows/client-management/mdm/clientcertificateinstall-csp.md b/windows/client-management/mdm/clientcertificateinstall-csp.md
index 6391e50c7d..587a1318fc 100644
--- a/windows/client-management/mdm/clientcertificateinstall-csp.md
+++ b/windows/client-management/mdm/clientcertificateinstall-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# ClientCertificateInstall CSP
diff --git a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
index d94173af03..66c326a853 100644
--- a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
+++ b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# ClientCertificateInstall DDF file
diff --git a/windows/client-management/mdm/cm-cellularentries-csp.md b/windows/client-management/mdm/cm-cellularentries-csp.md
index 94a6e27f51..392f0820ef 100644
--- a/windows/client-management/mdm/cm-cellularentries-csp.md
+++ b/windows/client-management/mdm/cm-cellularentries-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CM\_CellularEntries CSP
diff --git a/windows/client-management/mdm/cm-proxyentries-csp.md b/windows/client-management/mdm/cm-proxyentries-csp.md
index 693b4feb34..3612c0995d 100644
--- a/windows/client-management/mdm/cm-proxyentries-csp.md
+++ b/windows/client-management/mdm/cm-proxyentries-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CM\_ProxyEntries CSP
diff --git a/windows/client-management/mdm/cmpolicy-csp.md b/windows/client-management/mdm/cmpolicy-csp.md
index e83953965b..daa2d26d67 100644
--- a/windows/client-management/mdm/cmpolicy-csp.md
+++ b/windows/client-management/mdm/cmpolicy-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CMPolicy CSP
diff --git a/windows/client-management/mdm/cmpolicyenterprise-csp.md b/windows/client-management/mdm/cmpolicyenterprise-csp.md
index a3c9b663bf..3decd7a9a4 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-csp.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CMPolicyEnterprise CSP
diff --git a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
index 6305ea17c3..7f8e457270 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CMPolicyEnterprise DDF file
diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md
index a6d30377d2..498d52cb2a 100644
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Configuration service provider reference
diff --git a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
index 1d424f8364..2e6ce78778 100644
--- a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
+++ b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Create a custom configuration service provider
diff --git a/windows/client-management/mdm/customdeviceui-csp.md b/windows/client-management/mdm/customdeviceui-csp.md
index 955159f333..5e4e2289db 100644
--- a/windows/client-management/mdm/customdeviceui-csp.md
+++ b/windows/client-management/mdm/customdeviceui-csp.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CustomDeviceUI CSP
diff --git a/windows/client-management/mdm/customdeviceui-ddf.md b/windows/client-management/mdm/customdeviceui-ddf.md
index d44a97a49e..1299aadd20 100644
--- a/windows/client-management/mdm/customdeviceui-ddf.md
+++ b/windows/client-management/mdm/customdeviceui-ddf.md
@@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# CustomDeviceUI DDF
diff --git a/windows/client-management/mdm/data-structures-windows-store-for-business.md b/windows/client-management/mdm/data-structures-windows-store-for-business.md
index 18b093df38..7a1bbaa552 100644
--- a/windows/client-management/mdm/data-structures-windows-store-for-business.md
+++ b/windows/client-management/mdm/data-structures-windows-store-for-business.md
@@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
+ms.date: 06/19/2017
---
# Data structures for Windows Store for Business
@@ -28,6 +29,7 @@ Here's the list of data structures used in the Windows Store for Business REST A
- [LicenseType](#licensetype)
- [LocalizedProductDetail](#localizedproductdetail)
- [OfflineLicense](#offlinelicense)
+- [PackageContentInfo](#packagecontentinfo)
- [PackageLocation](#packagelocation)
- [ProductArchitectures](#productarchitectures)
- [ProductDetails](#productdetails)
@@ -85,26 +87,22 @@ Specifies the properties of the alternate identifier.
-
-
+
seatDetails |
-Collection of [SeatDetails](#seatdetails) |
- |
+collection of [SeatDetails](#seatdetails) |
failedSeatOperations |
-Collection of [FailedSeatRequest](#failedseatrequest) |
- |
+collection of [FailedSeatRequest](#failedseatrequest) |
@@ -117,31 +115,26 @@ Specifies the properties of the alternate identifier.
-
-
+
failureReason |
string |
- |
productKey |
[ProductKey](#productkey) |
- |
userName |
string |
- |
@@ -173,7 +166,7 @@ Specifies the properties of the alternate identifier.
contentId |
string |
-Identifies a specific application |
+Identifies a specific application. |
location |
@@ -207,12 +200,12 @@ Specifies the properties of the alternate identifier.
fileSize |
-integer -64 |
- |
+integer-64 |
+Size of the file. |
packageRank |
-integer-3232 |
+integer-32 |
Optional |
@@ -225,26 +218,22 @@ Specifies the properties of the alternate identifier.
-
-
+
open |
- |
Open distribution policy - licenses/seats can be assigned/consumed without limit |
restricted |
- |
Restricted distribution policy - licenses/seats must be assigned/consumed according to the available count |
@@ -277,7 +266,7 @@ Specifies the properties of the alternate identifier.
seatCapacity |
integer-64 |
-Total number of seats that have been purchased for an application |
+Total number of seats that have been purchased for an application. |
availableSeats |
@@ -296,12 +285,12 @@ Specifies the properties of the alternate identifier.
distributionPolicy |
-InventoryDistributionPolicy |
+[InventoryDistributionPolicy](#inventorydistributionpolicy) |
|
status |
-InventoryStatus |
+[InventoryStatus](#inventorystatus) |
|
@@ -329,11 +318,11 @@ Specifies the properties of the alternate identifier.
continuationToken |
string |
-continuationToken is only available if there is a next page |
+Only available if there is a next page. |
inventoryEntries |
-collection of |
+collection of [InventoryEntryDetails](#inventoryentrydetails) |
|
@@ -346,27 +335,23 @@ Specifies the properties of the alternate identifier.
-
-
+
active |
- |
-Entry is available in the organization’s inventory |
+Entry is available in the organization’s inventory. |
removed |
- |
-Entry has been removed from the organization’s inventory |
+Entry has been removed from the organization’s inventory. |
@@ -378,8 +363,8 @@ Specifies the properties of the alternate identifier.
-
-
+
+
+
+
+
+
+Code
+ |
+
8007001F - 0x4000D
|
diff --git a/windows/deployment/upgrade/upgrade-readiness-get-started.md b/windows/deployment/upgrade/upgrade-readiness-get-started.md
index bb6ce8f949..937be3b7e3 100644
--- a/windows/deployment/upgrade/upgrade-readiness-get-started.md
+++ b/windows/deployment/upgrade/upgrade-readiness-get-started.md
@@ -40,6 +40,9 @@ To enable system, application, and driver data to be shared with Microsoft, you
Upgrade Readiness is offered as a solution in the Microsoft Operations Management Suite (OMS), a collection of cloud based services for managing your on-premises and cloud environments. For more information about OMS, see [Operations Management Suite overview](http://azure.microsoft.com/documentation/articles/operations-management-suite-overview/).
+>[!IMPORTANT]
+>Upgrade Readiness is a free solution. When configured correctly, all data associated with the Upgrade Readiness solution are exempt from billing in both OMS and Azure. Upgrade Readiness data **do not** count toward OMS daily upload limits.
+
If you are already using OMS, you’ll find Upgrade Readiness in the Solutions Gallery. Select the **Upgrade Readiness** tile in the gallery and then click **Add** on the solution's details page. Upgrade Readiness is now visible in your workspace.
If you are not using OMS:
diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md
index 4e36256cae..7cd077d90a 100644
--- a/windows/deployment/windows-10-poc-sc-config-mgr.md
+++ b/windows/deployment/windows-10-poc-sc-config-mgr.md
@@ -1,10 +1,11 @@
---
-title: Deploy Windows 10 using System Center Configuration Manager
-description: Deploy Windows 10 in a test lab using System Center Configuration Manager
+title: Step by step - Deploy Windows 10 using System Center Configuration Manager
+description: Deploy Windows 10 in a test lab using System Center Configuration Manager
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-ms.pagetype: deploykeywords: deployment, automate, tools, configure, sccm, configuration manager
+ms.pagetype: deploy
+keywords: deployment, automate, tools, configure, sccm
localizationpriority: high
author: greg-lindsay
---
@@ -14,6 +15,7 @@ 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)
diff --git a/windows/deployment/windows-10-poc.md b/windows/deployment/windows-10-poc.md
index 32af71bf09..ebdbe4e613 100644
--- a/windows/deployment/windows-10-poc.md
+++ b/windows/deployment/windows-10-poc.md
@@ -54,11 +54,8 @@ Topics and procedures in this guide are summarized in the following table. An es
|
[Convert PC to VM](#convert-pc-to-vm) | Convert a physical computer on your network to a VM hosted in Hyper-V. | 30 minutes
|
[Resize VHD](#resize-vhd) | Increase the storage capacity for one of the Windows Server VMs. | 5 minutes
|
[Configure Hyper-V](#configure-hyper-v) | Create virtual switches, determine available RAM for virtual machines, and add virtual machines. | 15 minutes
-<<<<<<< HEAD:windows/deployment/windows-10-poc.md
|
[Configure service and user accounts](#configure-service-and-user-accounts) | Start virtual machines and configure all services and settings. | 60 minutes
-=======
|
[Configure VMs](#configure-vms) | Start virtual machines and configure all services and settings. | 60 minutes
->>>>>>> bb842731e73d0f219d021f0869d9b36c8aba222c:windows/deploy/windows-10-poc.md
|
[Appendix A: Verify the configuration](#appendix-a-verify-the-configuration) | Verify and troubleshoot network connectivity and services in the PoC environment. | 30 minutes
|
[Appendix B: Terminology in this guide](#appendix-b-terminology-used-in-this-guide) | Terms used in this guide. | Informational
|
diff --git a/windows/device-security/docfx.json b/windows/device-security/docfx.json
index ca5178e70e..acfa4df08b 100644
--- a/windows/device-security/docfx.json
+++ b/windows/device-security/docfx.json
@@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.win-device-security"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/windows/docfx.json b/windows/docfx.json
index 4b2035530d..f1253f1567 100644
--- a/windows/docfx.json
+++ b/windows/docfx.json
@@ -15,7 +15,12 @@
],
"globalMetadata": {
"ROBOTS": "INDEX, FOLLOW",
- "breadcrumb_path": "/itpro/windows/breadcrumb/toc.json"
+ "breadcrumb_path": "/itpro/windows/breadcrumb/toc.json",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "Win.windows"
+ }
+ }
},
"externalReference": [
],
diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json
index a95581a35a..e33995957d 100644
--- a/windows/hub/docfx.json
+++ b/windows/hub/docfx.json
@@ -38,7 +38,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "brianlic",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.windows-hub"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/windows/keep-secure/docfx.json b/windows/keep-secure/docfx.json
index 8d60cf1552..c69d3e3f49 100644
--- a/windows/keep-secure/docfx.json
+++ b/windows/keep-secure/docfx.json
@@ -29,7 +29,13 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.keep-secure"
+ }
+ }
+ },
"fileMetadata": {},
"template": [],
"dest": "keep-secure"
diff --git a/windows/manage/docfx.json b/windows/manage/docfx.json
index 628f06503d..eee8740627 100644
--- a/windows/manage/docfx.json
+++ b/windows/manage/docfx.json
@@ -29,7 +29,13 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.windows-manage"
+ }
+ }
+ },
"fileMetadata": {},
"template": [],
"dest": "windows-manage"
diff --git a/windows/plan/docfx.json b/windows/plan/docfx.json
index 289552ee34..4a303a21bc 100644
--- a/windows/plan/docfx.json
+++ b/windows/plan/docfx.json
@@ -29,7 +29,13 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.windows-plan"
+ }
+ }
+ },
"fileMetadata": {},
"template": [],
"dest": "windows-plan"
diff --git a/windows/threat-protection/TOC.md b/windows/threat-protection/TOC.md
index 2a1c0426c4..266a77fc24 100644
--- a/windows/threat-protection/TOC.md
+++ b/windows/threat-protection/TOC.md
@@ -127,11 +127,9 @@
#### [Use PowerShell cmdlets to configure and manage Windows Defender AV](windows-defender-antivirus\use-powershell-cmdlets-windows-defender-antivirus.md)
#### [Use Windows Management Instrumentation (WMI) to configure and manage Windows Defender AV](windows-defender-antivirus\use-wmi-windows-defender-antivirus.md)
#### [Use the mpcmdrun.exe commandline tool to configure and manage Windows Defender AV](windows-defender-antivirus\command-line-arguments-windows-defender-antivirus.md)
-
## [Windows Defender SmartScreen](windows-defender-smartscreen\windows-defender-smartscreen-overview.md)
### [Available Windows Defender SmartScreen Group Policy and mobile device management (MDM) settings](windows-defender-smartscreen\windows-defender-smartscreen-available-settings.md)
### [Set up and use Windows Defender SmartScreen on individual devices](windows-defender-smartscreen\windows-defender-smartscreen-set-individual-device.md)
-
## [Protect your enterprise data using Windows Information Protection (WIP)](windows-information-protection\protect-enterprise-data-using-wip.md)
### [Create a Windows Information Protection (WIP) policy](windows-information-protection\overview-create-wip-policy.md)
#### [Create a Windows Information Protection (WIP) using the classic console for Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md)
@@ -152,13 +150,9 @@
#### [Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](windows-information-protection\app-behavior-with-wip.md)
#### [Recommended Enterprise Cloud Resources and Neutral Resources network settings with Windows Information Protection (WIP)](windows-information-protection\recommended-network-definitions-for-wip.md)
#### [Using Outlook Web Access with Windows Information Protection (WIP)](windows-information-protection\using-owa-with-wip.md)
-
## [Mitigate threats by using Windows 10 security features](overview-of-threat-mitigations-in-windows-10.md)
-
## [Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md)
-
+## [Secure the windows 10 boot process](secure-the-windows-10-boot-process.md)
## [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md)
-
## [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md)
-
-## [Change history for Threat Protection](change-history-for-threat-protection.md)
+## [Change history for Threat Protection](change-history-for-threat-protection.md)
\ No newline at end of file
diff --git a/windows/threat-protection/change-history-for-threat-protection.md b/windows/threat-protection/change-history-for-threat-protection.md
index ed82259478..c664fa8066 100644
--- a/windows/threat-protection/change-history-for-threat-protection.md
+++ b/windows/threat-protection/change-history-for-threat-protection.md
@@ -18,6 +18,7 @@ This topic lists new and updated topics in the [Threat protection](index.md) doc
[Deploy your Windows Information Protection (WIP) policy using the Azure portal for Microsoft Intune](windows-information-protection\deploy-wip-policy-using-intune-azure.md)|New topic for MDM using the Azure portal.|
[Associate and deploy a VPN policy for Windows Information Protection (WIP) using the Azure portal for Microsoft Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune-azure.md)|New topic for MDM using the Azure portal.|
|[List of enlightened Microsoft apps for use with Windows Information Protection (WIP)](windows-information-protection\enlightened-microsoft-apps-and-wip.md)|Updated to include newly enlightened and supported apps.|
+[Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md)| Updated from existing applicable and relevant Windows 8.1 content |
## March 2017
diff --git a/windows/threat-protection/docfx.json b/windows/threat-protection/docfx.json
index 2989cbeaa7..055e983ab5 100644
--- a/windows/threat-protection/docfx.json
+++ b/windows/threat-protection/docfx.json
@@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.win-threat-protection"
+ }
+ }
},
"fileMetadata": {},
"template": [],
diff --git a/windows/threat-protection/images/dn168167.boot_process(en-us,MSDN.10).png b/windows/threat-protection/images/dn168167.boot_process(en-us,MSDN.10).png
new file mode 100644
index 0000000000..97fabb4625
Binary files /dev/null and b/windows/threat-protection/images/dn168167.boot_process(en-us,MSDN.10).png differ
diff --git a/windows/threat-protection/images/dn168167.measure_boot(en-us,MSDN.10).png b/windows/threat-protection/images/dn168167.measure_boot(en-us,MSDN.10).png
new file mode 100644
index 0000000000..321f23ea7e
Binary files /dev/null and b/windows/threat-protection/images/dn168167.measure_boot(en-us,MSDN.10).png differ
diff --git a/windows/threat-protection/secure-the-windows-10-boot-process.md b/windows/threat-protection/secure-the-windows-10-boot-process.md
new file mode 100644
index 0000000000..069d8b1578
--- /dev/null
+++ b/windows/threat-protection/secure-the-windows-10-boot-process.md
@@ -0,0 +1,129 @@
+---
+title: Secure the Windows 10 boot process
+description: This article describes how Windows 10 security features helps protect your PC from malware, including rootkits and other applications
+keywords: trusted boot, windows 10 boot proces
+ms.prod: w10
+ms.mktglfcycl: Explore
+ms.pagetype: security
+ms.sitesec: library
+localizationpriority: medium
+author: brianlic-msft
+---
+
+# Secure the Windows 10 boot process
+
+**Applies to:**
+- Windows 10
+- Windows 8.1
+
+The Windows operating system has many features to help protect you from malware, and it does an amazingly good job. Except for apps that businesses develop and use internally, all Windows Store apps must meet a series of requirements to be certified and included in the Windows Store. This certification process examines several criteria, including security, and is an effective means of preventing malware from entering the Windows Store. Even if a malicious app does get through, the Windows 10 operating system includes a series of security features that can mitigate the impact. For instance, Windows Store apps are sandboxed and lack the privileges necessary to access user data or change system settings.
+
+Windows 10 has multiple levels of protection for desktop apps and data, too. Windows Defender uses signatures to detect and quarantine apps that are known to be malicious. The SmartScreen Filter warns users before allowing them to run an untrustworthy app, even if it’s recognized as malware. Before an app can change system settings, the user would have to grant the app administrative privileges by using User Account Control.
+
+Those are just some of the ways that Windows 10 protects you from malware. However, those security features protect you only after Windows 10 starts. Modern malware—and bootkits specifically—are capable of starting before Windows, completely bypassing operating system security, and remaining completely hidden.
+
+When you run Windows 10 on a PC or any PC that supports Unified Extensible Firmware Interface (UEFI), Trusted Boot protects your PC from malware from the moment you power on your PC until your anti-malware starts. In the unlikely event that malware does infect a PC, it can’t remain hidden; Trusted Boot can prove the system’s integrity to your infrastructure in a way that malware can’t disguise. Even on PCs without UEFI, Windows 10 provides even better startup security than previous versions of Windows.
+
+First, let’s examine what rootkits are and how they work. Then, we’ll show you how Windows 10 can protect you.
+
+
+## The threat: rootkits
+
+*Rootkits* are a sophisticated and dangerous type of malware that run in kernel mode, using the same privileges as the operating system. Because rootkits have the same rights as the operating system and start before it, they can completely hide themselves and other applications. Often, rootkits are part of an entire suite of malware that can bypass local logins, record passwords and keystrokes, transfer private files, and capture cryptographic data.
+
+Different types of rootkits load during different phases of the startup process:
+
+- **Firmware rootkits.** These kits overwrite the firmware of the PC’s basic input/output system or other hardware so the rootkit can start before Windows.
+- **Bootkits.** These kits replace the operating system’s bootloader (the small piece of software that starts the operating system) so that the PC loads the bootkit before the operating system.
+- **Kernel rootkits.** These kits replace a portion of the operating system kernel so the rootkit can start automatically when the operating system loads.
+- **Driver rootkits.** These kits pretend to be one of the trusted drivers that Windows uses to communicate with the PC hardware.
+
+## The countermeasures
+Windows 10 supports four features to help prevent rootkits and bootkits from loading during the startup process:
+- **Secure Boot.** PCs with UEFI firmware and a Trusted Platform Module (TPM) can be configured to load only trusted operating system bootloaders.
+- **Trusted Boot.** Windows checks the integrity of every component of the startup process before loading it.
+- **Early Launch Anti-Malware (ELAM).** ELAM tests all drivers before they load and prevents unapproved drivers from loading.
+- **Measured Boot.** The PC’s firmware logs the boot process, and Windows can send it to a trusted server that can objectively assess the PC’s health.
+
+Figure 1 shows the Windows 10 startup process.
+
+
+.png)
+
+**Figure 1. Secure Boot, Trusted Boot, and Measured Boot block malware at every stage**
+
+Secure Boot and Measured Boot are only possible on PCs with UEFI 2.3.1 and a TPM chip. Fortunately, all Windows 10 PCs that meet Windows Hardware Compatibility Program requirements have these components, and many PCs designed for earlier versions of Windows have them as well.
+
+The sections that follow describe Secure Boot, Trusted Boot, ELAM, and Measured Boot.
+
+## Secure Boot
+When a PC starts, it first finds the operating system bootloader. PCs without Secure Boot simply run whatever bootloader is on the PC’s hard drive. There’s no way for the PC to tell whether it’s a trusted operating system or a rootkit.
+
+When a PC equipped with UEFI starts, the PC first verifies that the firmware is digitally signed, reducing the risk of firmware rootkits. If Secure Boot is enabled, the firmware examines the bootloader’s digital signature to verify that it hasn’t been modified. If the bootloader is intact, the firmware starts the bootloader only if one of the following conditions is true:
+
+- **The bootloader was signed using a trusted certificate.** In the case of PCs certified for Windows 10, the Microsoft® certificate is trusted.
+- **The user has manually approved the bootloader’s digital signature.** This allows the user to load non-Microsoft operating systems.
+
+All x86-based Certified For Windows 10 PCs must meet several requirements related to Secure Boot:
+
+- They must have Secure Boot enabled by default.
+- They must trust Microsoft’s certificate (and thus any bootloader Microsoft has signed).
+- They must allow the user to configure Secure Boot to trust other bootloaders.
+- They must allow the user to completely disable Secure Boot.
+
+These requirements help protect you from rootkits while allowing you to run any operating system you want. You have three options for running non-Microsoft operating systems:
+
+- **Use an operating system with a certified bootloader.** Because all Certified For Windows 10 PCs must trust Microsoft’s certificate, Microsoft offers a service to analyze and sign any non-Microsoft bootloader so that it will be trusted by all Certified For Windows 10 PCs. In fact, an [open source bootloader](http://mjg59.dreamwidth.org/20303.html) capable of loading Linux is already available. To begin the process of obtaining a certificate, go to .
+- **Configure UEFI to trust your custom bootloader.** All Certified For Windows 10 PCs allow you to trust a non-certified bootloader by adding a signature to the UEFI database, allowing you to run any operating system, including homemade operating systems.
+- **Turn off Secure Boot.** All Certified For Windows 10 PCs allow you to turn off Secure Boot so that you can run any software. This does not help protect you from bootkits, however.
+
+To prevent malware from abusing these options, the user must manually configure the UEFI firmware to trust a non-certified bootloader or to turn off Secure Boot. Software cannot change the Secure Boot settings. For more information about Secure Boot, read the blog, [Protecting the pre-OS environment with UEFI](http://blogs.msdn.com/b/b8/archive/2011/09/22/protecting-the-pre-os-environment-with-uefi.aspx).
+
+Like most mobile devices, ARM-based Certified For Windows RT devices, such as the Microsoft Surface RT device, are designed to run only Windows 8.1. Therefore, Secure Boot cannot be turned off, and you cannot load a different operating system. Fortunately, there is a large market of ARM devices designed to run other operating systems.
+
+## Trusted Boot
+Trusted Boot takes over where Secure Boot leaves off. The bootloader verifies the digital signature of the Windows 10 kernel before loading it. The Windows 10 kernel, in turn, verifies every other component of the Windows startup process, including the boot drivers, startup files, and ELAM. If a file has been modified, the bootloader detects the problem and refuses to load the corrupted component. Often, Windows 10 can automatically repair the corrupted component, restoring the integrity of Windows and allowing the PC to start normally.
+
+## Early Launch Anti-Malware
+Because Secure Boot has protected the bootloader and Trusted Boot has protected the Windows kernel, the next opportunity for malware to start is by infecting a non-Microsoft boot driver. Traditional anti-malware apps don’t start until after the boot drivers have been loaded, giving a rootkit disguised as a driver the opportunity to work.
+
+Early Launch Anti-Malware (ELAM) can load a Microsoft or non-Microsoft anti-malware driver before all non-Microsoft boot drivers and applications, thus continuing the chain of trust established by Secure Boot and Trusted Boot. Because the operating system hasn’t started yet, and because Windows needs to boot as quickly as possible, ELAM has a simple task: examine every boot driver and determine whether it is on the list of trusted drivers. If it’s not trusted, Windows won’t load it.
+
+An ELAM driver isn’t a full-featured anti-malware solution; that loads later in the boot process. Windows Defender (included with Windows 10) supports ELAM, as does [Microsoft System Center 2012 Endpoint Protection](https://www.microsoft.com/en-us/server-cloud/system-center/endpoint-protection-2012.aspx) and several non-Microsoft anti-malware apps.
+
+## Measured Boot
+If a PC in your organization does become infected with a rootkit, you need to know about it. Enterprise anti-malware apps can report malware infections to the IT department, but that doesn’t work with rootkits that hide their presence. In other words, you can’t trust the client to tell you whether it’s healthy.
+
+As a result, PCs infected with rootkits appear to be healthy, even with anti-malware running. Infected PCs continue to connect to the enterprise network, giving the rootkit access to vast amounts of confidential data and potentially allowing the rootkit to spread across the internal network.
+
+Working with the TPM and non-Microsoft software, Measured Boot in Windows 10 allows a trusted server on the network to verify the integrity of the Windows startup process. Measured Boot uses the following process:
+
+1. The PC’s UEFI firmware stores in the TPM a hash of the firmware, bootloader, boot drivers, and everything that will be loaded before the anti-malware app.
+2. At the end of the startup process, Windows starts the non-Microsoft remote attestation client. The trusted attestation server sends the client a unique key.
+3. The TPM uses the unique key to digitally sign the log recorded by the UEFI.
+4. The client sends the log to the server, possibly with other security information.
+
+Depending on the implementation and configuration, the server can now determine whether the client is healthy and grant the client access to either a limited quarantine network or to the full network.
+
+Figure 2 illustrates the Measured Boot and remote attestation process.
+
+
+.png)
+
+
+**Figure 2. Measured Boot proves the PC’s health to a remote server**
+
+
+Windows 10 includes the application programming interfaces to support Measured Boot, but you’ll need non-Microsoft tools to implement a remote attestation client and trusted attestation server to take advantage of it. For an example of such a tool, download the [TPM Platform Crypto-Provider Toolkit](http://research.microsoft.com/en-us/downloads/74c45746-24ad-4cb7-ba4b-0c6df2f92d5d/) from Microsoft Research or Microsoft Enterprise Security MVP Dan Griffin’s [Measured Boot Tool](http://mbt.codeplex.com/).
+
+Measured Boot uses the power of UEFI, TPM, and Windows 10 to give you a way to confidently assess the trustworthiness of a client PC across the network.
+
+## Summary
+Secure Boot, Trusted Boot, and Measured Boot create an architecture that is fundamentally resistant to bootkits and rootkits. In Windows 10, these features have the potential to eliminate kernel-level malware from your network. This is the most ground-breaking anti-malware solution that Windows has ever had; it’s leaps and bounds ahead of everything else. With Windows 10, you can truly trust the integrity of your operating system.
+
+For more information:
+
+- Watch a [video demonstration of Secure Boot](https://technet.microsoft.com/en-us/windows/jj737995.aspx)
+
+## Additional resources
+- [Windows 10 Enterprise Evaluation](https://technet.microsoft.com/evalcenter/hh699156.aspx?ocid=wc-tn-wctc)
diff --git a/windows/threat-protection/windows-defender-antivirus/configure-network-connections-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-network-connections-windows-defender-antivirus.md
index 194b3e9cfb..e31e53a2bb 100644
--- a/windows/threat-protection/windows-defender-antivirus/configure-network-connections-windows-defender-antivirus.md
+++ b/windows/threat-protection/windows-defender-antivirus/configure-network-connections-windows-defender-antivirus.md
@@ -17,7 +17,7 @@ author: iaanw
**Applies to:**
-- Windows 10, version 1703
+- Windows 10 (some instructions are only applicable for Windows 10, version 1703)
**Audience**
@@ -130,6 +130,7 @@ Used by Windows to send client telemetry, Windows Defender Antivirus uses this f
This update uses SSL (TCP Port 443) to download manifests and upload telemetry to Microsoft that uses the following DNS endpoints: - vortex-win.data.microsoft.com
- settings-win.data.microsoft.com
|
+
@@ -147,7 +148,7 @@ Use the following argument with the Windows Defender AV command line utility (*m
MpCmdRun - ValidateMapsConnection
```
> [!NOTE]
-> You may need to open an administrator-level version of the command prompt. Right-click the item in the Start menu, click **Run as administrator** and click **Yes** at the permissions prompt.
+> You need to open an administrator-level version of the command prompt. Right-click the item in the Start menu, click **Run as administrator** and click **Yes** at the permissions prompt. This command will only work on Windows 10, version 1703.
See [Use the mpcmdrun.exe commandline tool to configure and manage Windows Defender Antivirus](command-line-arguments-windows-defender-antivirus.md) for more information on how to use the *mpcmdrun.exe* utility.
@@ -185,6 +186,9 @@ You will also see a detection under **Quarantined threats** in the **Scan histor

+>[!NOTE]
+>Versions of Windows 10 before version 1703 have a different user interface. See the [Windows Defender Antivirus in the Windows Defender Security Center](windows-defender-security-center-antivirus.md) topic for more information about the differences between versions, and instructions on how to perform common tasks in the different interfaces.
+
The Windows event log will also show [Windows Defender client event ID 2050](troubleshoot-windows-defender-antivirus.md).
>[!IMPORTANT]
diff --git a/windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features.md b/windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features.md
index d1da91abab..5ba96c2e65 100644
--- a/windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features.md
+++ b/windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features.md
@@ -48,7 +48,7 @@ Topic | Description
:---|:---
[Utilize Microsoft cloud-provided protection in Windows Defender Antivirus](utilize-microsoft-cloud-protection-windows-defender-antivirus.md) | Cloud-delivered protection provides an advanced level of fast, robust antivirus detection
[Configure behavioral, heuristic, and real-time protection](configure-protection-features-windows-defender-antivirus.md)|Enable behavior-based, heuristic, and real-time protection in Windows Defender AV
-[Configure end-user interaction with WDAM](configure-end-user-interaction-windows-defender-antivirus.md)|Configure how end-users interact with Windows Defender AV, what notifications they see, and if they can override settings
+[Configure end-user interaction with Windows Defender Antivirus](configure-end-user-interaction-windows-defender-antivirus.md)|Configure how end-users interact with Windows Defender AV, what notifications they see, and if they can override settings
diff --git a/windows/update/docfx.json b/windows/update/docfx.json
index 21e6f12fb6..e95b5a9ccc 100644
--- a/windows/update/docfx.json
+++ b/windows/update/docfx.json
@@ -29,7 +29,13 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.windows-update"
+ }
+ }
+ },
"fileMetadata": {},
"template": [],
"dest": "windows-update"
diff --git a/windows/whats-new/docfx.json b/windows/whats-new/docfx.json
index 590b6d84d5..1bbc64ff9e 100644
--- a/windows/whats-new/docfx.json
+++ b/windows/whats-new/docfx.json
@@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "trudyha",
- "ms.date": "04/05/2017"
+ "ms.date": "04/05/2017",
+ "_op_documentIdPathDepotMapping": {
+ "./": {
+ "depot_name": "MSDN.win-whats-new"
+ }
+ }
},
"fileMetadata": {},
"template": [],