deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-29 05:37:22 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into vso-11111589

Browse Source
This commit is contained in:
Celeste de Guzman 2017-04-25 16:23:21 -07:00
commit b1fe83d946
71 changed files with 1248 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
.openpublishing.publish.config.json
View File

@ -43,7 +43,6 @@
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
@ -232,20 +231,6 @@
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows",
"build_source_folder": "windows",
"build_output_subfolder": "windows",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-hub",
"build_source_folder": "windows/hub",
@ -293,6 +278,102 @@
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "keep-secure",
"build_source_folder": "windows/keep-secure",
"build_output_subfolder": "keep-secure",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-manage",
"build_source_folder": "windows/manage",
"build_output_subfolder": "windows-manage",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-plan",
"build_source_folder": "windows/plan",
"build_output_subfolder": "windows-plan",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-update",
"build_source_folder": "windows/update",
"build_output_subfolder": "windows-update",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-deploy",
"build_source_folder": "windows/deploy",
"build_output_subfolder": "windows-deploy",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-configure",
"build_source_folder": "windows/configure",
"build_output_subfolder": "windows-configure",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
}
],
"notification_subscribers": [
@ -315,4 +396,3 @@
],
"need_generate_pdf_url_template": false
}

221
.openpublishing.redirection.json
View File

@ -2,7 +2,7 @@
"redirections": [
{
"source_path": "windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md",
"redirect_url": "/itpro/windows/keep-secure/create-wip-policy-using-intune",
"redirect_url": "/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune",
"redirect_document_id": false
},
{
@ -62,12 +62,12 @@
},
{
"source_path": "windows/manage/waas-quick-start.md",
"redirect_url": "/itpro/windows/update/waas-quick-start",
"redirect_url": "/windows/deployment/update/waas-quick-start",
"redirect_document_id": true
},
{
"source_path": "windows/manage/waas-overview.md",
"redirect_url": "/itpro/windows/update/waas-overview",
"redirect_url": "/windows/deployment/update/waas-overview",
"redirect_document_id": true
},
{
@ -122,7 +122,7 @@
},
{
"source_path": "windows/manage/waas-manage-updates-wufb.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": true
},
{
@ -162,7 +162,7 @@
},
{
"source_path": "windows/manage/waas-update-windows-10.md",
"redirect_url": "/itpro/windows/update/index",
"redirect_url": "/windows/deployment/update/index",
"redirect_document_id": false
},
{
@ -627,7 +627,7 @@
},
{
"source_path": "windows/manage/introduction-to-windows-10-servicing.md",
"redirect_url": "/itpro/windows/update/index",
"redirect_url": "/windows/deployment/update/index",
"redirect_document_id": true
},
{
@ -657,107 +657,107 @@
},
{
"source_path": "windows/plan/act-community-ratings-and-process.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": true
},
{
"source_path": "windows/plan/act-database-configuration.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-database-migration.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-deployment-options.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-glossary.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/activating-and-closing-windows-in-acm.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-lps-share-permissions.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-operatingsystem-application-report.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-operatingsystem-computer-report.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-operatingsystem-device-report.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-product-and-documentation-resources.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-settings-dialog-box-preferences-tab.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-settings-dialog-box-settings-tab.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-toolbar-icons-in-acm.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-tools-packages-and-services.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/act-user-interface-reference.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/adding-or-editing-an-issue.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/adding-or-editing-a-solution.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/analyzing-your-compatibility-data.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/application-dialog-box.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/categorizing-your-compatibility-data.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
@ -767,77 +767,77 @@
},
{
"source_path": "windows/plan/common-compatibility-issues.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/compatibility-monitor-users-guide.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/computer-dialog-box.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/configuring-act.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/creating-and-editing-issues-and-solutions.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/creating-an-enterprise-environment-for-compatibility-testing.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/creating-an-inventory-collector-package.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/creating-a-runtime-analysis-package.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/customizing-your-report-views.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/data-sent-through-the-microsoft-compatibility-exchange.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/deciding-whether-to-fix-an-application-or-deploy-a-workaround.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/deciding-which-applications-to-test.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/deleting-a-data-collection-package.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/deploying-an-inventory-collector-package.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/deploying-a-runtime-analysis-package.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
@ -847,182 +847,182 @@
},
{
"source_path": "windows/plan/example-filter-queries.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/exporting-a-data-collection-package.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/filtering-your-compatibility-data.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/fixing-compatibility-issues.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/identifying-computers-for-inventory-collection.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/integration-with-management-solutions-.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": false
},
{
"source_path": "windows/plan/internet-explorer-web-site-report.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/labeling-data-in-acm.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/log-file-locations-for-data-collection-packages.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/managing-your-data-collection-packages.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/organizational-tasks-for-each-report-type.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/organizing-your-compatibility-data.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/prioritizing-your-compatibility-data.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/ratings-icons-in-acm.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/resolving-an-issue.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/saving-opening-and-exporting-reports.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/selecting-the-send-and-receive-status-for-an-application.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/selecting-your-compatibility-rating.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/selecting-your-deployment-status.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/sending-and-receiving-compatibility-data.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/settings-for-acm.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/setup-and-deployment.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": false
},
{
"source_path": "windows/plan/software-requirements-for-act.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/software-requirements-for-rap.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/taking-inventory-of-your-organization.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/testing-compatibility-on-the-target-platform.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/troubleshooting-act.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/troubleshooting-act-database-issues.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/troubleshooting-the-act-configuration-wizard.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/troubleshooting-the-act-log-processing-service.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/using-act.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/using-compatibility-monitor-to-send-feedback.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/viewing-your-compatibility-reports.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/websiteurl-dialog-box.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/welcome-to-act.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
"source_path": "windows/plan/whats-new-in-act-60.md",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": false
},
{
@ -1032,12 +1032,12 @@
},
{
"source_path": "windows/plan/windows-10-servicing-options.md",
"redirect_url": "/itpro/windows/update/waas-overview",
"redirect_url": "/windows/deployment/update/waas-overview",
"redirect_document_id": false
},
{
"source_path": "windows/plan/windows-update-for-business.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": false
},
{
@ -1727,7 +1727,7 @@
},
{
"source_path": "windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md",
"redirect_url": "/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics",
"redirect_url": "/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness",
"redirect_document_id": true
},
{
@ -1872,7 +1872,7 @@
},
{
"source_path": "windows/deploy/troubleshoot-upgrade-analytics.md",
"redirect_url": "/windows/deployment/upgrade/troubleshoot-upgrade-analytics",
"redirect_url": "/windows/deployment/upgrade/troubleshoot-upgrade-readiness",
"redirect_document_id": true
},
{
@ -1892,47 +1892,47 @@
},
{
"source_path": "windows/deploy/upgrade-analytics-additional-insights.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-additional-insights",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-additional-insights",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-architecture.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-architecture",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-architecture",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-deploy-windows.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-deploy-windows",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-deploy-windows",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-deployment-script.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-deployment-script",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-deployment-script",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-get-started.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-get-started",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-get-started",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-identify-apps.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-identify-apps",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-identify-apps",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-requirements.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-requirements",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-requirements",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-resolve-issues.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-resolve-issues",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-resolve-issues",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/upgrade-analytics-upgrade-overview.md",
"redirect_url": "/windows/deployment/upgrade/upgrade-analytics-upgrade-overview",
"redirect_url": "/windows/deployment/upgrade/upgrade-readiness-upgrade-overview",
"redirect_document_id": true
},
{
@ -2022,7 +2022,7 @@
},
{
"source_path": "windows/deploy/use-upgrade-analytics-to-manage-windows-upgrades.md",
"redirect_url": "/windows/deployment/upgrade/use-upgrade-analytics-to-manage-windows-upgrades",
"redirect_url": "/windows/deployment/upgrade/use-upgrade-readiness-to-manage-windows-upgrades",
"redirect_document_id": true
},
{
@ -8157,7 +8157,7 @@
},
{
"source_path": "windows/keep-secure/deploy-managed-installer-for-device-guard.md",
"redirect_url": "/windows/device-security/deploy-managed-installer-for-device-guard",
"redirect_url": "/windows/device-security/device-guard/deploy-managed-installer-for-device-guard",
"redirect_document_id": true
},
{
@ -8169,6 +8169,41 @@
"source_path": "windows/index.md",
"redirect_url": "/windows/windows-10/index",
"redirect_document_id": true
},
{
"source_path": "windows/manage/index.md",
"redirect_url": "/windows/windows-10/index",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/index.md",
"redirect_url": "/windows/deployment/index",
"redirect_document_id": true
},
{
"source_path": "windows/plan/index.md",
"redirect_url": "/windows/deployment/planning/index",
"redirect_document_id": true
},
{
"source_path": "windows/keep-secure/index.md",
"redirect_url": "/windows/windows-10/index",
"redirect_document_id": true
},
{
"source_path": "windows/manage/windows-store-for-business.md",
"redirect_url": "/microsoft-store/index",
"redirect_document_id": true
},
{
"source_path": "windows/update/index.md",
"redirect_url": "/windows/deployment/update/index",
"redirect_document_id": true
},
{
"source_path": "windows/configure/index.md",
"redirect_url": "/windows/configuration/index",
"redirect_document_id": true
}
]
}

BIN
education/windows/images/windows-ad-connect.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 44 KiB

15
education/windows/take-a-test-multiple-pcs.md
View File

@ -200,8 +200,17 @@ Anything hosted on the web can be presented in a locked down manner, not just as
**To provide a link to the test**
1. Create the link to the test using schema activation.
- Create a link using a web UI
Manually embed a URL with a specific prefix. You can select parameters depending on what you want to enable. For more info, see [Create a link using schema activation](#create-a-link-using-schema-activation).
For this option, you can just copy the assessment URL, select the options you want to allow during the test, and click a button to create the link. We recommend this for option for teachers.
To get started, go here: [Create a link using a web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-link).
- Create a link using schema activation
You can accomplish the same thing as the first option (using a web UI), by manually embedding a URL with a specific prefix. You can select parameters depending on what you want to enable.
For more info, see [Create a link using schema activation](#create-a-link-using-schema-activation).
2. Distribute the link.
@ -217,7 +226,7 @@ One of the ways you can present content in a locked down manner is by embedding
1. Embed a link or create a desktop shortcut with:
```
ms-edu-secureassessment:<URL>!enforceLockdown
ms-edu-secureassessment:<URL>#enforceLockdown
```
2. To enable printing, screen capture, or both, use the above link and append one of these parameters:
@ -235,7 +244,7 @@ One of the ways you can present content in a locked down manner is by embedding
> The Windows 10, version 1607 legacy configuration, `ms-edu-secureassessment:<URL>!enforcelockdown` is still supported, but not in combination with the new parameters.
### Create a shortcut for the test link
You can also distribute the test link by creating a shortcut. To do this, create the link to the test by either using the [web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-l) or using [schema activation](#create-a-link-using-schema-activation). After you have the link, follow these steps:
You can also distribute the test link by creating a shortcut. To do this, create the link to the test by either using the [web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-link) or using [schema activation](#create-a-link-using-schema-activation). After you have the link, follow these steps:
1. On a device running Windows, right-click on the desktop and then select **New > Shortcut**.
2. In the **Create Shortcut** window, paste the assessment URL in the field under **Type the location of the item**.

7
education/windows/take-a-test-single-pc.md
View File

@ -58,12 +58,11 @@ Anything hosted on the web can be presented in a locked down manner, not just as
1. Create the link to the test.
There are different ways you can do this:
- Create a link using a web UI
For this option, you can just copy the assessment URL, select the options you want to allow during the test, and click a button to create the link. We recommend this for option for teachers.
To get started, go here: [Create a link using a web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-link)
To get started, go here: [Create a link using a web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-link).
- Create a link using schema activation
@ -91,7 +90,7 @@ One of the ways you can present content in a locked down manner is by embedding
1. Embed a link or create a desktop shortcut with:
```
ms-edu-secureassessment:<URL>!enforceLockdown
ms-edu-secureassessment:<URL>#enforceLockdown
```
2. To enable printing, screen capture, or both, use the above link and append one of these parameters:
@ -110,7 +109,7 @@ One of the ways you can present content in a locked down manner is by embedding
### Create a shortcut for the test link
You can also distribute the test link by creating a shortcut. To do this, create the link to the test by either using the [web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-l) or using [schema activation](#create-a-link-using-schema-activation). After you have the link, follow these steps:
You can also distribute the test link by creating a shortcut. To do this, create the link to the test by either using the [web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-link) or using [schema activation](#create-a-link-using-schema-activation). After you have the link, follow these steps:
1. On a device running Windows, right-click on the desktop and then select **New > Shortcut**.
2. In the **Create Shortcut** window, paste the assessment URL in the field under **Type the location of the item**.

61
education/windows/use-set-up-school-pcs-app.md
View File

@ -15,11 +15,6 @@ author: CelesteDG
- Windows 10
> [!NOTE]
> The latest Set up School PCs app will be available for download in the Store very soon. To get familiar with the settings you can configure in the latest app, read the information in this topic.
IT administrators and technical teachers can use the **Set up School PCs** app to quickly set up PCs for students. A student PC set up using the app is tailored to provide students with the tools they need for learning while removing apps and features that they don't need.
![Set up School PCs app](images/suspc_getstarted_resized.png)
@ -49,30 +44,42 @@ A student PC that's set up using the Set up School PCs provisioning package is t
## Tips for success
* **Run the same Windows 10 build on the admin device and the student PCs**
It's critical that the IT administrator's or technical teacher's device is running the same Windows 10 build (Windows 10, version 1607 or Windows 10, version 1703) as the student PCs that you're provisioning.
> [!NOTE]
> If you're using the Windows 10, version 1607 build of the Set up School PCs app, do not use it to provision student PCs with Windows 10, version 1703 images. Conversely, if you're using the Windows 10, version 1703 build of Set up School PCs, do not use it to provision student PCs with Windows 10, version 1607 images. We recommend using the latest Set up School PCs app (for Windows 10, version 1703) along with Windows 10, version 1703 images on the student PCs that you're provisioning.
* **Run the app at work**
For the best results, run the Set up School PCs app on your work device connected to your school's network. That way the app can gather accurate information about your wireless networks and cloud subscriptions.
For the best results, run the Set up School PCs app on your work device connected to your school's network. That way the app can gather accurate information about your wireless networks and cloud subscriptions.
> [!NOTE]
> Don't use the **Set up Schools PCs** app for PCs that must connect to enterprise networks or to open Wi-Fi networks that require the user to accept Terms of Use.
> [!NOTE]
> Don't use the **Set up Schools PCs** app for PCs that must connect to enterprise networks or to open Wi-Fi networks that require the user to accept Terms of Use.
* **Network tips**
* You cannot use Set up School PCs over a certification-based network, or one where you have to enter credentials in a browser. You can only connect to an open network, or one with a basic password.
* If you need to set up a lot of devices over Wi-Fi, make sure that your network configuration can support it.
- We recommend configuring your DHCP so you have a good set of IP addresses available (about 100-200). These IP addresses will expire after a short amount of time (about 30 minutes). This allows you set up many devices simultaneously, and the IP addresses will be freed up quick so you can continue to set up devices without risk of crashing your network.
* **Apply to new student PCs**
* The provisioning package that the Set up School PCs app creates should be used on new PCs that haven't been set up for accounts yet. If you apply the provisioning package to a student PC that has already been set up, existing accounts and data might be lost.
> [!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.
> [!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.
* 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:
- Go to **Settings > Update & security > Recovery**. In the **Reset this PC** section of the **Recovery** page, click **Get started**.
- Or, hit **Shift** + click **Restart** in the **Power** menu to load the Windows boot user experience. From there, follow these steps:
1. Click **Troubleshoot** and then choose **Reset this PC**.
2. Select **Remove everything**.
3. Select **No - remove provisioning packages**.
4. Select **Only the drive where Windows is installed** (this may not always show up).
5. Click **Just remove my files**.
6. Click **Reset**.
To do this:
- Go to **Settings > Update & security > Recovery**. In the **Reset this PC** section of the **Recovery** page, click **Get started**.
- Or, hit **Shift** + click **Restart** in the **Power** menu to load the Windows boot user experience. From there, follow these steps:
1. Click **Troubleshoot** and then choose **Reset this PC**.
2. Select **Remove everything**.
3. Select **No - remove provisioning packages**.
4. Select **Only the drive where Windows is installed** (this may not always show up).
5. Click **Just remove my files**.
6. Click **Reset**.
* **Use more than one USB key**
@ -93,9 +100,7 @@ What you need:
- The **Set up School PCs** app, installed on your work PC and connected to your school's network.
<!--
[Download the Set up School PCs app from the Store](https://www.microsoft.com/store/apps/9nblggh4ls40).
-->
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.
@ -152,7 +157,11 @@ The **Set up School PCs** app guides you through the configuration choices for t
> If you select this option, the provisioning process will take longer (about 30 minutes).
- Select **Allow local storage (not recommended for shared devices)** to let students save files to the **Desktop** and **Documents** folder on the student PC. We don't recommend this option if the device will be part of a shared cart or lab.
- Select **Optimize device for a single student, instead of a shared cart or lab** to optimize the device for use by a single student (1:1). Check this option if the device will not be part of a shared cart or lab.
- Select **Optimize device for a single student, instead of a shared cart or lab** to optimize the device for use by a single student (1:1).
- Check this option if the device will not be part of a shared cart or lab.
- Set up School PCs will change some account management logic so that it sets the expiration time for an account to 180 days (without requiring sign-in).
- This setting also increases the maximum storage to 100% of the available disk space. This prevents the student's account from being erased if the student stores a lot of files or data, or if the student doesn't use the PC over a prolonged period.
- Select **Let guests sign-in to these PCs** to allow guests to use student PCs without a school account. For example, if the device will be in a library and you want other users (like visiting students or teachers) to be able to use the device, you can select this option.
If you select this option, this adds a **Guest** account button in the PC's sign-in screen to allow anyone to use the PC.
@ -178,13 +187,13 @@ 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.
<!-- comment out
7. If you want to add Store for Business apps to the student PCs, you can select from the list of recommended apps in the **Add STEM and Makerspace apps to Student PCs** page.
7. If you want to add Microsoft Store for Education apps to the student PCs, you can select from the list of recommended apps in the **Add STEM and Makerspace apps to Student PCs** page.
1. Select the apps that you want to add. You'll see a checkmark on apps that you select.
2. Click **Next**.
**Figure 4** - Select Store apps to add to student PCs
**Figure 4** - Select Microsoft Store apps to add to student PCs
![Select Store apps to add to student PCs](images/suspc_choosesettings_apps.png)
![Select Microsoft Store apps to add to student PCs](images/suspc_choosesettings_apps.png)
-->

3
mdop/mbam-v25/copying-the-mbam-25-group-policy-templates.md
View File

@ -22,7 +22,8 @@ MDOP Group Policy templates are available for download in a self-extracting, com
**How to download and deploy the MDOP Group Policy templates**
1. Download the MDOP Group Policy templates from [How to Get MDOP Group Policy (.admx) Templates](https://go.microsoft.com/fwlink/p/?LinkId=393941) .
1. Download the MDOP Group Policy templates from [Microsoft Desktop Optimization Pack Group Policy Administrative Templates
](https://www.microsoft.com/en-us/download/details.aspx?id=54957).
2. Run the downloaded file to extract the template folders.

10
mdop/mbam-v25/how-to-enable-bitlocker-by-using-mbam-as-part-of-a-windows-deploymentmbam-25.md
View File

@ -43,7 +43,10 @@ This topic explains how to enable BitLocker on an end user's computer by using M
- Optionally encrypt FDDs
- Escrow TPM OwnerAuth, even on Windows 8 or higher (MBAM still must own the TPM on Windows 7 for escrow to occur)
- Escrow TPM OwnerAuth
For Windows 7, MBAM must own the TPM for escrow to occur.
For Windows 8.1, Windows 10 RTM and Windows 10 version 1511, escrow of TPM OwnerAuth is supported.
For Windows 10, version 1607 or later, only Windows can take ownership of the TPM. In addiiton, Windows will not retain the TPM owner password when provisioning the TPM. See [TPM owner password](http://technet.microsoft.com/en-us/itpro/windows/keep-secure/change-the-tpm-owner-password) for further details.
- Escrow recovery keys and recovery key packages
@ -55,13 +58,15 @@ This topic explains how to enable BitLocker on an end user's computer by using M
- Robust error handling
You can download the `Invoke-MbamClientDeployment.ps1` script from [Microsoft.com Download Center](https://www.microsoft.com/download/details.aspx?id=54439). This is the main script that your deployment system will call to configure BitLocker drive encryption and record recovery keys with the MBAM Server.
You can download the `Invoke-MbamClientDeployment.ps1` script from [Microsoft.com Download Center](https://www.microsoft.com/download/details.aspx?id=48698). This is the main script that your deployment system will call to configure BitLocker drive encryption and record recovery keys with the MBAM Server.
**WMI deployment methods for MBAM:** The following WMI methods have been added in MBAM 2.5 SP1 to support enabling BitLocker by using the `Invoke-MbamClientDeployment.ps1` PowerShell script.
<a href="" id="mbam-machine-wmi-class"></a>**MBAM\_Machine WMI Class**
**PrepareTpmAndEscrowOwnerAuth:** Reads the TPM OwnerAuth and sends it to the MBAM recovery database by using the MBAM recovery service. If the TPM is not owned and auto-provisioning is not on, it generates a TPM OwnerAuth and takes ownership. If it fails, an error code is returned for troubleshooting.
**Note** For Windows 10, version 1607 or later, only Windows can take ownership of the TPM. In addiiton, Windows will not retain the TPM owner password when provisioning the TPM. See [TPM owner password](http://technet.microsoft.com/en-us/itpro/windows/keep-secure/change-the-tpm-owner-password) for further details.
| Parameter | Description |
| -------- | ----------- |
| RecoveryServiceEndPoint | A string specifying the MBAM recovery service endpoint. |
@ -173,6 +178,7 @@ Here are a list of common error messages:
3. Name the step **Persist TPM OwnerAuth**
4. Set the command line to `cscript.exe "%SCRIPTROOT%/SaveWinPETpmOwnerAuth.wsf"`
**Note:** For Windows 10, version 1607 or later, only Windows can take ownership of the TPM. In addiiton, Windows will not retain the TPM owner password when provisioning the TPM. See [TPM owner password](http://technet.microsoft.com/en-us/itpro/windows/keep-secure/change-the-tpm-owner-password) for further details.
3. In the **State Restore** folder, delete the **Enable BitLocker** task.

3
mdop/mbam-v25/mbam-25-security-considerations.md
View File

@ -31,6 +31,7 @@ This topic contains the following information about how to secure Microsoft BitL
## <a href="" id="bkmk-tpm"></a>Configure MBAM to escrow the TPM and store OwnerAuth passwords
**Note** For Windows 10, version 1607 or later, only Windows can take ownership of the TPM. In addiiton, Windows will not retain the TPM owner password when provisioning the TPM. See [TPM owner password](http://technet.microsoft.com/en-us/itpro/windows/keep-secure/change-the-tpm-owner-password) for further details.
Depending on its configuration, the Trusted Platform Module (TPM) will lock itself in certain situations ─ such as when too many incorrect passwords are entered ─ and can remain locked for a period of time. During TPM lockout, BitLocker cannot access the encryption keys to perform unlock or decryption operations, requiring the user to enter their BitLocker recovery key to access the operating system drive. To reset TPM lockout, you must provide the TPM OwnerAuth password.
@ -38,6 +39,8 @@ MBAM can store the TPM OwnerAuth password in the MBAM database if it owns the TP
### Escrowing TPM OwnerAuth in Windows 8 and higher
**Note** For Windows 10, version 1607 or later, only Windows can take ownership of the TPM. In addiiton, Windows will not retain the TPM owner password when provisioning the TPM. See [TPM owner password](http://technet.microsoft.com/en-us/itpro/windows/keep-secure/change-the-tpm-owner-password) for further details.
In Windows 8 or higher, MBAM no longer must own the TPM to store the OwnerAuth password, as long as the OwnerAuth is available on the local machine.
To enable MBAM to escrow and then store TPM OwnerAuth passwords, you must configure these Group Policy settings.

13
mdop/mbam-v25/prerequisites-for-mbam-25-clients.md
View File

@ -40,19 +40,26 @@ Before you install the MBAM Client software on end users' computers, ensure that
<td align="left"><p></p></td>
</tr>
<tr class="even">
<td align="left"><p>For Windows 8 and Windows 8.1 client computers only: If you want MBAM to be able to store and manage the TPM recovery keys, TPM auto-provisioning must be turned off, and MBAM must be set as the owner of the TPM before you deploy MBAM.</p>
<td align="left"><p>For Windows 8.1, Windows 10 RTM or Windows 10 version 1511 client computers only: If you want MBAM to be able to store and manage the TPM recovery keys, TPM auto-provisioning must be turned off, and MBAM must be set as the owner of the TPM before you deploy MBAM.</p>
<p>In MBAM 2.5 SP1 only, you no longer need to turn off TPM auto-provisioning, but you must make sure that the TPM Group Policy Objects are set to not escrow TPM OwnerAuth to Active Directory.</p></td>
<td align="left"><p>[MBAM 2.5 Security Considerations](mbam-25-security-considerations.md#bkmk-tpm)</p></td>
</tr>
<tr class="odd">
<td align="left"><p>For Windows 10, version 1607 or later, only Windows can take ownership of the TPM. In addiiton, Windows will not retain the TPM owner password when provisioning the TPM.</p>
<p>In MBAM 2.5 SP1, you must turn on auto-provisioning.</p>
</p></td>
<td align="left"><p>See [TPM owner password](http://technet.microsoft.com/en-us/itpro/windows/keep-secure/change-the-tpm-owner-password) for further details.
</p></td>
</tr>
<tr class="even">
<td align="left"><p>The TPM chip must be turned on in the BIOS and be resettable from the operating system.</p></td>
<td align="left"><p>See the BIOS documentation for more information.</p></td>
</tr>
<tr class="even">
<tr class="odd">
<td align="left"><p>The computer’s hard disk must have at least two partitions and must be formatted with the NTFS file system.</p></td>
<td align="left"><p></p></td>
</tr>
<tr class="odd">
<tr class="even">
<td align="left"><p>The computer’s hard disk must have a BIOS that is compatible with TPM and that supports USB devices during computer startup.</p></td>
<td align="left"><div class="alert">
<strong>Note</strong>  

8
mdop/mbam-v25/release-notes-for-mbam-25-sp1.md
View File

@ -119,13 +119,7 @@ If Internet Explorer Enhanced Security Configuration (ESC) is turned on, an "Acc
**Workaround:** If the "Access Denied" error message appears when you try to view reports on the MBAM Server, you can set a Group Policy Object or change the default manually in your image to disable Enhanced Security Configuration. You can also alternatively view the reports from another computer on which ESC is not enabled.
### Support for Bitlocker XTS-AES encryption algorithm
Bitlocker added support for the XTS-AES encryption algorithm in Windows 10, version 1511.
As of HF02, MBAM now supports this Bitlocker option and is a client-only update.
However, there are two known limitations:
* MBAM will correctly report compliance status but the **Cipher Strength** field in MBAM reports will be empty.
MBAM pre-built reports and compliance charts won’t break but the **Cipher Strength** column will be empty for XTS machines.
Also, if a customer has a custom report that uses this particular field, they may have to make adjustments to accommodate this update.
Bitlocker added support for the XTS-AES encryption algorithm in Windows 10, version 1511. With HF02, MBAM added client support for this Bitlocker option and in HF04, the server-side support was added. However, there is one known limitation:
* Customers must use the same encryption strength for OS and data volumes on the same machine.
If different encryption strengths are used, MBAM will report the machine as **non-compliant**.

4
smb/cloud-mode-business-setup.md
View File

@ -12,13 +12,13 @@ ms.pagetype: smb
author: CelesteDG
---
![Are you ready to move to the cloud?](images/business-cloud-mode.png)
# Get started: Deploy and manage a full cloud IT solution for your business
**Applies to:**
- Office 365 Business Premium, Azure AD Premium, Intune, Windows Store for Business, Windows 10
Are you ready to move your business to the cloud or wondering what it takes to make this happen with Microsoft cloud services and tools?
In this walkthrough, we'll show you how to deploy and manage a full cloud IT solution for your small to medium business using Office 365 Business Premium, Microsoft Azure AD, Intune, Windows Store for Business, and Windows 10. We'll show you the basics on how to:
- Acquire an Office 365 business domain
- Add Microsoft Intune and Azure Active Directory (AD) Premium licenses to your business tenant

26
windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
View File

@ -63,7 +63,7 @@ netsh advfirewall set allprofiles state on
Set-NetFirewallProfile -Profile Domain,Public,Private -Enabled True
```
### Control firewall behavior
### Control Windows Firewall behavior
The global default settings can be defined through the command-line interface. These modifications are also available through the Windows Firewall with Advanced Security console.
@ -84,6 +84,30 @@ Windows PowerShell
Set-NetFirewallProfile -DefaultInboundAction Block -DefaultOutboundAction Allow –NotifyOnListen True -AllowUnicastResponseToMulticast True –LogFileName %SystemRoot%\System32\LogFiles\Firewall\pfirewall.log
```
### Disable Windows Firewall
Disabling Windows Firewall with Advanced Security can cause the following problems:
- Start menu can stop working
- Modern applications can fail to install or update
- Activation of Windows via phone fails
- Application or OS incompatibilities that depend on Windows Firewall
Do not disable Windows Firewall with Advanced Security service by stopping the service.
The proper method to disable the Windows Firewall is to disable the Windows Firewall Profiles and leave the service running.
Use the following procedure to turn the firewall off, or disable the Group Policy setting **Computer Configuration|Administrative Templates|Network|Network Connections|Windows Firewall|Domain Prolfile|Windows Firewall:Protect all network connections**.
For more information, see [Windows firewall with advanced security deployment guide](windows-firewall-with-advanced-security-deployment-guide.md).
If you turn off the Windows Firewall with Advanced Security service, you lose other benefits provided by the service, such as the ability to use Internet Protocol security (IPsec) connection security rules, network protection from attacks that employ network fingerprinting, [Windows Service Hardening](http://go.microsoft.com/fwlink/?linkid=104976), and [boot time filters](https://blogs.technet.microsoft.com/networking/2009/03/24/stopping-the-windows-authenticating-firewall-service-and-the-boot-time-policy/).
Non-Microsoft firewall software can programmatically disable only the parts of Windows Firewall with Advanced Security that need to be disabled for compatibility.
You should not disable the firewall yourself for this purpose.
Stopping the service associated with Windows Firewall with Advanced Security is not supported by Microsoft.
The following example disables Windows Firewall with Advanced Security for all profiles.
```powershell
Set-NetFirewallProfile -Profile Domain,Public,Private -Enabled False
```
## Deploy basic firewall rules
This section provides scriptlet examples for creating, modifying, and deleting firewall rules.

12
windows/application-management/app-v/appv-auto-batch-sequencing.md
View File

@ -35,7 +35,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
2. Add the following required XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package.
- **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -55,7 +55,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows</Name>
<AppName>Skype for Windows</AppName>
<InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -64,7 +64,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Power BI</Name>
<AppName>Power BI</AppName>
<InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -97,7 +97,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
2. Add the following required XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package.
- **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -115,7 +115,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows</Name>
<AppName>Skype for Windows</AppName>
<InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<TimeoutInMinutes>20</TimeoutInMinutes>
@ -123,7 +123,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Power BI</Name>
<AppName>Power BI</AppName>
<InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<TimeoutInMinutes>20</TimeoutInMinutes>

12
windows/application-management/app-v/appv-auto-batch-updating.md
View File

@ -29,7 +29,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
2. Add the following XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package.
- **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -50,7 +50,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows Update</Name>
<AppName>Skype for Windows Update</AppName>
<InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -60,7 +60,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Microsoft Power BI Update</Name>
<AppName>Microsoft Power BI Update</AppName>
<InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -95,7 +95,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
2. Add the following XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package.
- **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -115,7 +115,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows Update</Name>
<AppName>Skype for Windows Update</AppName>
<InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -125,7 +125,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Microsoft Power BI Update</Name>
<AppName>Microsoft Power BI Update</AppName>
<InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions>

1
windows/client-management/TOC.md
View File

@ -8,3 +8,4 @@
## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
## [Windows libraries](windows-libraries.md)
## [Change history for Client management](change-history-for-client-management.md)

23
windows/client-management/change-history-for-client-management.md Normal file
View File

@ -0,0 +1,23 @@
---
title: Change history for Client management (Windows 10)
description: This topic lists changes to documentation for configuring Windows 10.
keywords:
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: security
localizationpriority: high
author: jdeckerMS
---
# Change history for Client management
This topic lists new and updated topics in the [Client management](index.md) documentation for Windows 10 and Windows 10 Mobile.
## RELEASE: Windows 10, version 1703
The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The following new topic has been added:
- [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)

3
windows/client-management/index.md
View File

@ -8,7 +8,7 @@ author: jdeckerMS
localizationpriority: medium
---
# Client Management
# Client management
**Applies to**
- Windows 10
@ -28,3 +28,4 @@ Learn about the administrative tools, tasks and best practices for managing Wind
|[Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)| Instructions for resetting a Windows 10 Mobile device using either *factory* or *'wipe and persist'* reset options|
|[Deploy Windows 10 Mobile](windows-10-mobile-and-mdm.md)| Considerations and instructions for deploying Windows 10 Mobile|
|[Windows libraries](windows-libraries.md)| Considerations and instructions for managing Windows 10 libraries such as My Documents, My Pictures, and My Music.|
|[Change history for Client management](change-history-for-client-management.md) | This topic lists new and updated topics in the Client management documentation for Windows 10 and Windows 10 Mobile. |

6
windows/configuration/change-history-for-configure-windows-10.md
View File

@ -14,6 +14,12 @@ author: jdeckerMS
This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for Windows 10 and Windows 10 Mobile.
## April 2017
| New or changed topic | Description |
| --- | --- |
| [Set up a shared or guest PC with Windows 10](set-up-shared-or-guest-pc.md) | Added instructions for using WMI bridge to configure shared PC |
## RELEASE: Windows 10, version 1703

23
windows/configuration/set-up-shared-or-guest-pc.md
View File

@ -85,7 +85,28 @@ You can configure Windows to be in shared PC mode in a couple different ways:
![Shared PC settings in ICD](images/icd-adv-shared-pc.png)
- WMI bridge: Environments that use Group Policy can use the WMI bridge to configure the [SharedPC CSP](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx).
- WMI bridge: Environments that use Group Policy can use the [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/desktop/dn905224.aspx) to configure the [MDM_SharedPC class](https://msdn.microsoft.com/library/windows/desktop/mt779129.aspx). For example, open PowerShell as an administrator and enter the following:
```
$sharedPC = Get-CimInstance -Namespace "root\cimv2\mdm\dmmap" -ClassName "MDM_SharedPC"
$sharedPC.EnableSharedPCMode = $True
$sharedPC.SetEduPolicies = $True
$sharedPC.SetPowerPolicies = $True
$sharedPC.MaintenanceStartTime = 0
$sharedPC.SignInOnResume = $True
$sharedPC.SleepTimeout = 0
$sharedPC.EnableAccountManager = $True
$sharedPC.AccountModel = 2
$sharedPC.DeletionPolicy = 1
$sharedPC.DiskLevelDeletion = 25
$sharedPC.DiskLevelCaching = 50
$sharedPC.RestrictLocalStorage = $False
$sharedPC.KioskModeAUMID = ""
$sharedPC.KioskModeUserTileDisplayText = ""
$sharedPC.InactiveThreshold = 0
Set-CimInstance -CimInstance $sharedPC
Get-CimInstance -Namespace $namespaceName -ClassName $MDM_SharedPCClass
```
### Create a provisioning package for shared use

37
windows/configure/docfx.json Normal file
View File

@ -0,0 +1,37 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"fileMetadata": {},
"template": [],
"dest": "windows-configure"
}
}

37
windows/deploy/docfx.json Normal file
View File

@ -0,0 +1,37 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"fileMetadata": {},
"template": [],
"dest": "windows-deploy"
}
}

26
windows/deployment/change-history-for-deploy-windows-10.md
View File

@ -37,14 +37,14 @@ The topics in this library have been updated for Windows 10, version 1703 (also
|----------------------|-------------|
| [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) | Multiple topics updated, name changed from Upgrade Analytics to Upgrade Readiness, and other content updates. |
| [USMT Requirements](usmt/usmt-requirements.md) | Updated: Vista support removed and other minor changes |
| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated structure and content |
| [Upgrade Analytics deployment script](upgrade/upgrade-analytics-deployment-script.md) | Added as a separate page from get started |
| [Use Upgrade Analytics to manage Windows upgrades](upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md) | Updated with links to new content and information about the target OS setting |
| [Upgrade Analytics - Upgrade overview](upgrade/upgrade-analytics-upgrade-overview.md) | New |
| [Upgrade Analytics - Step 1: Identify important apps](upgrade/upgrade-analytics-identify-apps.md) | Updated topic title and content |
| [Upgrade Analytics - Step 2: Resolve app and driver issues](upgrade/upgrade-analytics-resolve-issues.md) | New |
| [Upgrade Analytics - Step 3: Deploy Windows](upgrade/upgrade-analytics-deploy-windows.md) | New |
| [Upgrade Analytics - Additional insights](upgrade/upgrade-analytics-additional-insights.md) | New |
| [Get started with Upgrade Analytics](upgrade/upgrade-readiness-get-started.md) | Updated structure and content |
| [Upgrade Analytics deployment script](upgrade/upgrade-readiness-deployment-script.md) | Added as a separate page from get started |
| [Use Upgrade Analytics to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades.md) | Updated with links to new content and information about the target OS setting |
| [Upgrade Analytics - Upgrade overview](upgrade/upgrade-readiness-upgrade-overview.md) | New |
| [Upgrade Analytics - Step 1: Identify important apps](upgrade/upgrade-readiness-identify-apps.md) | Updated topic title and content |
| [Upgrade Analytics - Step 2: Resolve app and driver issues](upgrade/upgrade-readiness-resolve-issues.md) | New |
| [Upgrade Analytics - Step 3: Deploy Windows](upgrade/upgrade-readiness-deploy-windows.md) | New |
| [Upgrade Analytics - Additional insights](upgrade/upgrade-readiness-additional-insights.md) | New |
## January 2017
@ -62,7 +62,7 @@ The topics in this library have been updated for Windows 10, version 1703 (also
| [Settings changed when you uninstall a provisioning package](/windows/configuration/provisioning-packages/provisioning-uninstall-package.md) | New (previously published in Hardware Dev Center on MSDN) |
| [Use a script to install a desktop app in provisioning packages](/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md) | New (previously published in Hardware Dev Center on MSDN) |
| [Windows ICD command-line interface (reference)](/windows/configuration/provisioning-packages/provisioning-command-line.md) | New (previously published in Hardware Dev Center on MSDN) |
| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog |
| [Get started with Upgrade Analytics](upgrade/upgrade-readiness-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog |
| [Provision PCs with common settings for initial deployment (simple provisioning)](/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-apply-package.md) |
| [Provision PCs with apps and certificates for initial deployments (advanced provisioning)](/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-apply-package.md) |
@ -76,9 +76,9 @@ The topics in this library have been updated for Windows 10, version 1703 (also
| New or changed topic | Description |
|----------------------|-------------|
| [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md) | New |
| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated with prerequisites for site discovery |
| [Resolve application and driver issues](upgrade/upgrade-analytics-resolve-issues.md) | Updated with app status info for Ready For Windows |
| [Review site discovery](upgrade/upgrade-analytics-additional-insights.md) | New |
| [Get started with Upgrade Analytics](upgrade/upgrade-readiness-get-started.md) | Updated with prerequisites for site discovery |
| [Resolve application and driver issues](upgrade/upgrade-readiness-resolve-issues.md) | Updated with app status info for Ready For Windows |
| [Review site discovery](upgrade/upgrade-readiness-additional-insights.md) | New |
## RELEASE: Windows 10, version 1607
@ -96,7 +96,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
## July 2016
| New or changed topic | Description |
|----------------------|-------------|
| [Manage Windows upgrades with Upgrade Analytics](upgrade/manage-windows-upgrades-with-upgrade-analytics.md) | New |
| [Manage Windows upgrades with Upgrade Analytics](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) | New |
## June 2016
| New or changed topic | Description |

BIN
windows/deployment/images/UR-lift-report.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 712 KiB

2
windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
View File

@ -42,7 +42,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
| New or changed topic | Description |
|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-readiness.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
| [Windows 10 servicing overview](../update/waas-overview.md) | Content on this page was summarized. Detailed content about servicing branches was moved to the [Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md) page. |

2
windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
View File

@ -30,7 +30,7 @@ Windows 10 spreads the traditional deployment effort of a Windows upgrade, which
- **Identify excluded PCs.** For some organizations, special-purpose devices such as those used to control factory or medical equipment or run ATMs require a stricter, less frequent feature update cycle than CB or Current Branch for Business (CBB) can offer. For those machines, you must install Windows 10 Enterprise LTSB to avoid feature updates for up to 10 years. Identify these PCs, and separate them from the phased deployment and servicing cycles to help remove confusion for your administrators and ensure that devices are handled correctly.
- **Recruit volunteers.** The purpose of testing a deployment is to receive feedback. One effective way to recruit pilot users is to request volunteers. When doing so, clearly state that you’re looking for feedback rather than people to just “try it out” and that there could be occasional issues involved with accepting feature updates right away. With Windows as a service, the expectation is that there should be few issues, but if an issue does arise, you want testers to let you know as soon as possible. When considering whom to recruit for pilot groups, be sure to include members who provide the broadest set of applications and devices to validate the largest number of apps and devices possible.
- **Choose a servicing tool.** Decide which product you’ll use to manage the Windows updates in your environment. If you’re currently using Windows Server Update Services (WSUS) or System Center Configuration Manager to manage your Windows updates, you can continue using those products to manage Windows 10 updates. Alternatively, you can use Windows Update for Business. In addition to which product you’ll use, consider how you’ll deliver the updates. With Windows 10, multiple peer-to-peer options are available to make update distribution faster. For a comparison of tools, see [Servicing tools](waas-overview.md#servicing-tools).
- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md).
- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-readiness.md).
>[!NOTE]
>This strategy is applicable to approaching an environment in which Windows 10 already exists. For information about how to deploy or upgrade to Windows 10 where another version of Windows exists, see [Plan for Windows 10 deployment](../planning/index.md).

4
windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics.md
View File

@ -1,4 +0,0 @@
---
title: Manage Windows upgrades with Upgrade Analytics (Windows 10)
redirect_url: manage-windows-upgrades-with-upgrade-readiness
---

4
windows/deployment/upgrade/troubleshoot-upgrade-analytics.md
View File

@ -1,4 +0,0 @@
---
title: Troubleshoot Upgrade Analytics (Windows 10)
redirect_url: troubleshoot-upgrade-readiness
---

4
windows/deployment/upgrade/upgrade-analytics-additional-insights.md
View File

@ -1,4 +0,0 @@
---
title: Upgrade Analytics - Additional insights
redirect_url: upgrade-readiness-additional-insights
---

4
windows/deployment/upgrade/upgrade-analytics-architecture.md
View File

@ -1,4 +0,0 @@
---
title: Upgrade Analytics architecture (Windows 10)
redirect_url: upgrade-readiness-architecture
---

4
windows/deployment/upgrade/upgrade-analytics-deploy-windows.md
View File

@ -1,4 +0,0 @@
---
title: Upgrade Analytics - Get a list of computers that are upgrade-ready (Windows 10)
redirect_url: upgrade-readiness-deploy-windows
---

4
windows/deployment/upgrade/upgrade-analytics-deployment-script.md
View File

@ -1,4 +0,0 @@
---
title: Upgrade Analytics deployment script (Windows 10)
redirect_url: upgrade-readiness-deployment-script
---

4
windows/deployment/upgrade/upgrade-analytics-get-started.md
View File

@ -1,4 +0,0 @@
---
title: Get started with Upgrade Analytics (Windows 10)
redirect_url: upgrade-readiness-get-started
---

5
windows/deployment/upgrade/upgrade-analytics-identify-apps.md
View File

@ -1,5 +0,0 @@
---
title: Upgrade Analytics - Identify important apps (Windows 10)
redirect_url: upgrade-readiness-identify-apps
---

5
windows/deployment/upgrade/upgrade-analytics-requirements.md
View File

@ -1,5 +0,0 @@
---
title: Upgrade Analytics requirements (Windows 10)
redirect_url: upgrade-readiness-requirements
---

5
windows/deployment/upgrade/upgrade-analytics-resolve-issues.md
View File

@ -1,5 +0,0 @@
---
title: Upgrade Analytics - Resolve application and driver issues (Windows 10)
redirect_url: upgrade-readiness-resolve-issues
---

4
windows/deployment/upgrade/upgrade-analytics-upgrade-overview.md
View File

@ -1,4 +0,0 @@
---
title: Upgrade Analytics - Upgrade Overview (Windows 10)
redirect_url: upgrade-readiness-upgrade-overview
---

2
windows/deployment/upgrade/upgrade-readiness-release-notes.md
View File

@ -1,5 +1,5 @@
---
title: Upgrade Readiness release notes (Windows 10)
description: Provides tips and limitations about Upgrade Readiness.
redirect_url: https://technet.microsoft.com/itpro/windows/deploy/upgrade-readiness-requirements#important-information-about-this-release
redirect_url: https://docs.microsoft.com/windows/deployment/upgrade/upgrade-readiness-requirements#important-information-about-this-release
---

70
windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
View File

@ -9,7 +9,16 @@ author: greg-lindsay
This section of the Upgrade Readiness workflow reports application and driver inventory and shows you which applications have known issues, which applications have no known issues, and which drivers have issues. We identify applications and drivers that need attention and suggest fixes when we know about them.
You can change an application’s upgrade decision and a driver’s upgrade decision from the blades in this section. To change an application’s or a driver’s importance level, select **User changes**. Select the item you want to change and then select the appropriate option from the **Select upgrade decision** list.
## In this section
The blades in the **Step 2: Resolve issues** section are:
- [Review applications with known issues](#review-applications-with-known-issues)
- [Review applications with no known issues](#review-applications-with-no-known-issues)
- [Review known driver issues](#review-known-driver-issues)
- [Prioritize app and driver testing](#prioritize-app-and-driver-testing)
>You can change an application’s upgrade decision and a driver’s upgrade decision from the blades in this section. To change an application’s or a driver’s importance level, select **User changes**. Select the item you want to change and then select the appropriate option from the **Select upgrade decision** list.
Upgrade decisions include:
@ -19,13 +28,6 @@ Upgrade decisions include:
| Review in progress | When you start to investigate an application or a driver to determine upgrade readiness, change its upgrade decision to **Review in progress**.<br><br>Until you’ve determined that applications and drivers will migrate successfully or you’ve resolved blocking issues, leave the upgrade decision status as **Review in progress**. <br><br> | Once you’ve fixed any issues and validated that the application or driver will migrate successfully, change the upgrade decision to **Ready to upgrade**. <br> |
| Ready to upgrade | Mark applications and drivers **Ready to upgrade** once you’ve resolved all blocking issues and you’re confident that they will upgrade successfully, or if you’ve decided to upgrade them as-is. | Applications with no known issues and with low installation rates are marked **Ready to upgrade** by default.<br><br>In Step 1, you might have marked some of your apps as **Ignore**. These should be marked as **Ready to upgrade**. Apps with low installation rates are marked as **Ready to upgrade** by default. Be sure to review any low install count applications for any business critical or important applications that are not yet upgrade-ready, despite their low installation rates. <br> |
| Won’t upgrade | By default, no applications or drivers are marked **Won’t upgrade** because only you can make that determination. <br><br>Use **Won’t upgrade** for applications and drivers that you do not work on your target operating system, or that you are unable to upgrade.<br> | If, during your investigation into an application or driver, you determine that they should not or cannot be upgraded, mark them **Won’t upgrade**. <br><br> |
The blades in the **Resolve issues** section are:
- Review applications with known issues
- Review applications with no known issues
- Review drivers with known issues
As you review applications with known issues, you can also see ISV support statements or applications using [Ready for Windows](https://www.readyforwindows.com/).
## Review applications with known issues
@ -150,3 +152,55 @@ To change a driver’s upgrade decision:
4. Click **Save** when finished.
## Prioritize app and driver testing
Planning and executing an OS upgrade project can be overwhelming. When you are tasked with evaluating thousands of applications and drivers to ensure a successful upgrade, it can be difficult to decide where to start. The Upgrade Readiness solution provides valuable assistance for you, helping to determine the most important apps and drivers to unblock and enabling you yo create a proposed action plan.
### Proposed action plan
The Upgrade Readiness proposed action plan is an optimally ordered list of apps and drivers that are in need of review. By testing apps and drivers in the order suggested by the proposed action plan, you are able to increase your number of “Ready to upgrade” computers in an efficient manner. The action plan can be a very powerful tool during upgrade planning – but it’s most helpful when it’s used correctly. This topic explains the proposed action plan, describes how to use it, and calls out a few misconceptions and invalid use cases that you should avoid.
The proposed action plan represents the order thath Microsoft recommends you rationalize the upgrade-readiness of your apps and drivers. By validating apps and drivers in the order proposed, you can ensure that you are testing efficiently.
Each item in the proposed action plan represents either an application or a driver that you have not yet marked “Ready to upgrade.”
>Since “Low install count” apps are automatically marked “Ready to upgrade”, you will not see any of these apps in the proposed action plan.
Each item in the plan has the following attributes:
| Attribute | Description | Example value |
|-----------------------|------------------------------------------|----------------|
| ItemRank | The location of this item in the context of the proposed action plan. For example, the item with ItemRank 7 is the 7th item in the Plan. It is crucial that the Plan is viewed in order by increasing ItemRank. Sorting the Plan in any other way invalidates the insights that the Plan provides. | 7 |
| ItemType | Whether this item is an app or driver -- possible values are: "App" and "Driver." | App |
| ItemName | The name of the app or driver that is in need of review. | Microsoft Visual C++ 2005 Redistributable (x64) |
| ItemVendor | The vendor of the app or driver. | Microsoft Corporation |
| ItemVersion | The version of the app or driver. | 12.1.0.1 |
| ItemLanguage | If this item is an application, then this field will be the language of the app. If the item is a driver, then this will say "N/A." | English |
| ItemHardwareId | If this item is a driver, then this field will be the hardware id of the driver. If the item is an app, then this will say "N/A." | N/A |
| Upgrade Decision | The upgrade decision you have provided for this app or driver. If you have not defined an upgrade decision, then you will see the default value of “Not reviewed.” | Review in progress |
| ComputersUnblocked | Assuming you have already marked all previous items in the proposed action plan “Ready to upgrade”, this represents the number of additional computers that will become “Ready to upgrade” by testing this app or driver and giving it an upgrade decision of “Ready to upgrade”. For example, if ComputersUnblocked is 200, then resolving any issues associated with the app/driver in question will make 200 new computers “Ready to upgrade.” | 200 |
| CumulativeUnblocked | The total number of computers that will become “Ready to upgrade” if you validate and mark this and all prior items in the proposed action plan “Ready to upgrade”. For example, if ItemRank is 7, and CumulativeUnblocked is 950, then fixing items 1 thru 7 in the proposed action plan will cause 950 of your computers to become “Ready to upgrade.” | 950 |
| CumulativeUnblockedPct | The percentage of your machines that will become “Ready to upgrade” if you make this and all prior items in the proposed action plan “Ready to upgrade.” | 0.24 |
See the following example action plan items (click the image for a full-size view):
<A HREF="../images/UR-lift-report.jpg">![Proposed action plan](../images/UR-lift-report.jpg)</A>
<BR>
In this example, the 3rd item is an application: **Microsoft Bing Sports**, a modern app, version **4.20.951.0**, published by Microsoft. By validating this app and making its UpgradeDecision “Ready to upgrade”, you can potentially make **1014** computers “Ready to upgrade” – but only after you have already validated items 1 and 2 in the list. By marking items 1, 2, and 3 “Ready to upgrade”, 14779 of your computers will become upgrade-ready. This represents 10.96% of the machines in this workspace.
#### Using the proposed action plan
There are several valid use cases for the proposed action plan. But it’s always important to remember that the information presented in the Plan is only accurate when sorted by increasing Item Rank! Here are three potential cases in which you could use the proposed action plan:
1. Quickly determine how many apps and drivers you’ll need to validate in order to make x% of your computers upgrade-ready. To determine this, simply find the first item in the Plan with a CumulativeUnblockedPct greater than or equal to your desired percentage of upgrade-ready computers. The corresponding ItemRank represents the smallest number of apps and drivers that you can validate in order to reach your upgrade readiness goal. The prior items in the proposed action plan itself represent the most efficient route to reaching your goal.
2. Use the proposed action plan to prepare a small portion of your machines for a pilot of your target Operating System. Let’s say you want to test a new Operating System by upgrading a few hundred computers. You can use the proposed action plan to determine how many apps and drivers you will need to validate before you can be confident that your pilot will be successful.
3. If your project deadline is approaching and you only have time to validate a few more apps and drivers, you can use the proposed action plan to determine which apps and drivers you should focus on to maximize the number of computers that you can confidently upgrade.
#### Misconceptions and things to avoid
The most common misconceptions about the proposed action plan involve the assumption that each item in the plan is independent of those around it. The apps and drivers in the plan must be considered in the correct order to draw valid conclusions. For example, if you choose to validate items 1, 3, 4, and 5 and mark each of them “Ready to upgrade,” the proposed action plan cannot tell you how many computers will become upgrade-ready as a result of your testing. Even the non-cumulative “ComputersUnblocked” count is dependent upon all prior issues having already been resolved.
If an item with ItemRank = 7 has a ComputersUnblocked value of 50, do not assume that 50 of your computers will become upgrade-ready if you test this item. However, if you validate items 1 through 6 in the plan, you can make an additional 50 computers upgrade-ready by validating the 7th item in the plan.

4
windows/deployment/upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md
View File

@ -1,4 +0,0 @@
---
title: Use Upgrade Analytics to manage Windows upgrades (Windows 10)
redirect_url: use-upgrade-readiness-to-manage-windows-upgrades
---

20
windows/deployment/upgrade/windows-10-edition-upgrades.md
View File

@ -41,13 +41,16 @@ X = unsupported <BR>
- To upgrade mobile editions of Windows 10 using MDM, you'll need to enter the product key for the upgraded edition in the **UpgradeEditionWithLicense** policy setting of the **WindowsLicensing** CSP. For more info, see [WindowsLicensing CSP](https://go.microsoft.com/fwlink/p/?LinkID=690907).
## Upgrade using a provisioning package
The Windows Imaging and Configuration Designer (ICD) tool is included in the Windows Assessment and Deployment Kit (ADK) for Windows 10. [Install the ADK.](https://go.microsoft.com/fwlink/p/?LinkId=526740)
Use Windows Configuration Designer to create a provisioning package to upgrade a desktop edition or mobile edition of Windows 10. To get started, [install Windows Configuration Designer from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4tx22).
- To use Windows ICD to create a provisioning package for upgrading desktop editions of Windows 10, go to **Runtime settings &gt; EditionUpgrade &gt; UpgradeEditionWithProductKey** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
- To create a provisioning package for upgrading desktop editions of Windows 10, go to **Runtime settings &gt; EditionUpgrade &gt; UpgradeEditionWithProductKey** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
- To use Windows ICD to create a provisioning package for upgrading mobile editions of Windows 10, go to **Runtime settings &gt; EditionUpgrade &gt; UpgradeEditionWithLicense** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
- To create a provisioning package for upgrading mobile editions of Windows 10, go to **Runtime settings &gt; EditionUpgrade &gt; UpgradeEditionWithLicense** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
For more info about Windows Configuration Designer, see these topics:
- [Create a provisioining package for Windows 10](https://docs.microsoft.com/en-us/windows/configuration/provisioning-packages/provisioning-create-package)
- [Apply a provisioning package](https://docs.microsoft.com/en-us/windows/configuration/provisioning-packages/provisioning-apply-package)
For more info on creating and applying a provisioning package using Windows ICD, see [Build and apply a provisioning package](https://go.microsoft.com/fwlink/p/?LinkID=533700).
## Upgrade using a command-line tool
You can run the changepk.exe command-line tool to upgrade devices to a supported edition of Windows 10:
@ -81,12 +84,3 @@ If you do not have a product key, you can upgrade your edition of Windows 10 th
**Note**<br>If you are a Windows 10 Home N or Windows 10 Home KN user and have trouble finding your applicable upgrade in the Windows Store, click [here](ms-windows-store://windowsupgrade/).
 
 
 

2
windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md
View File

@ -16,10 +16,8 @@ localizationpriority: high
- Windows 10
- Windows 8.1
- Windows 8
- Windows 7
- Windows Server 2012 R2
- Windows Server 2012
- Windows Server 2008 R2
**Looking for retail activation?**
- [Get Help Activating Microsoft Windows](https://go.microsoft.com/fwlink/p/?LinkId=618644)

2
windows/deployment/windows-10-poc-sc-config-mgr.md
View File

@ -52,8 +52,8 @@ Topics and procedures in this guide are summarized in the following table. An es
<TR><TD>[Create a task sequence](#create-a-task-sequence)<TD>Create a Configuration Manager task sequence with MDT integration using the MDT wizard<TD>15 minutes
<TR><TD>[Finalize the operating system configuration](#finalize-the-operating-system-configuration)<TD>Enable monitoring, configure rules, and distribute content.<TD>30 minutes
<TR><TD>[Deploy Windows 10 using PXE and Configuration Manager](#deploy-windows-10-using-pxe-and-configuration-manager)<TD>Deploy Windows 10 using Configuration Manager deployment packages and task sequences.<TD>60 minutes
<TR><TD>[Refresh a client with Windows 10 using Configuration Manager](#refresh-a-client-with-windows-10-using-configuration-manager)<TD>Use a task sequence to refresh a client with Windows 10 using Configuration Manager and MDT<TD>90 minutes
<TR><TD>[Replace a client with Windows 10 using Configuration Manager](#replace-a-client-with-windows-10-using-configuration-manager)<TD>Replace a client computer with Windows 10 using Configuration Manager.<TD>90 minutes
<TR><TD>[Refresh a client with Windows 10 using Configuration Manager](#refresh-a-client-with-windows-10-using-configuration-manager)<TD>Use a task sequence to refresh a client with Windows 10 using Configuration Manager and MDT<TD>90 minutes
</TABLE>

1
windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies.md
View File

@ -20,6 +20,7 @@ This section includes the following topics:
- [Deploy code integrity policies: policy rules and file rules](deploy-code-integrity-policies-policy-rules-and-file-rules.md)
- [Deploy code integrity policies: steps](deploy-code-integrity-policies-steps.md)
- [Deploy catalog files to support code integrity policies](deploy-catalog-files-to-support-code-integrity-policies.md)
- [Deploy Managed Installer for Device Guard](deploy-managed-installer-for-device-guard.md)
To increase the protection for devices that meet certain hardware requirements, you can use virtualization-based security (VBS) with your code integrity policies.
- For requirements, see [Hardware, firmware, and software requirements for Device Guard](requirements-and-deployment-planning-guidelines-for-device-guard.md#hardware-firmware-and-software-requirements-for-device-guard) in "Requirements and deployment planning guidelines for Device Guard."

0
windows/WaaS-infographic.pdf → windows/hub/WaaS-infographic.pdf
View File

4
windows/hub/docfx.json
View File

@ -20,7 +20,9 @@
{
"files": [
"**/*.png",
"**/*.jpg"
"**/*.jpg",
"**/*.gif",
"**/*.pdf"
],
"exclude": [
"**/obj/**",

2
windows/hub/index.md
View File

@ -80,7 +80,7 @@ Find the latest how to and support content that IT pros need to evaluate, plan,
These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
- <a href='https://technet.microsoft.com/en-us/itpro/windows/manage/waas-overview'>Read more about Windows as a Service</a>
- <a href='/windows/deployment/update/waas-overview'>Read more about Windows as a Service</a>
</td>
</tr>

37
windows/keep-secure/docfx.json Normal file
View File

@ -0,0 +1,37 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"fileMetadata": {},
"template": [],
"dest": "keep-secure"
}
}

37
windows/manage/docfx.json Normal file
View File

@ -0,0 +1,37 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"fileMetadata": {},
"template": [],
"dest": "windows-manage"
}
}

37
windows/plan/docfx.json Normal file
View File

@ -0,0 +1,37 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"fileMetadata": {},
"template": [],
"dest": "windows-plan"
}
}

160
windows/threat-protection/TOC.md
View File

@ -1 +1,159 @@
# [Index](index.md)
# [Threat protection](index.md)
## [Windows Defender Advanced Threat Protection](windows-defender-atp\windows-defender-advanced-threat-protection.md)
### [Minimum requirements](windows-defender-atp\minimum-requirements-windows-defender-advanced-threat-protection.md)
### [Preview features](windows-defender-atp\preview-windows-defender-advanced-threat-protection.md)
### [Data storage and privacy](windows-defender-atp\data-storage-privacy-windows-defender-advanced-threat-protection.md)
### [Assign user access to the portal](windows-defender-atp\assign-portal-access-windows-defender-advanced-threat-protection.md)
### [Onboard endpoints and set up access](windows-defender-atp\onboard-configure-windows-defender-advanced-threat-protection.md)
#### [Configure endpoints](windows-defender-atp\configure-endpoints-windows-defender-advanced-threat-protection.md)
##### [Configure endpoints using Group Policy](windows-defender-atp\configure-endpoints-gp-windows-defender-advanced-threat-protection.md)
##### [Configure endpoints using System Security Configuration Manager](windows-defender-atp\configure-endpoints-sccm-windows-defender-advanced-threat-protection.md)
##### [Configure endpoints using Mobile Device Management tools](windows-defender-atp\configure-endpoints-mdm-windows-defender-advanced-threat-protection.md)
###### [Configure endpoints using Microsoft Intune](windows-defender-atp\configure-endpoints-mdm-windows-defender-advanced-threat-protection.md#configure-endpoints-using-microsoft-intune)
##### [Configure endpoints using a local script](windows-defender-atp\configure-endpoints-script-windows-defender-advanced-threat-protection.md)
#### [Configure proxy and Internet settings](windows-defender-atp\configure-proxy-internet-windows-defender-advanced-threat-protection.md)
#### [Troubleshoot onboarding issues](windows-defender-atp\troubleshoot-onboarding-windows-defender-advanced-threat-protection.md)
### [Portal overview](windows-defender-atp\portal-overview-windows-defender-advanced-threat-protection.md)
### [Use the Windows Defender ATP portal](windows-defender-atp\use-windows-defender-advanced-threat-protection.md)
#### [View the Dashboard](windows-defender-atp\dashboard-windows-defender-advanced-threat-protection.md)
#### [View and organize the Alerts queue](windows-defender-atp\alerts-queue-windows-defender-advanced-threat-protection.md)
#### [Investigate alerts](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md)
##### [Alert process tree](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md#alert-process-tree)
##### [Incident graph](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md#incident-graph)
##### [Alert timeline](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md#alert-timeline)
#### [Investigate files](windows-defender-atp\investigate-files-windows-defender-advanced-threat-protection.md)
#### [Investigate an IP address](windows-defender-atp\investigate-ip-windows-defender-advanced-threat-protection.md)
#### [Investigate a domain](windows-defender-atp\investigate-domain-windows-defender-advanced-threat-protection.md)
#### [View and organize the Machines view](windows-defender-atp\machines-view-overview-windows-defender-advanced-threat-protection.md)
#### [Investigate machines](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md)
##### [Search for specific alerts](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#search-for-specific-alerts)
##### [Filter events from a specific date](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#filter-events-from-a-specific-date)
##### [Export machine timeline events](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#export-machine-timeline-events)
##### [Navigate between pages](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#navigate-between-pages)
#### [Investigate a user account](windows-defender-atp\investigate-user-windows-defender-advanced-threat-protection.md)
#### [Manage alerts](windows-defender-atp\manage-alerts-windows-defender-advanced-threat-protection.md)
#### [Take response actions](windows-defender-atp\response-actions-windows-defender-advanced-threat-protection.md)
##### [Take response actions on a machine](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md)
###### [Isolate machines from the network](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#isolate-machines-from-the-network)
###### [Undo machine isolation](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#undo-machine-isolation)
###### [Collect investigation package](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#collect-investigation-package)
###### [Check activity details in Action center](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
##### [Take response actions on a file](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md)
###### [Stop and quarantine files in your network](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#stop-and-quarantine-files-in-your-network)
###### [Remove file from quarantine](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-quarantine)
###### [Block files in your network](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#block-files-in-your-network)
###### [Check activity details in Action center](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
###### [Deep analysis](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#deep-analysis)
####### [Submit files for analysis](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#submit-files-for-analysis)
####### [View deep analysis reports](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#view-deep-analysis-reports)
####### [Troubleshoot deep analysis](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#troubleshoot-deep-analysis)
### [Pull alerts to your SIEM tools](windows-defender-atp\configure-siem-windows-defender-advanced-threat-protection.md)
#### [Enable SIEM integration](windows-defender-atp\enable-siem-integration-windows-defender-advanced-threat-protection.md)
#### [Configure Splunk to pull alerts](windows-defender-atp\configure-splunk-windows-defender-advanced-threat-protection.md)
#### [Configure HP ArcSight to pull alerts](windows-defender-atp\configure-arcsight-windows-defender-advanced-threat-protection.md)
#### [Windows Defender ATP alert API fields](windows-defender-atp\api-portal-mapping-windows-defender-advanced-threat-protection.md)
#### [Pull alerts using REST API](windows-defender-atp\pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md)
#### [Troubleshoot SIEM tool integration issues](windows-defender-atp\troubleshoot-siem-windows-defender-advanced-threat-protection.md)
### [Use the threat intelligence API to create custom alerts](windows-defender-atp\use-custom-ti-windows-defender-advanced-threat-protection.md)
#### [Understand threat intelligence concepts](windows-defender-atp\threat-indicator-concepts-windows-defender-advanced-threat-protection.md)
#### [Enable the custom threat intelligence application](windows-defender-atp\enable-custom-ti-windows-defender-advanced-threat-protection.md)
#### [Create custom threat intelligence alerts](windows-defender-atp\custom-ti-api-windows-defender-advanced-threat-protection.md)
#### [PowerShell code examples](windows-defender-atp\powershell-example-code-windows-defender-advanced-threat-protection.md)
#### [Python code examples](windows-defender-atp\python-example-code-windows-defender-advanced-threat-protection.md)
#### [Experiment with custom threat intelligence alerts](windows-defender-atp\experiment-custom-ti-windows-defender-advanced-threat-protection.md)
#### [Troubleshoot custom threat intelligence issues](windows-defender-atp\troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md)
### [Check sensor state](windows-defender-atp\check-sensor-status-windows-defender-advanced-threat-protection.md)
#### [Fix unhealthy sensors](windows-defender-atp\fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md)
##### [Inactive machines](windows-defender-atp\fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md#inactive-machines)
##### [Misconfigured machines](windows-defender-atp\fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md#misconfigured-machines)
### [Configure Windows Defender ATP preferences settings](windows-defender-atp\preferences-setup-windows-defender-advanced-threat-protection.md)
#### [Update general settings](windows-defender-atp\general-settings-windows-defender-advanced-threat-protection.md)
#### [Turn on advanced features](windows-defender-atp\advanced-features-windows-defender-advanced-threat-protection.md)
#### [Turn on preview experience](windows-defender-atp\preview-settings-windows-defender-advanced-threat-protection.md)
#### [Configure email notifications](windows-defender-atp\configure-email-notifications-windows-defender-advanced-threat-protection.md)
### [Windows Defender ATP settings](windows-defender-atp\settings-windows-defender-advanced-threat-protection.md)
### [Windows Defender ATP service status](windows-defender-atp\service-status-windows-defender-advanced-threat-protection.md)
### [Troubleshoot Windows Defender ATP](windows-defender-atp\troubleshoot-windows-defender-advanced-threat-protection.md)
### [Review events and errors on endpoints with Event Viewer](windows-defender-atp\event-error-codes-windows-defender-advanced-threat-protection.md)
### [Windows Defender Antivirus compatibility](windows-defender-atp\defender-compatibility-windows-defender-advanced-threat-protection.md)
## [Windows Defender Antivirus in Windows 10](windows-defender-antivirus\windows-defender-antivirus-in-windows-10.md)
### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-antivirus\windows-defender-security-center-antivirus.md)
### [Windows Defender Antivirus on Windows Server](windows-defender-antivirus\windows-defender-antivirus-on-windows-server-2016.md)
### [Windows Defender Antivirus and Advanced Threat Protection: Better together](windows-defender-antivirus\windows-defender-antivirus-compatibility.md)
### [Evaluate Windows Defender Antivirus protection](windows-defender-antivirus\evaluate-windows-defender-antivirus.md)
### [Deploy, manage updates, and report on Windows Defender Antivirus](windows-defender-antivirus\deploy-manage-report-windows-defender-antivirus.md)
#### [Deploy and enable Windows Defender Antivirus](windows-defender-antivirus\deploy-windows-defender-antivirus.md)
##### [Deployment guide for VDI environments](windows-defender-antivirus\deployment-vdi-windows-defender-antivirus.md)
#### [Report on Windows Defender Antivirus protection](windows-defender-antivirus\report-monitor-windows-defender-antivirus.md)
#### [Manage updates and apply baselines](windows-defender-antivirus\manage-updates-baselines-windows-defender-antivirus.md)
##### [Manage protection and definition updates](windows-defender-antivirus\manage-protection-updates-windows-defender-antivirus.md)
##### [Manage when protection updates should be downloaded and applied](windows-defender-antivirus\manage-protection-update-schedule-windows-defender-antivirus.md)
##### [Manage updates for endpoints that are out of date](windows-defender-antivirus\manage-outdated-endpoints-windows-defender-antivirus.md)
##### [Manage event-based forced updates](windows-defender-antivirus\manage-event-based-updates-windows-defender-antivirus.md)
##### [Manage updates for mobile devices and VMs](windows-defender-antivirus\manage-updates-mobile-devices-vms-windows-defender-antivirus.md)
### [Configure Windows Defender Antivirus features](windows-defender-antivirus\configure-windows-defender-antivirus-features.md)
#### [Utilize Microsoft cloud-provided protection](windows-defender-antivirus\utilize-microsoft-cloud-protection-windows-defender-antivirus.md)
##### [Enable cloud-delivered protection](windows-defender-antivirus\enable-cloud-protection-windows-defender-antivirus.md)
##### [Specify the cloud-delivered protection level](windows-defender-antivirus\specify-cloud-protection-level-windows-defender-antivirus.md)
##### [Configure and validate network connections](windows-defender-antivirus\configure-network-connections-windows-defender-antivirus.md)
##### [Enable the Block at First Sight feature](windows-defender-antivirus\configure-block-at-first-sight-windows-defender-antivirus.md)
##### [Configure the cloud block timeout period](windows-defender-antivirus\configure-cloud-block-timeout-period-windows-defender-antivirus.md)
#### [Configure behavioral, heuristic, and real-time protection](windows-defender-antivirus\configure-protection-features-windows-defender-antivirus.md)
##### [Detect and block Potentially Unwanted Applications](windows-defender-antivirus\detect-block-potentially-unwanted-apps-windows-defender-antivirus.md)
##### [Enable and configure always-on protection and monitoring](windows-defender-antivirus\configure-real-time-protection-windows-defender-antivirus.md)
#### [Configure end-user interaction with Windows Defender AV](windows-defender-antivirus\configure-end-user-interaction-windows-defender-antivirus.md)
##### [Configure the notifications that appear on endpoints](windows-defender-antivirus\configure-notifications-windows-defender-antivirus.md)
##### [Prevent users from seeing or interacting with the user interface](windows-defender-antivirus\prevent-end-user-interaction-windows-defender-antivirus.md)
##### [Prevent or allow users to locally modify policy settings](windows-defender-antivirus\configure-local-policy-overrides-windows-defender-antivirus.md)
### [Customize, initiate, and review the results of scans and remediation](windows-defender-antivirus\customize-run-review-remediate-scans-windows-defender-antivirus.md)
#### [Configure and validate exclusions in Windows Defender AV scans](windows-defender-antivirus\configure-exclusions-windows-defender-antivirus.md)
##### [Configure and validate exclusions based on file name, extension, and folder location](windows-defender-antivirus\configure-extension-file-exclusions-windows-defender-antivirus.md)
##### [Configure and validate exclusions for files opened by processes](windows-defender-antivirus\configure-process-opened-file-exclusions-windows-defender-antivirus.md)
##### [Configure exclusions in Windows Defender AV on Windows Server 2016](windows-defender-antivirus\configure-server-exclusions-windows-defender-antivirus.md)
#### [Configure scanning options in Windows Defender AV](windows-defender-antivirus\configure-advanced-scan-types-windows-defender-antivirus.md)
#### [Configure remediation for scans](windows-defender-antivirus\configure-remediation-windows-defender-antivirus.md)
#### [Configure scheduled scans](windows-defender-antivirus\scheduled-catch-up-scans-windows-defender-antivirus.md)
#### [Configure and run scans](windows-defender-antivirus\run-scan-windows-defender-antivirus.md)
#### [Review scan results](windows-defender-antivirus\review-scan-results-windows-defender-antivirus.md)
#### [Run and review the results of a Windows Defender Offline scan](windows-defender-antivirus\windows-defender-offline.md)
### [Review event logs and error codes to troubleshoot issues](windows-defender-antivirus\troubleshoot-windows-defender-antivirus.md)
### [Reference topics for management and configuration tools](windows-defender-antivirus\configuration-management-reference-windows-defender-antivirus.md)
#### [Use Group Policy settings to configure and manage Windows Defender AV](windows-defender-antivirus\use-group-policy-windows-defender-antivirus.md)
#### [Use System Center Configuration Manager and Microsoft Intune to configure and manage Windows Defender AV](windows-defender-antivirus\use-intune-config-manager-windows-defender-antivirus.md)
#### [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) policy using Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md)
##### [Deploy your Windows Information Protection (WIP) policy](windows-information-protection\deploy-wip-policy-using-intune.md)
##### [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune.md)
#### [Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](windows-information-protection\create-wip-policy-using-sccm.md)
#### [Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](windows-information-protection\create-and-verify-an-efs-dra-certificate.md)
#### [Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](windows-information-protection\wip-app-enterprise-context.md)
### [Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](windows-information-protection\mandatory-settings-for-wip.md)
### [Testing scenarios for Windows Information Protection (WIP)](windows-information-protection\testing-scenarios-for-wip.md)
### [Limitations while using Windows Information Protection (WIP)](windows-information-protection\limitations-with-wip.md)
### [How to collect Windows Information Protection (WIP) audit event logs](windows-information-protection\collect-wip-audit-event-logs.md)
### [General guidance and best practices for Windows Information Protection (WIP)](windows-information-protection\guidance-and-best-practices-wip.md)
#### [Enlightened apps for use with Windows Information Protection (WIP)](windows-information-protection\enlightened-microsoft-apps-and-wip.md)
#### [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)
## [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)

1
windows/threat-protection/change-history-for-threat-protection.md
View File

@ -14,6 +14,7 @@ This topic lists new and updated topics in the [Threat protection](index.md) doc
## March 2017
|New or changed topic |Description |
|---------------------|------------|
|[Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune.md)|Updated based on Windows 10, version 1703.|
|[How to collect Windows Information Protection (WIP) audit event logs](windows-information-protection\collect-wip-audit-event-logs.md) |New |
|[Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](windows-information-protection\mandatory-settings-for-wip.md) |Updated based on Windows 10, version 1703. |
|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md) |Updated based on Windows 10, version 1703. |

5
windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md
View File

@ -28,4 +28,7 @@ Learn about new features in the Windows Defender ATP preview release and be amon
You'll have access to upcoming features which you can provide feedback on to help improve the overall experience before features are generally available.
For more information, see [Turn on the preview experience](preview-settings-windows-defender-advanced-threat-protection.md).
Turn on the preview experience setting to be among the first to try upcoming features.
1. In the navigation pane, select **Preferences setup** > **Preview experience**.
2. Toggle the setting between **On** and **Off** and select **Save preferences**.

2
windows/threat-protection/windows-information-protection/app-behavior-with-wip.md
View File

@ -14,7 +14,7 @@ localizationpriority: high
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10 Mobile, version 1607 and later
Windows Information Protection (WIP) classifies apps into two categories: enlightened and unenlightened. Enlighted apps can differentiate between corporate and personal data, correctly determining which to protect based on internal policies. Corporate data is encrypted on the managed device and attempts to copy/paste or share this information with non-corporate apps or people will fail. Unenlightened apps, when marked as corporate-managed, consider all data corporate and encrypt everything by default.

4
windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md
View File

@ -13,8 +13,8 @@ localizationpriority: high
**Applies to:**
- Windows 10 and later
- Windows 10 Mobile and later
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
Windows Information Protection (WIP) creates audit events in the following situations:

4
windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
View File

@ -13,8 +13,8 @@ localizationpriority: high
# Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate
**Applies to:**
- Windows 10, version 1703
- Windows 10 Mobile, version 1703
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
If you don’t already have an EFS DRA certificate, you’ll need to create and extract one from your system before you can use Windows Information Protection (WIP), formerly known as enterprise data protection (EDP), in your organization. For the purposes of this section, we’ll use the file name EFSDRA; however, this name can be replaced with anything that makes sense to you.

104
windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
View File

@ -1,6 +1,6 @@
---
title: Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune (Windows 10)
description: After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to create and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
title: Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune (Windows 10)
description: After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
ms.assetid: d0eaba4f-6d7d-4ae4-8044-64680a40cf6b
keywords: WIP, Enterprise Data Protection
ms.prod: w10
@ -11,103 +11,63 @@ author: eross-msft
localizationpriority: high
---
# Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune
# Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune
**Applies to:**
- Windows 10, version 1607
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later (except Microsoft Azure Rights Management, which is only available on the desktop)
After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to create and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Azure Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
## Create your VPN policy using Microsoft Intune
Follow these steps to create the VPN policy you want to use with WIP.
## Associate your WIP policy to your VPN policy by using Microsoft Azure Intune
Follow these steps to associate your WIP policy with your organization's existing VPN policy.
**To create your VPN policy**
**To associate your policies**
1. Open the Intune administration console, and go to the **Policy** node, and then click **Add Policy**.
1. Create your VPN profile. For info about how to do this, see [How to configure VPN settings in Microsoft Intune](https://docs.microsoft.com/en-us/intune-azure/configure-devices/how-to-configure-vpn-settings) and [How to create custom VPN profiles in Microsoft Intune](https://docs.microsoft.com/en-us/intune-azure/configure-devices/create-custom-vpn-profiles#create-a-custom-configuration).
2. Go to **Windows**, click the **VPN Profile (Windows 10 Desktop and Mobile and later)**, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.
2. Open the Microsoft Azure Intune mobile application management console, click **Device configuration**, and then click **Create Profile**.
![Microsoft Intune, Create a new policy using the New Policy screen](images/intune-vpn-createpolicy.png)
![Microsoft Azure Intune, Create a new policy using the the Azure portal](images/wip-azure-vpn-device-policy.png)
3. Type *Contoso_VPN_Win10* into the **Name** box, along with an optional description for your policy into the **Description** box.
3. In the **Create Profile** blade, type a name for your profile, such as *Contoso_VPN_Win10*, into the **Name** box, add an optional description for your policy into the **Description** box, select **Windows 10 and later** from the **Platform** dropdown box, select **Custom** from the **Profile type** dropdown box, and then click **Configure**.
![Microsoft Intune: Fill in the required Name and optional Description for your policy](images/intune-vpn-titledescription.png)
![Microsoft Azure Intune, Create a new policy using the Create Profile blade](images/wip-azure-vpn-configure-policy.png)
4. In the **VPN Settings** area, type the following info:
4. In the **Custom OMA-URI Settings** blade, click **Add**.
- **VPN connection name.** This name is also what appears to your employees, so it's important that it be clear and understandable.
5. In the **Add Row** blade, type:
- **Connection type.** Pick the connection type that matches your infrastructure. The options are **Pulse Secure**, **F5 Edge Client**, **Dell SonicWALL Mobile Connect**, or **Check Point Capsule VPN**.
- **Name.** Type a name for your setting, such as *EDPModeID*.
- **VPN server description.** A descriptive name for this connection. Only you will see it, but it should be unique and readable.
- **Description.** Type an optional description for your setting.
- **Server IP address or FQDN.** The server's IP address or fully-qualified domain name (FQDN).
- **OMA-URI.** Type _./Vendor/MSFT/VPNv2/&lt;VPNProfileName&gt;/EDPModeId_ into the box.
![Microsoft Intune: Fill in the VPN Settings area](images/intune-vpn-vpnsettings.png)
- **Data type.** Select **String** from the dropdown box
5. In the **Authentication** area, choose the authentication method that matches your VPN infrastructure, either **Username and Password** or **Certificates**.<p>
It's your choice whether you check the box to **Remember the user credentials at each logon**.
- **Value.** Type your fully-qualified domain that should be used by the OMA-URI setting. For example, _corp.contoso.com_.
![Microsoft Intune, Choose the Authentication Method for your VPN system](images/intune-vpn-authentication.png)
![Microsoft Azure Intune, Add your OMA-URI settings](images/wip-azure-vpn-custom-omauri.png)
6. You can leave the rest of the default or blank settings, and then click **Save Policy**.
6. Click **OK** to save your setting info in the **Add Row** blade, and then click **OK** in the **Custom OMA-URI Settings** blade to save the setting with your policy.
## Deploy your VPN policy using Microsoft Intune
7. Click **Create** to create the policy, including your OMA_URI info.
## Deploy your VPN policy using Microsoft Azure Intune
After you’ve created your VPN policy, you'll need to deploy it to the same group you deployed your Windows Information Protection (WIP) policy.
**To deploy your VPN policy**
**To deploy your Custom VPN policy**
1. On the **Configuration policies** page, locate your newly-created policy, click to select it, and then click the **Manage Deployment** button.
1. On the **App policy** blade, click your newly-created policy, click **User groups** from the menu that appears, and then click **Add user group**.
2. In the left pane of the **Manage Deployment** box, click the employees or groups that should get the policy, and then click **Add**.<p>
The added people move to the **Selected Groups** list on the right-hand pane.
A list of user groups, made up of all of the security groups in your Azure Active Directory, appear in the **Add user group** blade.
![Microsoft Intune: Pick the group of employees that should get the policy](images/intune-deploy-vpn.png)
2. Choose the group you want your policy to apply to, and then click **Select** to deploy the policy.
3. After you've picked all of the employees and groups that should get the policy, click **OK**.<p>
The policy is deployed to the selected users' devices.
The policy is deployed to the selected users' devices.
## Link your WIP and VPN policies and deploy the custom configuration policy
The final step to making your VPN configuration work with WIP, is to link your two policies together. To do this, you must first create a custom configuration policy, setting it to use your **EDPModeID** setting, and then deploying the policy to the same group you deployed your WIP and VPN policies
**To link your VPN policy**
1. Open the Intune administration console, and go to the **Policy** node, and then click **Add Policy**.
2. Go to **Windows**, click the **Custom Configuration (Windows 10 Desktop and Mobile and later)**, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.
![Microsoft Intune, Create a new policy from the New Policy screen](images/intune-vpn-customconfig.png)
3. Type a name (required) and an optional description for your policy into the **Name** and **Description** boxes.
![Microsoft Intune: Fill in the required Name and optional Description for your policy](images/intune-vpn-wipmodeid.png)
4. In the **OMA-URI Settings** area, click **Add** to add your **EDPModeID** info.
5. In the **OMA-URI Settings** area, type the following info:
- **Setting name.** Type **EDPModeID** as the name.
- **Data type.** Pick the **String** data type.
- **OMA-URI.** Type `./Vendor/MSFT/VPNv2/<VPNProfileName>/EDPModeId`, replacing &lt;*VPNProfileName*&gt; with the name you gave to your VPN policy. For example, `./Vendor/MSFT/VPNv2/W10-Checkpoint-VPN1/EDPModeId`.
- **Value.** Your fully-qualified domain that should be used by the OMA-URI setting.
![Microsoft Intune: Fill in the OMA-URI Settings for the EMPModeID setting](images/intune-vpn-omaurisettings.png)
6. Click **OK** to save your new OMA-URI setting, and then click **Save Policy.**
**To deploy your linked policy**
1. On the **Configuration policies** page, locate your newly-created policy, click to select it, and then click the **Manage Deployment** button.
2. In the left pane of the **Manage Deployment** box, click the employees or groups that should get the policy, and then click **Add**. The added people move to the **Selected Groups** list on the right-hand pane.
![Microsoft Intune, Manage Deployment box used to deploy your linked VPN policy](images/intune-groupselection_vpnlink.png)
3. After you've picked all of the employees and groups that should get the policy, click **OK**. The policy is deployed to the selected users' devices.
![Microsoft Intune: Pick your user groups that should get the policy when it's deployed](images/wip-azure-add-user-groups.png)
>[!NOTE]
>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).

6
windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
View File

@ -412,12 +412,12 @@ There are no default locations included with WIP, you must add each of your netw
<tr>
<td>Proxy servers</td>
<td>proxy.contoso.com:80;proxy2.contoso.com:443</td>
<td>Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<br><br>This list shouldn’t include any servers listed in the Internal proxy servers list, which are used for non-WIP-protected traffic.<br><br>If you have multiple resources, you must separate them using the ";" delimiter.</td>
<td>Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<br><br>This list shouldn’t include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic.<br><br>If you have multiple resources, you must separate them using the ";" delimiter.</td>
</tr>
<tr>
<td>Internal proxy servers</td>
<td>contoso.internalproxy1.com;contoso.internalproxy2.com</td>
<td>Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<br><br>This list shouldn’t include any servers listed in the Proxy servers list, which are used for WIP-protected traffic.<br><br>If you have multiple resources, you must separate them using the ";" delimiter.</td>
<td>Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<br><br>This list shouldn’t include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic.<br><br>If you have multiple resources, you must separate them using the ";" delimiter.</td>
</tr>
<tr>
<td>IPv4 ranges</td>
@ -506,7 +506,7 @@ Optionally, if you don’t want everyone in your organization to be able to shar
## Related topics
- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
- [Azure RMS Documentation Update for May 2016](https://blogs.technet.microsoft.com/enterprisemobility/2016/05/31/azure-rms-documentation-update-for-may-2016/)
- [What is Azure Rights Management?]( https://docs.microsoft.com/en-us/information-protection/understand-explore/what-is-azure-rms)

16
windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md
View File

@ -14,9 +14,9 @@ localizationpriority: high
# Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager
**Applies to:**
- Windows 10, version 1607
- Windows 10 Mobile
- System Center Configuration Manager
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
- System Center Configuration Manager
System Center Configuration Manager helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection mode, and how to find enterprise data on the network.
@ -387,7 +387,7 @@ There are no default locations included with WIP, you must add each of your netw
<tr>
<td>Enterprise Cloud Resources</td>
<td><strong>With proxy:</strong> contoso.sharepoint.com,contoso.internalproxy1.com|<br>contoso.visualstudio.com,contoso.internalproxy2.com<p><strong>Without proxy:</strong> contoso.sharepoint.com|contoso.visualstudio.com</td>
<td>Specify the cloud resources to be treated as corporate and protected by WIP.<p>For each cloud resource, you may also optionally specify a proxy server from your Enterprise Internal Proxy Servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Enterprise Internal Proxy Servers is considered enterprise.<p>If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: <code>URL &lt;,proxy&gt;|URL &lt;,proxy&gt;</code>.<p><strong>Important</strong><br>In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can’t tell whether it’s attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the <code>/&#42;AppCompat&#42;/</code> string to the setting. For example: <code>URL &lt;,proxy&gt;|URL &lt;,proxy&gt;|/&#42;AppCompat&#42;/</code>.</td>
<td>Specify the cloud resources to be treated as corporate and protected by WIP.<p>For each cloud resource, you may also optionally specify a proxy server from your Internal proxy servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Internal proxy servers is considered enterprise.<p>If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: <code>URL &lt;,proxy&gt;|URL &lt;,proxy&gt;</code>.<p><strong>Important</strong><br>In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can’t tell whether it’s attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the <code>/&#42;AppCompat&#42;/</code> string to the setting. For example: <code>URL &lt;,proxy&gt;|URL &lt;,proxy&gt;|/&#42;AppCompat&#42;/</code>.</td>
</tr>
<tr>
<td>Enterprise Network Domain Names (Required)</td>
@ -395,14 +395,14 @@ There are no default locations included with WIP, you must add each of your netw
<td>Specify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected.<p>This setting works with the IP ranges settings to detect whether a network endpoint is enterprise or personal on private networks.<p>If you have multiple resources, you must separate them using the "," delimiter.</td>
</tr>
<tr>
<td>Enterprise Proxy Servers</td>
<td>Proxy servers</td>
<td>proxy.contoso.com:80;proxy2.contoso.com:443</td>
<td>Specify your externally-facing proxy server addresses, along with the port through which traffic is allowed and protected with WIP.<p>This list shouldn’t include any servers listed in the Enterprise Internal Proxy Servers list, which are used for WIP-protected traffic.<p>This setting is also required if you use a proxy in your network. If you don't have a proxy server, you might find that enterprise resources are unavailable when a client is behind a proxy, such as when you’re visiting another company and not on that company’s guest network.<p>If you have multiple resources, you must separate them using the ";" delimiter.</td>
<td>Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<br><br>This list shouldn’t include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic.<br><br>If you have multiple resources, you must separate them using the ";" delimiter.</td>
</tr>
<tr>
<td>Enterprise Internal Proxy Servers</td>
<td>Internal proxy servers</td>
<td>contoso.internalproxy1.com;contoso.internalproxy2.com</td>
<td>Specify the proxy servers your devices will go through to reach your cloud resources.<p>Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<p>This list shouldn’t include any servers listed in the Enterprise Proxy Servers list, which are used for non-WIP-protected traffic.<p>If you have multiple resources, you must separate them using the ";" delimiter.</td>
<td>Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.<br><br>This list shouldn’t include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic.<br><br>If you have multiple resources, you must separate them using the ";" delimiter.</td>
</tr>
<tr>
<td>Enterprise IPv4 Range (Required)</td>

2
windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
View File

@ -38,6 +38,6 @@ After you’ve created your Windows Information Protection (WIP) policy, you'll
## Related topics
- [Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune](create-wip-policy-using-intune.md)
- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)

4
windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
View File

@ -15,8 +15,8 @@ localizationpriority: high
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
Learn the difference between enlightened and unenlightened apps, and then review the list of enlightened apps provided by Microsoft along with the text you will need to use to add them to your allowed apps list.

4
windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md
View File

@ -14,8 +14,8 @@ localizationpriority: high
# General guidance and best practices for Windows Information Protection (WIP)
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
This section includes info about the enlightened Microsoft apps, including how to add them to your allowed apps list in Microsoft Intune. It also includes some testing scenarios that we recommend running through with Windows Information Protection (WIP).

4
windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md
View File

@ -13,8 +13,8 @@ localizationpriority: high
# Mandatory tasks and settings required to turn on Windows Information Protection (WIP)
**Applies to:**
- Windows 10, version 1703
- Windows 10 Mobile, version 1703
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
This list provides all of the tasks and settings that are required for the operating system to turn on Windows Information Protection (WIP), formerly known as enterprise data protection (EDP), in your enterprise.

4
windows/threat-protection/windows-information-protection/overview-create-wip-policy.md
View File

@ -13,8 +13,8 @@ localizationpriority: high
# Create a Windows Information Protection (WIP) policy
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
Microsoft Intune and System Center Configuration Manager helps you create and deploy your enterprise data protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.

4
windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
View File

@ -14,8 +14,8 @@ localizationpriority: high
# Protect your enterprise data using Windows Information Protection (WIP)
**Applies to:**
- Windows 10, version 1703
- Windows 10 Mobile, version 1703
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

4
windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md
View File

@ -14,8 +14,8 @@ localizationpriority: high
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

4
windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md
View File

@ -14,8 +14,8 @@ localizationpriority: high
# Testing scenarios for Windows Information Protection (WIP)
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
We've come up with a list of suggested testing scenarios that you can use to test Windows Information Protection (WIP) in your company.

4
windows/threat-protection/windows-information-protection/using-owa-with-wip.md
View File

@ -13,8 +13,8 @@ localizationpriority: high
# Using Outlook on the web with Windows Information Protection (WIP)
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

4
windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md
View File

@ -13,8 +13,8 @@ localizationpriority: high
# Determine the Enterprise Context of an app running in Windows Information Protection (WIP)
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

37
windows/update/docfx.json Normal file
View File

@ -0,0 +1,37 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"fileMetadata": {},
"template": [],
"dest": "windows-update"
}
}

7
windows/whats-new/whats-new-windows-10-version-1703.md
View File

@ -75,7 +75,7 @@ Cortana is Microsoft’s personal digital assistant, who helps busy people get t
Using Azure AD also means that you can remove an employee’s profile (for example, when an employee leaves your organization) while respecting Windows Information Protection (WIP) policies and ignoring enterprise content, such as emails, calendar items, and people lists that are marked as enterprise data.
For more info about Cortana at work, see (/windows/configuration/cortana-at-work/cortana-at-work-overview)
For more info about Cortana at work, see [Cortana integration in your business or enterprise](/windows/configuration/cortana-at-work/cortana-at-work-overview.md)
## Deployment
@ -170,6 +170,11 @@ For Windows desktops, users are able to reset a forgotten PIN through **Settings
For more details, check out [What if I forget my PIN?](/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password#what-if-i-forget-my-pin).
### Windows Information Protection (WIP) and Azure Active Directory (Azure AD)
Microsoft Azure Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your allowed apps, your WIP-protection level, and how to find enterprise data on the network. For more info, see [Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune](/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md) and [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md).
You can also now collect your audit event logs by using the Reporting configuration service provider (CSP) or the Windows Event Forwarding (for Windows desktop domain-joined devices). For info, see the brand-new topic, [How to collect Windows Information Protection (WIP) audit event logs](/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md).
## Update
### Windows Update for Business