diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index f9ebdac192..ecd7571ea7 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -129,6 +129,20 @@
"build_entry_point": "docs",
"template_folder": "_themes"
},
+ {
+ "docset_name": "SV",
+ "build_source_folder": "windows/sv",
+ "build_output_subfolder": "SV",
+ "locale": "en-us",
+ "monikers": [],
+ "moniker_ranges": [],
+ "open_to_public_contributors": true,
+ "type_mapping": {
+ "Conceptual": "Content"
+ },
+ "build_entry_point": "docs",
+ "template_folder": "_themes"
+ },
{
"docset_name": "win-access-protection",
"build_source_folder": "windows/access-protection",
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 99e0af3157..a85af91d65 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -18769,6 +18769,16 @@
"source_path": "windows/security/threat-protection/microsoft-defender-antivirus/manage-updates-baselines-microsoft-defender-antivirus.md",
"redirect_url": "/microsoft-365/security/defender-endpoint/manage-updates-baselines-microsoft-defender-antivirus",
"redirect_document_id": false
- }
+ },
+ {
+ "source_path": "windows/security/threat-protection/device-control/control-usb-devices-using-intune.md",
+ "redirect_url": "/microsoft-365/security/defender-endpoint/control-usb-devices-using-intune",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/security/threat-protection/device-control/device-control-report.md",
+ "redirect_url": "/microsoft-365/security/defender-endpoint/device-control-report",
+ "redirect_document_id": false
+ }
]
}
diff --git a/bcs/TOC.md b/bcs/TOC.md
deleted file mode 100644
index 06913f7aef..0000000000
--- a/bcs/TOC.md
+++ /dev/null
@@ -1 +0,0 @@
-# [Index](index.md)
\ No newline at end of file
diff --git a/bcs/TOC.yml b/bcs/TOC.yml
new file mode 100644
index 0000000000..981fe6d622
--- /dev/null
+++ b/bcs/TOC.yml
@@ -0,0 +1,2 @@
+- name: Index
+ href: index.md
diff --git a/browsers/TOC.md b/browsers/TOC.md
deleted file mode 100644
index c77d167a67..0000000000
--- a/browsers/TOC.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Table of Contents
-## [Microsoft Edge](edge/index.md)
-## [Internet Explorer 11](internet-explorer/index.md)
\ No newline at end of file
diff --git a/browsers/TOC.yml b/browsers/TOC.yml
new file mode 100644
index 0000000000..e396fab3f5
--- /dev/null
+++ b/browsers/TOC.yml
@@ -0,0 +1,6 @@
+- name: Table of Contents
+ items:
+ - name: Microsoft Edge
+ href: edge/index.md
+ - name: Internet Explorer 11
+ href: internet-explorer/index.md
diff --git a/browsers/edge/TOC.md b/browsers/edge/TOC.md
deleted file mode 100644
index bae1f59877..0000000000
--- a/browsers/edge/TOC.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# [Microsoft Edge deployment for IT Pros](index.yml)
-
-## [System requirements and supported languages](about-microsoft-edge.md)
-
-## [Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
-
-## [Deploy Microsoft Edge kiosk mode](microsoft-edge-kiosk-mode-deploy.md)
-
-## [Group policies & configuration options](group-policies/index.yml)
-### [Address bar](group-policies/address-bar-settings-gp.md)
-### [Adobe Flash](group-policies/adobe-settings-gp.md)
-### [Books Library](group-policies/books-library-management-gp.md)
-### [Browser experience](group-policies/browser-settings-management-gp.md)
-### [Developer tools](group-policies/developer-settings-gp.md)
-### [Extensions](group-policies/extensions-management-gp.md)
-### [Favorites](group-policies/favorites-management-gp.md)
-### [Home button](group-policies/home-button-gp.md)
-### [Interoperability and enterprise mode guidance](group-policies/interoperability-enterprise-guidance-gp.md)
-### [Kiosk mode deployment in Microsoft Edge](microsoft-edge-kiosk-mode-deploy.md)
-### [New Tab page](group-policies/new-tab-page-settings-gp.md)
-### [Prelaunch Microsoft Edge and preload tabs](group-policies/prelaunch-preload-gp.md)
-### [Search engine customization](group-policies/search-engine-customization-gp.md)
-### [Security and privacy](group-policies/security-privacy-management-gp.md)
-### [Start page](group-policies/start-pages-gp.md)
-### [Sync browser](group-policies/sync-browser-settings-gp.md)
-### [Telemetry and data collection](group-policies/telemetry-management-gp.md)
-
-
-## [Change history for Microsoft Edge](change-history-for-microsoft-edge.md)
-
-## [Microsoft Edge Frequently Asked Questions (FAQ)](microsoft-edge-faq.yml)
-
-
diff --git a/browsers/edge/TOC.yml b/browsers/edge/TOC.yml
new file mode 100644
index 0000000000..22f318e503
--- /dev/null
+++ b/browsers/edge/TOC.yml
@@ -0,0 +1,50 @@
+- name: Microsoft Edge deployment for IT Pros
+ href: index.yml
+ items:
+ - name: System requirements and supported languages
+ href: about-microsoft-edge.md
+ - name: Use Enterprise Mode to improve compatibility
+ href: emie-to-improve-compatibility.md
+ - name: Deploy Microsoft Edge kiosk mode
+ href: microsoft-edge-kiosk-mode-deploy.md
+ - name: Group policies & configuration options
+ href: group-policies/index.yml
+ items:
+ - name: Address bar
+ href: group-policies/address-bar-settings-gp.md
+ - name: Adobe Flash
+ href: group-policies/adobe-settings-gp.md
+ - name: Books Library
+ href: group-policies/books-library-management-gp.md
+ - name: Browser experience
+ href: group-policies/browser-settings-management-gp.md
+ - name: Developer tools
+ href: group-policies/developer-settings-gp.md
+ - name: Extensions
+ href: group-policies/extensions-management-gp.md
+ - name: Favorites
+ href: group-policies/favorites-management-gp.md
+ - name: Home button
+ href: group-policies/home-button-gp.md
+ - name: Interoperability and enterprise mode guidance
+ href: group-policies/interoperability-enterprise-guidance-gp.md
+ - name: Kiosk mode deployment in Microsoft Edge
+ href: microsoft-edge-kiosk-mode-deploy.md
+ - name: New Tab page
+ href: group-policies/new-tab-page-settings-gp.md
+ - name: Prelaunch Microsoft Edge and preload tabs
+ href: group-policies/prelaunch-preload-gp.md
+ - name: Search engine customization
+ href: group-policies/search-engine-customization-gp.md
+ - name: Security and privacy
+ href: group-policies/security-privacy-management-gp.md
+ - name: Start page
+ href: group-policies/start-pages-gp.md
+ - name: Sync browser
+ href: group-policies/sync-browser-settings-gp.md
+ - name: Telemetry and data collection
+ href: group-policies/telemetry-management-gp.md
+ - name: Change history for Microsoft Edge
+ href: change-history-for-microsoft-edge.md
+ - name: Microsoft Edge Frequently Asked Questions (FAQ)
+ href: microsoft-edge-faq.yml
diff --git a/browsers/edge/docfx.json b/browsers/edge/docfx.json
index dc265d815a..d77b68f7fb 100644
--- a/browsers/edge/docfx.json
+++ b/browsers/edge/docfx.json
@@ -53,7 +53,7 @@
"garycentric"
]
},
- "externalReference": [],
+ "fileMetadata": {},
"template": "op.html",
"dest": "browsers/edge",
"markdownEngineName": "markdig"
diff --git a/browsers/edge/emie-to-improve-compatibility.md b/browsers/edge/emie-to-improve-compatibility.md
index 09a98b4378..b7dbb29a92 100644
--- a/browsers/edge/emie-to-improve-compatibility.md
+++ b/browsers/edge/emie-to-improve-compatibility.md
@@ -27,8 +27,32 @@ If you have specific websites and apps that have compatibility problems with Mic
Using Enterprise Mode means that you can continue to use Microsoft Edge as your default browser, while also ensuring that your apps continue working on IE11.
+## Interoperability goals and enterprise guidance
-[!INCLUDE [interoperability-goals-enterprise-guidance](../includes/interoperability-goals-enterprise-guidance.md)]
+Our primary goal is that your websites work in Microsoft Edge. To that end, we've made Microsoft Edge the default browser.
+
+You must continue using IE11 if web apps use any of the following:
+
+* ActiveX controls
+
+* x-ua-compatible headers
+
+* <meta> tags with an http-equivalent value of X-UA-Compatible header
+
+* Enterprise mode or compatibility view to addressing compatibility issues
+
+* legacy document modes
+
+If you have uninstalled IE11, you can download it from the Microsoft Store or the [Internet Explorer 11 download page](https://go.microsoft.com/fwlink/p/?linkid=290956). Alternatively, you can use Enterprise Mode with Microsoft Edge to transition only the sites that need these technologies to load in IE11.
+
+> [!TIP]
+> If you want to use Group Policy to set Internet Explorer as your default browser, you can find the info here, [Set the default browser using Group Policy](https://go.microsoft.com/fwlink/p/?LinkId=620714).
+
+|Technology |Why it existed |Why we don't need it anymore |
+|---------|---------|---------|
+|ActiveX |ActiveX is a binary extension model introduced in 1996 which allowed developers to embed native Windows technologies (COM/OLE) in web pages. These controls can be downloaded and installed from a site and were subsequently loaded in-process and rendered in Internet Explorer. | |
+|Browser Helper Objects (BHO) |BHOs are a binary extension model introduced in 1997 which enabled developers to write COM objects that were loaded in-process with the browser and could perform actions on available windows and modules. A common use was to build toolbars that installed into Internet Explorer. | |
+|Document modes | Starting with IE8, Internet Explorer introduced a new “document mode” with every release. These document modes could be requested via the x-ua-compatible header to put the browser into a mode which emulates legacy versions. |Similar to other modern browsers, Microsoft Edge has a single “living” document mode. To minimize the compatibility burden, we test features behind switches in about:flags until stable and ready to be turned on by default. |
## Enterprise guidance
Microsoft Edge is the default browser experience for Windows 10 and Windows 10 Mobile. However, if you're running web apps that rely on ActiveX controls, continue using Internet Explorer 11 for the web apps to work correctly. If you don't have IE11 installed anymore, you can download it from the Microsoft Store or the [Internet Explorer 11 download page](https://go.microsoft.com/fwlink/p/?linkid=290956). Also, if you use an earlier version of Internet Explorer, upgrade to IE11.
diff --git a/browsers/includes/interoperability-goals-enterprise-guidance.md b/browsers/includes/interoperability-goals-enterprise-guidance.md
deleted file mode 100644
index 407e07bf91..0000000000
--- a/browsers/includes/interoperability-goals-enterprise-guidance.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-author: eavena
-ms.author: eravena
-ms.date: 10/15/2018
-ms.reviewer:
-audience: itpro
manager: dansimp
-ms.prod: edge
-ms.topic: include
----
-
-## Interoperability goals and enterprise guidance
-
-Our primary goal is that your websites work in Microsoft Edge. To that end, we've made Microsoft Edge the default browser.
-
-You must continue using IE11 if web apps use any of the following:
-
-* ActiveX controls
-
-* x-ua-compatible headers
-
-* <meta> tags with an http-equivalent value of X-UA-Compatible header
-
-* Enterprise mode or compatibility view to addressing compatibility issues
-
-* legacy document modes
-
-If you have uninstalled IE11, you can download it from the Microsoft Store or the [Internet Explorer 11 download page](https://go.microsoft.com/fwlink/p/?linkid=290956). Alternatively, you can use Enterprise Mode with Microsoft Edge to transition only the sites that need these technologies to load in IE11.
-
-> [!TIP]
-> If you want to use Group Policy to set Internet Explorer as your default browser, you can find the info here, [Set the default browser using Group Policy](https://go.microsoft.com/fwlink/p/?LinkId=620714).
-
-
-|Technology |Why it existed |Why we don't need it anymore |
-|---------|---------|---------|
-|ActiveX |ActiveX is a binary extension model introduced in 1996 which allowed developers to embed native Windows technologies (COM/OLE) in web pages. These controls can be downloaded and installed from a site and were subsequently loaded in-process and rendered in Internet Explorer. | |
-|Browser Helper Objects (BHO) |BHOs are a binary extension model introduced in 1997 which enabled developers to write COM objects that were loaded in-process with the browser and could perform actions on available windows and modules. A common use was to build toolbars that installed into Internet Explorer. | |
-|Document modes | Starting with IE8, Internet Explorer introduced a new “document mode” with every release. These document modes could be requested via the x-ua-compatible header to put the browser into a mode which emulates legacy versions. |Similar to other modern browsers, Microsoft Edge has a single “living” document mode. To minimize the compatibility burden, we test features behind switches in about:flags until stable and ready to be turned on by default. |
-
-
----
diff --git a/browsers/internet-explorer/TOC.md b/browsers/internet-explorer/TOC.md
deleted file mode 100644
index 060f6ffb99..0000000000
--- a/browsers/internet-explorer/TOC.md
+++ /dev/null
@@ -1,191 +0,0 @@
-# [IE11 Deployment Guide for IT Pros](ie11-deploy-guide/index.md)
-
-## [Change history for the Internet Explorer 11 (IE11) Deployment Guide](ie11-deploy-guide/change-history-for-internet-explorer-11.md)
-
-## [System requirements and language support for Internet Explorer 11](ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md)
-
-## [List of updated features and tools - Internet Explorer 11 (IE11)](ie11-deploy-guide/updated-features-and-tools-with-ie11.md)
-
-## [Install and Deploy Internet Explorer 11 (IE11)](ie11-deploy-guide/install-and-deploy-ie11.md)
-### [Customize Internet Explorer 11 installation packages](ie11-deploy-guide/customize-ie11-install-packages.md)
-#### [Using IEAK 11 to create packages](ie11-deploy-guide/using-ieak11-to-create-install-packages.md)
-#### [Create packages for multiple operating systems or languages](ie11-deploy-guide/create-install-packages-for-multiple-operating-systems-or-languages.md)
-#### [Using .INF files to create packages](ie11-deploy-guide/using-inf-files-to-create-install-packages.md)
-### [Choose how to install Internet Explorer 11 (IE11)](ie11-deploy-guide/choose-how-to-install-ie11.md)
-#### [Install Internet Explorer 11 (IE11) - System Center 2012 R2 Configuration Manager](ie11-deploy-guide/install-ie11-using-system-center-configuration-manager.md)
-#### [Install Internet Explorer 11 (IE11) - Windows Server Update Services (WSUS)](ie11-deploy-guide/install-ie11-using-windows-server-update-services-wsus.md)
-#### [Install Internet Explorer 11 (IE11) - Microsoft Intune](ie11-deploy-guide/install-ie11-using-microsoft-intune.md)
-#### [Install Internet Explorer 11 (IE11) - Network](ie11-deploy-guide/install-ie11-using-the-network.md)
-#### [Install Internet Explorer 11 (IE11) - Operating system deployment systems](ie11-deploy-guide/install-ie11-using-operating-system-deployment-systems.md)
-#### [Install Internet Explorer 11 (IE11) - Third-party tools](ie11-deploy-guide/install-ie11-using-third-party-tools.md)
-### [Choose how to deploy Internet Explorer 11 (IE11)](ie11-deploy-guide/choose-how-to-deploy-ie11.md)
-#### [Deploy Internet Explorer 11 using Automatic Version Synchronization (AVS)](ie11-deploy-guide/deploy-ie11-using-automatic-version-synchronization-avs.md)
-#### [Deploy Internet Explorer 11 using software distribution tools](ie11-deploy-guide/deploy-ie11-using-software-distribution-tools.md)
-### [Virtualization and compatibility with Internet Explorer 11](ie11-deploy-guide/virtualization-and-compatibility-with-ie11.md)
-
-## [Collect data using Enterprise Site Discovery](ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md)
-
-## [Enterprise Mode for Internet Explorer 11 (IE11)](ie11-deploy-guide/enterprise-mode-overview-for-ie11.md)
-### [Tips and tricks to manage Internet Explorer compatibility](ie11-deploy-guide/tips-and-tricks-to-manage-ie-compatibility.md)
-### [Enterprise Mode and the Enterprise Mode Site List](ie11-deploy-guide/what-is-enterprise-mode.md)
-### [Set up Enterprise Mode logging and data collection](ie11-deploy-guide/set-up-enterprise-mode-logging-and-data-collection.md)
-### [Turn on Enterprise Mode and use a site list](ie11-deploy-guide/turn-on-enterprise-mode-and-use-a-site-list.md)
-### [Enterprise Mode schema v.2 guidance](ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md)
-### [Enterprise Mode schema v.1 guidance](ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md)
-### [Check for a new Enterprise Mode site list xml file](ie11-deploy-guide/check-for-new-enterprise-mode-site-list-xml-file.md)
-### [Turn on local control and logging for Enterprise Mode](ie11-deploy-guide/turn-on-local-control-and-logging-for-enterprise-mode.md)
-### [Use the Enterprise Mode Site List Manager](ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md)
-#### [Add single sites to the Enterprise Mode site list using the Enterprise Mode Site List Manager (schema v.2)](ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-2-enterprise-mode-tool.md)
-#### [Add single sites to the Enterprise Mode site list using the Enterprise Mode Site List Manager (schema v.1)](ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md)
-#### [Add multiple sites to the Enterprise Mode site list using a file and the Enterprise Mode Site List Manager (schema v.2)](ie11-deploy-guide/add-multiple-sites-to-enterprise-mode-site-list-using-the-version-2-schema-and-enterprise-mode-tool.md)
-#### [Add multiple sites to the Enterprise Mode site list using a file and the Enterprise Mode Site List Manager (schema v.1)](ie11-deploy-guide/add-multiple-sites-to-enterprise-mode-site-list-using-the-version-1-schema-and-enterprise-mode-tool.md)
-#### [Edit the Enterprise Mode site list using the Enterprise Mode Site List Manager](ie11-deploy-guide/edit-the-enterprise-mode-site-list-using-the-enterprise-mode-site-list-manager.md)
-#### [Fix validation problems using the Enterprise Mode Site List Manager](ie11-deploy-guide/fix-validation-problems-using-the-enterprise-mode-site-list-manager.md)
-#### [Search your Enterprise Mode site list in the Enterprise Mode Site List Manager](ie11-deploy-guide/search-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md)
-#### [Save your site list to XML in the Enterprise Mode Site List Manager](ie11-deploy-guide/save-your-site-list-to-xml-in-the-enterprise-mode-site-list-manager.md)
-#### [Export your Enterprise Mode site list from the Enterprise Mode Site List Manager](ie11-deploy-guide/export-your-enterprise-mode-site-list-from-the-enterprise-mode-site-list-manager.md)
-#### [Import your Enterprise Mode site list to the Enterprise Mode Site List Manager](ie11-deploy-guide/import-into-the-enterprise-mode-site-list-manager.md)
-#### [Delete sites from your Enterprise Mode site list in the Enterprise Mode Site List Manager](ie11-deploy-guide/delete-sites-from-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md)
-#### [Remove all sites from your Enterprise Mode site list in the Enterprise Mode Site List Manager](ie11-deploy-guide/remove-all-sites-from-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md)
-#### [Review neutral sites for Internet Explorer mode using the Enterprise Mode Site List Manager](ie11-deploy-guide/review-neutral-sites-with-site-list-manager.md)
-### [Use the Enterprise Mode Site List Portal](ie11-deploy-guide/use-the-enterprise-mode-portal.md)
-#### [Set up the Enterprise Mode Site List Portal](ie11-deploy-guide/set-up-enterprise-mode-portal.md)
-##### [Use the Settings page to finish setting up the Enterprise Mode Site List Portal](ie11-deploy-guide/configure-settings-enterprise-mode-portal.md)
-##### [Add employees to the Enterprise Mode Site List Portal](ie11-deploy-guide/add-employees-enterprise-mode-portal.md)
-#### [Workflow-based processes for employees using the Enterprise Mode Site List Portal](ie11-deploy-guide/workflow-processes-enterprise-mode-portal.md)
-##### [Create a change request using the Enterprise Mode Site List Portal](ie11-deploy-guide/create-change-request-enterprise-mode-portal.md)
-##### [Verify your changes using the Enterprise Mode Site List Portal](ie11-deploy-guide/verify-changes-preprod-enterprise-mode-portal.md)
-##### [Approve a change request using the Enterprise Mode Site List Portal](ie11-deploy-guide/approve-change-request-enterprise-mode-portal.md)
-##### [Schedule approved change requests for production using the Enterprise Mode Site List Portal](ie11-deploy-guide/schedule-production-change-enterprise-mode-portal.md)
-##### [Verify the change request update in the production environment using the Enterprise Mode Site List Portal](ie11-deploy-guide/verify-changes-production-enterprise-mode-portal.md)
-##### [View the apps currently on the Enterprise Mode Site List](ie11-deploy-guide/view-apps-enterprise-mode-site-list.md)
-##### [View the available Enterprise Mode reports from the Enterprise Mode Site List Portal](ie11-deploy-guide/view-enterprise-mode-reports-for-portal.md)
-### [Using IE7 Enterprise Mode or IE8 Enterprise Mode](ie11-deploy-guide/using-enterprise-mode.md)
-### [Fix web compatibility issues using document modes and the Enterprise Mode site list](ie11-deploy-guide/fix-compat-issues-with-doc-modes-and-enterprise-mode-site-list.md)
-### [Remove sites from a local Enterprise Mode site list](ie11-deploy-guide/remove-sites-from-a-local-enterprise-mode-site-list.md)
-### [Remove sites from a local compatibility view list](ie11-deploy-guide/remove-sites-from-a-local-compatibililty-view-list.md)
-### [Turn off Enterprise Mode](ie11-deploy-guide/turn-off-enterprise-mode.md)
-
-
-## [Group Policy and Internet Explorer 11 (IE11)](ie11-deploy-guide/group-policy-and-ie11.md)
-### [Group Policy management tools](ie11-deploy-guide/group-policy-objects-and-ie11.md)
-#### [Group Policy and the Group Policy Management Console (GPMC)](ie11-deploy-guide/group-policy-and-group-policy-mgmt-console-ie11.md)
-#### [Group Policy and the Local Group Policy Editor](ie11-deploy-guide/group-policy-and-local-group-policy-editor-ie11.md)
-#### [Group Policy and Advanced Group Policy Management (AGPM)](ie11-deploy-guide/group-policy-and-advanced-group-policy-mgmt-ie11.md)
-#### [Group Policy and Windows Powershell](ie11-deploy-guide/group-policy-windows-powershell-ie11.md)
-#### [Group Policy and Shortcut Extensions](ie11-deploy-guide/group-policy-shortcut-extensions-ie11.md)
-### [New group policy settings for Internet Explorer 11](ie11-deploy-guide/new-group-policy-settings-for-ie11.md)
-### [Set the default browser using Group Policy](ie11-deploy-guide/set-the-default-browser-using-group-policy.md)
-### [ActiveX installation using group policy](ie11-deploy-guide/activex-installation-using-group-policy.md)
-### [Group Policy and compatibility with Internet Explorer 11](ie11-deploy-guide/group-policy-compatibility-with-ie11.md)
-### [Group policy preferences and Internet Explorer 11](ie11-deploy-guide/group-policy-preferences-and-ie11.md)
-### [Administrative templates and Internet Explorer 11](ie11-deploy-guide/administrative-templates-and-ie11.md)
-### [Enable and disable add-ons using administrative templates and group policy](ie11-deploy-guide/enable-and-disable-add-ons-using-administrative-templates-and-group-policy.md)
-
-## [Manage Internet Explorer 11](ie11-deploy-guide/manage-ie11-overview.md)
-### [Auto detect settings Internet Explorer 11](ie11-deploy-guide/auto-detect-settings-for-ie11.md)
-### [Auto configuration settings for Internet Explorer 11](ie11-deploy-guide/auto-configuration-settings-for-ie11.md)
-### [Auto proxy configuration settings for Internet Explorer 11](ie11-deploy-guide/auto-proxy-configuration-settings-for-ie11.md)
-
-## [Troubleshoot Internet Explorer 11 (IE11)](ie11-deploy-guide/troubleshoot-ie11.md)
-### [Setup problems with Internet Explorer 11](ie11-deploy-guide/setup-problems-with-ie11.md)
-### [Install problems with Internet Explorer 11](ie11-deploy-guide/install-problems-with-ie11.md)
-### [Problems after installing Internet Explorer 11](ie11-deploy-guide/problems-after-installing-ie11.md)
-### [Auto configuration and auto proxy problems with Internet Explorer 11](ie11-deploy-guide/auto-configuration-and-auto-proxy-problems-with-ie11.md)
-### [User interface problems with Internet Explorer 11](ie11-deploy-guide/user-interface-problems-with-ie11.md)
-### [Group Policy problems with Internet Explorer 11](ie11-deploy-guide/group-policy-problems-ie11.md)
-### [.NET Framework problems with Internet Explorer 11](ie11-deploy-guide/net-framework-problems-with-ie11.md)
-### [Enhanced Protected Mode problems with Internet Explorer](ie11-deploy-guide/enhanced-protected-mode-problems-with-ie11.md)
-### [Fix font rendering problems by turning off natural metrics](ie11-deploy-guide/turn-off-natural-metrics.md)
-### [Intranet problems with Internet Explorer 11](ie11-deploy-guide/intranet-problems-and-ie11.md)
-### [Browser cache changes and roaming profiles](ie11-deploy-guide/browser-cache-changes-and-roaming-profiles.md)
-
-## [Out-of-date ActiveX control blocking](ie11-deploy-guide/out-of-date-activex-control-blocking.md)
-### [Blocked out-of-date ActiveX controls](ie11-deploy-guide/blocked-out-of-date-activex-controls.md)
-
-## [Deprecated document modes and Internet Explorer 11](ie11-deploy-guide/deprecated-document-modes.md)
-
-## [What is the Internet Explorer 11 Blocker Toolkit?](ie11-deploy-guide/what-is-the-internet-explorer-11-blocker-toolkit.md)
-### [Internet Explorer 11 delivery through automatic updates](ie11-deploy-guide/ie11-delivery-through-automatic-updates.md)
-### [Internet Explorer 11 Blocker Toolkit FAQ](ie11-faq/faq-ie11-blocker-toolkit.md)
-
-## [Missing Internet Explorer Maintenance settings for Internet Explorer 11](ie11-deploy-guide/missing-internet-explorer-maintenance-settings-for-ie11.md)
-
-## [Missing the Compatibility View Button](ie11-deploy-guide/missing-the-compatibility-view-button.md)
-
-## [Deploy pinned websites using Microsoft Deployment Toolkit (MDT) 2013](ie11-deploy-guide/deploy-pinned-sites-using-mdt-2013.md)
-
-# [IE11 Frequently Asked Questions (FAQ) Guide for IT Pros](ie11-faq/faq-for-it-pros-ie11.md)
-
-# [Internet Explorer Administration Kit 11 (IEAK 11) - Administration Guide for IT Pros](ie11-ieak/index.md)
-## [What IEAK can do for you](ie11-ieak/what-ieak-can-do-for-you.md)
-## [Internet Explorer Administration Kit (IEAK) information and downloads](ie11-ieak/ieak-information-and-downloads.md)
-## [Before you start using IEAK 11](ie11-ieak/before-you-create-custom-pkgs-ieak11.md)
-### [Hardware and software requirements for IEAK 11](ie11-ieak/hardware-and-software-reqs-ieak11.md)
-### [Determine the licensing version and features to use in IEAK 11](ie11-ieak/licensing-version-and-features-ieak11.md)
-### [Security features and IEAK 11](ie11-ieak/security-and-ieak11.md)
-### [File types used or created by IEAK 11](ie11-ieak/file-types-ieak11.md)
-### [Tasks and references to consider before creating and deploying custom packages using IEAK 11](ie11-ieak/create-manage-deploy-custom-pkgs-ieak11.md)
-### [Create the build computer folder structure using IEAK 11](ie11-ieak/create-build-folder-structure-ieak11.md)
-### [Set up auto detection for DHCP or DNS servers using IEAK 11](ie11-ieak/auto-detection-dhcp-or-dns-servers-ieak11.md)
-### [Use proxy auto-configuration (.pac) files with IEAK 11](ie11-ieak/proxy-auto-config-examples.md)
-### [Customize the toolbar button and Favorites List icons using IEAK 11](ie11-ieak/guidelines-toolbar-and-favorites-list-ieak11.md)
-### [Use the uninstallation .INF files to uninstall custom components](ie11-ieak/create-uninstall-inf-files-for-custom-components.md)
-### [Add and approve ActiveX controls using the IEAK 11](ie11-ieak/add-and-approve-activex-controls-ieak11.md)
-### [Register an uninstall app for custom components using IEAK 11](ie11-ieak/register-uninstall-app-ieak11.md)
-### [Customize Automatic Search for Internet Explorer using IEAK 11](ie11-ieak/customize-automatic-search-for-ie.md)
-### [Create multiple versions of your custom package using IEAK 11](ie11-ieak/create-multiple-browser-packages-ieak11.md)
-### [Before you install your package over your network using IEAK 11](ie11-ieak/prep-network-install-with-ieak11.md)
-### [Use the RSoP snap-in to review policy settings](ie11-ieak/rsop-snapin-for-policy-settings-ieak11.md)
-### [IEAK 11 - Frequently Asked Questions](ie11-faq/faq-ieak11.md)
-### [Troubleshoot custom package and IEAK 11 problems](ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md)
-
-## [Internet Explorer Administration Kit 11 (IEAK 11) Customization Wizard options](ie11-ieak/ieak11-wizard-custom-options.md)
-### [Use the File Locations page in the IEAK 11 Wizard](ie11-ieak/file-locations-ieak11-wizard.md)
-### [Use the Platform Selection page in the IEAK 11 Wizard](ie11-ieak/platform-selection-ieak11-wizard.md)
-### [Use the Language Selection page in the IEAK 11 Wizard](ie11-ieak/language-selection-ieak11-wizard.md)
-### [Use the Package Type Selection page in the IEAK 11 Wizard](ie11-ieak/pkg-type-selection-ieak11-wizard.md)
-### [Use the Feature Selection page in the IEAK 11 Wizard](ie11-ieak/feature-selection-ieak11-wizard.md)
-### [Use the Automatic Version Synchronization page in the IEAK 11 Wizard](ie11-ieak/auto-version-sync-ieak11-wizard.md)
-### [Use the Custom Components page in the IEAK 11 Wizard](ie11-ieak/custom-components-ieak11-wizard.md)
-### [Use the Internal Install page in the IEAK 11 Wizard](ie11-ieak/internal-install-ieak11-wizard.md)
-### [Use the User Experience page in the IEAK 11 Wizard](ie11-ieak/user-experience-ieak11-wizard.md)
-### [Use the Browser User Interface page in the IEAK 11 Wizard](ie11-ieak/browser-ui-ieak11-wizard.md)
-### [Use the Search Providers page in the IEAK 11 Wizard](ie11-ieak/search-providers-ieak11-wizard.md)
-### [Use the Important URLs - Home Page and Support page in the IEAK 11 Wizard](ie11-ieak/important-urls-home-page-and-support-ieak11-wizard.md)
-### [Use the Accelerators page in the IEAK 11 Wizard](ie11-ieak/accelerators-ieak11-wizard.md)
-### [Use the Favorites, Favorites Bar, and Feeds page in the IEAK 11 Wizard](ie11-ieak/favorites-favoritesbar-and-feeds-ieak11-wizard.md)
-### [Use the Browsing Options page in the IEAK 11 Wizard](ie11-ieak/browsing-options-ieak11-wizard.md)
-### [Use the First Run Wizard and Welcome Page Options page in the IEAK 11 Wizard](ie11-ieak/first-run-and-welcome-page-ieak11-wizard.md)
-### [Use the Compatibility View page in the IEAK 11 Wizard](ie11-ieak/compat-view-ieak11-wizard.md)
-### [Use the Connection Manager page in the IEAK 11 Wizard](ie11-ieak/connection-mgr-ieak11-wizard.md)
-### [Use the Connection Settings page in the IEAK 11 Wizard](ie11-ieak/connection-settings-ieak11-wizard.md)
-### [Use the Automatic Configuration page in the IEAK 11 Wizard](ie11-ieak/auto-config-ieak11-wizard.md)
-### [Use the Proxy Settings page in the IEAK 11 Wizard](ie11-ieak/proxy-settings-ieak11-wizard.md)
-### [Use the Security and Privacy Settings page in the IEAK 11 Wizard](ie11-ieak/security-and-privacy-settings-ieak11-wizard.md)
-### [Use the Add a Root Certificate page in the IEAK 11 Wizard](ie11-ieak/add-root-certificate-ieak11-wizard.md)
-### [Use the Programs page in the IEAK 11 Wizard](ie11-ieak/programs-ieak11-wizard.md)
-### [Use the Additional Settings page in the IEAK 11 Wizard](ie11-ieak/additional-settings-ieak11-wizard.md)
-### [Use the Wizard Complete - Next Steps page in the IEAK 11 Wizard](ie11-ieak/wizard-complete-ieak11-wizard.md)
-
-## [Using Internet Settings (.INS) files with IEAK 11](ie11-ieak/using-internet-settings-ins-files.md)
-### [Use the Branding .INS file to create custom branding and setup info](ie11-ieak/branding-ins-file-setting.md)
-### [Use the BrowserToolbars .INS file to customize the Internet Explorer toolbar](ie11-ieak/browsertoolbars-ins-file-setting.md)
-### [Use the CabSigning .INS file to review the digital signatures for your apps](ie11-ieak/cabsigning-ins-file-setting.md)
-### [Use the ConnectionSettings .INS file to review the network connections for install](ie11-ieak/connectionsettings-ins-file-setting.md)
-### [Use the CustomBranding .INS file to specify the custom branding location](ie11-ieak/custombranding-ins-file-setting.md)
-### [Use the ExtRegInf .INS file to specify installation files and mode](ie11-ieak/extreginf-ins-file-setting.md)
-### [Use the FavoritesEx .INS file for your Favorites icon and URLs](ie11-ieak/favoritesex-ins-file-setting.md)
-### [Use the HideCustom .INS file to hide GUIDs](ie11-ieak/hidecustom-ins-file-setting.md)
-### [Use the ISP_Security .INS file to add your root certificate](ie11-ieak/isp-security-ins-file-setting.md)
-### [Use the Media .INS file to specify your install media](ie11-ieak/media-ins-file-setting.md)
-### [Use the Proxy .INS file to specify a proxy server](ie11-ieak/proxy-ins-file-setting.md)
-### [Use the Security Imports .INS file to import security info](ie11-ieak/security-imports-ins-file-setting.md)
-### [Use the URL .INS file to use an auto-configured proxy server](ie11-ieak/url-ins-file-setting.md)
-
-## [IExpress Wizard for Windows Server 2008 R2 with SP1](ie11-ieak/iexpress-wizard-for-win-server.md)
-### [IExpress Wizard command-line options](ie11-ieak/iexpress-command-line-options.md)
-### [Internet Explorer Setup command-line options and return codes](ie11-ieak/ie-setup-command-line-options-and-return-codes.md)
-
-## KB Troubleshoot
-### [Internet Explorer and Microsoft Edge FAQ for IT Pros](kb-support/ie-edge-faqs.md)
diff --git a/browsers/internet-explorer/TOC.yml b/browsers/internet-explorer/TOC.yml
new file mode 100644
index 0000000000..1b8fbcaecf
--- /dev/null
+++ b/browsers/internet-explorer/TOC.yml
@@ -0,0 +1,359 @@
+- name: IE11 Deployment Guide for IT Pros
+ href: ie11-deploy-guide/index.md
+ items:
+ - name: Change history for the Internet Explorer 11 (IE11) Deployment Guide
+ href: ie11-deploy-guide/change-history-for-internet-explorer-11.md
+ - name: System requirements and language support for Internet Explorer 11
+ href: ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md
+ - name: List of updated features and tools - Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/updated-features-and-tools-with-ie11.md
+ - name: Install and Deploy Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/install-and-deploy-ie11.md
+ items:
+ - name: Customize Internet Explorer 11 installation packages
+ href: ie11-deploy-guide/customize-ie11-install-packages.md
+ items:
+ - name: Using IEAK 11 to create packages
+ href: ie11-deploy-guide/using-ieak11-to-create-install-packages.md
+ - name: Create packages for multiple operating systems or languages
+ href: ie11-deploy-guide/create-install-packages-for-multiple-operating-systems-or-languages.md
+ - name: Using .INF files to create packages
+ href: ie11-deploy-guide/using-inf-files-to-create-install-packages.md
+ - name: Choose how to install Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/choose-how-to-install-ie11.md
+ items:
+ - name: Install Internet Explorer 11 (IE11) - System Center 2012 R2 Configuration Manager
+ href: ie11-deploy-guide/install-ie11-using-system-center-configuration-manager.md
+ - name: Install Internet Explorer 11 (IE11) - Windows Server Update Services (WSUS)
+ href: ie11-deploy-guide/install-ie11-using-windows-server-update-services-wsus.md
+ - name: Install Internet Explorer 11 (IE11) - Microsoft Intune
+ href: ie11-deploy-guide/install-ie11-using-microsoft-intune.md
+ - name: Install Internet Explorer 11 (IE11) - Network
+ href: ie11-deploy-guide/install-ie11-using-the-network.md
+ - name: Install Internet Explorer 11 (IE11) - Operating system deployment systems
+ href: ie11-deploy-guide/install-ie11-using-operating-system-deployment-systems.md
+ - name: Install Internet Explorer 11 (IE11) - Third-party tools
+ href: ie11-deploy-guide/install-ie11-using-third-party-tools.md
+ - name: Choose how to deploy Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/choose-how-to-deploy-ie11.md
+ items:
+ - name: Deploy Internet Explorer 11 using Automatic Version Synchronization (AVS)
+ href: ie11-deploy-guide/deploy-ie11-using-automatic-version-synchronization-avs.md
+ - name: Deploy Internet Explorer 11 using software distribution tools
+ href: ie11-deploy-guide/deploy-ie11-using-software-distribution-tools.md
+ - name: Virtualization and compatibility with Internet Explorer 11
+ href: ie11-deploy-guide/virtualization-and-compatibility-with-ie11.md
+ - name: Collect data using Enterprise Site Discovery
+ href: ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md
+ - name: Enterprise Mode for Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/enterprise-mode-overview-for-ie11.md
+ items:
+ - name: Tips and tricks to manage Internet Explorer compatibility
+ href: ie11-deploy-guide/tips-and-tricks-to-manage-ie-compatibility.md
+ - name: Enterprise Mode and the Enterprise Mode Site List
+ href: ie11-deploy-guide/what-is-enterprise-mode.md
+ - name: Set up Enterprise Mode logging and data collection
+ href: ie11-deploy-guide/set-up-enterprise-mode-logging-and-data-collection.md
+ - name: Turn on Enterprise Mode and use a site list
+ href: ie11-deploy-guide/turn-on-enterprise-mode-and-use-a-site-list.md
+ - name: Enterprise Mode schema v.2 guidance
+ href: ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md
+ - name: Enterprise Mode schema v.1 guidance
+ href: ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md
+ - name: Check for a new Enterprise Mode site list xml file
+ href: ie11-deploy-guide/check-for-new-enterprise-mode-site-list-xml-file.md
+ - name: Turn on local control and logging for Enterprise Mode
+ href: ie11-deploy-guide/turn-on-local-control-and-logging-for-enterprise-mode.md
+ - name: Use the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md
+ items:
+ - name: Add single sites to the Enterprise Mode site list using the Enterprise Mode Site List Manager (schema v.2)
+ href: ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-2-enterprise-mode-tool.md
+ - name: Add single sites to the Enterprise Mode site list using the Enterprise Mode Site List Manager (schema v.1)
+ href: ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md
+ - name: Add multiple sites to the Enterprise Mode site list using a file and the Enterprise Mode Site List Manager (schema v.2)
+ href: ie11-deploy-guide/add-multiple-sites-to-enterprise-mode-site-list-using-the-version-2-schema-and-enterprise-mode-tool.md
+ - name: Add multiple sites to the Enterprise Mode site list using a file and the Enterprise Mode Site List Manager (schema v.1)
+ href: ie11-deploy-guide/add-multiple-sites-to-enterprise-mode-site-list-using-the-version-1-schema-and-enterprise-mode-tool.md
+ - name: Edit the Enterprise Mode site list using the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/edit-the-enterprise-mode-site-list-using-the-enterprise-mode-site-list-manager.md
+ - name: Fix validation problems using the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/fix-validation-problems-using-the-enterprise-mode-site-list-manager.md
+ - name: Search your Enterprise Mode site list in the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/search-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md
+ - name: Save your site list to XML in the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/save-your-site-list-to-xml-in-the-enterprise-mode-site-list-manager.md
+ - name: Export your Enterprise Mode site list from the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/export-your-enterprise-mode-site-list-from-the-enterprise-mode-site-list-manager.md
+ - name: Import your Enterprise Mode site list to the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/import-into-the-enterprise-mode-site-list-manager.md
+ - name: Delete sites from your Enterprise Mode site list in the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/delete-sites-from-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md
+ - name: Remove all sites from your Enterprise Mode site list in the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/remove-all-sites-from-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md
+ - name: Review neutral sites for Internet Explorer mode using the Enterprise Mode Site List Manager
+ href: ie11-deploy-guide/review-neutral-sites-with-site-list-manager.md
+ - name: Use the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/use-the-enterprise-mode-portal.md
+ items:
+ - name: Set up the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/set-up-enterprise-mode-portal.md
+ items:
+ - name: Use the Settings page to finish setting up the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/configure-settings-enterprise-mode-portal.md
+ - name: Add employees to the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/add-employees-enterprise-mode-portal.md
+ - name: Workflow-based processes for employees using the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/workflow-processes-enterprise-mode-portal.md
+ items:
+ - name: Create a change request using the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/create-change-request-enterprise-mode-portal.md
+ - name: Verify your changes using the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/verify-changes-preprod-enterprise-mode-portal.md
+ - name: Approve a change request using the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/approve-change-request-enterprise-mode-portal.md
+ - name: Schedule approved change requests for production using the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/schedule-production-change-enterprise-mode-portal.md
+ - name: Verify the change request update in the production environment using the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/verify-changes-production-enterprise-mode-portal.md
+ - name: View the apps currently on the Enterprise Mode Site List
+ href: ie11-deploy-guide/view-apps-enterprise-mode-site-list.md
+ - name: View the available Enterprise Mode reports from the Enterprise Mode Site List Portal
+ href: ie11-deploy-guide/view-enterprise-mode-reports-for-portal.md
+ - name: Using IE7 Enterprise Mode or IE8 Enterprise Mode
+ href: ie11-deploy-guide/using-enterprise-mode.md
+ - name: Fix web compatibility issues using document modes and the Enterprise Mode site list
+ href: ie11-deploy-guide/fix-compat-issues-with-doc-modes-and-enterprise-mode-site-list.md
+ - name: Remove sites from a local Enterprise Mode site list
+ href: ie11-deploy-guide/remove-sites-from-a-local-enterprise-mode-site-list.md
+ - name: Remove sites from a local compatibility view list
+ href: ie11-deploy-guide/remove-sites-from-a-local-compatibililty-view-list.md
+ - name: Turn off Enterprise Mode
+ href: ie11-deploy-guide/turn-off-enterprise-mode.md
+ - name: Group Policy and Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/group-policy-and-ie11.md
+ items:
+ - name: Group Policy management tools
+ href: ie11-deploy-guide/group-policy-objects-and-ie11.md
+ items:
+ - name: Group Policy and the Group Policy Management Console (GPMC)
+ href: ie11-deploy-guide/group-policy-and-group-policy-mgmt-console-ie11.md
+ - name: Group Policy and the Local Group Policy Editor
+ href: ie11-deploy-guide/group-policy-and-local-group-policy-editor-ie11.md
+ - name: Group Policy and Advanced Group Policy Management (AGPM)
+ href: ie11-deploy-guide/group-policy-and-advanced-group-policy-mgmt-ie11.md
+ - name: Group Policy and Windows Powershell
+ href: ie11-deploy-guide/group-policy-windows-powershell-ie11.md
+ - name: Group Policy and Shortcut Extensions
+ href: ie11-deploy-guide/group-policy-shortcut-extensions-ie11.md
+ - name: New group policy settings for Internet Explorer 11
+ href: ie11-deploy-guide/new-group-policy-settings-for-ie11.md
+ - name: Set the default browser using Group Policy
+ href: ie11-deploy-guide/set-the-default-browser-using-group-policy.md
+ - name: ActiveX installation using group policy
+ href: ie11-deploy-guide/activex-installation-using-group-policy.md
+ - name: Group Policy and compatibility with Internet Explorer 11
+ href: ie11-deploy-guide/group-policy-compatibility-with-ie11.md
+ - name: Group policy preferences and Internet Explorer 11
+ href: ie11-deploy-guide/group-policy-preferences-and-ie11.md
+ - name: Administrative templates and Internet Explorer 11
+ href: ie11-deploy-guide/administrative-templates-and-ie11.md
+ - name: Enable and disable add-ons using administrative templates and group policy
+ href: ie11-deploy-guide/enable-and-disable-add-ons-using-administrative-templates-and-group-policy.md
+ - name: Manage Internet Explorer 11
+ href: ie11-deploy-guide/manage-ie11-overview.md
+ items:
+ - name: Auto detect settings Internet Explorer 11
+ href: ie11-deploy-guide/auto-detect-settings-for-ie11.md
+ - name: Auto configuration settings for Internet Explorer 11
+ href: ie11-deploy-guide/auto-configuration-settings-for-ie11.md
+ - name: Auto proxy configuration settings for Internet Explorer 11
+ href: ie11-deploy-guide/auto-proxy-configuration-settings-for-ie11.md
+ - name: Troubleshoot Internet Explorer 11 (IE11)
+ href: ie11-deploy-guide/troubleshoot-ie11.md
+ items:
+ - name: Setup problems with Internet Explorer 11
+ href: ie11-deploy-guide/setup-problems-with-ie11.md
+ - name: Install problems with Internet Explorer 11
+ href: ie11-deploy-guide/install-problems-with-ie11.md
+ - name: Problems after installing Internet Explorer 11
+ href: ie11-deploy-guide/problems-after-installing-ie11.md
+ - name: Auto configuration and auto proxy problems with Internet Explorer 11
+ href: ie11-deploy-guide/auto-configuration-and-auto-proxy-problems-with-ie11.md
+ - name: User interface problems with Internet Explorer 11
+ href: ie11-deploy-guide/user-interface-problems-with-ie11.md
+ - name: Group Policy problems with Internet Explorer 11
+ href: ie11-deploy-guide/group-policy-problems-ie11.md
+ - name: .NET Framework problems with Internet Explorer 11
+ href: ie11-deploy-guide/net-framework-problems-with-ie11.md
+ - name: Enhanced Protected Mode problems with Internet Explorer
+ href: ie11-deploy-guide/enhanced-protected-mode-problems-with-ie11.md
+ - name: Fix font rendering problems by turning off natural metrics
+ href: ie11-deploy-guide/turn-off-natural-metrics.md
+ - name: Intranet problems with Internet Explorer 11
+ href: ie11-deploy-guide/intranet-problems-and-ie11.md
+ - name: Browser cache changes and roaming profiles
+ href: ie11-deploy-guide/browser-cache-changes-and-roaming-profiles.md
+ - name: Out-of-date ActiveX control blocking
+ href: ie11-deploy-guide/out-of-date-activex-control-blocking.md
+ items:
+ - name: Blocked out-of-date ActiveX controls
+ href: ie11-deploy-guide/blocked-out-of-date-activex-controls.md
+ - name: Deprecated document modes and Internet Explorer 11
+ href: ie11-deploy-guide/deprecated-document-modes.md
+ - name: What is the Internet Explorer 11 Blocker Toolkit?
+ href: ie11-deploy-guide/what-is-the-internet-explorer-11-blocker-toolkit.md
+ items:
+ - name: Internet Explorer 11 delivery through automatic updates
+ href: ie11-deploy-guide/ie11-delivery-through-automatic-updates.md
+ - name: Internet Explorer 11 Blocker Toolkit FAQ
+ href: ie11-faq/faq-ie11-blocker-toolkit.yml
+ - name: Missing Internet Explorer Maintenance settings for Internet Explorer 11
+ href: ie11-deploy-guide/missing-internet-explorer-maintenance-settings-for-ie11.md
+ - name: Missing the Compatibility View Button
+ href: ie11-deploy-guide/missing-the-compatibility-view-button.md
+ - name: Deploy pinned websites using Microsoft Deployment Toolkit (MDT) 2013
+ href: ie11-deploy-guide/deploy-pinned-sites-using-mdt-2013.md
+- name: IE11 Frequently Asked Questions (FAQ) Guide for IT Pros
+ href: ie11-faq/faq-for-it-pros-ie11.yml
+- name: Internet Explorer Administration Kit 11 (IEAK 11) - Administration Guide for IT Pros
+ href: ie11-ieak/index.md
+ items:
+ - name: What IEAK can do for you
+ href: ie11-ieak/what-ieak-can-do-for-you.md
+ - name: Internet Explorer Administration Kit (IEAK) information and downloads
+ href: ie11-ieak/ieak-information-and-downloads.md
+ - name: Before you start using IEAK 11
+ href: ie11-ieak/before-you-create-custom-pkgs-ieak11.md
+ items:
+ - name: Hardware and software requirements for IEAK 11
+ href: ie11-ieak/hardware-and-software-reqs-ieak11.md
+ - name: Determine the licensing version and features to use in IEAK 11
+ href: ie11-ieak/licensing-version-and-features-ieak11.md
+ - name: Security features and IEAK 11
+ href: ie11-ieak/security-and-ieak11.md
+ - name: File types used or created by IEAK 11
+ href: ie11-ieak/file-types-ieak11.md
+ - name: Tasks and references to consider before creating and deploying custom packages using IEAK 11
+ href: ie11-ieak/create-manage-deploy-custom-pkgs-ieak11.md
+ - name: Create the build computer folder structure using IEAK 11
+ href: ie11-ieak/create-build-folder-structure-ieak11.md
+ - name: Set up auto detection for DHCP or DNS servers using IEAK 11
+ href: ie11-ieak/auto-detection-dhcp-or-dns-servers-ieak11.md
+ - name: Use proxy auto-configuration (.pac) files with IEAK 11
+ href: ie11-ieak/proxy-auto-config-examples.md
+ - name: Customize the toolbar button and Favorites List icons using IEAK 11
+ href: ie11-ieak/guidelines-toolbar-and-favorites-list-ieak11.md
+ - name: Use the uninstallation .INF files to uninstall custom components
+ href: ie11-ieak/create-uninstall-inf-files-for-custom-components.md
+ - name: Add and approve ActiveX controls using the IEAK 11
+ href: ie11-ieak/add-and-approve-activex-controls-ieak11.md
+ - name: Register an uninstall app for custom components using IEAK 11
+ href: ie11-ieak/register-uninstall-app-ieak11.md
+ - name: Customize Automatic Search for Internet Explorer using IEAK 11
+ href: ie11-ieak/customize-automatic-search-for-ie.md
+ - name: Create multiple versions of your custom package using IEAK 11
+ href: ie11-ieak/create-multiple-browser-packages-ieak11.md
+ - name: Before you install your package over your network using IEAK 11
+ href: ie11-ieak/prep-network-install-with-ieak11.md
+ - name: Use the RSoP snap-in to review policy settings
+ href: ie11-ieak/rsop-snapin-for-policy-settings-ieak11.md
+ - name: IEAK 11 - Frequently Asked Questions
+ href: ie11-faq/faq-ieak11.yml
+ - name: Troubleshoot custom package and IEAK 11 problems
+ href: ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md
+ - name: Internet Explorer Administration Kit 11 (IEAK 11) Customization Wizard options
+ href: ie11-ieak/ieak11-wizard-custom-options.md
+ items:
+ - name: Use the File Locations page in the IEAK 11 Wizard
+ href: ie11-ieak/file-locations-ieak11-wizard.md
+ - name: Use the Platform Selection page in the IEAK 11 Wizard
+ href: ie11-ieak/platform-selection-ieak11-wizard.md
+ - name: Use the Language Selection page in the IEAK 11 Wizard
+ href: ie11-ieak/language-selection-ieak11-wizard.md
+ - name: Use the Package Type Selection page in the IEAK 11 Wizard
+ href: ie11-ieak/pkg-type-selection-ieak11-wizard.md
+ - name: Use the Feature Selection page in the IEAK 11 Wizard
+ href: ie11-ieak/feature-selection-ieak11-wizard.md
+ - name: Use the Automatic Version Synchronization page in the IEAK 11 Wizard
+ href: ie11-ieak/auto-version-sync-ieak11-wizard.md
+ - name: Use the Custom Components page in the IEAK 11 Wizard
+ href: ie11-ieak/custom-components-ieak11-wizard.md
+ - name: Use the Internal Install page in the IEAK 11 Wizard
+ href: ie11-ieak/internal-install-ieak11-wizard.md
+ - name: Use the User Experience page in the IEAK 11 Wizard
+ href: ie11-ieak/user-experience-ieak11-wizard.md
+ - name: Use the Browser User Interface page in the IEAK 11 Wizard
+ href: ie11-ieak/browser-ui-ieak11-wizard.md
+ - name: Use the Search Providers page in the IEAK 11 Wizard
+ href: ie11-ieak/search-providers-ieak11-wizard.md
+ - name: Use the Important URLs - Home Page and Support page in the IEAK 11 Wizard
+ href: ie11-ieak/important-urls-home-page-and-support-ieak11-wizard.md
+ - name: Use the Accelerators page in the IEAK 11 Wizard
+ href: ie11-ieak/accelerators-ieak11-wizard.md
+ - name: Use the Favorites, Favorites Bar, and Feeds page in the IEAK 11 Wizard
+ href: ie11-ieak/favorites-favoritesbar-and-feeds-ieak11-wizard.md
+ - name: Use the Browsing Options page in the IEAK 11 Wizard
+ href: ie11-ieak/browsing-options-ieak11-wizard.md
+ - name: Use the First Run Wizard and Welcome Page Options page in the IEAK 11 Wizard
+ href: ie11-ieak/first-run-and-welcome-page-ieak11-wizard.md
+ - name: Use the Compatibility View page in the IEAK 11 Wizard
+ href: ie11-ieak/compat-view-ieak11-wizard.md
+ - name: Use the Connection Manager page in the IEAK 11 Wizard
+ href: ie11-ieak/connection-mgr-ieak11-wizard.md
+ - name: Use the Connection Settings page in the IEAK 11 Wizard
+ href: ie11-ieak/connection-settings-ieak11-wizard.md
+ - name: Use the Automatic Configuration page in the IEAK 11 Wizard
+ href: ie11-ieak/auto-config-ieak11-wizard.md
+ - name: Use the Proxy Settings page in the IEAK 11 Wizard
+ href: ie11-ieak/proxy-settings-ieak11-wizard.md
+ - name: Use the Security and Privacy Settings page in the IEAK 11 Wizard
+ href: ie11-ieak/security-and-privacy-settings-ieak11-wizard.md
+ - name: Use the Add a Root Certificate page in the IEAK 11 Wizard
+ href: ie11-ieak/add-root-certificate-ieak11-wizard.md
+ - name: Use the Programs page in the IEAK 11 Wizard
+ href: ie11-ieak/programs-ieak11-wizard.md
+ - name: Use the Additional Settings page in the IEAK 11 Wizard
+ href: ie11-ieak/additional-settings-ieak11-wizard.md
+ - name: Use the Wizard Complete - Next Steps page in the IEAK 11 Wizard
+ href: ie11-ieak/wizard-complete-ieak11-wizard.md
+ - name: Using Internet Settings (.INS) files with IEAK 11
+ href: ie11-ieak/using-internet-settings-ins-files.md
+ items:
+ - name: Use the Branding .INS file to create custom branding and setup info
+ href: ie11-ieak/branding-ins-file-setting.md
+ - name: Use the BrowserToolbars .INS file to customize the Internet Explorer toolbar
+ href: ie11-ieak/browsertoolbars-ins-file-setting.md
+ - name: Use the CabSigning .INS file to review the digital signatures for your apps
+ href: ie11-ieak/cabsigning-ins-file-setting.md
+ - name: Use the ConnectionSettings .INS file to review the network connections for install
+ href: ie11-ieak/connectionsettings-ins-file-setting.md
+ - name: Use the CustomBranding .INS file to specify the custom branding location
+ href: ie11-ieak/custombranding-ins-file-setting.md
+ - name: Use the ExtRegInf .INS file to specify installation files and mode
+ href: ie11-ieak/extreginf-ins-file-setting.md
+ - name: Use the FavoritesEx .INS file for your Favorites icon and URLs
+ href: ie11-ieak/favoritesex-ins-file-setting.md
+ - name: Use the HideCustom .INS file to hide GUIDs
+ href: ie11-ieak/hidecustom-ins-file-setting.md
+ - name: Use the ISP_Security .INS file to add your root certificate
+ href: ie11-ieak/isp-security-ins-file-setting.md
+ - name: Use the Media .INS file to specify your install media
+ href: ie11-ieak/media-ins-file-setting.md
+ - name: Use the Proxy .INS file to specify a proxy server
+ href: ie11-ieak/proxy-ins-file-setting.md
+ - name: Use the Security Imports .INS file to import security info
+ href: ie11-ieak/security-imports-ins-file-setting.md
+ - name: Use the URL .INS file to use an auto-configured proxy server
+ href: ie11-ieak/url-ins-file-setting.md
+ - name: IExpress Wizard for Windows Server 2008 R2 with SP1
+ href: ie11-ieak/iexpress-wizard-for-win-server.md
+ items:
+ - name: IExpress Wizard command-line options
+ href: ie11-ieak/iexpress-command-line-options.md
+ - name: Internet Explorer Setup command-line options and return codes
+ href: ie11-ieak/ie-setup-command-line-options-and-return-codes.md
+ - name: KB Troubleshoot
+ items:
+ - name: Internet Explorer and Microsoft Edge FAQ for IT Pros
+ href: kb-support/ie-edge-faqs.md
diff --git a/browsers/internet-explorer/ie11-deploy-guide/ie11-delivery-through-automatic-updates.md b/browsers/internet-explorer/ie11-deploy-guide/ie11-delivery-through-automatic-updates.md
index ba0ca09c45..cd8bea93d3 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/ie11-delivery-through-automatic-updates.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/ie11-delivery-through-automatic-updates.md
@@ -54,7 +54,7 @@ If you use Automatic Updates in your company, but want to stop your users from a
- **Download and use the Internet Explorer 11 Blocker Toolkit.** Includes a Group Policy template and a script that permanently blocks Internet Explorer 11 from being offered by Windows Update or Microsoft Update as a high-priority update. You can download this kit from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=40722).
> [!NOTE]
- > The toolkit won't stop users with local administrator accounts from manually installing Internet Explorer 11. Using this toolkit also prevents your users from receiving automatic upgrades from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11. For more information, see the [Internet Explorer 11 Blocker Toolkit frequently asked questions](../ie11-faq/faq-ie11-blocker-toolkit.md).
+ > The toolkit won't stop users with local administrator accounts from manually installing Internet Explorer 11. Using this toolkit also prevents your users from receiving automatic upgrades from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11. For more information, see the [Internet Explorer 11 Blocker Toolkit frequently asked questions](../ie11-faq/faq-ie11-blocker-toolkit.yml).
- **Use an update management solution to control update deployment.**
If you already use an update management solution, like [Windows Server Update Services (WSUS)](/windows-server/administration/windows-server-update-services/get-started/windows-server-update-services-wsus) or the more advanced [Microsoft Endpoint Configuration Manager](/previous-versions/system-center/system-center-2012-R2/gg682129(v=technet.10)), you should use that instead of the Internet Explorer Blocker Toolkit.
@@ -137,7 +137,7 @@ If you need to reset your Update Rollups packages to auto-approve, do this:
- [Internet Explorer 11 Blocker Toolkit download](https://www.microsoft.com/download/details.aspx?id=40722)
-- [Internet Explorer 11 FAQ for IT pros](../ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 FAQ for IT pros](../ie11-faq/faq-for-it-pros-ie11.yml)
- [Internet Explorer 11 delivery through automatic updates]()
diff --git a/browsers/internet-explorer/ie11-deploy-guide/index.md b/browsers/internet-explorer/ie11-deploy-guide/index.md
index 07567e994a..561c0f9983 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/index.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/index.md
@@ -60,6 +60,6 @@ IE11 offers differing experiences in Windows 8.1:
|Internet Explorer 11 or IE11 |The whole browser, which includes both IE and Internet Explorer for the desktop. |
## Related topics
-- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.yml)
- [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
- [Microsoft Edge - Deployment Guide for IT Pros](/microsoft-edge/deploy/)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-deploy-guide/updated-features-and-tools-with-ie11.md b/browsers/internet-explorer/ie11-deploy-guide/updated-features-and-tools-with-ie11.md
index ea71c2a358..ace67f0ddc 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/updated-features-and-tools-with-ie11.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/updated-features-and-tools-with-ie11.md
@@ -40,7 +40,7 @@ Internet Explorer 11 includes several new features and tools. This topic includ
- **Out-of-date ActiveX control blocking**. Helps to keep your ActiveX controls up-to-date, because malicious software (or malware) can target security flaws in outdated controls, damaging your computer by collecting info from it, installing unwanted software, or by letting someone else control it remotely. For more info, see [Out-of-date ActiveX control blocking](out-of-date-activex-control-blocking.md).
-- **Do Not Track (DNT) exceptions.** IE11 lets websites ask whether to track users as they browse a website. If the user approves the request, IE records an exception to the "Do Not Track" rule and sends headers to the website that allow tracking. By respecting these headers and requesting exceptions to the default privacy settings, website owners can develop a trusted relationship with their users about privacy. For more info, see [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.md).
+- **Do Not Track (DNT) exceptions.** IE11 lets websites ask whether to track users as they browse a website. If the user approves the request, IE records an exception to the "Do Not Track" rule and sends headers to the website that allow tracking. By respecting these headers and requesting exceptions to the default privacy settings, website owners can develop a trusted relationship with their users about privacy. For more info, see [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.yml).
- **IE Administration Kit (IEAK).** Lets you create custom, branded versions of IE11. For more info and to download the tool, see [Internet Explorer Administration Kit 11 (IEAK 11) - Administration Guide for IT Pros](../ie11-ieak/index.md).
diff --git a/browsers/internet-explorer/ie11-deploy-guide/what-is-the-internet-explorer-11-blocker-toolkit.md b/browsers/internet-explorer/ie11-deploy-guide/what-is-the-internet-explorer-11-blocker-toolkit.md
index ca0cff00f2..3ec3c7c763 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/what-is-the-internet-explorer-11-blocker-toolkit.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/what-is-the-internet-explorer-11-blocker-toolkit.md
@@ -50,7 +50,7 @@ Wait for the message, **Blocking deployment of IE11 on the local machine. The op
6. Close the Command Prompt.
-For answers to frequently asked questions, see [Internet Explorer 11 Blocker Toolkit: Frequently Asked Questions](../ie11-faq/faq-ie11-blocker-toolkit.md).
+For answers to frequently asked questions, see [Internet Explorer 11 Blocker Toolkit: Frequently Asked Questions](../ie11-faq/faq-ie11-blocker-toolkit.yml).
## Automatic updates
Internet Explorer 11 makes browsing the web faster, easier, safer, and more reliable than ever. To help customers become more secure and up-to-date, Microsoft will distribute Internet Explorer 11 through Automatic Updates and the Windows Update and Microsoft Update sites. Internet Explorer 11 will be available for users of the 32-bit and 64-bit versions of Windows 7 Service Pack 1 (SP1), and 64-bit version of Windows Server 2008 R2 SP1. This article provides an overview of the delivery process and options available for IT administrators to control how and when Internet Explorer 11 is deployed to their organization through Automatic Updates.
@@ -73,7 +73,7 @@ If you use Automatic Updates in your company, but want to stop your users from a
- **Download and use the Internet Explorer 11 Blocker Toolkit.** Includes a Group Policy template and a script that permanently blocks Internet Explorer 11 from being offered by Windows Update or Microsoft Update as a high-priority update. You can download this kit from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=40722).
> [!NOTE]
- >The toolkit won't stop users with local administrator accounts from manually installing Internet Explorer 11. Using this toolkit also prevents your users from receiving automatic upgrades from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11. For more information, see the [Internet Explorer 11 Blocker Toolkit frequently asked questions](../ie11-faq/faq-for-it-pros-ie11.md).
+ >The toolkit won't stop users with local administrator accounts from manually installing Internet Explorer 11. Using this toolkit also prevents your users from receiving automatic upgrades from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11. For more information, see the [Internet Explorer 11 Blocker Toolkit frequently asked questions](../ie11-faq/faq-for-it-pros-ie11.yml).
- **Use an update management solution to control update deployment.** If you already use an update management solution, like [Windows Server Update Services (WSUS)](/windows-server/administration/windows-server-update-services/get-started/windows-server-update-services-wsus) or the more advanced [System Center 2012 Configuration Manager](/previous-versions/system-center/system-center-2012-R2/gg682129(v=technet.10)), you should use that instead of the Internet Explorer Blocker Toolkit.
@@ -147,9 +147,9 @@ After the new Internet Explorer 11 package is available for download, you should
- [Internet Explorer 11 Blocker Toolkit download](https://www.microsoft.com/download/details.aspx?id=40722)
-- [Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions](../ie11-faq/faq-ie11-blocker-toolkit.md)
+- [Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions](../ie11-faq/faq-ie11-blocker-toolkit.yml)
-- [Internet Explorer 11 FAQ for IT pros](../ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 FAQ for IT pros](../ie11-faq/faq-for-it-pros-ie11.yml)
- [Internet Explorer 11 delivery through automatic updates](ie11-delivery-through-automatic-updates.md)
diff --git a/browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.md b/browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.md
deleted file mode 100644
index cd28b78b12..0000000000
--- a/browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.md
+++ /dev/null
@@ -1,207 +0,0 @@
----
-ms.localizationpriority: medium
-ms.mktglfcycl: explore
-description: Frequently asked questions about Internet Explorer 11 for IT Pros
-author: dansimp
-ms.prod: ie11
-ms.assetid: 140e7d33-584a-44da-8c68-6c1d568e1de3
-ms.reviewer:
-audience: itpro
-manager: dansimp
-ms.author: dansimp
-title: Internet Explorer 11 - FAQ for IT Pros (Internet Explorer 11 for IT Pros)
-ms.sitesec: library
-ms.date: 10/16/2017
----
-
-
-# Internet Explorer 11 - FAQ for IT Pros
-
-[!INCLUDE [Microsoft 365 workloads end of support for IE11](../includes/microsoft-365-ie-end-of-support.md)]
-
-Answering frequently asked questions about Internet Explorer 11 (IE11) features, operating system support, integration with the Windows operating system, Group Policy, and general configuration.
-
-## Frequently Asked Questions
-
-**Q: What operating system does IE11 run on?**
-
-- Windows 10
-
-- Windows 8.1
-
-- Windows Server 2012 R2
-
-- Windows 7 with Service Pack 1 (SP1)
-
-- Windows Server 2008 R2 with Service Pack 1 (SP1)
-
-
-**Q: How do I install IE11 on Windows 10, Windows 8.1, or Windows Server 2012 R2?**
-IE11 is preinstalled with Windows 8.1 and Windows Server 2012 R2. No additional action is required.
-
-**Q: How do I install IE11 on Windows 7 with SP1 or Windows Server 2008 R2 with SP1?**
-You can install IE11 on computers running either Windows 7 with SP1 or Windows Server 2008 R2 with SP1. To download IE11, see the IE11 [home page](https://go.microsoft.com/fwlink/p/?LinkId=290956).
-
-**Q: How does IE11 integrate with Windows 8.1?**
-IE11 is the default handler for the HTTP and HTTPS protocols and the default browser for Windows 8.1. There are two experiences in Windows 8.1: Internet Explorer and Internet Explorer for the desktop. IE is the default browser for touch-first, immersive experiences. Internet Explorer for the desktop provides a more traditional window and tab management experience. The underlying platform of IE11 is fully interoperable across both IE and the familiar Internet Explorer for the desktop, letting developers write the same markup for both experiences.
-
-**Q: What are the new or improved security features?**
-IE11 offers improvements to Enhanced Protected Mode, password manager, and other security features. IE11 also turns on Transport Layer Security (TLS) 1.2 by default.
-
-**Q: How is Microsoft supporting modern web standards, such as WebGL?**
-Microsoft is committed to providing an interoperable web by supporting modern web standards. Doing this lets developers use the same markup across web browsers, helping to reduce development and support costs.
-Supported web standards include:
-
-- Web Graphics Library (WebGL)
-
-- Canvas 2D L2 extensions, including image smoothing using the nearest neighbor, dashed lines, and fill rules
-
-- Fullscreen API
-
-- Encrypted media extensions
-
-- Media source extensions
-
-- CSS flexible box layout module
-
-- And mutation observers like DOM4 and 5.3
-
-For more information about specific changes and additions, see the [IE11 guide for developers](/previous-versions/windows/internet-explorer/ie-developer/dev-guides/bg182636(v=vs.85)).
-
-**Q: What test tools exist to test for potential application compatibility issues?**
-The Compat Inspector tool supports Windows Internet Explorer 9 through IE11. For more information, see [Compat Inspector User Guide](https://go.microsoft.com/fwlink/p/?LinkId=313189). In addition, you can use the new [F12 Developer Tools](/previous-versions/windows/internet-explorer/ie-developer/dev-guides/bg182632(v=vs.85)) that are included with IE11, or the [modern.ie](https://go.microsoft.com/fwlink/p/?linkid=308902) website for Microsoft Edge.
-
-**Q: Why am I having problems launching my legacy apps with Internet Explorer 11**?
-It’s most likely because IE no longer starts apps that use managed browser hosting controls, like in the .NET Framework 1.1 and 2.0. You can get IE11 to use managed browser hosting controls again, by:
-
-- **For x86 systems or for 32-bit processes on x64 systems:** Go to the `HKLM\SOFTWARE\MICROSOFT\.NETFramework` registry key and change the **EnableIEHosting** value to **1**.
-
-- **For x64 systems or for 64-bit processes on x64 systems:** Go to the `HKLM\SOFTWARE\Wow6432Node\.NETFramework` registry key and change the **EnableIEHosting** value to **1**.
-
-For more information, see the [Web Applications](/dotnet/framework/migration-guide/application-compatibility) section of the Application Compatibility in the .NET Framework 4.5 page.
-
-**Q: Is there a compatibility list for IE?**
-Yes. You can review the XML-based [compatibility version list](https://go.microsoft.com/fwlink/p/?LinkId=403864).
-
-**Q: What is Enterprise Mode?**
-Enterprise Mode is a compatibility mode designed for Enterprises. This mode lets websites render using a modified browser configuration that’s designed to avoid the common compatibility problems associated with web apps written and tested on older versions of IE, like Windows Internet Explorer 7 or Windows Internet Explorer 8.
-For more information, see [Turn on Enterprise Mode and use a site list](../ie11-deploy-guide/turn-on-enterprise-mode-and-use-a-site-list.md).
-
-**Q: What is the Enterprise Mode Site List Manager tool?**
-Enterprise Mode Site List Manager tool gives you a way to add websites to your Enterprise Mode site list, without having to manually code XML.
-For more information, see all of the topics in [Use the Enterprise Mode Site List Manager](../ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md).
-
-**Q: Are browser plug-ins supported in IE11?**
-The immersive version of IE11 provides an add-on–free experience, so browser plugins won't load and dependent content won't be displayed. This doesn't apply to Internet Explorer for the desktop. For more information, see [Browsing Without Plug-ins](https://go.microsoft.com/fwlink/p/?LinkId=242587). However, Internet Explorer for the desktop and IE11 on Windows 7 with SP1 do support browser plugins, including ActiveX controls such as Adobe Flash and Microsoft Silverlight.
-
-**Q: Is Adobe Flash supported on IE11?**
-Adobe Flash is included as a platform feature and is available out of the box for Windows 8.1, running on both IE and Internet Explorer for the desktop. Users can turn this feature on or off using the **Manage Add-ons** dialog box, while administrators can turn this feature on or off using the Group Policy setting, **Turn off Adobe Flash in IE and prevent applications from using IE technology to instantiate Flash objects**.
-**Important**
-The preinstalled version of Adobe Flash isn't supported on IE11 running on either Windows 7 with SP1 or Windows Server 2008 R2 with SP1. However, you can still download and install the separate Adobe Flash plug-in.
-
-**Q: Can I replace IE11 on Windows 8.1 with an earlier version?**
-No. Windows 8.1 doesn't support any of the previous versions of IE.
-
-**Q: Are there any new Group Policy settings in IE11?**
-IE11 includes all of the previous Group Policy settings you've used to manage and control web browser configuration since Internet Explorer 9. It also includes the following new Group Policy settings, supporting new features:
-
-- Turn off Page Prediction
-
-- Turn on the swiping motion for Internet Explorer for the desktop
-
-- Allow Microsoft services to provide more relevant and personalized search results
-
-- Turn off phone number detection
-
-- Allow IE to use the SPDY/3 network protocol
-
-- Let users turn on and use Enterprise Mode from the **Tools** menu
-
-- Use the Enterprise Mode IE website list
-
-For more information, see [New group policy settings for IE11](../ie11-deploy-guide/new-group-policy-settings-for-ie11.md).
-
-
-**Q: Where can I get more information about IE11 for IT pros?**
-Visit the [Springboard Series for Microsoft Browsers](https://go.microsoft.com/fwlink/p/?LinkId=313191) webpage on TechNet.
-
-
-
-**Q: Can I customize settings for IE on Windows 8.1?**
-Settings can be customized in the following ways:
-
-- IE11 **Settings** charm.
-
-- IE11-related Group Policy settings.
-
-- IEAK 11 for settings shared by both IE and Internet Explorer for the desktop.
-
-**Q: Can I make Internet Explorer for the desktop my default browsing experience?**
-Group Policy settings can be set to open either IE or Internet Explorer for the desktop as the default browser experience. Individual users can configure their own settings in the **Programs** tab of **Internet Options**. The following table shows the settings and results:
-
-|Setting |Result |
-|--------|-------|
-|Let IE decide |Links open in the same type of experience from where they're launched. For example, clicking a link from a Microsoft Store app, opens IE. However, clicking a link from a desktop app, opens Internet Explorer for the desktop. |
-|Always in IE11 |Links always open in IE. |
-|Always in Internet Explorer for the desktop |Links always open in Internet Explorer for the desktop. |
-
-
-**Q. Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?**
-Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
-
-IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. Select a language below and download IEAK 11 from the download center:
-
-| | | |
-|---------|---------|---------|
-|[English](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/en-us/ieak.msi) |[French](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fr-fr/ieak.msi) |[Norwegian (Bokmål)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nb-no/ieak.msi) |
-|[Arabic](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ar-sa/ieak.msi) |[Chinese (Simplified)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-cn/ieak.msi) |[Chinese(Traditional)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-tw/ieak.msi) |
-|[Czech](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/cs-cz/ieak.msi) |[Danish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/da-dk/ieak.msi) |[Dutch](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nl-nl/ieak.msi) |
-|[Finnish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fi-fi/ieak.msi) |[German](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/de-de/ieak.msi) |[Greek](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/el-gr/ieak.msi) |
-|[Hebrew](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/he-il/ieak.msi) |[Hungarian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/hu-hu/ieak.msi) |[Italian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/it-it/ieak.msi) |
-|[Japanese](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ja-jp/ieak.msi) |[Korean](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ko-kr/ieak.msi) |[Polish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pl-pl/ieak.msi) |
-|[Portuguese (Brazil)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-br/ieak.msi) |[Portuguese (Portugal)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-pt/ieak.msi) |[Russian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ru-ru/ieak.msi) |
-|[Spanish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/es-es/ieak.msi) |[Swedish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/sv-se/ieak.msi) |[Turkish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/tr-tr/ieak.msi) |
-
-
-
-
-**Q. What are the different modes available for the Internet Explorer Customization Wizard?**
-The IEAK Customization Wizard displays pages based on your licensing mode selection, either **Internal** or **External**. For more information on IEAK Customization Wizard modes, see [Determine the licensing version and features to use in IEAK 11](../ie11-ieak/licensing-version-and-features-ieak11.md).
-
-The following table displays which pages are available in IEAK 11, based on the licensing mode:
-
-| **Wizard Pages** | **External** | **Internal** |
-|-------------------------------------------|--------------|--------------|
-| Welcome to the IEAK | Yes | Yes |
-| File Locations | Yes | Yes |
-| Platform Selection | Yes | Yes |
-| Language Selection | Yes | Yes |
-| Package Type Selection | Yes | Yes |
-| Feature Selection | Yes | Yes |
-| Automatic Version Synchronization | Yes | Yes |
-| Custom Components | Yes | Yes |
-| Corporate Install | No | Yes |
-| User Experience | No | Yes |
-| Browser User Interface | Yes | Yes |
-| Search Providers | Yes | Yes |
-| Important URLs - Home page and Support | Yes | Yes |
-| Accelerators | Yes | Yes |
-| Favorites, Favorites Bar, and Feeds | Yes | Yes |
-| Browsing Options | No | Yes |
-| First Run Wizard and Welcome Page Options | Yes | Yes |
-| Compatibility View | Yes | Yes |
-| Connection Manager | Yes | Yes |
-| Connection Settings | Yes | Yes |
-| Automatic Configuration | No | Yes |
-| Proxy Settings | Yes | Yes |
-| Security and Privacy Settings | No | Yes |
-| Add a Root Certificate | Yes | No |
-| Programs | Yes | Yes |
-| Additional Settings | No | Yes |
-| Wizard Complete | Yes | Yes |
-
-
-## Related topics
-- [Microsoft Edge - Deployment Guide for IT Pros](/microsoft-edge/deploy/)
-- [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](../ie11-deploy-guide/index.md)
-- [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.yml b/browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.yml
new file mode 100644
index 0000000000..b025aa3409
--- /dev/null
+++ b/browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.yml
@@ -0,0 +1,253 @@
+### YamlMime:FAQ
+metadata:
+ ms.localizationpriority: medium
+ ms.mktglfcycl: explore
+ description: Frequently asked questions about Internet Explorer 11 for IT Pros
+ author: dansimp
+ ms.prod: ie11
+ ms.assetid: 140e7d33-584a-44da-8c68-6c1d568e1de3
+ ms.reviewer:
+ audience: itpro
+ manager: dansimp
+ ms.author: dansimp
+ title: Internet Explorer 11 - FAQ for IT Pros (Internet Explorer 11 for IT Pros)
+ ms.sitesec: library
+ ms.date: 10/16/2017
+
+title: Internet Explorer 11 - FAQ for IT Pros
+summary: |
+ [!INCLUDE [Microsoft 365 workloads end of support for IE11](../includes/microsoft-365-ie-end-of-support.md)]
+
+ Answering frequently asked questions about Internet Explorer 11 (IE11) features, operating system support, integration with the Windows operating system, Group Policy, and general configuration.
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ Frequently Asked Questions
+ answer: |
+ - question: |
+ What operating system does IE11 run on?
+ answer: |
+ - Windows 10
+
+ - Windows 8.1
+
+ - Windows Server 2012 R2
+
+ - Windows 7 with Service Pack 1 (SP1)
+
+ - Windows Server 2008 R2 with Service Pack 1 (SP1)
+
+
+ - question: |
+ How do I install IE11 on Windows 10, Windows 8.1, or Windows Server 2012 R2?
+ answer: |
+ IE11 is preinstalled with Windows 8.1 and Windows Server 2012 R2. No additional action is required.
+
+ - question: |
+ How do I install IE11 on Windows 7 with SP1 or Windows Server 2008 R2 with SP1?
+ answer: |
+ You can install IE11 on computers running either Windows 7 with SP1 or Windows Server 2008 R2 with SP1. To download IE11, see the IE11 [home page](https://go.microsoft.com/fwlink/p/?LinkId=290956).
+
+ - question: |
+ How does IE11 integrate with Windows 8.1?
+ answer: |
+ IE11 is the default handler for the HTTP and HTTPS protocols and the default browser for Windows 8.1. There are two experiences in Windows 8.1: Internet Explorer and Internet Explorer for the desktop. IE is the default browser for touch-first, immersive experiences. Internet Explorer for the desktop provides a more traditional window and tab management experience. The underlying platform of IE11 is fully interoperable across both IE and the familiar Internet Explorer for the desktop, letting developers write the same markup for both experiences.
+
+ - question: |
+ What are the new or improved security features?
+ answer: |
+ IE11 offers improvements to Enhanced Protected Mode, password manager, and other security features. IE11 also turns on Transport Layer Security (TLS) 1.2 by default.
+
+ - question: |
+ How is Microsoft supporting modern web standards, such as WebGL?
+ answer: |
+ Microsoft is committed to providing an interoperable web by supporting modern web standards. Doing this lets developers use the same markup across web browsers, helping to reduce development and support costs.
+ Supported web standards include:
+
+ - Web Graphics Library (WebGL)
+
+ - Canvas 2D L2 extensions, including image smoothing using the nearest neighbor, dashed lines, and fill rules
+
+ - Fullscreen API
+
+ - Encrypted media extensions
+
+ - Media source extensions
+
+ - CSS flexible box layout module
+
+ - And mutation observers like DOM4 and 5.3
+
+ For more information about specific changes and additions, see the [IE11 guide for developers](/previous-versions/windows/internet-explorer/ie-developer/dev-guides/bg182636(v=vs.85)).
+
+ - question: |
+ What test tools exist to test for potential application compatibility issues?
+ answer: |
+ The Compat Inspector tool supports Windows Internet Explorer 9 through IE11. For more information, see [Compat Inspector User Guide](https://go.microsoft.com/fwlink/p/?LinkId=313189). In addition, you can use the new [F12 Developer Tools](/previous-versions/windows/internet-explorer/ie-developer/dev-guides/bg182632(v=vs.85)) that are included with IE11, or the [modern.ie](https://go.microsoft.com/fwlink/p/?linkid=308902) website for Microsoft Edge.
+
+ - question: |
+ Why am I having problems launching my legacy apps with Internet Explorer 11?
+ answer: |
+ It’s most likely because IE no longer starts apps that use managed browser hosting controls, like in the .NET Framework 1.1 and 2.0. You can get IE11 to use managed browser hosting controls again, by:
+
+ - **For x86 systems or for 32-bit processes on x64 systems:** Go to the `HKLM\SOFTWARE\MICROSOFT\.NETFramework` registry key and change the **EnableIEHosting** value to **1**.
+
+ - **For x64 systems or for 64-bit processes on x64 systems:** Go to the `HKLM\SOFTWARE\Wow6432Node\.NETFramework` registry key and change the **EnableIEHosting** value to **1**.
+
+ For more information, see the [Web Applications](/dotnet/framework/migration-guide/application-compatibility) section of the Application Compatibility in the .NET Framework 4.5 page.
+
+ - question: |
+ Is there a compatibility list for IE?
+ answer: |
+ Yes. You can review the XML-based [compatibility version list](https://go.microsoft.com/fwlink/p/?LinkId=403864).
+
+ - question: |
+ What is Enterprise Mode?
+ answer: |
+ Enterprise Mode is a compatibility mode designed for Enterprises. This mode lets websites render using a modified browser configuration that’s designed to avoid the common compatibility problems associated with web apps written and tested on older versions of IE, like Windows Internet Explorer 7 or Windows Internet Explorer 8.
+ For more information, see [Turn on Enterprise Mode and use a site list](../ie11-deploy-guide/turn-on-enterprise-mode-and-use-a-site-list.md).
+
+ - question: |
+ What is the Enterprise Mode Site List Manager tool?
+ answer: |
+ Enterprise Mode Site List Manager tool gives you a way to add websites to your Enterprise Mode site list, without having to manually code XML.
+ For more information, see all of the topics in [Use the Enterprise Mode Site List Manager](../ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md).
+
+ - question: |
+ Are browser plug-ins supported in IE11?
+ answer: |
+ The immersive version of IE11 provides an add-on–free experience, so browser plugins won't load and dependent content won't be displayed. This doesn't apply to Internet Explorer for the desktop. For more information, see [Browsing Without Plug-ins](https://go.microsoft.com/fwlink/p/?LinkId=242587). However, Internet Explorer for the desktop and IE11 on Windows 7 with SP1 do support browser plugins, including ActiveX controls such as Adobe Flash and Microsoft Silverlight.
+
+ - question: |
+ Is Adobe Flash supported on IE11?
+ answer: |
+ Adobe Flash is included as a platform feature and is available out of the box for Windows 8.1, running on both IE and Internet Explorer for the desktop. Users can turn this feature on or off using the **Manage Add-ons** dialog box, while administrators can turn this feature on or off using the Group Policy setting, **Turn off Adobe Flash in IE and prevent applications from using IE technology to instantiate Flash objects**.
+ **Important**
+ The preinstalled version of Adobe Flash isn't supported on IE11 running on either Windows 7 with SP1 or Windows Server 2008 R2 with SP1. However, you can still download and install the separate Adobe Flash plug-in.
+
+ - question: |
+ Can I replace IE11 on Windows 8.1 with an earlier version?
+ answer: |
+ No. Windows 8.1 doesn't support any of the previous versions of IE.
+
+ - question: |
+ Are there any new Group Policy settings in IE11?
+ answer: |
+ IE11 includes all of the previous Group Policy settings you've used to manage and control web browser configuration since Internet Explorer 9. It also includes the following new Group Policy settings, supporting new features:
+
+ - Turn off Page Prediction
+
+ - Turn on the swiping motion for Internet Explorer for the desktop
+
+ - Allow Microsoft services to provide more relevant and personalized search results
+
+ - Turn off phone number detection
+
+ - Allow IE to use the SPDY/3 network protocol
+
+ - Let users turn on and use Enterprise Mode from the **Tools** menu
+
+ - Use the Enterprise Mode IE website list
+
+ For more information, see [New group policy settings for IE11](../ie11-deploy-guide/new-group-policy-settings-for-ie11.md).
+
+
+ - question: |
+ Where can I get more information about IE11 for IT pros?
+ answer: |
+ Visit the [Springboard Series for Microsoft Browsers](https://go.microsoft.com/fwlink/p/?LinkId=313191) webpage on TechNet.
+
+
+
+ - question: |
+ Can I customize settings for IE on Windows 8.1?
+ answer: |
+ Settings can be customized in the following ways:
+
+ - IE11 **Settings** charm.
+
+ - IE11-related Group Policy settings.
+
+ - IEAK 11 for settings shared by both IE and Internet Explorer for the desktop.
+
+ - question: |
+ Can I make Internet Explorer for the desktop my default browsing experience?
+ answer: |
+ Group Policy settings can be set to open either IE or Internet Explorer for the desktop as the default browser experience. Individual users can configure their own settings in the **Programs** tab of **Internet Options**. The following table shows the settings and results:
+
+ |Setting |Result |
+ |--------|-------|
+ |Let IE decide |Links open in the same type of experience from where they're launched. For example, clicking a link from a Microsoft Store app, opens IE. However, clicking a link from a desktop app, opens Internet Explorer for the desktop. |
+ |Always in IE11 |Links always open in IE. |
+ |Always in Internet Explorer for the desktop |Links always open in Internet Explorer for the desktop. |
+
+
+ - question: |
+ Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?
+ answer: |
+ Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
+
+ IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. Select a language below and download IEAK 11 from the download center:
+
+ | | | |
+ |---------|---------|---------|
+ |[English](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/en-us/ieak.msi) |[French](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fr-fr/ieak.msi) |[Norwegian (Bokmål)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nb-no/ieak.msi) |
+ |[Arabic](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ar-sa/ieak.msi) |[Chinese (Simplified)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-cn/ieak.msi) |[Chinese(Traditional)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-tw/ieak.msi) |
+ |[Czech](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/cs-cz/ieak.msi) |[Danish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/da-dk/ieak.msi) |[Dutch](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nl-nl/ieak.msi) |
+ |[Finnish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fi-fi/ieak.msi) |[German](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/de-de/ieak.msi) |[Greek](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/el-gr/ieak.msi) |
+ |[Hebrew](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/he-il/ieak.msi) |[Hungarian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/hu-hu/ieak.msi) |[Italian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/it-it/ieak.msi) |
+ |[Japanese](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ja-jp/ieak.msi) |[Korean](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ko-kr/ieak.msi) |[Polish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pl-pl/ieak.msi) |
+ |[Portuguese (Brazil)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-br/ieak.msi) |[Portuguese (Portugal)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-pt/ieak.msi) |[Russian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ru-ru/ieak.msi) |
+ |[Spanish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/es-es/ieak.msi) |[Swedish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/sv-se/ieak.msi) |[Turkish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/tr-tr/ieak.msi) |
+
+
+
+
+ - question: |
+ What are the different modes available for the Internet Explorer Customization Wizard?
+ answer: |
+ The IEAK Customization Wizard displays pages based on your licensing mode selection, either **Internal** or **External**. For more information on IEAK Customization Wizard modes, see [Determine the licensing version and features to use in IEAK 11](../ie11-ieak/licensing-version-and-features-ieak11.md).
+
+ The following table displays which pages are available in IEAK 11, based on the licensing mode:
+
+ | **Wizard Pages** | **External** | **Internal** |
+ |-------------------------------------------|--------------|--------------|
+ | Welcome to the IEAK | Yes | Yes |
+ | File Locations | Yes | Yes |
+ | Platform Selection | Yes | Yes |
+ | Language Selection | Yes | Yes |
+ | Package Type Selection | Yes | Yes |
+ | Feature Selection | Yes | Yes |
+ | Automatic Version Synchronization | Yes | Yes |
+ | Custom Components | Yes | Yes |
+ | Corporate Install | No | Yes |
+ | User Experience | No | Yes |
+ | Browser User Interface | Yes | Yes |
+ | Search Providers | Yes | Yes |
+ | Important URLs - Home page and Support | Yes | Yes |
+ | Accelerators | Yes | Yes |
+ | Favorites, Favorites Bar, and Feeds | Yes | Yes |
+ | Browsing Options | No | Yes |
+ | First Run Wizard and Welcome Page Options | Yes | Yes |
+ | Compatibility View | Yes | Yes |
+ | Connection Manager | Yes | Yes |
+ | Connection Settings | Yes | Yes |
+ | Automatic Configuration | No | Yes |
+ | Proxy Settings | Yes | Yes |
+ | Security and Privacy Settings | No | Yes |
+ | Add a Root Certificate | Yes | No |
+ | Programs | Yes | Yes |
+ | Additional Settings | No | Yes |
+ | Wizard Complete | Yes | Yes |
+
+
+additionalContent: |
+
+ ## Related topics
+
+ - [Microsoft Edge - Deployment Guide for IT Pros](/microsoft-edge/deploy/)
+ - [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](../ie11-deploy-guide/index.md)
+ - [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.md b/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.md
deleted file mode 100644
index 551959c31f..0000000000
--- a/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.md
+++ /dev/null
@@ -1,124 +0,0 @@
----
-ms.localizationpriority: medium
-ms.mktglfcycl: explore
-description: Get answers to commonly asked questions about the Internet Explorer 11 Blocker Toolkit.
-author: dansimp
-ms.author: dansimp
-ms.prod: ie11
-ms.assetid:
-ms.reviewer:
-audience: itpro
-manager: dansimp
-title: Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions
-ms.sitesec: library
-ms.date: 05/10/2018
----
-
-# Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions
-
-[!INCLUDE [Microsoft 365 workloads end of support for IE11](../includes/microsoft-365-ie-end-of-support.md)]
-
-
-Get answers to commonly asked questions about the Internet Explorer 11 Blocker Toolkit.
-
-> [!Important]
-> If you administer your company’s environment using an update management solution, such as Windows Server Update Services (WSUS) or System Center 2012 Configuration Manager, you don’t need to use the Internet Explorer 11 Blocker Toolkit. Update management solutions let you completely manage your Windows Updates and Microsoft Updates, including your Internet Explorer 11 deployment.
-
-- [Automatic updates delivery process](#automatic-updates-delivery-process)
-
-- [How the Internet Explorer 11 Blocker Toolkit works](#how-the-internet-explorer-11-blocker-toolkit-works)
-
-- [Internet Explorer 11 Blocker Toolkit and other update services](#internet-explorer-11-blocker-toolkit-and-other-update-services)
-
-## Automatic Updates delivery process
-
-
-**Q. Which users will receive Internet Explorer 11 as an important update?**
-A. Users running either Windows 7 with Service Pack 1 (SP1) or the 64-bit version of Windows Server 2008 R2 with Service Pack 1 (SP1) will receive Internet Explorer 11 as an important update, if Automatic Updates are turned on. Windows Update is manually run. Automatic Updates will automatically download and install the Internet Explorer 11 files if it’s turned on. For more information about how Internet Explorer works with Automatic Updates and information about other deployment blocking options, see [Internet Explorer 11 Delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md).
-
-**Q. When is the Blocker Toolkit available?**
-A. The Blocker Toolkit is currently available from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=40722).
-
-**Q. What tools can I use to manage Windows Updates and Microsoft Updates in my company?**
-A. We encourage anyone who wants full control over their company’s deployment of Windows Updates and Microsoft Updates, to use [Windows Server Update Services (WSUS)](/windows-server/administration/windows-server-update-services/get-started/windows-server-update-services-wsus), a free tool for users of Windows Server. You can also use the more advanced configuration management tool, [System Center 2012 Configuration Manager](/previous-versions/system-center/system-center-2012-R2/gg682041(v=technet.10)).
-
-**Q. How long does the blocker mechanism work?**
-A. The Internet Explorer 11 Blocker Toolkit uses a registry key value to permanently turn off the automatic delivery of Internet Explorer 11. This behavior lasts as long as the registry key value isn’t removed or changed.
-
-**Q. Why should I use the Internet Explorer 11 Blocker Toolkit to stop delivery of Internet Explorer 11? Why can’t I just disable all of Automatic Updates?**
-A. Automatic Updates provide you with ongoing critical security and reliability updates. Turning this feature off can leave your computers more vulnerable. Instead, we suggest that you use an update management solution, such as WSUS, to fully control your environment while leaving this feature running, managing how and when the updates get to your user’s computers.
-
-The Internet Explorer 11 Blocker Toolkit safely allows Internet Explorer 11 to download and install in companies that can’t use WSUS, Configuration Manager, or
-other update management solution.
-
-**Q. Why don’t we just block URL access to Windows Update or Microsoft Update?**
-A. Blocking the Windows Update or Microsoft Update URLs also stops delivery of critical security and reliability updates for all of the supported versions of the Windows operating system; leaving your computers more vulnerable.
-
-## How the Internet Explorer 11 Blocker Toolkit works
-
-**Q. How should I test the Internet Explorer 11 Blocker Toolkit in my company?**
-A. Because the toolkit only sets a registry key to turn on and off the delivery of Internet Explorer 11, there should be no additional impact or side effects to your environment. No additional testing should be necessary.
-
-**Q. What’s the registry key used to block delivery of Internet Explorer 11?**
-A. HKLM\\SOFTWARE\\Microsoft\\Internet Explorer\\Setup\\11.0
-
-**Q. What’s the registry key name and values?**
-The registry key name is **DoNotAllowIE11**, where:
-
-- A value of **1** turns off the automatic delivery of Internet Explorer 11 using Automatic Updates and turns off the Express install option.
-
-- Not providing a registry key, or using a value of anything other than **1**, lets the user install Internet Explorer 11 through Automatic Updates or a
- manual update.
-
-**Q. Does the Internet Explorer 11 Blocker Toolkit stop users from manually installing Internet Explorer 11?**
-A. No. The Internet Explorer 11 Blocker Toolkit only stops computers from automatically installing Internet Explorer 11 through Automatic Updates. Users can still download and install Internet Explorer 11 from the Microsoft Download Center or from external media.
-
-**Q. Does the Internet Explorer 11 Blocker Toolkit stop users from automatically upgrading to Internet Explorer 11?**
-A. Yes. The Internet Explorer 11 Blocker Toolkit also prevents Automatic Updates from automatically upgrading a computer from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11.
-
-**Q. How does the provided script work?**
-A. The script accepts one of two command line options:
-
-- **Block:** Creates the registry key that stops Internet Explorer 11 from installing through Automatic Updates.
-
-- **Unblock:** Removes the registry key that stops Internet Explorer 11 from installing through Automatic Updates.
-
-**Q. What’s the ADM template file used for?**
-A. The Administrative Template (.adm file) lets you import the new Group Policy environment and use Group Policy Objects to centrally manage all of the computers in your company.
-
-**Q. Is the tool localized?**
-A. No. The tool isn’t localized, it’s only available in English (en-us). However, it does work, without any modifications, on any language edition of the supported operating systems.
-
-## Internet Explorer 11 Blocker Toolkit and other update services
-
-**Q: Is there a version of the Internet Explorer Blocker Toolkit that will prevent automatic installation of IE11?**
-Yes. The IE11 Blocker Toolkit is available for download. For more information, see [Toolkit to Disable Automatic Delivery of IE11](https://go.microsoft.com/fwlink/p/?LinkId=328195) on the Microsoft Download Center.
-
-**Q. Does the Internet Explorer 11 blocking mechanism also block delivery of Internet Explorer 11 through update management solutions, like WSUS?**
-A. No. You can still deploy Internet Explorer 11 using one of the upgrade management solutions, even if the blocking mechanism is activated. The Internet Explorer 11 Blocker Toolkit is only intended for companies that don’t use upgrade management solutions.
-
-**Q. If WSUS is set to 'auto-approve' Update Rollup packages (this is not the default configuration), how do I stop Internet Explorer 11 from automatically installing throughout my company?**
-A. You only need to change your settings if:
-
-- You use WSUS to manage updates and allow auto-approvals for Update Rollup installation.
-
- -and-
-
-- You have computers running either Windows 7 SP1 or Windows Server 2008 R2 (SP1) with Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 installed.
-
- -and-
-
-- You don’t want to upgrade your older versions of Internet Explorer to Internet Explorer 11 right now.
-
-If these scenarios apply to your company, see [Internet Explorer 11 delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md) for more information on how to prevent automatic installation.
-
-
-## Additional resources
-
-- [Internet Explorer 11 Blocker Toolkit download](https://www.microsoft.com/download/details.aspx?id=40722)
-
-- [Internet Explorer 11 FAQ for IT pros](./faq-for-it-pros-ie11.md)
-
-- [Internet Explorer 11 delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md)
-
-- [Internet Explorer 11 deployment guide](../ie11-deploy-guide/index.md)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.yml b/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.yml
new file mode 100644
index 0000000000..217b48f990
--- /dev/null
+++ b/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.yml
@@ -0,0 +1,161 @@
+### YamlMime:FAQ
+metadata:
+ ms.localizationpriority: medium
+ ms.mktglfcycl: explore
+ description: Get answers to commonly asked questions about the Internet Explorer 11 Blocker Toolkit.
+ author: dansimp
+ ms.author: dansimp
+ ms.prod: ie11
+ ms.assetid:
+ ms.reviewer:
+ audience: itpro
+ manager: dansimp
+ title: Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions
+ ms.sitesec: library
+ ms.date: 05/10/2018
+
+title: Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions
+summary: |
+ [!INCLUDE [Microsoft 365 workloads end of support for IE11](../includes/microsoft-365-ie-end-of-support.md)]
+
+
+ Get answers to commonly asked questions about the Internet Explorer 11 Blocker Toolkit.
+
+ > [!Important]
+ > If you administer your company’s environment using an update management solution, such as Windows Server Update Services (WSUS) or System Center 2012 Configuration Manager, you don’t need to use the Internet Explorer 11 Blocker Toolkit. Update management solutions let you completely manage your Windows Updates and Microsoft Updates, including your Internet Explorer 11 deployment.
+
+ - [Automatic updates delivery process](/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit#automatic-updates-delivery-process)
+
+ - [How the Internet Explorer 11 Blocker Toolkit works](/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit#how-the-internet-explorer-11-blocker-toolkit-works)
+
+ - [Internet Explorer 11 Blocker Toolkit and other update services](/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit#internet-explorer-11-blocker-toolkit-and-other-update-services)
+
+
+sections:
+ - name: Automatic Updates delivery process
+ questions:
+ - question: |
+ Which users will receive Internet Explorer 11 important update?
+ answer: |
+ Users running either Windows 7 with Service Pack 1 (SP1) or the 64-bit version of Windows Server 2008 R2 with Service Pack 1 (SP1) will receive Internet Explorer 11 important update, if Automatic Updates are turned on. Windows Update is manually run. Automatic Updates will automatically downloand install the Internet Explorer 11 files if it’s turned on. For more information about how Internet Explorer works with Automatic Updates and information about other deployment blocking options, see [Internet Explorer 11 Delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md).
+
+ - question: |
+ When is the Blocker Toolkit available?
+ answer: |
+ The Blocker Toolkit is currently available from the [Microsoft DownloCenter](https://www.microsoft.com/download/details.aspx?id=40722).
+
+ - question: |
+ Whtools cI use to manage Windows Updates and Microsoft Updates in my company?
+ answer: |
+ We encourage anyone who wants full control over their company’s deployment of Windows Updates and Microsoft Updates, to use [Windows Server Update Services (WSUS)](/windows-server/administration/windows-server-update-services/get-started/windows-server-update-services-wsus), a free tool for users of Windows Server. You calso use the more advanced configuration management tool, [System Center 2012 Configuration Manager](/previous-versions/system-center/system-center-2012-R2/gg682041(v=technet.10)).
+
+ - question: |
+ How long does the blocker mechanism work?
+ answer: |
+ The Internet Explorer 11 Blocker Toolkit uses a registry key value to permanently turn off the automatic delivery of Internet Explorer 11. This behavior lasts long the registry key value isn’t removed or changed.
+
+ - question: |
+ Why should I use the Internet Explorer 11 Blocker Toolkit to stop delivery of Internet Explorer 11? Why can’t I just disable all of Automatic Updates?
+ answer: |
+ Automatic Updates provide you with ongoing criticsecurity and reliability updates. Turning this feature off cleave your computers more vulnerable. Instead, we suggest thyou use update management solution, such WSUS, to fully control your environment while leaving this feature running, managing how and when the updates get to your user’s computers.
+
+ The Internet Explorer 11 Blocker Toolkit safely allows Internet Explorer 11 to downloand install in companies thcan’t use WSUS, Configuration Manager, or
+ other update management solution.
+
+ - question: |
+ Why don’t we just block URL access to Windows Update or Microsoft Update?
+ answer: |
+ Blocking the Windows Update or Microsoft Update URLs also stops delivery of criticsecurity and reliability updates for all of the supported versions of the Windows operating system; leaving your computers more vulnerable.
+
+ - name: How the Internet Explorer 11 Blocker Toolkit works
+ questions:
+ - question: |
+ How should I test the Internet Explorer 11 Blocker Toolkit in my company?
+ answer: |
+ Because the toolkit only sets a registry key to turn on and off the delivery of Internet Explorer 11, there should be no additionimpact or side effects to your environment. No additiontesting should be necessary.
+
+ - question: |
+ What’s the registry key used to block delivery of Internet Explorer 11?
+ answer: |
+ HKLM\\SOFTWARE\\Microsoft\\Internet Explorer\\Setup\\11.0
+
+ - question: |
+ What’s the registry key name and values?
+ answer: |
+ The registry key name is **DoNotAllowIE11**, where:
+
+ - A value of **1** turns off the automatic delivery of Internet Explorer 11 using Automatic Updates and turns off the Express install option.
+
+ - Not providing a registry key, or using a value of anything other th**1**, lets the user install Internet Explorer 11 through Automatic Updates or a
+ manuupdate.
+
+ - question: |
+ Does the Internet Explorer 11 Blocker Toolkit stop users from manually installing Internet Explorer 11?
+ answer: |
+ No. The Internet Explorer 11 Blocker Toolkit only stops computers from automatically installing Internet Explorer 11 through Automatic Updates. Users cstill downloand install Internet Explorer 11 from the Microsoft DownloCenter or from externmedia.
+
+ - question: |
+ Does the Internet Explorer 11 Blocker Toolkit stop users from automatically upgrading to Internet Explorer 11?
+ answer: |
+ Yes. The Internet Explorer 11 Blocker Toolkit also prevents Automatic Updates from automatically upgrading a computer from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11.
+
+ - question: |
+ How does the provided script work?
+ answer: |
+ The script accepts one of two command line options:
+
+ - **Block:** Creates the registry key thstops Internet Explorer 11 from installing through Automatic Updates.
+
+ - **Unblock:** Removes the registry key thstops Internet Explorer 11 from installing through Automatic Updates.
+
+ - question: |
+ What’s the ADM template file used for?
+ answer: |
+ The Administrative Template (.adm file) lets you import the new Group Policy environment and use Group Policy Objects to centrally manage all of the computers in your company.
+
+ - question: |
+ Is the tool localized?
+ answer: |
+ No. The tool isn’t localized, it’s only available in English (en-us). However, it does work, without any modifications, on any language edition of the supported operating systems.
+
+ - name: Internet Explorer 11 Blocker Toolkit and other update services
+ questions:
+ - question: |
+ Is there a version of the Internet Explorer Blocker Toolkit thwill prevent automatic installation of IE11?
+ answer: |
+ Yes. The IE11 Blocker Toolkit is available for download. For more information, see [Toolkit to Disable Automatic Delivery of IE11](https://go.microsoft.com/fwlink/p/?LinkId=328195) on the Microsoft DownloCenter.
+
+ - question: |
+ Does the Internet Explorer 11 blocking mechanism also block delivery of Internet Explorer 11 through update management solutions, like WSUS?
+ answer: |
+ No. You cstill deploy Internet Explorer 11 using one of the upgrade management solutions, even if the blocking mechanism is activated. The Internet Explorer 11 Blocker Toolkit is only intended for companies thdon’t use upgrade management solutions.
+
+ - question: |
+ If WSUS is set to 'auto-approve' Update Rollup packages (this is not the default configuration), how do I stop Internet Explorer 11 from automatically installing throughout my company?
+ answer: |
+ You only need to change your settings if:
+
+ - You use WSUS to manage updates and allow auto-approvals for Update Rollup installation.
+
+ -and-
+
+ - You have computers running either Windows 7 SP1 or Windows Server 2008 R2 (SP1) with Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 installed.
+
+ -and-
+
+ - You don’t want to upgrade your older versions of Internet Explorer to Internet Explorer 11 right now.
+
+ If these scenarios apply to your company, see [Internet Explorer 11 delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md) for more information on how to prevent automatic installation.
+
+
+additionalContent: |
+
+ ## Additionresources
+
+ - [Internet Explorer 11 Blocker Toolkit download](https://www.microsoft.com/download/details.aspx?id=40722)
+
+ - [Internet Explorer 11 Ffor IT pros](./faq-for-it-pros-ie11.yml)
+
+ - [Internet Explorer 11 delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md)
+
+ - [Internet Explorer 11 deployment guide](../ie11-deploy-guide/index.md)
diff --git a/browsers/internet-explorer/ie11-faq/faq-ieak11.md b/browsers/internet-explorer/ie11-faq/faq-ieak11.md
deleted file mode 100644
index 674c2a1600..0000000000
--- a/browsers/internet-explorer/ie11-faq/faq-ieak11.md
+++ /dev/null
@@ -1,124 +0,0 @@
----
-ms.localizationpriority: medium
-ms.mktglfcycl: support
-ms.pagetype: security
-description: Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
-author: dansimp
-ms.author: dansimp
-ms.manager: elizapo
-ms.prod: ie11
-ms.assetid:
-ms.reviewer:
-audience: itpro
-manager: dansimp
-title: IEAK 11 - Frequently Asked Questions
-ms.sitesec: library
-ms.date: 05/10/2018
----
-
-# IEAK 11 - Frequently Asked Questions
-
-[!INCLUDE [Microsoft 365 workloads end of support for IE11](../includes/microsoft-365-ie-end-of-support.md)]
-
-
-Get answers to commonly asked questions about the Internet Explorer Administration Kit 11 (IEAK 11), and find links to additional material you might find helpful.
-
-**What is IEAK 11?**
-
-IEAK 11 enables you to customize, brand, and distribute customized Internet Explorer 11 browser packages across an organization. Download the kit from the [Internet Explorer Administration Kit (IEAK) information and downloads](../ie11-ieak/ieak-information-and-downloads.md).
-
-**What are the supported operating systems?**
-
-You can customize and install IEAK 11 on the following supported operating systems:
-
-- Windows 8
-
-- Windows Server 2012
-
-- Windows 7 Service Pack 1 (SP1)
-
-- Windows Server 2008 R2 Service Pack 1 (SP1)
-
-> [!NOTE]
-> IEAK 11 does not support building custom packages for Windows RT.
-
-
-**What can I customize with IEAK 11?**
-
-The IEAK 11 enables you to customize branding and settings for Internet Explorer 11. For PCs running Windows 7, the custom package also includes the Internet Explorer executable.
-
-> [!NOTE]
-> Internet Explorer 11 is preinstalled on PCs running Windows 8. Therefore, the executable is not included in the customized package.
-
-**Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?**
-Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
-
-> [!NOTE]
-> IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. To download IEAK 11, see [Internet Explorer Administration Kit (IEAK) information and downloads](../ie11-ieak/ieak-information-and-downloads.md).
-
-**Q: Is there a version of the Internet Explorer Administration Kit (IEAK) supporting IE11?**
-Yes. The Internet Explorer Administration Kit 11 (IEAK 11) is available for download. IEAK 11 lets you create custom versions of IE11 for use in your organization. For more information, see the following resources:
-
-- [Internet Explorer Administration Kit Information and Downloads](../ie11-ieak/ieak-information-and-downloads.md) on the Internet Explorer TechCenter.
-
-- [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
-
-**What are the different modes available for the Internet Explorer Customization Wizard?**
-The IEAK Customization Wizard displays pages based on your licensing mode selection, either **Internal** or **External**. For more information on IEAK Customization Wizard modes, see [What IEAK can do for you](../ie11-ieak/what-ieak-can-do-for-you.md).
-
-The following table displays which pages are available in IEAK 11, based on the licensing mode:
-
-| **Wizard Pages** | **External** | **Internal** |
-|-------------------------------------------|--------------|--------------|
-| Welcome to the IEAK | Yes | Yes |
-| File Locations | Yes | Yes |
-| Platform Selection | Yes | Yes |
-| Language Selection | Yes | Yes |
-| Package Type Selection | Yes | Yes |
-| Feature Selection | Yes | Yes |
-| Automatic Version Synchronization | Yes | Yes |
-| Custom Components | Yes | Yes |
-| Corporate Install | No | Yes |
-| User Experience | No | Yes |
-| Browser User Interface | Yes | Yes |
-| Search Providers | Yes | Yes |
-| Important URLs - Home page and Support | Yes | Yes |
-| Accelerators | Yes | Yes |
-| Favorites, Favorites Bar, and Feeds | Yes | Yes |
-| Browsing Options | No | Yes |
-| First Run Wizard and Welcome Page Options | Yes | Yes |
-| Compatibility View | Yes | Yes |
-| Connection Manager | Yes | Yes |
-| Connection Settings | Yes | Yes |
-| Automatic Configuration | No | Yes |
-| Proxy Settings | Yes | Yes |
-| Security and Privacy Settings | No | Yes |
-| Add a Root Certificate | Yes | No |
-| Programs | Yes | Yes |
-| Additional Settings | No | Yes |
-| Wizard Complete | Yes | Yes |
-
-
-**Q. Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?**
-Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
-
-IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. Select a language below and download IEAK 11 from the download center:
-
-| | | |
-|---------|---------|---------|
-|[English](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/en-us/ieak.msi) |[French](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fr-fr/ieak.msi) |[Norwegian (Bokmål)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nb-no/ieak.msi) |
-|[Arabic](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ar-sa/ieak.msi) |[Chinese (Simplified)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-cn/ieak.msi) |[Chinese(Traditional)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-tw/ieak.msi) |
-|[Czech](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/cs-cz/ieak.msi) |[Danish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/da-dk/ieak.msi) |[Dutch](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nl-nl/ieak.msi) |
-|[Finnish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fi-fi/ieak.msi) |[German](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/de-de/ieak.msi) |[Greek](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/el-gr/ieak.msi) |
-|[Hebrew](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/he-il/ieak.msi) |[Hungarian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/hu-hu/ieak.msi) |[Italian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/it-it/ieak.msi) |
-|[Japanese](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ja-jp/ieak.msi) |[Korean](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ko-kr/ieak.msi) |[Polish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pl-pl/ieak.msi) |
-|[Portuguese (Brazil)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-br/ieak.msi) |[Portuguese (Portugal)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-pt/ieak.msi) |[Russian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ru-ru/ieak.msi) |
-|[Spanish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/es-es/ieak.msi) |[Swedish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/sv-se/ieak.msi) |[Turkish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/tr-tr/ieak.msi) |
-
-
-## Additional resources
-
-[Download IEAK 11](../ie11-ieak/ieak-information-and-downloads.md)
-[IEAK 11 overview](../ie11-ieak/index.md)
-[IEAK 11 product documentation](../ie11-ieak/index.md)
-[IEAK 11 licensing guidelines](../ie11-ieak/licensing-version-and-features-ieak11.md)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-faq/faq-ieak11.yml b/browsers/internet-explorer/ie11-faq/faq-ieak11.yml
new file mode 100644
index 0000000000..e2400b19af
--- /dev/null
+++ b/browsers/internet-explorer/ie11-faq/faq-ieak11.yml
@@ -0,0 +1,140 @@
+### YamlMime:FAQ
+metadata:
+ ms.localizationpriority: medium
+ ms.mktglfcycl: support
+ ms.pagetype: security
+ description: Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
+ author: dansimp
+ ms.author: dansimp
+ ms.manager: elizapo
+ ms.prod: ie11
+ ms.assetid:
+ ms.reviewer:
+ audience: itpro
+ manager: dansimp
+ title: IEAK 11 - Frequently Asked Questions
+ ms.sitesec: library
+ ms.date: 05/10/2018
+
+title: IEAK 11 - Frequently Asked Questions
+summary: |
+ [!INCLUDE [Microsoft 365 workloads end of support for IE11](../includes/microsoft-365-ie-end-of-support.md)]
+
+
+ Get answers to commonly asked questions about the Internet Explorer Administration Kit 11 (IEAK 11), and find links to additional material you might find helpful.
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ What is IEAK 11?
+ answer: |
+ IEAK 11 enables you to customize, brand, and distribute customized Internet Explorer 11 browser packages across an organization. Download the kit from the [Internet Explorer Administration Kit (IEAK) information and downloads](../ie11-ieak/ieak-information-and-downloads.md).
+
+ - question: |
+ What are the supported operating systems?
+ answer: |
+ You can customize and install IEAK 11 on the following supported operating systems:
+
+ - Windows 8
+
+ - Windows Server 2012
+
+ - Windows 7 Service Pack 1 (SP1)
+
+ - Windows Server 2008 R2 Service Pack 1 (SP1)
+
+ > [!NOTE]
+ > IEAK 11 does not support building custom packages for Windows RT.
+
+
+ - question: |
+ What can I customize with IEAK 11?
+ answer: |
+ The IEAK 11 enables you to customize branding and settings for Internet Explorer 11. For PCs running Windows 7, the custom package also includes the Internet Explorer executable.
+
+ > [!NOTE]
+ > Internet Explorer 11 is preinstalled on PCs running Windows 8. Therefore, the executable is not included in the customized package.
+
+ - question: |
+ Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?
+ answer: |
+ Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
+
+ > [!NOTE]
+ > IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. To download IEAK 11, see [Internet Explorer Administration Kit (IEAK) information and downloads](../ie11-ieak/ieak-information-and-downloads.md).
+
+ - question: |
+ Is there a version of the Internet Explorer Administration Kit (IEAK) supporting IE11?
+ answer: |
+ Yes. The Internet Explorer Administration Kit 11 (IEAK 11) is available for download. IEAK 11 lets you create custom versions of IE11 for use in your organization. For more information, see the following resources:
+
+ - [Internet Explorer Administration Kit Information and Downloads](../ie11-ieak/ieak-information-and-downloads.md) on the Internet Explorer TechCenter.
+
+ - [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
+
+ - question: |
+ What are the different modes available for the Internet Explorer Customization Wizard?
+ answer: |
+ The IEAK Customization Wizard displays pages based on your licensing mode selection, either **Internal** or **External**. For more information on IEAK Customization Wizard modes, see [What IEAK can do for you](../ie11-ieak/what-ieak-can-do-for-you.md).
+
+ The following table displays which pages are available in IEAK 11, based on the licensing mode:
+
+ | **Wizard Pages** | **External** | **Internal** |
+ |-------------------------------------------|--------------|--------------|
+ | Welcome to the IEAK | Yes | Yes |
+ | File Locations | Yes | Yes |
+ | Platform Selection | Yes | Yes |
+ | Language Selection | Yes | Yes |
+ | Package Type Selection | Yes | Yes |
+ | Feature Selection | Yes | Yes |
+ | Automatic Version Synchronization | Yes | Yes |
+ | Custom Components | Yes | Yes |
+ | Corporate Install | No | Yes |
+ | User Experience | No | Yes |
+ | Browser User Interface | Yes | Yes |
+ | Search Providers | Yes | Yes |
+ | Important URLs - Home page and Support | Yes | Yes |
+ | Accelerators | Yes | Yes |
+ | Favorites, Favorites Bar, and Feeds | Yes | Yes |
+ | Browsing Options | No | Yes |
+ | First Run Wizard and Welcome Page Options | Yes | Yes |
+ | Compatibility View | Yes | Yes |
+ | Connection Manager | Yes | Yes |
+ | Connection Settings | Yes | Yes |
+ | Automatic Configuration | No | Yes |
+ | Proxy Settings | Yes | Yes |
+ | Security and Privacy Settings | No | Yes |
+ | Add a Root Certificate | Yes | No |
+ | Programs | Yes | Yes |
+ | Additional Settings | No | Yes |
+ | Wizard Complete | Yes | Yes |
+
+
+ - question: |
+ Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?
+ answer: |
+ Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
+
+ IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. Select a language below and download IEAK 11 from the download center:
+
+ | | | |
+ |---------|---------|---------|
+ |[English](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/en-us/ieak.msi) |[French](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fr-fr/ieak.msi) |[Norwegian (Bokmål)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nb-no/ieak.msi) |
+ |[Arabic](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ar-sa/ieak.msi) |[Chinese (Simplified)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-cn/ieak.msi) |[Chinese(Traditional)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-tw/ieak.msi) |
+ |[Czech](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/cs-cz/ieak.msi) |[Danish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/da-dk/ieak.msi) |[Dutch](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nl-nl/ieak.msi) |
+ |[Finnish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fi-fi/ieak.msi) |[German](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/de-de/ieak.msi) |[Greek](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/el-gr/ieak.msi) |
+ |[Hebrew](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/he-il/ieak.msi) |[Hungarian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/hu-hu/ieak.msi) |[Italian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/it-it/ieak.msi) |
+ |[Japanese](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ja-jp/ieak.msi) |[Korean](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ko-kr/ieak.msi) |[Polish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pl-pl/ieak.msi) |
+ |[Portuguese (Brazil)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-br/ieak.msi) |[Portuguese (Portugal)](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-pt/ieak.msi) |[Russian](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ru-ru/ieak.msi) |
+ |[Spanish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/es-es/ieak.msi) |[Swedish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/sv-se/ieak.msi) |[Turkish](https://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/tr-tr/ieak.msi) |
+
+additionalContent: |
+
+ ## Additional resources
+
+ -[Download IEAK 11](../ie11-ieak/ieak-information-and-downloads.md)
+ -[IEAK 11 overview](../ie11-ieak/index.md)
+ -[IEAK 11 product documentation](../ie11-ieak/index.md)
+ -[IEAK 11 licensing guidelines](../ie11-ieak/licensing-version-and-features-ieak11.md)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md b/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md
index 1d8b34786a..69b71a1820 100644
--- a/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md
+++ b/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md
@@ -32,7 +32,7 @@ The Internet Explorer Administration Kit (IEAK) simplifies the creation, deploym
[IEAK 11 licensing guidelines](licensing-version-and-features-ieak11.md)
-[IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.md)
+[IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.yml)
[Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](before-you-create-custom-pkgs-ieak11.md)
diff --git a/browsers/internet-explorer/ie11-ieak/index.md b/browsers/internet-explorer/ie11-ieak/index.md
index 30d5fd6b52..5b662eeca6 100644
--- a/browsers/internet-explorer/ie11-ieak/index.md
+++ b/browsers/internet-explorer/ie11-ieak/index.md
@@ -43,10 +43,10 @@ IE11 and IEAK 11 offers differing experiences between Windows 7 and Windows 8.1
|Internet Explorer Customization Wizard 11 |Step-by-step wizard screens that help you create custom IE11 installation packages. |
## Related topics
-- [IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.md)
+- [IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.yml)
- [Download IEAK 11](ieak-information-and-downloads.md)
- [IEAK 11 administrators guide]()
- [IEAK 11 licensing guidelines](licensing-version-and-features-ieak11.md)
-- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.yml)
- [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](../ie11-deploy-guide/index.md)
- [Microsoft Edge - Deployment Guide for IT Pros](/microsoft-edge/deploy/)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md b/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md
index 2428cba980..b6c2cc7087 100644
--- a/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md
+++ b/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md
@@ -62,11 +62,11 @@ ISVs install IEAK using External mode (for Internet Explorer 10 or newer) or Int
## Additional resources
-- [IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.md)
+- [IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.yml)
- [Download IEAK 11](ieak-information-and-downloads.md)
- [IEAK 11 overview](index.md)
- [IEAK 11 administrators guide](./index.md)
- [IEAK 11 licensing guidelines](licensing-version-and-features-ieak11.md)
-- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.yml)
- [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](../ie11-deploy-guide/index.md)
- [Microsoft Edge - Deployment Guide for IT Pros](/microsoft-edge/deploy/)
\ No newline at end of file
diff --git a/browsers/internet-explorer/index.md b/browsers/internet-explorer/index.md
index 6c3085d888..cba6e52972 100644
--- a/browsers/internet-explorer/index.md
+++ b/browsers/internet-explorer/index.md
@@ -15,7 +15,7 @@ ms.date: 07/27/2017
# Internet Explorer 11 (IE11)
Find info about Internet Explorer 11 that's important to IT Pros.
-- [Internet Explorer 11 - FAQ for IT Pros](ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 - FAQ for IT Pros](ie11-faq/faq-for-it-pros-ie11.yml)
- [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](ie11-deploy-guide/index.md)
diff --git a/browsers/internet-explorer/internet-explorer.yml b/browsers/internet-explorer/internet-explorer.yml
index 1d1950f20d..6aa0242523 100644
--- a/browsers/internet-explorer/internet-explorer.yml
+++ b/browsers/internet-explorer/internet-explorer.yml
@@ -25,7 +25,7 @@ landingContent:
- text: System requirements and language support
url: ./ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md
- text: Frequently asked questions
- url: ./ie11-faq/faq-for-it-pros-ie11.md
+ url: ./ie11-faq/faq-for-it-pros-ie11.yml
- text: Internet Explorer 11 deployment guide
url: ./ie11-deploy-guide/index.md
- text: Use Enterprise Mode to improve compatibility
@@ -89,7 +89,7 @@ landingContent:
- text: Download IEAK 11
url: ./ie11-ieak/ieak-information-and-downloads.md
- text: Frequently asked questions about IEAK 11
- url: ./ie11-faq/faq-ieak11.md
+ url: ./ie11-faq/faq-ieak11.yml
- text: Customization and distribution guidelines
url: ./ie11-ieak/licensing-version-and-features-ieak11.md#customization-guidelines
- linkListType: deploy
@@ -147,7 +147,7 @@ landingContent:
- text: Disable VBScript execution in Internet Explorer for Internet Zone and Restricted Sites Zone
url: https://support.microsoft.com/help/4012494/option-to-disable-vbscript-execution-in-internet-explorer-for-internet
- text: Frequently asked questions about IEAK 11
- url: ./ie11-faq/faq-ieak11.md
+ url: ./ie11-faq/faq-ieak11.yml
- text: Internet Explorer 8, 9, 10, 11 forum
url: https://social.technet.microsoft.com/forums/ie/home?forum=ieitprocurrentver
- text: Contact a Microsoft support professional
diff --git a/education/includes/education-content-updates.md b/education/includes/education-content-updates.md
index fd0f0a83fb..1f83558533 100644
--- a/education/includes/education-content-updates.md
+++ b/education/includes/education-content-updates.md
@@ -2,10 +2,8 @@
-## Week of January 11, 2021
+## Week of April 26, 2021
| Published On |Topic title | Change |
|------|------------|--------|
-| 1/14/2021 | [Chromebook migration guide (Windows 10)](../windows/chromebook-migration-guide.md) | modified |
-| 1/14/2021 | [Deploy Windows 10 in a school district (Windows 10)](../windows/deploy-windows-10-in-a-school-district.md) | modified |
\ No newline at end of file
diff --git a/education/trial-in-a-box/TOC.md b/education/trial-in-a-box/TOC.md
deleted file mode 100644
index 71ed4cbd0c..0000000000
--- a/education/trial-in-a-box/TOC.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# [Microsoft Education Trial in a Box](index.md)
-## [Educator Trial in a Box Guide](educator-tib-get-started.md)
-## [IT Admin Trial in a Box Guide](itadmin-tib-get-started.md)
-## [Microsoft Education Trial in a Box Support](support-options.md)
\ No newline at end of file
diff --git a/education/trial-in-a-box/TOC.yml b/education/trial-in-a-box/TOC.yml
new file mode 100644
index 0000000000..6050d91b67
--- /dev/null
+++ b/education/trial-in-a-box/TOC.yml
@@ -0,0 +1,9 @@
+- name: Microsoft Education Trial in a Box
+ href: index.md
+ items:
+ - name: Educator Trial in a Box Guide
+ href: educator-tib-get-started.md
+ - name: IT Admin Trial in a Box Guide
+ href: itadmin-tib-get-started.md
+ - name: Microsoft Education Trial in a Box Support
+ href: support-options.md
diff --git a/education/windows/TOC.md b/education/windows/TOC.md
deleted file mode 100644
index b55cbbfe02..0000000000
--- a/education/windows/TOC.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# [Windows 10 for Education](index.md)
-## [Windows 10 editions for education customers](windows-editions-for-education-customers.md)
-## [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)
-## [Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)
-## [Set up Windows devices for education](set-up-windows-10.md)
-### [What's new in Set up School PCs](set-up-school-pcs-whats-new.md)
-### [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md)
-#### [Azure AD Join for school PCs](set-up-school-pcs-azure-ad-join.md)
-#### [Shared PC mode for school devices](set-up-school-pcs-shared-pc-mode.md)
-#### [Provisioning package settings](set-up-school-pcs-provisioning-package.md)
-### [Use the Set up School PCs app](use-set-up-school-pcs-app.md)
-### [Set up student PCs to join domain](set-up-students-pcs-to-join-domain.md)
-### [Provision student PCs with apps](set-up-students-pcs-with-apps.md)
-## [Take tests in Windows 10](take-tests-in-windows-10.md)
-### [Set up Take a Test on a single PC](take-a-test-single-pc.md)
-### [Set up Take a Test on multiple PCs](take-a-test-multiple-pcs.md)
-### [Take a Test app technical reference](take-a-test-app-technical.md)
-## [Reset devices with Autopilot Reset](autopilot-reset.md)
-## [Working with Microsoft Store for Education](education-scenarios-store-for-business.md)
-## [Get Minecraft: Education Edition](get-minecraft-for-education.md)
-### [For teachers: get Minecraft Education Edition](teacher-get-minecraft.md)
-### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md)
-### [Get Minecraft: Education Edition with Windows 10 device promotion](get-minecraft-device-promotion.md)
-## [Test Windows 10 in S mode on existing Windows 10 education devices](test-windows10s-for-edu.md)
-## [Enable Windows 10 in S mode on Surface Go devices](enable-s-mode-on-surface-go-devices.md)
-## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
-## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
-## [Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode](s-mode-switch-to-edu.md)
-## [Change to Windows 10 Pro Education from Windows 10 Pro](change-to-pro-education.md)
-## [Chromebook migration guide](chromebook-migration-guide.md)
-## [Change history for Windows 10 for Education](change-history-edu.md)
diff --git a/education/windows/TOC.yml b/education/windows/TOC.yml
new file mode 100644
index 0000000000..6571e40f23
--- /dev/null
+++ b/education/windows/TOC.yml
@@ -0,0 +1,67 @@
+- name: Windows 10 for Education
+ href: index.md
+ items:
+ - name: Windows 10 editions for education customers
+ href: windows-editions-for-education-customers.md
+ - name: Windows 10 configuration recommendations for education customers
+ href: configure-windows-for-education.md
+ - name: Deployment recommendations for school IT administrators
+ href: edu-deployment-recommendations.md
+ - name: Set up Windows devices for education
+ href: set-up-windows-10.md
+ items:
+ - name: What's new in Set up School PCs
+ href: set-up-school-pcs-whats-new.md
+ - name: Technical reference for the Set up School PCs app
+ href: set-up-school-pcs-technical.md
+ items:
+ - name: Azure AD Join for school PCs
+ href: set-up-school-pcs-azure-ad-join.md
+ - name: Shared PC mode for school devices
+ href: set-up-school-pcs-shared-pc-mode.md
+ - name: Provisioning package settings
+ href: set-up-school-pcs-provisioning-package.md
+ - name: Use the Set up School PCs app
+ href: use-set-up-school-pcs-app.md
+ - name: Set up student PCs to join domain
+ href: set-up-students-pcs-to-join-domain.md
+ - name: Provision student PCs with apps
+ href: set-up-students-pcs-with-apps.md
+ - name: Take tests in Windows 10
+ href: take-tests-in-windows-10.md
+ items:
+ - name: Set up Take a Test on a single PC
+ href: take-a-test-single-pc.md
+ - name: Set up Take a Test on multiple PCs
+ href: take-a-test-multiple-pcs.md
+ - name: Take a Test app technical reference
+ href: take-a-test-app-technical.md
+ - name: Reset devices with Autopilot Reset
+ href: autopilot-reset.md
+ - name: Working with Microsoft Store for Education
+ href: education-scenarios-store-for-business.md
+ - name: "Get Minecraft: Education Edition"
+ href: get-minecraft-for-education.md
+ items:
+ - name: "For teachers: get Minecraft Education Edition"
+ href: teacher-get-minecraft.md
+ - name: "For IT administrators: get Minecraft Education Edition"
+ href: school-get-minecraft.md
+ - name: "Get Minecraft: Education Edition with Windows 10 device promotion"
+ href: get-minecraft-device-promotion.md
+ - name: Test Windows 10 in S mode on existing Windows 10 education devices
+ href: test-windows10s-for-edu.md
+ - name: Enable Windows 10 in S mode on Surface Go devices
+ href: enable-s-mode-on-surface-go-devices.md
+ - name: Deploy Windows 10 in a school
+ href: deploy-windows-10-in-a-school.md
+ - name: Deploy Windows 10 in a school district
+ href: deploy-windows-10-in-a-school-district.md
+ - name: Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode
+ href: s-mode-switch-to-edu.md
+ - name: Change to Windows 10 Pro Education from Windows 10 Pro
+ href: change-to-pro-education.md
+ - name: Chromebook migration guide
+ href: chromebook-migration-guide.md
+ - name: Change history for Windows 10 for Education
+ href: change-history-edu.md
diff --git a/gdpr/TOC.md b/gdpr/TOC.md
deleted file mode 100644
index 06913f7aef..0000000000
--- a/gdpr/TOC.md
+++ /dev/null
@@ -1 +0,0 @@
-# [Index](index.md)
\ No newline at end of file
diff --git a/gdpr/TOC.yml b/gdpr/TOC.yml
new file mode 100644
index 0000000000..981fe6d622
--- /dev/null
+++ b/gdpr/TOC.yml
@@ -0,0 +1,2 @@
+- name: Index
+ href: index.md
diff --git a/gdpr/docfx.json b/gdpr/docfx.json
index 145ed2f444..1d092a902e 100644
--- a/gdpr/docfx.json
+++ b/gdpr/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/smb/TOC.md b/smb/TOC.md
deleted file mode 100644
index 2b4214e907..0000000000
--- a/smb/TOC.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# [Windows 10 for SMB](index.md)
-## [Get started: Deploy and manage a full cloud IT solution for your business](cloud-mode-business-setup.md)
diff --git a/smb/TOC.yml b/smb/TOC.yml
new file mode 100644
index 0000000000..45500dc1bc
--- /dev/null
+++ b/smb/TOC.yml
@@ -0,0 +1,5 @@
+- name: Windows 10 for SMB
+ href: index.md
+ items:
+ - name: "Get started: Deploy and manage a full cloud IT solution for your business"
+ href: cloud-mode-business-setup.md
diff --git a/smb/includes/smb-content-updates.md b/smb/includes/smb-content-updates.md
new file mode 100644
index 0000000000..1f83558533
--- /dev/null
+++ b/smb/includes/smb-content-updates.md
@@ -0,0 +1,9 @@
+
+
+
+
+## Week of April 26, 2021
+
+
+| Published On |Topic title | Change |
+|------|------------|--------|
diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md
deleted file mode 100644
index a0ce28d2c2..0000000000
--- a/store-for-business/TOC.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# [Microsoft Store for Business](index.md)
-## [What's new in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md)
-## [Sign up and get started](sign-up-microsoft-store-for-business-overview.md)
-### [Microsoft Store for Business and Microsoft Store for Education overview](microsoft-store-for-business-overview.md)
-### [Prerequisites for Microsoft Store for Business and Education](prerequisites-microsoft-store-for-business.md)
-### [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md)
-### [Settings reference: Microsoft Store for Business and Education](settings-reference-microsoft-store-for-business.md)
-## [Find and acquire apps](find-and-acquire-apps-overview.md)
-### [Apps in the Microsoft Store for Business and Education](apps-in-microsoft-store-for-business.md)
-### [Acquire apps](acquire-apps-microsoft-store-for-business.md)
-### [Working with line-of-business apps](working-with-line-of-business-apps.md)
-## [Distribute apps](distribute-apps-to-your-employees-microsoft-store-for-business.md)
-### [Distribute apps using your private store](distribute-apps-from-your-private-store.md)
-### [Assign apps to employees](assign-apps-to-employees.md)
-### [Distribute apps with a management tool](distribute-apps-with-management-tool.md)
-### [Distribute offline apps](distribute-offline-apps.md)
-## [Manage products and services](manage-apps-microsoft-store-for-business-overview.md)
-### [App inventory management](app-inventory-management-microsoft-store-for-business.md)
-### [Manage orders](manage-orders-microsoft-store-for-business.md)
-### [Manage access to private store](manage-access-to-private-store.md)
-### [Manage private store settings](manage-private-store-settings.md)
-### [Configure MDM provider](configure-mdm-provider-microsoft-store-for-business.md)
-### [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md)
-### [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md)
-### [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md)
-### [Working with solution providers](/microsoft-365/commerce/manage-partners)
-## [Billing and payments](billing-payments-overview.md)
-### [Understand your invoice](billing-understand-your-invoice-msfb.md)
-### [Payment methods](payment-methods.md)
-### [Understand billing profiles](billing-profile.md)
-## [Manage settings in the Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md)
-### [Update account settings](update-microsoft-store-for-business-account-settings.md)
-### [Manage user accounts](manage-users-and-groups-microsoft-store-for-business.md)
-## [Device Guard signing portal](device-guard-signing-portal.md)
-### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md)
-### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md)
-## [Troubleshoot](troubleshoot-microsoft-store-for-business.md)
-## [Notifications](notifications-microsoft-store-business.md)
-## [Change history](sfb-change-history.md)
\ No newline at end of file
diff --git a/store-for-business/TOC.yml b/store-for-business/TOC.yml
new file mode 100644
index 0000000000..c3379274a8
--- /dev/null
+++ b/store-for-business/TOC.yml
@@ -0,0 +1,86 @@
+- name: Microsoft Store for Business
+ href: index.md
+ items:
+ - name: What's new in Microsoft Store for Business and Education
+ href: whats-new-microsoft-store-business-education.md
+ - name: Sign up and get started
+ href: sign-up-microsoft-store-for-business-overview.md
+ items:
+ - name: Microsoft Store for Business and Microsoft Store for Education overview
+ href: microsoft-store-for-business-overview.md
+ - name: Prerequisites for Microsoft Store for Business and Education
+ href: prerequisites-microsoft-store-for-business.md
+ - name: Roles and permissions in the Microsoft Store for Business and Education
+ href: roles-and-permissions-microsoft-store-for-business.md
+ - name: "Settings reference: Microsoft Store for Business and Education"
+ href: settings-reference-microsoft-store-for-business.md
+ - name: Find and acquire apps
+ href: find-and-acquire-apps-overview.md
+ items:
+ - name: Apps in the Microsoft Store for Business and Education
+ href: apps-in-microsoft-store-for-business.md
+ - name: Acquire apps
+ href: acquire-apps-microsoft-store-for-business.md
+ - name: Working with line-of-business apps
+ href: working-with-line-of-business-apps.md
+ - name: Distribute apps
+ href: distribute-apps-to-your-employees-microsoft-store-for-business.md
+ items:
+ - name: Distribute apps using your private store
+ href: distribute-apps-from-your-private-store.md
+ - name: Assign apps to employees
+ href: assign-apps-to-employees.md
+ - name: Distribute apps with a management tool
+ href: distribute-apps-with-management-tool.md
+ - name: Distribute offline apps
+ href: distribute-offline-apps.md
+ - name: Manage products and services
+ href: manage-apps-microsoft-store-for-business-overview.md
+ items:
+ - name: App inventory management
+ href: app-inventory-management-microsoft-store-for-business.md
+ - name: Manage orders
+ href: manage-orders-microsoft-store-for-business.md
+ - name: Manage access to private store
+ href: manage-access-to-private-store.md
+ - name: Manage private store settings
+ href: manage-private-store-settings.md
+ - name: Configure MDM provider
+ href: configure-mdm-provider-microsoft-store-for-business.md
+ - name: Manage Windows device deployment with Windows Autopilot Deployment
+ href: add-profile-to-devices.md
+ - name: Microsoft Store for Business and Education PowerShell module - preview
+ href: microsoft-store-for-business-education-powershell-module.md
+ - name: Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business
+ href: manage-mpsa-software-microsoft-store-for-business.md
+ - name: Working with solution providers
+ href: /microsoft-365/commerce/manage-partners
+ - name: Billing and payments
+ href: billing-payments-overview.md
+ items:
+ - name: Understand your invoice
+ href: billing-understand-your-invoice-msfb.md
+ - name: Payment methods
+ href: payment-methods.md
+ - name: Understand billing profiles
+ href: billing-profile.md
+ - name: Manage settings in the Microsoft Store for Business and Education
+ href: manage-settings-microsoft-store-for-business.md
+ items:
+ - name: Update account settings
+ href: update-microsoft-store-for-business-account-settings.md
+ - name: Manage user accounts
+ href: manage-users-and-groups-microsoft-store-for-business.md
+ - name: Device Guard signing portal
+ href: device-guard-signing-portal.md
+ items:
+ - name: Add unsigned app to code integrity policy
+ href: add-unsigned-app-to-code-integrity-policy.md
+ - name: Sign code integrity policy with Device Guard signing
+ href: sign-code-integrity-policy-with-device-guard-signing.md
+ - name: Troubleshoot
+ href: troubleshoot-microsoft-store-for-business.md
+ - name: Notifications
+ href: notifications-microsoft-store-business.md
+ - name: Change history
+ href: sfb-change-history.md
diff --git a/store-for-business/education/TOC.md b/store-for-business/education/TOC.md
deleted file mode 100644
index f6d8cc393d..0000000000
--- a/store-for-business/education/TOC.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# [Microsoft Store for Education](../index.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [What's new in Microsoft Store for Business and Education](../whats-new-microsoft-store-business-education.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Sign up and get started](../sign-up-microsoft-store-for-business-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Microsoft Store for Business and Education overview](../microsoft-store-for-business-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Prerequisites for Microsoft Store for Business and Education](../prerequisites-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Sign up for Microsoft Store for Business or Microsoft Store for Education](/microsoft-store/sign-up-microsoft-store-for-business?toc=/microsoft-store/education/toc.json)
-### [Roles and permissions in the Microsoft Store for Business and Education](../roles-and-permissions-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Settings reference: Microsoft Store for Business and Education](../settings-reference-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Working with Microsoft Store for Education](/education/windows/education-scenarios-store-for-business?toc=/microsoft-store/education/toc.json)
-## [Find and acquire apps](../find-and-acquire-apps-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Apps in the Microsoft Store for Business and Education](../apps-in-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Acquire apps in the Microsoft Store for Business and Education](../acquire-apps-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Working with line-of-business apps](../working-with-line-of-business-apps.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Get Minecraft: Education Edition](/education/windows/get-minecraft-for-education?toc=/microsoft-store/education/toc.json)
-### [For teachers: get Minecraft Education Edition](/education/windows/teacher-get-minecraft?toc=/microsoft-store/education/toc.json)
-### [For IT administrators: get Minecraft Education Edition](/education/windows/school-get-minecraft?toc=/microsoft-store/education/toc.json)
-### [Get Minecraft: Education Edition with Windows 10 device promotion](/education/windows/get-minecraft-device-promotion?toc=/microsoft-store/education/toc.json)
-## [Distribute apps to your employees from the Microsoft Store for Business and Education](../distribute-apps-to-your-employees-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Distribute apps using your private store](../distribute-apps-from-your-private-store.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Assign apps to employees](../assign-apps-to-employees.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Distribute apps with a management tool](../distribute-apps-with-management-tool.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Distribute offline apps](../distribute-offline-apps.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Manage products and services](../manage-apps-microsoft-store-for-business-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [App inventory management for Microsoft Store for Business](../app-inventory-management-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Manage app orders in Microsoft Store for Business and Education](../manage-orders-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Manage access to private store](../manage-access-to-private-store.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Manage private store settings](../manage-private-store-settings.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Configure MDM provider](../configure-mdm-provider-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Manage Windows device deployment with Windows Autopilot Deployment](../add-profile-to-devices.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Microsoft Store for Business and Education PowerShell module - preview](../microsoft-store-for-business-education-powershell-module.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](../manage-mpsa-software-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Device Guard signing portal](../device-guard-signing-portal.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Add unsigned app to code integrity policy](../add-unsigned-app-to-code-integrity-policy.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Sign code integrity policy with Device Guard signing](../sign-code-integrity-policy-with-device-guard-signing.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Manage settings in the Microsoft Store for Business and Education](../manage-settings-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Update Microsoft Store for Business and Microsoft Store for Education account settings](../update-microsoft-store-for-business-account-settings.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-### [Manage user accounts in Microsoft Store for Business and Education](../manage-users-and-groups-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Troubleshoot Microsoft Store for Business](../troubleshoot-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
-## [Notifications in Microsoft Store for Business and Education](../notifications-microsoft-store-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json)
\ No newline at end of file
diff --git a/store-for-business/education/TOC.yml b/store-for-business/education/TOC.yml
new file mode 100644
index 0000000000..edb38bce1a
--- /dev/null
+++ b/store-for-business/education/TOC.yml
@@ -0,0 +1,86 @@
+- name: Microsoft Store for Education
+ href: ../index.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: What's new in Microsoft Store for Business and Education
+ href: ../whats-new-microsoft-store-business-education.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Sign up and get started
+ href: ../sign-up-microsoft-store-for-business-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: Microsoft Store for Business and Education overview
+ href: ../microsoft-store-for-business-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Prerequisites for Microsoft Store for Business and Education
+ href: ../prerequisites-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Sign up for Microsoft Store for Business or Microsoft Store for Education
+ href: /microsoft-store/sign-up-microsoft-store-for-business?toc=/microsoft-store/education/toc.json
+ - name: Roles and permissions in the Microsoft Store for Business and Education
+ href: ../roles-and-permissions-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: "Settings reference: Microsoft Store for Business and Education"
+ href: ../settings-reference-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Working with Microsoft Store for Education
+ href: /education/windows/education-scenarios-store-for-business?toc=/microsoft-store/education/toc.json
+ - name: Find and acquire apps
+ href: ../find-and-acquire-apps-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: Apps in the Microsoft Store for Business and Education
+ href: ../apps-in-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Acquire apps in the Microsoft Store for Business and Education
+ href: ../acquire-apps-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Working with line-of-business apps
+ href: ../working-with-line-of-business-apps.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: "Get Minecraft: Education Edition"
+ href: /education/windows/get-minecraft-for-education?toc=/microsoft-store/education/toc.json
+ items:
+ - name: "For teachers: get Minecraft Education Edition"
+ href: /education/windows/teacher-get-minecraft?toc=/microsoft-store/education/toc.json
+ - name: "For IT administrators: get Minecraft Education Edition"
+ href: /education/windows/school-get-minecraft?toc=/microsoft-store/education/toc.json
+ - name: "Get Minecraft: Education Edition with Windows 10 device promotion"
+ href: /education/windows/get-minecraft-device-promotion?toc=/microsoft-store/education/toc.json
+ - name: Distribute apps to your employees from the Microsoft Store for Business and Education
+ href: ../distribute-apps-to-your-employees-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: Distribute apps using your private store
+ href: ../distribute-apps-from-your-private-store.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Assign apps to employees
+ href: ../assign-apps-to-employees.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Distribute apps with a management tool
+ href: ../distribute-apps-with-management-tool.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Distribute offline apps
+ href: ../distribute-offline-apps.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage products and services
+ href: ../manage-apps-microsoft-store-for-business-overview.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: App inventory management for Microsoft Store for Business
+ href: ../app-inventory-management-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage app orders in Microsoft Store for Business and Education
+ href: ../manage-orders-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage access to private store
+ href: ../manage-access-to-private-store.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage private store settings
+ href: ../manage-private-store-settings.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Configure MDM provider
+ href: ../configure-mdm-provider-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage Windows device deployment with Windows Autopilot Deployment
+ href: ../add-profile-to-devices.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Microsoft Store for Business and Education PowerShell module - preview
+ href: ../microsoft-store-for-business-education-powershell-module.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business
+ href: ../manage-mpsa-software-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Device Guard signing portal
+ href: ../device-guard-signing-portal.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: Add unsigned app to code integrity policy
+ href: ../add-unsigned-app-to-code-integrity-policy.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Sign code integrity policy with Device Guard signing
+ href: ../sign-code-integrity-policy-with-device-guard-signing.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage settings in the Microsoft Store for Business and Education
+ href: ../manage-settings-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ items:
+ - name: Update Microsoft Store for Business and Microsoft Store for Education account settings
+ href: ../update-microsoft-store-for-business-account-settings.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Manage user accounts in Microsoft Store for Business and Education
+ href: ../manage-users-and-groups-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Troubleshoot Microsoft Store for Business
+ href: ../troubleshoot-microsoft-store-for-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
+ - name: Notifications in Microsoft Store for Business and Education
+ href: ../notifications-microsoft-store-business.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json
diff --git a/store-for-business/includes/store-for-business-content-updates.md b/store-for-business/includes/store-for-business-content-updates.md
index 5bfd1836da..1f83558533 100644
--- a/store-for-business/includes/store-for-business-content-updates.md
+++ b/store-for-business/includes/store-for-business-content-updates.md
@@ -2,20 +2,8 @@
-## Week of March 22, 2021
+## Week of April 26, 2021
| Published On |Topic title | Change |
|------|------------|--------|
-| 3/26/2021 | [Acquire apps in Microsoft Store for Business (Windows 10)](/microsoft-store/acquire-apps-microsoft-store-for-business) | modified |
-| 3/26/2021 | [Apps in Microsoft Store for Business and Education (Windows 10)](/microsoft-store/apps-in-microsoft-store-for-business) | modified |
-| 3/26/2021 | [Change history for Microsoft Store for Business and Education](/microsoft-store/sfb-change-history) | modified |
-| 3/26/2021 | [Whats new in Microsoft Store for Business and Education](/microsoft-store/release-history-microsoft-store-business-education) | modified |
-
-
-## Week of March 15, 2021
-
-
-| Published On |Topic title | Change |
-|------|------------|--------|
-| 3/17/2021 | [Roles and permissions in Microsoft Store for Business and Education (Windows 10)](/microsoft-store/roles-and-permissions-microsoft-store-for-business) | modified |
diff --git a/windows/access-protection/docfx.json b/windows/access-protection/docfx.json
index 2f90a93cf1..fff71782f2 100644
--- a/windows/access-protection/docfx.json
+++ b/windows/access-protection/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/application-management/TOC.md b/windows/application-management/TOC.md
deleted file mode 100644
index 45491337c3..0000000000
--- a/windows/application-management/TOC.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# [Manage applications in Windows 10](index.md)
-## [Sideload apps](sideload-apps-in-windows-10.md)
-## [Remove background task resource restrictions](enterprise-background-activity-controls.md)
-## [Enable or block Windows Mixed Reality apps in the enterprise](manage-windows-mixed-reality.md)
-## [Understand apps in Windows 10](apps-in-windows-10.md)
-## [Add apps and features in Windows 10](add-apps-and-features.md)
-## [Repackage win32 apps in the MSIX format](msix-app-packaging-tool.md)
-## [Application Virtualization (App-V) for Windows](app-v/appv-for-windows.md)
-### [Getting Started with App-V](app-v/appv-getting-started.md)
-#### [What's new in App-V for Windows 10, version 1703 and earlier](app-v/appv-about-appv.md)
-##### [Release Notes for App-V for Windows 10, version 1607](app-v/appv-release-notes-for-appv-for-windows.md)
-##### [Release Notes for App-V for Windows 10, version 1703](app-v/appv-release-notes-for-appv-for-windows-1703.md)
-#### [Evaluating App-V](app-v/appv-evaluating-appv.md)
-#### [High Level Architecture for App-V](app-v/appv-high-level-architecture.md)
-### [Planning for App-V](app-v/appv-planning-for-appv.md)
-#### [Preparing Your Environment for App-V](app-v/appv-preparing-your-environment.md)
-##### [App-V Prerequisites](app-v/appv-prerequisites.md)
-##### [App-V Security Considerations](app-v/appv-security-considerations.md)
-#### [Planning to Deploy App-V](app-v/appv-planning-to-deploy-appv.md)
-##### [App-V Supported Configurations](app-v/appv-supported-configurations.md)
-##### [App-V Capacity Planning](app-v/appv-capacity-planning.md)
-##### [Planning for High Availability with App-V](app-v/appv-planning-for-high-availability-with-appv.md)
-##### [Planning to Deploy App-V with an Electronic Software Distribution System](app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md)
-##### [Planning for the App-V Server Deployment](app-v/appv-planning-for-appv-server-deployment.md)
-##### [Planning for the App-V Sequencer and Client Deployment](app-v/appv-planning-for-sequencer-and-client-deployment.md)
-##### [Planning for Using App-V with Office](app-v/appv-planning-for-using-appv-with-office.md)
-##### [Planning to Use Folder Redirection with App-V](app-v/appv-planning-folder-redirection-with-appv.md)
-#### [App-V Planning Checklist](app-v/appv-planning-checklist.md)
-### [Deploying App-V](app-v/appv-deploying-appv.md)
-#### [Deploying the App-V Sequencer and Configuring the Client](app-v/appv-deploying-the-appv-sequencer-and-client.md)
-##### [About Client Configuration Settings](app-v/appv-client-configuration-settings.md)
-##### [Enable the App-V desktop client](app-v/appv-enable-the-app-v-desktop-client.md)
-##### [How to Install the Sequencer](app-v/appv-install-the-sequencer.md)
-#### [Deploying the App-V Server](app-v/appv-deploying-the-appv-server.md)
-##### [How to Deploy the App-V Server](app-v/appv-deploy-the-appv-server.md)
-##### [How to Deploy the App-V Server Using a Script](app-v/appv-deploy-the-appv-server-with-a-script.md)
-##### [How to Deploy the App-V Databases by Using SQL Scripts](app-v/appv-deploy-appv-databases-with-sql-scripts.md)
-##### [How to Install the Publishing Server on a Remote Computer](app-v/appv-install-the-publishing-server-on-a-remote-computer.md)
-##### [How to Install the Management and Reporting Databases on Separate Computers from the Management and Reporting Services](app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md)
-##### [How to install the Management Server on a Standalone Computer and Connect it to the Database](app-v/appv-install-the-management-server-on-a-standalone-computer.md)
-##### [About App-V Reporting](app-v/appv-reporting.md)
-##### [How to install the Reporting Server on a Standalone Computer and Connect it to the Database](app-v/appv-install-the-reporting-server-on-a-standalone-computer.md)
-#### [App-V Deployment Checklist](app-v/appv-deployment-checklist.md)
-#### [Deploying Microsoft Office 2016 by Using App-V](app-v/appv-deploying-microsoft-office-2016-with-appv.md)
-#### [Deploying Microsoft Office 2013 by Using App-V](app-v/appv-deploying-microsoft-office-2013-with-appv.md)
-#### [Deploying Microsoft Office 2010 by Using App-V](app-v/appv-deploying-microsoft-office-2010-wth-appv.md)
-### [Operations for App-V](app-v/appv-operations.md)
-#### [Creating and Managing App-V Virtualized Applications](app-v/appv-creating-and-managing-virtualized-applications.md)
-##### [Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-auto-provision-a-vm.md)
-##### [Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-auto-batch-sequencing.md)
-##### [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-auto-batch-updating.md)
-##### [Manually sequence a new app using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-sequence-a-new-application.md)
-##### [How to Modify an Existing Virtual Application Package](app-v/appv-modify-an-existing-virtual-application-package.md)
-##### [How to Create and Use a Project Template](app-v/appv-create-and-use-a-project-template.md)
-##### [How to Create a Package Accelerator](app-v/appv-create-a-package-accelerator.md)
-##### [How to Create a Virtual Application Package Using an App-V Package Accelerator](app-v/appv-create-a-virtual-application-package-package-accelerator.md)
-#### [Administering App-V Virtual Applications by Using the Management Console](app-v/appv-administering-virtual-applications-with-the-management-console.md)
-##### [About App-V Dynamic Configuration](app-v/appv-dynamic-configuration.md)
-##### [How to Connect to the Management Console](app-v/appv-connect-to-the-management-console.md)
-##### [How to Add or Upgrade Packages by Using the Management Console](app-v/appv-add-or-upgrade-packages-with-the-management-console.md)
-##### [How to Configure Access to Packages by Using the Management Console](app-v/appv-configure-access-to-packages-with-the-management-console.md)
-##### [How to Publish a Package by Using the Management Console](app-v/appv-publish-a-packages-with-the-management-console.md)
-##### [How to Delete a Package in the Management Console](app-v/appv-delete-a-package-with-the-management-console.md)
-##### [How to Add or Remove an Administrator by Using the Management Console](app-v/appv-add-or-remove-an-administrator-with-the-management-console.md)
-##### [How to Register and Unregister a Publishing Server by Using the Management Console](app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md)
-##### [How to Create a Custom Configuration File by Using the App-V Management Console](app-v/appv-create-a-custom-configuration-file-with-the-management-console.md)
-##### [How to Transfer Access and Configurations to Another Version of a Package by Using the Management Console](app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md)
-##### [How to Customize Virtual Applications Extensions for a Specific AD Group by Using the Management Console](app-v/appv-customize-virtual-application-extensions-with-the-management-console.md)
-##### [How to View and Configure Applications and Default Virtual Application Extensions by Using the Management Console](app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md)
-#### [Managing Connection Groups](app-v/appv-managing-connection-groups.md)
-##### [About the Connection Group Virtual Environment](app-v/appv-connection-group-virtual-environment.md)
-##### [About the Connection Group File](app-v/appv-connection-group-file.md)
-##### [How to Create a Connection Group](app-v/appv-create-a-connection-group.md)
-##### [How to Create a Connection Group with User-Published and Globally Published Packages](app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md)
-##### [How to Delete a Connection Group](app-v/appv-delete-a-connection-group.md)
-##### [How to Publish a Connection Group](app-v/appv-publish-a-connection-group.md)
-##### [How to Make a Connection Group Ignore the Package Version](app-v/appv-configure-connection-groups-to-ignore-the-package-version.md)
-##### [How to Allow Only Administrators to Enable Connection Groups](app-v/appv-allow-administrators-to-enable-connection-groups.md)
-#### [Deploying App-V Packages by Using Electronic Software Distribution (ESD)](app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md)
-##### [How to deploy App-V Packages Using Electronic Software Distribution](app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md)
-##### [How to Enable Only Administrators to Publish Packages by Using an ESD](app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md)
-#### [Using the App-V Client Management Console](app-v/appv-using-the-client-management-console.md)
-##### [Automatically clean-up unpublished packages on the App-V client](app-v/appv-auto-clean-unpublished-packages.md)
-#### [Migrating to App-V from a Previous Version](app-v/appv-migrating-to-appv-from-a-previous-version.md)
-##### [How to Convert a Package Created in a Previous Version of App-V](app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md)
-#### [Maintaining App-V](app-v/appv-maintaining-appv.md)
-##### [How to Move the App-V Server to Another Computer](app-v/appv-move-the-appv-server-to-another-computer.md)
-#### [Administering App-V by Using Windows PowerShell](app-v/appv-administering-appv-with-powershell.md)
-##### [How to Load the Windows PowerShell Cmdlets for App-V and Get Cmdlet Help](app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md)
-##### [How to Manage App-V Packages Running on a Stand-Alone Computer by Using Windows PowerShell](app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md)
-##### [How to Manage Connection Groups on a Stand-alone Computer by Using Windows PowerShell](app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md)
-##### [How to Modify Client Configuration by Using Windows PowerShell](app-v/appv-modify-client-configuration-with-powershell.md)
-##### [How to Configure the Client to Receive Package and Connection Groups Updates From the Publishing Server](app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md)
-##### [How to Apply the User Configuration File by Using Windows PowerShell](app-v/appv-apply-the-user-configuration-file-with-powershell.md)
-##### [How to Apply the Deployment Configuration File by Using Windows PowerShell](app-v/appv-apply-the-deployment-configuration-file-with-powershell.md)
-##### [How to Sequence a Package by Using Windows PowerShell](app-v/appv-sequence-a-package-with-powershell.md)
-##### [How to Create a Package Accelerator by Using Windows PowerShell](app-v/appv-create-a-package-accelerator-with-powershell.md)
-##### [How to Enable Reporting on the App-V Client by Using Windows PowerShell](app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md)
-##### [How to Install the App-V Databases and Convert the Associated Security Identifiers by Using Windows PowerShell](app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md)
-### [Troubleshooting App-V](app-v/appv-troubleshooting.md)
-### [Technical Reference for App-V](app-v/appv-technical-reference.md)
-#### [Available Mobile Device Management (MDM) settings for App-V](app-v/appv-available-mdm-settings.md)
-#### [Performance Guidance for Application Virtualization](app-v/appv-performance-guidance.md)
-#### [Application Publishing and Client Interaction](app-v/appv-application-publishing-and-client-interaction.md)
-#### [Viewing App-V Server Publishing Metadata](app-v/appv-viewing-appv-server-publishing-metadata.md)
-#### [Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications](app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md)
-## [Service Host process refactoring](svchost-service-refactoring.md)
-## [Per-user services in Windows](per-user-services-in-windows.md)
-## [Disabling System Services in Windows Server](/windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server)
-## [Deploy app upgrades on Windows 10 Mobile](deploy-app-upgrades-windows-10-mobile.md)
-## [Change history for Application management](change-history-for-application-management.md)
-## [How to keep apps removed from Windows 10 from returning during an update](remove-provisioned-apps-during-update.md)
\ No newline at end of file
diff --git a/windows/application-management/add-apps-and-features.md b/windows/application-management/add-apps-and-features.md
index 89fdaaf04c..2834995eab 100644
--- a/windows/application-management/add-apps-and-features.md
+++ b/windows/application-management/add-apps-and-features.md
@@ -5,8 +5,8 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: article
-ms.author: dansimp
-author: msfttracyp
+ms.author: greglin
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 04/26/2018
ms.reviewer:
diff --git a/windows/application-management/app-v/appv-about-appv.md b/windows/application-management/app-v/appv-about-appv.md
index b1dcf3d7f6..83fd92e681 100644
--- a/windows/application-management/app-v/appv-about-appv.md
+++ b/windows/application-management/app-v/appv-about-appv.md
@@ -1,7 +1,7 @@
---
title: What's new in App-V for Windows 10, version 1703 and earlier (Windows 10)
description: Information about what's new in App-V for Windows 10, version 1703 and earlier.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# What's new in App-V for Windows 10, version 1703 and earlier
diff --git a/windows/application-management/app-v/appv-add-or-remove-an-administrator-with-the-management-console.md b/windows/application-management/app-v/appv-add-or-remove-an-administrator-with-the-management-console.md
index 8e37f9eb2f..2b8eb78f4d 100644
--- a/windows/application-management/app-v/appv-add-or-remove-an-administrator-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-add-or-remove-an-administrator-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to Add or Remove an Administrator by Using the Management Console (Windows 10)
description: Add or remove an administrator on the Microsoft Application Virtualization (App-V) server by using the Management Console.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to add or remove an administrator by using the Management Console
diff --git a/windows/application-management/app-v/appv-add-or-upgrade-packages-with-the-management-console.md b/windows/application-management/app-v/appv-add-or-upgrade-packages-with-the-management-console.md
index c26f77e8e4..d09522b1ba 100644
--- a/windows/application-management/app-v/appv-add-or-upgrade-packages-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-add-or-upgrade-packages-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to Add or Upgrade Packages by Using the Management Console (Windows 10)
description: Add or remove an administrator on the Microsoft Application Virtualization (App-V) server by using the Management Console.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to add or upgrade packages by using the Management Console
diff --git a/windows/application-management/app-v/appv-administering-appv-with-powershell.md b/windows/application-management/app-v/appv-administering-appv-with-powershell.md
index 58a0c8b25d..fd18bc7d76 100644
--- a/windows/application-management/app-v/appv-administering-appv-with-powershell.md
+++ b/windows/application-management/app-v/appv-administering-appv-with-powershell.md
@@ -1,7 +1,7 @@
---
title: Administering App-V by using Windows PowerShell (Windows 10)
description: Administer App-V by using Windows PowerShell and learn where to find more information about PowerShell for App-V.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Administering App-V by using Windows PowerShell
diff --git a/windows/application-management/app-v/appv-administering-virtual-applications-with-the-management-console.md b/windows/application-management/app-v/appv-administering-virtual-applications-with-the-management-console.md
index 82f1d28429..9b26750d0e 100644
--- a/windows/application-management/app-v/appv-administering-virtual-applications-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-administering-virtual-applications-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: Administering App-V Virtual Applications by using the Management Console (Windows 10)
description: Administering App-V Virtual Applications by using the Management Console
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Administering App-V Virtual Applications by using the Management Console
diff --git a/windows/application-management/app-v/appv-allow-administrators-to-enable-connection-groups.md b/windows/application-management/app-v/appv-allow-administrators-to-enable-connection-groups.md
index e9537f973b..af9ea8e786 100644
--- a/windows/application-management/app-v/appv-allow-administrators-to-enable-connection-groups.md
+++ b/windows/application-management/app-v/appv-allow-administrators-to-enable-connection-groups.md
@@ -1,7 +1,7 @@
---
title: Only Allow Admins to Enable Connection Groups (Windows 10)
description: Configure the App-V client so that only administrators, not users, can enable or disable connection groups.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to allow only administrators to enable connection groups
diff --git a/windows/application-management/app-v/appv-application-publishing-and-client-interaction.md b/windows/application-management/app-v/appv-application-publishing-and-client-interaction.md
index ace2fb67c1..b522d68ad8 100644
--- a/windows/application-management/app-v/appv-application-publishing-and-client-interaction.md
+++ b/windows/application-management/app-v/appv-application-publishing-and-client-interaction.md
@@ -1,7 +1,7 @@
---
title: Application Publishing and Client Interaction (Windows 10)
description: Learn technical information about common App-V Client operations and their integration with the local operating system.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Application publishing and client interaction
diff --git a/windows/application-management/app-v/appv-apply-the-deployment-configuration-file-with-powershell.md b/windows/application-management/app-v/appv-apply-the-deployment-configuration-file-with-powershell.md
index 5ba6786e15..bf6f0effd2 100644
--- a/windows/application-management/app-v/appv-apply-the-deployment-configuration-file-with-powershell.md
+++ b/windows/application-management/app-v/appv-apply-the-deployment-configuration-file-with-powershell.md
@@ -1,7 +1,7 @@
---
title: Apply deployment config file via Windows PowerShell (Windows 10)
description: How to apply the deployment configuration file by using Windows PowerShell for Windows 10.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/15/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to apply the deployment configuration file by using Windows PowerShell
diff --git a/windows/application-management/app-v/appv-apply-the-user-configuration-file-with-powershell.md b/windows/application-management/app-v/appv-apply-the-user-configuration-file-with-powershell.md
index e3abc3524a..851e74f1e6 100644
--- a/windows/application-management/app-v/appv-apply-the-user-configuration-file-with-powershell.md
+++ b/windows/application-management/app-v/appv-apply-the-user-configuration-file-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to apply the user configuration file by using Windows PowerShell (Windows 10)
description: How to apply the user configuration file by using Windows PowerShell (Windows 10).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/15/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to apply the user configuration file by using Windows PowerShell
diff --git a/windows/application-management/app-v/appv-auto-batch-sequencing.md b/windows/application-management/app-v/appv-auto-batch-sequencing.md
index a1e082c4bb..fe2fe8690a 100644
--- a/windows/application-management/app-v/appv-auto-batch-sequencing.md
+++ b/windows/application-management/app-v/appv-auto-batch-sequencing.md
@@ -1,7 +1,7 @@
---
title: Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer) (Windows 10)
description: How to automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)
diff --git a/windows/application-management/app-v/appv-auto-batch-updating.md b/windows/application-management/app-v/appv-auto-batch-updating.md
index 18506158bf..24651988b3 100644
--- a/windows/application-management/app-v/appv-auto-batch-updating.md
+++ b/windows/application-management/app-v/appv-auto-batch-updating.md
@@ -1,7 +1,7 @@
---
title: Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer) (Windows 10)
description: How to automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)
diff --git a/windows/application-management/app-v/appv-auto-clean-unpublished-packages.md b/windows/application-management/app-v/appv-auto-clean-unpublished-packages.md
index 3acd5f85db..acf7bb3cdf 100644
--- a/windows/application-management/app-v/appv-auto-clean-unpublished-packages.md
+++ b/windows/application-management/app-v/appv-auto-clean-unpublished-packages.md
@@ -1,7 +1,7 @@
---
title: Auto-remove unpublished packages on App-V client (Windows 10)
description: How to automatically clean up any unpublished packages on your App-V client devices.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/15/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Automatically clean up unpublished packages on the App-V client
diff --git a/windows/application-management/app-v/appv-auto-provision-a-vm.md b/windows/application-management/app-v/appv-auto-provision-a-vm.md
index 1cb284903c..1acb2935e3 100644
--- a/windows/application-management/app-v/appv-auto-provision-a-vm.md
+++ b/windows/application-management/app-v/appv-auto-provision-a-vm.md
@@ -1,7 +1,7 @@
---
title: Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer) (Windows 10)
description: How to automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer) PowerShell cmdlet or the user interface.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)
diff --git a/windows/application-management/app-v/appv-available-mdm-settings.md b/windows/application-management/app-v/appv-available-mdm-settings.md
index e0089bc26a..2b73883501 100644
--- a/windows/application-management/app-v/appv-available-mdm-settings.md
+++ b/windows/application-management/app-v/appv-available-mdm-settings.md
@@ -1,7 +1,7 @@
---
title: Available Mobile Device Management (MDM) settings for App-V (Windows 10)
description: Learn the available Mobile Device Management (MDM) settings you can use to configure App-V on Windows 10.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/15/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Available Mobile Device Management (MDM) settings for App-V
diff --git a/windows/application-management/app-v/appv-capacity-planning.md b/windows/application-management/app-v/appv-capacity-planning.md
index d3c80a88c9..76f23f4537 100644
--- a/windows/application-management/app-v/appv-capacity-planning.md
+++ b/windows/application-management/app-v/appv-capacity-planning.md
@@ -1,7 +1,7 @@
---
title: App-V Capacity Planning (Windows 10)
description: Use these recommendations as a baseline to help determine capacity planning information that is appropriate to your organization’s App-V infrastructure.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# App-V Capacity Planning
diff --git a/windows/application-management/app-v/appv-client-configuration-settings.md b/windows/application-management/app-v/appv-client-configuration-settings.md
index f641b232d6..b0821ae348 100644
--- a/windows/application-management/app-v/appv-client-configuration-settings.md
+++ b/windows/application-management/app-v/appv-client-configuration-settings.md
@@ -1,7 +1,7 @@
---
title: About Client Configuration Settings (Windows 10)
description: Learn about the App-V client configuration settings and how to use Windows PowerShell to modify the client configuration settings.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# About Client Configuration Settings
diff --git a/windows/application-management/app-v/appv-configure-access-to-packages-with-the-management-console.md b/windows/application-management/app-v/appv-configure-access-to-packages-with-the-management-console.md
index a4d1d3bb4f..82dca3e617 100644
--- a/windows/application-management/app-v/appv-configure-access-to-packages-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-configure-access-to-packages-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to configure access to packages by using the Management Console (Windows 10)
description: How to configure access to packages by using the App-V Management Console.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to configure access to packages by using the Management Console
diff --git a/windows/application-management/app-v/appv-configure-connection-groups-to-ignore-the-package-version.md b/windows/application-management/app-v/appv-configure-connection-groups-to-ignore-the-package-version.md
index ea6f204d50..12b44773a7 100644
--- a/windows/application-management/app-v/appv-configure-connection-groups-to-ignore-the-package-version.md
+++ b/windows/application-management/app-v/appv-configure-connection-groups-to-ignore-the-package-version.md
@@ -1,7 +1,7 @@
---
title: How to make a connection group ignore the package version (Windows 10)
description: Learn how to make a connection group ignore the package version with the App-V Server Management Console.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to make a connection group ignore the package version
diff --git a/windows/application-management/app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md b/windows/application-management/app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
index bef16f0060..9dadc20365 100644
--- a/windows/application-management/app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
+++ b/windows/application-management/app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
@@ -1,7 +1,7 @@
---
title: How to configure the client to receive package and connection groups updates from the publishing server (Windows 10)
description: How to configure the client to receive package and connection groups updates from the publishing server.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/25/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to configure the client to receive package and connection groups updates from the publishing server
diff --git a/windows/application-management/app-v/appv-connect-to-the-management-console.md b/windows/application-management/app-v/appv-connect-to-the-management-console.md
index d585386b76..b2414c2635 100644
--- a/windows/application-management/app-v/appv-connect-to-the-management-console.md
+++ b/windows/application-management/app-v/appv-connect-to-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to connect to the Management Console (Windows 10)
description: In this article, learn the procedure for connecting to the App-V Management Console through your web browser.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/25/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to connect to the Management Console
diff --git a/windows/application-management/app-v/appv-connection-group-file.md b/windows/application-management/app-v/appv-connection-group-file.md
index 16d0bd518e..70072685d4 100644
--- a/windows/application-management/app-v/appv-connection-group-file.md
+++ b/windows/application-management/app-v/appv-connection-group-file.md
@@ -1,7 +1,7 @@
---
title: About the connection group file (Windows 10)
description: A summary of what the connection group file is and how to configure it.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/25/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# About the connection group file
diff --git a/windows/application-management/app-v/appv-connection-group-virtual-environment.md b/windows/application-management/app-v/appv-connection-group-virtual-environment.md
index 743c824815..a1a9c16649 100644
--- a/windows/application-management/app-v/appv-connection-group-virtual-environment.md
+++ b/windows/application-management/app-v/appv-connection-group-virtual-environment.md
@@ -1,7 +1,7 @@
---
title: About the connection group virtual environment (Windows 10)
description: Learn how the connection group virtual environment works and how package priority is determined.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 06/25/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# About the connection group virtual environment
diff --git a/windows/application-management/app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md b/windows/application-management/app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md
index 36691ab472..44e0487b4e 100644
--- a/windows/application-management/app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md
+++ b/windows/application-management/app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md
@@ -1,7 +1,7 @@
---
title: How to convert a package created in a previous version of App-V (Windows 10)
description: Use the package converter utility to convert a virtual application package created in a previous version of App-V.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to convert a package created in a previous version of App-V
@@ -40,22 +40,22 @@ The App-V package converter will save the App-V 4.6 installation root folder and
- **Test-AppvLegacyPackage**—This cmdlet checks packages. It will return information about any failures with the package such as missing **.sft** files, an invalid source, **.osd** file errors, or invalid package version. This cmdlet will not parse the **.sft** file or do any in-depth validation. For information about options and basic functionality for this cmdlet, using Windows PowerShell, enter the following cmdlet:
- ```PowerShell
- Test-AppvLegacyPackage -?
- ```
+ ```PowerShell
+ Test-AppvLegacyPackage -?
+ ```
- **ConvertFrom-AppvLegacyPackage**—This cmdlet converts packages from legacy versions to updated versions. To convert an existing package, enter the following cmdlet:
- ```PowerShell
- ConvertFrom-AppvLegacyPackage C:\contentStore C:\convertedPackages
- ```
+ ```PowerShell
+ ConvertFrom-AppvLegacyPackage C:\contentStore C:\convertedPackages
+ ```
In this cmdlet, `C:\contentStore` represents the location of the existing package and `C:\convertedPackages` is the output directory to which the resulting App-V for Windows 10 virtual application package file will be saved. By default, if you do not specify a new name, the old package name will be used.
Additionally, the package converter optimizes performance of packages in App-V for Windows 10 by setting the package to stream fault the App-V package. This is more performant than the primary feature block and fully downloading the package. The flag **DownloadFullPackageOnFirstLaunch** allows you to convert the package and set the package to be fully downloaded by default.
-> [!NOTE]
- >Before you specify the output directory, you must create the output directory.
+ > [!NOTE]
+ > Before you specify the output directory, you must create the output directory.
### Advanced Conversion Tips
@@ -75,23 +75,20 @@ The App-V package converter will save the App-V 4.6 installation root folder and
- Batching—The Windows PowerShell command enables batching. More specifically, the cmdlets support taking a string\[\] object for the *-Source* parameter that represents a list of directory paths. This allows you to enter the following cmdlets together:
- ```PowerShell
- $packages = dir C:\contentStore
- ConvertFrom-AppvLegacyAppvPackage-Source $packages -Target C:\ConvertedPackages
- ```
+ ```PowerShell
+ $packages = dir C:\contentStore
+ ConvertFrom-AppvLegacyAppvPackage-Source $packages -Target C:\ConvertedPackages
+ ```
- Alternatively, you can use piping like this:
+ Alternatively, you can use piping like this:
- ```PowerShell
- dir C:\ContentStore | ConvertFrom-AppvLegacyAppvPackage -Target C:\ConvertedPackages
- ```
+ ```PowerShell
+ dir C:\ContentStore | ConvertFrom-AppvLegacyAppvPackage -Target C:\ConvertedPackages
+ ```
- Other functionality—Windows PowerShell has other built-in functionality for features such as aliases, lazy-binding, .NET Object, and many others. These features can help you create advanced scenarios for the Package Converter.
-
-
-
## Related topics
- [Operations for App-V](appv-operations.md)
diff --git a/windows/application-management/app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md b/windows/application-management/app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
index 62787b9a7c..1b3212816f 100644
--- a/windows/application-management/app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
+++ b/windows/application-management/app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
@@ -1,7 +1,7 @@
---
title: How to create a connection croup with user-published and globally published packages (Windows 10)
description: How to create a connection croup with user-published and globally published packages.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to create a connection croup with user-published and globally published packages
diff --git a/windows/application-management/app-v/appv-create-a-connection-group.md b/windows/application-management/app-v/appv-create-a-connection-group.md
index 509167b5f4..38fb3646e7 100644
--- a/windows/application-management/app-v/appv-create-a-connection-group.md
+++ b/windows/application-management/app-v/appv-create-a-connection-group.md
@@ -1,7 +1,7 @@
---
title: How to create a connection group (Windows 10)
description: Learn how to create a connection group with the App-V Management Console and where to find information about managing connection groups.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to create a connection group
diff --git a/windows/application-management/app-v/appv-create-a-custom-configuration-file-with-the-management-console.md b/windows/application-management/app-v/appv-create-a-custom-configuration-file-with-the-management-console.md
index 42081976ef..34f45644e9 100644
--- a/windows/application-management/app-v/appv-create-a-custom-configuration-file-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-create-a-custom-configuration-file-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to create a custom configuration file by using the App-V Management Console (Windows 10)
description: How to create a custom configuration file by using the App-V Management Console.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to create a custom configuration file by using the App-V Management Console
diff --git a/windows/application-management/app-v/appv-create-a-package-accelerator-with-powershell.md b/windows/application-management/app-v/appv-create-a-package-accelerator-with-powershell.md
index d6a62ddf52..3e6fe295f1 100644
--- a/windows/application-management/app-v/appv-create-a-package-accelerator-with-powershell.md
+++ b/windows/application-management/app-v/appv-create-a-package-accelerator-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to create a package accelerator by using Windows PowerShell (Windows 10)
description: Learn how to create an App-v Package Accelerator by using Windows PowerShell. App-V Package Accelerators automatically sequence large, complex applications.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to create a package accelerator by using Windows PowerShell
diff --git a/windows/application-management/app-v/appv-create-a-package-accelerator.md b/windows/application-management/app-v/appv-create-a-package-accelerator.md
index d2c69c8afb..19d0617e41 100644
--- a/windows/application-management/app-v/appv-create-a-package-accelerator.md
+++ b/windows/application-management/app-v/appv-create-a-package-accelerator.md
@@ -1,7 +1,7 @@
---
title: How to create a package accelerator (Windows 10)
description: Learn how to create App-V Package Accelerators to automatically generate new virtual application packages.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to create a package accelerator
diff --git a/windows/application-management/app-v/appv-create-a-virtual-application-package-package-accelerator.md b/windows/application-management/app-v/appv-create-a-virtual-application-package-package-accelerator.md
index 200f0481e4..f091625f1a 100644
--- a/windows/application-management/app-v/appv-create-a-virtual-application-package-package-accelerator.md
+++ b/windows/application-management/app-v/appv-create-a-virtual-application-package-package-accelerator.md
@@ -1,7 +1,7 @@
---
title: How to create a virtual application package using an App-V Package Accelerator (Windows 10)
description: How to create a virtual application package using an App-V Package Accelerator.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to create a virtual application package using an App-V Package Accelerator
diff --git a/windows/application-management/app-v/appv-create-and-use-a-project-template.md b/windows/application-management/app-v/appv-create-and-use-a-project-template.md
index 21bfd31f68..4927af50b8 100644
--- a/windows/application-management/app-v/appv-create-and-use-a-project-template.md
+++ b/windows/application-management/app-v/appv-create-and-use-a-project-template.md
@@ -1,7 +1,7 @@
---
title: Create and apply an App-V project template to a sequenced App-V package (Windows 10)
description: Steps for how to create and apply an App-V project template (.appvt) to a sequenced App-V package.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Create and apply an App-V project template to a sequenced App-V package
diff --git a/windows/application-management/app-v/appv-creating-and-managing-virtualized-applications.md b/windows/application-management/app-v/appv-creating-and-managing-virtualized-applications.md
index 30debd58c4..d3110cf110 100644
--- a/windows/application-management/app-v/appv-creating-and-managing-virtualized-applications.md
+++ b/windows/application-management/app-v/appv-creating-and-managing-virtualized-applications.md
@@ -1,7 +1,7 @@
---
title: Creating and managing App-V virtualized applications (Windows 10)
description: Create and manage App-V virtualized applications to monitor and record the installation process for an application to be run as a virtualized application.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Creating and managing App-V virtualized applications
diff --git a/windows/application-management/app-v/appv-customize-virtual-application-extensions-with-the-management-console.md b/windows/application-management/app-v/appv-customize-virtual-application-extensions-with-the-management-console.md
index ebbdf508c3..b6ed9b54af 100644
--- a/windows/application-management/app-v/appv-customize-virtual-application-extensions-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-customize-virtual-application-extensions-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to customize virtual application extensions for a specific AD group by using the Management Console (Windows 10)
description: How to customize virtual application extensions for a specific AD group by using the Management Console.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 07/10/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to customize virtual applications extensions for a specific AD group by using the Management Console
diff --git a/windows/application-management/app-v/appv-delete-a-connection-group.md b/windows/application-management/app-v/appv-delete-a-connection-group.md
index 60a5518fe9..a252b5a53d 100644
--- a/windows/application-management/app-v/appv-delete-a-connection-group.md
+++ b/windows/application-management/app-v/appv-delete-a-connection-group.md
@@ -1,7 +1,7 @@
---
title: How to delete a connection group (Windows 10)
description: Learn how to delete an existing App-V connection group in the App-V Management Console and where to find information about managing connection groups.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to delete a connection group
diff --git a/windows/application-management/app-v/appv-delete-a-package-with-the-management-console.md b/windows/application-management/app-v/appv-delete-a-package-with-the-management-console.md
index 27a1adeb35..989346048b 100644
--- a/windows/application-management/app-v/appv-delete-a-package-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-delete-a-package-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to delete a package in the Management Console (Windows 10)
description: Learn how to delete a package in the App-V Management Console and where to find information about operations for App-V.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to delete a package in the Management Console
diff --git a/windows/application-management/app-v/appv-deploy-appv-databases-with-sql-scripts.md b/windows/application-management/app-v/appv-deploy-appv-databases-with-sql-scripts.md
index f7ccc22f58..8fd2c674f6 100644
--- a/windows/application-management/app-v/appv-deploy-appv-databases-with-sql-scripts.md
+++ b/windows/application-management/app-v/appv-deploy-appv-databases-with-sql-scripts.md
@@ -1,7 +1,7 @@
---
title: How to Deploy the App-V Databases by Using SQL Scripts (Windows 10)
description: Learn how to use SQL scripts to install the App-V databases and upgrade the App-V databases to a later version.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to deploy the App-V databases by using SQL scripts
diff --git a/windows/application-management/app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
index 29719a0f8c..0d670783b7 100644
--- a/windows/application-management/app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
+++ b/windows/application-management/app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
@@ -1,7 +1,7 @@
---
title: How to deploy App-V packages using electronic software distribution (Windows 10)
description: Learn how use an electronic software distribution (ESD) system to deploy App-V virtual applications to App-V clients.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to deploy App-V packages using electronic software distribution
diff --git a/windows/application-management/app-v/appv-deploy-the-appv-server-with-a-script.md b/windows/application-management/app-v/appv-deploy-the-appv-server-with-a-script.md
index f2c8cc0af3..467272455a 100644
--- a/windows/application-management/app-v/appv-deploy-the-appv-server-with-a-script.md
+++ b/windows/application-management/app-v/appv-deploy-the-appv-server-with-a-script.md
@@ -1,7 +1,7 @@
---
title: How to Deploy the App-V Server Using a Script (Windows 10)
description: 'Learn how to deploy the App-V server by using a script (appv_server_setup.exe) from the command line.'
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to deploy the App-V server using a script
diff --git a/windows/application-management/app-v/appv-deploy-the-appv-server.md b/windows/application-management/app-v/appv-deploy-the-appv-server.md
index ec7bcac622..e8fa0ac8b9 100644
--- a/windows/application-management/app-v/appv-deploy-the-appv-server.md
+++ b/windows/application-management/app-v/appv-deploy-the-appv-server.md
@@ -1,7 +1,7 @@
---
title: How to Deploy the App-V Server (Windows 10)
description: Use these instructions to deploy the Application Virtualization (App-V) Server in App-V for Windows 10.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to Deploy the App-V Server (new installation)
@@ -33,9 +33,13 @@ ms.topic: article
* The [MSDN (Microsoft Developer Network) subscriptions site](https://msdn.microsoft.com/subscriptions/downloads/default.aspx#FileId=65215). You must have a MSDN subscription to download the MDOP ISO package from this site.
* The [Volume Licensing Service Center](https://www.microsoft.com/licensing/default.aspx) if you're using [Windows 10 for Enterprise or Education](https://www.microsoft.com/WindowsForBusiness/windows-product-home).
+
2. Copy the App-V server installation files to the computer on which you want to install it.
+
3. Start the App-V server installation by right-clicking and running **appv\_server\_setup.exe** as an administrator, and then click **Install**.
+
4. Review and accept the license terms, and choose whether to enable Microsoft updates.
+
5. On the **Feature Selection** page, select all components listed in the following table.
| Component | Description |
@@ -45,27 +49,33 @@ ms.topic: article
| Publishing server | Provides hosting and streaming functionality for virtual applications. |
| Reporting server | Provides App-V reporting services. |
| Reporting database | Facilitates database predeployments for App-V reporting. |
+
6. On the **Installation Location** page, accept the default location where the selected components will be installed, or change the location by typing a new path on the **Installation Location** line.
+
7. On the initial **Create New Management Database** page, configure the **Microsoft SQL Server instance** and **Management Server database** by selecting the appropriate option below.
| Method | What you need to do |
|---|---|
| You are using a custom Microsoft SQL Server instance. | Select **Use the custom instance**, then specify the instance name.
Use the format **INSTANCENAME**. The assumed installation location is the local computer.
Not supported: A server name using the format **ServerName**\\**INSTANCE**.|
| You are using a custom database name. | Select **Custom configuration** and type the database name.
The database name must be unique, or the installation will fail.|
+
8. On the **Configure** page, accept the default value, **Use this local computer**.
> [!NOTE]
- >If you're installing the Management server and Management database side-by-side, the appropriate options are selected by default and cannot be changed.
+ > If you're installing the Management server and Management database side-by-side, the appropriate options are selected by default and cannot be changed.
+
9. On the initial **Create New Reporting Database** page, configure the **Microsoft SQL Server instance** and **Reporting Server database** by selecting the appropriate option below.
| Method | What you need to do |
|---|---|
| You are using a custom Microsoft SQL Server instance. | Select **Use the custom instance**, and type the name of the instance.
Use the format **INSTANCENAME**. The assumed installation location is the local computer.
Not supported: A server name using the format **ServerName**\\**INSTANCE**.|
| You are using a custom database name. | Select **Custom configuration** and type the database name.
The database name must be unique, or the installation will fail.|
+
10. On the **Configure** page, accept the default value: **Use this local computer**.
- > [!NOTE]
- >If you're installing the Management server and Management database side-by-side, the appropriate options are selected by default and cannot be changed.
+ > [!NOTE]
+ > If you're installing the Management server and Management database side-by-side, the appropriate options are selected by default and cannot be changed.
+
11. On the **Configure** (Management Server Configuration) page, specify the following:
| Item to configure | Description and examples |
@@ -73,6 +83,7 @@ ms.topic: article
| Specify AD group | Specify the AD group with sufficient permissions to manage the App-V environment. Example: MyDomain\MyUser
After installation, you can add users or groups on the management console. However, global security groups and Active Directory Domain Services (AD DS) distribution groups are not supported. You must use Domain local or Universal groups to perform this action.|
|Website name | Specify the custom name that will be used to run the publishing service.
If you do not have a custom name, you don't have to change it.|
|Port binding | Specify a unique port number that will be used by App-V. Example: **12345**
Ensure that the port specified is not being used by another website. |
+
12. On the **Configure Publishing Server Configuration** page, specify the following:
| Item to configure | Description and examples |
@@ -80,18 +91,21 @@ ms.topic: article
| Specify the management service URL | Example: http://localhost:12345 |
| Website name | Specify the custom website name that will be used to run the publishing service.
If you do not have a custom name, do not make any changes. |
| Port binding | Specify a unique port number that will be used by App-V. Example: 54321
Ensure that the port specified is not being used by another website. |
+
13. On the **Reporting Server** page, specify the following:
| Item to configure | Description and examples |
|---|---|
| Website name | Specify the custom name that will be used to run the Reporting Service.
If you do not have a custom name, do not make any changes. |
| Port binding | Specify a unique port number that will be used by App-V. Example: 55555
Ensure that the port specified is not being used by another website.|
+
14. To start the installation, click **Install** on the **Ready** page, and then click **Close** on the **Finished** page.
+
15. To verify that the setup completed successfully, open a web browser, and type the following URL with the bracketed variables adjusted according to your specifications in the earlier steps:
- ```http://:/console.html```
+ `http://:/console.html`
- Example: ```http://localhost:12345/console.html```. If the installation succeeded, the App-V Management console will display with no errors.
+ Example: `http://localhost:12345/console.html`. If the installation succeeded, the App-V Management console will display with no errors.
## Related topics
diff --git a/windows/application-management/app-v/appv-deploying-appv.md b/windows/application-management/app-v/appv-deploying-appv.md
index 5061447ca8..04cd90525d 100644
--- a/windows/application-management/app-v/appv-deploying-appv.md
+++ b/windows/application-management/app-v/appv-deploying-appv.md
@@ -1,7 +1,7 @@
---
title: Deploying App-V (Windows 10)
description: App-V supports several different deployment options. Learn how to complete App-V deployment at different stages in your App-V deployment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying App-V for Windows 10
diff --git a/windows/application-management/app-v/appv-deploying-microsoft-office-2010-wth-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2010-wth-appv.md
index 143b808f76..7a38ac29e7 100644
--- a/windows/application-management/app-v/appv-deploying-microsoft-office-2010-wth-appv.md
+++ b/windows/application-management/app-v/appv-deploying-microsoft-office-2010-wth-appv.md
@@ -1,7 +1,7 @@
---
title: Deploying Microsoft Office 2010 by Using App-V (Windows 10)
description: Create Office 2010 packages for Microsoft Application Virtualization (App-V) using the App-V Sequencer or the App-V Package Accelerator.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying Microsoft Office 2010 by Using App-V
diff --git a/windows/application-management/app-v/appv-deploying-microsoft-office-2013-with-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2013-with-appv.md
index 9a10805448..778f467100 100644
--- a/windows/application-management/app-v/appv-deploying-microsoft-office-2013-with-appv.md
+++ b/windows/application-management/app-v/appv-deploying-microsoft-office-2013-with-appv.md
@@ -1,7 +1,7 @@
---
title: Deploying Microsoft Office 2013 by Using App-V (Windows 10)
description: Use Application Virtualization (App-V) to deliver Microsoft Office 2013 as a virtualized application to computers in your organization.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying Microsoft Office 2013 by Using App-V
diff --git a/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md
index 1cc721db34..654fa05a45 100644
--- a/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md
+++ b/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md
@@ -1,7 +1,7 @@
---
title: Deploying Microsoft Office 2016 by using App-V (Windows 10)
description: Use Application Virtualization (App-V) to deliver Microsoft Office 2016 as a virtualized application to computers in your organization.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying Microsoft Office 2016 by using App-V
diff --git a/windows/application-management/app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
index 6164ddf1fb..032233877b 100644
--- a/windows/application-management/app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
+++ b/windows/application-management/app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
@@ -1,7 +1,7 @@
---
title: Deploying App-V packages by using electronic software distribution (ESD)
description: Deploying App-V packages by using electronic software distribution (ESD)
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying App-V packages by using electronic software distribution (ESD)
diff --git a/windows/application-management/app-v/appv-deploying-the-appv-sequencer-and-client.md b/windows/application-management/app-v/appv-deploying-the-appv-sequencer-and-client.md
index 15f8f520d4..9547612b38 100644
--- a/windows/application-management/app-v/appv-deploying-the-appv-sequencer-and-client.md
+++ b/windows/application-management/app-v/appv-deploying-the-appv-sequencer-and-client.md
@@ -1,7 +1,7 @@
---
title: Deploying the App-V Sequencer and configuring the client (Windows 10)
description: Learn how to deploy the App-V Sequencer and configure the client by using the ADMX template and Group Policy.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying the App-V Sequencer and configuring the client
diff --git a/windows/application-management/app-v/appv-deploying-the-appv-server.md b/windows/application-management/app-v/appv-deploying-the-appv-server.md
index fad40ca584..71d9510a36 100644
--- a/windows/application-management/app-v/appv-deploying-the-appv-server.md
+++ b/windows/application-management/app-v/appv-deploying-the-appv-server.md
@@ -1,7 +1,7 @@
---
title: Deploying the App-V Server (Windows 10)
description: Learn how to deploy the Application Virtualization (App-V) Server in App-V for Windows 10 by using different deployment configurations described in this article.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Deploying the App-V server
@@ -35,11 +35,15 @@ App-V offers the following five server components, each of which serves a specif
* **Management server.** Use the App-V management server and console to manage your App-V infrastructure. See [Administering App-V with the management console](appv-administering-virtual-applications-with-the-management-console.md) for more information about the management server.
- > [!NOTE]
- >If you are using App-V with your electronic software distribution solution, you don’t need to use the management server and console. However, you may want to take advantage of the reporting and streaming capabilities in App-V.
+ > [!NOTE]
+ > If you are using App-V with your electronic software distribution solution, you don’t need to use the management server and console. However, you may want to take advantage of the reporting and streaming capabilities in App-V.
+
* **Management database.** Use the App-V management database to facilitate database pre-deployments for App-V management. For more information about the management database, see [How to deploy the App-V server](appv-deploy-the-appv-server.md).
+
* **Publishing server.** Use the App-V publishing server to host and stream virtual applications. The publishing server supports the HTTP and HTTPS protocols and does not require a database connection. To learn how to configure the publishing server, see [How to install the App-V publishing server](appv-install-the-publishing-server-on-a-remote-computer.md).
+
* **Reporting server.** Use the App-V reporting server to generate reports that help you manage your App-V infrastructure. The reporting server requires a connection to the reporting database. To learn more about App-V's reporting capabilities, see [About App-V reporting](appv-reporting.md).
+
* **Reporting database.** Use the App-V reporting database to facilitate database pre-deployments for App-V reporting. To learn more about the reporting database, see [How to deploy the App-V server](appv-deploy-the-appv-server.md).
All five App-V server components are included in the Microsoft Desktop Optimization Pack (MDOP) 2015 ISO package, which can be downloaded from either of the following locations:
diff --git a/windows/application-management/app-v/appv-deployment-checklist.md b/windows/application-management/app-v/appv-deployment-checklist.md
index e64dfcb45c..501a6eae9f 100644
--- a/windows/application-management/app-v/appv-deployment-checklist.md
+++ b/windows/application-management/app-v/appv-deployment-checklist.md
@@ -1,7 +1,7 @@
---
title: App-V Deployment Checklist (Windows 10)
description: Use the App-V deployment checklist to understand the recommended steps and items to consider when deploying App-V features.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# App-V Deployment Checklist
diff --git a/windows/application-management/app-v/appv-dynamic-configuration.md b/windows/application-management/app-v/appv-dynamic-configuration.md
index fac027c816..8d5b3cafad 100644
--- a/windows/application-management/app-v/appv-dynamic-configuration.md
+++ b/windows/application-management/app-v/appv-dynamic-configuration.md
@@ -1,7 +1,7 @@
---
title: About App-V Dynamic Configuration (Windows 10)
description: Learn how to create or edit an existing Application Virtualization (App-V) dynamic configuration file.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# About App-V dynamic configuration
diff --git a/windows/application-management/app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
index 013c9bf60d..93ddd8f4d6 100644
--- a/windows/application-management/app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
+++ b/windows/application-management/app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
@@ -1,7 +1,7 @@
---
title: How to Enable Only Administrators to Publish Packages by Using an ESD (Windows 10)
description: Learn how to enable only administrators to publish packages by bsing an electronic software delivery (ESD).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to enable only administrators to publish packages by using an ESD
diff --git a/windows/application-management/app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md b/windows/application-management/app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md
index ba86d9400f..8b6dd8e9fc 100644
--- a/windows/application-management/app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md
+++ b/windows/application-management/app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to Enable Reporting on the App-V Client by Using Windows PowerShell (Windows 10)
description: How to Enable Reporting on the App-V Client by Using Windows PowerShell
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to Enable Reporting on the App-V Client by Using Windows PowerShell
diff --git a/windows/application-management/app-v/appv-enable-the-app-v-desktop-client.md b/windows/application-management/app-v/appv-enable-the-app-v-desktop-client.md
index e9352f15ee..7aa623a0a3 100644
--- a/windows/application-management/app-v/appv-enable-the-app-v-desktop-client.md
+++ b/windows/application-management/app-v/appv-enable-the-app-v-desktop-client.md
@@ -1,7 +1,7 @@
---
title: Enable the App-V in-box client (Windows 10)
description: Learn how to enable the Microsoft Application Virtualization (App-V) in-box client installed with Windows 10.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Enable the App-V in-box client
diff --git a/windows/application-management/app-v/appv-evaluating-appv.md b/windows/application-management/app-v/appv-evaluating-appv.md
index c5d8ac6964..3ee9e20feb 100644
--- a/windows/application-management/app-v/appv-evaluating-appv.md
+++ b/windows/application-management/app-v/appv-evaluating-appv.md
@@ -1,7 +1,7 @@
---
title: Evaluating App-V (Windows 10)
description: Learn how to evaluate App-V for Windows 10 in a lab environment before deploying into a production environment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-for-windows.md b/windows/application-management/app-v/appv-for-windows.md
index d089cb3371..bcea5b5e47 100644
--- a/windows/application-management/app-v/appv-for-windows.md
+++ b/windows/application-management/app-v/appv-for-windows.md
@@ -1,7 +1,7 @@
---
title: Application Virtualization (App-V) (Windows 10)
description: See various topics that can help you administer Application Virtualization (App-V) and its components.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Application Virtualization (App-V) for Windows 10 overview
diff --git a/windows/application-management/app-v/appv-getting-started.md b/windows/application-management/app-v/appv-getting-started.md
index d689d83a5b..56cf023ddc 100644
--- a/windows/application-management/app-v/appv-getting-started.md
+++ b/windows/application-management/app-v/appv-getting-started.md
@@ -1,7 +1,7 @@
---
title: Getting Started with App-V (Windows 10)
description: Get started with Microsoft Application Virtualization (App-V) for Windows 10. App-V for Windows 10 delivers Win32 applications to users as virtual applications.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Getting started with App-V for Windows 10
diff --git a/windows/application-management/app-v/appv-high-level-architecture.md b/windows/application-management/app-v/appv-high-level-architecture.md
index cf81569563..7c11b77a24 100644
--- a/windows/application-management/app-v/appv-high-level-architecture.md
+++ b/windows/application-management/app-v/appv-high-level-architecture.md
@@ -1,7 +1,7 @@
---
title: High-level architecture for App-V (Windows 10)
description: Use the information in this article to simplify your Microsoft Application Virtualization (App-V) deployment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# High-level architecture for App-V
diff --git a/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md b/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
index fed3c5c9ec..b0daa8e5c6 100644
--- a/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
+++ b/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to Install the App-V Databases and Convert the Associated Security Identifiers by Using Windows PowerShell (Windows 10)
description: How to Install the App-V Databases and Convert the Associated Security Identifiers by Using Windows PowerShell
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md b/windows/application-management/app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md
index 2b99c85da9..b48c88fe55 100644
--- a/windows/application-management/app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md
+++ b/windows/application-management/app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md
@@ -1,7 +1,7 @@
---
title: How to Install the Management and Reporting Databases on separate computers from the Management and Reporting Services (Windows 10)
description: How to install the Management and Reporting Databases on separate computers from the Management and Reporting Services.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to Install the Management and Reporting Databases on separate computers from the Management and Reporting Services
diff --git a/windows/application-management/app-v/appv-install-the-management-server-on-a-standalone-computer.md b/windows/application-management/app-v/appv-install-the-management-server-on-a-standalone-computer.md
index f8c387ecb8..9a7bb5df47 100644
--- a/windows/application-management/app-v/appv-install-the-management-server-on-a-standalone-computer.md
+++ b/windows/application-management/app-v/appv-install-the-management-server-on-a-standalone-computer.md
@@ -1,7 +1,7 @@
---
title: How to install the Management Server on a Standalone Computer and Connect it to the Database (Windows 10)
description: How to install the Management Server on a Standalone Computer and Connect it to the Database
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to install the Management Server on a Standalone Computer and Connect it to the Database
diff --git a/windows/application-management/app-v/appv-install-the-publishing-server-on-a-remote-computer.md b/windows/application-management/app-v/appv-install-the-publishing-server-on-a-remote-computer.md
index df6dc6c726..3ac42e959a 100644
--- a/windows/application-management/app-v/appv-install-the-publishing-server-on-a-remote-computer.md
+++ b/windows/application-management/app-v/appv-install-the-publishing-server-on-a-remote-computer.md
@@ -1,7 +1,7 @@
---
title: Install the Publishing Server on a Remote Computer (Windows 10)
description: Use the procedures in this article to install the Microsoft Application Virtualization (App-V) publishing server on a separate computer.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to install the publishing server on a remote computer
diff --git a/windows/application-management/app-v/appv-install-the-reporting-server-on-a-standalone-computer.md b/windows/application-management/app-v/appv-install-the-reporting-server-on-a-standalone-computer.md
index 17251170f3..41fb1e6ffa 100644
--- a/windows/application-management/app-v/appv-install-the-reporting-server-on-a-standalone-computer.md
+++ b/windows/application-management/app-v/appv-install-the-reporting-server-on-a-standalone-computer.md
@@ -1,7 +1,7 @@
---
title: How to install the Reporting Server on a standalone computer and connect it to the database (Windows 10)
description: How to install the App-V Reporting Server on a Standalone Computer and Connect it to the Database
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to install the reporting server on a standalone computer and connect it to the database
diff --git a/windows/application-management/app-v/appv-install-the-sequencer.md b/windows/application-management/app-v/appv-install-the-sequencer.md
index 0c3ae2e9a0..e8785b3d7f 100644
--- a/windows/application-management/app-v/appv-install-the-sequencer.md
+++ b/windows/application-management/app-v/appv-install-the-sequencer.md
@@ -1,7 +1,7 @@
---
title: Install the App-V Sequencer (Windows 10)
description: Learn how to install the App-V Sequencer to convert Win32 applications into virtual packages for deployment to user devices.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Install the App-V Sequencer
diff --git a/windows/application-management/app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md b/windows/application-management/app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
index febbd0b2da..3f38081e58 100644
--- a/windows/application-management/app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
+++ b/windows/application-management/app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
@@ -1,7 +1,7 @@
---
title: How to Load the Windows PowerShell Cmdlets for App-V and Get Cmdlet Help (Windows 10)
description: How to Load the Windows PowerShell Cmdlets for App-V and Get Cmdlet Help
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to load the Windows PowerShell cmdlets for App-V and get cmdlet help
diff --git a/windows/application-management/app-v/appv-maintaining-appv.md b/windows/application-management/app-v/appv-maintaining-appv.md
index ca2c8811c9..6375ae29ad 100644
--- a/windows/application-management/app-v/appv-maintaining-appv.md
+++ b/windows/application-management/app-v/appv-maintaining-appv.md
@@ -1,7 +1,7 @@
---
title: Maintaining App-V (Windows 10)
description: After you have deployed App-V for Windows 10, you can use the following information to maintain the App-V infrastructure.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Maintaining App-V
diff --git a/windows/application-management/app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md b/windows/application-management/app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
index 964437cc18..278b757481 100644
--- a/windows/application-management/app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
+++ b/windows/application-management/app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to manage App-V packages running on a stand-alone computer by using Windows PowerShell (Windows 10)
description: How to manage App-V packages running on a stand-alone computer by using Windows PowerShell.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/24/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to manage App-V packages running on a stand-alone computer by using Windows PowerShell
diff --git a/windows/application-management/app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md b/windows/application-management/app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
index d6e03d17a6..5333448a99 100644
--- a/windows/application-management/app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
+++ b/windows/application-management/app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to Manage Connection Groups on a Stand-alone Computer by Using Windows PowerShell (Windows 10)
description: How to Manage Connection Groups on a Stand-alone Computer by Using Windows PowerShell
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-managing-connection-groups.md b/windows/application-management/app-v/appv-managing-connection-groups.md
index f308ee42da..1a1fed1187 100644
--- a/windows/application-management/app-v/appv-managing-connection-groups.md
+++ b/windows/application-management/app-v/appv-managing-connection-groups.md
@@ -1,7 +1,7 @@
---
title: Managing Connection Groups (Windows 10)
description: Connection groups can allow administrators to manage packages independently and avoid having to add the same application multiple times to a client computer.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-migrating-to-appv-from-a-previous-version.md b/windows/application-management/app-v/appv-migrating-to-appv-from-a-previous-version.md
index c852fb9f1a..da8bf8b6cc 100644
--- a/windows/application-management/app-v/appv-migrating-to-appv-from-a-previous-version.md
+++ b/windows/application-management/app-v/appv-migrating-to-appv-from-a-previous-version.md
@@ -1,7 +1,7 @@
---
title: Migrating to App-V from a Previous Version (Windows 10)
description: Learn how to migrate to Microsoft Application Virtualization (App-V) for Windows 10 from a previous version.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-modify-an-existing-virtual-application-package.md b/windows/application-management/app-v/appv-modify-an-existing-virtual-application-package.md
index 6a6da20d55..0cc6df1e55 100644
--- a/windows/application-management/app-v/appv-modify-an-existing-virtual-application-package.md
+++ b/windows/application-management/app-v/appv-modify-an-existing-virtual-application-package.md
@@ -1,7 +1,7 @@
---
title: How to Modify an Existing Virtual Application Package (Windows 10)
description: Learn how to modify an existing virtual application package and add a new application to an existing virtual application package.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-modify-client-configuration-with-powershell.md b/windows/application-management/app-v/appv-modify-client-configuration-with-powershell.md
index 9b7fa5dc90..ad99c8c0b2 100644
--- a/windows/application-management/app-v/appv-modify-client-configuration-with-powershell.md
+++ b/windows/application-management/app-v/appv-modify-client-configuration-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to Modify Client Configuration by Using Windows PowerShell (Windows 10)
description: Learn how to modify the Application Virtualization (App-V) client configuration by using Windows PowerShell.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-move-the-appv-server-to-another-computer.md b/windows/application-management/app-v/appv-move-the-appv-server-to-another-computer.md
index 8d46833f6d..ea80b1f3c8 100644
--- a/windows/application-management/app-v/appv-move-the-appv-server-to-another-computer.md
+++ b/windows/application-management/app-v/appv-move-the-appv-server-to-another-computer.md
@@ -1,7 +1,7 @@
---
title: How to Move the App-V Server to Another Computer (Windows 10)
description: Learn how to create a new management server console in your environment and learn how to connect it to the App-V database.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-operations.md b/windows/application-management/app-v/appv-operations.md
index a916d38776..91ddd5b656 100644
--- a/windows/application-management/app-v/appv-operations.md
+++ b/windows/application-management/app-v/appv-operations.md
@@ -1,7 +1,7 @@
---
title: Operations for App-V (Windows 10)
description: Learn about the various types of App-V administration and operating tasks that are typically performed by an administrator.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Operations for App-V
diff --git a/windows/application-management/app-v/appv-performance-guidance.md b/windows/application-management/app-v/appv-performance-guidance.md
index bb51e1fee6..dba895b3b1 100644
--- a/windows/application-management/app-v/appv-performance-guidance.md
+++ b/windows/application-management/app-v/appv-performance-guidance.md
@@ -1,7 +1,7 @@
---
title: Performance Guidance for Application Virtualization (Windows 10)
description: Learn how to configure App-V for optimal performance, optimize virtual app packages, and provide a better user experience with RDS and VDI.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-planning-checklist.md b/windows/application-management/app-v/appv-planning-checklist.md
index e2d9776c2c..e838f04c45 100644
--- a/windows/application-management/app-v/appv-planning-checklist.md
+++ b/windows/application-management/app-v/appv-planning-checklist.md
@@ -1,7 +1,7 @@
---
title: App-V Planning Checklist (Windows 10)
description: Learn about the recommended steps and items to consider when planning an Application Virtualization (App-V) deployment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# App-V Planning Checklist
diff --git a/windows/application-management/app-v/appv-planning-folder-redirection-with-appv.md b/windows/application-management/app-v/appv-planning-folder-redirection-with-appv.md
index 0b9b995319..18032d260a 100644
--- a/windows/application-management/app-v/appv-planning-folder-redirection-with-appv.md
+++ b/windows/application-management/app-v/appv-planning-folder-redirection-with-appv.md
@@ -1,7 +1,7 @@
---
title: Planning to Use Folder Redirection with App-V (Windows 10)
description: Learn about folder redirection with App-V. Folder redirection enables users and administrators to redirect the path of a folder to a new location.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning to Use Folder Redirection with App-V
diff --git a/windows/application-management/app-v/appv-planning-for-appv-server-deployment.md b/windows/application-management/app-v/appv-planning-for-appv-server-deployment.md
index 94b436fd53..f17f8cf5e9 100644
--- a/windows/application-management/app-v/appv-planning-for-appv-server-deployment.md
+++ b/windows/application-management/app-v/appv-planning-for-appv-server-deployment.md
@@ -1,7 +1,7 @@
---
title: Planning for the App-V Server Deployment (Windows 10)
description: Learn what you need to know so you can plan for the Microsoft Application Virtualization (App-V) 5.1 server deployment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning for the App-V server deployment
diff --git a/windows/application-management/app-v/appv-planning-for-appv.md b/windows/application-management/app-v/appv-planning-for-appv.md
index 39d5199ea8..94081c7ff8 100644
--- a/windows/application-management/app-v/appv-planning-for-appv.md
+++ b/windows/application-management/app-v/appv-planning-for-appv.md
@@ -1,7 +1,7 @@
---
title: Planning for App-V (Windows 10)
description: Use the information in this article to plan to deploy App-V without disrupting your existing network or user experience.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning for App-V
diff --git a/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
index daa0698829..4cdce6102f 100644
--- a/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
+++ b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
@@ -1,7 +1,7 @@
---
title: Planning for High Availability with App-V Server
description: Learn what you need to know so you can plan for high availability with Application Virtualization (App-V) server.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning for high availability with App-V Server
diff --git a/windows/application-management/app-v/appv-planning-for-sequencer-and-client-deployment.md b/windows/application-management/app-v/appv-planning-for-sequencer-and-client-deployment.md
index 52019b0496..f6e0a38b9e 100644
--- a/windows/application-management/app-v/appv-planning-for-sequencer-and-client-deployment.md
+++ b/windows/application-management/app-v/appv-planning-for-sequencer-and-client-deployment.md
@@ -1,7 +1,7 @@
---
title: Planning for the App-V Sequencer and Client Deployment (Windows 10)
description: Learn what you need to do to plan for the App-V Sequencer and Client deployment, and where to find additional information about the deployment process.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning for the App-V Sequencer and Client Deployment
diff --git a/windows/application-management/app-v/appv-planning-for-using-appv-with-office.md b/windows/application-management/app-v/appv-planning-for-using-appv-with-office.md
index 32b20fa1e6..9db1afb81a 100644
--- a/windows/application-management/app-v/appv-planning-for-using-appv-with-office.md
+++ b/windows/application-management/app-v/appv-planning-for-using-appv-with-office.md
@@ -1,7 +1,7 @@
---
title: Planning for Deploying App-V with Office (Windows 10)
description: Use the information in this article to plan how to deploy Office within Microsoft Application Virtualization (App-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning for deploying App-V with Office
diff --git a/windows/application-management/app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
index b4f2aa7341..a5ab9870cf 100644
--- a/windows/application-management/app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
+++ b/windows/application-management/app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
@@ -1,7 +1,7 @@
---
title: Planning to Deploy App-V with an Electronic Software Distribution System (Windows 10)
description: Planning to Deploy App-V with an Electronic Software Distribution System
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning to Deploy App-V with an electronic software distribution system
diff --git a/windows/application-management/app-v/appv-planning-to-deploy-appv.md b/windows/application-management/app-v/appv-planning-to-deploy-appv.md
index f08a2b2b44..0b26e63e8a 100644
--- a/windows/application-management/app-v/appv-planning-to-deploy-appv.md
+++ b/windows/application-management/app-v/appv-planning-to-deploy-appv.md
@@ -1,7 +1,7 @@
---
title: Planning to Deploy App-V (Windows 10)
description: Learn about the different deployment configurations and requirements to consider before you deploy App-V for Windows 10.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Planning to Deploy App-V for Windows 10
diff --git a/windows/application-management/app-v/appv-preparing-your-environment.md b/windows/application-management/app-v/appv-preparing-your-environment.md
index 991209bd1b..9753d170ef 100644
--- a/windows/application-management/app-v/appv-preparing-your-environment.md
+++ b/windows/application-management/app-v/appv-preparing-your-environment.md
@@ -7,9 +7,9 @@ ms.sitesec: library
ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
-author: dansimp
+author: greg-lindsay
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Preparing your environment for App-V
diff --git a/windows/application-management/app-v/appv-prerequisites.md b/windows/application-management/app-v/appv-prerequisites.md
index f9a46fe013..2cdfd2d90c 100644
--- a/windows/application-management/app-v/appv-prerequisites.md
+++ b/windows/application-management/app-v/appv-prerequisites.md
@@ -1,7 +1,7 @@
---
title: App-V Prerequisites (Windows 10)
description: Learn about the prerequisites you need before you begin installing Application Virtualization (App-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/18/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# App-V for Windows 10 prerequisites
diff --git a/windows/application-management/app-v/appv-publish-a-connection-group.md b/windows/application-management/app-v/appv-publish-a-connection-group.md
index e7fb9c1327..27eb277fc2 100644
--- a/windows/application-management/app-v/appv-publish-a-connection-group.md
+++ b/windows/application-management/app-v/appv-publish-a-connection-group.md
@@ -1,7 +1,7 @@
---
title: How to Publish a Connection Group (Windows 10)
description: Learn how to publish a connection group to computers that run the Application Virtualization (App-V) client.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to Publish a Connection Group
diff --git a/windows/application-management/app-v/appv-publish-a-packages-with-the-management-console.md b/windows/application-management/app-v/appv-publish-a-packages-with-the-management-console.md
index 0bd0ff8e80..c438b69062 100644
--- a/windows/application-management/app-v/appv-publish-a-packages-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-publish-a-packages-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to publish a package by using the Management console (Windows 10)
description: Learn how the Management console in App-V can help you enable admin controls as well as publish App-V packages.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 09/27/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# How to publish a package by using the Management console
diff --git a/windows/application-management/app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md b/windows/application-management/app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
index 74a2712705..7023d46bce 100644
--- a/windows/application-management/app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to Register and Unregister a Publishing Server by Using the Management Console (Windows 10)
description: How to Register and Unregister a Publishing Server by Using the Management Console
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-release-notes-for-appv-for-windows-1703.md b/windows/application-management/app-v/appv-release-notes-for-appv-for-windows-1703.md
index e8e1893c11..993c86f316 100644
--- a/windows/application-management/app-v/appv-release-notes-for-appv-for-windows-1703.md
+++ b/windows/application-management/app-v/appv-release-notes-for-appv-for-windows-1703.md
@@ -1,7 +1,7 @@
---
title: Release Notes for App-V for Windows 10, version 1703 (Windows 10)
description: A list of known issues and workarounds for App-V running on Windows 10, version 1703.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-release-notes-for-appv-for-windows.md b/windows/application-management/app-v/appv-release-notes-for-appv-for-windows.md
index cfbb33c0ae..bfabcf0c97 100644
--- a/windows/application-management/app-v/appv-release-notes-for-appv-for-windows.md
+++ b/windows/application-management/app-v/appv-release-notes-for-appv-for-windows.md
@@ -1,7 +1,7 @@
---
title: Release Notes for App-V for Windows 10, version 1607 (Windows 10)
description: A list of known issues and workarounds for App-V running on Windows 10, version 1607.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
# Release Notes for App-V for Windows 10, version 1607
diff --git a/windows/application-management/app-v/appv-reporting.md b/windows/application-management/app-v/appv-reporting.md
index 7597734e85..a777b5a01e 100644
--- a/windows/application-management/app-v/appv-reporting.md
+++ b/windows/application-management/app-v/appv-reporting.md
@@ -1,7 +1,7 @@
---
title: About App-V Reporting (Windows 10)
description: Learn how the App-V reporting feature collects information about computers running the App-V client and virtual application package usage.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/16/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# About App-V reporting
diff --git a/windows/application-management/app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md b/windows/application-management/app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md
index e3b0a072c7..d552115faf 100644
--- a/windows/application-management/app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md
+++ b/windows/application-management/app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md
@@ -1,7 +1,7 @@
---
title: Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications (Windows 10)
description: Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 03/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-security-considerations.md b/windows/application-management/app-v/appv-security-considerations.md
index 32f77084f6..02603d57b2 100644
--- a/windows/application-management/app-v/appv-security-considerations.md
+++ b/windows/application-management/app-v/appv-security-considerations.md
@@ -1,7 +1,7 @@
---
title: App-V Security Considerations (Windows 10)
description: Learn about accounts and groups, log files, and other security-related considerations for Microsoft Application Virtualization (App-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/16/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# App-V security considerations
diff --git a/windows/application-management/app-v/appv-sequence-a-new-application.md b/windows/application-management/app-v/appv-sequence-a-new-application.md
index d0cf44c341..0c47bf69b6 100644
--- a/windows/application-management/app-v/appv-sequence-a-new-application.md
+++ b/windows/application-management/app-v/appv-sequence-a-new-application.md
@@ -1,7 +1,7 @@
---
title: Manually sequence a new app using the Microsoft Application Virtualization Sequencer (App-V Sequencer) (Windows 10)
description: Learn how to manually sequence a new app by using the App-V Sequencer that's included with the Windows ADK.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/16/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# Manually sequence a new app using the Microsoft Application Virtualization Sequencer (App-V Sequencer)
@@ -37,8 +37,8 @@ In Windows 10, version 1607, the App-V Sequencer is included with the Windows AD
- If an application installer changes the security access to a new or existing file or directory, those changes are not captured in the package.
- If short paths have been disabled for the virtualized package’s target volume, you must also sequence the package to a volume that was created and still has short-paths disabled. It cannot be the system volume.
->[!NOTE]
->The App-V Sequencer cannot sequence applications with filenames matching "CO_<_x_>" where *x* is any numeral. Error 0x8007139F will be generated.
+ > [!NOTE]
+ > The App-V Sequencer cannot sequence applications with filenames matching "CO_<_x_>" where *x* is any numeral. Error 0x8007139F will be generated.
## Sequence a new standard application
@@ -56,9 +56,9 @@ In Windows 10, version 1607, the App-V Sequencer is included with the Windows AD
5. On the **Select Installer** page, select **Browse** and specify the installation file for the application.
> [!NOTE]
- >If the specified application installer modifies security access to a file or directory, existing or new, the associated changes will not be captured into the package.
+ > If the specified application installer modifies security access to a file or directory, existing or new, the associated changes will not be captured into the package.
- If the application does not have an associated installer file and you plan to run all installation steps manually, select the **Perform a Custom Installation** check box, and then select **Next**.
+ If the application does not have an associated installer file and you plan to run all installation steps manually, select the **Perform a Custom Installation** check box, and then select **Next**.
6. On the **Package Name** page, specify a name for the package. Use a name that helps identify the purpose and version of the application that will be added to the package. The package name is displayed in the App-V Management Console. Once you're done, select **Next**.
@@ -89,20 +89,20 @@ In Windows 10, version 1607, the App-V Sequencer is included with the Windows AD
12. On the **Streaming** page, run each program so that it can be optimized and run more efficiently on target computers. It can take several minutes for all the applications to run. After all applications have run, close each of the applications, and then select **Next**.
- > [!NOTE]
- >If you do not open any applications during this step, the default streaming method is on-demand streaming delivery. This means applications will be downloaded bit by bit until it can be opened. After that, depending on how the background loading is configured, it will load the rest of the application.
+ > [!NOTE]
+ > If you do not open any applications during this step, the default streaming method is on-demand streaming delivery. This means applications will be downloaded bit by bit until it can be opened. After that, depending on how the background loading is configured, it will load the rest of the application.
13. On the **Target OS** page, specify the operating systems that can run this package. To allow all supported operating systems in your environment to run this package, select **Allow this package to run on any operating system**. To configure this package to run only on specific operating systems, select **Allow this package to run only on the following operating systems** and select the operating systems that can run this package. After that, select **Next**.
- >[!IMPORTANT]
- >Make sure that the operating systems you specify here are supported by the application you are sequencing.
+ > [!IMPORTANT]
+ > Make sure that the operating systems you specify here are supported by the application you are sequencing.
14. The **Create Package** page is displayed. To modify the package without saving it, select **Continue to modify package without saving using the package editor**. This option opens the package in the sequencer console so that you can modify the package before saving it. Select **Next**.
To save the package immediately, select **Save the package now** (default). Add optional **Comments** to be associated with the package. Comments are useful for identifying the program version and other information about the package.
- >[!IMPORTANT]
- >The system does not support non-printable characters in **Comments** and **Descriptions**.
+ > [!IMPORTANT]
+ > The system does not support non-printable characters in **Comments** and **Descriptions**.
The default **Save Location** is also displayed on this page. To change the default location, select **Browse** and specify the new location. After that, select **Create**.
@@ -110,14 +110,15 @@ In Windows 10, version 1607, the App-V Sequencer is included with the Windows AD
Your package should now be available in the sequencer.
- >[!IMPORTANT]
- >After you have successfully created a virtual application package, you can't run the virtual application package on the computer that is running the sequencer.
+ > [!IMPORTANT]
+ > After you have successfully created a virtual application package, you can't run the virtual application package on the computer that is running the sequencer.
## Sequence an add-on or plug-in application
->[!NOTE]
->Before performing the following procedure, install the parent application locally on the computer that is running the sequencer. Or if you have the parent application virtualized, you can follow the steps in the add-on or plug-in workflow to unpack the parent application on the computer.
->For example, if you are sequencing a plug-in for Microsoft Excel, install Microsoft Excel locally on the computer that's running the sequencer. You should also install the parent application in the same directory where the application is installed on target computers. If the plug-in or add-on is going to be used with an existing virtual application package, install the application on the same virtual application drive that was used when you created the parent virtual application package.
+> [!NOTE]
+> Before performing the following procedure, install the parent application locally on the computer that is running the sequencer. Or if you have the parent application virtualized, you can follow the steps in the add-on or plug-in workflow to unpack the parent application on the computer.
+>
+> For example, if you are sequencing a plug-in for Microsoft Excel, install Microsoft Excel locally on the computer that's running the sequencer. You should also install the parent application in the same directory where the application is installed on target computers. If the plug-in or add-on is going to be used with an existing virtual application package, install the application on the same virtual application drive that was used when you created the parent virtual application package.
1. On the computer that runs the sequencer, first, select **All Programs**, then select **Microsoft Application Virtualization**, and then select **Microsoft Application Virtualization Sequencer**.
@@ -153,8 +154,8 @@ In Windows 10, version 1607, the App-V Sequencer is included with the Windows AD
13. On the **Streaming** page, run each program so that it can be optimized and run more efficiently on target computers. Streaming improves the experience when the virtual application package is run on target computers on high-latency networks. It can take several minutes for all applications to run. After all applications have run, close each application. You can also configure the package to be required to be fully downloaded before opening by selecting the **Force applications to be downloaded** check-box. Select **Next**.
- > [!NOTE]
- >If necessary, you can stop an application from loading during this step. In the **Application Launch** dialog box, select **Stop** and select one of the check boxes: **Stop all applications** or **Stop this application only**.
+ > [!NOTE]
+ > If necessary, you can stop an application from loading during this step. In the **Application Launch** dialog box, select **Stop** and select one of the check boxes: **Stop all applications** or **Stop this application only**.
14. On the **Target OS** page, specify the operating systems that can run this package. To allow all supported operating systems in your environment to run this package, select the **Allow this package to run on any operating system** check box. To configure this package to run only on specific operating systems, select the **Allow this package to run only on the following operating systems** check box, and then select the operating systems that can run this package. Select **Next**.
@@ -211,9 +212,6 @@ In Windows 10, version 1607, the App-V Sequencer is included with the Windows AD
>After you have successfully created a virtual application package, you can't run the virtual application package on the computer that is running the sequencer.
-
-
-
## Related topics
- [Install the App-V Sequencer](appv-install-the-sequencer.md)
diff --git a/windows/application-management/app-v/appv-sequence-a-package-with-powershell.md b/windows/application-management/app-v/appv-sequence-a-package-with-powershell.md
index 823392d02d..6a5a084f6a 100644
--- a/windows/application-management/app-v/appv-sequence-a-package-with-powershell.md
+++ b/windows/application-management/app-v/appv-sequence-a-package-with-powershell.md
@@ -1,7 +1,7 @@
---
title: How to sequence a package by using Windows PowerShell (Windows 10)
description: Learn how to sequence a new Microsoft Application Virtualization (App-V) package by using Windows PowerShell.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-supported-configurations.md b/windows/application-management/app-v/appv-supported-configurations.md
index d834a9d19e..f2d40d15b1 100644
--- a/windows/application-management/app-v/appv-supported-configurations.md
+++ b/windows/application-management/app-v/appv-supported-configurations.md
@@ -1,7 +1,7 @@
---
title: App-V Supported Configurations (Windows 10)
description: Learn the requirements to install and run App-V supported configurations in your Windows 10 environment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/16/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
# App-V Supported Configurations
diff --git a/windows/application-management/app-v/appv-technical-reference.md b/windows/application-management/app-v/appv-technical-reference.md
index 19f2f4b499..ec6e36ed71 100644
--- a/windows/application-management/app-v/appv-technical-reference.md
+++ b/windows/application-management/app-v/appv-technical-reference.md
@@ -1,7 +1,7 @@
---
title: Technical Reference for App-V (Windows 10)
description: Learn strategy and context for many performance optimization practices in this technical reference for Application Virtualization (App-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md b/windows/application-management/app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
index 7e1aad87e1..28caecc4fa 100644
--- a/windows/application-management/app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to Transfer Access and Configurations to Another Version of a Package by Using the Management Console (Windows 10)
description: How to Transfer Access and Configurations to Another Version of a Package by Using the Management Console
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-troubleshooting.md b/windows/application-management/app-v/appv-troubleshooting.md
index 1da98e9c7d..2ee6c51728 100644
--- a/windows/application-management/app-v/appv-troubleshooting.md
+++ b/windows/application-management/app-v/appv-troubleshooting.md
@@ -1,7 +1,7 @@
---
title: Troubleshooting App-V (Windows 10)
description: Learn how to find information about troubleshooting Application Virtualization (App-V) and information about other App-V topics.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md b/windows/application-management/app-v/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md
index c1a66569fb..fd2a4d1bf4 100644
--- a/windows/application-management/app-v/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md
+++ b/windows/application-management/app-v/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md
@@ -1,7 +1,7 @@
---
title: Upgrading to App-V for Windows 10 from an existing installation (Windows 10)
description: Learn about upgrading to Application Virtualization (App-V) for Windows 10 from an existing installation.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
# Upgrading to App-V for Windows 10 from an existing installation
diff --git a/windows/application-management/app-v/appv-using-the-client-management-console.md b/windows/application-management/app-v/appv-using-the-client-management-console.md
index 63ec292b62..1f463763a0 100644
--- a/windows/application-management/app-v/appv-using-the-client-management-console.md
+++ b/windows/application-management/app-v/appv-using-the-client-management-console.md
@@ -1,7 +1,7 @@
---
title: Using the App-V Client Management Console (Windows 10)
description: Learn how to use the Application Virtualization (App-V) client management console to manage packages on the computer running the App-V client.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md b/windows/application-management/app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
index b7879ce0c2..96494e493b 100644
--- a/windows/application-management/app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
+++ b/windows/application-management/app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
@@ -1,7 +1,7 @@
---
title: How to View and Configure Applications and Default Virtual Application Extensions by Using the Management Console (Windows 10)
description: How to View and Configure Applications and Default Virtual Application Extensions by Using the Management Console
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/app-v/appv-viewing-appv-server-publishing-metadata.md b/windows/application-management/app-v/appv-viewing-appv-server-publishing-metadata.md
index 94aa4195ee..8cb9a3b085 100644
--- a/windows/application-management/app-v/appv-viewing-appv-server-publishing-metadata.md
+++ b/windows/application-management/app-v/appv-viewing-appv-server-publishing-metadata.md
@@ -1,7 +1,7 @@
---
title: Viewing App-V Server Publishing Metadata (Windows 10)
description: Use this procedure to view App-V Server publishing metadata, which can help you resolve publishing-related issues.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, appcompat, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
diff --git a/windows/application-management/apps-in-windows-10.md b/windows/application-management/apps-in-windows-10.md
index 31da1afc51..d8cddab78d 100644
--- a/windows/application-management/apps-in-windows-10.md
+++ b/windows/application-management/apps-in-windows-10.md
@@ -7,8 +7,8 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
-ms.author: dansimp
-author: msfttracyp
+ms.author: greglin
+author: greg-lindsay
ms.localizationpriority: medium
ms.topic: article
---
diff --git a/windows/application-management/change-history-for-application-management.md b/windows/application-management/change-history-for-application-management.md
deleted file mode 100644
index e7e6041a1d..0000000000
--- a/windows/application-management/change-history-for-application-management.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: Change history for Application management in Windows 10 (Windows 10)
-description: View new release information and updated topics in the documentation for application management in Windows 10.
-keywords:
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.date: 10/24/2017
-ms.reviewer:
-manager: dansimp
----
-
-# Change history for Application management in Windows 10
-
-This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for Windows 10 and Windows 10 Mobile.
-
-## RELEASE: Windows 10, version 1803
-
-The topics in this library have been updated for Windows 10, version 1803.
-
-## October 2017
-
-New or changed topic | Description
---- | ---
-[Enable or block Windows Mixed Reality apps in the enterprise](manage-windows-mixed-reality.md) | Added instructions for manually installing Windows Mixed Reality
-
-## RELEASE: Windows 10, version 1709
-
-The topics in this library have been updated for Windows 10, version 1709 (also known as the Fall Creators Update). The following new topic has been added:
-
-- [Enable or block Windows Mixed Reality apps in the enterprise](manage-windows-mixed-reality.md)
-
-## September 2017
-| New or changed topic | Description |
-| --- | --- |
-| [Per-user services in Windows 10](per-user-services-in-windows.md) | New |
-| [Remove background task resource restrictions](enterprise-background-activity-controls.md) | New |
-| [Understand the different apps included in Windows 10](apps-in-windows-10.md) | New |
-
-## July 2017
-| New or changed topic | Description |
-| --- | --- |
-| [Service Host process refactoring](svchost-service-refactoring.md) | New |
-| [Deploy app upgrades on Windows 10 Mobile](deploy-app-upgrades-windows-10-mobile.md) | New |
-
-
diff --git a/windows/application-management/deploy-app-upgrades-windows-10-mobile.md b/windows/application-management/deploy-app-upgrades-windows-10-mobile.md
index 96be5ecfc1..59b3dc2209 100644
--- a/windows/application-management/deploy-app-upgrades-windows-10-mobile.md
+++ b/windows/application-management/deploy-app-upgrades-windows-10-mobile.md
@@ -5,8 +5,8 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
-ms.author: dansimp
-author: msfttracyp
+ms.author: greglin
+author: greg-lindsay
ms.date: 07/21/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index 460b8ecfdd..4d3e15e0a7 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/application-management/enterprise-background-activity-controls.md b/windows/application-management/enterprise-background-activity-controls.md
index 5b90927126..d123957cd1 100644
--- a/windows/application-management/enterprise-background-activity-controls.md
+++ b/windows/application-management/enterprise-background-activity-controls.md
@@ -1,8 +1,8 @@
---
-author: dansimp
+author: greg-lindsay
title: Remove background task resource restrictions
description: Allow enterprise background tasks unrestricted access to computer resources.
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/03/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/application-management/index.md b/windows/application-management/index.md
deleted file mode 100644
index a294e75581..0000000000
--- a/windows/application-management/index.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Windows 10 application management
-description: Learn about managing applications in Windows 10 and Windows 10 Mobile clients, including how to remove background task resource restrictions.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-manager: dansimp
-author: dansimp
-ms.localizationpriority: high
----
-
-# Windows 10 application management
-
-**Applies to**
-- Windows 10
-
-Learn about managing applications in Windows 10 and Windows 10 Mobile clients.
-
-
-| Topic | Description |
-|---|---|
-|[Sideload apps in Windows 10](sideload-apps-in-windows-10.md)| Requirements and instructions for side-loading LOB applications on Windows 10 and Windows 10 Mobile clients|
-| [Remove background task resource restrictions](enterprise-background-activity-controls.md) | Windows provides controls to manage which experiences may run in the background. |
-| [Enable or block Windows Mixed Reality apps in the enterprise](manage-windows-mixed-reality.md) | Learn how to enable or block Windows Mixed Reality apps. |
-|[App-V](app-v/appv-getting-started.md)| Microsoft Application Virtualization (App-V) for Windows 10 enables organizations to deliver Win32 applications to users as virtual applications|
-| [Service Host process refactoring](svchost-service-refactoring.md) | Changes to Service Host grouping in Windows 10 |
-|[Per User services in Windows 10](per-user-services-in-windows.md)| Overview of per user services and instructions for viewing and disabling them in Windows 10 and Windows 2016|
-[Disabling System Services in Windows Server](/windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server) | Security guidelines for disabling services in Windows Server 2016 with Desktop Experience
-|[Understand apps in Windows 10](apps-in-windows-10.md)| Overview of the different apps included by default in Windows 10 Enterprise|
-| [Deploy app upgrades on Windows 10 Mobile](deploy-app-upgrades-windows-10-mobile.md) | How to upgrade apps on Windows 10 Mobile |
-[Change history for Application management](change-history-for-application-management.md) | This topic lists new and updated topics in the Application management documentation for Windows 10 and Windows 10 Mobile.
\ No newline at end of file
diff --git a/windows/application-management/index.yml b/windows/application-management/index.yml
new file mode 100644
index 0000000000..dc786fd289
--- /dev/null
+++ b/windows/application-management/index.yml
@@ -0,0 +1,68 @@
+### YamlMime:Landing
+
+title: Windows application management # < 60 chars
+summary: Learn about managing applications in Windows client, including how to remove background task resource restrictions. # < 160 chars
+
+metadata:
+ title: Windows application management # Required; page title displayed in search results. Include the brand. < 60 chars.
+ description: Learn about managing applications in Windows 10 and Windows Sun Valley. # Required; article description that is displayed in search results. < 160 chars.
+ services: windows-10
+ ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+ ms.subservice: subservice
+ ms.topic: landing-page # Required
+ ms.collection: windows-10
+ author: greg-lindsay #Required; your GitHub user alias, with correct capitalization.
+ ms.author: greglin #Required; microsoft alias of author; optional team alias.
+ ms.date: 04/30/2021 #Required; mm/dd/yyyy format.
+ localization_priority: medium
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+
+landingContent:
+# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - title: Manage Windows applications
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Understand apps in Windows 10
+ url: apps-in-windows-10.md
+ - text: How to add apps and features to Windows 10
+ url: add-apps-and-features.md
+ - text: Sideload LOB apps in Windows 10
+ url: sideload-apps-in-windows-10.md
+ - text: Keep removed apps from returning during an update
+ url: remove-provisioned-apps-during-update.md
+
+ # Card (optional)
+ - title: Application Virtualization (App-V)
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: App-V overview
+ url: app-v/appv-for-windows.md
+ - text: Getting started with App-V
+ url: app-v/appv-getting-started.md
+ - text: Planning for App-V
+ url: app-v/appv-planning-for-appv.md
+ - text: Deploying App-V
+ url: app-v/appv-deploying-appv.md
+ - text: Operations for App-V
+ url: app-v/appv-operations.md
+ - text: Troubleshooting App-V
+ url: app-v/appv-troubleshooting.md
+ - text: Technical Reference for App-V
+ url: app-v/appv-technical-reference.md
+
+ # Card (optional)
+ - title: Windows System Services
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Changes to Service Host grouping in Windows 10
+ url: svchost-service-refactoring.md
+ - text: Per-user services in Windows
+ url: per-user-services-in-windows.md
+ - text: Per-user services in Windows
+ url: per-user-services-in-windows.md
\ No newline at end of file
diff --git a/windows/application-management/manage-windows-mixed-reality.md b/windows/application-management/manage-windows-mixed-reality.md
index 505a840ba1..2305949341 100644
--- a/windows/application-management/manage-windows-mixed-reality.md
+++ b/windows/application-management/manage-windows-mixed-reality.md
@@ -8,8 +8,8 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
---
@@ -33,7 +33,7 @@ Organizations that use Windows Server Update Services (WSUS) must take action to
2. Windows Mixed Reality Feature on Demand (FOD) is downloaded from Windows Update. If access to Windows Update is blocked, you must manually install the Windows Mixed Reality FOD.
- 1. Download the FOD .cab file for [Windows 10, version 2004](https://software-download.microsoft.com/download/pr/Microsoft-Windows-Holographic-Desktop-FOD-Package~31bf3856ad364e35~amd64~~.cab), [Windows 10, version 1903 and 1909](https://software-download.microsoft.com/download/pr/Microsoft-Windows-Holographic-Desktop-FOD-Package-31bf3856ad364e35-amd64.cab), [Windows 10, version 1809](https://software-download.microsoft.com/download/pr/microsoft-windows-holographic-desktop-fod-package31bf3856ad364e35amd64_1.cab), [Windows 10, version 1803](https://download.microsoft.com/download/9/9/3/9934B163-FA01-4108-A38A-851B4ACD1244/Microsoft-Windows-Holographic-Desktop-FOD-Package~31bf3856ad364e35~amd64~~.cab), or [Windows 10, version 1709](https://download.microsoft.com/download/6/F/8/6F816172-AC7D-4F45-B967-D573FB450CB7/Microsoft-Windows-Holographic-Desktop-FOD-Package.cab).
+ 1. Download the FOD .cab file for [Windows 10, version 2004](https://software-download.microsoft.com/download/pr/6cf73b63/Microsoft-Windows-Holographic-Desktop-FOD-Package~31bf3856ad364e35~amd64~~.cab), [Windows 10, version 1903 and 1909](https://software-download.microsoft.com/download/pr/Microsoft-Windows-Holographic-Desktop-FOD-Package-31bf3856ad364e35-amd64.cab), [Windows 10, version 1809](https://software-download.microsoft.com/download/pr/microsoft-windows-holographic-desktop-fod-package31bf3856ad364e35amd64_1.cab), [Windows 10, version 1803](https://download.microsoft.com/download/9/9/3/9934B163-FA01-4108-A38A-851B4ACD1244/Microsoft-Windows-Holographic-Desktop-FOD-Package~31bf3856ad364e35~amd64~~.cab), or [Windows 10, version 1709](https://download.microsoft.com/download/6/F/8/6F816172-AC7D-4F45-B967-D573FB450CB7/Microsoft-Windows-Holographic-Desktop-FOD-Package.cab).
> [!NOTE]
> You must download the FOD .cab file that matches your operating system version.
@@ -99,4 +99,4 @@ In the following example, the **Id** can be any generated GUID and the **Name**
## Related topics
-- [Mixed reality](https://developer.microsoft.com/windows/mixed-reality/mixed_reality)
\ No newline at end of file
+- [Mixed reality](https://developer.microsoft.com/windows/mixed-reality/mixed_reality)
diff --git a/windows/application-management/msix-app-packaging-tool.md b/windows/application-management/msix-app-packaging-tool.md
index 030d1c6a31..96e4e52e60 100644
--- a/windows/application-management/msix-app-packaging-tool.md
+++ b/windows/application-management/msix-app-packaging-tool.md
@@ -6,12 +6,12 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 12/03/2018
ms.reviewer:
manager: dansimp
-author: msfttracyp
+author: greg-lindsay
---
# Repackage existing win32 applications to the MSIX format
diff --git a/windows/application-management/per-user-services-in-windows.md b/windows/application-management/per-user-services-in-windows.md
index cd68824109..0cda2dc8c9 100644
--- a/windows/application-management/per-user-services-in-windows.md
+++ b/windows/application-management/per-user-services-in-windows.md
@@ -5,8 +5,8 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
-ms.author: dansimp
-author: msfttracyp
+ms.author: greglin
+author: greg-lindsay
ms.date: 09/14/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/application-management/remove-provisioned-apps-during-update.md b/windows/application-management/remove-provisioned-apps-during-update.md
index e85e9efb07..43afa3c4c5 100644
--- a/windows/application-management/remove-provisioned-apps-during-update.md
+++ b/windows/application-management/remove-provisioned-apps-during-update.md
@@ -4,8 +4,8 @@ description: How to keep provisioned apps that were removed from your machine fr
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-ms.author: dansimp
-author: msfttracyp
+ms.author: greglin
+author: greg-lindsay
ms.date: 05/25/2018
ms.reviewer:
manager: dansimp
diff --git a/windows/application-management/sideload-apps-in-windows-10.md b/windows/application-management/sideload-apps-in-windows-10.md
index 58033a8f99..fe07daba50 100644
--- a/windows/application-management/sideload-apps-in-windows-10.md
+++ b/windows/application-management/sideload-apps-in-windows-10.md
@@ -4,12 +4,12 @@ description: Learn how to sideload line-of-business (LOB) apps in Windows 10. W
ms.assetid: C46B27D0-375B-4F7A-800E-21595CF1D53D
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
-author: msfttracyp
+author: greg-lindsay
ms.date: 05/20/2019
---
diff --git a/windows/application-management/svchost-service-refactoring.md b/windows/application-management/svchost-service-refactoring.md
index 3bd1bf1897..4130fde7e5 100644
--- a/windows/application-management/svchost-service-refactoring.md
+++ b/windows/application-management/svchost-service-refactoring.md
@@ -5,8 +5,8 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
-ms.author: dansimp
-author: msfttracyp
+ms.author: greglin
+author: greg-lindsay
ms.date: 07/20/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/application-management/toc.yml b/windows/application-management/toc.yml
new file mode 100644
index 0000000000..282bdafc46
--- /dev/null
+++ b/windows/application-management/toc.yml
@@ -0,0 +1,266 @@
+items:
+- name: Manage Windows applications
+ href: index.yml
+- name: Application management
+ items:
+ - name: Sideload apps
+ href: sideload-apps-in-windows-10.md
+ - name: Remove background task resource restrictions
+ href: enterprise-background-activity-controls.md
+ - name: Enable or block Windows Mixed Reality apps in the enterprise
+ href: manage-windows-mixed-reality.md
+ - name: Understand apps in Windows 10
+ href: apps-in-windows-10.md
+ - name: Add apps and features in Windows 10
+ href: add-apps-and-features.md
+ - name: Repackage win32 apps in the MSIX format
+ href: msix-app-packaging-tool.md
+- name: Application Virtualization (App-V)
+ items:
+ - name: App-V for Windows 10 overview
+ href: app-v/appv-for-windows.md
+ - name: Getting Started
+ items:
+ - name: Getting Started with App-V
+ href: app-v/appv-getting-started.md
+ - name: What's new
+ items:
+ - name: What's new in App-V for Windows 10, version 1703 and earlier
+ href: app-v/appv-about-appv.md
+ - name: Release Notes for App-V for Windows 10, version 1607
+ href: app-v/appv-release-notes-for-appv-for-windows.md
+ - name: Release Notes for App-V for Windows 10, version 1703
+ href: app-v/appv-release-notes-for-appv-for-windows-1703.md
+ - name: Evaluating App-V
+ href: app-v/appv-evaluating-appv.md
+ - name: High Level Architecture for App-V
+ href: app-v/appv-high-level-architecture.md
+ - name: Planning
+ items:
+ - name: Planning for App-V
+ href: app-v/appv-planning-for-appv.md
+ - name: Preparing your environment
+ items:
+ - name: Preparing your environment for App-V
+ href: app-v/appv-preparing-your-environment.md
+ - name: App-V Prerequisites
+ href: app-v/appv-prerequisites.md
+ - name: App-V security considerations
+ href: app-v/appv-security-considerations.md
+ - name: Planning to deploy
+ items:
+ - name: Planning to Deploy App-V
+ href: app-v/appv-planning-to-deploy-appv.md
+ - name: App-V Supported Configurations
+ href: app-v/appv-supported-configurations.md
+ - name: App-V Capacity Planning
+ href: app-v/appv-capacity-planning.md
+ - name: Planning for High Availability with App-V
+ href: app-v/appv-planning-for-high-availability-with-appv.md
+ - name: Planning to Deploy App-V with an Electronic Software Distribution System
+ href: app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
+ - name: Planning for the App-V Server Deployment
+ href: app-v/appv-planning-for-appv-server-deployment.md
+ - name: Planning for the App-V Sequencer and Client Deployment
+ href: app-v/appv-planning-for-sequencer-and-client-deployment.md
+ - name: Planning for Using App-V with Office
+ href: app-v/appv-planning-for-using-appv-with-office.md
+ - name: Planning to Use Folder Redirection with App-V
+ href: app-v/appv-planning-folder-redirection-with-appv.md
+ - name: App-V Planning Checklist
+ href: app-v/appv-planning-checklist.md
+ - name: Deploying
+ items:
+ - name: Deploying App-V
+ href: app-v/appv-deploying-appv.md
+ - name: App-V sequencer and client configuration
+ items:
+ - name: Deploying the App-V Sequencer and Configuring the Client
+ href: app-v/appv-deploying-the-appv-sequencer-and-client.md
+ - name: About Client Configuration Settings
+ href: app-v/appv-client-configuration-settings.md
+ - name: Enable the App-V desktop client
+ href: app-v/appv-enable-the-app-v-desktop-client.md
+ - name: How to Install the Sequencer
+ href: app-v/appv-install-the-sequencer.md
+ - name: App-V server deployment
+ items:
+ - name: Deploying the App-V Server
+ href: app-v/appv-deploying-the-appv-server.md
+ - name: How to Deploy the App-V Server
+ href: app-v/appv-deploy-the-appv-server.md
+ - name: How to Deploy the App-V Server Using a Script
+ href: app-v/appv-deploy-the-appv-server-with-a-script.md
+ - name: How to Deploy the App-V Databases by Using SQL Scripts
+ href: app-v/appv-deploy-appv-databases-with-sql-scripts.md
+ - name: How to Install the Publishing Server on a Remote Computer
+ href: app-v/appv-install-the-publishing-server-on-a-remote-computer.md
+ - name: How to Install the Management and Reporting Databases on Separate Computers from the Management and Reporting Services
+ href: app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md
+ - name: How to install the Management Server on a Standalone Computer and Connect it to the Database
+ href: app-v/appv-install-the-management-server-on-a-standalone-computer.md
+ - name: About App-V Reporting
+ href: app-v/appv-reporting.md
+ - name: How to install the Reporting Server on a Standalone Computer and Connect it to the Database
+ href: app-v/appv-install-the-reporting-server-on-a-standalone-computer.md
+ - name: App-V Deployment Checklist
+ href: app-v/appv-deployment-checklist.md
+ - name: Deploying Microsoft Office 2016 by Using App-V
+ href: app-v/appv-deploying-microsoft-office-2016-with-appv.md
+ - name: Deploying Microsoft Office 2013 by Using App-V
+ href: app-v/appv-deploying-microsoft-office-2013-with-appv.md
+ - name: Deploying Microsoft Office 2010 by Using App-V
+ href: app-v/appv-deploying-microsoft-office-2010-wth-appv.md
+ - name: Operations
+ items:
+ - name: Operations for App-V
+ href: app-v/appv-operations.md
+ - name: Creating and managing virtualized applications
+ items:
+ - name: Creating and Managing App-V Virtualized Applications
+ href: app-v/appv-creating-and-managing-virtualized-applications.md
+ - name: Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)
+ href: app-v/appv-auto-provision-a-vm.md
+ - name: Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)
+ href: app-v/appv-auto-batch-sequencing.md
+ - name: Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)
+ href: app-v/appv-auto-batch-updating.md
+ - name: Manually sequence a new app using Microsoft Application Virtualization Sequencer (App-V Sequencer)
+ href: app-v/appv-sequence-a-new-application.md
+ - name: How to Modify an Existing Virtual Application Package
+ href: app-v/appv-modify-an-existing-virtual-application-package.md
+ - name: How to Create and Use a Project Template
+ href: app-v/appv-create-and-use-a-project-template.md
+ - name: How to Create a Package Accelerator
+ href: app-v/appv-create-a-package-accelerator.md
+ - name: How to Create a Virtual Application Package Using an App-V Package Accelerator
+ href: app-v/appv-create-a-virtual-application-package-package-accelerator.md
+ - name: Administering App-V
+ items:
+ - name: Administering App-V Virtual Applications by Using the Management Console
+ href: app-v/appv-administering-virtual-applications-with-the-management-console.md
+ - name: About App-V Dynamic Configuration
+ href: app-v/appv-dynamic-configuration.md
+ - name: How to Connect to the Management Console
+ href: app-v/appv-connect-to-the-management-console.md
+ - name: How to Add or Upgrade Packages by Using the Management Console
+ href: app-v/appv-add-or-upgrade-packages-with-the-management-console.md
+ - name: How to Configure Access to Packages by Using the Management Console
+ href: app-v/appv-configure-access-to-packages-with-the-management-console.md
+ - name: How to Publish a Package by Using the Management Console
+ href: app-v/appv-publish-a-packages-with-the-management-console.md
+ - name: How to Delete a Package in the Management Console
+ href: app-v/appv-delete-a-package-with-the-management-console.md
+ - name: How to Add or Remove an Administrator by Using the Management Console
+ href: app-v/appv-add-or-remove-an-administrator-with-the-management-console.md
+ - name: How to Register and Unregister a Publishing Server by Using the Management Console
+ href: app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
+ - name: How to Create a Custom Configuration File by Using the App-V Management Console
+ href: app-v/appv-create-a-custom-configuration-file-with-the-management-console.md
+ - name: How to Transfer Access and Configurations to Another Version of a Package by Using the Management Console
+ href: app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
+ - name: How to Customize Virtual Applications Extensions for a Specific AD Group by Using the Management Console
+ href: app-v/appv-customize-virtual-application-extensions-with-the-management-console.md
+ - name: How to View and Configure Applications and Default Virtual Application Extensions by Using the Management Console
+ href: app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
+ - name: Connection groups
+ items:
+ - name: Managing Connection Groups
+ href: app-v/appv-managing-connection-groups.md
+ - name: About the Connection Group Virtual Environment
+ href: app-v/appv-connection-group-virtual-environment.md
+ - name: About the Connection Group File
+ href: app-v/appv-connection-group-file.md
+ - name: How to Create a Connection Group
+ href: app-v/appv-create-a-connection-group.md
+ - name: How to Create a Connection Group with User-Published and Globally Published Packages
+ href: app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
+ - name: How to Delete a Connection Group
+ href: app-v/appv-delete-a-connection-group.md
+ - name: How to Publish a Connection Group
+ href: app-v/appv-publish-a-connection-group.md
+ - name: How to Make a Connection Group Ignore the Package Version
+ href: app-v/appv-configure-connection-groups-to-ignore-the-package-version.md
+ - name: How to Allow Only Administrators to Enable Connection Groups
+ href: app-v/appv-allow-administrators-to-enable-connection-groups.md
+ - name: Deploying App-V packages with ESD
+ items:
+ - name: Deploying App-V Packages by Using Electronic Software Distribution (ESD)
+ href: app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
+ - name: How to deploy App-V Packages Using Electronic Software Distribution
+ href: app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
+ - name: How to Enable Only Administrators to Publish Packages by Using an ESD
+ href: app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
+ - name: Using the management console
+ items:
+ - name: Using the App-V client management console
+ href: app-v/appv-using-the-client-management-console.md
+ - name: Automatically clean-up unpublished packages on the App-V client
+ href: app-v/appv-auto-clean-unpublished-packages.md
+ - name: Migrating
+ items:
+ - name: Migrating to App-V from a previous version
+ href: app-v/appv-migrating-to-appv-from-a-previous-version.md
+ - name: How to convert a package created in a previous version of App-V
+ href: app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md
+ - name: Maintenance
+ items:
+ - name: Maintaining App-V
+ href: app-v/appv-maintaining-appv.md
+ - name: How to Move the App-V Server to Another Computer
+ href: app-v/appv-move-the-appv-server-to-another-computer.md
+ - name: Administering App-V with Windows PowerShell
+ items:
+ - name: Administering App-V by using Windows PowerShell
+ href: app-v/appv-administering-appv-with-powershell.md
+ - name: How to Load the Windows PowerShell Cmdlets for App-V and Get Cmdlet Help
+ href: app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
+ - name: How to Manage App-V Packages Running on a Stand-Alone Computer by Using Windows PowerShell
+ href: app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
+ - name: How to Manage Connection Groups on a Stand-alone Computer by Using Windows PowerShell
+ href: app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
+ - name: How to Modify Client Configuration by Using Windows PowerShell
+ href: app-v/appv-modify-client-configuration-with-powershell.md
+ - name: How to Configure the Client to Receive Package and Connection Groups Updates From the Publishing Server
+ href: app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
+ - name: How to Apply the User Configuration File by Using Windows PowerShell
+ href: app-v/appv-apply-the-user-configuration-file-with-powershell.md
+ - name: How to Apply the Deployment Configuration File by Using Windows PowerShell
+ href: app-v/appv-apply-the-deployment-configuration-file-with-powershell.md
+ - name: How to Sequence a Package by Using Windows PowerShell
+ href: app-v/appv-sequence-a-package-with-powershell.md
+ - name: How to Create a Package Accelerator by Using Windows PowerShell
+ href: app-v/appv-create-a-package-accelerator-with-powershell.md
+ - name: How to Enable Reporting on the App-V Client by Using Windows PowerShell
+ href: app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md
+ - name: How to Install the App-V Databases and Convert the Associated Security Identifiers by Using Windows PowerShell
+ href: app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
+ - name: Troubleshooting App-V
+ href: app-v/appv-troubleshooting.md
+ - name: Technical Reference
+ items:
+ - name: Technical Reference for App-V
+ href: app-v/appv-technical-reference.md
+ - name: Available Mobile Device Management (MDM) settings for App-V
+ href: app-v/appv-available-mdm-settings.md
+ - name: Performance Guidance for Application Virtualization
+ href: app-v/appv-performance-guidance.md
+ - name: Application Publishing and Client Interaction
+ href: app-v/appv-application-publishing-and-client-interaction.md
+ - name: Viewing App-V Server Publishing Metadata
+ href: app-v/appv-viewing-appv-server-publishing-metadata.md
+ - name: Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications
+ href: app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md
+
+- name: Reference
+ items:
+ - name: Service Host process refactoring
+ href: svchost-service-refactoring.md
+ - name: Per-user services in Windows
+ href: per-user-services-in-windows.md
+ - name: Disabling System Services in Windows Server
+ href: /windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server
+ - name: Deploy app upgrades on Windows 10 Mobile
+ href: deploy-app-upgrades-windows-10-mobile.md
+ - name: How to keep apps removed from Windows 10 from returning during an update
+ href: remove-provisioned-apps-during-update.md
\ No newline at end of file
diff --git a/windows/client-management/TOC.md b/windows/client-management/TOC.md
deleted file mode 100644
index aac950751a..0000000000
--- a/windows/client-management/TOC.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# [Manage clients in Windows 10](index.md)
-## [Administrative Tools in Windows 10](administrative-tools-in-windows-10.md)
-### [Use Quick Assist to help users](quick-assist.md)
-## [Create mandatory user profiles](mandatory-user-profile.md)
-## [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md)
-## [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md)
-## [New policies for Windows 10](new-policies-for-windows-10.md)
-## [Windows 10 default media removal policy](change-default-removal-policy-external-storage-media.md)
-## [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md)
-## [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
-## [What version of Windows am I running](windows-version-search.md)
-## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
-## [Transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md)
-## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
-## [Windows libraries](windows-libraries.md)
-## [Troubleshoot Windows 10 clients](windows-10-support-solutions.md)
-### [Advanced troubleshooting for Windows networking](troubleshoot-networking.md)
-#### [Advanced troubleshooting Wireless network connectivity](advanced-troubleshooting-wireless-network-connectivity.md)
-#### [Advanced troubleshooting 802.1X authentication](advanced-troubleshooting-802-authentication.md)
-##### [Data collection for troubleshooting 802.1X authentication](data-collection-for-802-authentication.md)
-#### [Advanced troubleshooting for TCP/IP](troubleshoot-tcpip.md)
-##### [Collect data using Network Monitor](troubleshoot-tcpip-netmon.md)
-##### [Troubleshoot TCP/IP connectivity](troubleshoot-tcpip-connectivity.md)
-##### [Troubleshoot port exhaustion](troubleshoot-tcpip-port-exhaust.md)
-##### [Troubleshoot Remote Procedure Call (RPC) errors](troubleshoot-tcpip-rpc-errors.md)
-### [Advanced troubleshooting for Windows startup](troubleshoot-windows-startup.md)
-#### [How to determine the appropriate page file size for 64-bit versions of Windows](determine-appropriate-page-file-size.md)
-#### [Generate a kernel or complete crash dump](generate-kernel-or-complete-crash-dump.md)
-#### [Introduction to the page file](introduction-page-file.md)
-#### [Configure system failure and recovery options in Windows](system-failure-recovery-options.md)
-#### [Advanced troubleshooting for Windows boot problems](advanced-troubleshooting-boot-problems.md)
-#### [Advanced troubleshooting for Windows-based computer freeze](troubleshoot-windows-freeze.md)
-#### [Advanced troubleshooting for stop error or blue screen error](troubleshoot-stop-errors.md)
-#### [Advanced troubleshooting for stop error 7B or Inaccessible_Boot_Device](troubleshoot-inaccessible-boot-device.md)
-#### [Advanced troubleshooting for Event ID 41 "The system has rebooted without cleanly shutting down first"](troubleshoot-event-id-41-restart.md)
-#### [Stop error occurs when you update the in-box Broadcom network adapter driver](troubleshoot-stop-error-on-broadcom-driver-update.md)
-## [Mobile device management for solution providers](mdm/index.md)
-## [Change history for Client management](change-history-for-client-management.md)
diff --git a/windows/client-management/administrative-tools-in-windows-10.md b/windows/client-management/administrative-tools-in-windows-10.md
index 3cf570a193..260944a53c 100644
--- a/windows/client-management/administrative-tools-in-windows-10.md
+++ b/windows/client-management/administrative-tools-in-windows-10.md
@@ -4,11 +4,11 @@ description: Administrative Tools is a folder in Control Panel that contains too
ms.assetid: FDC63933-C94C-43CB-8373-629795926DC8
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 07/27/2017
ms.topic: article
diff --git a/windows/client-management/advanced-troubleshooting-802-authentication.md b/windows/client-management/advanced-troubleshooting-802-authentication.md
index 739e349c4a..ac96c101cf 100644
--- a/windows/client-management/advanced-troubleshooting-802-authentication.md
+++ b/windows/client-management/advanced-troubleshooting-802-authentication.md
@@ -7,7 +7,7 @@ keywords: advanced troubleshooting, 802.1X authentication, troubleshooting, auth
ms.prod: w10
ms.mktglfcycl:
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.author: tracyp
ms.topic: troubleshooting
diff --git a/windows/client-management/advanced-troubleshooting-boot-problems.md b/windows/client-management/advanced-troubleshooting-boot-problems.md
index f1594dd088..263435a1a5 100644
--- a/windows/client-management/advanced-troubleshooting-boot-problems.md
+++ b/windows/client-management/advanced-troubleshooting-boot-problems.md
@@ -3,9 +3,9 @@ title: Advanced troubleshooting for Windows boot problems
description: Learn to troubleshoot when Windows can't boot. This article includes advanced troubleshooting techniques intended for use by support agents and IT professionals.
ms.prod: w10
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 11/16/2018
ms.reviewer:
manager: dansimp
diff --git a/windows/client-management/advanced-troubleshooting-wireless-network-connectivity.md b/windows/client-management/advanced-troubleshooting-wireless-network-connectivity.md
index a024756b85..ce4154396e 100644
--- a/windows/client-management/advanced-troubleshooting-wireless-network-connectivity.md
+++ b/windows/client-management/advanced-troubleshooting-wireless-network-connectivity.md
@@ -7,9 +7,9 @@ keywords: troubleshooting, wireless network connectivity, wireless, Wi-Fi
ms.prod: w10
ms.mktglfcycl:
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: troubleshooting
---
diff --git a/windows/client-management/change-history-for-client-management.md b/windows/client-management/change-history-for-client-management.md
deleted file mode 100644
index 3c7c213761..0000000000
--- a/windows/client-management/change-history-for-client-management.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: Change history for Client management (Windows 10)
-description: Learn about new and updated topics in the Client management documentation for Windows 10 and Windows 10 Mobile.
-keywords:
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-ms.date: 1/21/2020
-ms.reviewer:
-manager: dansimp
-ms.topic: article
----
-
-# 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.
-
-## February 2020
-
-New or changed topic | Description
---- | ---
-[Blue screen occurs when you update the in-box Broadcom NIC driver](troubleshoot-stop-error-on-broadcom-driver-update.md) | New
-[Advanced troubleshooting for Windows startup](troubleshoot-windows-startup.md) | Updated
-
-## December 2019
-
-New or changed topic | Description
---- | ---
-[Change in default removal policy for external storage media in Windows 10, version 1809](change-default-removal-policy-external-storage-media.md) | New
-[Advanced troubleshooting for Windows startup](troubleshoot-windows-startup.md) | Updated
-[Advanced troubleshooting for Event ID 41 "The system has rebooted without cleanly shutting down first"](troubleshoot-event-id-41-restart.md) | New
-
-## December 2018
-
-New or changed topic | Description
---- | ---
-[Advanced troubleshooting for TCP/IP](troubleshoot-tcpip.md) | New
-[Collect data using Network Monitor](troubleshoot-tcpip-netmon.md) | New
-[Troubleshoot TCP/IP connectivity](troubleshoot-tcpip-connectivity.md) | New
-[Troubleshoot port exhaustion issues](troubleshoot-tcpip-port-exhaust.md) | New
-[Troubleshoot Remote Procedure Call (RPC) errors](troubleshoot-tcpip-rpc-errors.md) | New
-
-## November 2018
-
-New or changed topic | Description
---- | ---
- [Advanced troubleshooting for Windows-based computer freeze issues](troubleshoot-windows-freeze.md) | New
- [Advanced troubleshooting for Stop error or blue screen error issue](troubleshoot-stop-errors.md) | New
-
-## RELEASE: Windows 10, version 1709
-
-The topics in this library have been updated for Windows 10, version 1709 (also known as the Fall Creators Update).
-
-
-## July 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [Group Policy settings that apply only to Windows 10 Enterprise and Education Editions](group-policies-for-enterprise-and-education-editions.md) | Added that Start layout policy setting can be applied to Windows 10 Pro, version 1703 |
-
-## June 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [Create mandatory user profiles](mandatory-user-profile.md) | Added Windows 10, version 1703, to profile extension table |
-
-## April 2017
-| New or changed topic | Description |
-|----------------------|-------------|
-| [New policies for Windows 10](new-policies-for-windows-10.md) | Added a list of new Group Policy settings for Windows 10, version 1703 |
-
-## 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)
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index 694a7e8b07..eb3917a794 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/client-management/generate-kernel-or-complete-crash-dump.md b/windows/client-management/generate-kernel-or-complete-crash-dump.md
index ac31619d20..e0a26c9402 100644
--- a/windows/client-management/generate-kernel-or-complete-crash-dump.md
+++ b/windows/client-management/generate-kernel-or-complete-crash-dump.md
@@ -78,6 +78,9 @@ To do this, follow these steps:
> [!IMPORTANT]
> Follow the steps in this section carefully. Serious problems might occur if you modify the registry incorrectly. Before you modify it, [back up the registry for restoration](https://support.microsoft.com/help/322756) in case problems occur.
+
+> [!NOTE]
+> This registry key is not required for clients running Windows 8 and later, or servers running Windows Server 2012 and later. Setting this registry key on later versions of Windows has no effect.
1. In Registry Editor, locate the following registry subkey:
@@ -110,4 +113,4 @@ If you want to run NMI in Microsoft Azure using Serial Console, see [Use Serial
### Use Debugger
-[Forcing a System Crash from the Debugger](/windows-hardware/drivers/debugger/forcing-a-system-crash-from-the-debugger)
\ No newline at end of file
+[Forcing a System Crash from the Debugger](/windows-hardware/drivers/debugger/forcing-a-system-crash-from-the-debugger)
diff --git a/windows/client-management/includes/allow-a-shared-books-folder-shortdesc.md b/windows/client-management/includes/allow-a-shared-books-folder-shortdesc.md
new file mode 100644
index 0000000000..ecfa4c5ca0
--- /dev/null
+++ b/windows/client-management/includes/allow-a-shared-books-folder-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge does not use a shared folder by default but downloads book files to a per-user folder for each user. With this policy, you can configure Microsoft Edge to store books from the Books Library to a default, shared folder in Windows, which decreases the amount of storage used by book files. When you enable this policy, Microsoft Edge downloads books to a shared folder after user action to download the book to their device, which allows them to remove downloaded books at any time. For this policy to work correctly, you must also enable the **Allow a Windows app to share application data between users** group policy. Also, the users must be signed in with a school or work account.
diff --git a/windows/client-management/includes/allow-address-bar-drop-down-shortdesc.md b/windows/client-management/includes/allow-address-bar-drop-down-shortdesc.md
new file mode 100644
index 0000000000..116864a49f
--- /dev/null
+++ b/windows/client-management/includes/allow-address-bar-drop-down-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge shows the Address bar drop-down list and makes it available by default, which takes precedence over the Configure search suggestions in Address bar policy. We recommend disabling this policy if you want to minimize network connections from Microsoft Edge to Microsoft service, which hides the functionality of the Address bar drop-down list. When you disable this policy, Microsoft Edge also disables the _Show search and site suggestions as I type_ toggle in Settings.
diff --git a/windows/client-management/includes/allow-adobe-flash-shortdesc.md b/windows/client-management/includes/allow-adobe-flash-shortdesc.md
new file mode 100644
index 0000000000..dca6cf6233
--- /dev/null
+++ b/windows/client-management/includes/allow-adobe-flash-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Adobe Flash is integrated with Microsoft Edge and runs Adobe Flash content by default. With this policy, you can configure Microsoft Edge to prevent Adobe Flash content from running.
diff --git a/windows/client-management/includes/allow-clearing-browsing-data-on-exit-shortdesc.md b/windows/client-management/includes/allow-clearing-browsing-data-on-exit-shortdesc.md
new file mode 100644
index 0000000000..af3d4fefef
--- /dev/null
+++ b/windows/client-management/includes/allow-clearing-browsing-data-on-exit-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge does not clear the browsing data on exit by default, but users can configure the _Clear browsing data_ option in Settings. Browsing data includes information you entered in forms, passwords, and even the websites visited. With this policy, you can configure Microsoft Edge to clear the browsing data automatically each time Microsoft Edge closes.
diff --git a/windows/client-management/includes/allow-configuration-updates-for-books-library-shortdesc.md b/windows/client-management/includes/allow-configuration-updates-for-books-library-shortdesc.md
new file mode 100644
index 0000000000..40a927c882
--- /dev/null
+++ b/windows/client-management/includes/allow-configuration-updates-for-books-library-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge automatically updates the configuration data for the Books library. Disabling this policy prevents Microsoft Edge from updating the configuration data. If Microsoft receives feedback about the amount of data about the Books library, the data comes as a JSON file.
diff --git a/windows/client-management/includes/allow-cortana-shortdesc.md b/windows/client-management/includes/allow-cortana-shortdesc.md
new file mode 100644
index 0000000000..fbfa0f13b0
--- /dev/null
+++ b/windows/client-management/includes/allow-cortana-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Since Microsoft Edge is integration with Cortana, Microsoft Edge allows users to use Cortana voice assistant by default. With this policy, you can configure Microsoft Edge to prevent users from using Cortana but can still search to find items on their device.
diff --git a/windows/client-management/includes/allow-developer-tools-shortdesc.md b/windows/client-management/includes/allow-developer-tools-shortdesc.md
new file mode 100644
index 0000000000..9d134d4a38
--- /dev/null
+++ b/windows/client-management/includes/allow-developer-tools-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows users to use the F12 developer tools to build and debug web pages by default. With this policy, you can configure Microsoft Edge to prevent users from using the F12 developer tools.
diff --git a/windows/client-management/includes/allow-extended-telemetry-for-books-tab-shortdesc.md b/windows/client-management/includes/allow-extended-telemetry-for-books-tab-shortdesc.md
new file mode 100644
index 0000000000..9d39c7e091
--- /dev/null
+++ b/windows/client-management/includes/allow-extended-telemetry-for-books-tab-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, and depending on the device configuration, Microsoft Edge gathers basic diagnostic data about the books in the Books Library and sends it to Microsoft. Enabling this policy gathers and sends both basic and additional diagnostic data, such as usage data.
diff --git a/windows/client-management/includes/allow-extensions-shortdesc.md b/windows/client-management/includes/allow-extensions-shortdesc.md
new file mode 100644
index 0000000000..ca5e422178
--- /dev/null
+++ b/windows/client-management/includes/allow-extensions-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows users to add or personalize extensions in Microsoft Edge by default. With this policy, you can configure Microsoft to prevent users from adding or personalizing extensions.
diff --git a/windows/client-management/includes/allow-fullscreen-mode-shortdesc.md b/windows/client-management/includes/allow-fullscreen-mode-shortdesc.md
new file mode 100644
index 0000000000..1aca979b7e
--- /dev/null
+++ b/windows/client-management/includes/allow-fullscreen-mode-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows fullscreen mode by default, which shows only the web content and hides the Microsoft Edge UI. When allowing fullscreen mode, users and extensions must have the proper permissions. Disabling this policy prevents fullscreen mode in Microsoft Edge.
diff --git a/windows/client-management/includes/allow-inprivate-browsing-shortdesc.md b/windows/client-management/includes/allow-inprivate-browsing-shortdesc.md
new file mode 100644
index 0000000000..4e15608ff7
--- /dev/null
+++ b/windows/client-management/includes/allow-inprivate-browsing-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge allows InPrivate browsing, and after closing all InPrivate tabs, Microsoft Edge deletes the browsing data from the device. With this policy, you can configure Microsoft Edge to prevent InPrivate web browsing.
diff --git a/windows/client-management/includes/allow-microsoft-compatibility-list-shortdesc.md b/windows/client-management/includes/allow-microsoft-compatibility-list-shortdesc.md
new file mode 100644
index 0000000000..46d2b5f57e
--- /dev/null
+++ b/windows/client-management/includes/allow-microsoft-compatibility-list-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+During browser navigation, Microsoft Edge checks the Microsoft Compatibility List for websites with known compatibility issues. If found, users are prompted to use Internet Explorer, where the site loads and displays correctly. Periodically during browser navigation, Microsoft Edge downloads the latest version of the list and applies the updates. With this policy, you can configure Microsoft Edge to ignore the compatibility list. You can view the compatibility list at about:compat.
diff --git a/windows/client-management/includes/allow-prelaunch-shortdesc.md b/windows/client-management/includes/allow-prelaunch-shortdesc.md
new file mode 100644
index 0000000000..fcaf11e3ef
--- /dev/null
+++ b/windows/client-management/includes/allow-prelaunch-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge pre-launches as a background process during Windows startup when the system is idle waiting to be launched by the user. Pre-launching helps the performance of Microsoft Edge and minimizes the amount of time required to start Microsoft Edge. You can also configure Microsoft Edge to prevent from pre-launching.
diff --git a/windows/client-management/includes/allow-printing-shortdesc.md b/windows/client-management/includes/allow-printing-shortdesc.md
new file mode 100644
index 0000000000..f03766176c
--- /dev/null
+++ b/windows/client-management/includes/allow-printing-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows users to print web content by default. With this policy, you can configure Microsoft Edge to prevent users from printing web content.
diff --git a/windows/client-management/includes/allow-saving-history-shortdesc.md b/windows/client-management/includes/allow-saving-history-shortdesc.md
new file mode 100644
index 0000000000..9acffb1e18
--- /dev/null
+++ b/windows/client-management/includes/allow-saving-history-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge saves the browsing history of visited websites and shows them in the History pane by default. Disabling this policy prevents Microsoft Edge from saving the browsing history. If browsing history existed before disabling this policy, the previous browsing history remains in the History pane. Disabling this policy does not stop roaming of existing browsing history or browsing history from other devices.
diff --git a/windows/client-management/includes/allow-search-engine-customization-shortdesc.md b/windows/client-management/includes/allow-search-engine-customization-shortdesc.md
new file mode 100644
index 0000000000..4992a19eab
--- /dev/null
+++ b/windows/client-management/includes/allow-search-engine-customization-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users can add new search engines or change the default search engine, in Settings. With this policy, you can prevent users from customizing the search engine in Microsoft Edge.
diff --git a/windows/client-management/includes/allow-sideloading-of-extensions-shortdesc.md b/windows/client-management/includes/allow-sideloading-of-extensions-shortdesc.md
new file mode 100644
index 0000000000..e16dbdc2db
--- /dev/null
+++ b/windows/client-management/includes/allow-sideloading-of-extensions-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge allows sideloading, which installs and runs unverified extensions. Disabling this policy prevents sideloading of extensions but does not prevent sideloading using Add-AppxPackage via PowerShell. You can only install extensions through Microsoft store (including a store for business), enterprise storefront (such as Company Portal) or PowerShell (using Add-AppxPackage).
diff --git a/windows/client-management/includes/allow-tab-preloading-shortdesc.md b/windows/client-management/includes/allow-tab-preloading-shortdesc.md
new file mode 100644
index 0000000000..783d8517ed
--- /dev/null
+++ b/windows/client-management/includes/allow-tab-preloading-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows preloading of the Start and New Tab pages during Windows sign in, and each time Microsoft Edge closes by default. Preloading minimizes the amount of time required to start Microsoft Edge and load a new tab. With this policy, you can configure Microsoft Edge to prevent preloading of tabs.
diff --git a/windows/client-management/includes/allow-web-content-on-new-tab-page-shortdesc.md b/windows/client-management/includes/allow-web-content-on-new-tab-page-shortdesc.md
new file mode 100644
index 0000000000..eb2a40f269
--- /dev/null
+++ b/windows/client-management/includes/allow-web-content-on-new-tab-page-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 11/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge loads the default New Tab page and lets the users make changes. If you disable this policy, a blank page loads instead of the New Tab page and prevents users from changing it.
diff --git a/windows/client-management/includes/allow-windows-app-to-share-data-users-shortdesc.md b/windows/client-management/includes/allow-windows-app-to-share-data-users-shortdesc.md
new file mode 100644
index 0000000000..51e769d22c
--- /dev/null
+++ b/windows/client-management/includes/allow-windows-app-to-share-data-users-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+With this policy, you can configure Windows 10 to share application data among multiple users on the system and with other instances of that app. Data shared through the SharedLocal folder is available through the Windows.Storage API. If you previously enabled this policy and now want to disable it, any shared app data remains in the SharedLocal folder.
diff --git a/windows/client-management/includes/always-show-books-library-shortdesc.md b/windows/client-management/includes/always-show-books-library-shortdesc.md
new file mode 100644
index 0000000000..264f64a898
--- /dev/null
+++ b/windows/client-management/includes/always-show-books-library-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge shows the Books Library only in countries or regions where supported. With this policy, you can configure Microsoft Edge to show the Books Library regardless of the device’s country or region.
diff --git a/windows/client-management/includes/configure-additional-search-engines-shortdesc.md b/windows/client-management/includes/configure-additional-search-engines-shortdesc.md
new file mode 100644
index 0000000000..f4a61c024c
--- /dev/null
+++ b/windows/client-management/includes/configure-additional-search-engines-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users cannot add, remove, or change any of the search engines in Microsoft Edge, but they can set a default search engine. You can set the default search engine using the Set default search engine policy. However, with this policy, you can configure up to five additional search engines and set any one of them as the default. If you previously enabled this policy and now want to disable it, disabling deletes all configured search engines.
diff --git a/windows/client-management/includes/configure-adobe-flash-click-to-run-setting-shortdesc.md b/windows/client-management/includes/configure-adobe-flash-click-to-run-setting-shortdesc.md
new file mode 100644
index 0000000000..0f73c32d5f
--- /dev/null
+++ b/windows/client-management/includes/configure-adobe-flash-click-to-run-setting-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge supports Adobe Flash as a built-in feature rather than as an external add-on and updates automatically via Windows Update. By default, Microsoft Edge prevents Adobe Flash content from loading automatically, requiring action from the user, for example, clicking the **Click-to-Run** button. Depending on how often the content loads and runs, the sites for the content gets added to the auto-allowed list. Disable this policy if you want Adobe Flash content to load automatically.
diff --git a/windows/client-management/includes/configure-autofill-shortdesc.md b/windows/client-management/includes/configure-autofill-shortdesc.md
new file mode 100644
index 0000000000..94441080d8
--- /dev/null
+++ b/windows/client-management/includes/configure-autofill-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users can choose to use the Autofill feature to populate the form fields automatically. With this policy, you can configure Microsoft Edge, when enabled to use Autofill or, when disabled to prevent using Autofill.
diff --git a/windows/client-management/includes/configure-browser-telemetry-for-m365-analytics-shortdesc.md b/windows/client-management/includes/configure-browser-telemetry-for-m365-analytics-shortdesc.md
new file mode 100644
index 0000000000..75a3631a95
--- /dev/null
+++ b/windows/client-management/includes/configure-browser-telemetry-for-m365-analytics-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge does not send browsing history data to Microsoft 365 Analytics by default. With this policy though, you can configure Microsoft Edge to send intranet history only, internet history only, or both to Microsoft 365 Analytics for enterprise devices with a configured Commercial ID.
diff --git a/windows/client-management/includes/configure-cookies-shortdesc.md b/windows/client-management/includes/configure-cookies-shortdesc.md
new file mode 100644
index 0000000000..93152d2e3d
--- /dev/null
+++ b/windows/client-management/includes/configure-cookies-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows all cookies from all websites by default. With this policy, you can configure Microsoft to block only 3rd-party cookies or block all cookies.
diff --git a/windows/client-management/includes/configure-do-not-track-shortdesc.md b/windows/client-management/includes/configure-do-not-track-shortdesc.md
new file mode 100644
index 0000000000..dd27fad917
--- /dev/null
+++ b/windows/client-management/includes/configure-do-not-track-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge does not send ‘Do Not Track’ requests to websites asking for tracking information, but users can choose to send tracking information to sites they visit. With this policy, you can configure Microsoft Edge to send or never send tracking information.
diff --git a/windows/client-management/includes/configure-enterprise-mode-site-list-shortdesc.md b/windows/client-management/includes/configure-enterprise-mode-site-list-shortdesc.md
new file mode 100644
index 0000000000..d13febee60
--- /dev/null
+++ b/windows/client-management/includes/configure-enterprise-mode-site-list-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge does not support ActiveX controls, Browser Helper Objects, VBScript, or other legacy technology. If you have sites or apps that use this technology, you can configure Microsoft Edge to check the Enterprise Mode Site List XML file that lists the sites and domains with compatibility issues and switch to IE11 automatically. You can use the same site list for both Microsoft Edge and IE11, or you can use separate lists. By default, Microsoft Edge ignores the Enterprise Mode and the Enterprise Mode Site List XML file. In this case, users might experience problems while using legacy apps. These sites and domains must be viewed using Internet Explorer 11 and Enterprise Mode.
diff --git a/windows/client-management/includes/configure-favorites-bar-shortdesc.md b/windows/client-management/includes/configure-favorites-bar-shortdesc.md
new file mode 100644
index 0000000000..8f16c20242
--- /dev/null
+++ b/windows/client-management/includes/configure-favorites-bar-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge hides the favorites bar by default but shows it on the Start and New Tab pages. Also, by default, the Favorites Bar toggle, in Settings, is set to Off but enabled letting users make changes. With this policy, you can configure Microsoft Edge to either show or hide the Favorites Bar on all pages.
diff --git a/windows/client-management/includes/configure-favorites-shortdesc.md b/windows/client-management/includes/configure-favorites-shortdesc.md
new file mode 100644
index 0000000000..9317df97f3
--- /dev/null
+++ b/windows/client-management/includes/configure-favorites-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Discontinued in Windows 10, version 1809. Use the **[Provision Favorites](../available-policies.md#provision-favorites)** policy instead.
diff --git a/windows/client-management/includes/configure-home-button-shortdesc.md b/windows/client-management/includes/configure-home-button-shortdesc.md
new file mode 100644
index 0000000000..c02a0dcee9
--- /dev/null
+++ b/windows/client-management/includes/configure-home-button-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge shows the home button and by clicking it the Start page loads by default. With this policy, you can configure the home button to load the New Tab page or a URL defined in the Set Home Button URL policy. You can also configure Microsoft Edge to hide the home button.
diff --git a/windows/client-management/includes/configure-kiosk-mode-shortdesc.md b/windows/client-management/includes/configure-kiosk-mode-shortdesc.md
new file mode 100644
index 0000000000..0247b490e6
--- /dev/null
+++ b/windows/client-management/includes/configure-kiosk-mode-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Configure how Microsoft Edge behaves when it’s running in kiosk mode with assigned access, either as a single-app or as one of many apps running on the kiosk device. You can control whether Microsoft Edge runs InPrivate full screen, InPrivate multi-tab with a tailored experience for kiosks, or normal browsing in Microsoft Edge.
diff --git a/windows/client-management/includes/configure-kiosk-reset-after-idle-timeout-shortdesc.md b/windows/client-management/includes/configure-kiosk-reset-after-idle-timeout-shortdesc.md
new file mode 100644
index 0000000000..3a7657e544
--- /dev/null
+++ b/windows/client-management/includes/configure-kiosk-reset-after-idle-timeout-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+You can configure Microsoft Edge kiosk mode to reset to the configured start experience after a specified amount of idle time in minutes (0-1440). The reset timer begins after the last user interaction. Once the idle time meets the time specified, a confirmation message prompts the user to continue, and if no user action, Microsoft Edge kiosk mode resets after 30 seconds. Resetting to the configured start experience deletes the current user’s browsing data.
diff --git a/windows/client-management/includes/configure-open-microsoft-edge-with-shortdesc.md b/windows/client-management/includes/configure-open-microsoft-edge-with-shortdesc.md
new file mode 100644
index 0000000000..8d1cc4f603
--- /dev/null
+++ b/windows/client-management/includes/configure-open-microsoft-edge-with-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge loads a specific page or pages defined in the Configure Start Pages policy and allow users to make changes. With this policy, you can configure Microsoft Edge to load either the Start page, New Tab page, previously opened pages. You can also configure Microsoft Edge to prevent users from changing or customizing the Start page. For this policy to work correctly, you must also configure the Configure Start Pages. If you want to prevent users from making changes, don’t configure the Disable Lockdown of Start Pages policy.
diff --git a/windows/client-management/includes/configure-password-manager-shortdesc.md b/windows/client-management/includes/configure-password-manager-shortdesc.md
new file mode 100644
index 0000000000..0d3bd9b655
--- /dev/null
+++ b/windows/client-management/includes/configure-password-manager-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge uses Password Manager automatically, allowing users to manager passwords locally. Disabling this policy restricts Microsoft Edge from using Password Manager. Don’t configure this policy if you want to let users choose to save and manage passwords locally using Password Manager.
diff --git a/windows/client-management/includes/configure-pop-up-blocker-shortdesc.md b/windows/client-management/includes/configure-pop-up-blocker-shortdesc.md
new file mode 100644
index 0000000000..d15347179d
--- /dev/null
+++ b/windows/client-management/includes/configure-pop-up-blocker-shortdesc.md
@@ -0,0 +1,12 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge turns off Pop-up Blocker, which opens pop-up windows. Enabling this policy turns on Pop-up Blocker preventing pop-up windows from opening. If you want users to choose to use Pop-up Blocker, don’t configure this policy.
+
diff --git a/windows/client-management/includes/configure-search-suggestions-in-address-bar-shortdesc.md b/windows/client-management/includes/configure-search-suggestions-in-address-bar-shortdesc.md
new file mode 100644
index 0000000000..2bdf42c6d3
--- /dev/null
+++ b/windows/client-management/includes/configure-search-suggestions-in-address-bar-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users can choose to see search suggestions in the Address bar of Microsoft Edge. Disabling this policy hides the search suggestions and enabling this policy shows the search suggestions.
diff --git a/windows/client-management/includes/configure-start-pages-shortdesc.md b/windows/client-management/includes/configure-start-pages-shortdesc.md
new file mode 100644
index 0000000000..146511b737
--- /dev/null
+++ b/windows/client-management/includes/configure-start-pages-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge loads the pages specified in App settings as the default Start pages. With this policy, you can configure one or more Start pages when you enable this policy and enable the Configure Open Microsoft Edge With policy. Once you set the Start pages, either in this policy or Configure Open Microsoft Edge With policy, users cannot make changes.
diff --git a/windows/client-management/includes/configure-windows-defender-smartscreen-shortdesc.md b/windows/client-management/includes/configure-windows-defender-smartscreen-shortdesc.md
new file mode 100644
index 0000000000..62547e8955
--- /dev/null
+++ b/windows/client-management/includes/configure-windows-defender-smartscreen-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge uses Windows Defender SmartScreen (turned on) to protect users from potential phishing scams and malicious software by default. Also, by default, users cannot disable (turn off) Windows Defender SmartScreen. Enabling this policy turns on Windows Defender SmartScreen and prevent users from turning it off. Don’t configure this policy to let users choose to turn Windows defender SmartScreen on or off.
diff --git a/windows/client-management/includes/disable-lockdown-of-start-pages-shortdesc.md b/windows/client-management/includes/disable-lockdown-of-start-pages-shortdesc.md
new file mode 100644
index 0000000000..37ff4011ad
--- /dev/null
+++ b/windows/client-management/includes/disable-lockdown-of-start-pages-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, the Start pages configured in either the Configure Start Pages policy or Configure Open Microsoft Edge policies cannot be changed and remain locked down. Enabling this policy unlocks the Start pages, and lets users make changes to either all configured Start page or any Start page configured with the Configure Start pages policy.
diff --git a/windows/client-management/includes/do-not-sync-browser-settings-shortdesc.md b/windows/client-management/includes/do-not-sync-browser-settings-shortdesc.md
new file mode 100644
index 0000000000..f0cb07d514
--- /dev/null
+++ b/windows/client-management/includes/do-not-sync-browser-settings-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, the “browser” group syncs automatically between user’s devices and allowing users to choose to make changes. The “browser” group uses the _Sync your Settings_ option in Settings to sync information like history and favorites. Enabling this policy prevents the “browser” group from using the Sync your Settings option. If you want syncing turned off by default but not disabled, select the _Allow users to turn “browser” syncing_ option.
diff --git a/windows/client-management/includes/do-not-sync-shortdesc.md b/windows/client-management/includes/do-not-sync-shortdesc.md
new file mode 100644
index 0000000000..f61cc11548
--- /dev/null
+++ b/windows/client-management/includes/do-not-sync-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge turns on the _Sync your settings_ toggle in **Settings > Device sync settings** letting users choose what to sync on their devices. Enabling this policy turns off and disables the _Sync your settings_ toggle preventing the syncing of user’s settings between their devices. If you want syncing turned off by default in Microsoft Edge but not disabled, enable this policy and select the _Allow users to turn syncing on_ option.
diff --git a/windows/client-management/includes/keep-favorites-in-sync-between-ie-and-edge-shortdesc.md b/windows/client-management/includes/keep-favorites-in-sync-between-ie-and-edge-shortdesc.md
new file mode 100644
index 0000000000..3bd062d263
--- /dev/null
+++ b/windows/client-management/includes/keep-favorites-in-sync-between-ie-and-edge-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge does not sync the user’s favorites between IE and Microsoft Edge. Enabling this policy syncs favorites between Internet Explorer and Microsoft Edge. Changes to favorites in one browser reflect in the other, including additions, deletions, modifications, and ordering of favorites.
diff --git a/windows/client-management/includes/microsoft-browser-extension-policy-shortdesc.md b/windows/client-management/includes/microsoft-browser-extension-policy-shortdesc.md
new file mode 100644
index 0000000000..05fce92a47
--- /dev/null
+++ b/windows/client-management/includes/microsoft-browser-extension-policy-shortdesc.md
@@ -0,0 +1,13 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 04/23/2020
+ms.reviewer:
+audience: itpro
+manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+[Microsoft browser extension policy](/legal/microsoft-edge/microsoft-browser-extension-policy):
+This article describes the supported mechanisms for extending or modifying the behavior or user experience of Microsoft Edge and Internet Explorer, or the content these browsers display. Techniques that aren't explicitly listed in this article are considered to be **unsupported**.
\ No newline at end of file
diff --git a/windows/client-management/includes/prevent-access-to-about-flags-page-shortdesc.md b/windows/client-management/includes/prevent-access-to-about-flags-page-shortdesc.md
new file mode 100644
index 0000000000..5bf46ea949
--- /dev/null
+++ b/windows/client-management/includes/prevent-access-to-about-flags-page-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users can access the about:flags page in Microsoft Edge, which is used to change developer settings and enable experimental features. Enabling this policy prevents users from accessing the about:flags page.
diff --git a/windows/client-management/includes/prevent-bypassing-windows-defender-prompts-for-files-shortdesc.md b/windows/client-management/includes/prevent-bypassing-windows-defender-prompts-for-files-shortdesc.md
new file mode 100644
index 0000000000..3676adbc89
--- /dev/null
+++ b/windows/client-management/includes/prevent-bypassing-windows-defender-prompts-for-files-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge allows users to bypass (ignore) the Windows Defender SmartScreen warnings about potentially malicious files, allowing them to continue downloading the unverified file(s). Enabling this policy prevents users from bypassing the warnings, blocking them from downloading of the unverified file(s).
diff --git a/windows/client-management/includes/prevent-bypassing-windows-defender-prompts-for-sites-shortdesc.md b/windows/client-management/includes/prevent-bypassing-windows-defender-prompts-for-sites-shortdesc.md
new file mode 100644
index 0000000000..05bae5dac6
--- /dev/null
+++ b/windows/client-management/includes/prevent-bypassing-windows-defender-prompts-for-sites-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge allows users to bypass (ignore) the Windows Defender SmartScreen warnings about potentially malicious sites, allowing them to continue to the site. With this policy though, you can configure Microsoft Edge to prevent users from bypassing the warnings, blocking them from continuing to the site.
diff --git a/windows/client-management/includes/prevent-certificate-error-overrides-shortdesc.md b/windows/client-management/includes/prevent-certificate-error-overrides-shortdesc.md
new file mode 100644
index 0000000000..675180c666
--- /dev/null
+++ b/windows/client-management/includes/prevent-certificate-error-overrides-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge, by default, allows overriding of the security warnings to sites that have SSL errors, bypassing or ignoring certificate errors. Enabling this policy prevents overriding of the security warnings.
diff --git a/windows/client-management/includes/prevent-changes-to-favorites-shortdesc.md b/windows/client-management/includes/prevent-changes-to-favorites-shortdesc.md
new file mode 100644
index 0000000000..33db87a522
--- /dev/null
+++ b/windows/client-management/includes/prevent-changes-to-favorites-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users can add, import, and make changes to the Favorites list in Microsoft Edge. Enabling this policy locks down the Favorites list in Microsoft Edge, preventing users from making changes. When enabled, Microsoft Edge turns off the Save a Favorite, Import settings, and context menu items, such as Create a new folder. Enable only this policy or the Keep favorites in sync between Internet Explorer and Microsoft Edge policy. If you enable both, Microsoft Edge prevents users from syncing their favorites between the two browsers.
diff --git a/windows/client-management/includes/prevent-edge-from-gathering-live-tile-info-shortdesc.md b/windows/client-management/includes/prevent-edge-from-gathering-live-tile-info-shortdesc.md
new file mode 100644
index 0000000000..30d9a48e8d
--- /dev/null
+++ b/windows/client-management/includes/prevent-edge-from-gathering-live-tile-info-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge collects the Live Tile metadata and sends it to Microsoft to help provide users a complete experience when they pin Live Tiles to the Start menu. However, with this policy, you can configure Microsoft Edge to prevent Microsoft from collecting Live Tile metadata, providing users with a limited experience.
diff --git a/windows/client-management/includes/prevent-first-run-webpage-from-opening-shortdesc.md b/windows/client-management/includes/prevent-first-run-webpage-from-opening-shortdesc.md
new file mode 100644
index 0000000000..9ed6170971
--- /dev/null
+++ b/windows/client-management/includes/prevent-first-run-webpage-from-opening-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, when launching Microsoft Edge for the first time, the First Run webpage (a welcome page) hosted on Microsoft.com loads automatically via an FWLINK. The welcome page lists the new features and helpful tips of Microsoft Edge. With this policy, you can configure Microsoft Edge to prevent loading the welcome page on first explicit user-launch.
diff --git a/windows/client-management/includes/prevent-turning-off-required-extensions-shortdesc.md b/windows/client-management/includes/prevent-turning-off-required-extensions-shortdesc.md
new file mode 100644
index 0000000000..7264330137
--- /dev/null
+++ b/windows/client-management/includes/prevent-turning-off-required-extensions-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge allows users to uninstall extensions by default. Enabling this policy prevents users from uninstalling extensions but lets them configure options for extensions defined in this policy, such as allowing InPrivate browsing. Any additional permissions requested by future updates of the extension gets granted automatically. If you enabled this policy and now you want to disable it, the list of extension package family names (PFNs) defined in this policy get ignored after disabling this policy.
diff --git a/windows/client-management/includes/prevent-users-to-turn-on-browser-syncing-shortdesc.md b/windows/client-management/includes/prevent-users-to-turn-on-browser-syncing-shortdesc.md
new file mode 100644
index 0000000000..e624de62e6
--- /dev/null
+++ b/windows/client-management/includes/prevent-users-to-turn-on-browser-syncing-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, the “browser” group syncs automatically between the user’s devices, letting users make changes. With this policy, though, you can prevent the “browser” group from syncing and prevent users from turning on the _Sync your Settings_ toggle in Settings. If you want syncing turned off by default but not disabled, select the _Allow users to turn “browser” syncing_ option in the Do not sync browser policy. For this policy to work correctly, you must enable the Do not sync browser policy.
diff --git a/windows/client-management/includes/prevent-using-localhost-ip-address-for-webrtc-shortdesc.md b/windows/client-management/includes/prevent-using-localhost-ip-address-for-webrtc-shortdesc.md
new file mode 100644
index 0000000000..5ef4bbdeca
--- /dev/null
+++ b/windows/client-management/includes/prevent-using-localhost-ip-address-for-webrtc-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge shows localhost IP address while making calls using the WebRTC protocol. Enabling this policy hides the localhost IP addresses.
diff --git a/windows/client-management/includes/provision-favorites-shortdesc.md b/windows/client-management/includes/provision-favorites-shortdesc.md
new file mode 100644
index 0000000000..30b9677f92
--- /dev/null
+++ b/windows/client-management/includes/provision-favorites-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, users can customize the Favorites list in Microsoft Edge. With this policy though, you provision a standard list of favorites, which can include folders, to appear in the Favorites list in addition to the user’s favorites. Edge. Once you provision the Favorites list, users cannot customize it, such as adding folders for organizing, and adding or removing any of the favorites configured.
diff --git a/windows/client-management/includes/search-provider-discovery-shortdesc.md b/windows/client-management/includes/search-provider-discovery-shortdesc.md
new file mode 100644
index 0000000000..8f54c4b93a
--- /dev/null
+++ b/windows/client-management/includes/search-provider-discovery-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge follows the OpenSearch 1.1 specification to discover and use web search providers. When a user browses to a search service, the OpenSearch description is picked up and saved for later use. Users can then choose to add the search service to use in the Microsoft Edge address bar.
diff --git a/windows/client-management/includes/send-all-intranet-sites-to-ie-shortdesc.md b/windows/client-management/includes/send-all-intranet-sites-to-ie-shortdesc.md
new file mode 100644
index 0000000000..787f96dd9b
--- /dev/null
+++ b/windows/client-management/includes/send-all-intranet-sites-to-ie-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, all websites, including intranet sites, open in Microsoft Edge automatically. Only enable this policy if there are known compatibility problems with Microsoft Edge. Enabling this policy loads only intranet sites in Internet Explorer 11 automatically.
diff --git a/windows/client-management/includes/set-default-search-engine-shortdesc.md b/windows/client-management/includes/set-default-search-engine-shortdesc.md
new file mode 100644
index 0000000000..39b408d1b4
--- /dev/null
+++ b/windows/client-management/includes/set-default-search-engine-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge uses the search engine specified in App settings, letting users make changes at any time unless the Allow search engine customization policy is disabled, which restricts users from making changes. With this policy, you can either remove or use the policy-set search engine. When you remove the policy-set search engine, Microsoft Edge uses the specified search engine for the market, which lets users make changes to the default search engine. You can use the policy-set search engine specified in the OpenSearch XML, which prevents users from making changes.
diff --git a/windows/client-management/includes/set-home-button-url-shortdesc.md b/windows/client-management/includes/set-home-button-url-shortdesc.md
new file mode 100644
index 0000000000..863cfdf84a
--- /dev/null
+++ b/windows/client-management/includes/set-home-button-url-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, Microsoft Edge shows the home button and loads the Start page, and locks down the home button to prevent users from changing what page loads. Enabling this policy loads a custom URL for the home button. When you enable this policy, and enable the Configure Home Button policy with the _Show home button & set a specific page_ option selected, a custom URL loads when the user clicks the home button.
diff --git a/windows/client-management/includes/set-new-tab-url-shortdesc.md b/windows/client-management/includes/set-new-tab-url-shortdesc.md
new file mode 100644
index 0000000000..5062d322e4
--- /dev/null
+++ b/windows/client-management/includes/set-new-tab-url-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+Microsoft Edge loads the default New Tab page by default. Enabling this policy lets you set a New Tab page URL in Microsoft Edge, preventing users from changing it. When you enable this policy, and you disable the Allow web content on New Tab page policy, Microsoft Edge ignores any URL specified in this policy and opens about:blank.
diff --git a/windows/client-management/includes/show-message-when-opening-sites-in-ie-shortdesc.md b/windows/client-management/includes/show-message-when-opening-sites-in-ie-shortdesc.md
new file mode 100644
index 0000000000..1dc59094fd
--- /dev/null
+++ b/windows/client-management/includes/show-message-when-opening-sites-in-ie-shortdesc.md
@@ -0,0 +1,10 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+Microsoft Edge does not show a notification before opening sites in Internet Explorer 11. However, with this policy, you can configure Microsoft Edge to display a notification before a site opens in IE11 or let users continue in Microsoft Edge. If you want users to continue in Microsoft Edge, enable this policy to show the _Keep going in Microsoft Edge_ link in the notification. For this policy to work correctly, you must also enable the Configure the Enterprise Mode Site List or Send all intranet sites to Internet Explorer 11, or both.
diff --git a/windows/client-management/includes/unlock-home-button-shortdesc.md b/windows/client-management/includes/unlock-home-button-shortdesc.md
new file mode 100644
index 0000000000..0dd37009b6
--- /dev/null
+++ b/windows/client-management/includes/unlock-home-button-shortdesc.md
@@ -0,0 +1,11 @@
+---
+author: dansimp
+ms.author: dansimp
+ms.date: 10/02/2018
+ms.reviewer:
+audience: itpro
manager: dansimp
+ms.prod: edge
+ms.topic: include
+---
+
+By default, when you enable the Configure Home Button policy or provide a URL in the Set Home Button URL policy, Microsoft Edge locks down the home button to prevent users from changing the settings. When you enable this policy, users can make changes to the home button even if you enabled the Configure Home Button or Set Home Button URL policies.
diff --git a/windows/client-management/index.md b/windows/client-management/index.md
deleted file mode 100644
index 477c88252a..0000000000
--- a/windows/client-management/index.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Client management (Windows 10)
-description: Learn about the administrative tools, tasks and best practices for managing Windows 10 and Windows 10 Mobile clients across your enterprise.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-author: dansimp
-ms.localizationpriority: medium
-ms.author: dansimp
----
-
-# Client management
-
-**Applies to**
-- Windows 10
-
-Learn about the administrative tools, tasks and best practices for managing Windows 10 and Windows 10 Mobile clients across your enterprise.
-
-| Topic | Description |
-|---|---|
-|[Administrative Tools in Windows 10](administrative-tools-in-windows-10.md)| Links to documentation for tools for IT pros and advanced users in the Administrative Tools folder.|
-|[Create mandatory user profiles](mandatory-user-profile.md)| Instructions for managing settings commonly defined in a mandatory profiles, including (but are not limited to): icons that appear on the desktop, desktop backgrounds, user preferences in Control Panel, printer selections, and more.|
-|[Connect to remote Azure Active Directory-joined PCs](connect-to-remote-aadj-pc.md)| Instructions for connecting to a remote PC joined to Azure Active Directory (Azure AD)|
-|[Join Windows 10 Mobile to Azure AD](join-windows-10-mobile-to-azure-active-directory.md)| Describes the considerations and options for using Windows 10 Mobile with Azure AD in your organization.|
-|[New policies for Windows 10](new-policies-for-windows-10.md)| Listing of new group policy settings available in Windows 10|
-|[Windows 10 default media removal policy](change-default-removal-policy-external-storage-media.md) |In Windows 10, version 1809, the default removal policy for external storage media changed from "Better performance" to "Quick removal." |
-|[Group policies for enterprise and education editions](group-policies-for-enterprise-and-education-editions.md)| Listing of all group policy settings that apply specifically to Windows 10 Enterprise and Education editions|
-| [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md) | Starting in Windows 10, version 1703, you can now manage the pages that are shown in the Settings app by using Group Policy. |
-|[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|
-|[Transitioning to modern ITPro management](manage-windows-10-in-your-organization-modern-management.md)| Describes modern Windows 10 ITPro management scenarios across traditional, hybrid and cloud-based enterprise needs|
-|[Windows 10 Mobile deployment and management guide](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.|
-|[Mobile device management for solution providers](mdm/index.md) | Procedural and reference documentation for solution providers providing mobile device management (MDM) for Windows 10 devices. |
-|[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. |
\ No newline at end of file
diff --git a/windows/client-management/index.yml b/windows/client-management/index.yml
new file mode 100644
index 0000000000..3731f3f13d
--- /dev/null
+++ b/windows/client-management/index.yml
@@ -0,0 +1,67 @@
+### YamlMime:Landing
+
+title: Client management # < 60 chars
+summary: Find out how to apply custom configurations to Windows client devices. Windows provides a number of features and methods to help you configure or lock down specific parts of the Windows interface. # < 160 chars
+
+metadata:
+ title: Configure Windows 10 # Required; page title displayed in search results. Include the brand. < 60 chars.
+ description: Learn about the administrative tools, tasks and best practices for managing Windows clients across your enterprise. # Required; article description that is displayed in search results. < 160 chars.
+ services: windows-10
+ ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+ ms.subservice: subservice
+ ms.topic: landing-page # Required
+ ms.collection: windows-10
+ author: greg-lindsay #Required; your GitHub user alias, with correct capitalization.
+ ms.author: greglin #Required; microsoft alias of author; optional team alias.
+ ms.date: 04/30/2021 #Required; mm/dd/yyyy format.
+ localization_priority: medium
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+
+landingContent:
+# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - title: Device management
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Administrative Tools in Windows 10
+ url: administrative-tools-in-windows-10.md
+ - text: Create mandatory user profiles
+ url: mandatory-user-profile.md
+ - text: Mobile device management (MDM)
+ url: mdm/index.md
+ - text: MDM for device updates
+ url: mdm/device-update-management.md
+ - text: Mobile device enrollment
+ url: mdm/mobile-device-enrollment.md
+
+ # Card (optional)
+ - title: CSP reference documentation
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Configuration service provider reference
+ url: mdm/configuration-service-provider-reference.md
+ - text: DynamicManagement CSP
+ url: mdm/dynamicmanagement-csp.md
+ - text: BitLocker CSP
+ url: mdm/bitlocker-csp.md
+ - text: Policy CSP - Update
+ url: mdm/policy-csp-update.md
+
+
+ # Card (optional)
+ - title: Troubleshoot Windows clients
+ linkLists:
+ - linkListType: how-to-guide
+ links:
+ - text: Troubleshoot Windows 10 clients
+ url: windows-10-support-solutions.md
+ - text: Advanced troubleshooting for Windows networking
+ url: troubleshoot-networking.md
+ - text: Advanced troubleshooting for Windows start-up
+ url: troubleshoot-networking.md
+ - text: Advanced troubleshooting for Windows networking
+ url: troubleshoot-windows-startup.md
diff --git a/windows/client-management/introduction-page-file.md b/windows/client-management/introduction-page-file.md
index b1964db01a..376916c1d3 100644
--- a/windows/client-management/introduction-page-file.md
+++ b/windows/client-management/introduction-page-file.md
@@ -66,5 +66,5 @@ The system commit charge is the total committed or "promised" memory of all comm
The system committed charge and system committed limit can be measured on the **Performance** tab in Task Manager or by using the "\Memory\Committed Bytes" and "\Memory\Commit Limit" performance counters. The \Memory\% Committed Bytes In Use counter is a ratio of \Memory\Committed Bytes to \Memory\Commit Limit values.
->[!Note]
->System-managed page files automatically grow up to three times the physical memory or 4 GB (whichever is larger) when the system commit charge reaches 90 percent of the system commit limit. This assumes that enough free disk space is available to accommodate the growth.
+> [!NOTE]
+> System-managed page files automatically grow up to three times the physical memory or 4 GB (whichever is larger, but no more than one-eighth of the volume size) when the system commit charge reaches 90 percent of the system commit limit. This assumes that enough free disk space is available to accommodate the growth.
diff --git a/windows/client-management/join-windows-10-mobile-to-azure-active-directory.md b/windows/client-management/join-windows-10-mobile-to-azure-active-directory.md
deleted file mode 100644
index a7d84c9fb8..0000000000
--- a/windows/client-management/join-windows-10-mobile-to-azure-active-directory.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-title: Join Windows 10 Mobile to Azure Active Directory (Windows 10)
-description: Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out-of-box experience (OOBE).
-ms.assetid: 955DD9EC-3519-4752-827E-79CEB1EC8D6B
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-ms.pagetype: mobile
-author: dansimp
-ms.localizationpriority: medium
-ms.date: 09/21/2017
-ms.topic: article
----
-
-# Join Windows 10 Mobile to Azure Active Directory
-
-
-**Applies to**
-
-- Windows 10 Mobile
-
-Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out-of-box experience (OOBE). This article describes the considerations and options for using Windows 10 Mobile with Azure AD in your organization.
-
-## Why join Windows 10 Mobile to Azure AD
-
-
-When a device running Windows 10 Mobile is joined to Azure AD, the device can exclusively use a credential owned by your organization, and you can ensure users sign in using the sign-in requirements of your organization. Joining a Windows 10 Mobile device to Azure AD provides many of the same benefits as joining desktop devices, such as:
-
-- Single sign-on (SSO) in applications like Mail, Word, and OneDrive using resources backed by Azure AD.
-
-- SSO in Microsoft Edge browser to Azure AD-connected web applications like Microsoft 365 admin center, Visual Studio, and more than [2500 non-Microsoft apps](https://go.microsoft.com/fwlink/p/?LinkID=746211).
-
-- SSO to resources on-premises.
-
-- Automatically enroll in your mobile device management (MDM) service.
-
-- Enable enterprise roaming of settings. (Not currently supported but on roadmap)
-
-- Use Microsoft Store for Business to target applications to users.
-
-## Are you upgrading current devices to Windows 10 Mobile?
-
-
-Windows Phone 8.1 only supported the ability to connect the device to personal cloud services using a Microsoft account for authentication. This required creating Microsoft accounts to be used for work purposes. In Windows 10 Mobile, you have the ability to join devices directly to Azure AD without requiring a personal Microsoft account.
-
-If you have existing Windows Phone 8.1 devices, the first thing to understand is whether the devices you have can be upgraded to Windows 10 Mobile. Microsoft will be releasing more information about upgrade availability soon. As more information becomes available, it will be posted at [How to get Windows 10 Mobile]( https://go.microsoft.com/fwlink/p/?LinkId=746312). Premier Enterprise customers that have a business need to postpone Windows 10 Mobile upgrade should contact their Technical Account Manager to understand what options may be available.
-
-Before upgrading and joining devices to Azure AD, you will want to consider existing data usage. How users are using the existing devices and what data is stored locally will vary for every customer. Are text messages used for work purposes and need to be backed up and available after the upgrade? Are there photos stored locally or stored associated with an Microsoft account? Are there device and app settings that to be retained? Are there contacts stored in the SIM or associated with an Microsoft account? You will need to explore methods for capturing and storing the data that needs to be retained before you join the devices to Azure AD. Photos, music files, and documents stored locally on the device can be copied from the device using a USB connection to a PC.
-
-To join upgraded mobile devices to Azure AD, [the devices must be reset](reset-a-windows-10-mobile-device.md) to start the out-of-box experience for device setup. Joining a device to Azure AD is not a change that can be done while maintaining existing user data. This is similar to changing a device from personally owned to organizationally owned. When a user joins an organization’s domain, the user is then required to log in as the domain user and start with a fresh user profile. A new user profile means there would not be any persisted settings, apps, or data from the previous personal profile.
-
-If you want to avoid the device reset process, consider [adding work accounts](#add-work-account) rather than joining the devices to Azure AD.
-
-## The difference between "Add work account" and "Azure AD Join"
-
-
-Even though Azure AD Join on Windows 10 Mobile provides the best overall experience, there are two ways that you can use an added work account instead of joining the device to Azure AD due to organizational requirements.
-
-- You can complete OOBE using the **Sign in later** option. This lets you start using Windows 10 Mobile with any connected Azure AD account or Microsoft account.
-
-- You can add access to Azure AD-backed resources on the device without resetting the device.
-
-However, neither of these methods provides SSO in the Microsoft Store or SSO to resources on-premises, and does not provide the ability to roam settings based on the Azure AD account using enterprise roaming. [Learn about enterprise state roaming in Azure AD.](/azure/active-directory/devices/enterprise-state-roaming-overview)
-
-Using **Settings** > **Accounts** > **Your email and accounts** > **Add work or school account**, users can add their Azure AD account to the device. Alternatively, a work account can be added when the user signs in to an application like Mail, Word, etc. If you [enable auto-enrollment in your MDM settings](https://go.microsoft.com/fwlink/p/?LinkID=691615), the device will automatically be enrolled in MDM.
-
-An added work account provides the same SSO experience in browser apps like Office 365 (Office portal, Outlook on the web, Calendar, People, OneDrive), Azure AD profile and change password app, and Visual Studio. You get SSO to built-in applications like Mail, Calendar, People, OneDrive and files hosted on OneDrive without prompts for a password. In Office apps like Microsoft Word, Microsoft Excel, etc., you simply select the Azure AD account and you are able to open files without entering a password.
-
-## Preparing for Windows 10 Mobile
-
-
-- **Azure AD configuration**
-
- Currently, Azure AD Join only supports self-provisioning, meaning the credentials of the user of the device must be used during the initial setup of the device. If your mobile operator prepares devices on your behalf, this will impact your ability to join the device to Azure AD. Many IT administrators may start with a desire to set up devices for their employees, but the Azure AD Join experience is optimized for end-users, including the option for automatic MDM enrollment.
-
- By default, Azure AD is set up to allow devices to join and to allow users to use their corporate credentials on organizational-owned devices or personal devices. The blog post [Azure AD Join on Windows 10 devices](https://go.microsoft.com/fwlink/p/?LinkID=616791) has more information on where you can review your Azure AD settings. You can configure Azure AD to not allow anyone to join, to allow everyone in your organization to join, or you can select specific Azure AD groups which are allowed to join.
-
-- **Device setup**
-
- A device running Windows 10 Mobile can only join Azure AD during OOBE. New devices from mobile operators will be in this state when they are received. Windows Phone 8.1 devices that are [upgraded](#bkmk-upgrade) to Windows 10 Mobile will need to be reset to get back to OOBE for device setup.
-
-- **Mobile device management**
-
- An MDM service is required for managing Azure AD-joined devices. You can use MDM to push settings to devices, as well as application and certificates used by VPN, Wi-Fi, etc. Azure AD Premium or [Enterprise Mobility Suite (EMS)](https://go.microsoft.com/fwlink/p/?LinkID=723984) licenses are required to set up your Azure AD-joined devices to automatically enroll in MDM. [Learn more about setting up your Azure AD tenant for MDM auto-enrollment.](https://go.microsoft.com/fwlink/p/?LinkID=691615)
-
-- **Windows Hello**
-
- Creating a Windows Hello (PIN) is required on Windows 10 Mobile by default and cannot be disabled. You can control Windows Hello policies using controls in MDM, such as Intune. Because the device is joined using organizational credentials, the device must have a PIN to unlock the device. Biometrics such as fingerprint or iris can be used for authentication. Creating a Windows Hello requires the user to perform an multi-factor authentication since the PIN is a strong authentication credential. [Learn more about Windows Hello for Azure AD.](/windows/security/identity-protection/hello-for-business/hello-identity-verification)
-
-- **Conditional access**
-
- Conditional access policies are also applicable to Windows 10 Mobile. Multifactor authentication and device compliance policies can be applied to users or resources and require that the user or device satisfies these requirements before access to resources is allowed. Policies like **Domain Join** which support traditional domain joining only apply to desktop PC. Policies dependent on IP range will be tough to enforce on a phone as the IP address of the operator is used unless the user has connected to corporate Wi-Fi or a VPN.
-
-- **Known issues**
-
- - The apps for **Device backup and restore** and to sync photos to OneDrive only work with the Microsoft account as the primary account—these apps won’t work on devices joined to Azure AD.
-
- - **Find my Phone** will work depending on how you add a Microsoft account to the device—for example, the Cortana application will sign in with your Microsoft account in a way that makes **Find my Phone** work. Cortana and OneNote both work with Azure AD accounts but must be set up with a Microsoft account first.
-
- - OneNote requires the user to sign in with a Microsoft account but will also provide access to Notebooks using the Azure AD account.
-
- - If your organization is configured to federate with Azure AD, your federation proxy will need to be Active Directory Federation Services (ADFS) or a 3rd party which supports WS-Trust endpoints just like ADFS does.
-
-## How to join Windows 10 Mobile to Azure AD
-
-
-1. During OOBE, on the **Keep your life in sync** screen, choose the option **Sign in with a work account**, and then tap **Next**.
-
- 
-
-2. Enter your Azure AD account. If your Azure AD account is federated, you will be redirected to your organization's sign-in page; if not, you enter your password here.
-
- 
-
- If you are taken to your organization's sign-in page, you may be required to provide a second factor of authentication.
-
- 
-
-3. After authentication completes, the device registration is complete. If your MDM service has a terms of use page, it would be seen here as well. Federated users are required to provide a password again to complete the authentication to Windows. Users with passwords managed in the cloud will not see this additional authentication prompt. This federated login requires your federation server to support a WS-Trust active endpoint.
-
- 
-
-4. Next, you set up a PIN.
-
- 
-
- **Note** To learn more about the PIN requirement, see [Why a PIN is better than a password](/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password).
-
-
-
-**To verify Azure AD join**
-
-- Go to **Settings** > **Accounts** > **Your email and accounts**. You will see your Azure AD account listed at the top and also listed as an account used by other apps. If auto-enrollment into MDM was configured, you will see in **Settings** > **Accounts** > **Work Access** that the device is correctly enrolled in MDM. If the MDM is pushing a certificate to be used by VPN, then **Settings** > **Network & wireless** > **VPN** will show the ability to connect to your VPN.
-
- 
-
-## Set up mail and calendar
-
-
-Setting up email on your Azure AD joined device is simple. Launching the **Mail** app brings you to the **Accounts** page. Most users will have their email accounts hosted in Office 365 and will automatically start syncing. Just tap **Ready to go**.
-
-
-
-When email is hosted in on-premises Exchange, the user must provide credentials to establish a basic authentication connection to the Exchange server. Tap **Add account** to see the types of mail accounts you can add, including your Azure AD account.
-
-
-
-After you select an account type, you provide credentials to complete setup for that mailbox.
-
-
-
-Setup for the **Calendar** app is similar. Open the app and you'll see your Azure AD account listed -- just tap **Ready to go**.
-
-
-
-Return to **Settings** > **Accounts** > **Your email and accounts**, and you will see your Azure AD account listed for **Email, calendar, and contacts**.
-
-
-
-## Use Office and OneDrive apps
-
-
-Office applications like Microsoft Word and Microsoft PowerPoint will automatically sign you in with your Azure AD account. When you open an Office app, you see a screen that allows you to choose between a Microsoft account and Azure AD account. Office shows this screen while it is automatically signing you in, so just be patient for a couple seconds and Office will automatically sign you in using your Azure AD account.
-
-Microsoft Word automatically shows the documents recently opened on other devices. Opening a document allows you to jump straight to the same section you were last editing on another device.
-
-
-
-Microsoft PowerPoint shows your recently opened slide decks.
-
-
-
-The OneDrive application also uses SSO, showing you all your documents and enabling you to open them without any authentication experience.
-
-
-
-In addition to application SSO, Azure AD joined devices also get SSO for browser applications which trust Azure AD, such as web applications, Visual Studio, Microsoft 365 admin center, and OneDrive for Business.
-
-
-
-OneNote requires a Microsoft account, but you can use it with your Azure AD account as well.
-
-
-
-After you sign in to OneNote, go to Settings > Accounts, and you will see that your Azure AD account is automatically added.
-
-
-
-To see the Notebooks that your Azure AD account has access to, tap **More Notebooks** and select the Notebook you want to open.
-
-
-
-## Use Microsoft Store for Business
-
-
-[Microsoft Store for Business](/microsoft-store/index) allows you to specify applications to be available to your users in the Microsoft Store application. These applications show up on a tab titled for your company. Applications approved in the Microsoft Store for Business portal can be installed by users.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/windows/client-management/manage-corporate-devices.md b/windows/client-management/manage-corporate-devices.md
index f725f87044..4fc41d68c1 100644
--- a/windows/client-management/manage-corporate-devices.md
+++ b/windows/client-management/manage-corporate-devices.md
@@ -36,7 +36,6 @@ You can use the same management tools to manage all device types running Windows
| [New policies for Windows 10](new-policies-for-windows-10.md) | New Group Policy settings added in Windows 10 |
| [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md) | Group Policy settings that apply only to Windows 10 Enterprise and Windows 10 Education |
| [Changes to Group Policy settings for Start in Windows 10](/windows/configuration/changes-to-start-policies-in-windows-10) | Changes to the Group Policy settings that you use to manage Start |
-| [Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md) | How to plan for and deploy Windows 10 Mobile devices |
| [Introduction to configuration service providers (CSPs) for IT pros](/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers) | How IT pros and system administrators can take advantage of many settings available through CSPs to configure devices running Windows 10 and Windows 10 Mobile in their organizations |
diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md
deleted file mode 100644
index 2f21a06d6f..0000000000
--- a/windows/client-management/mdm/TOC.md
+++ /dev/null
@@ -1,435 +0,0 @@
-# [Mobile device management](index.md)
-## [What's new in MDM enrollment and management](new-in-windows-mdm-enrollment-management.md)
-### [Change history for MDM documentation](change-history-for-mdm-documentation.md)
-## [Mobile device enrollment](mobile-device-enrollment.md)
-### [MDM enrollment of Windows devices](mdm-enrollment-of-windows-devices.md)
-#### [Azure AD and Microsoft Intune: Automatic MDM enrollment in the new Portal](azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md)
-### [Enroll a Windows 10 device automatically using Group Policy](enroll-a-windows-10-device-automatically-using-group-policy.md)
-### [Federated authentication device enrollment](federated-authentication-device-enrollment.md)
-### [Certificate authentication device enrollment](certificate-authentication-device-enrollment.md)
-### [On-premises authentication device enrollment](on-premise-authentication-device-enrollment.md)
-## [Understanding ADMX-backed policies](understanding-admx-backed-policies.md)
-## [Enable ADMX-backed policies in MDM](enable-admx-backed-policies-in-mdm.md)
-## [Win32 and Desktop Bridge app policy configuration](win32-and-centennial-app-policy-configuration.md)
-## [Implement server-side support for mobile application management on Windows](implement-server-side-mobile-application-management.md)
-## [Diagnose MDM failures in Windows 10](diagnose-mdm-failures-in-windows-10.md)
-## [Deploy and configure App-V apps using MDM](appv-deploy-and-config.md)
-## [Azure Active Directory integration with MDM](azure-active-directory-integration-with-mdm.md)
-### [Add an Azure AD tenant and Azure AD subscription](add-an-azure-ad-tenant-and-azure-ad-subscription.md)
-### [Register your free Azure Active Directory subscription](register-your-free-azure-active-directory-subscription.md)
-## [Enterprise app management](enterprise-app-management.md)
-## [Mobile device management (MDM) for device updates](device-update-management.md)
-## [Bulk enrollment](bulk-enrollment-using-windows-provisioning-tool.md)
-## [Management tool for the Microsoft Store for Business](management-tool-for-windows-store-for-business.md)
-### [REST API reference for Microsoft Store for Business](rest-api-reference-windows-store-for-business.md)
-#### [Data structures for Microsoft Store for Business](data-structures-windows-store-for-business.md)
-#### [Get Inventory](get-inventory.md)
-#### [Get product details](get-product-details.md)
-#### [Get localized product details](get-localized-product-details.md)
-#### [Get offline license](get-offline-license.md)
-#### [Get product packages](get-product-packages.md)
-#### [Get product package](get-product-package.md)
-#### [Get seats](get-seats.md)
-#### [Get seat](get-seat.md)
-#### [Assign seats](assign-seats.md)
-#### [Reclaim seat from user](reclaim-seat-from-user.md)
-#### [Bulk assign and reclaim seats from users](bulk-assign-and-reclaim-seats-from-user.md)
-#### [Get seats assigned to a user](get-seats-assigned-to-a-user.md)
-## [Enable offline upgrades to Windows 10 for Windows Embedded 8.1 Handheld devices](enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md)
-## [Certificate renewal](certificate-renewal-windows-mdm.md)
-## [Disconnecting from the management infrastructure (unenrollment)](disconnecting-from-mdm-unenrollment.md)
-## [Enterprise settings, policies, and app management](windows-mdm-enterprise-settings.md)
-## [Push notification support for device management](push-notification-windows-mdm.md)
-## [OMA DM protocol support](oma-dm-protocol-support.md)
-## [Structure of OMA DM provisioning files](structure-of-oma-dm-provisioning-files.md)
-## [Server requirements for OMA DM](server-requirements-windows-mdm.md)
-## [DMProcessConfigXMLFiltered](dmprocessconfigxmlfiltered.md)
-## [Using PowerShell scripting with the WMI Bridge Provider](using-powershell-scripting-with-the-wmi-bridge-provider.md)
-## [WMI providers supported in Windows 10](wmi-providers-supported-in-windows.md)
-## [Configuration service provider reference](configuration-service-provider-reference.md)
-### [AccountManagement CSP](accountmanagement-csp.md)
-#### [AccountManagement DDF file](accountmanagement-ddf.md)
-### [Accounts CSP](accounts-csp.md)
-#### [Accounts DDF file](accounts-ddf-file.md)
-### [ActiveSync CSP](activesync-csp.md)
-#### [ActiveSync DDF file](activesync-ddf-file.md)
-### [AllJoynManagement CSP](alljoynmanagement-csp.md)
-#### [AllJoynManagement DDF](alljoynmanagement-ddf.md)
-### [APPLICATION CSP](application-csp.md)
-### [ApplicationControl CSP](applicationcontrol-csp.md)
-#### [ApplicationControl DDF file](applicationcontrol-csp-ddf.md)
-### [AppLocker CSP](applocker-csp.md)
-#### [AppLocker DDF file](applocker-ddf-file.md)
-#### [AppLocker XSD](applocker-xsd.md)
-### [AssignedAccess CSP](assignedaccess-csp.md)
-#### [AssignedAccess DDF file](assignedaccess-ddf.md)
-### [BitLocker CSP](bitlocker-csp.md)
-#### [BitLocker DDF file](bitlocker-ddf-file.md)
-### [BOOTSTRAP CSP](bootstrap-csp.md)
-### [BrowserFavorite CSP](browserfavorite-csp.md)
-### [CellularSettings CSP](cellularsettings-csp.md)
-### [CertificateStore CSP](certificatestore-csp.md)
-#### [CertificateStore DDF file](certificatestore-ddf-file.md)
-### [CleanPC CSP](cleanpc-csp.md)
-#### [CleanPC DDF](cleanpc-ddf.md)
-### [ClientCertificateInstall CSP](clientcertificateinstall-csp.md)
-#### [ClientCertificateInstall DDF file](clientcertificateinstall-ddf-file.md)
-### [CM_CellularEntries CSP](cm-cellularentries-csp.md)
-### [CM_ProxyEntries CSP](cm-proxyentries-csp.md)
-### [CMPolicy CSP](cmpolicy-csp.md)
-### [CMPolicyEnterprise CSP](cmpolicyenterprise-csp.md)
-#### [CMPolicyEnterprise DDF file](cmpolicyenterprise-ddf-file.md)
-### [CustomDeviceUI CSP](customdeviceui-csp.md)
-#### [CustomDeviceUI DDF file](customdeviceui-ddf.md)
-### [Defender CSP](defender-csp.md)
-#### [Defender DDF file](defender-ddf.md)
-### [DevDetail CSP](devdetail-csp.md)
-#### [DevDetail DDF file](devdetail-ddf-file.md)
-### [DeveloperSetup CSP](developersetup-csp.md)
-#### [DeveloperSetup DDF](developersetup-ddf.md)
-### [DeviceInstanceService CSP](deviceinstanceservice-csp.md)
-### [DeviceLock CSP](devicelock-csp.md)
-#### [DeviceLock DDF file](devicelock-ddf-file.md)
-### [DeviceManageability CSP](devicemanageability-csp.md)
-#### [DeviceManageability DDF](devicemanageability-ddf.md)
-### [DeviceStatus CSP](devicestatus-csp.md)
-#### [DeviceStatus DDF](devicestatus-ddf.md)
-### [DevInfo CSP](devinfo-csp.md)
-#### [DevInfo DDF file](devinfo-ddf-file.md)
-### [DiagnosticLog CSP](diagnosticlog-csp.md)
-#### [DiagnosticLog DDF file](diagnosticlog-ddf.md)
-### [DMAcc CSP](dmacc-csp.md)
-#### [DMAcc DDF file](dmacc-ddf-file.md)
-### [DMClient CSP](dmclient-csp.md)
-#### [DMClient DDF file](dmclient-ddf-file.md)
-### [DMSessionActions CSP](dmsessionactions-csp.md)
-#### [DMSessionActions DDF file](dmsessionactions-ddf.md)
-### [DynamicManagement CSP](dynamicmanagement-csp.md)
-#### [DynamicManagement DDF file](dynamicmanagement-ddf.md)
-### [EMAIL2 CSP](email2-csp.md)
-#### [EMAIL2 DDF file](email2-ddf-file.md)
-### [EnrollmentStatusTracking CSP](enrollmentstatustracking-csp.md)
-#### [EnrollmentStatusTracking DDF file](enrollmentstatustracking-csp-ddf.md)
-### [EnterpriseAPN CSP](enterpriseapn-csp.md)
-#### [EnterpriseAPN DDF](enterpriseapn-ddf.md)
-### [EnterpriseAppManagement CSP](enterpriseappmanagement-csp.md)
-### [EnterpriseAppVManagement CSP](enterpriseappvmanagement-csp.md)
-#### [EnterpriseAppVManagement DDF file](enterpriseappvmanagement-ddf.md)
-### [EnterpriseAssignedAccess CSP](enterpriseassignedaccess-csp.md)
-#### [EnterpriseAssignedAccess DDF file](enterpriseassignedaccess-ddf.md)
-#### [EnterpriseAssignedAccess XSD](enterpriseassignedaccess-xsd.md)
-### [EnterpriseDataProtection CSP](enterprisedataprotection-csp.md)
-#### [EnterpriseDataProtection DDF file](enterprisedataprotection-ddf-file.md)
-### [EnterpriseDesktopAppManagement CSP](enterprisedesktopappmanagement-csp.md)
-#### [EnterpriseDesktopAppManagement DDF](enterprisedesktopappmanagement-ddf-file.md)
-#### [EnterpriseDesktopAppManagement XSD](enterprisedesktopappmanagement2-xsd.md)
-### [EnterpriseExt CSP](enterpriseext-csp.md)
-#### [EnterpriseExt DDF file](enterpriseext-ddf.md)
-### [EnterpriseExtFileSystem CSP](enterpriseextfilessystem-csp.md)
-#### [EnterpriseExtFileSystem DDF file](enterpriseextfilesystem-ddf.md)
-### [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md)
-#### [EnterpriseModernAppManagement DDF](enterprisemodernappmanagement-ddf.md)
-#### [EnterpriseModernAppManagement XSD](enterprisemodernappmanagement-xsd.md)
-### [eUICCs CSP](euiccs-csp.md)
-#### [eUICCs DDF file](euiccs-ddf-file.md)
-### [FileSystem CSP](filesystem-csp.md)
-### [Firewall CSP](firewall-csp.md)
-#### [Firewall DDF file](firewall-ddf-file.md)
-### [HealthAttestation CSP](healthattestation-csp.md)
-#### [HealthAttestation DDF](healthattestation-ddf.md)
-### [HotSpot CSP](hotspot-csp.md)
-### [Maps CSP](maps-csp.md)
-#### [Maps DDF](maps-ddf-file.md)
-### [Messaging CSP](messaging-csp.md)
-#### [Messaging DDF file](messaging-ddf.md)
-### [MultiSIM CSP](multisim-csp.md)
-#### [MultiSIM DDF file](multisim-ddf.md)
-### [NAP CSP](nap-csp.md)
-### [NAPDEF CSP](napdef-csp.md)
-### [NetworkProxy CSP](networkproxy-csp.md)
-#### [NetworkProxy DDF file](networkproxy-ddf.md)
-### [NetworkQoSPolicy CSP](networkqospolicy-csp.md)
-#### [NetworkQoSPolicy DDF file](networkqospolicy-ddf.md)
-### [NodeCache CSP](nodecache-csp.md)
-#### [NodeCache DDF file](nodecache-ddf-file.md)
-### [Office CSP](office-csp.md)
-#### [Office DDF](office-ddf.md)
-### [PassportForWork CSP](passportforwork-csp.md)
-#### [PassportForWork DDF file](passportforwork-ddf.md)
-### [Personalization CSP](personalization-csp.md)
-#### [Personalization DDF file](personalization-ddf.md)
-### [Policy CSP](policy-configuration-service-provider.md)
-#### [Policy CSP DDF file](policy-ddf-file.md)
-#### [Policies in Policy CSP supported by Group Policy](policies-in-policy-csp-supported-by-group-policy.md)
-#### [ADMX-backed policies in Policy CSP](policies-in-policy-csp-admx-backed.md)
-#### [Policies in Policy CSP supported by HoloLens 2](policies-in-policy-csp-supported-by-hololens2.md)
-#### [Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite](policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md)
-#### [Policies in Policy CSP supported by HoloLens (1st gen) Development Edition](policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md)
-#### [Policies in Policy CSP supported by Windows 10 IoT Enterprise](./configuration-service-provider-reference.md)
-#### [Policies in Policy CSP supported by Windows 10 IoT Core](policies-in-policy-csp-supported-by-iot-core.md)
-#### [Policies in Policy CSP supported by Microsoft Surface Hub](policies-in-policy-csp-supported-by-surface-hub.md)
-#### [Policy CSPs that can be set using Exchange Active Sync (EAS)](policies-in-policy-csp-that-can-be-set-using-eas.md)
-#### [AboveLock](policy-csp-abovelock.md)
-#### [Accounts](policy-csp-accounts.md)
-#### [ActiveXControls](policy-csp-activexcontrols.md)
-#### [ADMX_ActiveXInstallService](policy-csp-admx-activexinstallservice.md)
-#### [ADMX_AddRemovePrograms](policy-csp-admx-addremoveprograms.md)
-#### [ADMX_AppCompat](policy-csp-admx-appcompat.md)
-#### [ADMX_AppxPackageManager](policy-csp-admx-appxpackagemanager.md)
-#### [ADMX_AppXRuntime](policy-csp-admx-appxruntime.md)
-#### [ADMX_AttachmentManager](policy-csp-admx-attachmentmanager.md)
-#### [ADMX_AuditSettings](policy-csp-admx-auditsettings.md)
-#### [ADMX_Bits](policy-csp-admx-bits.md)
-#### [ADMX_CipherSuiteOrder](policy-csp-admx-ciphersuiteorder.md)
-#### [ADMX_COM](policy-csp-admx-com.md)
-#### [ADMX_ControlPanel](policy-csp-admx-controlpanel.md)
-#### [ADMX_ControlPanelDisplay](policy-csp-admx-controlpaneldisplay.md)
-#### [ADMX_Cpls](policy-csp-admx-cpls.md)
-#### [ADMX_CredentialProviders](policy-csp-admx-credentialproviders.md)
-#### [ADMX_CredSsp](policy-csp-admx-credssp.md)
-#### [ADMX_CredUI](policy-csp-admx-credui.md)
-#### [ADMX_CtrlAltDel](policy-csp-admx-ctrlaltdel.md)
-#### [ADMX_DataCollection](policy-csp-admx-datacollection.md)
-#### [ADMX_Desktop](policy-csp-admx-desktop.md)
-#### [ADMX_DeviceInstallation](policy-csp-admx-deviceinstallation.md)
-#### [ADMX_DeviceSetup](policy-csp-admx-devicesetup.md)
-#### [ADMX_DigitalLocker](policy-csp-admx-digitallocker.md)
-#### [ADMX_DistributedLinkTracking](policy-csp-admx-distributedlinktracking.md)
-#### [ADMX_DnsClient](policy-csp-admx-dnsclient.md)
-#### [ADMX_DWM](policy-csp-admx-dwm.md)
-#### [ADMX_EAIME](policy-csp-admx-eaime.md)
-#### [ADMX_EncryptFilesonMove](policy-csp-admx-encryptfilesonmove.md)
-#### [ADMX_EnhancedStorage](policy-csp-admx-enhancedstorage.md)
-#### [ADMX_ErrorReporting](policy-csp-admx-errorreporting.md)
-#### [ADMX_EventForwarding](policy-csp-admx-eventforwarding.md)
-#### [ADMX_EventLog](policy-csp-admx-eventlog.md)
-#### [ADMX_Explorer](policy-csp-admx-explorer.md)
-#### [ADMX_FileRecovery](policy-csp-admx-filerecovery.md)
-#### [ADMX_FileServerVSSProvider](policy-csp-admx-fileservervssprovider.md)
-#### [ADMX_FileSys](policy-csp-admx-filesys.md)
-#### [ADMX_FolderRedirection](policy-csp-admx-folderredirection.md)
-#### [ADMX_Globalization](policy-csp-admx-globalization.md)
-#### [ADMX_GroupPolicy](policy-csp-admx-grouppolicy.md)
-#### [ADMX_Help](policy-csp-admx-help.md)
-#### [ADMX_HelpAndSupport](policy-csp-admx-helpandsupport.md)
-#### [ADMX_ICM](policy-csp-admx-icm.md)
-#### [ADMX_kdc](policy-csp-admx-kdc.md)
-#### [ADMX_Kerberos](policy-csp-admx-kerberos.md)
-#### [ADMX_LanmanServer](policy-csp-admx-lanmanserver.md)
-#### [ADMX_LanmanWorkstation](policy-csp-admx-lanmanworkstation.md)
-#### [ADMX_LinkLayerTopologyDiscovery](policy-csp-admx-linklayertopologydiscovery.md)
-#### [ADMX_Logon](policy-csp-admx-logon.md)
-#### [ADMX_MicrosoftDefenderAntivirus](policy-csp-admx-microsoftdefenderantivirus.md)
-#### [ADMX_MMC](policy-csp-admx-mmc.md)
-#### [ADMX_MMCSnapins](policy-csp-admx-mmcsnapins.md)
-#### [ADMX_MSAPolicy](policy-csp-admx-msapolicy.md)
-#### [ADMX_msched](policy-csp-admx-msched.md)
-#### [ADMX_MSDT](policy-csp-admx-msdt.md)
-#### [ADMX_MSI](policy-csp-admx-msi.md)
-#### [ADMX_nca](policy-csp-admx-nca.md)
-#### [ADMX_NCSI](policy-csp-admx-ncsi.md)
-#### [ADMX_Netlogon](policy-csp-admx-netlogon.md)
-#### [ADMX_NetworkConnections](policy-csp-admx-networkconnections.md)
-#### [ADMX_OfflineFiles](policy-csp-admx-offlinefiles.md)
-#### [ADMX_PeerToPeerCaching](policy-csp-admx-peertopeercaching.md)
-#### [ADMX_PerformanceDiagnostics](policy-csp-admx-performancediagnostics.md)
-#### [ADMX_Power](policy-csp-admx-power.md)
-#### [ADMX_PowerShellExecutionPolicy](policy-csp-admx-powershellexecutionpolicy.md)
-#### [ADMX_Printing](policy-csp-admx-printing.md)
-#### [ADMX_Printing2](policy-csp-admx-printing2.md)
-#### [ADMX_Programs](policy-csp-admx-programs.md)
-#### [ADMX_Reliability](policy-csp-admx-reliability.md)
-#### [ADMX_RemoteAssistance](policy-csp-admx-remoteassistance.md)
-#### [ADMX_RemovableStorage](policy-csp-admx-removablestorage.md)
-#### [ADMX_RPC](policy-csp-admx-rpc.md)
-#### [ADMX_Scripts](policy-csp-admx-scripts.md)
-#### [ADMX_sdiageng](policy-csp-admx-sdiageng.md)
-#### [ADMX_Securitycenter](policy-csp-admx-securitycenter.md)
-#### [ADMX_Sensors](policy-csp-admx-sensors.md)
-#### [ADMX_Servicing](policy-csp-admx-servicing.md)
-#### [ADMX_SettingSync](policy-csp-admx-settingsync.md)
-#### [ADMX_SharedFolders](policy-csp-admx-sharedfolders.md)
-#### [ADMX_Sharing](policy-csp-admx-sharing.md)
-#### [ADMX_ShellCommandPromptRegEditTools](policy-csp-admx-shellcommandpromptregedittools.md)
-#### [ADMX_SkyDrive](policy-csp-admx-skydrive.md)
-#### [ADMX_Smartcard](policy-csp-admx-smartcard.md)
-#### [ADMX_Snmp](policy-csp-admx-snmp.md)
-#### [ADMX_StartMenu](policy-csp-admx-startmenu.md)
-#### [ADMX_SystemRestore](policy-csp-admx-systemrestore.md)
-#### [ADMX_Taskbar](policy-csp-admx-taskbar.md)
-#### [ADMX_tcpip](policy-csp-admx-tcpip.md)
-#### [ADMX_Thumbnails](policy-csp-admx-thumbnails.md)
-#### [ADMX_TPM](policy-csp-admx-tpm.md)
-#### [ADMX_UserExperienceVirtualization](policy-csp-admx-userexperiencevirtualization.md)
-#### [ADMX_UserProfiles](policy-csp-admx-userprofiles.md)
-#### [ADMX_W32Time](policy-csp-admx-w32time.md)
-#### [ADMX_WCM](policy-csp-admx-wcm.md)
-#### [ADMX_WinCal](policy-csp-admx-wincal.md)
-#### [ADMX_WindowsAnytimeUpgrade](policy-csp-admx-windowsanytimeupgrade.md)
-#### [ADMX_WindowsConnectNow](policy-csp-admx-windowsconnectnow.md)
-#### [ADMX_WindowsExplorer](policy-csp-admx-windowsexplorer.md)
-#### [ADMX_WindowsFileProtection](policy-csp-admx-windowsfileprotection.md)
-#### [ADMX_WindowsMediaDRM](policy-csp-admx-windowsmediadrm.md)
-#### [ADMX_WindowsMediaPlayer](policy-csp-admx-windowsmediaplayer.md)
-#### [ADMX_WindowsRemoteManagement](policy-csp-admx-windowsremotemanagement.md)
-#### [ADMX_WindowsStore](policy-csp-admx-windowsstore.md)
-#### [ADMX_WinInit](policy-csp-admx-wininit.md)
-#### [ADMX_WinLogon](policy-csp-admx-winlogon.md)
-#### [ADMX-Winsrv](policy-csp-admx-winsrv.md)
-#### [ADMX_wlansvc](policy-csp-admx-wlansvc.md)
-#### [ADMX_WPN](policy-csp-admx-wpn.md)
-#### [ApplicationDefaults](policy-csp-applicationdefaults.md)
-#### [ApplicationManagement](policy-csp-applicationmanagement.md)
-#### [AppRuntime](policy-csp-appruntime.md)
-#### [AppVirtualization](policy-csp-appvirtualization.md)
-#### [AttachmentManager](policy-csp-attachmentmanager.md)
-#### [Audit](policy-csp-audit.md)
-#### [Authentication](policy-csp-authentication.md)
-#### [Autoplay](policy-csp-autoplay.md)
-#### [BitLocker](policy-csp-bitlocker.md)
-#### [BITS](policy-csp-bits.md)
-#### [Bluetooth](policy-csp-bluetooth.md)
-#### [Browser](policy-csp-browser.md)
-#### [Camera](policy-csp-camera.md)
-#### [Cellular](policy-csp-cellular.md)
-#### [Connectivity](policy-csp-connectivity.md)
-#### [ControlPolicyConflict](policy-csp-controlpolicyconflict.md)
-#### [CredentialsDelegation](policy-csp-credentialsdelegation.md)
-#### [CredentialProviders](policy-csp-credentialproviders.md)
-#### [CredentialsUI](policy-csp-credentialsui.md)
-#### [Cryptography](policy-csp-cryptography.md)
-#### [DataProtection](policy-csp-dataprotection.md)
-#### [DataUsage](policy-csp-datausage.md)
-#### [Defender](policy-csp-defender.md)
-#### [DeliveryOptimization](policy-csp-deliveryoptimization.md)
-#### [Desktop](policy-csp-desktop.md)
-#### [DeviceGuard](policy-csp-deviceguard.md)
-#### [DeviceHealthMonitoring](policy-csp-devicehealthmonitoring.md)
-#### [DeviceInstallation](policy-csp-deviceinstallation.md)
-#### [DeviceLock](policy-csp-devicelock.md)
-#### [Display](policy-csp-display.md)
-#### [DmaGuard](policy-csp-dmaguard.md)
-#### [Education](policy-csp-education.md)
-#### [EnterpriseCloudPrint](policy-csp-enterprisecloudprint.md)
-#### [ErrorReporting](policy-csp-errorreporting.md)
-#### [EventLogService](policy-csp-eventlogservice.md)
-#### [Experience](policy-csp-experience.md)
-#### [ExploitGuard](policy-csp-exploitguard.md)
-#### [FileExplorer](policy-csp-fileexplorer.md)
-#### [Games](policy-csp-games.md)
-#### [Handwriting](policy-csp-handwriting.md)
-#### [InternetExplorer](policy-csp-internetexplorer.md)
-#### [Kerberos](policy-csp-kerberos.md)
-#### [KioskBrowser](policy-csp-kioskbrowser.md)
-#### [LanmanWorkstation](policy-csp-lanmanworkstation.md)
-#### [Licensing](policy-csp-licensing.md)
-#### [LocalPoliciesSecurityOptions](policy-csp-localpoliciessecurityoptions.md)
-#### [LocalUsersAndGroups](policy-csp-localusersandgroups.md)
-#### [LockDown](policy-csp-lockdown.md)
-#### [Maps](policy-csp-maps.md)
-#### [Messaging](policy-csp-messaging.md)
-#### [MixedReality](policy-csp-mixedreality.md)
-#### [MSSecurityGuide](policy-csp-mssecurityguide.md)
-#### [MSSLegacy](policy-csp-msslegacy.md)
-#### [Multitasking](policy-csp-multitasking.md)
-#### [NetworkIsolation](policy-csp-networkisolation.md)
-#### [Notifications](policy-csp-notifications.md)
-#### [Power](policy-csp-power.md)
-#### [Printers](policy-csp-printers.md)
-#### [Privacy](policy-csp-privacy.md)
-#### [RemoteAssistance](policy-csp-remoteassistance.md)
-#### [RemoteDesktopServices](policy-csp-remotedesktopservices.md)
-#### [RemoteManagement](policy-csp-remotemanagement.md)
-#### [RemoteProcedureCall](policy-csp-remoteprocedurecall.md)
-#### [RemoteShell](policy-csp-remoteshell.md)
-#### [RestrictedGroups](policy-csp-restrictedgroups.md)
-#### [Search](policy-csp-search.md)
-#### [Security](policy-csp-security.md)
-#### [ServiceControlManager](policy-csp-servicecontrolmanager.md)
-#### [Settings](policy-csp-settings.md)
-#### [Speech](policy-csp-speech.md)
-#### [Start](policy-csp-start.md)
-#### [Storage](policy-csp-storage.md)
-#### [System](policy-csp-system.md)
-#### [SystemServices](policy-csp-systemservices.md)
-#### [TaskManager](policy-csp-taskmanager.md)
-#### [TaskScheduler](policy-csp-taskscheduler.md)
-#### [TextInput](policy-csp-textinput.md)
-#### [TimeLanguageSettings](policy-csp-timelanguagesettings.md)
-#### [Troubleshooting](policy-csp-troubleshooting.md)
-#### [Update](policy-csp-update.md)
-#### [UserRights](policy-csp-userrights.md)
-#### [Wifi](policy-csp-wifi.md)
-#### [WindowsConnectionManager](policy-csp-windowsconnectionmanager.md)
-#### [WindowsDefenderSecurityCenter](policy-csp-windowsdefendersecuritycenter.md)
-#### [WindowsDefenderSmartScreen](policy-csp-smartscreen.md)
-#### [WindowsInkWorkspace](policy-csp-windowsinkworkspace.md)
-#### [WindowsLogon](policy-csp-windowslogon.md)
-#### [WindowsPowerShell](policy-csp-windowspowershell.md)
-#### [WindowsSandbox](policy-csp-windowssandbox.md)
-#### [WirelessDisplay](policy-csp-wirelessdisplay.md)
-### [PolicyManager CSP](policymanager-csp.md)
-### [Provisioning CSP](provisioning-csp.md)
-### [PROXY CSP](proxy-csp.md)
-### [PXLOGICAL CSP](pxlogical-csp.md)
-### [Reboot CSP](reboot-csp.md)
-#### [Reboot DDF file](reboot-ddf-file.md)
-### [Registry CSP](registry-csp.md)
-#### [Registry DDF file](registry-ddf-file.md)
-### [RemoteFind CSP](remotefind-csp.md)
-#### [RemoteFind DDF file](remotefind-ddf-file.md)
-### [RemoteLock CSP](remotelock-csp.md)
-#### [RemoteLock DDF file](remotelock-ddf-file.md)
-### [RemoteRing CSP](remotering-csp.md)
-#### [RemoteRing DDF file](remotering-ddf-file.md)
-### [RemoteWipe CSP](remotewipe-csp.md)
-#### [RemoteWipe DDF file](remotewipe-ddf-file.md)
-### [Reporting CSP](reporting-csp.md)
-#### [Reporting DDF file](reporting-ddf-file.md)
-### [RootCATrustedCertificates CSP](rootcacertificates-csp.md)
-#### [RootCATrustedCertificates DDF file](rootcacertificates-ddf-file.md)
-### [SecureAssessment CSP](secureassessment-csp.md)
-#### [SecureAssessment DDF file](secureassessment-ddf-file.md)
-### [SecurityPolicy CSP](securitypolicy-csp.md)
-### [SharedPC CSP](sharedpc-csp.md)
-#### [SharedPC DDF file](sharedpc-ddf-file.md)
-### [Storage CSP](storage-csp.md)
-#### [Storage DDF file](storage-ddf-file.md)
-### [SUPL CSP](supl-csp.md)
-#### [SUPL DDF file](supl-ddf-file.md)
-### [SurfaceHub CSP](surfacehub-csp.md)
-#### [SurfaceHub DDF file](surfacehub-ddf-file.md)
-### [TenantLockdown CSP](tenantlockdown-csp.md)
-#### [TenantLockdown DDF file](tenantlockdown-ddf.md)
-### [TPMPolicy CSP](tpmpolicy-csp.md)
-#### [TPMPolicy DDF file](tpmpolicy-ddf-file.md)
-### [UEFI CSP](uefi-csp.md)
-#### [UEFI DDF file](uefi-ddf.md)
-### [UnifiedWriteFilter CSP](unifiedwritefilter-csp.md)
-#### [UnifiedWriteFilter DDF file](unifiedwritefilter-ddf.md)
-### [Update CSP](update-csp.md)
-#### [Update DDF file](update-ddf-file.md)
-### [VPN CSP](vpn-csp.md)
-#### [VPN DDF file](vpn-ddf-file.md)
-### [VPNv2 CSP](vpnv2-csp.md)
-#### [VPNv2 DDF file](vpnv2-ddf-file.md)
-#### [ProfileXML XSD](vpnv2-profile-xsd.md)
-#### [EAP configuration](eap-configuration.md)
-### [w4 APPLICATION CSP](w4-application-csp.md)
-### [w7 APPLICATION CSP](w7-application-csp.md)
-### [WiFi CSP](wifi-csp.md)
-#### [WiFi DDF file](wifi-ddf-file.md)
-### [Win32AppInventory CSP](win32appinventory-csp.md)
-#### [Win32AppInventory DDF file](win32appinventory-ddf-file.md)
-### [Win32CompatibilityAppraiser CSP](win32compatibilityappraiser-csp.md)
-#### [Win32CompatibilityAppraiser DDF file](win32compatibilityappraiser-ddf.md)
-### [WindowsAdvancedThreatProtection CSP](windowsadvancedthreatprotection-csp.md)
-#### [WindowsAdvancedThreatProtection DDF file](windowsadvancedthreatprotection-ddf.md)
-### [WindowsDefenderApplicationGuard CSP](windowsdefenderapplicationguard-csp.md)
-#### [WindowsDefenderApplicationGuard DDF file](windowsdefenderapplicationguard-ddf-file.md)
-### [WindowsLicensing CSP](windowslicensing-csp.md)
-#### [WindowsLicensing DDF file](windowslicensing-ddf-file.md)
-### [WindowsSecurityAuditing CSP](windowssecurityauditing-csp.md)
-#### [WindowsSecurityAuditing DDF file](windowssecurityauditing-ddf-file.md)
-### [WiredNetwork CSP](wirednetwork-csp.md)
-#### [WiredNetwork DDF file](wirednetwork-ddf-file.md)
\ No newline at end of file
diff --git a/windows/client-management/mdm/applocker-csp.md b/windows/client-management/mdm/applocker-csp.md
index e84a683f15..68f4b045a0 100644
--- a/windows/client-management/mdm/applocker-csp.md
+++ b/windows/client-management/mdm/applocker-csp.md
@@ -73,9 +73,7 @@ Defines restrictions for applications.
> [!NOTE]
> When you create a list of allowed apps, all [inbox apps](#inboxappsandcomponents) are also blocked, and you must include them in your list of allowed apps. Don't forget to add the inbox apps for Phone, Messaging, Settings, Start, Email and accounts, Work and school, and other apps that you need.
->
-> In Windows 10 Mobile, when you create a list of allowed apps, the [settings app that rely on splash apps](#settingssplashapps) are blocked. To unblock these apps, you must include them in your list of allowed apps.
->
+
> Delete/unenrollment is not properly supported unless Grouping values are unique across enrollments. If multiple enrollments use the same Grouping value, then unenrollment will not work as expected since there are duplicate URIs that get deleted by the resource manager. To prevent this problem, the Grouping value should include some randomness. The best practice is to use a randomly generated GUID. However, there is no requirement on the exact value of the node.
> [!NOTE]
@@ -83,8 +81,6 @@ Defines restrictions for applications.
Additional information:
-- [Find publisher and product name of apps](#productname) - step-by-step guide for getting the publisher and product names for various Windows apps.
-
**AppLocker/ApplicationLaunchRestrictions/_Grouping_**
Grouping nodes are dynamic nodes, and there may be any number of them for a given enrollment (or a given context). The actual identifiers are selected by the management endpoint, whose job it is to determine what their purpose is, and to not conflict with other identifiers that they define.
Different enrollments and contexts may use the same Authority identifier, even if many such identifiers are active at the same time.
@@ -262,25 +258,6 @@ Data type is string.
Supported operations are Get, Add, Delete, and Replace.
-## Find publisher and product name of apps
-
-
-You can pair a Windows Phone (Windows 10 Mobile, version 1511) to your desktop using the Device Portal on the phone to get the various types of information, including publisher name and product name of apps installed on the phone. This procedure describes pairing your phone to your desktop using WiFi.
-
-If this procedure does not work for you, try the other methods for pairing described in [Device Portal for Mobile](/windows/uwp/debug-test-perf/device-portal-mobile).
-
-**To find Publisher and PackageFullName for apps installed on Windows 10 Mobile**
-
-1. On your Windows Phone, go to **Settings**. Choose **Update & security**. Then choose **For developers**.
-2. Choose **Developer mode**.
-3. Turn on **Device discovery**.
-4. Turn on **Device Portal** and keep **AuthenticationOn**.
-5. Under the **Device Portal**, under **Connect using: WiFi**, copy the URL to your desktop browser to connect using WiFi.
-
- If you get a certificate error, continue to the web page.
-
- If you get an error about not reaching the web page, then you should try the other methods for pairing described in [Device Portal for Mobile](/windows/uwp/debug-test-perf/device-portal-mobile).
-
6. On your phone under **Device discovery**, tap **Pair**. You will get a code (case sensitive).
7. On the browser on the **Set up access page**, enter the code (case sensitive) into the text box and click **Submit**.
@@ -293,11 +270,11 @@ If this procedure does not work for you, try the other methods for pairing descr
-10. If you do not see the app that you want, look under **Installed apps**. Using the drop down menu, click on the application and you get the Version, Publisher, and PackageFullName displayed.
+10. If you do not see the app that you want, look under **Installed apps**. Using the drop- down menu, click on the application and you get the Version, Publisher, and PackageFullName displayed.
-The following table show the mapping of information to the AppLocker publisher rule field.
+The following table shows the mapping of information to the AppLocker publisher rule field.
@@ -324,7 +301,7 @@ The following table show the mapping of information to the AppLocker publisher r
Version |
Version
This can be used either in the HighSection or LowSection of the BinaryVersionRange.
-HighSection defines the highest version number and LowSection defines the lowest version number that should be trusted. You can use a wildcard for both versions to make a version independent rule. Using a wildcard for one of the values will provide higher than or lower than a specific version semantics. |
+HighSection defines the highest version number and LowSection defines the lowest version number that should be trusted. You can use a wildcard for both versions to make a version- independent rule. Using a wildcard for one of the values will provide higher than or lower than a specific version semantics.
@@ -417,7 +394,7 @@ Result
## Settings apps that rely on splash apps
-When you create a list of allowed apps in Windows 10 Mobile, you must also include the subset of Settings apps that rely on splash apps in your list of allowed apps. These apps are blocked unless they are explicitly added to the list of allowed apps. The following table shows the subset of Settings apps that rely on splash apps .
+These apps are blocked unless they are explicitly added to the list of allowed apps. The following table shows the subset of Settings apps that rely on splash apps.
The product name is first part of the PackageFullName followed by the version number.
@@ -566,7 +543,7 @@ The following list shows the apps that may be included in the inbox.
Microsoft.AccountsControl |
-| Enterprise install app |
+Enterprise installs app |
da52fa01-ac0f-479d-957f-bfe4595941cb |
|
@@ -811,7 +788,7 @@ The following list shows the apps that may be included in the inbox.
|
-| Sign-in for Windows 10 Holographic |
+Sign in for Windows 10 Holographic |
|
WebAuthBridgeInternetSso, WebAuthBridgeInternet, WebAuthBridgeIntranetSso, WebAuthBrokerInternetSso, WebAuthBrokerInternetSso, WebAuthBrokerInternetSso, WebAuthBrokerInternet, WebAuthBrokerIntranetSso, SignIn |
@@ -1015,11 +992,6 @@ The following example disables the Mixed Reality Portal. In the example, the **I
```
-The following example for Windows 10 Mobile denies all apps and allows the following apps:
-
-- [settings app that rely on splash apps](#settingssplashapps)
-- most of the [inbox apps](#inboxappsandcomponents), but not all.
-
In this example, **MobileGroup0** is the node name. We recommend using a GUID for this node.
```xml
@@ -1476,7 +1448,7 @@ In this example, **MobileGroup0** is the node name. We recommend using a GUID fo
```
## Example for Windows 10 Holographic for Business
-The following example for Windows 10 Holographic for Business denies all apps and allows the minimum set of [inbox apps](#inboxappsandcomponents) to enable to enable a working device, as well as Settings.
+The following example for Windows 10 Holographic for Business denies all apps and allows the minimum set of [inbox apps](#inboxappsandcomponents) to enable a working device, as well as Settings.
```xml
diff --git a/windows/client-management/mdm/bitlocker-csp.md b/windows/client-management/mdm/bitlocker-csp.md
index 2864971440..f19bba4d59 100644
--- a/windows/client-management/mdm/bitlocker-csp.md
+++ b/windows/client-management/mdm/bitlocker-csp.md
@@ -23,7 +23,7 @@ The BitLocker configuration service provider (CSP) is used by the enterprise to
A Get operation on any of the settings, except for RequireDeviceEncryption and RequireStorageCardEncryption, returns
the setting configured by the admin.
-For RequireDeviceEncryption and RequireStorageCardEncryption, the Get operation returns the actual status of enforcement to the admin, such as if Trusted Platform Module (TPM) protection is required and if encryption is required. And if the device has BitLocker enabled but with password protector, the status reported is 0. A Get operation on RequireDeviceEncryption does not verify that the a minimum PIN length is enforced (SystemDrivesMinimumPINLength).
+For RequireDeviceEncryption and RequireStorageCardEncryption, the Get operation returns the actual status of enforcement to the admin, such as if Trusted Platform Module (TPM) protection is required and if encryption is required. And if the device has BitLocker enabled but with password protector, the status reported is 0. A Get operation on RequireDeviceEncryption does not verify that a minimum PIN length is enforced (SystemDrivesMinimumPINLength).
The following shows the BitLocker configuration service provider in tree format.
```
@@ -64,7 +64,6 @@ Allows the administrator to require storage card encryption on the device. This
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
 |
@@ -122,7 +121,6 @@ Allows the administrator to require encryption to be turned on by using BitLocke
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -189,7 +187,6 @@ Allows you to set the default encryption method for each of the different drive
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -274,7 +271,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Require addition
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -283,7 +280,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Require addition
 |
|
|
- |
+
@@ -382,7 +379,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Configure minimu
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -391,7 +388,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Configure minimu
|
|
|
- |
+
@@ -459,7 +456,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Configure pre-bo
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -468,7 +465,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Configure pre-bo
|
|
|
- |
+
@@ -485,7 +482,7 @@ ADMX Info:
> [!TIP]
> For a step-by-step guide to enable ADMX-backed policies, see [Enable ADMX-backed policies in MDM](enable-admx-backed-policies-in-mdm.md). For additional information, see [Understanding ADMX-backed policies](understanding-admx-backed-policies.md).
-This setting lets you configure the entire recovery message or replace the existing URL that are displayed on the pre-boot key recovery screen when the OS drive is locked.
+This setting lets you configure the entire recovery message or replace the existing URL that is displayed on the pre-boot key recovery screen when the OS drive is locked.
If you set the value to "1" (Use default recovery message and URL), the default BitLocker recovery message and URL will be displayed in the pre-boot key recovery screen. If you have previously configured a custom recovery message or URL and want to revert to the default message, you must keep the policy enabled and set the value "1" (Use default recovery message and URL).
@@ -548,7 +545,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Choose how BitLo
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -557,7 +554,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Choose how BitLo
|
|
|
- |
+
@@ -645,7 +642,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Choose how BitLo
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -654,7 +651,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Choose how BitLo
|
|
|
- |
+
@@ -751,7 +748,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Deny write acces
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -760,7 +757,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Deny write acces
|
|
|
- |
+
@@ -820,7 +817,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Deny write acces
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -829,7 +826,7 @@ This setting is a direct mapping to the Bitlocker Group Policy "Deny write acces
|
|
|
- |
+
@@ -905,7 +902,7 @@ Allows the admin to disable the warning prompt for other disk encryption on the
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -914,7 +911,7 @@ Allows the admin to disable the warning prompt for other disk encryption on the
|
|
|
- |
+
@@ -969,7 +966,7 @@ If "AllowWarningForOtherDiskEncryption" is not set, or is set to "1", "RequireDe
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -978,7 +975,7 @@ If "AllowWarningForOtherDiskEncryption" is not set, or is set to "1", "RequireDe
|
|
|
- |
+
@@ -1024,7 +1021,7 @@ This setting initiates a client-driven recovery password refresh after an OS dri
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -1033,7 +1030,7 @@ This setting initiates a client-driven recovery password refresh after an OS dri
|
|
|
- |
+
@@ -1079,7 +1076,7 @@ Each server-side recovery key rotation is represented by a request ID. The serve
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -1088,7 +1085,7 @@ Each server-side recovery key rotation is represented by a request ID. The serve
|
|
|
- |
+
@@ -1124,7 +1121,7 @@ This node reports compliance state of device encryption on the system.
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -1133,7 +1130,7 @@ This node reports compliance state of device encryption on the system.
|
|
|
- |
+
@@ -1192,7 +1189,7 @@ Status code can be one of the following:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -1201,7 +1198,7 @@ Status code can be one of the following:
|
|
|
- |
+
@@ -1227,7 +1224,7 @@ This node needs to be queried in synchronization with RotateRecoveryPasswordsSta
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -1236,7 +1233,7 @@ This node needs to be queried in synchronization with RotateRecoveryPasswordsSta
|
|
|
- |
+
diff --git a/windows/client-management/mdm/certificate-authentication-device-enrollment.md b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
index 028007ccce..f01490c427 100644
--- a/windows/client-management/mdm/certificate-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
@@ -61,7 +61,6 @@ Cache-Control: no-cache
101
10.0.0.0
3.0
- WindowsPhone
10.0.0.0
Certificate
@@ -353,12 +352,8 @@ http://schemas.microsoft.com/5.0.0.0/ConfigurationManager/Enrollment/DeviceEnrol
49015420323756
Full
-
- WindowsPhone
-
-
- 10.0.0.0
-
+
+
7BA748C8-703E-4DF2-A74A-92984117346A
diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md
index 3227294e86..90f132759c 100644
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@@ -41,7 +41,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -50,7 +49,6 @@ Additional lists:
|
|
|
- |
@@ -69,7 +67,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -78,7 +75,6 @@ Additional lists:
4 |
4 |
|
- |
@@ -97,7 +93,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -106,7 +101,6 @@ Additional lists:
|
|
|
- |
@@ -125,7 +119,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -134,7 +127,6 @@ Additional lists:
|
|
|
- |
@@ -153,7 +145,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -162,7 +153,6 @@ Additional lists:
|
|
|
- |
@@ -181,7 +171,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 6 |
@@ -190,7 +179,6 @@ Additional lists:
6 |
6 |
6 |
- 6 |
@@ -209,7 +197,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -218,7 +205,6 @@ Additional lists:
|
|
|
- |
@@ -237,7 +223,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -246,7 +231,6 @@ Additional lists:
|
|
|
- |
@@ -265,7 +249,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -274,7 +257,6 @@ Additional lists:
|
|
|
- |
@@ -293,7 +275,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -302,7 +283,6 @@ Additional lists:
2 |
2 |
2 |
- 2 |
@@ -321,7 +301,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -330,7 +309,6 @@ Additional lists:
|
|
|
- |
@@ -349,7 +327,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 3 |
@@ -358,7 +335,6 @@ Additional lists:
3 |
3 |
|
- |
@@ -377,7 +353,7 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -386,7 +362,6 @@ Additional lists:
|
|
1 |
- 1 |
@@ -405,7 +380,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 2 |
@@ -414,7 +388,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -433,7 +406,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 3 |
@@ -442,7 +414,6 @@ Additional lists:
3 |
3 |
|
- |
@@ -461,7 +432,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 2 |
@@ -470,7 +440,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -489,7 +458,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -498,7 +466,6 @@ Additional lists:
|
|
|
- |
@@ -517,7 +484,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -526,7 +492,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -545,7 +510,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -554,7 +518,6 @@ Additional lists:
|
|
|
- |
@@ -573,7 +536,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -582,7 +544,6 @@ Additional lists:
|
|
|
- |
@@ -601,7 +562,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -610,7 +570,6 @@ Additional lists:
|
|
|
- |
@@ -629,7 +588,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -638,7 +596,6 @@ Additional lists:
|
|
|
- |
@@ -657,7 +614,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -666,7 +622,6 @@ Additional lists:
|
|
|
- |
@@ -685,7 +640,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -694,7 +648,6 @@ Additional lists:
|
|
|
- |
@@ -713,7 +666,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -722,7 +674,6 @@ Additional lists:
|
|
|
- |
@@ -741,7 +692,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -750,7 +700,6 @@ Additional lists:
|
|
|
- |
@@ -769,7 +718,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -778,7 +726,6 @@ Additional lists:
|
|
|
- |
@@ -797,7 +744,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -806,7 +752,6 @@ Additional lists:
|
|
|
- |
@@ -825,7 +770,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -853,7 +797,7 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -881,8 +825,7 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
-
+
|
|
@@ -890,7 +833,6 @@ Additional lists:
|
|
|
- |
@@ -909,7 +851,7 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
+
|
@@ -918,7 +860,6 @@ Additional lists:
2 |
2 |
3 |
- 3 |
@@ -937,7 +878,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -946,7 +886,6 @@ Additional lists:
|
|
|
- |
@@ -965,7 +904,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 6 |
@@ -974,7 +912,6 @@ Additional lists:
6 |
6 |
|
- |
@@ -993,7 +930,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 2 |
@@ -1002,7 +938,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -1021,7 +956,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1030,7 +964,6 @@ Additional lists:
|
|
|
- |
@@ -1049,7 +982,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1058,7 +990,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -1077,7 +1008,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1086,7 +1016,6 @@ Additional lists:
|
|
|
- |
@@ -1105,7 +1034,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1115,7 +1043,6 @@ Additional lists:
| |
|
|
- |
@@ -1134,7 +1061,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1162,7 +1088,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1171,7 +1096,6 @@ Additional lists:
|
|
|
- |
@@ -1190,7 +1114,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1199,7 +1122,6 @@ Additional lists:
|
|
|
- |
@@ -1218,7 +1140,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1227,7 +1148,6 @@ Additional lists:
|
|
|
- |
@@ -1246,7 +1166,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1255,7 +1174,6 @@ Additional lists:
3 |
3 |
3 |
- 3 |
@@ -1274,7 +1192,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1283,7 +1200,6 @@ Additional lists:
|
|
(Provisioning only) |
- (Provisioning only) |
@@ -1302,7 +1218,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1311,7 +1226,6 @@ Additional lists:
3 |
3 |
|
- |
@@ -1330,7 +1244,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1339,7 +1252,6 @@ Additional lists:
|
|
|
- |
@@ -1358,7 +1270,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1367,7 +1278,6 @@ Additional lists:
|
|
|
- |
@@ -1386,7 +1296,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1395,7 +1304,6 @@ Additional lists:
|
|
|
- |
@@ -1414,7 +1322,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1423,7 +1330,6 @@ Additional lists:
|
|
2 |
- 2 |
@@ -1442,7 +1348,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| 4 |
@@ -1451,7 +1356,6 @@ Additional lists:
4 |
4 |
4 |
- 4 |
@@ -1470,7 +1374,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1479,7 +1382,6 @@ Additional lists:
|
|
|
- |
@@ -1498,7 +1400,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1507,7 +1408,6 @@ Additional lists:
|
|
|
- |
@@ -1526,7 +1426,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1535,7 +1434,6 @@ Additional lists:
2 |
2 |
2 |
- 2 |
@@ -1554,7 +1452,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1563,7 +1460,6 @@ Additional lists:
|
|
|
- |
@@ -1582,7 +1478,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1591,7 +1486,6 @@ Additional lists:
|
|
|
- |
@@ -1610,7 +1504,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1619,7 +1512,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -1638,7 +1530,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1647,7 +1538,6 @@ Additional lists:
|
|
|
- |
@@ -1666,7 +1556,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1675,7 +1564,6 @@ Additional lists:
|
|
|
- |
@@ -1694,7 +1582,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1703,7 +1590,6 @@ Additional lists:
|
|
|
- |
@@ -1722,7 +1608,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1731,7 +1616,6 @@ Additional lists:
2 |
2 |
|
- |
@@ -1750,7 +1634,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1759,7 +1642,6 @@ Additional lists:
|
|
|
- |
@@ -1778,7 +1660,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1787,7 +1668,6 @@ Additional lists:
|
|
|
- |
@@ -1806,7 +1686,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
| (Provisioning only) |
@@ -1815,7 +1694,6 @@ Additional lists:
(Provisioning only) |
(Provisioning only) |
(Provisioning only) |
- (Provisioning only) |
@@ -1834,7 +1712,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1843,7 +1720,6 @@ Additional lists:
|
|
|
- |
@@ -1862,7 +1738,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1871,7 +1746,6 @@ Additional lists:
|
|
|
- |
@@ -1890,7 +1764,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1899,7 +1772,6 @@ Additional lists:
|
|
|
- |
@@ -1918,7 +1790,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1927,7 +1798,6 @@ Additional lists:
|
|
|
- |
@@ -1946,7 +1816,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1955,7 +1824,6 @@ Additional lists:
|
|
|
- |
@@ -1974,7 +1842,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -1983,7 +1850,6 @@ Additional lists:
|
|
|
- |
@@ -2002,7 +1868,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2011,7 +1876,6 @@ Additional lists:
|
|
|
- |
@@ -2030,7 +1894,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2039,7 +1902,6 @@ Additional lists:
|
|
|
- |
@@ -2058,7 +1920,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2067,7 +1928,6 @@ Additional lists:
|
|
|
- |
@@ -2086,7 +1946,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2095,7 +1954,6 @@ Additional lists:
1 |
1 |
|
- |
@@ -2114,7 +1972,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2123,7 +1980,6 @@ Additional lists:
|
|
|
- |
@@ -2142,7 +1998,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2151,7 +2006,6 @@ Additional lists:
1 |
1 |
|
- |
@@ -2170,7 +2024,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2179,7 +2032,6 @@ Additional lists:
|
|
|
- |
@@ -2198,7 +2050,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2226,7 +2077,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2235,7 +2085,6 @@ Additional lists:
5 |
5 |
|
- |
@@ -2254,7 +2103,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2263,7 +2111,6 @@ Additional lists:
|
|
|
- |
@@ -2282,7 +2129,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2291,7 +2137,6 @@ Additional lists:
4 |
4 |
|
- |
@@ -2310,7 +2155,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2319,7 +2163,6 @@ Additional lists:
|
|
|
- |
@@ -2338,7 +2181,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2347,7 +2189,6 @@ Additional lists:
|
|
|
- |
@@ -2366,7 +2207,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2375,7 +2215,6 @@ Additional lists:
|
|
|
- |
@@ -2394,7 +2233,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2403,7 +2241,6 @@ Additional lists:
|
|
|
- |
@@ -2422,7 +2259,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2450,7 +2286,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2459,7 +2294,6 @@ Additional lists:
|
|
|
- |
@@ -2478,7 +2312,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2487,7 +2320,6 @@ Additional lists:
1 |
1 |
|
- |
@@ -2506,7 +2338,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2515,7 +2346,6 @@ Additional lists:
5 |
5 |
|
- |
@@ -2534,7 +2364,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2543,7 +2372,6 @@ Additional lists:
1 |
1 |
|
- |
@@ -2562,7 +2390,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2570,8 +2397,7 @@ Additional lists:
3 |
3 |
3 |
- |
- |
+ | >
@@ -2591,7 +2417,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2600,7 +2425,6 @@ Additional lists:
|
|
|
- |
@@ -2619,7 +2443,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2628,7 +2451,6 @@ Additional lists:
|
|
|
- |
@@ -2647,7 +2469,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
@@ -2656,7 +2477,6 @@ Additional lists:
5 |
5 |
5 |
- 5 |
@@ -2675,7 +2495,6 @@ Additional lists:
Enterprise |
Education |
Mobile |
- Mobile Enterprise |
|
diff --git a/windows/client-management/mdm/defender-csp.md b/windows/client-management/mdm/defender-csp.md
index 9f021cbaac..fbdd7913a0 100644
--- a/windows/client-management/mdm/defender-csp.md
+++ b/windows/client-management/mdm/defender-csp.md
@@ -457,8 +457,8 @@ The data type is integer.
Supported operations are Add, Delete, Get, Replace.
Valid values are:
-- 1 – Enable.
-- 0 (default) – Disable.
+- 1 (default) – Enable.
+- 0 – Disable.
**Configuration/MeteredConnectionUpdates**
Allow managed devices to update through metered connections. Data charges may apply.
@@ -518,8 +518,8 @@ When enabled or disabled exists on the client and admin moves the setting to not
More details:
-- [Microsoft Defender AV diagnostic data](/windows/security/threat-protection/microsoft-defender-antivirus/collect-diagnostic-data)
-- [Collect investigation package from devices](/windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts#collect-investigation-package-from-devices)
+- [Microsoft Defender AV diagnostic data](/microsoft-365/security/defender-endpoint/collect-diagnostic-data)
+- [Collect investigation package from devices](/microsoft-365/security/defender-endpoint/respond-machine-alerts#collect-investigation-package-from-devices)
**Scan**
Node that can be used to start a Windows Defender scan on a device.
@@ -542,4 +542,4 @@ Supported operations are Get and Execute.
## Related topics
-[Configuration service provider reference](configuration-service-provider-reference.md)
\ No newline at end of file
+[Configuration service provider reference](configuration-service-provider-reference.md)
diff --git a/windows/client-management/mdm/devdetail-ddf-file.md b/windows/client-management/mdm/devdetail-ddf-file.md
index 25be11c21b..717e018b44 100644
--- a/windows/client-management/mdm/devdetail-ddf-file.md
+++ b/windows/client-management/mdm/devdetail-ddf-file.md
@@ -189,28 +189,7 @@ The XML below is the current version for this CSP.
text/plain
-
-
- SwV
-
-
-
-
- Returns the Windows Phone OS software version.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
+
HwV
diff --git a/windows/client-management/mdm/device-update-management.md b/windows/client-management/mdm/device-update-management.md
index 00d784cb32..8e886f3661 100644
--- a/windows/client-management/mdm/device-update-management.md
+++ b/windows/client-management/mdm/device-update-management.md
@@ -19,13 +19,13 @@ ms.date: 11/15/2017
>[!TIP]
>If you're not a developer or administrator, you'll find more helpful information in the [Windows Update: Frequently Asked Questions](https://support.microsoft.com/help/12373/windows-update-faq).
-In the current device landscape of PC, tablets, phones, and IoT devices, Mobile Device Management (MDM) solutions are becoming prevalent as a lightweight device management technology. In Windows 10, we are investing heavily in extending the management capabilities available to MDMs. One key feature we are adding is the ability for MDMs to keep devices up-to-date with the latest Microsoft updates.
+In the current device landscape of PC, tablets, phones, and IoT devices, Mobile Device Management (MDM) solutions are becoming prevalent as a lightweight device management technology. In Windows 10, we are investing heavily in extending the management capabilities available to MDMs. One key feature we are adding is the ability for MDMs to keep devices up to date with the latest Microsoft updates.
In particular, Windows 10 provides APIs to enable MDMs to:
-- Ensure machines stay up-to-date by configuring Automatic Update policies.
+- Ensure machines stay up to date by configuring Automatic Update policies.
- Test updates on a smaller set of machines before enterprise-wide rollout by configuring which updates are approved for a given device.
-- Get compliance status of managed devices so IT can easily understand which machines still need a particular security patch, or how up-to-date is a particular machine.
+- Get compliance status of managed devices so IT can easily understand which machines still need a particular security patch, or how up to date is a particular machine.
This topic provides MDM independent software vendors (ISV) with the information they need to implement update management in Windows 10.
@@ -34,7 +34,7 @@ In Windows 10, the MDM protocol has been extended to better enable IT admins to
- Configure automatic update policies to ensure devices stay up-to-date.
- Get device compliance information (the list of updates that are needed but not yet installed).
- Specify a per-device update approval list, to ensure devices don’t install unapproved updates that have not been tested.
-- Approve EULAs on behalf of the end-user so update deployment can be automated even for updates with EULAs.
+- Approve EULAs on behalf of the end user so update deployment can be automated even for updates with EULAs.
The OMA DM APIs for specifying update approvals and getting compliance status refer to updates by using an Update ID, which is a GUID that identifies a particular update. The MDM, of course, will want to expose IT-friendly information about the update (instead of a raw GUID), including the update’s title, description, KB, update type (for example, a security update or service pack). For more information, see [\[MS-WSUSSS\]: Windows Update Services: Server-Server Protocol](/openspecs/windows_protocols/ms-wsusss/f49f0c3e-a426-4b4b-b401-9aeb2892815c).
@@ -69,7 +69,8 @@ Some important highlights:
- The protocol allows the MDM to sync update metadata for a particular update by calling GetUpdateData. For more information, see [GetUpdateData](/openspecs/windows_protocols/ms-wsusss/c28ad30c-fa3f-4bc6-a747-788391d2d964) in MSDN. The LocURI to get the applicable updates with their revision Numbers is `./Vendor/MSFT/Update/InstallableUpdates?list=StructData`. Because not all updates are available via S2S sync, make sure you handle SOAP errors.
- For mobile devices, you can either sync metadata for a particular update by calling GetUpdateData, or for a local on-premises solution, you can use WSUS and manually import the mobile updates from the Microsoft Update Catalog site. For more information, see [Process flow diagram and screenshots of server sync process](#process-flow-diagram-and-screenshots-of-server-sync-process).
-> **Note** On Microsoft Update, metadata for a given update gets modified over time (updating descriptive information, fixing bugs in applicability rules, localization changes, etc). Each time such a change is made that doesn’t affect the update itself, a new update revision is created. The identity of an update revision is a compound key containing both an UpdateID (GUID) and a RevisionNumber (int). The MDM should not expose the notion of an update revision to IT. Instead, for each UpdateID (GUID) the MDM should just keep the metadata for the later revision of that update (the one with the highest revision number).
+> [!NOTE]
+> On Microsoft Update, metadata for a given update gets modified over time (updating descriptive information, fixing bugs in applicability rules, localization changes, etc). Each time such a change is made that doesn’t affect the update itself, a new update revision is created. The identity of an update revision is a compound key containing both an UpdateID (GUID) and a RevisionNumber (int). The MDM should not expose the notion of an update revision to IT. Instead, for each UpdateID (GUID) the MDM should just keep the metadata for the later revision of that update (the one with the highest revision number).
## Examples of update metadata XML structure and element descriptions
@@ -79,7 +80,7 @@ The response of the GetUpdateData call returns an array of ServerSyncUpdateData
- **UpdateID** – The unique identifier for an update
- **RevisionNumber** – Revision number for the update in case the update was modified.
- **CreationDate** – the date on which this update was created.
-- **UpdateType** – The type of update which could include the following:
+- **UpdateType** – The type of update, which could include the following:
- **Detectoid** – if this update identity represents a compatibility logic
- **Category** – This could represent either of the following:
- A Product category the update belongs to. For example, Windows, MS office etc.
@@ -106,7 +107,7 @@ First some background:
The following procedure describes a basic algorithm for a metadata sync service:
- Initialization, composed of the following:
- 1. Create an empty list of “needed update IDs to fault in”. This list will get updated by the MDM service component that uses OMA DM. We recommend not adding definition updates to this list, since those are temporary in nature (for example, Defender releases about 4 new definition updates per day, each of which is cumulative).
+ 1. Create an empty list of “needed update IDs to fault in”. This list will get updated by the MDM service component that uses OMA DM. We recommend not adding definition updates to this list, since those are temporary in nature (for example, Defender releases about four new definition updates per day, each of which is cumulative).
- Sync periodically (we recommend once every 2 hours - no more than once/hour).
1. Implement the authorization phase of the protocol to get a cookie if you don’t already have a non-expired cookie. See **Sample 1: Authorization** in [Protocol Examples](/openspecs/windows_protocols/ms-wsusss/2dedbd00-fbb7-46ee-8ee0-aec9bd1ecd2a).
2. Implement the metadata portion of the protocol (see **Sample 2: Metadata and Deployments Synchronization** in [Protocol Examples](/openspecs/windows_protocols/ms-wsusss/2dedbd00-fbb7-46ee-8ee0-aec9bd1ecd2a)), and:
@@ -129,7 +130,7 @@ The following list describes a suggested model for applying updates.
1. Have a "Test Group" and an "All Group".
2. In the Test group, just let all updates flow.
-3. In the All Group, set up Quality Update deferral for 7 days and then Quality Updates will be auto approved after the 7 days. Note that Definition Updates are excluded from Quality Update deferrals and will be auto approved when they are availible. This can be done by setting Update/DeferQualityUpdatesPeriodInDays to 7 and just letting updates flow after seven days or pushing Pause in case of issues.
+3. In the All Group, set up Quality Update deferral for 7 days and then Quality Updates will be auto approved after the 7 days. Note that Definition Updates are excluded from Quality Update deferrals and will be auto approved when they are available. This can be done by setting Update/DeferQualityUpdatesPeriodInDays to 7 and just letting updates flow after seven days or pushing Pause in case of issues.
Updates are configured using a combination of the [Update CSP](update-csp.md), and the update portion of the [Policy CSP](policy-configuration-service-provider.md). Please refer to these topics for details on configuring updates.
@@ -143,7 +144,7 @@ The following diagram shows the Update policies in a tree format.
**Update/ActiveHoursEnd**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1607. Allows the IT admin (when used with Update/ActiveHoursStart) to manage a range of active hours where update reboots are not scheduled. This value sets the end time. There is a 12 hour maximum from start time.
@@ -157,8 +158,7 @@ The following diagram shows the Update policies in a tree format.
**Update/ActiveHoursMaxRange**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
-
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education.
Added in Windows 10, version 1703. Allows the IT admin to specify the max active hours range. This value sets max number of active hours from start time.
@@ -168,7 +168,7 @@ The following diagram shows the Update policies in a tree format.
**Update/ActiveHoursStart**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education.
Added in Windows 10, version 1607. Allows the IT admin (when used with Update/ActiveHoursEnd) to manage a range of hours where update reboots are not scheduled. This value sets the start time. There is a 12 hour maximum from end time.
@@ -182,7 +182,7 @@ The following diagram shows the Update policies in a tree format.
**Update/AllowAutoUpdate**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education.
Enables the IT admin to manage automatic update behavior to scan, download, and install updates.
@@ -218,10 +218,10 @@ The following diagram shows the Update policies in a tree format.
**Update/AllowNonMicrosoftSignedUpdate**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise and Windows 10 Education.
-
Allows the IT admin to manage whether Automatic Updates accepts updates signed by entities other than Microsoft when the update is found at the UpdateServiceUrl location. This policy supports using WSUS for 3rd party software and patch distribution.
+
Allows the IT admin to manage whether Automatic Updates accepts updates signed by entities other than Microsoft when the update is found at the UpdateServiceUrl location. This policy supports using WSUS for third party software and patch distribution.
Supported operations are Get and Replace.
@@ -230,11 +230,11 @@ The following diagram shows the Update policies in a tree format.
- 0 – Not allowed or not configured. Updates from an intranet Microsoft update service location must be signed by Microsoft.
- 1 – Allowed. Accepts updates received through an intranet Microsoft update service location, if they are signed by a certificate found in the "Trusted Publishers" certificate store of the local computer.
-
This policy is specific to desktop and local publishing via WSUS for 3rd party updates (binaries and updates not hosted on Microsoft Update) and allows IT to manage whether Automatic Updates accepts updates signed by entities other than Microsoft when the update is found on an intranet Microsoft update service location.
+
This policy is specific to desktop and local publishing via WSUS for third party updates (binaries and updates not hosted on Microsoft Update) and allows IT to manage whether Automatic Updates accepts updates signed by entities other than Microsoft when the update is found on an intranet Microsoft update service location.
**Update/AllowUpdateService**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Specifies whether the device could use Microsoft Update, Windows Server Update Services (WSUS), or Microsoft.
@@ -254,7 +254,7 @@ The following diagram shows the Update policies in a tree format.
**Update/AutoRestartNotificationSchedule**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1703. Allows the IT Admin to specify the period for auto-restart reminder notifications.
@@ -265,10 +265,10 @@ The following diagram shows the Update policies in a tree format.
**Update/AutoRestartRequiredNotificationDismissal**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
-
Added in Windows 10, version 1703. Allows the IT Admin to specify the method by which the auto-restart required notification is dismissed.
+
Added in Windows 10, version 1703. Allows the IT Admin to specify the method by which the auto restart required notification is dismissed.
The following list shows the supported values:
@@ -277,7 +277,7 @@ The following diagram shows the Update policies in a tree format.
**Update/BranchReadinessLevel**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1607. Allows the IT admin to set which branch a device receives their updates from.
@@ -290,8 +290,6 @@ The following diagram shows the Update policies in a tree format.
**Update/DeferFeatureUpdatesPeriodInDays**
> [!NOTE]
> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education.
->
Since this policy is not blocked, you will not get a failure message when you use it to configure a Windows 10 Mobile device. However, the policy will not take effect.
-
Added in Windows 10, version 1607. Defers Feature Updates for the specified number of days.
@@ -299,7 +297,7 @@ The following diagram shows the Update policies in a tree format.
**Update/DeferQualityUpdatesPeriodInDays**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1607. Defers Quality Updates for the specified number of days.
@@ -308,20 +306,15 @@ The following diagram shows the Update policies in a tree format.
**Update/DeferUpdatePeriod**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
>
> Don't use this policy in Windows 10, version 1607 devices, instead use the new policies listed in [Changes in Windows 10, version 1607 for update management](device-update-management.md#windows10version1607forupdatemanagement). You can continue to use DeferUpdatePeriod for Windows 10, version 1511 devices.
-
Allows IT Admins to specify update delays for up to 4 weeks.
+
Allows IT Admins to specify update delays for up to four weeks.
Supported values are 0-4, which refers to the number of weeks to defer updates.
-
In Windows 10 Mobile Enterprise version 1511 devices set to automatic updates, for DeferUpdatePeriod to work, you must set the following:
-
-- Update/RequireDeferUpgrade must be set to 1
-- System/AllowTelemetry must be set to 1 or higher
-
If the "Specify intranet Microsoft update service location" policy is enabled, then the "Defer upgrades by", "Defer updates by" and "Pause Updates and Upgrades" settings have no effect.
If the Allow Telemetry policy is enabled and the Options value is set to 0, then the "Defer upgrades by", "Defer updates by" and "Pause Updates and Upgrades" settings have no effect.
@@ -371,7 +364,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
Other/cannot defer |
No deferral |
No deferral |
-Any update category not specifically enumerated above falls into this category.
+ | Any update category not enumerated above falls into this category.
Definition Update - E0789628-CE08-4437-BE74-2495B842F43B |
@@ -387,7 +380,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
> Don't use this policy in Windows 10, version 1607 devices, instead use the new policies listed in [Changes in Windows 10, version 1607 for update management](device-update-management.md#windows10version1607forupdatemanagement). You can continue to use DeferUpgradePeriod for Windows 10, version 1511 devices.
-Allows IT Admins to specify additional upgrade delays for up to 8 months.
+
Allows IT Admins to specify additional upgrade delays for up to eight months.
Supported values are 0-8, which refers to the number of months to defer upgrades.
@@ -397,7 +390,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/EngagedRestartDeadline**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1703. Allows the IT Admin to specify the deadline in days before automatically scheduling and executing a pending restart outside of active hours. The deadline can be set between 2 and 30 days from the time the restart becomes pending. If configured, the pending restart will transition from Auto-restart to Engaged restart (pending user schedule) to be automatically executed within the specified period. If no deadline is specified or deadline is set to 0, the restart will not be automatically executed and will remain Engaged restart (pending user scheduling).
@@ -408,25 +401,25 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/EngagedRestartSnoozeSchedule**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1703. Allows the IT Admin to control the number of days a user can snooze Engaged restart reminder notifications.
Supported values are 1-3 days.
-
The default value is 3 days.
+
The default value is three days.
**Update/EngagedRestartTransitionSchedule**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1703. Allows the IT Admin to control the timing before transitioning from Auto restarts scheduled outside of active hours to Engaged restart, which requires the user to schedule. The period can be set between 2 and 30 days from the time the restart becomes pending.
Supported values are 2-30 days.
-
The default value is 7 days.
+
The default value is seven days.
**Update/ExcludeWUDriversInQualityUpdate**
> [!NOTE]
@@ -484,12 +477,12 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/PauseDeferrals**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
>
> Don't use this policy in Windows 10, version 1607 devices, instead use the new policies listed in [Changes in Windows 10, version 1607 for update management](device-update-management.md#windows10version1607forupdatemanagement). You can continue to use PauseDeferrals for Windows 10, version 1511 devices.
-
Allows IT Admins to pause updates and upgrades for up to 5 weeks. Paused deferrals will be reset after 5 weeks.
+
Allows IT Admins to pause updates and upgrades for up to five weeks. Paused deferrals will be reset after five weeks.
The following list shows the supported values:
@@ -503,8 +496,6 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/PauseFeatureUpdates**
> [!NOTE]
> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education.
->
Since this policy is not blocked, you will not get a failure message when you use it to configure a Windows 10 Mobile device. However, the policy will not take effect.
-
Added in Windows 10, version 1607. Allows IT Admins to pause Feature Updates for up to 60 days.
@@ -515,7 +506,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/PauseQualityUpdates**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1607. Allows IT Admins to pause Quality Updates.
@@ -527,7 +518,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/RequireDeferUpgrade**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
>
> Don't use this policy in Windows 10, version 1607 devices, instead use the new policies listed in [Changes in Windows 10, version 1607 for update management](device-update-management.md#windows10version1607forupdatemanagement). You can continue to use RequireDeferUpgrade for Windows 10, version 1511 devices.
@@ -542,7 +533,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/RequireUpdateApproval**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
@@ -561,7 +552,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/ScheduleImminentRestartWarning**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1703. Allows the IT Admin to specify the period for auto-restart imminent warning notifications.
@@ -572,7 +563,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/ScheduledInstallDay**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Enables the IT admin to schedule the day of the update installation.
@@ -594,7 +585,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/ScheduledInstallTime**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Enables the IT admin to schedule the time of the update installation.
@@ -609,10 +600,10 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/ScheduleRestartWarning**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
-
Added in Windows 10, version 1703. Allows the IT Admin to specify the period for auto-restart warning reminder notifications.
+
Added in Windows 10, version 1703. Allows the IT Admin to specify the period for auto restart warning reminder notifications.
Supported values are 2, 4, 8, 12, or 24 (hours).
@@ -620,10 +611,10 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/SetAutoRestartNotificationDisable**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
-
Added in Windows 10, version 1703. Allows the IT Admin to disable auto-restart notifications for update installations.
+
Added in Windows 10, version 1703. Allows the IT Admin to disable auto restart notifications for update installations.
The following list shows the supported values:
@@ -632,10 +623,10 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
**Update/UpdateServiceUrl**
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
> [!Important]
-> Starting in Windows 10, version 1703 this policy is not supported in Windows 10 Mobile Enterprise and IoT Enterprise.
+> Starting in Windows 10, version 1703 this policy is not supported in IoT Enterprise.
Allows the device to check for updates from a WSUS server instead of Microsoft Update. This is useful for on-premises MDMs that need to update devices that cannot connect to the Internet.
@@ -699,7 +690,7 @@ Node for update approvals and EULA acceptance on behalf of the end-user.
The MDM must first present the EULA to IT and have them accept it before the update is approved. Failure to do this is a breach of legal or contractual obligations. The EULAs can be obtained from the update metadata and have their own EULA ID. It's possible for multiple updates to share the same EULA. It is only necessary to approve the EULA once per EULA ID, not one per update.
-The update approval list enables IT to approve individual updates and update classifications. Auto-approval by update classifications allows IT to automatically approve Definition Updates (i.e., updates to the virus and spyware definitions on devices) and Security Updates (i.e., product-specific updates for security-related vulnerability). The update approval list does not support the uninstallation of updates by revoking approval of already installed updates. Updates are approved based on UpdateID, and an UpdateID only needs to be approved once. An update UpdateID and RevisionNumber are part of the UpdateIdentity type. An UpdateID can be associated to several UpdateIdentity GUIDs due to changes to the RevisionNumber setting. MDM services must synchronize the UpdateIdentity of an UpdateID based on the latest RevisionNumber to get the latest metadata for an update. However, update approval is based on UpdateID.
+The update approval list enables IT to approve individual updates and update classifications. Auto-approval by update classifications allows IT to automatically approve Definition Updates (that is, updates to the virus and spyware definitions on devices) and Security Updates (that is, product-specific updates for security-related vulnerability). The update approval list does not support the uninstallation of updates by revoking approval of already installed updates. Updates are approved based on UpdateID, and an UpdateID only needs to be approved once. An update UpdateID and RevisionNumber are part of the UpdateIdentity type. An UpdateID can be associated to several UpdateIdentity GUIDs due to changes to the RevisionNumber setting. MDM services must synchronize the UpdateIdentity of an UpdateID based on the latest RevisionNumber to get the latest metadata for an update. However, update approval is based on UpdateID.
> **Note** For the Windows 10 build, the client may need to reboot after additional updates are added.
@@ -894,21 +885,9 @@ Here is the list of older policies that are still supported for backward compati
- Update/DeferUpdatePeriod
- Update/PauseDeferrals
-For Windows Update for Business, here is the list of supported policies on Windows 10 Mobile Enterprise:
-
-- For Windows 10, version 1511 (Build 10586): Update/RequireDeferUpgrade, Update/DeferUpdatePeriod and Update/PauseDeferrals. To use DeferUpdatePeriod and PauseDeferrals the RequireDeferUpgrade has to be set to 1, which essentially means for a device running 1511, the Windows Update for Business policies can only be set when a device is configured for CBB servicing.
-- For Windows 10, version 1607 (Build 14393): Update/BranchReadinessLevel, Update/DeferQualityUpdatesPeriodInDays and Update/PauseQualityUpdates. In 1607 we added support where you can configure Windows Update for Business policies when a device is configured for CB/CBB servicing.
-
-> **Note**
-For policies supported for Windows Update for Business, when you set policies for both Windows 10, version 1607 and Windows 10, version 1511 running on 1607, then 1607 policies will be configured (1607 trumps 1511).
-
-For policies supported for Windows Update for Business, when you set 1511 policies on a device running 1607, the you will get the expected behavior for 1511 policies.
-
-
-
## Update management user experience screenshot
-The following screenshots of the administrator console shows the list of update titles, approval status, and additional metadata fields.
+The following screenshots of the administrator console show the list of update titles, approval status, and additional metadata fields.
diff --git a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
index eff91fca3c..3bd7186d4f 100644
--- a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
+++ b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
@@ -40,12 +40,12 @@ mdmdiagnosticstool.exe -area DeviceEnrollment;DeviceProvisioning;Autopilot -cab
- In File Explorer, navigate to c:\Users\Public\Documents\MDMDiagnostics to see the report.
### Understanding cab structure
-The cab file will have logs according to the areas that were used in the command. This explanation is based on DeviceEnrollment,DeviceProvisioning and Autopilot areas. It applies to the cab files collected via command line or Feedback Hub
+The cab file will have logs according to the areas that were used in the command. This explanation is based on DeviceEnrollment, DeviceProvisioning and Autopilot areas. It applies to the cab files collected via command line or Feedback Hub
- DiagnosticLogCSP_Collector_Autopilot_*: Autopilot etls
- DiagnosticLogCSP_Collector_DeviceProvisioning_*: Provisioning etls (Microsoft-Windows-Provisioning-Diagnostics-Provider)
-- MDMDiagHtmlReport.html: Summary snapshot of MDM space configurations and policies. Includes, management url, MDM server device id, certificates, policies.
-- MdmDiagLogMetadata,json: mdmdiagnosticstool metadata file, contains command line arguments used to run the tool
+- MDMDiagHtmlReport.html: Summary snapshot of MDM space configurations and policies. Includes, management url, MDM server device ID, certificates, policies.
+- MdmDiagLogMetadata, json: mdmdiagnosticstool metadata file, contains command-line arguments used to run the tool
- MDMDiagReport.xml: contains a more detail view into the MDM space configurations, e.g enrollment variables
- MdmDiagReport_RegistryDump.reg: contains dumps from common MDM registry locations
- MdmLogCollectorFootPrint.txt: mdmdiagnosticslog tool logs from running the command
@@ -133,10 +133,6 @@ Example: Export the Debug logs
```
-
-
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-addremoveprograms.md b/windows/client-management/mdm/policy-csp-admx-addremoveprograms.md
index 0c6e0067ac..647cff6ce4 100644
--- a/windows/client-management/mdm/policy-csp-admx-addremoveprograms.md
+++ b/windows/client-management/mdm/policy-csp-admx-addremoveprograms.md
@@ -939,17 +939,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-appcompat.md b/windows/client-management/mdm/policy-csp-admx-appcompat.md
index b626e67721..ff2c292c54 100644
--- a/windows/client-management/mdm/policy-csp-admx-appcompat.md
+++ b/windows/client-management/mdm/policy-csp-admx-appcompat.md
@@ -729,17 +729,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-appxpackagemanager.md b/windows/client-management/mdm/policy-csp-admx-appxpackagemanager.md
index 086c0dafc1..9a4ac00b81 100644
--- a/windows/client-management/mdm/policy-csp-admx-appxpackagemanager.md
+++ b/windows/client-management/mdm/policy-csp-admx-appxpackagemanager.md
@@ -106,16 +106,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-appxruntime.md b/windows/client-management/mdm/policy-csp-admx-appxruntime.md
index 6d76bd5f74..de1358be57 100644
--- a/windows/client-management/mdm/policy-csp-admx-appxruntime.md
+++ b/windows/client-management/mdm/policy-csp-admx-appxruntime.md
@@ -323,17 +323,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-attachmentmanager.md b/windows/client-management/mdm/policy-csp-admx-attachmentmanager.md
index 895402efef..8bc9cf11ea 100644
--- a/windows/client-management/mdm/policy-csp-admx-attachmentmanager.md
+++ b/windows/client-management/mdm/policy-csp-admx-attachmentmanager.md
@@ -407,17 +407,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-auditsettings.md b/windows/client-management/mdm/policy-csp-admx-auditsettings.md
index 2564a91801..45e3546cb4 100644
--- a/windows/client-management/mdm/policy-csp-admx-auditsettings.md
+++ b/windows/client-management/mdm/policy-csp-admx-auditsettings.md
@@ -104,17 +104,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-bits.md b/windows/client-management/mdm/policy-csp-admx-bits.md
index 35597b677e..a9c4c671d0 100644
--- a/windows/client-management/mdm/policy-csp-admx-bits.md
+++ b/windows/client-management/mdm/policy-csp-admx-bits.md
@@ -1086,17 +1086,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-ciphersuiteorder.md b/windows/client-management/mdm/policy-csp-admx-ciphersuiteorder.md
index c6bcd46621..b258029bba 100644
--- a/windows/client-management/mdm/policy-csp-admx-ciphersuiteorder.md
+++ b/windows/client-management/mdm/policy-csp-admx-ciphersuiteorder.md
@@ -188,16 +188,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-com.md b/windows/client-management/mdm/policy-csp-admx-com.md
index aaaa28a510..fe5fda7a65 100644
--- a/windows/client-management/mdm/policy-csp-admx-com.md
+++ b/windows/client-management/mdm/policy-csp-admx-com.md
@@ -182,17 +182,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-controlpanel.md b/windows/client-management/mdm/policy-csp-admx-controlpanel.md
index 4a340834f9..e2b1569c90 100644
--- a/windows/client-management/mdm/policy-csp-admx-controlpanel.md
+++ b/windows/client-management/mdm/policy-csp-admx-controlpanel.md
@@ -348,16 +348,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md b/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md
index a03950bfdc..970899b339 100644
--- a/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md
+++ b/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md
@@ -1811,16 +1811,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-cpls.md b/windows/client-management/mdm/policy-csp-admx-cpls.md
index d198e617ff..765b443616 100644
--- a/windows/client-management/mdm/policy-csp-admx-cpls.md
+++ b/windows/client-management/mdm/policy-csp-admx-cpls.md
@@ -102,17 +102,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-credentialproviders.md b/windows/client-management/mdm/policy-csp-admx-credentialproviders.md
index dcaa5fa29f..21edb1f061 100644
--- a/windows/client-management/mdm/policy-csp-admx-credentialproviders.md
+++ b/windows/client-management/mdm/policy-csp-admx-credentialproviders.md
@@ -254,17 +254,9 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are for upcoming release.
+These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-credssp.md b/windows/client-management/mdm/policy-csp-admx-credssp.md
index 7cf1e14d14..2cc80b3bec 100644
--- a/windows/client-management/mdm/policy-csp-admx-credssp.md
+++ b/windows/client-management/mdm/policy-csp-admx-credssp.md
@@ -954,17 +954,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-credui.md b/windows/client-management/mdm/policy-csp-admx-credui.md
index cf430cc22f..f897258fbe 100644
--- a/windows/client-management/mdm/policy-csp-admx-credui.md
+++ b/windows/client-management/mdm/policy-csp-admx-credui.md
@@ -170,17 +170,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-ctrlaltdel.md b/windows/client-management/mdm/policy-csp-admx-ctrlaltdel.md
index 7ec6bdd7bc..b8b9047875 100644
--- a/windows/client-management/mdm/policy-csp-admx-ctrlaltdel.md
+++ b/windows/client-management/mdm/policy-csp-admx-ctrlaltdel.md
@@ -324,17 +324,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-datacollection.md b/windows/client-management/mdm/policy-csp-admx-datacollection.md
index b550db06f6..28d46d0d21 100644
--- a/windows/client-management/mdm/policy-csp-admx-datacollection.md
+++ b/windows/client-management/mdm/policy-csp-admx-datacollection.md
@@ -99,17 +99,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are for upcoming release.
diff --git a/windows/client-management/mdm/policy-csp-admx-desktop.md b/windows/client-management/mdm/policy-csp-admx-desktop.md
index 8c3fd1a932..60c1836ab2 100644
--- a/windows/client-management/mdm/policy-csp-admx-desktop.md
+++ b/windows/client-management/mdm/policy-csp-admx-desktop.md
@@ -2168,16 +2168,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-deviceinstallation.md b/windows/client-management/mdm/policy-csp-admx-deviceinstallation.md
index 69e459d10c..6dbde4ba7a 100644
--- a/windows/client-management/mdm/policy-csp-admx-deviceinstallation.md
+++ b/windows/client-management/mdm/policy-csp-admx-deviceinstallation.md
@@ -605,15 +605,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-devicesetup.md b/windows/client-management/mdm/policy-csp-admx-devicesetup.md
index 5da6627e8f..99a7d7da64 100644
--- a/windows/client-management/mdm/policy-csp-admx-devicesetup.md
+++ b/windows/client-management/mdm/policy-csp-admx-devicesetup.md
@@ -173,16 +173,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-digitallocker.md b/windows/client-management/mdm/policy-csp-admx-digitallocker.md
index 08a7dab278..3bd65a3fa2 100644
--- a/windows/client-management/mdm/policy-csp-admx-digitallocker.md
+++ b/windows/client-management/mdm/policy-csp-admx-digitallocker.md
@@ -175,17 +175,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-distributedlinktracking.md b/windows/client-management/mdm/policy-csp-admx-distributedlinktracking.md
index 9be08a64ea..d1e758c1e7 100644
--- a/windows/client-management/mdm/policy-csp-admx-distributedlinktracking.md
+++ b/windows/client-management/mdm/policy-csp-admx-distributedlinktracking.md
@@ -101,17 +101,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-dnsclient.md b/windows/client-management/mdm/policy-csp-admx-dnsclient.md
index 9aba6d0482..9eab8af0c7 100644
--- a/windows/client-management/mdm/policy-csp-admx-dnsclient.md
+++ b/windows/client-management/mdm/policy-csp-admx-dnsclient.md
@@ -1710,16 +1710,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-dwm.md b/windows/client-management/mdm/policy-csp-admx-dwm.md
index 71f9b3638f..faa2117abe 100644
--- a/windows/client-management/mdm/policy-csp-admx-dwm.md
+++ b/windows/client-management/mdm/policy-csp-admx-dwm.md
@@ -476,16 +476,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-eaime.md b/windows/client-management/mdm/policy-csp-admx-eaime.md
index b56ce8c52a..8a85ec79d6 100644
--- a/windows/client-management/mdm/policy-csp-admx-eaime.md
+++ b/windows/client-management/mdm/policy-csp-admx-eaime.md
@@ -956,17 +956,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-encryptfilesonmove.md b/windows/client-management/mdm/policy-csp-admx-encryptfilesonmove.md
index 1dd5a4e6cb..96abbdd6f2 100644
--- a/windows/client-management/mdm/policy-csp-admx-encryptfilesonmove.md
+++ b/windows/client-management/mdm/policy-csp-admx-encryptfilesonmove.md
@@ -101,17 +101,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-enhancedstorage.md b/windows/client-management/mdm/policy-csp-admx-enhancedstorage.md
index 7e217f1364..01df1bdf33 100644
--- a/windows/client-management/mdm/policy-csp-admx-enhancedstorage.md
+++ b/windows/client-management/mdm/policy-csp-admx-enhancedstorage.md
@@ -461,17 +461,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-errorreporting.md b/windows/client-management/mdm/policy-csp-admx-errorreporting.md
index 5f3fc5e33b..3757e328fa 100644
--- a/windows/client-management/mdm/policy-csp-admx-errorreporting.md
+++ b/windows/client-management/mdm/policy-csp-admx-errorreporting.md
@@ -2187,16 +2187,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-eventforwarding.md b/windows/client-management/mdm/policy-csp-admx-eventforwarding.md
index 449bed0b21..f07d3af050 100644
--- a/windows/client-management/mdm/policy-csp-admx-eventforwarding.md
+++ b/windows/client-management/mdm/policy-csp-admx-eventforwarding.md
@@ -185,17 +185,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-eventlog.md b/windows/client-management/mdm/policy-csp-admx-eventlog.md
index ea4b084c38..bdeee9c870 100644
--- a/windows/client-management/mdm/policy-csp-admx-eventlog.md
+++ b/windows/client-management/mdm/policy-csp-admx-eventlog.md
@@ -1573,17 +1573,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-explorer.md b/windows/client-management/mdm/policy-csp-admx-explorer.md
index da74235b97..36140f5eeb 100644
--- a/windows/client-management/mdm/policy-csp-admx-explorer.md
+++ b/windows/client-management/mdm/policy-csp-admx-explorer.md
@@ -386,15 +386,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-filerecovery.md b/windows/client-management/mdm/policy-csp-admx-filerecovery.md
index 124a5759b8..7f2635d2ab 100644
--- a/windows/client-management/mdm/policy-csp-admx-filerecovery.md
+++ b/windows/client-management/mdm/policy-csp-admx-filerecovery.md
@@ -90,7 +90,8 @@ ADMX Info:
-Footnotes:
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-fileservervssprovider.md b/windows/client-management/mdm/policy-csp-admx-fileservervssprovider.md
index a1b52fa8fd..856646d7d1 100644
--- a/windows/client-management/mdm/policy-csp-admx-fileservervssprovider.md
+++ b/windows/client-management/mdm/policy-csp-admx-fileservervssprovider.md
@@ -102,17 +102,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-filesys.md b/windows/client-management/mdm/policy-csp-admx-filesys.md
index 768b9ea68d..b3759a2b16 100644
--- a/windows/client-management/mdm/policy-csp-admx-filesys.md
+++ b/windows/client-management/mdm/policy-csp-admx-filesys.md
@@ -573,17 +573,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-folderredirection.md b/windows/client-management/mdm/policy-csp-admx-folderredirection.md
index c1b7ee3ab0..cfada38cac 100644
--- a/windows/client-management/mdm/policy-csp-admx-folderredirection.md
+++ b/windows/client-management/mdm/policy-csp-admx-folderredirection.md
@@ -555,17 +555,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-globalization.md b/windows/client-management/mdm/policy-csp-admx-globalization.md
index 4a4c00cd36..b37e84f406 100644
--- a/windows/client-management/mdm/policy-csp-admx-globalization.md
+++ b/windows/client-management/mdm/policy-csp-admx-globalization.md
@@ -1882,16 +1882,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-grouppolicy.md b/windows/client-management/mdm/policy-csp-admx-grouppolicy.md
index 1b089bd628..45abf7cdd0 100644
--- a/windows/client-management/mdm/policy-csp-admx-grouppolicy.md
+++ b/windows/client-management/mdm/policy-csp-admx-grouppolicy.md
@@ -3397,15 +3397,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-help.md b/windows/client-management/mdm/policy-csp-admx-help.md
index 3b42429ea9..f1ea850871 100644
--- a/windows/client-management/mdm/policy-csp-admx-help.md
+++ b/windows/client-management/mdm/policy-csp-admx-help.md
@@ -340,17 +340,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-helpandsupport.md b/windows/client-management/mdm/policy-csp-admx-helpandsupport.md
index ca46354852..bd11b4a210 100644
--- a/windows/client-management/mdm/policy-csp-admx-helpandsupport.md
+++ b/windows/client-management/mdm/policy-csp-admx-helpandsupport.md
@@ -316,17 +316,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-icm.md b/windows/client-management/mdm/policy-csp-admx-icm.md
index 63e72f5539..eecfadc85d 100644
--- a/windows/client-management/mdm/policy-csp-admx-icm.md
+++ b/windows/client-management/mdm/policy-csp-admx-icm.md
@@ -1975,17 +1975,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-kdc.md b/windows/client-management/mdm/policy-csp-admx-kdc.md
index ec9b9e660a..76d11f5aa4 100644
--- a/windows/client-management/mdm/policy-csp-admx-kdc.md
+++ b/windows/client-management/mdm/policy-csp-admx-kdc.md
@@ -502,17 +502,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-kerberos.md b/windows/client-management/mdm/policy-csp-admx-kerberos.md
index 7f36359852..0546c527b2 100644
--- a/windows/client-management/mdm/policy-csp-admx-kerberos.md
+++ b/windows/client-management/mdm/policy-csp-admx-kerberos.md
@@ -625,17 +625,7 @@ ADMX Info:
-
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-lanmanserver.md b/windows/client-management/mdm/policy-csp-admx-lanmanserver.md
index 74d7cb2b32..e8d00a28cb 100644
--- a/windows/client-management/mdm/policy-csp-admx-lanmanserver.md
+++ b/windows/client-management/mdm/policy-csp-admx-lanmanserver.md
@@ -366,16 +366,8 @@ ADMX Info:
-Footnotes:
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-lanmanworkstation.md b/windows/client-management/mdm/policy-csp-admx-lanmanworkstation.md
index 96da8caef4..ac60e3f522 100644
--- a/windows/client-management/mdm/policy-csp-admx-lanmanworkstation.md
+++ b/windows/client-management/mdm/policy-csp-admx-lanmanworkstation.md
@@ -270,16 +270,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-linklayertopologydiscovery.md b/windows/client-management/mdm/policy-csp-admx-linklayertopologydiscovery.md
index d8eee0b351..146ad0388c 100644
--- a/windows/client-management/mdm/policy-csp-admx-linklayertopologydiscovery.md
+++ b/windows/client-management/mdm/policy-csp-admx-linklayertopologydiscovery.md
@@ -175,17 +175,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-logon.md b/windows/client-management/mdm/policy-csp-admx-logon.md
index b463924f33..68442eff39 100644
--- a/windows/client-management/mdm/policy-csp-admx-logon.md
+++ b/windows/client-management/mdm/policy-csp-admx-logon.md
@@ -1192,17 +1192,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-microsoftdefenderantivirus.md b/windows/client-management/mdm/policy-csp-admx-microsoftdefenderantivirus.md
index 2b47023734..aa27ba10da 100644
--- a/windows/client-management/mdm/policy-csp-admx-microsoftdefenderantivirus.md
+++ b/windows/client-management/mdm/policy-csp-admx-microsoftdefenderantivirus.md
@@ -6837,17 +6837,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-mmc.md b/windows/client-management/mdm/policy-csp-admx-mmc.md
index dc9f501685..05474b42bb 100644
--- a/windows/client-management/mdm/policy-csp-admx-mmc.md
+++ b/windows/client-management/mdm/policy-csp-admx-mmc.md
@@ -430,17 +430,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-mmcsnapins.md b/windows/client-management/mdm/policy-csp-admx-mmcsnapins.md
index dcbb289b4b..688de0b909 100644
--- a/windows/client-management/mdm/policy-csp-admx-mmcsnapins.md
+++ b/windows/client-management/mdm/policy-csp-admx-mmcsnapins.md
@@ -8435,16 +8435,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-msapolicy.md b/windows/client-management/mdm/policy-csp-admx-msapolicy.md
index 3532d29c56..c94cb373ac 100644
--- a/windows/client-management/mdm/policy-csp-admx-msapolicy.md
+++ b/windows/client-management/mdm/policy-csp-admx-msapolicy.md
@@ -101,17 +101,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-msched.md b/windows/client-management/mdm/policy-csp-admx-msched.md
index c5cb159658..85cdf6f62c 100644
--- a/windows/client-management/mdm/policy-csp-admx-msched.md
+++ b/windows/client-management/mdm/policy-csp-admx-msched.md
@@ -176,17 +176,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-msdt.md b/windows/client-management/mdm/policy-csp-admx-msdt.md
index e6ab53acce..4af5ccff52 100644
--- a/windows/client-management/mdm/policy-csp-admx-msdt.md
+++ b/windows/client-management/mdm/policy-csp-admx-msdt.md
@@ -273,17 +273,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-msi.md b/windows/client-management/mdm/policy-csp-admx-msi.md
index 3e2094f298..b3f1bd2e74 100644
--- a/windows/client-management/mdm/policy-csp-admx-msi.md
+++ b/windows/client-management/mdm/policy-csp-admx-msi.md
@@ -1860,16 +1860,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-nca.md b/windows/client-management/mdm/policy-csp-admx-nca.md
index aaa011b575..da4cff082f 100644
--- a/windows/client-management/mdm/policy-csp-admx-nca.md
+++ b/windows/client-management/mdm/policy-csp-admx-nca.md
@@ -611,17 +611,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-ncsi.md b/windows/client-management/mdm/policy-csp-admx-ncsi.md
index 2dc203705f..7bca9000d2 100644
--- a/windows/client-management/mdm/policy-csp-admx-ncsi.md
+++ b/windows/client-management/mdm/policy-csp-admx-ncsi.md
@@ -506,17 +506,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-netlogon.md b/windows/client-management/mdm/policy-csp-admx-netlogon.md
index 45405c7cc2..76c9223297 100644
--- a/windows/client-management/mdm/policy-csp-admx-netlogon.md
+++ b/windows/client-management/mdm/policy-csp-admx-netlogon.md
@@ -2753,16 +2753,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-networkconnections.md b/windows/client-management/mdm/policy-csp-admx-networkconnections.md
index 7e542154a7..deb0305f18 100644
--- a/windows/client-management/mdm/policy-csp-admx-networkconnections.md
+++ b/windows/client-management/mdm/policy-csp-admx-networkconnections.md
@@ -2185,16 +2185,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-offlinefiles.md b/windows/client-management/mdm/policy-csp-admx-offlinefiles.md
index 27b56e21e6..d9524a1f82 100644
--- a/windows/client-management/mdm/policy-csp-admx-offlinefiles.md
+++ b/windows/client-management/mdm/policy-csp-admx-offlinefiles.md
@@ -3689,17 +3689,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-peertopeercaching.md b/windows/client-management/mdm/policy-csp-admx-peertopeercaching.md
index ed16a33a35..7704597e96 100644
--- a/windows/client-management/mdm/policy-csp-admx-peertopeercaching.md
+++ b/windows/client-management/mdm/policy-csp-admx-peertopeercaching.md
@@ -791,16 +791,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-performancediagnostics.md b/windows/client-management/mdm/policy-csp-admx-performancediagnostics.md
index 0e39a89004..a19a43f761 100644
--- a/windows/client-management/mdm/policy-csp-admx-performancediagnostics.md
+++ b/windows/client-management/mdm/policy-csp-admx-performancediagnostics.md
@@ -347,17 +347,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-power.md b/windows/client-management/mdm/policy-csp-admx-power.md
index 3d1a58a8f1..e7609b69d8 100644
--- a/windows/client-management/mdm/policy-csp-admx-power.md
+++ b/windows/client-management/mdm/policy-csp-admx-power.md
@@ -1867,16 +1867,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-powershellexecutionpolicy.md b/windows/client-management/mdm/policy-csp-admx-powershellexecutionpolicy.md
index 5880faae13..cf73077bc0 100644
--- a/windows/client-management/mdm/policy-csp-admx-powershellexecutionpolicy.md
+++ b/windows/client-management/mdm/policy-csp-admx-powershellexecutionpolicy.md
@@ -337,16 +337,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-printing.md b/windows/client-management/mdm/policy-csp-admx-printing.md
index e97cb3df92..c831b4a527 100644
--- a/windows/client-management/mdm/policy-csp-admx-printing.md
+++ b/windows/client-management/mdm/policy-csp-admx-printing.md
@@ -2013,16 +2013,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-printing2.md b/windows/client-management/mdm/policy-csp-admx-printing2.md
index 8ce369426a..60ed6563a3 100644
--- a/windows/client-management/mdm/policy-csp-admx-printing2.md
+++ b/windows/client-management/mdm/policy-csp-admx-printing2.md
@@ -727,15 +727,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-programs.md b/windows/client-management/mdm/policy-csp-admx-programs.md
index d7e0d1fec9..b325def568 100644
--- a/windows/client-management/mdm/policy-csp-admx-programs.md
+++ b/windows/client-management/mdm/policy-csp-admx-programs.md
@@ -553,17 +553,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-reliability.md b/windows/client-management/mdm/policy-csp-admx-reliability.md
index 398c939856..794b2ccea4 100644
--- a/windows/client-management/mdm/policy-csp-admx-reliability.md
+++ b/windows/client-management/mdm/policy-csp-admx-reliability.md
@@ -346,17 +346,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-remoteassistance.md b/windows/client-management/mdm/policy-csp-admx-remoteassistance.md
index 692487c12d..ee0e87ac83 100644
--- a/windows/client-management/mdm/policy-csp-admx-remoteassistance.md
+++ b/windows/client-management/mdm/policy-csp-admx-remoteassistance.md
@@ -190,17 +190,7 @@ ADMX Info:
-
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are for upcoming release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-removablestorage.md b/windows/client-management/mdm/policy-csp-admx-removablestorage.md
index 6a9c3b8bfa..05f6d8b135 100644
--- a/windows/client-management/mdm/policy-csp-admx-removablestorage.md
+++ b/windows/client-management/mdm/policy-csp-admx-removablestorage.md
@@ -2314,16 +2314,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-rpc.md b/windows/client-management/mdm/policy-csp-admx-rpc.md
index 4c77e82fa2..053d6fda1d 100644
--- a/windows/client-management/mdm/policy-csp-admx-rpc.md
+++ b/windows/client-management/mdm/policy-csp-admx-rpc.md
@@ -375,17 +375,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-scripts.md b/windows/client-management/mdm/policy-csp-admx-scripts.md
index 56b8fa10a1..8019979d43 100644
--- a/windows/client-management/mdm/policy-csp-admx-scripts.md
+++ b/windows/client-management/mdm/policy-csp-admx-scripts.md
@@ -970,17 +970,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-sdiageng.md b/windows/client-management/mdm/policy-csp-admx-sdiageng.md
index dca614dec2..cf6bf9fdf7 100644
--- a/windows/client-management/mdm/policy-csp-admx-sdiageng.md
+++ b/windows/client-management/mdm/policy-csp-admx-sdiageng.md
@@ -245,16 +245,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-securitycenter.md b/windows/client-management/mdm/policy-csp-admx-securitycenter.md
index 7590b70934..4e97164a9e 100644
--- a/windows/client-management/mdm/policy-csp-admx-securitycenter.md
+++ b/windows/client-management/mdm/policy-csp-admx-securitycenter.md
@@ -111,17 +111,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-sensors.md b/windows/client-management/mdm/policy-csp-admx-sensors.md
index 66a0fdf6d6..aa5c26fd6f 100644
--- a/windows/client-management/mdm/policy-csp-admx-sensors.md
+++ b/windows/client-management/mdm/policy-csp-admx-sensors.md
@@ -387,16 +387,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-servicing.md b/windows/client-management/mdm/policy-csp-admx-servicing.md
index af834f2656..6b62a42e86 100644
--- a/windows/client-management/mdm/policy-csp-admx-servicing.md
+++ b/windows/client-management/mdm/policy-csp-admx-servicing.md
@@ -101,17 +101,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-settingsync.md b/windows/client-management/mdm/policy-csp-admx-settingsync.md
index 53ca6431fc..b79d238174 100644
--- a/windows/client-management/mdm/policy-csp-admx-settingsync.md
+++ b/windows/client-management/mdm/policy-csp-admx-settingsync.md
@@ -691,16 +691,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-sharedfolders.md b/windows/client-management/mdm/policy-csp-admx-sharedfolders.md
index a9749a346b..467cab854e 100644
--- a/windows/client-management/mdm/policy-csp-admx-sharedfolders.md
+++ b/windows/client-management/mdm/policy-csp-admx-sharedfolders.md
@@ -177,17 +177,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-sharing.md b/windows/client-management/mdm/policy-csp-admx-sharing.md
index 42e13cdd7d..faccab55d9 100644
--- a/windows/client-management/mdm/policy-csp-admx-sharing.md
+++ b/windows/client-management/mdm/policy-csp-admx-sharing.md
@@ -98,16 +98,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-shellcommandpromptregedittools.md b/windows/client-management/mdm/policy-csp-admx-shellcommandpromptregedittools.md
index 58d1a90759..223fa3819b 100644
--- a/windows/client-management/mdm/policy-csp-admx-shellcommandpromptregedittools.md
+++ b/windows/client-management/mdm/policy-csp-admx-shellcommandpromptregedittools.md
@@ -333,17 +333,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-skydrive.md b/windows/client-management/mdm/policy-csp-admx-skydrive.md
index e42d009528..464845261e 100644
--- a/windows/client-management/mdm/policy-csp-admx-skydrive.md
+++ b/windows/client-management/mdm/policy-csp-admx-skydrive.md
@@ -101,17 +101,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-smartcard.md b/windows/client-management/mdm/policy-csp-admx-smartcard.md
index b75b3b086d..227aeb686b 100644
--- a/windows/client-management/mdm/policy-csp-admx-smartcard.md
+++ b/windows/client-management/mdm/policy-csp-admx-smartcard.md
@@ -1214,17 +1214,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-snmp.md b/windows/client-management/mdm/policy-csp-admx-snmp.md
index 8b1a15bdca..9e6698333d 100644
--- a/windows/client-management/mdm/policy-csp-admx-snmp.md
+++ b/windows/client-management/mdm/policy-csp-admx-snmp.md
@@ -275,17 +275,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-startmenu.md b/windows/client-management/mdm/policy-csp-admx-startmenu.md
index 2c16014c48..43eb801c4d 100644
--- a/windows/client-management/mdm/policy-csp-admx-startmenu.md
+++ b/windows/client-management/mdm/policy-csp-admx-startmenu.md
@@ -4996,16 +4996,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-systemrestore.md b/windows/client-management/mdm/policy-csp-admx-systemrestore.md
index 70b84425c0..d636e16649 100644
--- a/windows/client-management/mdm/policy-csp-admx-systemrestore.md
+++ b/windows/client-management/mdm/policy-csp-admx-systemrestore.md
@@ -105,17 +105,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-taskbar.md b/windows/client-management/mdm/policy-csp-admx-taskbar.md
index bff61dc5f1..4237d69e83 100644
--- a/windows/client-management/mdm/policy-csp-admx-taskbar.md
+++ b/windows/client-management/mdm/policy-csp-admx-taskbar.md
@@ -1648,17 +1648,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-tcpip.md b/windows/client-management/mdm/policy-csp-admx-tcpip.md
index 3cd6999994..c4ebc56f82 100644
--- a/windows/client-management/mdm/policy-csp-admx-tcpip.md
+++ b/windows/client-management/mdm/policy-csp-admx-tcpip.md
@@ -996,17 +996,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-thumbnails.md b/windows/client-management/mdm/policy-csp-admx-thumbnails.md
index 73f6ca56cd..d21e77ad3c 100644
--- a/windows/client-management/mdm/policy-csp-admx-thumbnails.md
+++ b/windows/client-management/mdm/policy-csp-admx-thumbnails.md
@@ -248,18 +248,8 @@ ADMX Info:
-
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-tpm.md b/windows/client-management/mdm/policy-csp-admx-tpm.md
index d12a0686f7..a428786a24 100644
--- a/windows/client-management/mdm/policy-csp-admx-tpm.md
+++ b/windows/client-management/mdm/policy-csp-admx-tpm.md
@@ -788,17 +788,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md b/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md
index 7f23f18d6f..54ba484366 100644
--- a/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md
+++ b/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md
@@ -9461,17 +9461,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
-
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-userprofiles.md b/windows/client-management/mdm/policy-csp-admx-userprofiles.md
index dcc45e4c5e..2382a9fb8e 100644
--- a/windows/client-management/mdm/policy-csp-admx-userprofiles.md
+++ b/windows/client-management/mdm/policy-csp-admx-userprofiles.md
@@ -641,15 +641,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-w32time.md b/windows/client-management/mdm/policy-csp-admx-w32time.md
index 37697fb185..7a60fbadde 100644
--- a/windows/client-management/mdm/policy-csp-admx-w32time.md
+++ b/windows/client-management/mdm/policy-csp-admx-w32time.md
@@ -414,17 +414,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-wcm.md b/windows/client-management/mdm/policy-csp-admx-wcm.md
index 0c5ea22e12..85f0ad3341 100644
--- a/windows/client-management/mdm/policy-csp-admx-wcm.md
+++ b/windows/client-management/mdm/policy-csp-admx-wcm.md
@@ -257,17 +257,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-wincal.md b/windows/client-management/mdm/policy-csp-admx-wincal.md
index 399309047c..de5d9fde63 100644
--- a/windows/client-management/mdm/policy-csp-admx-wincal.md
+++ b/windows/client-management/mdm/policy-csp-admx-wincal.md
@@ -177,17 +177,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsanytimeupgrade.md b/windows/client-management/mdm/policy-csp-admx-windowsanytimeupgrade.md
index efff151d08..5902416124 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsanytimeupgrade.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsanytimeupgrade.md
@@ -100,16 +100,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md b/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md
index 086405efd2..d65677d585 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md
@@ -249,17 +249,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsexplorer.md b/windows/client-management/mdm/policy-csp-admx-windowsexplorer.md
index 004f66dae4..234f5f9d6c 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsexplorer.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsexplorer.md
@@ -5353,16 +5353,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsfileprotection.md b/windows/client-management/mdm/policy-csp-admx-windowsfileprotection.md
index 610f1840b9..66662cba51 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsfileprotection.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsfileprotection.md
@@ -342,16 +342,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsmediadrm.md b/windows/client-management/mdm/policy-csp-admx-windowsmediadrm.md
index 66570c3061..301c276ef2 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsmediadrm.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsmediadrm.md
@@ -101,17 +101,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md b/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md
index f0273482cf..86aa3334d8 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md
@@ -1599,17 +1599,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsremotemanagement.md b/windows/client-management/mdm/policy-csp-admx-windowsremotemanagement.md
index dc7bcf1f15..89752639b2 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsremotemanagement.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsremotemanagement.md
@@ -170,16 +170,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsstore.md b/windows/client-management/mdm/policy-csp-admx-windowsstore.md
index cec2e2bd4f..ce460a7d15 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsstore.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsstore.md
@@ -395,15 +395,6 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-wininit.md b/windows/client-management/mdm/policy-csp-admx-wininit.md
index 93d25c2f1e..29981fc6c6 100644
--- a/windows/client-management/mdm/policy-csp-admx-wininit.md
+++ b/windows/client-management/mdm/policy-csp-admx-wininit.md
@@ -243,17 +243,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-winlogon.md b/windows/client-management/mdm/policy-csp-admx-winlogon.md
index f1998bb579..1867096ce5 100644
--- a/windows/client-management/mdm/policy-csp-admx-winlogon.md
+++ b/windows/client-management/mdm/policy-csp-admx-winlogon.md
@@ -479,16 +479,7 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-admx-winsrv.md b/windows/client-management/mdm/policy-csp-admx-winsrv.md
index ac5a01bce6..afef9cf403 100644
--- a/windows/client-management/mdm/policy-csp-admx-winsrv.md
+++ b/windows/client-management/mdm/policy-csp-admx-winsrv.md
@@ -103,17 +103,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-wlansvc.md b/windows/client-management/mdm/policy-csp-admx-wlansvc.md
index c66f4a6598..8dc6686b17 100644
--- a/windows/client-management/mdm/policy-csp-admx-wlansvc.md
+++ b/windows/client-management/mdm/policy-csp-admx-wlansvc.md
@@ -245,17 +245,8 @@ ADMX Info:
-Footnotes:
-
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
diff --git a/windows/client-management/mdm/policy-csp-admx-wpn.md b/windows/client-management/mdm/policy-csp-admx-wpn.md
index 7e7e4ee561..99ac55e97e 100644
--- a/windows/client-management/mdm/policy-csp-admx-wpn.md
+++ b/windows/client-management/mdm/policy-csp-admx-wpn.md
@@ -475,16 +475,9 @@ ADMX Info:
-Footnotes:
+> [!NOTE]
+> These policies are currently only available as part of a Windows Insider release.
+
-- 1 - Available in Windows 10, version 1607
-- 2 - Available in Windows 10, version 1703
-- 3 - Available in Windows 10, version 1709
-- 4 - Available in Windows 10, version 1803
-- 5 - Available in Windows 10, version 1809
-- 6 - Available in Windows 10, version 1903
-- 7 - Available in Windows 10, version 1909
-- 8 - Available in Windows 10, version 2004
-- 9 - Available in Windows 10, version 20H2
\ No newline at end of file
diff --git a/windows/client-management/mdm/policy-csp-applicationmanagement.md b/windows/client-management/mdm/policy-csp-applicationmanagement.md
index 1f128f9b64..9bbbdcc162 100644
--- a/windows/client-management/mdm/policy-csp-applicationmanagement.md
+++ b/windows/client-management/mdm/policy-csp-applicationmanagement.md
@@ -390,7 +390,7 @@ The following list shows the supported values:
-[!INCLUDE [allow-windows-app-to-share-data-users-shortdesc](../../../browsers/edge/shortdesc/allow-windows-app-to-share-data-users-shortdesc.md)]
+[!INCLUDE [allow-windows-app-to-share-data-users-shortdesc](../includes/allow-windows-app-to-share-data-users-shortdesc.md)]
diff --git a/windows/client-management/mdm/policy-csp-authentication.md b/windows/client-management/mdm/policy-csp-authentication.md
index 51f56ffbbb..d62b5b232d 100644
--- a/windows/client-management/mdm/policy-csp-authentication.md
+++ b/windows/client-management/mdm/policy-csp-authentication.md
@@ -7,8 +7,7 @@ ms.prod: w10
ms.technology: windows
author: manikadhiman
ms.localizationpriority: medium
-ms.date: 09/27/2019
-ms.reviewer:
+ms.reviewer: bobgil
manager: dansimp
---
@@ -37,6 +36,9 @@ manager: dansimp
Authentication/AllowSecondaryAuthenticationDevice
+
+ Authentication/ConfigureWebSignInAllowedUrls
+
Authentication/EnableFastFirstSignIn
@@ -359,6 +361,68 @@ The following list shows the supported values:
+
+**Authentication/ConfigureWebSignInAllowedUrls**
+
+
+
+
+ | Windows Edition |
+ Supported? |
+
+
+ | Home |
+ |
+
+
+ | Pro |
+ 4 |
+
+
+ | Business |
+ 4 |
+
+
+ | Enterprise |
+ 4 |
+
+
+ | Education |
+ 4 |
+
+
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Available in Windows 10, version 1803. Specifies the list of domains that are allowed to be navigated to in AAD PIN reset and Web Sign-in Windows device scenarios where authentication is handled by AD FS or a third-party federated identity provider. Note this policy is required in federated environments as a mitigation to the vulnerability described in [CVE-2021-27092](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-27092).
+
+**Example**: If your organization's PIN reset or Web Sign-in authentication flow is expected to navigate to two domains, accounts.contoso.com and signin.contoso.com, the policy value should be "accounts.contoso.com;signin.contoso.com".
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
**Authentication/EnableFastFirstSignIn**
@@ -579,4 +643,3 @@ Footnotes:
- 8 - Available in Windows 10, version 2004.
-
diff --git a/windows/client-management/mdm/policy-csp-browser.md b/windows/client-management/mdm/policy-csp-browser.md
index 8f0000728f..ca1ff0bcbb 100644
--- a/windows/client-management/mdm/policy-csp-browser.md
+++ b/windows/client-management/mdm/policy-csp-browser.md
@@ -242,7 +242,7 @@ ms.localizationpriority: medium
>*Supported versions: Microsoft Edge on Windows 10, version 1703*
-[!INCLUDE [allow-address-bar-drop-down-shortdesc](../../../browsers/edge/shortdesc/allow-address-bar-drop-down-shortdesc.md)]
+[!INCLUDE [allow-address-bar-drop-down-shortdesc](../includes/allow-address-bar-drop-down-shortdesc.md)]
@@ -312,7 +312,7 @@ Most restricted value: 0
-[!INCLUDE [configure-autofill-shortdesc](../../../browsers/edge/shortdesc/configure-autofill-shortdesc.md)]
+[!INCLUDE [configure-autofill-shortdesc](../includes/configure-autofill-shortdesc.md)]
@@ -391,7 +391,7 @@ To verify AllowAutofill is set to 0 (not allowed):
-[!INCLUDE [allow-configuration-updates-for-books-library-shortdesc](../../../browsers/edge/shortdesc/allow-configuration-updates-for-books-library-shortdesc.md)]
+[!INCLUDE [allow-configuration-updates-for-books-library-shortdesc](../includes/allow-configuration-updates-for-books-library-shortdesc.md)]
@@ -459,7 +459,7 @@ Supported values:
-[!INCLUDE [configure-cookies-shortdesc](../../../browsers/edge/shortdesc/configure-cookies-shortdesc.md)]
+[!INCLUDE [configure-cookies-shortdesc](../includes/configure-cookies-shortdesc.md)]
@@ -541,7 +541,7 @@ To verify AllowCookies is set to 0 (not allowed):
> [!NOTE]
> This policy is only enforced in Windows 10 for desktop and not supported in Windows 10 Mobile.
-[!INCLUDE [allow-developer-tools-shortdesc](../../../browsers/edge/shortdesc/allow-developer-tools-shortdesc.md)]
+[!INCLUDE [allow-developer-tools-shortdesc](../includes/allow-developer-tools-shortdesc.md)]
@@ -609,7 +609,7 @@ Most restricted value: 0
-[!INCLUDE [configure-do-not-track-shortdesc](../../../browsers/edge/shortdesc/configure-do-not-track-shortdesc.md)]
+[!INCLUDE [configure-do-not-track-shortdesc](../includes/configure-do-not-track-shortdesc.md)]
@@ -689,7 +689,7 @@ To verify AllowDoNotTrack is set to 0 (not allowed):
>*Supported versions: Microsoft Edge on Windows 10, version 1607*
-[!INCLUDE [allow-extensions-shortdesc](../../../browsers/edge/shortdesc/allow-extensions-shortdesc.md)]
+[!INCLUDE [allow-extensions-shortdesc](../includes/allow-extensions-shortdesc.md)]
@@ -758,7 +758,7 @@ Supported values:
-[!INCLUDE [allow-adobe-flash-shortdesc](../../../browsers/edge/shortdesc/allow-adobe-flash-shortdesc.md)]
+[!INCLUDE [allow-adobe-flash-shortdesc](../includes/allow-adobe-flash-shortdesc.md)]
@@ -828,7 +828,7 @@ Supported values:
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [configure-adobe-flash-click-to-run-setting-shortdesc](../../../browsers/edge/shortdesc/configure-adobe-flash-click-to-run-setting-shortdesc.md)]
+[!INCLUDE [configure-adobe-flash-click-to-run-setting-shortdesc](../includes/configure-adobe-flash-click-to-run-setting-shortdesc.md)]
@@ -899,7 +899,7 @@ Most restricted value: 1
-[!INCLUDE [allow-fullscreen-mode-shortdesc](../../../browsers/edge/shortdesc/allow-fullscreen-mode-shortdesc.md)]
+[!INCLUDE [allow-fullscreen-mode-shortdesc](../includes/allow-fullscreen-mode-shortdesc.md)]
@@ -974,7 +974,7 @@ Most restricted value: 0
-[!INCLUDE [allow-inprivate-browsing-shortdesc](../../../browsers/edge/shortdesc/allow-inprivate-browsing-shortdesc.md)]
+[!INCLUDE [allow-inprivate-browsing-shortdesc](../includes/allow-inprivate-browsing-shortdesc.md)]
@@ -1046,7 +1046,7 @@ Most restricted value: 0
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [allow-microsoft-compatibility-list-shortdesc](../../../browsers/edge/shortdesc/allow-microsoft-compatibility-list-shortdesc.md)]
+[!INCLUDE [allow-microsoft-compatibility-list-shortdesc](../includes/allow-microsoft-compatibility-list-shortdesc.md)]
@@ -1116,7 +1116,7 @@ Most restricted value: 0
-[!INCLUDE [configure-password-manager-shortdesc](../../../browsers/edge/shortdesc/configure-password-manager-shortdesc.md)]
+[!INCLUDE [configure-password-manager-shortdesc](../includes/configure-password-manager-shortdesc.md)]
@@ -1195,7 +1195,7 @@ To verify AllowPasswordManager is set to 0 (not allowed):
-[!INCLUDE [configure-pop-up-blocker-shortdesc](../../../browsers/edge/shortdesc/configure-pop-up-blocker-shortdesc.md)]
+[!INCLUDE [configure-pop-up-blocker-shortdesc](../includes/configure-pop-up-blocker-shortdesc.md)]
@@ -1275,7 +1275,7 @@ To verify AllowPopups is set to 0 (not allowed):
-[!INCLUDE [allow-prelaunch-shortdesc](../../../browsers/edge/shortdesc/allow-prelaunch-shortdesc.md)]
+[!INCLUDE [allow-prelaunch-shortdesc](../includes/allow-prelaunch-shortdesc.md)]
@@ -1352,7 +1352,7 @@ Most restricted value: 0
-[!INCLUDE [allow-printing-shortdesc](../../../browsers/edge/shortdesc/allow-printing-shortdesc.md)]
+[!INCLUDE [allow-printing-shortdesc](../includes/allow-printing-shortdesc.md)]
@@ -1429,7 +1429,7 @@ Most restricted value: 0
-[!INCLUDE [allow-saving-history-shortdesc](../../../browsers/edge/shortdesc/allow-saving-history-shortdesc.md)]
+[!INCLUDE [allow-saving-history-shortdesc](../includes/allow-saving-history-shortdesc.md)]
@@ -1508,7 +1508,7 @@ Most restricted value: 0
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [allow-search-engine-customization-shortdesc](../../../browsers/edge/shortdesc/allow-search-engine-customization-shortdesc.md)]
+[!INCLUDE [allow-search-engine-customization-shortdesc](../includes/allow-search-engine-customization-shortdesc.md)]
@@ -1579,7 +1579,7 @@ Most restricted value: 0
-[!INCLUDE [configure-search-suggestions-in-address-bar-shortdesc](../../../browsers/edge/shortdesc/configure-search-suggestions-in-address-bar-shortdesc.md)]
+[!INCLUDE [configure-search-suggestions-in-address-bar-shortdesc](../includes/configure-search-suggestions-in-address-bar-shortdesc.md)]
@@ -1651,7 +1651,7 @@ Most restricted value: 0
-[!INCLUDE [allow-sideloading-of-extensions-shortdesc](../../../browsers/edge/shortdesc/allow-sideloading-of-extensions-shortdesc.md)]
+[!INCLUDE [allow-sideloading-of-extensions-shortdesc](../includes/allow-sideloading-of-extensions-shortdesc.md)]
@@ -1726,7 +1726,7 @@ Most restricted value: 0
-[!INCLUDE [configure-windows-defender-smartscreen-shortdesc](../../../browsers/edge/shortdesc/configure-windows-defender-smartscreen-shortdesc.md)]
+[!INCLUDE [configure-windows-defender-smartscreen-shortdesc](../includes/configure-windows-defender-smartscreen-shortdesc.md)]
@@ -1805,7 +1805,7 @@ To verify AllowSmartScreen is set to 0 (not allowed):
-[!INCLUDE [allow-tab-preloading-shortdesc](../../../browsers/edge/shortdesc/allow-tab-preloading-shortdesc.md)]
+[!INCLUDE [allow-tab-preloading-shortdesc](../includes/allow-tab-preloading-shortdesc.md)]
@@ -1881,7 +1881,7 @@ Most restricted value: 1
-[!INCLUDE [allow-web-content-on-new-tab-page-shortdesc](../../../browsers/edge/shortdesc/allow-web-content-on-new-tab-page-shortdesc.md)]
+[!INCLUDE [allow-web-content-on-new-tab-page-shortdesc](../includes/allow-web-content-on-new-tab-page-shortdesc.md)]
@@ -1956,7 +1956,7 @@ Supported values:
-[!INCLUDE [always-show-books-library-shortdesc](../../../browsers/edge/shortdesc/always-show-books-library-shortdesc.md)]
+[!INCLUDE [always-show-books-library-shortdesc](../includes/always-show-books-library-shortdesc.md)]
@@ -2029,7 +2029,7 @@ Most restricted value: 0
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [allow-clearing-browsing-data-on-exit-shortdesc](../../../browsers/edge/shortdesc/allow-clearing-browsing-data-on-exit-shortdesc.md)]
+[!INCLUDE [allow-clearing-browsing-data-on-exit-shortdesc](../includes/allow-clearing-browsing-data-on-exit-shortdesc.md)]
@@ -2109,7 +2109,7 @@ To verify that browsing data is cleared on exit (ClearBrowsingDataOnExit is set
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [configure-additional-search-engines-shortdesc](../../../browsers/edge/shortdesc/configure-additional-search-engines-shortdesc.md)]
+[!INCLUDE [configure-additional-search-engines-shortdesc](../includes/configure-additional-search-engines-shortdesc.md)]
> [!IMPORTANT]
> Due to Protected Settings (aka.ms/browserpolicy), this setting applies only on domain-joined machines or when the device is MDM-enrolled.
@@ -2184,7 +2184,7 @@ Most restricted value: 0
-[!INCLUDE [configure-favorites-bar-shortdesc](../../../browsers/edge/shortdesc/configure-favorites-bar-shortdesc.md)]
+[!INCLUDE [configure-favorites-bar-shortdesc](../includes/configure-favorites-bar-shortdesc.md)]
@@ -2260,7 +2260,7 @@ Supported values:
-[!INCLUDE [configure-home-button-shortdesc](../../../browsers/edge/shortdesc/configure-home-button-shortdesc.md)]
+[!INCLUDE [configure-home-button-shortdesc](../includes/configure-home-button-shortdesc.md)]
@@ -2341,7 +2341,7 @@ Supported values:
-[!INCLUDE [configure-kiosk-mode-shortdesc](../../../browsers/edge/shortdesc/configure-kiosk-mode-shortdesc.md)]
+[!INCLUDE [configure-kiosk-mode-shortdesc](../includes/configure-kiosk-mode-shortdesc.md)]
For this policy to work, you must configure Microsoft Edge in assigned access; otherwise, Microsoft Edge ignores the settings in this policy. To learn more about assigned access and kiosk configuration, see [Configure kiosk and shared devices running Windows desktop editions](/windows/configuration/kiosk-shared-pc).
@@ -2426,7 +2426,7 @@ Supported values:
-[!INCLUDE [configure-kiosk-reset-after-idle-timeout-shortdesc](../../../browsers/edge/shortdesc/configure-kiosk-reset-after-idle-timeout-shortdesc.md)]
+[!INCLUDE [configure-kiosk-reset-after-idle-timeout-shortdesc](../includes/configure-kiosk-reset-after-idle-timeout-shortdesc.md)]
You must set ConfigureKioskMode to enabled (1 - InPrivate public browsing) and configure Microsoft Edge as a single-app in assigned access for this policy to take effect; otherwise, Microsoft Edge ignores this setting. To learn more about assigned access and kiosk configuration, see [Configure kiosk and shared devices running Windows desktop editions](/windows/configuration/kiosk-shared-pc).
@@ -2504,7 +2504,7 @@ Supported values:
-[!INCLUDE [configure-open-microsoft-edge-with-shortdesc](../../../browsers/edge/shortdesc/configure-open-microsoft-edge-with-shortdesc.md)]
+[!INCLUDE [configure-open-microsoft-edge-with-shortdesc](../includes/configure-open-microsoft-edge-with-shortdesc.md)]
**Version 1703 or later**:
If you don't want to send traffic to Microsoft, use the \ value, which honors both domain and non domain-joined devices when it's the only configured URL.
@@ -2593,7 +2593,7 @@ Supported values:
-[!INCLUDE [configure-browser-telemetry-for-m365-analytics-shortdesc](../../../browsers/edge/shortdesc/configure-browser-telemetry-for-m365-analytics-shortdesc.md)]
+[!INCLUDE [configure-browser-telemetry-for-m365-analytics-shortdesc](../includes/configure-browser-telemetry-for-m365-analytics-shortdesc.md)]
@@ -2672,7 +2672,7 @@ Most restricted value: 0
>*Supported versions: Microsoft Edge on Windows 10*
-[!INCLUDE [disable-lockdown-of-start-pages-shortdesc](../../../browsers/edge/shortdesc/disable-lockdown-of-start-pages-shortdesc.md)]
+[!INCLUDE [disable-lockdown-of-start-pages-shortdesc](../includes/disable-lockdown-of-start-pages-shortdesc.md)]
> [!NOTE]
> This policy has no effect when the Browser/HomePages policy is not configured.
@@ -2747,7 +2747,7 @@ Most restricted value: 0
-[!INCLUDE [allow-extended-telemetry-for-books-tab-shortdesc](../../../browsers/edge/shortdesc/allow-extended-telemetry-for-books-tab-shortdesc.md)]
+[!INCLUDE [allow-extended-telemetry-for-books-tab-shortdesc](../includes/allow-extended-telemetry-for-books-tab-shortdesc.md)]
@@ -2816,7 +2816,7 @@ Most restricted value: 0
-[!INCLUDE [configure-enterprise-mode-site-list-shortdesc](../../../browsers/edge/shortdesc/configure-enterprise-mode-site-list-shortdesc.md)]
+[!INCLUDE [configure-enterprise-mode-site-list-shortdesc](../includes/configure-enterprise-mode-site-list-shortdesc.md)]
> [!NOTE]
> This policy is only enforced in Windows 10 for desktop and not supported in Windows 10 Mobile.
@@ -2947,7 +2947,7 @@ Supported values:
> This policy is only available for Windows 10 for desktop and not supported in Windows 10 Mobile.
-[!INCLUDE [configure-start-pages-shortdesc](../../../browsers/edge/shortdesc/configure-start-pages-shortdesc.md)]
+[!INCLUDE [configure-start-pages-shortdesc](../includes/configure-start-pages-shortdesc.md)]
**Version 1607**
Starting with this version, the HomePages policy enforces that users cannot change the Start pages settings.
@@ -3030,7 +3030,7 @@ Supported values:
>*Supported versions: Microsoft Edge on Windows 10, version 1709*
-[!INCLUDE [prevent-changes-to-favorites-shortdesc](../../../browsers/edge/shortdesc/prevent-changes-to-favorites-shortdesc.md)]
+[!INCLUDE [prevent-changes-to-favorites-shortdesc](../includes/prevent-changes-to-favorites-shortdesc.md)]
@@ -3100,7 +3100,7 @@ Most restricted value: 1
-[!INCLUDE [prevent-access-to-about-flags-page-shortdesc](../../../browsers/edge/shortdesc/prevent-access-to-about-flags-page-shortdesc.md)]
+[!INCLUDE [prevent-access-to-about-flags-page-shortdesc](../includes/prevent-access-to-about-flags-page-shortdesc.md)]
@@ -3169,7 +3169,7 @@ Most restricted value: 1
-[!INCLUDE [prevent-certificate-error-overrides-shortdesc](../../../browsers/edge/shortdesc/prevent-certificate-error-overrides-shortdesc.md)]
+[!INCLUDE [prevent-certificate-error-overrides-shortdesc](../includes/prevent-certificate-error-overrides-shortdesc.md)]
@@ -3245,7 +3245,7 @@ Most restricted value: 1
>*Supported versions: Microsoft Edge on Windows 10, version 1703*
-[!INCLUDE [prevent-first-run-webpage-from-opening-shortdesc](../../../browsers/edge/shortdesc/prevent-first-run-webpage-from-opening-shortdesc.md)]
+[!INCLUDE [prevent-first-run-webpage-from-opening-shortdesc](../includes/prevent-first-run-webpage-from-opening-shortdesc.md)]
@@ -3315,7 +3315,7 @@ Most restricted value: 1
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [prevent-edge-from-gathering-live-tile-info-shortdesc](../../../browsers/edge/shortdesc/prevent-edge-from-gathering-live-tile-info-shortdesc.md)]
+[!INCLUDE [prevent-edge-from-gathering-live-tile-info-shortdesc](../includes/prevent-edge-from-gathering-live-tile-info-shortdesc.md)]
@@ -3383,7 +3383,7 @@ Most restricted value: 1
-[!INCLUDE [prevent-bypassing-windows-defender-prompts-for-sites-shortdesc](../../../browsers/edge/shortdesc/prevent-bypassing-windows-defender-prompts-for-sites-shortdesc.md)]
+[!INCLUDE [prevent-bypassing-windows-defender-prompts-for-sites-shortdesc](../includes/prevent-bypassing-windows-defender-prompts-for-sites-shortdesc.md)]
@@ -3452,7 +3452,7 @@ Most restricted value: 1
-[!INCLUDE [prevent-bypassing-windows-defender-prompts-for-files-shortdesc](../../../browsers/edge/shortdesc/prevent-bypassing-windows-defender-prompts-for-files-shortdesc.md)]
+[!INCLUDE [prevent-bypassing-windows-defender-prompts-for-files-shortdesc](../includes/prevent-bypassing-windows-defender-prompts-for-files-shortdesc.md)]
@@ -3520,7 +3520,7 @@ Most restricted value: 1
-[!INCLUDE [prevent-turning-off-required-extensions-shortdesc](../../../browsers/edge/shortdesc/prevent-turning-off-required-extensions-shortdesc.md)]
+[!INCLUDE [prevent-turning-off-required-extensions-shortdesc](../includes/prevent-turning-off-required-extensions-shortdesc.md)]
@@ -3598,7 +3598,7 @@ Supported values:
> [!NOTE]
> This policy is only enforced in Windows 10 for desktop and not supported in Windows 10 Mobile.
-[!INCLUDE [prevent-using-localhost-ip-address-for-webrtc-shortdesc](../../../browsers/edge/shortdesc/prevent-using-localhost-ip-address-for-webrtc-shortdesc.md)]
+[!INCLUDE [prevent-using-localhost-ip-address-for-webrtc-shortdesc](../includes/prevent-using-localhost-ip-address-for-webrtc-shortdesc.md)]
@@ -3668,7 +3668,7 @@ Most restricted value: 1
>*Supported versions: Microsoft Edge on Windows 10, version 1709 or later*
-[!INCLUDE [provision-favorites-shortdesc](../../../browsers/edge/shortdesc/provision-favorites-shortdesc.md)]
+[!INCLUDE [provision-favorites-shortdesc](../includes/provision-favorites-shortdesc.md)]
Define a default list of favorites in Microsoft Edge. In this case, the Save a Favorite, Import settings, and context menu options (such as Create a new folder) are turned off.
@@ -3745,7 +3745,7 @@ ADMX Info:
-[!INCLUDE [send-all-intranet-sites-to-ie-shortdesc](../../../browsers/edge/shortdesc/send-all-intranet-sites-to-ie-shortdesc.md)]
+[!INCLUDE [send-all-intranet-sites-to-ie-shortdesc](../includes/send-all-intranet-sites-to-ie-shortdesc.md)]
> [!NOTE]
> This policy is only enforced in Windows 10 for desktop and not supported in Windows 10 Mobile.
@@ -3820,7 +3820,7 @@ Most restricted value: 0
>*Supported versions: Microsoft Edge on Windows 10, version 1703*
-[!INCLUDE [set-default-search-engine-shortdesc](../../../browsers/edge/shortdesc/set-default-search-engine-shortdesc.md)]
+[!INCLUDE [set-default-search-engine-shortdesc](../includes/set-default-search-engine-shortdesc.md)]
> [!IMPORTANT]
> This setting can be used only with domain-joined or MDM-enrolled devices. For more information, see the [Microsoft browser extension policy](/legal/windows/agreements/microsoft-browser-extension-policy).
@@ -3897,7 +3897,7 @@ Most restricted value: 1
-[!INCLUDE [set-home-button-url-shortdesc](../../../browsers/edge/shortdesc/set-home-button-url-shortdesc.md)]
+[!INCLUDE [set-home-button-url-shortdesc](../includes/set-home-button-url-shortdesc.md)]
@@ -3972,7 +3972,7 @@ Supported values:
-[!INCLUDE [set-new-tab-url-shortdesc](../../../browsers/edge/shortdesc/set-new-tab-url-shortdesc.md)]
+[!INCLUDE [set-new-tab-url-shortdesc](../includes/set-new-tab-url-shortdesc.md)]
@@ -4045,7 +4045,7 @@ Supported values:
-[!INCLUDE [show-message-when-opening-sites-in-ie-shortdesc](../../../browsers/edge/shortdesc/show-message-when-opening-sites-in-ie-shortdesc.md)]
+[!INCLUDE [show-message-when-opening-sites-in-ie-shortdesc](../includes/show-message-when-opening-sites-in-ie-shortdesc.md)]
> [!NOTE]
@@ -4189,7 +4189,7 @@ Supported values:
>*Supported versions: Microsoft Edge on Windows 10, version 1703 or later*
-[!INCLUDE [keep-favorites-in-sync-between-ie-and-edge-shortdesc](../../../browsers/edge/shortdesc/keep-favorites-in-sync-between-ie-and-edge-shortdesc.md)]
+[!INCLUDE [keep-favorites-in-sync-between-ie-and-edge-shortdesc](../includes/keep-favorites-in-sync-between-ie-and-edge-shortdesc.md)]
> [!NOTE]
> This policy is only enforced in Windows 10 for desktop and not supported in Windows 10 Mobile.
@@ -4271,7 +4271,7 @@ To verify that favorites are in synchronized between Internet Explorer and Micro
-[!INCLUDE [unlock-home-button-shortdesc](../../../browsers/edge/shortdesc/unlock-home-button-shortdesc.md)]
+[!INCLUDE [unlock-home-button-shortdesc](../includes/unlock-home-button-shortdesc.md)]
@@ -4345,7 +4345,7 @@ Supported values:
-[!INCLUDE [allow-a-shared-books-folder-shortdesc](../../../browsers/edge/shortdesc/allow-a-shared-books-folder-shortdesc.md)]
+[!INCLUDE [allow-a-shared-books-folder-shortdesc](../includes/allow-a-shared-books-folder-shortdesc.md)]
@@ -4378,4 +4378,4 @@ Footnotes:
- 7 - Available in Windows 10, version 1909.
- 8 - Available in Windows 10, version 2004.
-
\ No newline at end of file
+
diff --git a/windows/client-management/mdm/policy-csp-defender.md b/windows/client-management/mdm/policy-csp-defender.md
index 8f9ad402e3..f70dd9c0e5 100644
--- a/windows/client-management/mdm/policy-csp-defender.md
+++ b/windows/client-management/mdm/policy-csp-defender.md
@@ -2314,7 +2314,7 @@ ADMX Info:
Added in Windows 10, version 1607. Specifies the level of detection for potentially unwanted applications (PUAs). Windows Defender alerts you when potentially unwanted software is being downloaded or attempts to install itself on your computer.
> [!NOTE]
-> Potentially unwanted applications (PUA) are a category of software that can cause your machine to run slowly, display unexpected ads, or at worst, install other software which might be unexpected or unwanted. By default in Windows 10 (version 2004 and later), Microsoft Defender Antivirus blocks apps that are considered PUA, for Enterprise (E5) devices. For more information about PUA, see [Detect and block potentially unwanted applications](/windows/security/threat-protection/microsoft-defender-antivirus/detect-block-potentially-unwanted-apps-microsoft-defender-antivirus).
+> Potentially unwanted applications (PUA) are a category of software that can cause your machine to run slowly, display unexpected ads, or at worst, install other software which might be unexpected or unwanted. By default in Windows 10 (version 2004 and later), Microsoft Defender Antivirus blocks apps that are considered PUA, for Enterprise (E5) devices. For more information about PUA, see [Detect and block potentially unwanted applications](/microsoft-365/security/defender-endpoint/detect-block-potentially-unwanted-apps-microsoft-defender-antivirus).
diff --git a/windows/client-management/mdm/policy-csp-enterprisecloudprint.md b/windows/client-management/mdm/policy-csp-enterprisecloudprint.md
index e9d1cb8436..af07ab44cf 100644
--- a/windows/client-management/mdm/policy-csp-enterprisecloudprint.md
+++ b/windows/client-management/mdm/policy-csp-enterprisecloudprint.md
@@ -313,8 +313,6 @@ Added in Windows 10, version 1703. Defines the maximum number of printers that s
The datatype is an integer.
-For Windows Mobile, the default value is 20.
-
diff --git a/windows/client-management/mdm/policy-csp-experience.md b/windows/client-management/mdm/policy-csp-experience.md
index 4cf594449d..b8ebc176d0 100644
--- a/windows/client-management/mdm/policy-csp-experience.md
+++ b/windows/client-management/mdm/policy-csp-experience.md
@@ -37,6 +37,9 @@ manager: dansimp
Experience/AllowManualMDMUnenrollment
+
+ Experience/AllowNewsAndInterestsOnTheTaskbar
+
Experience/AllowSaveAsOfOfficeFiles
@@ -73,6 +76,9 @@ manager: dansimp
Experience/ConfigureWindowsSpotlightOnLockScreen
+
+ Experience/ConfigureChatIcon
+
Experience/DisableCloudOptimizedContent
@@ -436,6 +442,65 @@ The following list shows the supported values:
+
+
+**Experience/AllowNewsAndInterestsOnTheTaskbar**
+
+
+
+
+ | Windows Edition |
+ Supported? |
+
+
+ | Home |
+ |
+
+
+ | Pro |
+ |
+
+
+ | Business |
+ |
+
+
+ | Enterprise |
+ |
+
+
+ | Education |
+ |
+
+
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Machine
+
+
+
+
+
+Specifies whether to allow "News and interests" on the Taskbar.
+
+
+
+The values for this policy are 1 and 0. This policy defaults to 1.
+
+- 1 - Default - News and interests feature will be allowed on the taskbar. The settings UI will be present in Taskbar context menu, and users will be able to turn off or switch mode.
+
+- 0 - News and interests feature will be turned off completely, and the settings UI in Taskbar context menu will be removed.
+
+
+
+
+
**Experience/AllowSaveAsOfOfficeFiles**
@@ -1157,6 +1222,65 @@ The following list shows the supported values:
+
+**Experience/ConfigureChatIcon**
+
+
+
+
+ | Windows Edition |
+ Supported? |
+
+
+ | Home |
+ |
+
+
+ | Pro |
+ |
+
+
+ | Business |
+ |
+
+
+ | Enterprise |
+ |
+
+
+ | Education |
+ |
+
+
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Machine
+
+
+
+
+Specifies whether to allow "Chat" on the Taskbar.
+
+
+
+The values for this policy are 0, 1, 2 and 3. This policy defaults to 0.
+
+0 - Default: The Chat icon will be displayed or hidden on the taskbar based on account type. Users can show or hide it in Settings.
+1 - Show: The Chat icon will be displayed on the taskbar by default. Users can show or hide it in Settings.
+2 - Hide: The Chat icon will be hidden by default. Users can show or hide it in Settings.
+3 - Disabled: The Chat icon will not be displayed, and users cannot show or hide it in Settings.
+
+
+
+
+
+
**Experience/DisableCloudOptimizedContent**
@@ -1341,7 +1465,7 @@ The following list shows the supported values:
-[!INCLUDE [do-not-sync-browser-settings-shortdesc](../../../browsers/edge/shortdesc/do-not-sync-browser-settings-shortdesc.md)]
+[!INCLUDE [do-not-sync-browser-settings-shortdesc](../includes/do-not-sync-browser-settings-shortdesc.md)]
Related policy:
[PreventUsersFromTurningOnBrowserSyncing](#experience-preventusersfromturningonbrowsersyncing)
@@ -1435,7 +1559,7 @@ _**Turn syncing off by default but don’t disable**_
-[!INCLUDE [prevent-users-to-turn-on-browser-syncing-shortdesc](../../../browsers/edge/shortdesc/prevent-users-to-turn-on-browser-syncing-shortdesc.md)]
+[!INCLUDE [prevent-users-to-turn-on-browser-syncing-shortdesc](../includes/prevent-users-to-turn-on-browser-syncing-shortdesc.md)]
Related policy:
[DoNotSyncBrowserSettings](#experience-donotsyncbrowsersetting)
@@ -1574,4 +1698,4 @@ Footnotes:
- 8 - Available in Windows 10, version 2004.
- 9 - Available in Windows 10, version 20H2.
-
\ No newline at end of file
+
diff --git a/windows/client-management/mdm/policy-csp-exploitguard.md b/windows/client-management/mdm/policy-csp-exploitguard.md
index 33e976d513..80e9be3716 100644
--- a/windows/client-management/mdm/policy-csp-exploitguard.md
+++ b/windows/client-management/mdm/policy-csp-exploitguard.md
@@ -74,7 +74,7 @@ manager: dansimp
-Enables the IT admin to push out a configuration representing the desired system and application mitigation options to all the devices in the organization. The configuration is represented by an XML. For more information Exploit Protection, see [Enable Exploit Protection on Devices](/windows/security/threat-protection/microsoft-defender-atp/enable-exploit-protection) and [Import, export, and deploy Exploit Protection configurations](/windows/threat-protection/windows-defender-exploit-guard/import-export-exploit-protection-emet-xml).
+Enables the IT admin to push out a configuration representing the desired system and application mitigation options to all the devices in the organization. The configuration is represented by an XML. For more information Exploit Protection, see [Enable Exploit Protection on Devices](/microsoft-365/security/defender-endpoint/enable-exploit-protection) and [Import, export, and deploy Exploit Protection configurations](/windows/threat-protection/windows-defender-exploit-guard/import-export-exploit-protection-emet-xml).
The system settings require a reboot; the application settings do not require a reboot.
diff --git a/windows/client-management/mdm/policy-csp-system.md b/windows/client-management/mdm/policy-csp-system.md
index 0c15cbd8fe..3615cb2e3f 100644
--- a/windows/client-management/mdm/policy-csp-system.md
+++ b/windows/client-management/mdm/policy-csp-system.md
@@ -141,7 +141,7 @@ manager: dansimp
> [!NOTE]
-> This policy setting applies only to devices running Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education, Windows 10 Mobile, and Windows 10 Mobile Enterprise.
+> This policy setting applies only to devices running Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education.
This policy setting determines whether users can access the Insider build controls in the Advanced Options for Windows Update. These controls are located under "Get Insider builds," and enable users to make their devices available for downloading and installing Windows preview software.
@@ -738,7 +738,7 @@ The following list shows the supported values for Windows 8.1:
In Windows 10, you can configure this policy setting to decide what level of diagnostic data to send to Microsoft. The following list shows the supported values for Windows 10:
- 0 – (**Security**) Sends information that is required to help keep Windows more secure, including data about the Connected User Experience and Telemetry component settings, the Malicious Software Removal Tool, and Microsoft Defender.
- **Note:** This value is only applicable to Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile Enterprise, Windows 10 IoT Core (IoT Core), Hololens 2, and Windows Server 2016. Using this setting on other devices is equivalent to setting the value of 1.
+ **Note:** This value is only applicable to Windows 10 Enterprise, Windows 10 Education, Windows 10 IoT Core (IoT Core), Hololens 2, and Windows Server 2016. Using this setting on other devices is equivalent to setting the value of 1.
- 1 – (**Basic**) Sends the same data as a value of 0, plus additional basic device info, including quality-related data, app compatibility, and app usage data.
- 2 – (**Enhanced**) Sends the same data as a value of 1, plus additional insights, including how Windows, Windows Server, System Center, and apps are used, how they perform, and advanced reliability data.
- 3 – (**Full**) Sends the same data as a value of 2, plus all data necessary to identify and fix problems with devices.
@@ -756,7 +756,7 @@ In Windows 10, you can configure this policy setting to decide what level of dia
0 – Security. Information that is required to help keep Windows more secure, including data about the Connected User Experience and Telemetry component settings, the Malicious Software Removal Tool, and Windows Defender.
-Note This value is only applicable to Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile Enterprise, Windows 10 IoT Core (IoT Core), and Windows Server 2016. Using this setting on other devices is equivalent to setting the value of 1.
+Note This value is only applicable to Windows 10 Enterprise, Windows 10 Education, Windows 10 IoT Core (IoT Core), and Windows Server 2016. Using this setting on other devices is equivalent to setting the value of 1.
|
diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md
index fd7d92d8dd..94f7b317fd 100644
--- a/windows/client-management/mdm/policy-csp-update.md
+++ b/windows/client-management/mdm/policy-csp-update.md
@@ -1715,11 +1715,6 @@ Allows IT Admins to specify update delays for up to 4 weeks.
Supported values are 0-4, which refers to the number of weeks to defer updates.
-In Windows 10 Mobile Enterprise version 1511 devices set to automatic updates, for DeferUpdatePeriod to work, you must set the following:
-
-- Update/RequireDeferUpgrade must be set to 1
-- System/AllowTelemetry must be set to 1 or higher
-
If the "Specify intranet Microsoft update service location" policy is enabled, then the "Defer upgrades by", "Defer updates by" and "Pause Updates and Upgrades" settings have no effect.
If the Allow Telemetry policy is enabled and the Options value is set to 0, then the "Defer upgrades by", "Defer updates by" and "Pause Updates and Upgrades" settings have no effect.
@@ -3470,7 +3465,7 @@ Supported values are 15, 30, or 60 (minutes).
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Added in Windows 10, version 1703. Allows the IT Admin to specify the period for auto-restart warning reminder notifications.
@@ -3937,7 +3932,7 @@ ADMX Info:
> [!NOTE]
-> This policy is available on Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, and Windows 10 Mobile Enterprise
+> This policy is available on Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
Enables the IT admin to schedule the time of the update installation.
@@ -4479,7 +4474,7 @@ ADMX Info:
> [!IMPORTANT]
-> Starting in Windows 10, version 1703 this policy is not supported in Windows 10 Mobile Enterprise and IoT Mobile.
+> Starting in Windows 10, version 1703 this policy is not supported in IoT Mobile.
Allows the device to check for updates from a WSUS server instead of Microsoft Update. This is useful for on-premises MDMs that need to update devices that cannot connect to the Internet.
diff --git a/windows/client-management/mdm/policy-csp-userrights.md b/windows/client-management/mdm/policy-csp-userrights.md
index 44ac3534f2..4a44915184 100644
--- a/windows/client-management/mdm/policy-csp-userrights.md
+++ b/windows/client-management/mdm/policy-csp-userrights.md
@@ -1004,7 +1004,7 @@ This security setting determines which service accounts are prevented from regis
GP Info:
-- GP English name: *Deny log on as a service*
+- GP English name: *Deny log on Locally*
- GP path: *Windows Settings/Security Settings/Local Policies/User Rights Assignment*
@@ -1901,4 +1901,4 @@ Footnotes:
- 6 - Available in Windows 10, version 1903.
- 7 - Available in Windows 10, version 1909.
- 8 - Available in Windows 10, version 2004.
-
\ No newline at end of file
+
diff --git a/windows/client-management/mdm/policy-csp-wirelessdisplay.md b/windows/client-management/mdm/policy-csp-wirelessdisplay.md
index 3aff9aac6c..58e9f7e4b9 100644
--- a/windows/client-management/mdm/policy-csp-wirelessdisplay.md
+++ b/windows/client-management/mdm/policy-csp-wirelessdisplay.md
@@ -14,8 +14,6 @@ manager: dansimp
# Policy CSP - WirelessDisplay
-
-
diff --git a/windows/client-management/mdm/policy-ddf-file.md b/windows/client-management/mdm/policy-ddf-file.md
index 0ed48a5776..de9a8618a9 100644
--- a/windows/client-management/mdm/policy-ddf-file.md
+++ b/windows/client-management/mdm/policy-ddf-file.md
@@ -28611,30 +28611,6 @@ Related policy:
-
- AllowScreenTimeoutWhileLockedUserConfig
-
-
-
-
-
-
-
- Specifies whether to show a user-configurable setting to control the screen timeout while on the lock screen of Windows 10 Mobile devices.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
AllowSimpleDevicePassword
@@ -28999,31 +28975,6 @@ Configure the minimum password age to be more than 0 if you want Enforce passwor
-
- ScreenTimeoutWhileLocked
-
-
-
-
-
-
-
- Specifies whether to show a user-configurable setting to control the screen timeout while on the lock screen of Windows 10 Mobile devices.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
Display
@@ -60350,30 +60301,6 @@ Related policy:
LowestValueMostSecure
-
- AllowScreenTimeoutWhileLockedUserConfig
-
-
-
-
- 0
- Specifies whether to show a user-configurable setting to control the screen timeout while on the lock screen of Windows 10 Mobile devices.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
- LastWrite
-
-
AllowSimpleDevicePassword
@@ -60747,31 +60674,6 @@ Configure the minimum password age to be more than 0 if you want Enforce passwor
LastWrite
-
- ScreenTimeoutWhileLocked
-
-
-
-
- 10
- Specifies whether to show a user-configurable setting to control the screen timeout while on the lock screen of Windows 10 Mobile devices.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
- LastWrite
-
-
-
Display
diff --git a/windows/client-management/mdm/provisioning-csp.md b/windows/client-management/mdm/provisioning-csp.md
index 1e6a236656..aad96d1dbf 100644
--- a/windows/client-management/mdm/provisioning-csp.md
+++ b/windows/client-management/mdm/provisioning-csp.md
@@ -17,13 +17,13 @@ ms.date: 06/26/2017
The Provisioning configuration service provider is used for bulk user enrollment to an MDM service.
-> **Note** Bulk enrollment does not work when two factor authentication is enabled.
-
-
+> [!NOTE]
+> Bulk enrollment does not work when two-factor authentication is enabled.
For bulk enrollment step-by-step guide, see [Bulk enrollment](bulk-enrollment-using-windows-provisioning-tool.md).
The following shows the Provisioning configuration service provider in tree format.
+
```
./Vendor/MSFT/ProvisioningCommands
ProvisioningCommands
@@ -40,43 +40,34 @@ ProvisioningCommands
----------------RestartRequired
----------------ContinueInstall
```
-**./Vendor/MSFT**
+
+**./Vendor/MSFT/ProvisioningCommands**
Root node for Provisioning CSP.
-**Provisioning/Enrollments**
+**Provisioning/Enrollments**
Node for defining bulk enrollment of users into an MDM service.
-**Provisioning/Enrollments/***UPN*
-Unique identifier for the enrollment. For bulk enrollment, this must a service account that is allowed to enroll multiple users. Example, "generic-device@contoso.com"
+**Provisioning/Enrollments/_UPN_**
+Unique identifier for the enrollment. For bulk enrollment, this must be a service account that is allowed to enroll multiple users. For example, "generic-device@contoso.com".
-**Provisioning/Enrollments/*UPN*/DiscoveryServiceFullURL**
+**Provisioning/Enrollments/*UPN*/DiscoveryServiceFullURL**
The full URL for the discovery service.
-**Provisioning/Enrollments/*UPN*/Secret**
+**Provisioning/Enrollments/*UPN*/Secret**
This information is dependent on the AuthPolicy being used. Possible values:
-- Password string for on-premises authentication enrollment
-- Federated security token for federated enrollment
-- Certificate thumb print for certificated based enrollment
+- Password string for on-premises authentication enrollment
+- Federated security token for federated enrollment
+- Certificate thumbprint for certificated based enrollment
-**Provisioning/Enrollments/*UPN*/AuthPolicy**
+**Provisioning/Enrollments/*UPN*/AuthPolicy**
Specifies the authentication policy used by the MDM service. Valid values:
-- OnPremise
-- Certificate
+- OnPremise
+- Certificate
-**Provisioning/Enrollments/*UPN*/PolicyServiceFullURL**
+**Provisioning/Enrollments/*UPN*/PolicyServiceFullURL**
Specifies the policy service URL.
-**Provisioning/Enrollments/*UPN*/EnrollmentServiceFullURL**
+**Provisioning/Enrollments/*UPN*/EnrollmentServiceFullURL**
Specifies the enrollment service URL.
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/proxy-csp.md b/windows/client-management/mdm/proxy-csp.md
index 540a52a931..2a474b9321 100644
--- a/windows/client-management/mdm/proxy-csp.md
+++ b/windows/client-management/mdm/proxy-csp.md
@@ -17,18 +17,17 @@ ms.date: 06/26/2017
The PROXY configuration service provider is used to configure proxy connections.
-> **Note** Use [CM\_ProxyEntries CSP](cm-proxyentries-csp.md) instead of PROXY CSP, which will be deprecated in a future release.
+> [!NOTE]
+> Use [CM\_ProxyEntries CSP](cm-proxyentries-csp.md) instead of PROXY CSP, which will be deprecated in a future release.
This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_NETWORKING\_ADMIN capabilities to be accessed from a network configuration application.
-
-
For the PROXY CSP, you cannot use the Replace command unless the node already exists.
The following shows the PROXY configuration service provider management object in tree format as used by OMA DM. The OMA Client Provisioning protocol is not supported by this configuration service provider.
+
```
-./Vendor/MSFT
-Proxy
+./Vendor/MSFT/Proxy
----*
--------ProxyId
--------Name
@@ -56,82 +55,73 @@ Proxy
------------Microsoft
----------------Guid
```
-**./Vendor/MSFT/Proxy**
+
+**./Vendor/MSFT/Proxy**
Root node for the proxy connection.
-***ProxyName***
+***ProxyName***
Defines the name of a proxy connection.
It is recommended that this element name is specified as a numbered node beginning at zero. For example, to provision two proxy connections, use "PROXY0" and "PROXY1" as the element names. Any unique name can be used if desired (such as "GPRS-NAP"), but no spaces may appear in the name (use %20 instead).
-The addition, update, and deletion of this sub-tree of nodes have be specified in a single atomic transaction.
+The addition, update, and deletion of this sub-tree of nodes have to be specified in a single atomic transaction.
-***ProxyName*/PROXYID**
+***ProxyName*/PROXYID**
Specifies the unique identifier of the proxy connection.
-***ProxyName*/NAME**
+***ProxyName*/NAME**
Specifies the user-friendly name of the proxy connection.
-***ProxyName*/ADDR**
+***ProxyName*/ADDR**
Specifies the address of the proxy server.
This value may be the network name of the server, or any other string (such as an IP address) used to uniquely identify the proxy connection.
-***ProxyName*/ADDRTYPE**
+***ProxyName*/ADDRTYPE**
Specifies the type of address used to identify the proxy server.
The valid values are IPV4, IPV6, E164, ALPHA.
-***ProxyName*/PROXYTYPE**
+***ProxyName*/PROXYTYPE**
Specifies the type of proxy connection.
Depending on the ProxyID, the valid values are ISA, WAP, SOCKS, or NULL.
-***ProxyName*/Ports**
+***ProxyName*/Ports**
Node for port information.
-***ProxyName*/Ports/***PortName*
+***ProxyName*/Ports/_PortName_**
Defines the name of a port.
It is recommended that this element name is specified as a numbered node beginning at zero. For example, to provision two ports, use "PORT0" and "PORT1" as the element names.
-***ProxyName*/Ports/*PortName*/PortNbr**
+***ProxyName*/Ports/*PortName*/PortNbr**
Specifies the port number to be associated with the parent port.
-***ProxyName*/Ports/*PortName*/Services**
+***ProxyName*/Ports/*PortName*/Services**
Node for services information.
-***ProxyName*/Ports/Services/***ServiceName*
+***ProxyName*/Ports/Services/_ServiceName_**
Defines the name of a service.
It is recommended that this element name is specified as a numbered node beginning at zero. For example, to provision two services, use "SERVICE0" and "SERVICE1" as the element names.
-***ProxyName*/Ports/Services/*ServiceName*/ServiceName**
+***ProxyName*/Ports/Services/*ServiceName*/ServiceName**
Specifies the protocol to be associated with the parent port.
One commonly used value is "HTTP".
-***ProxyName*/ConRefs**
+***ProxyName*/ConRefs**
Node for connection reference information
-***ProxyName*/ConRefs/***ConRefName*
+***ProxyName*/ConRefs/_ConRefName_**
Defines the name of a connection reference.
It is recommended that this element name is specified as a numbered node beginning at zero. For example, to provision two connection references, use "CONREF0" and "CONREF1" as the element names.
-***ProxyName*/ConRefs/*ConRefName*/ConRef**
+***ProxyName*/ConRefs/*ConRefName*/ConRef**
Specifies one single connectivity object associated with the proxy connection.
## Related topics
-
[Configuration service provider reference](configuration-service-provider-reference.md)
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/supl-ddf-file.md b/windows/client-management/mdm/supl-ddf-file.md
index 2c1db8dd46..9e7d8d762f 100644
--- a/windows/client-management/mdm/supl-ddf-file.md
+++ b/windows/client-management/mdm/supl-ddf-file.md
@@ -216,29 +216,6 @@ The XML below is the DDF for the current version for this CSP.
-
- HighAccPositioningMethod
-
-
-
-
-
- 0
- Optional. Specifies the positioning method that the SUPL client will use for mobile originated position requests. The default is 0. The default method in Windows Phones provides high-quality assisted GNSS positioning for mobile originated position requests without loading the mobile operator's network or location services. For OMA DM, if the format for this node is incorrect the entry will be ignored and an error will be returned, but the configuration service provider will continue processing the rest of the parameters.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
LocMasterSwitchDependencyNII
@@ -308,26 +285,6 @@ The XML below is the DDF for the current version for this CSP.
-
- RootCertificate
-
-
-
-
- Required. Specifies the root certificate for the H-SLP server. Windows Phone does not support a non-secure mode. If this node is not included, the configuration service provider will fail but may not return a specific error.
-
-
-
-
-
-
-
-
-
-
-
-
-
Name
@@ -765,29 +722,6 @@ The XML below is the DDF for the current version for this CSP.
-
- PositioningMethod_MR
-
-
-
-
-
- 0
- Optional. Specifies the positioning method that the SUPL client will use for mobile originated position requests. The default is 0. The default method in Windows Phones provides high-quality assisted GNSS positioning for mobile originated position requests without loading the mobile operator's network or location services. The Mobile Station Assisted and AFLT positioning methods must only be configured for test purposes. For OMA DM, if the format for this node is incorrect the entry will be ignored and an error will be returned, but the configuration service provider will continue processing the rest of the parameters.
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
LocMasterSwitchDependencyNII
diff --git a/windows/client-management/mdm/toc.yml b/windows/client-management/mdm/toc.yml
new file mode 100644
index 0000000000..8680bff0db
--- /dev/null
+++ b/windows/client-management/mdm/toc.yml
@@ -0,0 +1,955 @@
+items:
+- name: Mobile device management
+ href: index.md
+ items:
+ - name: What's new in MDM enrollment and management
+ href: new-in-windows-mdm-enrollment-management.md
+ items:
+ - name: Change history for MDM documentation
+ href: change-history-for-mdm-documentation.md
+ - name: Mobile device enrollment
+ href: mobile-device-enrollment.md
+ items:
+ - name: MDM enrollment of Windows devices
+ href: mdm-enrollment-of-windows-devices.md
+ items:
+ - name: "Azure AD and Microsoft Intune: Automatic MDM enrollment in the new Portal"
+ href: azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
+ - name: Enroll a Windows 10 device automatically using Group Policy
+ href: enroll-a-windows-10-device-automatically-using-group-policy.md
+ - name: Federated authentication device enrollment
+ href: federated-authentication-device-enrollment.md
+ - name: Certificate authentication device enrollment
+ href: certificate-authentication-device-enrollment.md
+ - name: On-premises authentication device enrollment
+ href: on-premise-authentication-device-enrollment.md
+ - name: Understanding ADMX-backed policies
+ href: understanding-admx-backed-policies.md
+ - name: Enable ADMX-backed policies in MDM
+ href: enable-admx-backed-policies-in-mdm.md
+ - name: Win32 and Desktop Bridge app policy configuration
+ href: win32-and-centennial-app-policy-configuration.md
+ - name: Implement server-side support for mobile application management on Windows
+ href: implement-server-side-mobile-application-management.md
+ - name: Diagnose MDM failures in Windows 10
+ href: diagnose-mdm-failures-in-windows-10.md
+ - name: Deploy and configure App-V apps using MDM
+ href: appv-deploy-and-config.md
+ - name: Azure Active Directory integration with MDM
+ href: azure-active-directory-integration-with-mdm.md
+ items:
+ - name: Add an Azure AD tenant and Azure AD subscription
+ href: add-an-azure-ad-tenant-and-azure-ad-subscription.md
+ - name: Register your free Azure Active Directory subscription
+ href: register-your-free-azure-active-directory-subscription.md
+ - name: Enterprise app management
+ href: enterprise-app-management.md
+ - name: Mobile device management (MDM) for device updates
+ href: device-update-management.md
+ - name: Bulk enrollment
+ href: bulk-enrollment-using-windows-provisioning-tool.md
+ - name: Management tool for the Microsoft Store for Business
+ href: management-tool-for-windows-store-for-business.md
+ items:
+ - name: REST API reference for Microsoft Store for Business
+ href: rest-api-reference-windows-store-for-business.md
+ items:
+ - name: Data structures for Microsoft Store for Business
+ href: data-structures-windows-store-for-business.md
+ - name: Get Inventory
+ href: get-inventory.md
+ - name: Get product details
+ href: get-product-details.md
+ - name: Get localized product details
+ href: get-localized-product-details.md
+ - name: Get offline license
+ href: get-offline-license.md
+ - name: Get product packages
+ href: get-product-packages.md
+ - name: Get product package
+ href: get-product-package.md
+ - name: Get seats
+ href: get-seats.md
+ - name: Get seat
+ href: get-seat.md
+ - name: Assign seats
+ href: assign-seats.md
+ - name: Reclaim seat from user
+ href: reclaim-seat-from-user.md
+ - name: Bulk assign and reclaim seats from users
+ href: bulk-assign-and-reclaim-seats-from-user.md
+ - name: Get seats assigned to a user
+ href: get-seats-assigned-to-a-user.md
+ - name: Enable offline upgrades to Windows 10 for Windows Embedded 8.1 Handheld devices
+ href: enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
+ - name: Certificate renewal
+ href: certificate-renewal-windows-mdm.md
+ - name: Disconnecting from the management infrastructure (unenrollment)
+ href: disconnecting-from-mdm-unenrollment.md
+ - name: Enterprise settings, policies, and app management
+ href: windows-mdm-enterprise-settings.md
+ - name: Push notification support for device management
+ href: push-notification-windows-mdm.md
+ - name: OMA DM protocol support
+ href: oma-dm-protocol-support.md
+ - name: Structure of OMA DM provisioning files
+ href: structure-of-oma-dm-provisioning-files.md
+ - name: Server requirements for OMA DM
+ href: server-requirements-windows-mdm.md
+ - name: DMProcessConfigXMLFiltered
+ href: dmprocessconfigxmlfiltered.md
+ - name: Using PowerShell scripting with the WMI Bridge Provider
+ href: using-powershell-scripting-with-the-wmi-bridge-provider.md
+ - name: WMI providers supported in Windows 10
+ href: wmi-providers-supported-in-windows.md
+ - name: Configuration service provider reference
+ href: configuration-service-provider-reference.md
+ items:
+ - name: AccountManagement CSP
+ href: accountmanagement-csp.md
+ items:
+ - name: AccountManagement DDF file
+ href: accountmanagement-ddf.md
+ - name: Accounts CSP
+ href: accounts-csp.md
+ items:
+ - name: Accounts DDF file
+ href: accounts-ddf-file.md
+ - name: ActiveSync CSP
+ href: activesync-csp.md
+ items:
+ - name: ActiveSync DDF file
+ href: activesync-ddf-file.md
+ - name: AllJoynManagement CSP
+ href: alljoynmanagement-csp.md
+ items:
+ - name: AllJoynManagement DDF
+ href: alljoynmanagement-ddf.md
+ - name: APPLICATION CSP
+ href: application-csp.md
+ - name: ApplicationControl CSP
+ href: applicationcontrol-csp.md
+ items:
+ - name: ApplicationControl DDF file
+ href: applicationcontrol-csp-ddf.md
+ - name: AppLocker CSP
+ href: applocker-csp.md
+ items:
+ - name: AppLocker DDF file
+ href: applocker-ddf-file.md
+ - name: AppLocker XSD
+ href: applocker-xsd.md
+ - name: AssignedAccess CSP
+ href: assignedaccess-csp.md
+ items:
+ - name: AssignedAccess DDF file
+ href: assignedaccess-ddf.md
+ - name: BitLocker CSP
+ href: bitlocker-csp.md
+ items:
+ - name: BitLocker DDF file
+ href: bitlocker-ddf-file.md
+ - name: BOOTSTRAP CSP
+ href: bootstrap-csp.md
+ - name: BrowserFavorite CSP
+ href: browserfavorite-csp.md
+ - name: CellularSettings CSP
+ href: cellularsettings-csp.md
+ - name: CertificateStore CSP
+ href: certificatestore-csp.md
+ items:
+ - name: CertificateStore DDF file
+ href: certificatestore-ddf-file.md
+ - name: CleanPC CSP
+ href: cleanpc-csp.md
+ items:
+ - name: CleanPC DDF
+ href: cleanpc-ddf.md
+ - name: ClientCertificateInstall CSP
+ href: clientcertificateinstall-csp.md
+ items:
+ - name: ClientCertificateInstall DDF file
+ href: clientcertificateinstall-ddf-file.md
+ - name: CM_CellularEntries CSP
+ href: cm-cellularentries-csp.md
+ - name: CM_ProxyEntries CSP
+ href: cm-proxyentries-csp.md
+ - name: CMPolicy CSP
+ href: cmpolicy-csp.md
+ - name: CMPolicyEnterprise CSP
+ href: cmpolicyenterprise-csp.md
+ items:
+ - name: CMPolicyEnterprise DDF file
+ href: cmpolicyenterprise-ddf-file.md
+ - name: CustomDeviceUI CSP
+ href: customdeviceui-csp.md
+ items:
+ - name: CustomDeviceUI DDF file
+ href: customdeviceui-ddf.md
+ - name: Defender CSP
+ href: defender-csp.md
+ items:
+ - name: Defender DDF file
+ href: defender-ddf.md
+ - name: DevDetail CSP
+ href: devdetail-csp.md
+ items:
+ - name: DevDetail DDF file
+ href: devdetail-ddf-file.md
+ - name: DeveloperSetup CSP
+ href: developersetup-csp.md
+ items:
+ - name: DeveloperSetup DDF
+ href: developersetup-ddf.md
+ - name: DeviceInstanceService CSP
+ href: deviceinstanceservice-csp.md
+ - name: DeviceLock CSP
+ href: devicelock-csp.md
+ items:
+ - name: DeviceLock DDF file
+ href: devicelock-ddf-file.md
+ - name: DeviceManageability CSP
+ href: devicemanageability-csp.md
+ items:
+ - name: DeviceManageability DDF
+ href: devicemanageability-ddf.md
+ - name: DeviceStatus CSP
+ href: devicestatus-csp.md
+ items:
+ - name: DeviceStatus DDF
+ href: devicestatus-ddf.md
+ - name: DevInfo CSP
+ href: devinfo-csp.md
+ items:
+ - name: DevInfo DDF file
+ href: devinfo-ddf-file.md
+ - name: DiagnosticLog CSP
+ href: diagnosticlog-csp.md
+ items:
+ - name: DiagnosticLog DDF file
+ href: diagnosticlog-ddf.md
+ - name: DMAcc CSP
+ href: dmacc-csp.md
+ items:
+ - name: DMAcc DDF file
+ href: dmacc-ddf-file.md
+ - name: DMClient CSP
+ href: dmclient-csp.md
+ items:
+ - name: DMClient DDF file
+ href: dmclient-ddf-file.md
+ - name: DMSessionActions CSP
+ href: dmsessionactions-csp.md
+ items:
+ - name: DMSessionActions DDF file
+ href: dmsessionactions-ddf.md
+ - name: DynamicManagement CSP
+ href: dynamicmanagement-csp.md
+ items:
+ - name: DynamicManagement DDF file
+ href: dynamicmanagement-ddf.md
+ - name: EMAIL2 CSP
+ href: email2-csp.md
+ items:
+ - name: EMAIL2 DDF file
+ href: email2-ddf-file.md
+ - name: EnrollmentStatusTracking CSP
+ href: enrollmentstatustracking-csp.md
+ items:
+ - name: EnrollmentStatusTracking DDF file
+ href: enrollmentstatustracking-csp-ddf.md
+ - name: EnterpriseAPN CSP
+ href: enterpriseapn-csp.md
+ items:
+ - name: EnterpriseAPN DDF
+ href: enterpriseapn-ddf.md
+ - name: EnterpriseAppManagement CSP
+ href: enterpriseappmanagement-csp.md
+ - name: EnterpriseAppVManagement CSP
+ href: enterpriseappvmanagement-csp.md
+ items:
+ - name: EnterpriseAppVManagement DDF file
+ href: enterpriseappvmanagement-ddf.md
+ - name: EnterpriseAssignedAccess CSP
+ href: enterpriseassignedaccess-csp.md
+ items:
+ - name: EnterpriseAssignedAccess DDF file
+ href: enterpriseassignedaccess-ddf.md
+ - name: EnterpriseAssignedAccess XSD
+ href: enterpriseassignedaccess-xsd.md
+ - name: EnterpriseDataProtection CSP
+ href: enterprisedataprotection-csp.md
+ items:
+ - name: EnterpriseDataProtection DDF file
+ href: enterprisedataprotection-ddf-file.md
+ - name: EnterpriseDesktopAppManagement CSP
+ href: enterprisedesktopappmanagement-csp.md
+ items:
+ - name: EnterpriseDesktopAppManagement DDF
+ href: enterprisedesktopappmanagement-ddf-file.md
+ - name: EnterpriseDesktopAppManagement XSD
+ href: enterprisedesktopappmanagement2-xsd.md
+ - name: EnterpriseExt CSP
+ href: enterpriseext-csp.md
+ items:
+ - name: EnterpriseExt DDF file
+ href: enterpriseext-ddf.md
+ - name: EnterpriseExtFileSystem CSP
+ href: enterpriseextfilessystem-csp.md
+ items:
+ - name: EnterpriseExtFileSystem DDF file
+ href: enterpriseextfilesystem-ddf.md
+ - name: EnterpriseModernAppManagement CSP
+ href: enterprisemodernappmanagement-csp.md
+ items:
+ - name: EnterpriseModernAppManagement DDF
+ href: enterprisemodernappmanagement-ddf.md
+ - name: EnterpriseModernAppManagement XSD
+ href: enterprisemodernappmanagement-xsd.md
+ - name: eUICCs CSP
+ href: euiccs-csp.md
+ items:
+ - name: eUICCs DDF file
+ href: euiccs-ddf-file.md
+ - name: FileSystem CSP
+ href: filesystem-csp.md
+ - name: Firewall CSP
+ href: firewall-csp.md
+ items:
+ - name: Firewall DDF file
+ href: firewall-ddf-file.md
+ - name: HealthAttestation CSP
+ href: healthattestation-csp.md
+ items:
+ - name: HealthAttestation DDF
+ href: healthattestation-ddf.md
+ - name: HotSpot CSP
+ href: hotspot-csp.md
+ - name: Maps CSP
+ href: maps-csp.md
+ items:
+ - name: Maps DDF
+ href: maps-ddf-file.md
+ - name: Messaging CSP
+ href: messaging-csp.md
+ items:
+ - name: Messaging DDF file
+ href: messaging-ddf.md
+ - name: MultiSIM CSP
+ href: multisim-csp.md
+ items:
+ - name: MultiSIM DDF file
+ href: multisim-ddf.md
+ - name: NAP CSP
+ href: nap-csp.md
+ - name: NAPDEF CSP
+ href: napdef-csp.md
+ - name: NetworkProxy CSP
+ href: networkproxy-csp.md
+ items:
+ - name: NetworkProxy DDF file
+ href: networkproxy-ddf.md
+ - name: NetworkQoSPolicy CSP
+ href: networkqospolicy-csp.md
+ items:
+ - name: NetworkQoSPolicy DDF file
+ href: networkqospolicy-ddf.md
+ - name: NodeCache CSP
+ href: nodecache-csp.md
+ items:
+ - name: NodeCache DDF file
+ href: nodecache-ddf-file.md
+ - name: Office CSP
+ href: office-csp.md
+ items:
+ - name: Office DDF
+ href: office-ddf.md
+ - name: PassportForWork CSP
+ href: passportforwork-csp.md
+ items:
+ - name: PassportForWork DDF file
+ href: passportforwork-ddf.md
+ - name: Personalization CSP
+ href: personalization-csp.md
+ items:
+ - name: Personalization DDF file
+ href: personalization-ddf.md
+ - name: Policy CSP
+ href: policy-configuration-service-provider.md
+ items:
+ - name: Policy CSP DDF file
+ href: policy-ddf-file.md
+ - name: Policies in Policy CSP supported by Group Policy
+ href: policies-in-policy-csp-supported-by-group-policy.md
+ - name: ADMX-backed policies in Policy CSP
+ href: policies-in-policy-csp-admx-backed.md
+ - name: Policies in Policy CSP supported by HoloLens 2
+ href: policies-in-policy-csp-supported-by-hololens2.md
+ - name: Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite
+ href: policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md
+ - name: Policies in Policy CSP supported by HoloLens (1st gen) Development Edition
+ href: policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md
+ - name: Policies in Policy CSP supported by Windows 10 IoT Enterprise
+ href: ./configuration-service-provider-reference.md
+ - name: Policies in Policy CSP supported by Windows 10 IoT Core
+ href: policies-in-policy-csp-supported-by-iot-core.md
+ - name: Policies in Policy CSP supported by Microsoft Surface Hub
+ href: policies-in-policy-csp-supported-by-surface-hub.md
+ - name: Policy CSPs that can be set using Exchange Active Sync (EAS)
+ href: policies-in-policy-csp-that-can-be-set-using-eas.md
+ - name: AboveLock
+ href: policy-csp-abovelock.md
+ - name: Accounts
+ href: policy-csp-accounts.md
+ - name: ActiveXControls
+ href: policy-csp-activexcontrols.md
+ - name: ADMX_ActiveXInstallService
+ href: policy-csp-admx-activexinstallservice.md
+ - name: ADMX_AddRemovePrograms
+ href: policy-csp-admx-addremoveprograms.md
+ - name: ADMX_AppCompat
+ href: policy-csp-admx-appcompat.md
+ - name: ADMX_AppxPackageManager
+ href: policy-csp-admx-appxpackagemanager.md
+ - name: ADMX_AppXRuntime
+ href: policy-csp-admx-appxruntime.md
+ - name: ADMX_AttachmentManager
+ href: policy-csp-admx-attachmentmanager.md
+ - name: ADMX_AuditSettings
+ href: policy-csp-admx-auditsettings.md
+ - name: ADMX_Bits
+ href: policy-csp-admx-bits.md
+ - name: ADMX_CipherSuiteOrder
+ href: policy-csp-admx-ciphersuiteorder.md
+ - name: ADMX_COM
+ href: policy-csp-admx-com.md
+ - name: ADMX_ControlPanel
+ href: policy-csp-admx-controlpanel.md
+ - name: ADMX_ControlPanelDisplay
+ href: policy-csp-admx-controlpaneldisplay.md
+ - name: ADMX_Cpls
+ href: policy-csp-admx-cpls.md
+ - name: ADMX_CredentialProviders
+ href: policy-csp-admx-credentialproviders.md
+ - name: ADMX_CredSsp
+ href: policy-csp-admx-credssp.md
+ - name: ADMX_CredUI
+ href: policy-csp-admx-credui.md
+ - name: ADMX_CtrlAltDel
+ href: policy-csp-admx-ctrlaltdel.md
+ - name: ADMX_DataCollection
+ href: policy-csp-admx-datacollection.md
+ - name: ADMX_Desktop
+ href: policy-csp-admx-desktop.md
+ - name: ADMX_DeviceInstallation
+ href: policy-csp-admx-deviceinstallation.md
+ - name: ADMX_DeviceSetup
+ href: policy-csp-admx-devicesetup.md
+ - name: ADMX_DigitalLocker
+ href: policy-csp-admx-digitallocker.md
+ - name: ADMX_DistributedLinkTracking
+ href: policy-csp-admx-distributedlinktracking.md
+ - name: ADMX_DnsClient
+ href: policy-csp-admx-dnsclient.md
+ - name: ADMX_DWM
+ href: policy-csp-admx-dwm.md
+ - name: ADMX_EAIME
+ href: policy-csp-admx-eaime.md
+ - name: ADMX_EncryptFilesonMove
+ href: policy-csp-admx-encryptfilesonmove.md
+ - name: ADMX_EnhancedStorage
+ href: policy-csp-admx-enhancedstorage.md
+ - name: ADMX_ErrorReporting
+ href: policy-csp-admx-errorreporting.md
+ - name: ADMX_EventForwarding
+ href: policy-csp-admx-eventforwarding.md
+ - name: ADMX_EventLog
+ href: policy-csp-admx-eventlog.md
+ - name: ADMX_Explorer
+ href: policy-csp-admx-explorer.md
+ - name: ADMX_FileRecovery
+ href: policy-csp-admx-filerecovery.md
+ - name: ADMX_FileServerVSSProvider
+ href: policy-csp-admx-fileservervssprovider.md
+ - name: ADMX_FileSys
+ href: policy-csp-admx-filesys.md
+ - name: ADMX_FolderRedirection
+ href: policy-csp-admx-folderredirection.md
+ - name: ADMX_Globalization
+ href: policy-csp-admx-globalization.md
+ - name: ADMX_GroupPolicy
+ href: policy-csp-admx-grouppolicy.md
+ - name: ADMX_Help
+ href: policy-csp-admx-help.md
+ - name: ADMX_HelpAndSupport
+ href: policy-csp-admx-helpandsupport.md
+ - name: ADMX_ICM
+ href: policy-csp-admx-icm.md
+ - name: ADMX_kdc
+ href: policy-csp-admx-kdc.md
+ - name: ADMX_Kerberos
+ href: policy-csp-admx-kerberos.md
+ - name: ADMX_LanmanServer
+ href: policy-csp-admx-lanmanserver.md
+ - name: ADMX_LanmanWorkstation
+ href: policy-csp-admx-lanmanworkstation.md
+ - name: ADMX_LinkLayerTopologyDiscovery
+ href: policy-csp-admx-linklayertopologydiscovery.md
+ - name: ADMX_Logon
+ href: policy-csp-admx-logon.md
+ - name: ADMX_MicrosoftDefenderAntivirus
+ href: policy-csp-admx-microsoftdefenderantivirus.md
+ - name: ADMX_MMC
+ href: policy-csp-admx-mmc.md
+ - name: ADMX_MMCSnapins
+ href: policy-csp-admx-mmcsnapins.md
+ - name: ADMX_MSAPolicy
+ href: policy-csp-admx-msapolicy.md
+ - name: ADMX_msched
+ href: policy-csp-admx-msched.md
+ - name: ADMX_MSDT
+ href: policy-csp-admx-msdt.md
+ - name: ADMX_MSI
+ href: policy-csp-admx-msi.md
+ - name: ADMX_nca
+ href: policy-csp-admx-nca.md
+ - name: ADMX_NCSI
+ href: policy-csp-admx-ncsi.md
+ - name: ADMX_Netlogon
+ href: policy-csp-admx-netlogon.md
+ - name: ADMX_NetworkConnections
+ href: policy-csp-admx-networkconnections.md
+ - name: ADMX_OfflineFiles
+ href: policy-csp-admx-offlinefiles.md
+ - name: ADMX_PeerToPeerCaching
+ href: policy-csp-admx-peertopeercaching.md
+ - name: ADMX_PerformanceDiagnostics
+ href: policy-csp-admx-performancediagnostics.md
+ - name: ADMX_Power
+ href: policy-csp-admx-power.md
+ - name: ADMX_PowerShellExecutionPolicy
+ href: policy-csp-admx-powershellexecutionpolicy.md
+ - name: ADMX_Printing
+ href: policy-csp-admx-printing.md
+ - name: ADMX_Printing2
+ href: policy-csp-admx-printing2.md
+ - name: ADMX_Programs
+ href: policy-csp-admx-programs.md
+ - name: ADMX_Reliability
+ href: policy-csp-admx-reliability.md
+ - name: ADMX_RemoteAssistance
+ href: policy-csp-admx-remoteassistance.md
+ - name: ADMX_RemovableStorage
+ href: policy-csp-admx-removablestorage.md
+ - name: ADMX_RPC
+ href: policy-csp-admx-rpc.md
+ - name: ADMX_Scripts
+ href: policy-csp-admx-scripts.md
+ - name: ADMX_sdiageng
+ href: policy-csp-admx-sdiageng.md
+ - name: ADMX_Securitycenter
+ href: policy-csp-admx-securitycenter.md
+ - name: ADMX_Sensors
+ href: policy-csp-admx-sensors.md
+ - name: ADMX_Servicing
+ href: policy-csp-admx-servicing.md
+ - name: ADMX_SettingSync
+ href: policy-csp-admx-settingsync.md
+ - name: ADMX_SharedFolders
+ href: policy-csp-admx-sharedfolders.md
+ - name: ADMX_Sharing
+ href: policy-csp-admx-sharing.md
+ - name: ADMX_ShellCommandPromptRegEditTools
+ href: policy-csp-admx-shellcommandpromptregedittools.md
+ - name: ADMX_SkyDrive
+ href: policy-csp-admx-skydrive.md
+ - name: ADMX_Smartcard
+ href: policy-csp-admx-smartcard.md
+ - name: ADMX_Snmp
+ href: policy-csp-admx-snmp.md
+ - name: ADMX_StartMenu
+ href: policy-csp-admx-startmenu.md
+ - name: ADMX_SystemRestore
+ href: policy-csp-admx-systemrestore.md
+ - name: ADMX_Taskbar
+ href: policy-csp-admx-taskbar.md
+ - name: ADMX_tcpip
+ href: policy-csp-admx-tcpip.md
+ - name: ADMX_Thumbnails
+ href: policy-csp-admx-thumbnails.md
+ - name: ADMX_TPM
+ href: policy-csp-admx-tpm.md
+ - name: ADMX_UserExperienceVirtualization
+ href: policy-csp-admx-userexperiencevirtualization.md
+ - name: ADMX_UserProfiles
+ href: policy-csp-admx-userprofiles.md
+ - name: ADMX_W32Time
+ href: policy-csp-admx-w32time.md
+ - name: ADMX_WCM
+ href: policy-csp-admx-wcm.md
+ - name: ADMX_WinCal
+ href: policy-csp-admx-wincal.md
+ - name: ADMX_WindowsAnytimeUpgrade
+ href: policy-csp-admx-windowsanytimeupgrade.md
+ - name: ADMX_WindowsConnectNow
+ href: policy-csp-admx-windowsconnectnow.md
+ - name: ADMX_WindowsExplorer
+ href: policy-csp-admx-windowsexplorer.md
+ - name: ADMX_WindowsFileProtection
+ href: policy-csp-admx-windowsfileprotection.md
+ - name: ADMX_WindowsMediaDRM
+ href: policy-csp-admx-windowsmediadrm.md
+ - name: ADMX_WindowsMediaPlayer
+ href: policy-csp-admx-windowsmediaplayer.md
+ - name: ADMX_WindowsRemoteManagement
+ href: policy-csp-admx-windowsremotemanagement.md
+ - name: ADMX_WindowsStore
+ href: policy-csp-admx-windowsstore.md
+ - name: ADMX_WinInit
+ href: policy-csp-admx-wininit.md
+ - name: ADMX_WinLogon
+ href: policy-csp-admx-winlogon.md
+ - name: ADMX-Winsrv
+ href: policy-csp-admx-winsrv.md
+ - name: ADMX_wlansvc
+ href: policy-csp-admx-wlansvc.md
+ - name: ADMX_WPN
+ href: policy-csp-admx-wpn.md
+ - name: ApplicationDefaults
+ href: policy-csp-applicationdefaults.md
+ - name: ApplicationManagement
+ href: policy-csp-applicationmanagement.md
+ - name: AppRuntime
+ href: policy-csp-appruntime.md
+ - name: AppVirtualization
+ href: policy-csp-appvirtualization.md
+ - name: AttachmentManager
+ href: policy-csp-attachmentmanager.md
+ - name: Audit
+ href: policy-csp-audit.md
+ - name: Authentication
+ href: policy-csp-authentication.md
+ - name: Autoplay
+ href: policy-csp-autoplay.md
+ - name: BitLocker
+ href: policy-csp-bitlocker.md
+ - name: BITS
+ href: policy-csp-bits.md
+ - name: Bluetooth
+ href: policy-csp-bluetooth.md
+ - name: Browser
+ href: policy-csp-browser.md
+ - name: Camera
+ href: policy-csp-camera.md
+ - name: Cellular
+ href: policy-csp-cellular.md
+ - name: Connectivity
+ href: policy-csp-connectivity.md
+ - name: ControlPolicyConflict
+ href: policy-csp-controlpolicyconflict.md
+ - name: CredentialsDelegation
+ href: policy-csp-credentialsdelegation.md
+ - name: CredentialProviders
+ href: policy-csp-credentialproviders.md
+ - name: CredentialsUI
+ href: policy-csp-credentialsui.md
+ - name: Cryptography
+ href: policy-csp-cryptography.md
+ - name: DataProtection
+ href: policy-csp-dataprotection.md
+ - name: DataUsage
+ href: policy-csp-datausage.md
+ - name: Defender
+ href: policy-csp-defender.md
+ - name: DeliveryOptimization
+ href: policy-csp-deliveryoptimization.md
+ - name: Desktop
+ href: policy-csp-desktop.md
+ - name: DeviceGuard
+ href: policy-csp-deviceguard.md
+ - name: DeviceHealthMonitoring
+ href: policy-csp-devicehealthmonitoring.md
+ - name: DeviceInstallation
+ href: policy-csp-deviceinstallation.md
+ - name: DeviceLock
+ href: policy-csp-devicelock.md
+ - name: Display
+ href: policy-csp-display.md
+ - name: DmaGuard
+ href: policy-csp-dmaguard.md
+ - name: Education
+ href: policy-csp-education.md
+ - name: EnterpriseCloudPrint
+ href: policy-csp-enterprisecloudprint.md
+ - name: ErrorReporting
+ href: policy-csp-errorreporting.md
+ - name: EventLogService
+ href: policy-csp-eventlogservice.md
+ - name: Experience
+ href: policy-csp-experience.md
+ - name: ExploitGuard
+ href: policy-csp-exploitguard.md
+ - name: FileExplorer
+ href: policy-csp-fileexplorer.md
+ - name: Games
+ href: policy-csp-games.md
+ - name: Handwriting
+ href: policy-csp-handwriting.md
+ - name: InternetExplorer
+ href: policy-csp-internetexplorer.md
+ - name: Kerberos
+ href: policy-csp-kerberos.md
+ - name: KioskBrowser
+ href: policy-csp-kioskbrowser.md
+ - name: LanmanWorkstation
+ href: policy-csp-lanmanworkstation.md
+ - name: Licensing
+ href: policy-csp-licensing.md
+ - name: LocalPoliciesSecurityOptions
+ href: policy-csp-localpoliciessecurityoptions.md
+ - name: LocalUsersAndGroups
+ href: policy-csp-localusersandgroups.md
+ - name: LockDown
+ href: policy-csp-lockdown.md
+ - name: Maps
+ href: policy-csp-maps.md
+ - name: Messaging
+ href: policy-csp-messaging.md
+ - name: MixedReality
+ href: policy-csp-mixedreality.md
+ - name: MSSecurityGuide
+ href: policy-csp-mssecurityguide.md
+ - name: MSSLegacy
+ href: policy-csp-msslegacy.md
+ - name: Multitasking
+ href: policy-csp-multitasking.md
+ - name: NetworkIsolation
+ href: policy-csp-networkisolation.md
+ - name: Notifications
+ href: policy-csp-notifications.md
+ - name: Power
+ href: policy-csp-power.md
+ - name: Printers
+ href: policy-csp-printers.md
+ - name: Privacy
+ href: policy-csp-privacy.md
+ - name: RemoteAssistance
+ href: policy-csp-remoteassistance.md
+ - name: RemoteDesktopServices
+ href: policy-csp-remotedesktopservices.md
+ - name: RemoteManagement
+ href: policy-csp-remotemanagement.md
+ - name: RemoteProcedureCall
+ href: policy-csp-remoteprocedurecall.md
+ - name: RemoteShell
+ href: policy-csp-remoteshell.md
+ - name: RestrictedGroups
+ href: policy-csp-restrictedgroups.md
+ - name: Search
+ href: policy-csp-search.md
+ - name: Security
+ href: policy-csp-security.md
+ - name: ServiceControlManager
+ href: policy-csp-servicecontrolmanager.md
+ - name: Settings
+ href: policy-csp-settings.md
+ - name: Speech
+ href: policy-csp-speech.md
+ - name: Start
+ href: policy-csp-start.md
+ - name: Storage
+ href: policy-csp-storage.md
+ - name: System
+ href: policy-csp-system.md
+ - name: SystemServices
+ href: policy-csp-systemservices.md
+ - name: TaskManager
+ href: policy-csp-taskmanager.md
+ - name: TaskScheduler
+ href: policy-csp-taskscheduler.md
+ - name: TextInput
+ href: policy-csp-textinput.md
+ - name: TimeLanguageSettings
+ href: policy-csp-timelanguagesettings.md
+ - name: Troubleshooting
+ href: policy-csp-troubleshooting.md
+ - name: Update
+ href: policy-csp-update.md
+ - name: UserRights
+ href: policy-csp-userrights.md
+ - name: Wifi
+ href: policy-csp-wifi.md
+ - name: WindowsConnectionManager
+ href: policy-csp-windowsconnectionmanager.md
+ - name: WindowsDefenderSecurityCenter
+ href: policy-csp-windowsdefendersecuritycenter.md
+ - name: WindowsDefenderSmartScreen
+ href: policy-csp-smartscreen.md
+ - name: WindowsInkWorkspace
+ href: policy-csp-windowsinkworkspace.md
+ - name: WindowsLogon
+ href: policy-csp-windowslogon.md
+ - name: WindowsPowerShell
+ href: policy-csp-windowspowershell.md
+ - name: WindowsSandbox
+ href: policy-csp-windowssandbox.md
+ - name: WirelessDisplay
+ href: policy-csp-wirelessdisplay.md
+ - name: PolicyManager CSP
+ href: policymanager-csp.md
+ - name: Provisioning CSP
+ href: provisioning-csp.md
+ - name: PROXY CSP
+ href: proxy-csp.md
+ - name: PXLOGICAL CSP
+ href: pxlogical-csp.md
+ - name: Reboot CSP
+ href: reboot-csp.md
+ items:
+ - name: Reboot DDF file
+ href: reboot-ddf-file.md
+ - name: Registry CSP
+ href: registry-csp.md
+ items:
+ - name: Registry DDF file
+ href: registry-ddf-file.md
+ - name: RemoteFind CSP
+ href: remotefind-csp.md
+ items:
+ - name: RemoteFind DDF file
+ href: remotefind-ddf-file.md
+ - name: RemoteLock CSP
+ href: remotelock-csp.md
+ items:
+ - name: RemoteLock DDF file
+ href: remotelock-ddf-file.md
+ - name: RemoteRing CSP
+ href: remotering-csp.md
+ items:
+ - name: RemoteRing DDF file
+ href: remotering-ddf-file.md
+ - name: RemoteWipe CSP
+ href: remotewipe-csp.md
+ items:
+ - name: RemoteWipe DDF file
+ href: remotewipe-ddf-file.md
+ - name: Reporting CSP
+ href: reporting-csp.md
+ items:
+ - name: Reporting DDF file
+ href: reporting-ddf-file.md
+ - name: RootCATrustedCertificates CSP
+ href: rootcacertificates-csp.md
+ items:
+ - name: RootCATrustedCertificates DDF file
+ href: rootcacertificates-ddf-file.md
+ - name: SecureAssessment CSP
+ href: secureassessment-csp.md
+ items:
+ - name: SecureAssessment DDF file
+ href: secureassessment-ddf-file.md
+ - name: SecurityPolicy CSP
+ href: securitypolicy-csp.md
+ - name: SharedPC CSP
+ href: sharedpc-csp.md
+ items:
+ - name: SharedPC DDF file
+ href: sharedpc-ddf-file.md
+ - name: Storage CSP
+ href: storage-csp.md
+ items:
+ - name: Storage DDF file
+ href: storage-ddf-file.md
+ - name: SUPL CSP
+ href: supl-csp.md
+ items:
+ - name: SUPL DDF file
+ href: supl-ddf-file.md
+ - name: SurfaceHub CSP
+ href: surfacehub-csp.md
+ items:
+ - name: SurfaceHub DDF file
+ href: surfacehub-ddf-file.md
+ - name: TenantLockdown CSP
+ href: tenantlockdown-csp.md
+ items:
+ - name: TenantLockdown DDF file
+ href: tenantlockdown-ddf.md
+ - name: TPMPolicy CSP
+ href: tpmpolicy-csp.md
+ items:
+ - name: TPMPolicy DDF file
+ href: tpmpolicy-ddf-file.md
+ - name: UEFI CSP
+ href: uefi-csp.md
+ items:
+ - name: UEFI DDF file
+ href: uefi-ddf.md
+ - name: UnifiedWriteFilter CSP
+ href: unifiedwritefilter-csp.md
+ items:
+ - name: UnifiedWriteFilter DDF file
+ href: unifiedwritefilter-ddf.md
+ - name: Update CSP
+ href: update-csp.md
+ items:
+ - name: Update DDF file
+ href: update-ddf-file.md
+ - name: VPN CSP
+ href: vpn-csp.md
+ items:
+ - name: VPN DDF file
+ href: vpn-ddf-file.md
+ - name: VPNv2 CSP
+ href: vpnv2-csp.md
+ items:
+ - name: VPNv2 DDF file
+ href: vpnv2-ddf-file.md
+ - name: ProfileXML XSD
+ href: vpnv2-profile-xsd.md
+ - name: EAP configuration
+ href: eap-configuration.md
+ - name: w4 APPLICATION CSP
+ href: w4-application-csp.md
+ - name: w7 APPLICATION CSP
+ href: w7-application-csp.md
+ - name: WiFi CSP
+ href: wifi-csp.md
+ items:
+ - name: WiFi DDF file
+ href: wifi-ddf-file.md
+ - name: Win32AppInventory CSP
+ href: win32appinventory-csp.md
+ items:
+ - name: Win32AppInventory DDF file
+ href: win32appinventory-ddf-file.md
+ - name: Win32CompatibilityAppraiser CSP
+ href: win32compatibilityappraiser-csp.md
+ items:
+ - name: Win32CompatibilityAppraiser DDF file
+ href: win32compatibilityappraiser-ddf.md
+ - name: WindowsAdvancedThreatProtection CSP
+ href: windowsadvancedthreatprotection-csp.md
+ items:
+ - name: WindowsAdvancedThreatProtection DDF file
+ href: windowsadvancedthreatprotection-ddf.md
+ - name: WindowsDefenderApplicationGuard CSP
+ href: windowsdefenderapplicationguard-csp.md
+ items:
+ - name: WindowsDefenderApplicationGuard DDF file
+ href: windowsdefenderapplicationguard-ddf-file.md
+ - name: WindowsLicensing CSP
+ href: windowslicensing-csp.md
+ items:
+ - name: WindowsLicensing DDF file
+ href: windowslicensing-ddf-file.md
+ - name: WindowsSecurityAuditing CSP
+ href: windowssecurityauditing-csp.md
+ items:
+ - name: WindowsSecurityAuditing DDF file
+ href: windowssecurityauditing-ddf-file.md
+ - name: WiredNetwork CSP
+ href: wirednetwork-csp.md
+ items:
+ - name: WiredNetwork DDF file
+ href: wirednetwork-ddf-file.md
diff --git a/windows/client-management/mdm/update-csp.md b/windows/client-management/mdm/update-csp.md
index db915eb9fe..89c8d33d45 100644
--- a/windows/client-management/mdm/update-csp.md
+++ b/windows/client-management/mdm/update-csp.md
@@ -16,13 +16,13 @@ ms.date: 02/23/2018
The Update configuration service provider enables IT administrators to manage and control the rollout of new updates.
-> [!Note]
-> The Update CSP functionality of 'AprrovedUpdates' is not recommended for managing desktop devices. To manage updates to desktop devices from Windows Update, see the [Policy CSP - Updates](policy-csp-update.md) documentation for the recommended policies.
+> [!NOTE]
+> The Update CSP functionality of 'AprrovedUpdates' is not recommended for managing desktop devices. To manage updates to desktop devices from Windows Update, see the [Policy CSP - Updates](policy-csp-update.md) documentation for the recommended policies.
The following shows the Update configuration service provider in tree format.
-```./Vendor/MSFT
-Update
+```
+./Vendor/MSFT/Update
----ApprovedUpdates
--------Approved Update Guid
------------ApprovedTime
@@ -50,7 +50,8 @@ Update
--------QualityUpdateStatus
--------FeatureUpdateStatus
```
-**Update**
+
+**./Vendor/MSFT/Update**
The root node.
Supported operation is Get.
@@ -70,10 +71,10 @@ Update
Supported operations are Get and Add.
-**ApprovedUpdates/***Approved Update Guid*
+**ApprovedUpdates/_Approved Update Guid_**
Specifies the update GUID.
-
To auto-approve a class of updates, you can specify the Update Classifications GUIDs. We strongly recommend to always specify the DefinitionsUpdates classification (E0789628-CE08-4437-BE74-2495B842F43B), which are used for anti-malware signatures. There are released periodically (several times a day). Some businesses may also want to auto-approve security updates to get them deployed quickly.
+
To auto-approve a class of updates, you can specify the Update Classifications GUIDs. We strongly recommend to always specify the DefinitionsUpdates classification (E0789628-CE08-4437-BE74-2495B842F43B), which are used for anti-malware signatures. These are released periodically (several times a day). Some businesses may also want to auto-approve security updates to get them deployed quickly.
Supported operations are Get and Add.
@@ -93,8 +94,8 @@ Update
Supported operation is Get.
-**FailedUpdates/***Failed Update Guid*
-
Update identifier field of the UpdateIdentity GUID that represent an update that failed to download or install.
+**FailedUpdates/_Failed Update Guid_**
+
Update identifier field of the UpdateIdentity GUID that represents an update that failed to download or install.
Supported operation is Get.
@@ -118,7 +119,7 @@ Update
Supported operation is Get.
-**InstalledUpdates/***Installed Update Guid*
+**InstalledUpdates/_Installed Update Guid_**
UpdateIDs that represent the updates installed on a device.
Supported operation is Get.
@@ -133,7 +134,7 @@ Update
Supported operation is Get.
-**InstallableUpdates/***Installable Update Guid*
+**InstallableUpdates/_Installable Update Guid_**
Update identifiers that represent the updates applicable and not installed on a device.
Supported operation is Get.
@@ -141,9 +142,9 @@ Update
**InstallableUpdates/*Installable Update Guid*/Type**
The UpdateClassification value of the update. Valid values are:
-- 0 - None
-- 1 - Security
-- 2 = Critical
+- 0 - None
+- 1 - Security
+- 2 - Critical
Supported operation is Get.
@@ -157,7 +158,7 @@ Update
Supported operation is Get.
-**PendingRebootUpdates/***Pending Reboot Update Guid*
+**PendingRebootUpdates/_Pending Reboot Update Guid_**
Update identifiers for the pending reboot state.
Supported operation is Get.
@@ -188,26 +189,25 @@ Added in Windows 10, version 1803. Node for the rollback operations.
**Rollback/QualityUpdate**
Added in Windows 10, version 1803. Roll back latest Quality Update, if the machine meets the following conditions:
-- Condition 1: Device must be Windows Update for Business Connected
-- Condition 2: Device must be in a Paused State
-- Condition 3: Device must have the Latest Quality Update installed on the device (Current State)
+- Condition 1: Device must be Windows Update for Business Connected
+- Condition 2: Device must be in a Paused State
+- Condition 3: Device must have the Latest Quality Update installed on the device (Current State)
If the conditions are not true, the device will not Roll Back the Latest Quality Update.
**Rollback/FeatureUpdate**
Added in Windows 10, version 1803. Roll Back Latest Feature Update, if the machine meets the following conditions:
-- Condition 1: Device must be Windows Update for Business Connected
-- Condition 2: Device must be in Paused State
-- Condition 3: Device must have the Latest Feature Update Installed on the device (Current State)
-- Condition 4: Machine should be within the uninstall period
+- Condition 1: Device must be Windows Update for Business Connected
+- Condition 2: Device must be in Paused State
+- Condition 3: Device must have the Latest Feature Update Installed on the device (Current State)
+- Condition 4: Machine should be within the uninstall period
-> [!Note]
-> This only works for Semi Annual Channel Targeted devices.
+> [!NOTE]
+> This only works for Semi-Annual Channel Targeted devices.
If the conditions are not true, the device will not Roll Back the Latest Feature Update.
-
**Rollback/QualityUpdateStatus**
Added in Windows 10, version 1803. Returns the result of last RollBack QualityUpdate operation.
@@ -217,6 +217,3 @@ Added in Windows 10, version 1803. Returns the result of last RollBack FeatureUp
## Related topics
[Configuration service provider reference](configuration-service-provider-reference.md)
-
-
-
diff --git a/windows/client-management/mdm/vpnv2-csp.md b/windows/client-management/mdm/vpnv2-csp.md
index 921891e030..15c30be7f5 100644
--- a/windows/client-management/mdm/vpnv2-csp.md
+++ b/windows/client-management/mdm/vpnv2-csp.md
@@ -866,6 +866,17 @@ Added in Windows 10, version 1607. Specifies the class-based default routes. Fo
Value type is bool. Supported operations include Get, Add, Replace, and Delete.
+**VPNv2/**ProfileName**/NativeProfile/PlumbIKEv2TSAsRoutes**
+Determines whether plumbing IPSec traffic selectors as routes onto VPN interface is enabled.
+
+If set to False, plumbing traffic selectors as routes is disabled.
+
+If set to True, plumbing traffic selectors as routes is enabled.
+
+By default, this value is set to False.
+
+Value type is bool. Supported operations include Get, Add, Replace, and Delete.
+
## Examples
@@ -1590,6 +1601,3 @@ Servers
-
-
-
diff --git a/windows/client-management/mdm/w4-application-csp.md b/windows/client-management/mdm/w4-application-csp.md
index 51a1739756..d6b9110b32 100644
--- a/windows/client-management/mdm/w4-application-csp.md
+++ b/windows/client-management/mdm/w4-application-csp.md
@@ -67,15 +67,6 @@ Required. Specifies the address of the MMS application server, as a string. The
**MS**
Optional. The maximum authorized size, in KB, for multimedia content. This parameter takes a numeric value in string format. If the value is not a number, or is less than or equal to 10, it will be ignored and outgoing MMS will not be resized.
-## Remarks
-
-
-Windows Phone MMS does not support user–selectable profiles. While multiple MMS profiles can be provisioned and saved simultaneously, only the last received profile is active.
-
-If provisioning XML is received for a profile with an existing name, the values in that profile will be overwritten with the new values.
-
-For more information about the parameters used by the w4 APPLICATION configuration service provider and how they are used, see the OMA MMS Conformance Document (OMA-TS-MMS-CONF-V1\_3-20051027-C) available from the [OMA website](https://go.microsoft.com/fwlink/p/?LinkId=526900).
-
## Related topics
diff --git a/windows/client-management/mdm/win32appinventory-csp.md b/windows/client-management/mdm/win32appinventory-csp.md
index 1e0af5deb5..c8c22786a1 100644
--- a/windows/client-management/mdm/win32appinventory-csp.md
+++ b/windows/client-management/mdm/win32appinventory-csp.md
@@ -18,9 +18,9 @@ ms.date: 06/26/2017
The Win32AppInventory configuration service provider is used to provide an inventory of installed applications on a device.
The following shows the Win32AppInventory configuration service provider management objects in tree format as used by Open Mobile Alliance Device Management (OMA DM), OMA Client Provisioning, and Enterprise DM.
+
```
-./Vendor/MSFT
-Win32AppInventory
+./Vendor/MSFT/Win32AppInventory
----Win32InstalledProgram
--------InstalledProgram
------------Name
@@ -32,40 +32,41 @@ Win32AppInventory
------------MsiProductCode
------------MsiPackageCode
```
-**./Vendor/MSFT/Win32AppInventory**
+
+**./Vendor/MSFT/Win32AppInventory**
The root node for the Win32AppInventory configuration service provider.
The supported operation is Get.
-**Win32InstalledProgram**
+**Win32InstalledProgram**
This represents an inventory of installed Win32 applications on the device.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram
+**Win32InstalledProgram/_InstalledProgram_**
A node that contains information for a specific application.
-**Win32InstalledProgram/**InstalledProgram**/Name**
+**Win32InstalledProgram/_InstalledProgram_/Name**
A string that specifies the name of the application.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/Publisher**
+**Win32InstalledProgram/_InstalledProgram_/Publisher**
A string that specifies the publisher of the application.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/Version**
+**Win32InstalledProgram/_InstalledProgram_/Version**
A string that specifies the version of the application.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/Language**
+**Win32InstalledProgram/_InstalledProgram_/Language**
A string that specifies the language of the application.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/RegKey**
+**Win32InstalledProgram/_InstalledProgram_/RegKey**
A string that specifies product code or registry subkey.
For MSI-based applications this is the product code.
@@ -74,32 +75,21 @@ For applications found in Add/Remove Programs, this is the registry subkey.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/Source**
+**Win32InstalledProgram/_InstalledProgram_/Source**
A string that specifies where the application was discovered, such as MSI or Add/Remove Programs.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/MsiProductCode**
+**Win32InstalledProgram/_InstalledProgram_/MsiProductCode**
A GUID that uniquely identifies a particular MSI product.
The supported operation is Get.
-**Win32InstalledProgram/**InstalledProgram**/MsiPackageCode**
+**Win32InstalledProgram/_InstalledProgram_/MsiPackageCode**
A GUID that identifies an MSI package. Multiple products can make up a single package.
The supported operation is Get.
## Related topics
-
[Configuration service provider reference](configuration-service-provider-reference.md)
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/windowslicensing-ddf-file.md b/windows/client-management/mdm/windowslicensing-ddf-file.md
index 7b8cb3437e..baa67a10f6 100644
--- a/windows/client-management/mdm/windowslicensing-ddf-file.md
+++ b/windows/client-management/mdm/windowslicensing-ddf-file.md
@@ -146,54 +146,6 @@ The XML below is for Windows 10, version 1809.
-
- UpgradeEditionWithLicense
-
-
-
-
- Provide a license for an edition upgrade of Windows 10 mobile devices. Does not require reboot.
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- LicenseKeyType
-
-
-
-
- Returns the parameter type used by Windows 10 devices for an edition upgrade. Windows 10 desktop devices require a product key for an edition upgrade. Windows 10 mobile devices require a license for an edition upgrade.
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
CheckApplicability
diff --git a/windows/client-management/new-policies-for-windows-10.md b/windows/client-management/new-policies-for-windows-10.md
index d13f235344..793835661a 100644
--- a/windows/client-management/new-policies-for-windows-10.md
+++ b/windows/client-management/new-policies-for-windows-10.md
@@ -519,7 +519,6 @@ No new [Exchange ActiveSync policies](/exchange/mobile-device-mailbox-policies-e
[Changes to Group Policy settings for Start in Windows 10](/windows/configuration/changes-to-start-policies-in-windows-10)
-[Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md)
\ No newline at end of file
diff --git a/windows/client-management/reset-a-windows-10-mobile-device.md b/windows/client-management/reset-a-windows-10-mobile-device.md
deleted file mode 100644
index 8a41883885..0000000000
--- a/windows/client-management/reset-a-windows-10-mobile-device.md
+++ /dev/null
@@ -1,94 +0,0 @@
----
-title: Reset a Windows 10 Mobile device (Windows 10)
-description: There are two methods for resetting a Windows 10 Mobile device factory reset and \ 0034;wipe and persist \ 0034; reset.
-ms.assetid: B42A71F4-DFEE-4D6E-A904-7942D1AAB73F
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-ms.pagetype: mobile
-author: dansimp
-ms.localizationpriority: medium
-ms.date: 07/27/2017
-ms.topic: article
----
-
-# Reset a Windows 10 Mobile device
-
-
-**Applies to**
-
-- Windows 10 Mobile
-
-There are two methods for resetting a Windows 10 Mobile device: factory reset and "wipe and persist" reset.
-
-- **Factory reset** restores the state of the device back to its first-boot state plus any update packages. The reset will not return device to the original factory state. To return the device to the original factory state, you must flash it with the original factory image by using the [Windows Device Recovery Tool](https://support.microsoft.com/help/12379/windows-10-mobile-device-recovery-tool-faq). All the provisioning applied to the device by the enterprise will be lost and will need to be re-applied if needed. For details on what is removed or persists, see [Resetting a mobile device](https://go.microsoft.com/fwlink/p/?LinkID=703715).
-- **"Wipe and persist" reset** preserves all the provisioning applied to the device before the reset. After the "wipe and persist" reset, all the preserved provisioning packages are automatically applied on the device and the data in the enterprise shared storage folder \\Data\\SharedData\\Enterprise\\Persistent is restored in that folder. For more information on the enterprise shared storage folder, see [EnterpriseExtFileSystem CSP](./mdm/enterpriseextfilessystem-csp.md).
-
-You can trigger a reset using your mobile device management (MDM) service, or a user can trigger a reset in the user interface (UI) or by using hardware buttons.
-
-## Reset using MDM
-
-
-The remote wipe command is sent as an XML provisioning file to the device. Since the [RemoteWipe configuration service provider (CSP)](./mdm/remotewipe-csp.md) uses OMA DM and WAP, authentication between client and server and delivery of the XML provisioning file is handled by provisioning. The remote wipe command is implemented on the device by using the **ResetPhone** function. For more information about the data that is removed as a result of the remote wipe command, see [Resetting a mobile device](https://go.microsoft.com/fwlink/p/?LinkId=703715).
-
-To perform a factory reset, restoring the device back to its out-of-box state, use the following syncML.
-
-```
-
-
-
- 3
- -
- ./Vendor/MSFT/RemoteWipe/DoWipe
-
-
-
-
-
-```
-
-To perform a "wipe and persist" reset, preserving the provisioning applied to the device before the reset and persisting data files locally, use the following syncML.
-
-```
-
-
-
- 3
- -
- ./Vendor/MSFT/RemoteWipe/DoWipePersistProvisionedData
-
-
-
-
-
-```
-
-## Reset using the UI
-
-
-1. On your mobile device, go to **Settings** > **System** > **About** > **Reset your Phone**
-
-2. When you tap **Reset your phone**, the dialog box will present an option to **Also remove provisioned content** if:
-
- - At least one provisioning package has been applied, or
- - A file is present in the enterprise shared storage folder \\Data\\SharedData\\Enterprise\\Persistent.
-
- If the option to **Also remove provisioned content** is selected, the reset that ensues is a regular factory reset. If the option is not selected, a "wipe and persist" reset is performed.
-
-## Reset using hardware buttons
-
-
-If your phone is unresponsive and you can't reach **Settings**, you may be able to reset your phone using the hardware buttons. Reset using hardware buttons does not give you the option to persist provisioned content. On Lumia phones (and some others), do the following to reset your phone:
-
-1. Press and hold the **Volume down** and **Power** buttons at the same time until you feel a vibration (about 10–15 seconds).
-
-2. When you feel the vibration, release the buttons, and then immediately press and hold the **Volume down** button until you see a large exclamation mark.
-
-3. When the exclamation mark appears, press the following four buttons in this order: **Volume up**, **Volume down**, **Power**, **Volume down**. Your phone should now reset and restart itself. (It might take a while for the reset to finish.)
-
-
-
-
\ No newline at end of file
diff --git a/windows/client-management/toc.yml b/windows/client-management/toc.yml
new file mode 100644
index 0000000000..4f41f66ba5
--- /dev/null
+++ b/windows/client-management/toc.yml
@@ -0,0 +1,86 @@
+items:
+- name: Windows client management
+ href: index.yml
+ items:
+ - name: Client management tools and settings
+ items:
+ - name: Administrative Tools in Windows 10
+ href: administrative-tools-in-windows-10.md
+ - name: Use Quick Assist to help users
+ href: quick-assist.md
+ - name: Create mandatory user profiles
+ href: mandatory-user-profile.md
+ - name: Connect to remote Azure Active Directory-joined PC
+ href: connect-to-remote-aadj-pc.md
+ - name: New policies for Windows 10
+ href: new-policies-for-windows-10.md
+ - name: Windows 10 default media removal policy
+ href: change-default-removal-policy-external-storage-media.md
+ - name: Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education
+ href: group-policies-for-enterprise-and-education-editions.md
+ - name: Manage the Settings app with Group Policy
+ href: manage-settings-app-with-group-policy.md
+ - name: What version of Windows am I running
+ href: windows-version-search.md
+ - name: Transitioning to modern management
+ href: manage-windows-10-in-your-organization-modern-management.md
+ - name: Windows libraries
+ href: windows-libraries.md
+ - name: Mobile device management (MDM)
+ items:
+ - name: Mobile Device Management
+ href: mdm/index.md
+ - name: Configuration Service Provider (CSP)
+ items:
+ - name: CSP reference
+ href: mdm/configuration-service-provider-reference.md
+ - name: Troubleshoot Windows 10 clients
+ items:
+ - name: Windows 10 support solutions
+ href: windows-10-support-solutions.md
+ - name: Advanced troubleshooting for Windows networking
+ href: troubleshoot-networking.md
+ items:
+ - name: Advanced troubleshooting Wireless network connectivity
+ href: advanced-troubleshooting-wireless-network-connectivity.md
+ - name: Advanced troubleshooting 802.1X authentication
+ href: advanced-troubleshooting-802-authentication.md
+ items:
+ - name: Data collection for troubleshooting 802.1X authentication
+ href: data-collection-for-802-authentication.md
+ - name: Advanced troubleshooting for TCP/IP
+ href: troubleshoot-tcpip.md
+ items:
+ - name: Collect data using Network Monitor
+ href: troubleshoot-tcpip-netmon.md
+ - name: Troubleshoot TCP/IP connectivity
+ href: troubleshoot-tcpip-connectivity.md
+ - name: Troubleshoot port exhaustion
+ href: troubleshoot-tcpip-port-exhaust.md
+ - name: Troubleshoot Remote Procedure Call (RPC) errors
+ href: troubleshoot-tcpip-rpc-errors.md
+ - name: Advanced troubleshooting for Windows startup
+ href: troubleshoot-windows-startup.md
+ items:
+ - name: How to determine the appropriate page file size for 64-bit versions of Windows
+ href: determine-appropriate-page-file-size.md
+ - name: Generate a kernel or complete crash dump
+ href: generate-kernel-or-complete-crash-dump.md
+ - name: Introduction to the page file
+ href: introduction-page-file.md
+ - name: Configure system failure and recovery options in Windows
+ href: system-failure-recovery-options.md
+ - name: Advanced troubleshooting for Windows boot problems
+ href: advanced-troubleshooting-boot-problems.md
+ - name: Advanced troubleshooting for Windows-based computer freeze
+ href: troubleshoot-windows-freeze.md
+ - name: Advanced troubleshooting for stop error or blue screen error
+ href: troubleshoot-stop-errors.md
+ - name: Advanced troubleshooting for stop error 7B or Inaccessible_Boot_Device
+ href: troubleshoot-inaccessible-boot-device.md
+ - name: Advanced troubleshooting for Event ID 41 "The system has rebooted without cleanly shutting down first"
+ href: troubleshoot-event-id-41-restart.md
+ - name: Stop error occurs when you update the in-box Broadcom network adapter driver
+ href: troubleshoot-stop-error-on-broadcom-driver-update.md
+
+
diff --git a/windows/client-management/windows-10-support-solutions.md b/windows/client-management/windows-10-support-solutions.md
index f906dc759d..ef2b5a09cc 100644
--- a/windows/client-management/windows-10-support-solutions.md
+++ b/windows/client-management/windows-10-support-solutions.md
@@ -1,6 +1,6 @@
---
-title: Troubleshooting Windows 10
-description: Learn where to find information about troubleshooting Windows 10 issues, for example Bitlocker issues and bugcheck errors.
+title: Windows 10 support solutions
+description: Learn where to find information about troubleshooting Windows 10 issues, for example BitLocker issues and bugcheck errors.
ms.reviewer: kaushika
manager: dansimp
ms.prod: w10
@@ -12,7 +12,7 @@ ms.localizationpriority: medium
ms.topic: troubleshooting
---
-# Troubleshoot Windows 10 client
+# Windows 10 support solutions
Microsoft regularly releases both updates for Windows Server. To ensure your servers can receive future updates, including security updates, it's important to keep your servers updated. Check out - [Windows 10 and Windows Server 2016 update history](https://support.microsoft.com/en-us/help/4000825/windows-10-windows-server-2016-update-history) for a complete list of released updates.
diff --git a/windows/configuration/changes-to-start-policies-in-windows-10.md b/windows/configuration/changes-to-start-policies-in-windows-10.md
index fe5186f6cf..2deeb1c576 100644
--- a/windows/configuration/changes-to-start-policies-in-windows-10.md
+++ b/windows/configuration/changes-to-start-policies-in-windows-10.md
@@ -8,8 +8,8 @@ keywords: ["group policy", "start menu", "start screen"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 11/28/2017
diff --git a/windows/configuration/configure-windows-10-taskbar.md b/windows/configuration/configure-windows-10-taskbar.md
index 53742aa809..15407ebc50 100644
--- a/windows/configuration/configure-windows-10-taskbar.md
+++ b/windows/configuration/configure-windows-10-taskbar.md
@@ -5,8 +5,8 @@ keywords: ["taskbar layout","pin apps"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 01/18/2018
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-crm.md b/windows/configuration/cortana-at-work/cortana-at-work-crm.md
index 9e2aea142f..e8a0cdee55 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-crm.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-crm.md
@@ -4,9 +4,9 @@ description: How to set up Cortana to give salespeople insights on important CRM
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-feedback.md b/windows/configuration/cortana-at-work/cortana-at-work-feedback.md
index d89ff3d90b..cd31806c01 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-feedback.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-feedback.md
@@ -4,9 +4,9 @@ description: Learn how to send feedback to Microsoft about Cortana at work so yo
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-o365.md b/windows/configuration/cortana-at-work/cortana-at-work-o365.md
index f13d9c9040..2241f9d819 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-o365.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-o365.md
@@ -4,9 +4,9 @@ description: Learn how to connect Cortana to Office 365 so employees are notifie
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-overview.md b/windows/configuration/cortana-at-work/cortana-at-work-overview.md
index 521df6bcfc..5d25f337c9 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-overview.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-overview.md
@@ -6,9 +6,9 @@ description: Cortana includes powerful configuration options specifically to opt
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
---
# Configure Cortana in Windows 10
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
index e01908c73b..2d82042faa 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
@@ -4,9 +4,9 @@ description: The list of Group Policy and mobile device management (MDM) policy
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
index 6bf6aaf7bd..65919eb8e8 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
@@ -4,9 +4,9 @@ description: How to integrate Cortana with Power BI to help your employees get a
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
index e2dfea47f8..2b6dca5a4a 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
@@ -4,9 +4,9 @@ description: A test scenario walking you through signing in and managing the not
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.reviewer:
manager: dansimp
---
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
index c33346c27f..33ac963a8e 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
@@ -4,9 +4,9 @@ description: A test scenario about how to perform a quick search with Cortana at
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
index 5382e5665c..b3c72fad56 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
@@ -4,9 +4,9 @@ description: A test scenario about how to set a location-based reminder using Co
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
index 1a34778608..f5377cf7c3 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
@@ -4,9 +4,9 @@ description: A test scenario about how to use Cortana at work to find your upcom
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
index 6312ad8983..a434e14f90 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
@@ -4,9 +4,9 @@ description: A test scenario about how to use Cortana at work to send email to a
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
index b2c7bdd9dd..9abb865b58 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
@@ -4,9 +4,9 @@ description: A test scenario about how to use Cortana with the Suggested reminde
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
index c10a722ceb..5b6970f37b 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
@@ -4,9 +4,9 @@ description: An optional test scenario about how to use Cortana at work with Win
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md b/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
index 9ab3b96e22..46b62aec12 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
@@ -4,9 +4,9 @@ description: A list of suggested testing scenarios that you can use to test Cort
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
index 229a2be971..478aeb7938 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
@@ -4,9 +4,9 @@ description: How to create voice commands that use Cortana to perform voice-enab
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md b/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
index 5f35fb8ca0..addf307b70 100644
--- a/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
+++ b/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
@@ -6,9 +6,9 @@ description: Cortana includes powerful configuration options specifically to opt
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
---
# Set up and test Cortana in Windows 10, version 2004 and later
diff --git a/windows/configuration/cortana-at-work/test-scenario-1.md b/windows/configuration/cortana-at-work/test-scenario-1.md
index 27402c3b61..daef056559 100644
--- a/windows/configuration/cortana-at-work/test-scenario-1.md
+++ b/windows/configuration/cortana-at-work/test-scenario-1.md
@@ -4,9 +4,9 @@ description: A test scenario about how to sign in with your work or school accou
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/test-scenario-2.md b/windows/configuration/cortana-at-work/test-scenario-2.md
index caf24e5f85..36934cf4a6 100644
--- a/windows/configuration/cortana-at-work/test-scenario-2.md
+++ b/windows/configuration/cortana-at-work/test-scenario-2.md
@@ -4,9 +4,9 @@ description: A test scenario about how to perform a quick search with Cortana at
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/test-scenario-3.md b/windows/configuration/cortana-at-work/test-scenario-3.md
index e348a1cee9..709082bda6 100644
--- a/windows/configuration/cortana-at-work/test-scenario-3.md
+++ b/windows/configuration/cortana-at-work/test-scenario-3.md
@@ -4,9 +4,9 @@ description: A test scenario about how to set up, review, and edit a reminder ba
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/test-scenario-4.md b/windows/configuration/cortana-at-work/test-scenario-4.md
index a0ea0e6332..b15cd265db 100644
--- a/windows/configuration/cortana-at-work/test-scenario-4.md
+++ b/windows/configuration/cortana-at-work/test-scenario-4.md
@@ -4,9 +4,9 @@ description: A test scenario about how to use Cortana at work to find your upcom
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/test-scenario-5.md b/windows/configuration/cortana-at-work/test-scenario-5.md
index ec1cb06e32..3dabe7811b 100644
--- a/windows/configuration/cortana-at-work/test-scenario-5.md
+++ b/windows/configuration/cortana-at-work/test-scenario-5.md
@@ -4,9 +4,9 @@ description: A test scenario about how to use Cortana at work to send email to a
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/test-scenario-6.md b/windows/configuration/cortana-at-work/test-scenario-6.md
index 6b23f0c1af..88853dfe0d 100644
--- a/windows/configuration/cortana-at-work/test-scenario-6.md
+++ b/windows/configuration/cortana-at-work/test-scenario-6.md
@@ -4,9 +4,9 @@ description: A test scenario about how to use Cortana with the Suggested reminde
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md b/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md
index 03d098501d..3933c23706 100644
--- a/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md
+++ b/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md
@@ -4,9 +4,9 @@ description: A list of suggested testing scenarios that you can use to test Cort
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.date: 10/05/2017
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/customize-and-export-start-layout.md b/windows/configuration/customize-and-export-start-layout.md
index a2266f5239..601ad70810 100644
--- a/windows/configuration/customize-and-export-start-layout.md
+++ b/windows/configuration/customize-and-export-start-layout.md
@@ -8,8 +8,8 @@ keywords: ["start screen"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 09/18/2018
diff --git a/windows/configuration/customize-windows-10-start-screens-by-using-group-policy.md b/windows/configuration/customize-windows-10-start-screens-by-using-group-policy.md
index 6f7c6e2b24..12f62c8444 100644
--- a/windows/configuration/customize-windows-10-start-screens-by-using-group-policy.md
+++ b/windows/configuration/customize-windows-10-start-screens-by-using-group-policy.md
@@ -8,9 +8,9 @@ keywords: ["Start layout", "start menu", "layout", "group policy"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md b/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md
index 455f7b311f..814515de59 100644
--- a/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md
+++ b/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md
@@ -8,9 +8,9 @@ keywords: ["start screen", "start menu"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.topic: article
-ms.author: dansimp
+ms.author: greglin
ms.localizationpriority: medium
ms.date: 02/08/2018
---
diff --git a/windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md b/windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
index 966c801287..ea856b24cd 100644
--- a/windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
+++ b/windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
@@ -8,8 +8,8 @@ keywords: ["Start layout", "start menu"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
---
diff --git a/windows/configuration/find-the-application-user-model-id-of-an-installed-app.md b/windows/configuration/find-the-application-user-model-id-of-an-installed-app.md
index 2e441e90d2..b255491bc9 100644
--- a/windows/configuration/find-the-application-user-model-id-of-an-installed-app.md
+++ b/windows/configuration/find-the-application-user-model-id-of-an-installed-app.md
@@ -3,8 +3,8 @@ title: Find the Application User Model ID of an installed app
ms.reviewer:
manager: dansimp
description: To configure assigned access (kiosk mode), you need the Application User Model ID (AUMID) of apps installed on a device.
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.prod: w10
diff --git a/windows/configuration/guidelines-for-assigned-access-app.md b/windows/configuration/guidelines-for-assigned-access-app.md
index ffac3bf28e..d24b76cd0c 100644
--- a/windows/configuration/guidelines-for-assigned-access-app.md
+++ b/windows/configuration/guidelines-for-assigned-access-app.md
@@ -5,9 +5,9 @@ keywords: ["kiosk", "lockdown", "assigned access"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 10/02/2018
ms.reviewer:
diff --git a/windows/configuration/kiosk-additional-reference.md b/windows/configuration/kiosk-additional-reference.md
index aa203bd090..67f49befe3 100644
--- a/windows/configuration/kiosk-additional-reference.md
+++ b/windows/configuration/kiosk-additional-reference.md
@@ -4,12 +4,12 @@ description: Find more information for configuring, validating, and troubleshoot
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.topic: reference
---
diff --git a/windows/configuration/kiosk-mdm-bridge.md b/windows/configuration/kiosk-mdm-bridge.md
index fbeb8c5ffa..73c8fdcc17 100644
--- a/windows/configuration/kiosk-mdm-bridge.md
+++ b/windows/configuration/kiosk-mdm-bridge.md
@@ -4,12 +4,12 @@ description: Environments that use Windows Management Instrumentation (WMI) can
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 11/07/2018
ms.topic: article
diff --git a/windows/configuration/kiosk-methods.md b/windows/configuration/kiosk-methods.md
index 0ff39ff4c9..0f19463f6b 100644
--- a/windows/configuration/kiosk-methods.md
+++ b/windows/configuration/kiosk-methods.md
@@ -2,14 +2,14 @@
title: Configure kiosks and digital signs on Windows desktop editions (Windows 10)
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
description: In this article, learn about the methods for configuring kiosks and digital signs on Windows desktop editions.
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: security
ms.localizationpriority: medium
-author: dansimp
+author: greg-lindsay
ms.topic: article
---
diff --git a/windows/configuration/kiosk-policies.md b/windows/configuration/kiosk-policies.md
index db710d4115..9f817f7581 100644
--- a/windows/configuration/kiosk-policies.md
+++ b/windows/configuration/kiosk-policies.md
@@ -9,10 +9,10 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: edu, security
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 07/30/2018
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/kiosk-prepare.md b/windows/configuration/kiosk-prepare.md
index 95183efe94..cd326e6f66 100644
--- a/windows/configuration/kiosk-prepare.md
+++ b/windows/configuration/kiosk-prepare.md
@@ -4,12 +4,12 @@ description: Learn how to prepare a device for kiosk configuration. Also, learn
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.topic: article
---
diff --git a/windows/configuration/kiosk-shelllauncher.md b/windows/configuration/kiosk-shelllauncher.md
index 6bbcf680f1..f510b637bd 100644
--- a/windows/configuration/kiosk-shelllauncher.md
+++ b/windows/configuration/kiosk-shelllauncher.md
@@ -4,12 +4,12 @@ description: Shell Launcher lets you change the default shell that launches when
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.topic: article
---
diff --git a/windows/configuration/kiosk-single-app.md b/windows/configuration/kiosk-single-app.md
index 3c1af9b241..ca176d9d44 100644
--- a/windows/configuration/kiosk-single-app.md
+++ b/windows/configuration/kiosk-single-app.md
@@ -4,12 +4,12 @@ description: A single-use device is easy to set up in Windows 10 for desktop ed
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 01/09/2019
ms.topic: article
@@ -212,9 +212,9 @@ When you use the **Provision kiosk devices** wizard in Windows Configuration Des
  Enable account management if you want to configure settings on this page. If enabled:You can enroll the device in Active Directory, enroll in Azure Active Directory, or create a local administrator account on the deviceTo enroll the device in Active Directory, enter the credentials for a least-privileged user account to join the device to the domain.Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, set up Azure AD join in your organization. The maximum number of devices per user setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. To enroll the device in Azure AD, select that option and enter a friendly name for the bulk token you will get using the wizard. Set an expiration date for the token (maximum is 180 days from the date you get the token). Click Get bulk token. In the Let's get you signed in window, enter an account that has permissions to join a device to Azure AD, and then the password. Click Accept to give Windows Configuration Designer the necessary permissions.Warning: You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.To create a local administrator account, select that option and enter a user name and password. Important: If you create a local account in the provisioning package, you must change the password using the Settings app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. |  |
  You can provision the kiosk app in the Add applications step. You can install multiple applications, both Windows desktop applications (Win32) and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see Provision PCs with appsWarning: If you click the plus button to add an application, you must specify an application for the provisioning package to validate. If you click the plus button in error, select any executable file in Installer Path, and then a Cancel button becomes available, allowing you to complete the provisioning package without an application. |  |
  To provision the device with a certificate for the kiosk app, click Add a certificate. Enter a name for the certificate, and then browse to and select the certificate to be used. |  |
-  You can create a local standard user account that will be used to run the kiosk app. If you toggle No, make sure that you have an existing user account to run the kiosk app.If you want to create an account, enter the user name and password, and then toggle Yes or No to automatically sign in the account when the device starts. (If you encounter issues with auto sign-in after you apply the provisioning package, check the Event Viewer logs for auto logon issues under Applications and Services Logs\Microsoft\Windows\Authentication User Interface\Operational.)In Configure the kiosk mode app, enter the name of the user account that will run the kiosk mode app. Select the type of app to run in kiosk mode, and then enter the path or filename (for a Windows desktop application) or the AUMID (for a Universal Windows app). For a Windows desktop application, you can use the filename if the path to the file is in the PATH environment variable, otherwise the full path is required. |  |
+| You can create a local standard user account that will be used to run the kiosk app. If you toggle No, make sure that you have an existing user account to run the kiosk app.If you want to create an account, enter the user name and password, and then toggle Yes or No to automatically sign in the account when the device starts. (If you encounter issues with auto sign-in after you apply the provisioning package, check the Event Viewer logs for auto logon issues under Applications and Services Logs\Microsoft\Windows\Authentication User Interface\Operational.)In Configure the kiosk mode app, enter the name of the user account that will run the kiosk mode app. Select the type of app to run in kiosk mode, and then enter the path or filename (for a Windows desktop application) or the AUMID (for a Universal Windows app). For a Windows desktop application, you can use the filename if the path to the file is in the PATH environment variable, otherwise the full path is required. | |
  On this step, select your options for tablet mode, the user experience on the Welcome and shutdown screens, and the timeout settings. |  |
-  You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device. |  |
+| You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device. | |
diff --git a/windows/configuration/kiosk-troubleshoot.md b/windows/configuration/kiosk-troubleshoot.md
index 479b7ca96e..75781737fb 100644
--- a/windows/configuration/kiosk-troubleshoot.md
+++ b/windows/configuration/kiosk-troubleshoot.md
@@ -9,9 +9,9 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: edu, security
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/kiosk-validate.md b/windows/configuration/kiosk-validate.md
index caddd7065c..13ba945753 100644
--- a/windows/configuration/kiosk-validate.md
+++ b/windows/configuration/kiosk-validate.md
@@ -4,12 +4,12 @@ description: In this article, learn what to expect on a multi-app kiosk in Windo
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 07/30/2018
ms.topic: article
diff --git a/windows/configuration/kiosk-xml.md b/windows/configuration/kiosk-xml.md
index c0eb573c32..36dd8ce054 100644
--- a/windows/configuration/kiosk-xml.md
+++ b/windows/configuration/kiosk-xml.md
@@ -9,10 +9,10 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: edu, security
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 10/02/2018
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
@@ -26,7 +26,7 @@ ms.topic: article
## Full XML sample
>[!NOTE]
->Updated for Windows 10, version 1903, and Windows 10 Insider Preview (19H2, 20H1 builds).
+>Updated for Windows 10, version 1903, 1909, and 2004.
```xml
@@ -254,8 +254,8 @@ This sample demonstrates that both UWP and Win32 apps can be configured to autom
```
-## [Preview] Global Profile Sample XML
-Global Profile is currently supported in Windows 10 Insider Preview (20H1 builds). Global Profile is designed for scenarios where a user does not have a designated profile, yet IT Admin still wants the user to run in lockdown mode, or used as mitigation when a profile cannot be determined for a user.
+## Global Profile Sample XML
+Global Profile is currently supported in Windows 10, version 2004. Global Profile is designed for scenarios where a user does not have a designated profile, yet IT Admin still wants the user to run in lockdown mode, or used as mitigation when a profile cannot be determined for a user.
This sample demonstrates that only a global profile is used, no active user configured. Global profile will be applied when every non-admin account logs in
```xml
@@ -393,8 +393,8 @@ Below sample shows dedicated profile and global profile mixed usage, a user woul
```
-## [Preview] Folder Access sample xml
-In Windows 10, version 1809, folder access is locked down so that when common file dialog is opened, IT Admin can specify if the user has access to the Downloads folder, or no access to any folder at all. This restriction has been redesigned for finer granulatity and easier use, and is available in Windows 10 Insider Preview (19H2, 20H1 builds).
+## Folder Access sample xml
+In Windows 10, version 1809, folder access is locked down so that when common file dialog is opened, IT Admin can specify if the user has access to the Downloads folder, or no access to any folder at all. This restriction has been redesigned for finer granularity and easier use, and is available in Windows 10 version 2009 and later.
IT Admin now can specify user access to Downloads folder, Removable drives, or no restrictions at all. Downloads and Removable Drives can be allowed at the same time.
@@ -636,7 +636,7 @@ IT Admin now can specify user access to Downloads folder, Removable drives, or n
## XSD for AssignedAccess configuration XML
>[!NOTE]
->Updated for Windows 10, version 1903 and Windows 10 Insider Preview (19H2, 20H1 builds).
+>Updated for Windows 10, version 1903 and later.
Below schema is for AssignedAccess Configuration up to Windows 10 1803 release.
```xml
@@ -859,7 +859,7 @@ Here is the schema for new features introduced in Windows 10 1809 release
```
-Schema for Windows 10 Insider Preview (19H2, 20H1 builds)
+Schema for Windows 10, version 1909 and later
```xml
  Enable account management if you want to configure settings on this page. You can enroll the device in Active Directory, enroll in Azure Active Directory, or create a local administrator account on the deviceTo enroll the device in Active Directory, enter the credentials for a least-privileged user account to join the device to the domain.Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, set up Azure AD join in your organization. The maximum number of devices per user setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. To enroll the device in Azure AD, select that option and enter a friendly name for the bulk token you will get using the wizard. Set an expiration date for the token (maximum is 180 days from the date you get the token). Click Get bulk token. In the Let's get you signed in window, enter an account that has permissions to join a device to Azure AD, and then the password. Click Accept to give Windows Configuration Designer the necessary permissions. To create a local administrator account, select that option and enter a user name and password. Important: If you create a local account in the provisioning package, you must change the password using the Settings app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. |  |
  You can install multiple applications, both Windows desktop applications (Win32) and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see Provision PCs with apps. |  |
  To provision the device with a certificate, click Add a certificate. Enter a name for the certificate, and then browse to and select the certificate to be used. |  |
-  You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device. |  |
+| You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device. | |
After you're done, click **Create**. It only takes a few seconds. When the package is built, the location where the package is stored is displayed as a hyperlink at the bottom of the page.
diff --git a/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
index cc40946bcb..a71916bfab 100644
--- a/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
+++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
@@ -5,8 +5,8 @@ keywords: ["runtime provisioning", "provisioning package"]
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provision-pcs-with-apps.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
index cf1dde06dc..cca8b46be8 100644
--- a/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
+++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
@@ -5,9 +5,9 @@ keywords: ["runtime provisioning", "provisioning package"]
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/provisioning-packages/provisioning-apply-package.md b/windows/configuration/provisioning-packages/provisioning-apply-package.md
index 2760481053..4a1bb159ac 100644
--- a/windows/configuration/provisioning-packages/provisioning-apply-package.md
+++ b/windows/configuration/provisioning-packages/provisioning-apply-package.md
@@ -4,8 +4,8 @@ description: Provisioning packages can be applied to a device during the first-r
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 08/22/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-command-line.md b/windows/configuration/provisioning-packages/provisioning-command-line.md
index 62e14f6e7a..d4debef680 100644
--- a/windows/configuration/provisioning-packages/provisioning-command-line.md
+++ b/windows/configuration/provisioning-packages/provisioning-command-line.md
@@ -4,8 +4,8 @@ description:
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-create-package.md b/windows/configuration/provisioning-packages/provisioning-create-package.md
index 946eaef66b..b67e28b34d 100644
--- a/windows/configuration/provisioning-packages/provisioning-create-package.md
+++ b/windows/configuration/provisioning-packages/provisioning-create-package.md
@@ -4,8 +4,8 @@ description: Learn how to create a provisioning package for Windows 10, which le
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-how-it-works.md b/windows/configuration/provisioning-packages/provisioning-how-it-works.md
index 46b7f1524f..5942a86179 100644
--- a/windows/configuration/provisioning-packages/provisioning-how-it-works.md
+++ b/windows/configuration/provisioning-packages/provisioning-how-it-works.md
@@ -4,8 +4,8 @@ description: A provisioning package (.ppkg) is a container for a collection of c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-install-icd.md b/windows/configuration/provisioning-packages/provisioning-install-icd.md
index 6fc7d6234f..8a7b9c464d 100644
--- a/windows/configuration/provisioning-packages/provisioning-install-icd.md
+++ b/windows/configuration/provisioning-packages/provisioning-install-icd.md
@@ -4,8 +4,8 @@ description: Learn how to install and use Windows Configuration Designer so you
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 10/16/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-multivariant.md b/windows/configuration/provisioning-packages/provisioning-multivariant.md
index 6d642dc5a8..e5d60aba7f 100644
--- a/windows/configuration/provisioning-packages/provisioning-multivariant.md
+++ b/windows/configuration/provisioning-packages/provisioning-multivariant.md
@@ -4,13 +4,13 @@ description: Create a provisioning package with multivariant settings to customi
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.topic: article
ms.localizationpriority: medium
ms.date: 11/08/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
# Create a provisioning package with multivariant settings
diff --git a/windows/configuration/provisioning-packages/provisioning-packages.md b/windows/configuration/provisioning-packages/provisioning-packages.md
index 0542d32d99..2313b0e929 100644
--- a/windows/configuration/provisioning-packages/provisioning-packages.md
+++ b/windows/configuration/provisioning-packages/provisioning-packages.md
@@ -7,8 +7,8 @@ manager: dansimp
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-powershell.md b/windows/configuration/provisioning-packages/provisioning-powershell.md
index 02c28c2b6d..4ed15d47fc 100644
--- a/windows/configuration/provisioning-packages/provisioning-powershell.md
+++ b/windows/configuration/provisioning-packages/provisioning-powershell.md
@@ -4,8 +4,8 @@ description:
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md b/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md
index 6a96d2a9a1..a616731808 100644
--- a/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md
+++ b/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md
@@ -4,8 +4,8 @@ description: With Windows 10, you can create provisioning packages that let you
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/provisioning-packages/provisioning-uninstall-package.md b/windows/configuration/provisioning-packages/provisioning-uninstall-package.md
index 08dc36142b..02e79a47a9 100644
--- a/windows/configuration/provisioning-packages/provisioning-uninstall-package.md
+++ b/windows/configuration/provisioning-packages/provisioning-uninstall-package.md
@@ -4,8 +4,8 @@ description: This topic lists the settings that are reverted when you uninstall
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 0089131ba6..6271219315 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -5,8 +5,8 @@ keywords: ["shared pc mode"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.reviewer:
diff --git a/windows/configuration/setup-digital-signage.md b/windows/configuration/setup-digital-signage.md
index ea28c23abd..80bbd5b7da 100644
--- a/windows/configuration/setup-digital-signage.md
+++ b/windows/configuration/setup-digital-signage.md
@@ -4,12 +4,12 @@ description: A single-use device such as a digital sign is easy to set up in Win
ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
keywords: ["assigned access", "kiosk", "lockdown", "digital sign", "digital signage", "kiosk browser", "browser"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 10/02/2018
ms.topic: article
diff --git a/windows/configuration/start-layout-troubleshoot.md b/windows/configuration/start-layout-troubleshoot.md
index 7e22c5ecb6..24dbcd1b32 100644
--- a/windows/configuration/start-layout-troubleshoot.md
+++ b/windows/configuration/start-layout-troubleshoot.md
@@ -4,8 +4,8 @@ description: Learn how to troubleshoot common Start menu errors in Windows 10. F
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-ms.author: dansimp
-author: dansimp
+ms.author: greglin
+author: greg-lindsay
ms.localizationpriority: medium
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/start-layout-xml-desktop.md b/windows/configuration/start-layout-xml-desktop.md
index e3704b03a6..49a2494418 100644
--- a/windows/configuration/start-layout-xml-desktop.md
+++ b/windows/configuration/start-layout-xml-desktop.md
@@ -5,8 +5,8 @@ keywords: ["start screen"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.date: 10/02/2018
ms.reviewer:
diff --git a/windows/configuration/start-secondary-tiles.md b/windows/configuration/start-secondary-tiles.md
index 57f5af4735..d988f11531 100644
--- a/windows/configuration/start-secondary-tiles.md
+++ b/windows/configuration/start-secondary-tiles.md
@@ -6,8 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: security
ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/stop-employees-from-using-microsoft-store.md b/windows/configuration/stop-employees-from-using-microsoft-store.md
index 0807229078..1f02d08053 100644
--- a/windows/configuration/stop-employees-from-using-microsoft-store.md
+++ b/windows/configuration/stop-employees-from-using-microsoft-store.md
@@ -8,8 +8,8 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store, mobile
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: conceptual
ms.localizationpriority: medium
ms.date: 4/16/2018
diff --git a/windows/configuration/ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md b/windows/configuration/ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md
index 1ac80eee49..5a6de72bf1 100644
--- a/windows/configuration/ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md
+++ b/windows/configuration/ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md
@@ -1,7 +1,7 @@
---
title: Administering UE-V with Windows PowerShell and WMI
description: Learn how User Experience Virtualization (UE-V) provides Windows PowerShell cmdlets to help administrators perform various UE-V tasks.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-administering-uev.md b/windows/configuration/ue-v/uev-administering-uev.md
index ae0c0dc0e4..819a185439 100644
--- a/windows/configuration/ue-v/uev-administering-uev.md
+++ b/windows/configuration/ue-v/uev-administering-uev.md
@@ -1,7 +1,7 @@
---
title: Administering UE-V
description: Learn how to perform administrative tasks for User Experience Virtualization (UE-V). These tasks include configuring the UE-V service and recovering lost settings.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-application-template-schema-reference.md b/windows/configuration/ue-v/uev-application-template-schema-reference.md
index 9fb9d1704d..1ac2f752ac 100644
--- a/windows/configuration/ue-v/uev-application-template-schema-reference.md
+++ b/windows/configuration/ue-v/uev-application-template-schema-reference.md
@@ -1,7 +1,7 @@
---
title: Application Template Schema Reference for UE-V
description: Learn details about the XML structure of the UE-V settings location templates and learn how to edit these files.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-changing-the-frequency-of-scheduled-tasks.md b/windows/configuration/ue-v/uev-changing-the-frequency-of-scheduled-tasks.md
index 3b63f09133..95f6808caf 100644
--- a/windows/configuration/ue-v/uev-changing-the-frequency-of-scheduled-tasks.md
+++ b/windows/configuration/ue-v/uev-changing-the-frequency-of-scheduled-tasks.md
@@ -1,7 +1,7 @@
---
title: Changing the Frequency of UE-V Scheduled Tasks
description: Learn how to create a script that uses the Schtasks.exe command-line options so you can change the frequency of UE-V scheduled tasks.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-configuring-uev-with-group-policy-objects.md b/windows/configuration/ue-v/uev-configuring-uev-with-group-policy-objects.md
index 2a85dc79f2..852fd636c1 100644
--- a/windows/configuration/ue-v/uev-configuring-uev-with-group-policy-objects.md
+++ b/windows/configuration/ue-v/uev-configuring-uev-with-group-policy-objects.md
@@ -1,7 +1,7 @@
---
title: Configuring UE-V with Group Policy Objects
description: In this article, learn how to configure User Experience Virtualization (UE-V) with Group Policy objects.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-configuring-uev-with-system-center-configuration-manager.md b/windows/configuration/ue-v/uev-configuring-uev-with-system-center-configuration-manager.md
index 2ced4afd25..742b25f00e 100644
--- a/windows/configuration/ue-v/uev-configuring-uev-with-system-center-configuration-manager.md
+++ b/windows/configuration/ue-v/uev-configuring-uev-with-system-center-configuration-manager.md
@@ -1,7 +1,7 @@
---
title: Configuring UE-V with Microsoft Endpoint Configuration Manager
description: Learn how to configure User Experience Virtualization (UE-V) with Microsoft Endpoint Configuration Manager.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-deploy-required-features.md b/windows/configuration/ue-v/uev-deploy-required-features.md
index dd861cea0f..7b078d49b1 100644
--- a/windows/configuration/ue-v/uev-deploy-required-features.md
+++ b/windows/configuration/ue-v/uev-deploy-required-features.md
@@ -1,7 +1,7 @@
---
title: Deploy required UE-V features
description: Learn how to install and configure User Experience Virtualization (UE-V) features, for example a network share that stores and retrieves user settings.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-deploy-uev-for-custom-applications.md b/windows/configuration/ue-v/uev-deploy-uev-for-custom-applications.md
index 8e69dc7cf3..83744db2ca 100644
--- a/windows/configuration/ue-v/uev-deploy-uev-for-custom-applications.md
+++ b/windows/configuration/ue-v/uev-deploy-uev-for-custom-applications.md
@@ -1,7 +1,7 @@
---
title: Use UE-V with custom applications
description: Use User Experience Virtualization (UE-V) to create your own custom settings location templates with the UE-V template generator.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-for-windows.md b/windows/configuration/ue-v/uev-for-windows.md
index 23ae2d9c91..bb6d70d870 100644
--- a/windows/configuration/ue-v/uev-for-windows.md
+++ b/windows/configuration/ue-v/uev-for-windows.md
@@ -1,7 +1,7 @@
---
title: User Experience Virtualization for Windows 10, version 1607
description: Overview of User Experience Virtualization for Windows 10, version 1607
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 05/02/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-getting-started.md b/windows/configuration/ue-v/uev-getting-started.md
index debae0eb95..2b8d0a7d04 100644
--- a/windows/configuration/ue-v/uev-getting-started.md
+++ b/windows/configuration/ue-v/uev-getting-started.md
@@ -1,7 +1,7 @@
---
title: Get Started with UE-V
description: Use the steps in this article to deploy User Experience Virtualization (UE-V) for the first time in a test environment.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 03/08/2018
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
---
# Get Started with UE-V
diff --git a/windows/configuration/ue-v/uev-manage-administrative-backup-and-restore.md b/windows/configuration/ue-v/uev-manage-administrative-backup-and-restore.md
index f953320ab4..d992db0cca 100644
--- a/windows/configuration/ue-v/uev-manage-administrative-backup-and-restore.md
+++ b/windows/configuration/ue-v/uev-manage-administrative-backup-and-restore.md
@@ -1,7 +1,7 @@
---
title: Manage Administrative Backup and Restore in UE-V
description: Learn how an administrator of User Experience Virtualization (UE-V) can back up and restore application and Windows settings to their original state.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-manage-configurations.md b/windows/configuration/ue-v/uev-manage-configurations.md
index 7189998439..1f773b7392 100644
--- a/windows/configuration/ue-v/uev-manage-configurations.md
+++ b/windows/configuration/ue-v/uev-manage-configurations.md
@@ -1,7 +1,7 @@
---
title: Manage Configurations for UE-V
description: Learn to manage the configuration of the User Experience Virtualization (UE-V) service and also learn to manage storage locations for UE-V resources.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md b/windows/configuration/ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md
index 07c7b40039..778370f194 100644
--- a/windows/configuration/ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md
+++ b/windows/configuration/ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md
@@ -1,7 +1,7 @@
---
title: Managing UE-V Settings Location Templates Using Windows PowerShell and WMI
description: Managing UE-V Settings Location Templates Using Windows PowerShell and WMI
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md b/windows/configuration/ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md
index 98b17b34e9..6d3b2e88dd 100644
--- a/windows/configuration/ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md
+++ b/windows/configuration/ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md
@@ -1,7 +1,7 @@
---
title: Manage UE-V Service and Packages with Windows PowerShell and WMI
description: Managing the UE-V service and packages with Windows PowerShell and WMI
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-migrating-settings-packages.md b/windows/configuration/ue-v/uev-migrating-settings-packages.md
index f9658f41a1..1b4c026987 100644
--- a/windows/configuration/ue-v/uev-migrating-settings-packages.md
+++ b/windows/configuration/ue-v/uev-migrating-settings-packages.md
@@ -1,7 +1,7 @@
---
title: Migrating UE-V settings packages
description: Learn to relocate User Experience Virtualization (UE-V) user settings packages either when you migrate to a new server or when you perform backups.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-prepare-for-deployment.md b/windows/configuration/ue-v/uev-prepare-for-deployment.md
index d1971558f4..f2642675a7 100644
--- a/windows/configuration/ue-v/uev-prepare-for-deployment.md
+++ b/windows/configuration/ue-v/uev-prepare-for-deployment.md
@@ -1,7 +1,7 @@
---
title: Prepare a UE-V Deployment
description: Learn about the types of User Experience Virtualization (UE-V) deployment you can execute and what preparations you can make beforehand to be successful.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-release-notes-1607.md b/windows/configuration/ue-v/uev-release-notes-1607.md
index 7c5805ff7d..91fb17d0de 100644
--- a/windows/configuration/ue-v/uev-release-notes-1607.md
+++ b/windows/configuration/ue-v/uev-release-notes-1607.md
@@ -1,7 +1,7 @@
---
title: User Experience Virtualization (UE-V) Release Notes
description: Read the latest information required to successfully install and use User Experience Virtualization (UE-V) that is not included in the UE-V documentation.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-security-considerations.md b/windows/configuration/ue-v/uev-security-considerations.md
index c45565ed5f..1548071462 100644
--- a/windows/configuration/ue-v/uev-security-considerations.md
+++ b/windows/configuration/ue-v/uev-security-considerations.md
@@ -1,7 +1,7 @@
---
title: Security Considerations for UE-V
description: Learn about accounts and groups, log files, and other security-related considerations for User Experience Virtualization (UE-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-sync-methods.md b/windows/configuration/ue-v/uev-sync-methods.md
index 02d1e1d9af..ad5f8b92dd 100644
--- a/windows/configuration/ue-v/uev-sync-methods.md
+++ b/windows/configuration/ue-v/uev-sync-methods.md
@@ -1,7 +1,7 @@
---
title: Sync Methods for UE-V
description: Learn how User Experience Virtualization (UE-V) service sync methods let you synchronize users’ application and Windows settings with the settings storage location.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-sync-trigger-events.md b/windows/configuration/ue-v/uev-sync-trigger-events.md
index 0db2a582f4..1c4975fe78 100644
--- a/windows/configuration/ue-v/uev-sync-trigger-events.md
+++ b/windows/configuration/ue-v/uev-sync-trigger-events.md
@@ -1,7 +1,7 @@
---
title: Sync Trigger Events for UE-V
description: Learn how User Experience Virtualization (UE-V) lets you synchronize your application and Windows settings across all your domain-joined devices.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-synchronizing-microsoft-office-with-uev.md b/windows/configuration/ue-v/uev-synchronizing-microsoft-office-with-uev.md
index f5e4f43205..6426a311cb 100644
--- a/windows/configuration/ue-v/uev-synchronizing-microsoft-office-with-uev.md
+++ b/windows/configuration/ue-v/uev-synchronizing-microsoft-office-with-uev.md
@@ -1,7 +1,7 @@
---
title: Synchronizing Microsoft Office with UE-V
description: Learn how User Experience Virtualization (UE-V) supports the synchronization of Microsoft Office application settings.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-technical-reference.md b/windows/configuration/ue-v/uev-technical-reference.md
index 8f0feaabbc..8640bb97f1 100644
--- a/windows/configuration/ue-v/uev-technical-reference.md
+++ b/windows/configuration/ue-v/uev-technical-reference.md
@@ -1,7 +1,7 @@
---
title: Technical Reference for UE-V
description: Use this technical reference to learn about the various features of User Experience Virtualization (UE-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-troubleshooting.md b/windows/configuration/ue-v/uev-troubleshooting.md
index 7e51868298..7b59eff17d 100644
--- a/windows/configuration/ue-v/uev-troubleshooting.md
+++ b/windows/configuration/ue-v/uev-troubleshooting.md
@@ -1,7 +1,7 @@
---
title: Troubleshooting UE-V
description: Use this technical reference to find resources for troubleshooting User Experience Virtualization (UE-V) for Windows 10.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md b/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
index 6090c8879e..44febde285 100644
--- a/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
+++ b/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
@@ -1,7 +1,7 @@
---
title: Upgrade to UE-V for Windows 10
description: Use these few adjustments to upgrade from User Experience Virtualization (UE-V) 2.x to the latest version of UE-V.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-using-uev-with-application-virtualization-applications.md b/windows/configuration/ue-v/uev-using-uev-with-application-virtualization-applications.md
index 2d435e85ed..cfaddd69f8 100644
--- a/windows/configuration/ue-v/uev-using-uev-with-application-virtualization-applications.md
+++ b/windows/configuration/ue-v/uev-using-uev-with-application-virtualization-applications.md
@@ -1,7 +1,7 @@
---
title: Using UE-V with Application Virtualization applications
description: Learn how to use User Experience Virtualization (UE-V) with Microsoft Application Virtualization (App-V).
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-whats-new-in-uev-for-windows.md b/windows/configuration/ue-v/uev-whats-new-in-uev-for-windows.md
index b9b1272e9a..1072f07164 100644
--- a/windows/configuration/ue-v/uev-whats-new-in-uev-for-windows.md
+++ b/windows/configuration/ue-v/uev-whats-new-in-uev-for-windows.md
@@ -1,7 +1,7 @@
---
title: What's New in UE-V for Windows 10, version 1607
description: Learn about what's new in User Experience Virtualization (UE-V) for Windows 10, including new features and capabilities.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md b/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
index 0a5cc1a242..f93a24390e 100644
--- a/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
+++ b/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
@@ -1,7 +1,7 @@
---
title: Working with Custom UE-V Templates and the UE-V Template Generator
description: Create your own custom settings location templates by working with Custom User Experience Virtualization (UE-V) Templates and the UE-V Template Generator.
-author: dansimp
+author: greg-lindsay
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
ms.sitesec: library
@@ -9,7 +9,7 @@ ms.prod: w10
ms.date: 04/19/2017
ms.reviewer:
manager: dansimp
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-accountmanagement.md b/windows/configuration/wcd/wcd-accountmanagement.md
index ffefe134f1..3ac49ccd7e 100644
--- a/windows/configuration/wcd/wcd-accountmanagement.md
+++ b/windows/configuration/wcd/wcd-accountmanagement.md
@@ -4,9 +4,9 @@ description: This section describes the account management settings that you can
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-accounts.md b/windows/configuration/wcd/wcd-accounts.md
index 6cc1c8921e..2e172a122e 100644
--- a/windows/configuration/wcd/wcd-accounts.md
+++ b/windows/configuration/wcd/wcd-accounts.md
@@ -4,9 +4,9 @@ description: This section describes the account settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-admxingestion.md b/windows/configuration/wcd/wcd-admxingestion.md
index 0e68a1d02b..2a64e58ca8 100644
--- a/windows/configuration/wcd/wcd-admxingestion.md
+++ b/windows/configuration/wcd/wcd-admxingestion.md
@@ -4,9 +4,9 @@ description: This section describes the ADMXIngestion settings that you can conf
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-assignedaccess.md b/windows/configuration/wcd/wcd-assignedaccess.md
index 464b19a7ae..a891fbcb93 100644
--- a/windows/configuration/wcd/wcd-assignedaccess.md
+++ b/windows/configuration/wcd/wcd-assignedaccess.md
@@ -4,9 +4,9 @@ description: This section describes the AssignedAccess setting that you can conf
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-automatictime.md b/windows/configuration/wcd/wcd-automatictime.md
index e8308679e0..53200de533 100644
--- a/windows/configuration/wcd/wcd-automatictime.md
+++ b/windows/configuration/wcd/wcd-automatictime.md
@@ -4,9 +4,9 @@ description: This section describes the AutomaticTime settings that you can conf
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-browser.md b/windows/configuration/wcd/wcd-browser.md
index b91890550a..d7e8ff6e10 100644
--- a/windows/configuration/wcd/wcd-browser.md
+++ b/windows/configuration/wcd/wcd-browser.md
@@ -4,9 +4,9 @@ description: This section describes the Browser settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 10/02/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-callandmessagingenhancement.md b/windows/configuration/wcd/wcd-callandmessagingenhancement.md
index 73b872d360..d841991b53 100644
--- a/windows/configuration/wcd/wcd-callandmessagingenhancement.md
+++ b/windows/configuration/wcd/wcd-callandmessagingenhancement.md
@@ -4,9 +4,9 @@ description: This section describes the CallAndMessagingEnhancement settings tha
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/21/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-calling.md b/windows/configuration/wcd/wcd-calling.md
index d08b7dd512..d346a04e2c 100644
--- a/windows/configuration/wcd/wcd-calling.md
+++ b/windows/configuration/wcd/wcd-calling.md
@@ -4,9 +4,9 @@ description: This section describes the Calling settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-cellcore.md b/windows/configuration/wcd/wcd-cellcore.md
index c00e9a5180..7515ff83bf 100644
--- a/windows/configuration/wcd/wcd-cellcore.md
+++ b/windows/configuration/wcd/wcd-cellcore.md
@@ -4,9 +4,9 @@ description: This section describes the CellCore settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 10/02/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-cellular.md b/windows/configuration/wcd/wcd-cellular.md
index ba1ec42b57..2a3982c0d3 100644
--- a/windows/configuration/wcd/wcd-cellular.md
+++ b/windows/configuration/wcd/wcd-cellular.md
@@ -6,9 +6,9 @@ description: This section describes the Cellular settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-certificates.md b/windows/configuration/wcd/wcd-certificates.md
index 78ce980355..79d200e65c 100644
--- a/windows/configuration/wcd/wcd-certificates.md
+++ b/windows/configuration/wcd/wcd-certificates.md
@@ -4,9 +4,9 @@ description: This section describes the Certificates settings that you can confi
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-changes.md b/windows/configuration/wcd/wcd-changes.md
index 999eda43b0..5747eeb261 100644
--- a/windows/configuration/wcd/wcd-changes.md
+++ b/windows/configuration/wcd/wcd-changes.md
@@ -6,9 +6,9 @@ description: This section describes the changes to settings in Windows Configura
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-cleanpc.md b/windows/configuration/wcd/wcd-cleanpc.md
index 9bc2d38599..17750d5db9 100644
--- a/windows/configuration/wcd/wcd-cleanpc.md
+++ b/windows/configuration/wcd/wcd-cleanpc.md
@@ -4,9 +4,9 @@ description: This section describes the CleanPC settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-connections.md b/windows/configuration/wcd/wcd-connections.md
index b8f745cbb4..807e392469 100644
--- a/windows/configuration/wcd/wcd-connections.md
+++ b/windows/configuration/wcd/wcd-connections.md
@@ -4,9 +4,9 @@ description: This section describes the Connections settings that you can config
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-connectivityprofiles.md b/windows/configuration/wcd/wcd-connectivityprofiles.md
index 54f87c6845..248a5ab250 100644
--- a/windows/configuration/wcd/wcd-connectivityprofiles.md
+++ b/windows/configuration/wcd/wcd-connectivityprofiles.md
@@ -4,9 +4,9 @@ description: This section describes the ConnectivityProfile settings that you ca
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-countryandregion.md b/windows/configuration/wcd/wcd-countryandregion.md
index ff0aa5fd59..3b9642b8e8 100644
--- a/windows/configuration/wcd/wcd-countryandregion.md
+++ b/windows/configuration/wcd/wcd-countryandregion.md
@@ -4,9 +4,9 @@ description: This section describes the CountryAndRegion settings that you can c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-desktopbackgroundandcolors.md b/windows/configuration/wcd/wcd-desktopbackgroundandcolors.md
index 660b9bbe1e..2d6ed40d77 100644
--- a/windows/configuration/wcd/wcd-desktopbackgroundandcolors.md
+++ b/windows/configuration/wcd/wcd-desktopbackgroundandcolors.md
@@ -4,9 +4,9 @@ description: This section describes the DesktopBackgrounAndColors settings that
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/21/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-developersetup.md b/windows/configuration/wcd/wcd-developersetup.md
index 29ec1d65bc..6053bddbbd 100644
--- a/windows/configuration/wcd/wcd-developersetup.md
+++ b/windows/configuration/wcd/wcd-developersetup.md
@@ -4,9 +4,9 @@ description: This section describes the DeveloperSetup settings that you can con
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-deviceformfactor.md b/windows/configuration/wcd/wcd-deviceformfactor.md
index 3437bbcacf..0cb8ee869d 100644
--- a/windows/configuration/wcd/wcd-deviceformfactor.md
+++ b/windows/configuration/wcd/wcd-deviceformfactor.md
@@ -4,9 +4,9 @@ description: This section describes the DeviceFormFactor setting that you can co
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-deviceinfo.md b/windows/configuration/wcd/wcd-deviceinfo.md
index b4080fa9b3..8f5e48d6c7 100644
--- a/windows/configuration/wcd/wcd-deviceinfo.md
+++ b/windows/configuration/wcd/wcd-deviceinfo.md
@@ -4,9 +4,9 @@ description: This section describes the DeviceInfo settings that you can configu
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/21/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-devicemanagement.md b/windows/configuration/wcd/wcd-devicemanagement.md
index 4cfeffee0a..22142d87cb 100644
--- a/windows/configuration/wcd/wcd-devicemanagement.md
+++ b/windows/configuration/wcd/wcd-devicemanagement.md
@@ -4,9 +4,9 @@ description: This section describes the DeviceManagement setting that you can co
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-deviceupdatecenter.md b/windows/configuration/wcd/wcd-deviceupdatecenter.md
index 0a509c9bc2..8db59d7617 100644
--- a/windows/configuration/wcd/wcd-deviceupdatecenter.md
+++ b/windows/configuration/wcd/wcd-deviceupdatecenter.md
@@ -4,9 +4,9 @@ description: This section describes the DeviceUpdateCenter settings that you can
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
manager: dansimp
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-dmclient.md b/windows/configuration/wcd/wcd-dmclient.md
index 7dee09082c..dfabf75bda 100644
--- a/windows/configuration/wcd/wcd-dmclient.md
+++ b/windows/configuration/wcd/wcd-dmclient.md
@@ -4,9 +4,9 @@ description: This section describes the DMClient setting that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-editionupgrade.md b/windows/configuration/wcd/wcd-editionupgrade.md
index 5b8b8969a5..7b0b331a3a 100644
--- a/windows/configuration/wcd/wcd-editionupgrade.md
+++ b/windows/configuration/wcd/wcd-editionupgrade.md
@@ -4,9 +4,9 @@ description: This section describes the EditionUpgrade settings that you can con
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-embeddedlockdownprofiles.md b/windows/configuration/wcd/wcd-embeddedlockdownprofiles.md
index 5a1cbf3bd0..fe3e097ba5 100644
--- a/windows/configuration/wcd/wcd-embeddedlockdownprofiles.md
+++ b/windows/configuration/wcd/wcd-embeddedlockdownprofiles.md
@@ -4,9 +4,9 @@ description: This section describes the EmbeddedLockdownProfiles setting that yo
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-firewallconfiguration.md b/windows/configuration/wcd/wcd-firewallconfiguration.md
index 00dc29db3c..f769dc4594 100644
--- a/windows/configuration/wcd/wcd-firewallconfiguration.md
+++ b/windows/configuration/wcd/wcd-firewallconfiguration.md
@@ -4,9 +4,9 @@ description: This section describes the FirewallConfiguration setting that you c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-firstexperience.md b/windows/configuration/wcd/wcd-firstexperience.md
index 10aa317751..b44927ef29 100644
--- a/windows/configuration/wcd/wcd-firstexperience.md
+++ b/windows/configuration/wcd/wcd-firstexperience.md
@@ -4,9 +4,9 @@ description: This section describes the FirstExperience settings that you can co
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 08/08/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-folders.md b/windows/configuration/wcd/wcd-folders.md
index 4977b81a41..38880a5f7d 100644
--- a/windows/configuration/wcd/wcd-folders.md
+++ b/windows/configuration/wcd/wcd-folders.md
@@ -4,9 +4,9 @@ description: This section describes the Folders settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-hotspot.md b/windows/configuration/wcd/wcd-hotspot.md
index 9f37adbdb3..5495478b7d 100644
--- a/windows/configuration/wcd/wcd-hotspot.md
+++ b/windows/configuration/wcd/wcd-hotspot.md
@@ -4,9 +4,9 @@ description: This section describes the HotSpot settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 12/18/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-initialsetup.md b/windows/configuration/wcd/wcd-initialsetup.md
index 9694bd6859..a2ea279640 100644
--- a/windows/configuration/wcd/wcd-initialsetup.md
+++ b/windows/configuration/wcd/wcd-initialsetup.md
@@ -4,9 +4,9 @@ description: This section describes the InitialSetup setting that you can config
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-internetexplorer.md b/windows/configuration/wcd/wcd-internetexplorer.md
index 9525337881..df4ef198d7 100644
--- a/windows/configuration/wcd/wcd-internetexplorer.md
+++ b/windows/configuration/wcd/wcd-internetexplorer.md
@@ -4,9 +4,9 @@ description: This section describes the InternetExplorer settings that you can c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-kioskbrowser.md b/windows/configuration/wcd/wcd-kioskbrowser.md
index 2e62c61759..011302e771 100644
--- a/windows/configuration/wcd/wcd-kioskbrowser.md
+++ b/windows/configuration/wcd/wcd-kioskbrowser.md
@@ -4,9 +4,9 @@ description: This section describes the KioskBrowser settings that you can confi
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 10/02/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-licensing.md b/windows/configuration/wcd/wcd-licensing.md
index d7a823d193..b4db1ca601 100644
--- a/windows/configuration/wcd/wcd-licensing.md
+++ b/windows/configuration/wcd/wcd-licensing.md
@@ -4,9 +4,9 @@ description: This section describes the Licensing settings that you can configur
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-location.md b/windows/configuration/wcd/wcd-location.md
index c2585b8fec..2e623a716c 100644
--- a/windows/configuration/wcd/wcd-location.md
+++ b/windows/configuration/wcd/wcd-location.md
@@ -4,9 +4,9 @@ description: This section describes the Location settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-maps.md b/windows/configuration/wcd/wcd-maps.md
index c8d1a683fb..dd1ffc9a9a 100644
--- a/windows/configuration/wcd/wcd-maps.md
+++ b/windows/configuration/wcd/wcd-maps.md
@@ -4,9 +4,9 @@ description: This section describes the Maps settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-messaging.md b/windows/configuration/wcd/wcd-messaging.md
index 5db05285af..fabee5c8f9 100644
--- a/windows/configuration/wcd/wcd-messaging.md
+++ b/windows/configuration/wcd/wcd-messaging.md
@@ -4,9 +4,9 @@ description: This section describes the Messaging settings that you can configur
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-modemconfigurations.md b/windows/configuration/wcd/wcd-modemconfigurations.md
index 2e35a4939e..79cc7624f2 100644
--- a/windows/configuration/wcd/wcd-modemconfigurations.md
+++ b/windows/configuration/wcd/wcd-modemconfigurations.md
@@ -4,9 +4,9 @@ description: This section describes the ModemConfiguration settings that you can
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-multivariant.md b/windows/configuration/wcd/wcd-multivariant.md
index fa30ed7621..4b46abbb30 100644
--- a/windows/configuration/wcd/wcd-multivariant.md
+++ b/windows/configuration/wcd/wcd-multivariant.md
@@ -4,9 +4,9 @@ description: This section describes the Multivariant settings that you can confi
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-networkproxy.md b/windows/configuration/wcd/wcd-networkproxy.md
index e9a85f635c..26dc49ac76 100644
--- a/windows/configuration/wcd/wcd-networkproxy.md
+++ b/windows/configuration/wcd/wcd-networkproxy.md
@@ -4,9 +4,9 @@ description: This section describes the NetworkProxy settings that you can confi
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-networkqospolicy.md b/windows/configuration/wcd/wcd-networkqospolicy.md
index bd1599f425..899b27631b 100644
--- a/windows/configuration/wcd/wcd-networkqospolicy.md
+++ b/windows/configuration/wcd/wcd-networkqospolicy.md
@@ -4,9 +4,9 @@ description: This section describes the NetworkQoSPolicy settings that you can c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-nfc.md b/windows/configuration/wcd/wcd-nfc.md
index 0e69a8611f..b584cad59c 100644
--- a/windows/configuration/wcd/wcd-nfc.md
+++ b/windows/configuration/wcd/wcd-nfc.md
@@ -4,9 +4,9 @@ description: This section describes the NFC settings that you can configure in p
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-oobe.md b/windows/configuration/wcd/wcd-oobe.md
index d3b9d33fff..72fc4e529e 100644
--- a/windows/configuration/wcd/wcd-oobe.md
+++ b/windows/configuration/wcd/wcd-oobe.md
@@ -6,9 +6,9 @@ description: This section describes the OOBE settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-otherassets.md b/windows/configuration/wcd/wcd-otherassets.md
index e9f913ccef..5166212585 100644
--- a/windows/configuration/wcd/wcd-otherassets.md
+++ b/windows/configuration/wcd/wcd-otherassets.md
@@ -4,9 +4,9 @@ description: This section describes the OtherAssets settings that you can config
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-personalization.md b/windows/configuration/wcd/wcd-personalization.md
index 2bd33a11a5..4f20e71ba6 100644
--- a/windows/configuration/wcd/wcd-personalization.md
+++ b/windows/configuration/wcd/wcd-personalization.md
@@ -4,9 +4,9 @@ description: This section describes the Personalization settings that you can co
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-policies.md b/windows/configuration/wcd/wcd-policies.md
index 39e41a67d1..8800dbb685 100644
--- a/windows/configuration/wcd/wcd-policies.md
+++ b/windows/configuration/wcd/wcd-policies.md
@@ -6,9 +6,9 @@ description: This section describes the Policies settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-privacy.md b/windows/configuration/wcd/wcd-privacy.md
index 7e5e005614..a1941225e8 100644
--- a/windows/configuration/wcd/wcd-privacy.md
+++ b/windows/configuration/wcd/wcd-privacy.md
@@ -4,9 +4,9 @@ description: This section describes the Privacy settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
manager: dansimp
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-provisioningcommands.md b/windows/configuration/wcd/wcd-provisioningcommands.md
index a10646cadc..991bd32799 100644
--- a/windows/configuration/wcd/wcd-provisioningcommands.md
+++ b/windows/configuration/wcd/wcd-provisioningcommands.md
@@ -4,9 +4,9 @@ description: This section describes the ProvisioningCommands settings that you c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-rcspresence.md b/windows/configuration/wcd/wcd-rcspresence.md
index d76762fcbc..ddcb62bed7 100644
--- a/windows/configuration/wcd/wcd-rcspresence.md
+++ b/windows/configuration/wcd/wcd-rcspresence.md
@@ -4,9 +4,9 @@ description: This section describes the RcsPresence settings that you can config
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-sharedpc.md b/windows/configuration/wcd/wcd-sharedpc.md
index f442bac8ee..b8dde5dc3f 100644
--- a/windows/configuration/wcd/wcd-sharedpc.md
+++ b/windows/configuration/wcd/wcd-sharedpc.md
@@ -4,9 +4,9 @@ description: This section describes the SharedPC settings that you can configure
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 10/16/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-shell.md b/windows/configuration/wcd/wcd-shell.md
index 2be71e7ded..459ec29c02 100644
--- a/windows/configuration/wcd/wcd-shell.md
+++ b/windows/configuration/wcd/wcd-shell.md
@@ -4,9 +4,9 @@ description: This section describes the Shell settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-smisettings.md b/windows/configuration/wcd/wcd-smisettings.md
index 09ee5e93bd..3c80f2de84 100644
--- a/windows/configuration/wcd/wcd-smisettings.md
+++ b/windows/configuration/wcd/wcd-smisettings.md
@@ -4,9 +4,9 @@ description: This section describes the SMISettings settings that you can config
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 03/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-start.md b/windows/configuration/wcd/wcd-start.md
index 292ef2be02..743151817b 100644
--- a/windows/configuration/wcd/wcd-start.md
+++ b/windows/configuration/wcd/wcd-start.md
@@ -4,9 +4,9 @@ description: This section describes the Start settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-startupapp.md b/windows/configuration/wcd/wcd-startupapp.md
index 64886d4f08..9516876a6d 100644
--- a/windows/configuration/wcd/wcd-startupapp.md
+++ b/windows/configuration/wcd/wcd-startupapp.md
@@ -4,9 +4,9 @@ description: This section describes the StartupApp settings that you can configu
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-startupbackgroundtasks.md b/windows/configuration/wcd/wcd-startupbackgroundtasks.md
index 010fdb922e..67662e4a93 100644
--- a/windows/configuration/wcd/wcd-startupbackgroundtasks.md
+++ b/windows/configuration/wcd/wcd-startupbackgroundtasks.md
@@ -4,9 +4,9 @@ description: This section describes the StartupBackgroundTasks settings that you
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-storaged3inmodernstandby.md b/windows/configuration/wcd/wcd-storaged3inmodernstandby.md
index eb80c8fee6..a7cbdabebe 100644
--- a/windows/configuration/wcd/wcd-storaged3inmodernstandby.md
+++ b/windows/configuration/wcd/wcd-storaged3inmodernstandby.md
@@ -4,9 +4,9 @@ description: This section describes the StorageD3InModernStandby settings that y
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
manager: dansimp
---
diff --git a/windows/configuration/wcd/wcd-surfacehubmanagement.md b/windows/configuration/wcd/wcd-surfacehubmanagement.md
index c7d1a3e433..31a54a9d24 100644
--- a/windows/configuration/wcd/wcd-surfacehubmanagement.md
+++ b/windows/configuration/wcd/wcd-surfacehubmanagement.md
@@ -4,9 +4,9 @@ description: This section describes the SurfaceHubManagement settings that you c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-tabletmode.md b/windows/configuration/wcd/wcd-tabletmode.md
index f943884cdb..09cd2e5d37 100644
--- a/windows/configuration/wcd/wcd-tabletmode.md
+++ b/windows/configuration/wcd/wcd-tabletmode.md
@@ -4,9 +4,9 @@ description: This section describes the TabletMode settings that you can configu
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-takeatest.md b/windows/configuration/wcd/wcd-takeatest.md
index bbc0fb7cfa..b7d826ac98 100644
--- a/windows/configuration/wcd/wcd-takeatest.md
+++ b/windows/configuration/wcd/wcd-takeatest.md
@@ -4,9 +4,9 @@ description: This section describes the TakeATest settings that you can configur
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/06/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-textinput.md b/windows/configuration/wcd/wcd-textinput.md
index 5054ab08db..c5508b901f 100644
--- a/windows/configuration/wcd/wcd-textinput.md
+++ b/windows/configuration/wcd/wcd-textinput.md
@@ -4,9 +4,9 @@ description: This section describes the TextInput settings that you can configur
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 09/15/2017
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd-theme.md b/windows/configuration/wcd/wcd-theme.md
index 5993e02c51..7dc40af968 100644
--- a/windows/configuration/wcd/wcd-theme.md
+++ b/windows/configuration/wcd/wcd-theme.md
@@ -4,9 +4,9 @@ description: This section describes the Theme settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-time.md b/windows/configuration/wcd/wcd-time.md
index a453f8eabe..6294abea3e 100644
--- a/windows/configuration/wcd/wcd-time.md
+++ b/windows/configuration/wcd/wcd-time.md
@@ -4,9 +4,9 @@ description: This section describes the Time settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
manager: dansimp
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-unifiedwritefilter.md b/windows/configuration/wcd/wcd-unifiedwritefilter.md
index 6d7c71eced..c4e5aebefe 100644
--- a/windows/configuration/wcd/wcd-unifiedwritefilter.md
+++ b/windows/configuration/wcd/wcd-unifiedwritefilter.md
@@ -4,9 +4,9 @@ description: This section describes the UnifiedWriteFilter settings that you can
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-universalappinstall.md b/windows/configuration/wcd/wcd-universalappinstall.md
index 57caf80096..f935eeb700 100644
--- a/windows/configuration/wcd/wcd-universalappinstall.md
+++ b/windows/configuration/wcd/wcd-universalappinstall.md
@@ -4,9 +4,9 @@ description: This section describes the UniversalAppInstall settings that you ca
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-universalappuninstall.md b/windows/configuration/wcd/wcd-universalappuninstall.md
index b9a7329acf..35204ca772 100644
--- a/windows/configuration/wcd/wcd-universalappuninstall.md
+++ b/windows/configuration/wcd/wcd-universalappuninstall.md
@@ -4,9 +4,9 @@ description: This section describes the UniversalAppUninstall settings that you
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-usberrorsoemoverride.md b/windows/configuration/wcd/wcd-usberrorsoemoverride.md
index 92a723d0c0..d551248370 100644
--- a/windows/configuration/wcd/wcd-usberrorsoemoverride.md
+++ b/windows/configuration/wcd/wcd-usberrorsoemoverride.md
@@ -4,9 +4,9 @@ description: This section describes the UsbErrorsOEMOverride settings that you c
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-weakcharger.md b/windows/configuration/wcd/wcd-weakcharger.md
index 317198f6b9..a8cd376714 100644
--- a/windows/configuration/wcd/wcd-weakcharger.md
+++ b/windows/configuration/wcd/wcd-weakcharger.md
@@ -4,9 +4,9 @@ description: This section describes the WeakCharger settings that you can config
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-windowshelloforbusiness.md b/windows/configuration/wcd/wcd-windowshelloforbusiness.md
index 936d9d7e62..c1dd26f101 100644
--- a/windows/configuration/wcd/wcd-windowshelloforbusiness.md
+++ b/windows/configuration/wcd/wcd-windowshelloforbusiness.md
@@ -4,9 +4,9 @@ description: This section describes the Windows Hello for Business settings that
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-windowsteamsettings.md b/windows/configuration/wcd/wcd-windowsteamsettings.md
index 546f4dc08b..dcefc054fd 100644
--- a/windows/configuration/wcd/wcd-windowsteamsettings.md
+++ b/windows/configuration/wcd/wcd-windowsteamsettings.md
@@ -4,9 +4,9 @@ description: This section describes the WindowsTeamSettings settings that you ca
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/wcd/wcd-wlan.md b/windows/configuration/wcd/wcd-wlan.md
index 08f92686be..2a746063eb 100644
--- a/windows/configuration/wcd/wcd-wlan.md
+++ b/windows/configuration/wcd/wcd-wlan.md
@@ -6,9 +6,9 @@ description: This section describes the WLAN settings that you can configure in
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
---
diff --git a/windows/configuration/wcd/wcd-workplace.md b/windows/configuration/wcd/wcd-workplace.md
index 1ab396893d..7d4431413d 100644
--- a/windows/configuration/wcd/wcd-workplace.md
+++ b/windows/configuration/wcd/wcd-workplace.md
@@ -4,9 +4,9 @@ description: This section describes the Workplace settings that you can configur
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.date: 04/30/2018
ms.reviewer:
diff --git a/windows/configuration/wcd/wcd.md b/windows/configuration/wcd/wcd.md
index 4372317664..f1e1091bc6 100644
--- a/windows/configuration/wcd/wcd.md
+++ b/windows/configuration/wcd/wcd.md
@@ -4,9 +4,9 @@ description: This section describes the settings that you can configure in provi
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
-author: dansimp
+author: greg-lindsay
ms.localizationpriority: medium
-ms.author: dansimp
+ms.author: greglin
ms.topic: article
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/windows-10-accessibility-for-ITPros.md b/windows/configuration/windows-10-accessibility-for-ITPros.md
index ef6a2e38ca..af1c230de8 100644
--- a/windows/configuration/windows-10-accessibility-for-ITPros.md
+++ b/windows/configuration/windows-10-accessibility-for-ITPros.md
@@ -5,8 +5,8 @@ keywords: accessibility, settings, vision, hearing, physical, cognition, assisti
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-ms.author: dansimp
-author: dansimp
+ms.author: greglin
+author: greg-lindsay
ms.localizationpriority: medium
ms.date: 01/12/2018
ms.reviewer:
diff --git a/windows/configuration/windows-10-start-layout-options-and-policies.md b/windows/configuration/windows-10-start-layout-options-and-policies.md
index 4d95b3346a..ce489cfec1 100644
--- a/windows/configuration/windows-10-start-layout-options-and-policies.md
+++ b/windows/configuration/windows-10-start-layout-options-and-policies.md
@@ -8,8 +8,8 @@ keywords: ["start screen", "start menu"]
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 06/19/2018
diff --git a/windows/configuration/windows-spotlight.md b/windows/configuration/windows-spotlight.md
index 3592008a22..1b43de2520 100644
--- a/windows/configuration/windows-spotlight.md
+++ b/windows/configuration/windows-spotlight.md
@@ -8,8 +8,8 @@ keywords: ["lockscreen"]
ms.prod: w10
ms.mktglfcycl: explore
ms.sitesec: library
-author: dansimp
-ms.author: dansimp
+author: greg-lindsay
+ms.author: greglin
ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
diff --git a/windows/configure/docfx.json b/windows/configure/docfx.json
index 26b7898d55..032a6cf7e4 100644
--- a/windows/configure/docfx.json
+++ b/windows/configure/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/deploy/docfx.json b/windows/deploy/docfx.json
index c532dc05a9..f8c535fddb 100644
--- a/windows/deploy/docfx.json
+++ b/windows/deploy/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/deployment/TOC.yml b/windows/deployment/TOC.yml
index 36ad237ce3..c8a3334ac2 100644
--- a/windows/deployment/TOC.yml
+++ b/windows/deployment/TOC.yml
@@ -164,6 +164,11 @@
href: update/waas-manage-updates-wufb.md
- name: Configure Windows Update for Business
href: update/waas-configure-wufb.md
+ - name: Windows Update for Business deployment service
+ href: update/deployment-service-overview.md
+ items:
+ - name: Troubleshoot the Windows Update for Business deployment service
+ href: update/deployment-service-troubleshoot.md
- name: Enforcing compliance deadlines for updates
href: update/wufb-compliancedeadlines.md
- name: Integrate Windows Update for Business with management solutions
@@ -249,6 +254,8 @@
href: update/windows-update-errors.md
- name: Windows Update error code reference
href: update/windows-update-error-reference.md
+ - name: Troubleshoot the Windows Update for Business deployment service
+ href: update/deployment-service-troubleshoot.md
- name: Reference
items:
@@ -293,7 +300,7 @@
- name: Security and data protection considerations for Windows To Go
href: planning/security-and-data-protection-considerations-for-windows-to-go.md
- name: "Windows To Go: frequently asked questions"
- href: planning/windows-to-go-frequently-asked-questions.md
+ href: planning/windows-to-go-frequently-asked-questions.yml
- name: Volume Activation Management Tool (VAMT) technical reference
items:
@@ -391,7 +398,7 @@
- name: Common Issues
href: usmt/usmt-common-issues.md
- name: Frequently Asked Questions
- href: usmt/usmt-faq.md
+ href: usmt/usmt-faq.yml
- name: Log Files
href: usmt/usmt-log-files.md
- name: Return Codes
diff --git a/windows/deployment/deploy-enterprise-licenses.md b/windows/deployment/deploy-enterprise-licenses.md
index d8339ad571..612b3619c6 100644
--- a/windows/deployment/deploy-enterprise-licenses.md
+++ b/windows/deployment/deploy-enterprise-licenses.md
@@ -251,7 +251,7 @@ Use the following figures to help you troubleshoot when users experience these c
### Review requirements on devices
-Devices must be running Windows 10 Pro, version 1703, and be Azure Active Directory joined, or hybrid domain joined with Azure AD Connect. Customers who are federated with Azure Active Directory are also eligible. You can use the following procedures to review whether a particular device meets requirements.
+Devices must be running Windows 10 Pro, version 1703 (or later), and be Azure Active Directory joined, or hybrid domain joined with Azure AD Connect. Customers who are federated with Azure Active Directory are also eligible. You can use the following procedures to review whether a particular device meets requirements.
**To determine if a device is Azure Active Directory joined:**
@@ -264,4 +264,4 @@ At a command prompt, type: **winver**
A popup window will display the Windows 10 version number and detailed OS build information.
-If a device is running a previous version of Windows 10 Pro (for example, version 1511), it will not be upgraded to Windows 10 Enterprise when a user signs in, even if the user has been assigned a subscription in the CSP portal.
\ No newline at end of file
+If a device is running a version of Windows 10 Pro prior to version 1703 (for example, version 1511), it will not be upgraded to Windows 10 Enterprise when a user signs in, even if the user has been assigned a subscription in the CSP portal.
diff --git a/windows/deployment/deploy-windows-cm/TOC.md b/windows/deployment/deploy-windows-cm/TOC.md
deleted file mode 100644
index b26445c4ab..0000000000
--- a/windows/deployment/deploy-windows-cm/TOC.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Deploy Windows 10 with Microsoft Endpoint Configuration Manager
-## Prepare for Windows 10 deployment with Configuration Manager
-### [Prepare for Zero Touch Installation with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
-### [Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-### [Add a Windows 10 operating system image using Configuration Manager](add-a-windows-10-operating-system-image-using-configuration-manager.md)
-### [Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-### [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-### [Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
-### [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
-
-## Deploy Windows 10 with Configuration Manager
-### [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
-### [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-### [Perform an in-place upgrade to Windows 10 using Configuration Manager](upgrade-to-windows-10-with-configuraton-manager.md)
\ No newline at end of file
diff --git a/windows/deployment/deploy-windows-cm/TOC.yml b/windows/deployment/deploy-windows-cm/TOC.yml
new file mode 100644
index 0000000000..06bf59500f
--- /dev/null
+++ b/windows/deployment/deploy-windows-cm/TOC.yml
@@ -0,0 +1,28 @@
+- name: Deploy Windows 10 with Microsoft Endpoint Configuration Manager
+ items:
+ - name: Prepare for Windows 10 deployment with Configuration Manager
+ items:
+ - name: Prepare for Zero Touch Installation with Configuration Manager
+ href: prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+ - name: Create a custom Windows PE boot image with Configuration Manager
+ href: create-a-custom-windows-pe-boot-image-with-configuration-manager.md
+ - name: Add a Windows 10 operating system image using Configuration Manager
+ href: add-a-windows-10-operating-system-image-using-configuration-manager.md
+ - name: Create an application to deploy with Windows 10 using Configuration Manager
+ href: create-an-application-to-deploy-with-windows-10-using-configuration-manager.md
+ - name: Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager
+ href: add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md
+ - name: Create a task sequence with Configuration Manager and MDT
+ href: create-a-task-sequence-with-configuration-manager-and-mdt.md
+ - name: Finalize the operating system configuration for Windows 10 deployment with Configuration Manager
+ href: finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md
+ - name: Deploy Windows 10 with Configuration Manager
+ items:
+ - name: Deploy Windows 10 using PXE and Configuration Manager
+ href: deploy-windows-10-using-pxe-and-configuration-manager.md
+ - name: Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager
+ href: refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
+ - name: Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager
+ href: replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
+ - name: Perform an in-place upgrade to Windows 10 using Configuration Manager
+ href: upgrade-to-windows-10-with-configuraton-manager.md
diff --git a/windows/deployment/deploy-windows-mdt/TOC.md b/windows/deployment/deploy-windows-mdt/TOC.md
deleted file mode 100644
index 7f51b8ca5b..0000000000
--- a/windows/deployment/deploy-windows-mdt/TOC.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Deploy Windows 10 with the Microsoft Deployment Toolkit (MDT)
-## [Get started with MDT](get-started-with-the-microsoft-deployment-toolkit.md)
-
-## Deploy Windows 10 with MDT
-### [Prepare for deployment with MDT](prepare-for-windows-deployment-with-mdt.md)
-### [Create a Windows 10 reference image](create-a-windows-10-reference-image.md)
-### [Deploy a Windows 10 image using MDT](deploy-a-windows-10-image-using-mdt.md)
-### [Build a distributed environment for Windows 10 deployment](build-a-distributed-environment-for-windows-10-deployment.md)
-### [Refresh a Windows 7 computer with Windows 10](refresh-a-windows-7-computer-with-windows-10.md)
-### [Replace a Windows 7 computer with a Windows 10 computer](replace-a-windows-7-computer-with-a-windows-10-computer.md)
-### [Perform an in-place upgrade to Windows 10 with MDT](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
-
-## Customize MDT
-### [Configure MDT settings](configure-mdt-settings.md)
-### [Set up MDT for BitLocker](set-up-mdt-for-bitlocker.md)
-### [Configure MDT deployment share rules](configure-mdt-deployment-share-rules.md)
-### [Configure MDT for UserExit scripts](configure-mdt-for-userexit-scripts.md)
-### [Simulate a Windows 10 deployment in a test environment](simulate-a-windows-10-deployment-in-a-test-environment.md)
-### [Use the MDT database to stage Windows 10 deployment information](use-the-mdt-database-to-stage-windows-10-deployment-information.md)
-### [Assign applications using roles in MDT](assign-applications-using-roles-in-mdt.md)
-### [Use web services in MDT](use-web-services-in-mdt.md)
-### [Use Orchestrator runbooks with MDT](use-orchestrator-runbooks-with-mdt.md)
diff --git a/windows/deployment/deploy-windows-mdt/TOC.yml b/windows/deployment/deploy-windows-mdt/TOC.yml
new file mode 100644
index 0000000000..51493a1083
--- /dev/null
+++ b/windows/deployment/deploy-windows-mdt/TOC.yml
@@ -0,0 +1,40 @@
+- name: Deploy Windows 10 with the Microsoft Deployment Toolkit (MDT)
+ items:
+ - name: Get started with MDT
+ href: get-started-with-the-microsoft-deployment-toolkit.md
+ - name: Deploy Windows 10 with MDT
+ items:
+ - name: Prepare for deployment with MDT
+ href: prepare-for-windows-deployment-with-mdt.md
+ - name: Create a Windows 10 reference image
+ href: create-a-windows-10-reference-image.md
+ - name: Deploy a Windows 10 image using MDT
+ href: deploy-a-windows-10-image-using-mdt.md
+ - name: Build a distributed environment for Windows 10 deployment
+ href: build-a-distributed-environment-for-windows-10-deployment.md
+ - name: Refresh a Windows 7 computer with Windows 10
+ href: refresh-a-windows-7-computer-with-windows-10.md
+ - name: Replace a Windows 7 computer with a Windows 10 computer
+ href: replace-a-windows-7-computer-with-a-windows-10-computer.md
+ - name: Perform an in-place upgrade to Windows 10 with MDT
+ href: upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md
+ - name: Customize MDT
+ items:
+ - name: Configure MDT settings
+ href: configure-mdt-settings.md
+ - name: Set up MDT for BitLocker
+ href: set-up-mdt-for-bitlocker.md
+ - name: Configure MDT deployment share rules
+ href: configure-mdt-deployment-share-rules.md
+ - name: Configure MDT for UserExit scripts
+ href: configure-mdt-for-userexit-scripts.md
+ - name: Simulate a Windows 10 deployment in a test environment
+ href: simulate-a-windows-10-deployment-in-a-test-environment.md
+ - name: Use the MDT database to stage Windows 10 deployment information
+ href: use-the-mdt-database-to-stage-windows-10-deployment-information.md
+ - name: Assign applications using roles in MDT
+ href: assign-applications-using-roles-in-mdt.md
+ - name: Use web services in MDT
+ href: use-web-services-in-mdt.md
+ - name: Use Orchestrator runbooks with MDT
+ href: use-orchestrator-runbooks-with-mdt.md
diff --git a/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md b/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
index ebe98a9061..ba163c16c9 100644
--- a/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
@@ -194,7 +194,7 @@ On **MDT01**:
2. WinPE x64
3. Windows 10 x64
3. In the new Windows 10 x64 folder, create the following folder structure:
- - Dell Inc
+ - Dell Inc.
- Latitude E7450
- Hewlett-Packard
- HP EliteBook 8560w
@@ -215,7 +215,7 @@ When you import drivers to the MDT driver repository, MDT creates a single insta
2. WinPE x64
3. Windows 10 x64
3. In the **Windows 10 x64** folder, create the following folder structure:
- - Dell Inc
+ - Dell Inc.
- Latitude E7450
- Hewlett-Packard
- HP EliteBook 8560w
@@ -304,15 +304,15 @@ On **MDT01**:
For the Dell Latitude E7450 model, you use the Dell Driver CAB file, which is accessible via the [Dell TechCenter website](https://go.microsoft.com/fwlink/p/?LinkId=619544).
-In these steps, we assume you have downloaded and extracted the CAB file for the Latitude E7450 model to the **D:\\Drivers\\Dell Inc\\Latitude E7450** folder.
+In these steps, we assume you have downloaded and extracted the CAB file for the Latitude E7450 model to the **D:\\Drivers\\Dell Inc.\\Latitude E7450** folder.
On **MDT01**:
-1. In the **Deployment Workbench**, in the **MDT Production** > **Out-Of-Box Drivers** > **Windows 10 x64** node, expand the **Dell Inc** node.
+1. In the **Deployment Workbench**, in the **MDT Production** > **Out-Of-Box Drivers** > **Windows 10 x64** node, expand the **Dell Inc.** node.
2. Right-click the **Latitude E7450** folder and select **Import Drivers** and use the following Driver source directory to import drivers:
- **D:\\Drivers\\Windows 10 x64\\Dell Inc\\Latitude E7450**
+ **D:\\Drivers\\Windows 10 x64\\Dell Inc.\\Latitude E7450**
### For the HP EliteBook 8560w
diff --git a/windows/deployment/images/configmgr-assets.PNG b/windows/deployment/images/configmgr-assets.PNG
deleted file mode 100644
index ac315148c5..0000000000
Binary files a/windows/deployment/images/configmgr-assets.PNG and /dev/null differ
diff --git a/windows/deployment/images/configmgr-assets.png b/windows/deployment/images/configmgr-assets.png
deleted file mode 100644
index ac315148c5..0000000000
Binary files a/windows/deployment/images/configmgr-assets.png and /dev/null differ
diff --git a/windows/deployment/planning/best-practice-recommendations-for-windows-to-go.md b/windows/deployment/planning/best-practice-recommendations-for-windows-to-go.md
index 36a7463bcc..c618841341 100644
--- a/windows/deployment/planning/best-practice-recommendations-for-windows-to-go.md
+++ b/windows/deployment/planning/best-practice-recommendations-for-windows-to-go.md
@@ -43,7 +43,7 @@ Additionally, we recommend that when you plan your deployment you should also pl
[Prepare your organization for Windows To Go](prepare-your-organization-for-windows-to-go.md)
[Deployment considerations for Windows To Go](deployment-considerations-for-windows-to-go.md)
[Security and data protection considerations for Windows To Go](security-and-data-protection-considerations-for-windows-to-go.md)
-[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.md)
+[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.yml)
diff --git a/windows/deployment/planning/deployment-considerations-for-windows-to-go.md b/windows/deployment/planning/deployment-considerations-for-windows-to-go.md
index 0c2afbd06a..704abaad66 100644
--- a/windows/deployment/planning/deployment-considerations-for-windows-to-go.md
+++ b/windows/deployment/planning/deployment-considerations-for-windows-to-go.md
@@ -57,7 +57,7 @@ When the Windows To Go workspace is going to be used first on an off-premises co
> [!TIP]
> Applying BitLocker Drive Encryption to the drives before provisioning is a much faster process than encrypting the drives after data has already been stored on them due to a new feature called used-disk space only encryption. For more information, see [What's New in BitLocker](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn306081(v=ws.11)).
-DirectAccess can be used to ensure that the user can login with their domain credentials without needing a local account. For instructions on setting up a DirectAccess solution, for a small pilot deployment see [Deploy a Single Remote Access Server using the Getting Started Wizard](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831520(v=ws.11)) for a larger scale deployment, see [Deploy Remote Access in an Enterprise](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/jj134200(v=ws.11)). If you do not want to use DirectAccess as an alternative users could log on using a local user account on the Windows To Go workspace and then use a virtual private network for remote access to your organizational network.
+DirectAccess can be used to ensure that the user can log in with their domain credentials without needing a local account. For instructions on setting up a DirectAccess solution, for a small pilot deployment see [Deploy a Single Remote Access Server using the Getting Started Wizard](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831520(v=ws.11)) for a larger scale deployment, see [Deploy Remote Access in an Enterprise](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/jj134200(v=ws.11)). If you do not want to use DirectAccess as an alternative user could log on using a local user account on the Windows To Go workspace and then use a virtual private network for remote access to your organizational network.
### Image deployment and drive provisioning considerations
@@ -218,7 +218,7 @@ The following list of commonly used Wi-Fi network adapters that are not supporte
-IT administrators that want to target Windows To Go images for specific systems should test their images to ensure that the necessary system drivers are in the image, especially for critical functionality like Wi-Fi that is not supported by class drivers. Some consumer devices require OEM specific driver packages, which may not be available on Windows Update. For more information on how to add a driver to a Windows Image, please refer to the [Basic Windows Deployment Step-by-Step Guide](/previous-versions/windows/it-pro/windows-8.1-and-8/hh825212(v=win.10)).
+IT administrators that want to target Windows To Go images for specific systems should test their images to ensure that the necessary system drivers are in the image, especially for critical functionality like Wi-Fi that is not supported by class drivers. Some consumer devices require OEM-specific driver packages, which may not be available on Windows Update. For more information on how to add a driver to a Windows Image, please refer to the [Basic Windows Deployment Step-by-Step Guide](/previous-versions/windows/it-pro/windows-8.1-and-8/hh825212(v=win.10)).
### Application installation and domain join
@@ -241,7 +241,7 @@ The use of the Store on Windows To Go workspaces that are running Windows 8 can
- **Disallow standby sleep states (S1-S3) when starting from a Windows To Go workspace**
- This policy setting specifies whether the PC can use standby sleep states (S1–S3) when started from a Windows To Go workspace. The Sleep state also presents a unique challenge to Windows To Go users. When a computer goes to sleep, it appears as if it is shut down. It could be very easy for a user to think that a Windows To Go workspace in sleep mode was actually shut down and they could remove the Windows To Go drive and take it home. Removing the Windows To Go drive in this scenario is equivalent to an unclean shutdown which may result in the loss of unsaved user data or the corruption on the drive. Moreover, if the user now boots the drive on another PC and brings it back to the first PC which still happens to be in the sleep state, it will lead to an arbitrary crash and eventually corruption of the drive and result in the workspace becoming unusable. If you enable this policy setting, the Windows To Go workspace cannot use the standby states to cause the PC to enter sleep mode. If you disable or do not configure this policy setting, the Windows To Go workspace can place the PC in sleep mode.
+ This policy setting specifies whether the PC can use standby sleep states (S1–S3) when started from a Windows To Go workspace. The Sleep state also presents a unique challenge to Windows To Go users. When a computer goes to sleep, it appears as if it is shut down. It could be very easy for a user to think that a Windows To Go workspace in sleep mode was actually shut down and they could remove the Windows To Go drive and take it home. Removing the Windows To Go drive in this scenario is equivalent to an unclean shutdown, which may result in the loss of unsaved user data or the corruption on the drive. Moreover, if the user now boots the drive on another PC and brings it back to the first PC, which still happens to be in the sleep state, it will lead to an arbitrary crash and eventually corruption of the drive and result in the workspace becoming unusable. If you enable this policy setting, the Windows To Go workspace cannot use the standby states to cause the PC to enter sleep mode. If you disable or do not configure this policy setting, the Windows To Go workspace can place the PC in sleep mode.
**Settings for host PCs**
@@ -267,7 +267,7 @@ Windows supports two types of PC firmware: Unified Extensible Firmware Interface
-This presented a unique challenge for Windows To Go because the firmware type is not easily determined by end-users—a UEFI computer looks just like a legacy BIOS computer and Windows To Go must boot on both types of firmware.
+This presented a unique challenge for Windows To Go because the firmware type is not easily determined by end users—a UEFI computer looks just like a legacy BIOS computer and Windows To Go must boot on both types of firmware.
To enable booting Windows To Go on both types of firmware, a new disk layout is provided for Windows 8 or later that contains both sets of boot components on a FAT32 system partition and a new command-line option was added to bcdboot.exe to support this configuration. The **/f** option is used with the **bcdboot /s** command to specify the firmware type of the target system partition by appending either **UEFI**, **BIOS** or **ALL**. When creating Windows To Go drives manually you must use the **ALL** parameter to provide the Windows To Go drive the ability to boot on both types of firmware. For example, on volume H: (your Windows To Go USB drive letter), you would use the command **bcdboot C:\\windows /s H: /f ALL**. The following diagram illustrates the disk layout that results from that command:
@@ -281,7 +281,7 @@ Windows To Go Startup Options is a setting available on Windows 10-based PCs tha
**To configure Windows To Go startup options**
-1. On the Start screen, type, type **Windows To Go Startup Options**, click **Settings** and then press Enter.
+1. On the Start screen, type, type **Windows To Go Startup Options**, click **Settings** and, then press Enter.
@@ -302,4 +302,4 @@ If you choose to not use the Windows To Go startup options or are using a PC run
[Windows To Go: feature overview](windows-to-go-overview.md)
[Prepare your organization for Windows To Go](prepare-your-organization-for-windows-to-go.md)
[Security and data protection considerations for Windows To Go](security-and-data-protection-considerations-for-windows-to-go.md)
-[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.md)
\ No newline at end of file
+[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.yml)
diff --git a/windows/deployment/planning/index.md b/windows/deployment/planning/index.md
index 518a1c29c4..9581461533 100644
--- a/windows/deployment/planning/index.md
+++ b/windows/deployment/planning/index.md
@@ -18,7 +18,7 @@ Windows 10 provides new deployment capabilities, scenarios, and tools by buildi
## In this section
|Topic |Description |
|------|------------|
-|[Windows 10 Enterprise: FAQ for IT professionals](windows-10-enterprise-faq-itpro.md) | Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise. |
+|[Windows 10 Enterprise: FAQ for IT professionals](windows-10-enterprise-faq-itpro.yml) | Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise. |
|[Windows 10 deployment considerations](windows-10-deployment-considerations.md) |There are new deployment options in Windows 10 that help you simplify the deployment process and automate migration of existing settings and applications. |
|[Windows 10 compatibility](windows-10-compatibility.md) |Windows 10 will be compatible with most existing PC hardware; most devices running Windows 7, Windows 8, or Windows 8.1 will meet the requirements for Windows 10. |
|[Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md) |There are specific infrastructure requirements to deploy and manage Windows 10 that should be in place prior to significant Windows 10 deployments within your organization. |
diff --git a/windows/deployment/planning/prepare-your-organization-for-windows-to-go.md b/windows/deployment/planning/prepare-your-organization-for-windows-to-go.md
index 53ac520c06..9d493e6f36 100644
--- a/windows/deployment/planning/prepare-your-organization-for-windows-to-go.md
+++ b/windows/deployment/planning/prepare-your-organization-for-windows-to-go.md
@@ -121,7 +121,7 @@ If you want Windows To Go to be able to connect back to organizational resources
[Security and data protection considerations for Windows To Go](security-and-data-protection-considerations-for-windows-to-go.md)
-[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.md)
+[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.yml)
diff --git a/windows/deployment/planning/security-and-data-protection-considerations-for-windows-to-go.md b/windows/deployment/planning/security-and-data-protection-considerations-for-windows-to-go.md
index faa9cab6ed..cf91886a29 100644
--- a/windows/deployment/planning/security-and-data-protection-considerations-for-windows-to-go.md
+++ b/windows/deployment/planning/security-and-data-protection-considerations-for-windows-to-go.md
@@ -32,7 +32,7 @@ One of the most important requirements to consider when you plan your Windows To
As long as you are not saving data on the Windows To Go drive, there is no need for a backup and restore solution for Windows To Go. If you are saving data on the drive and are not using folder redirection and offline files, you should back up all of your data to a network location, such as cloud storage or a network share after each work session. Review the new and improved features described in [Supporting Information Workers with Reliable File Services and Storage](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831495(v=ws.11)) for different solutions you could implement.
-If the USB drive fails for any reason, the standard process to restore the drive to working condition is to reformat and re-provision the drive with Windows To Go, so all data and customization on the drive will be lost. This is another reason why using roaming user profiles, folder redirection and offline files with Windows To Go is strongly recommended. For more information, see [Folder Redirection, Offline Files, and Roaming User Profiles overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh848267(v=ws.11)).
+If the USB drive fails for any reason, the standard process to restore the drive to working condition is to reformat and reprovision the drive with Windows To Go, so all data and customization on the drive will be lost. This is another reason why using roaming user profiles, folder redirection, and offline files with Windows To Go is strongly recommended. For more information, see [Folder Redirection, Offline Files, and Roaming User Profiles overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh848267(v=ws.11)).
## BitLocker
@@ -42,7 +42,7 @@ We recommend that you use BitLocker with your Windows To Go drives to protect th
You can enable BitLocker while using the Windows To Go Creator wizard as part of the drive provisioning process before first use; or it can be enabled afterward by the user from within the Windows To Go workspace.
**Tip**
-If the Windows To Go Creator wizard is not able to enable BitLocker, see [Why can't I enable BitLocker from Windows To Go Creator?](windows-to-go-frequently-asked-questions.md#wtg-faq-blfail)
+If the Windows To Go Creator wizard is not able to enable BitLocker, see [Why can't I enable BitLocker from Windows To Go Creator?](windows-to-go-frequently-asked-questions.yml#why-can-t-i-enable-bitlocker-from-windows-to-go-creator-)
@@ -51,7 +51,7 @@ If you are using a host computer running Windows 7 that has BitLocker enabled,
## Disk discovery and data leakage
-We recommend that you use the **NoDefaultDriveLetter** attribute when provisioning the USB drive to help prevent accidental data leakage. **NoDefaultDriveLetter** will prevent the host operating system from assigning a drive letter if a user inserts it into a running computer. This means the drive will not appear in Windows Explorer and an AutoPlay prompt will not be displayed to the user. This reduces the likelihood that an end-user will access the offline Windows To Go disk directly from another computer. If you use the Windows To Go Creator to provision a workspace, this attribute will automatically be set for you.
+We recommend that you use the **NoDefaultDriveLetter** attribute when provisioning the USB drive to help prevent accidental data leakage. **NoDefaultDriveLetter** will prevent the host operating system from assigning a drive letter if a user inserts it into a running computer. This means the drive will not appear in Windows Explorer and an Auto-Play prompt will not be displayed to the user. This reduces the likelihood that an end user will access the offline Windows To Go disk directly from another computer. If you use the Windows To Go Creator to provision a workspace, this attribute will automatically be set for you.
To prevent accidental data leakage between Windows To Go and the host system Windows 8 has a new SAN policy—OFFLINE\_INTERNAL - “4” to prevent the operating system from automatically bringing online any internally connected disk. The default configuration for Windows To Go has this policy enabled. It is strongly recommended you do not change this policy to allow mounting of internal hard drives when booted into the Windows To Go workspace. If the internal drive contains a hibernated Windows 8 operating system, mounting the drive will lead to loss of hibernation state and, therefore, user state or any unsaved user data when the host operating system is booted. If the internal drive contains a hibernated Windows 7 or earlier operating system, mounting the drive will lead to corruption when the host operating system is booted.
@@ -60,7 +60,7 @@ For more information, see [How to Configure Storage Area Network (SAN) Policy in
## Security certifications for Windows To Go
-Windows to Go is a core capability of Windows when it is deployed on the drive and is configured following the guidance for the applicable security certification. Solutions built using Windows To Go can be submitted for additional certifications by the solution provider that cover the solution provider’s specific hardware environment. For more details about Windows security certifications, see the following topics.
+Windows to Go is a core capability of Windows when it is deployed on the drive and is configured following the guidance for the applicable security certification. Solutions built using Windows To Go can be submitted for more certifications by the solution provider that cover the solution provider’s specific hardware environment. For more information about Windows security certifications, see the following topics.
- [Windows Platform Common Criteria Certification](/windows/security/threat-protection/windows-platform-common-criteria)
@@ -75,7 +75,7 @@ Windows to Go is a core capability of Windows when it is deployed on the drive a
[Deployment considerations for Windows To Go](deployment-considerations-for-windows-to-go.md)
-[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.md)
+[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.yml)
diff --git a/windows/deployment/planning/windows-10-deprecated-features.md b/windows/deployment/planning/windows-10-deprecated-features.md
index ccc51614a9..9bb45ca3af 100644
--- a/windows/deployment/planning/windows-10-deprecated-features.md
+++ b/windows/deployment/planning/windows-10-deprecated-features.md
@@ -26,6 +26,7 @@ The features described below are no longer being actively developed, and might b
|Feature | Details and mitigation | Announced in version |
| ----------- | --------------------- | ---- |
+| Timeline | Starting in July 2021, if you have your activity history synced across your devices through your Microsoft account (MSA), you'll no longer have the option to upload new activity in Timeline. See [Get help with timeline](https://support.microsoft.com/windows/get-help-with-timeline-febc28db-034c-d2b0-3bbe-79aa0c501039).| 20H2 |
| Microsoft Edge | The legacy version of Microsoft Edge is no longer being developed.| 2004 |
| Companion Device Framework | The [Companion Device Framework](/windows-hardware/design/device-experiences/windows-hello-companion-device-framework) is no longer under active development.| 2004 |
| Dynamic Disks | The [Dynamic Disks](/windows/win32/fileio/basic-and-dynamic-disks#dynamic-disks) feature is no longer being developed. This feature will be fully replaced by [Storage Spaces](/windows-server/storage/storage-spaces/overview) in a future release.| 2004 |
diff --git a/windows/deployment/planning/windows-10-enterprise-faq-itpro.md b/windows/deployment/planning/windows-10-enterprise-faq-itpro.md
deleted file mode 100644
index a70b3498c4..0000000000
--- a/windows/deployment/planning/windows-10-enterprise-faq-itpro.md
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: Windows 10 Enterprise FAQ for IT pros (Windows 10)
-description: Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise.
-keywords: Windows 10 Enterprise, download, system requirements, drivers, appcompat, manage updates, Windows as a service, servicing channels, deployment tools
-ms.prod: w10
-ms.mktglfcycl: plan
-ms.localizationpriority: medium
-ms.sitesec: library
-author: greg-lindsay
-ms.date: 08/18/2017
-ms.reviewer:
-manager: laurawi
-ms.author: greglin
-audience: itpro
-ms.topic: article
----
-
-# Windows 10 Enterprise: FAQ for IT professionals
-
-Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise.
-
-## Download and requirements
-
-### Where can I download Windows 10 Enterprise?
-
-If you have Windows volume licenses with Software Assurance, or if you have purchased licenses for Windows 10 Enterprise volume licenses, you can download 32-bit and 64-bit versions of Windows 10 Enterprise from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). If you do not have current Software Assurance for Windows and would like to purchase volume licenses for Windows 10 Enterprise, contact your preferred Microsoft Reseller or see [How to purchase through Volume Licensing](https://www.microsoft.com/Licensing/how-to-buy/how-to-buy.aspx).
-
-### What are the system requirements?
-
-For details, see [Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752).
-
-### What are the hardware requirements for Windows 10?
-
-Most computers that are compatible with Windows 8.1 will be compatible with Windows 10. You may need to install updated drivers in Windows 10 for your devices to properly function. See [Windows 10 specifications](https://www.microsoft.com/windows/windows-10-specifications) for more information.
-
-### Can I evaluate Windows 10 Enterprise?
-
-Yes, a 90-day evaluation of Windows 10 Enterprise is available through the [TechNet Evaluation Center](https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise). The evaluation is available in Chinese (Simplified), Chinese (Traditional), French, German, Italian, Japanese, Korean, Portuguese (Brazil), and Spanish (Spain, International Sort). We highly recommend that organizations make use of the Windows 10 Enterprise 90-day Evaluation to try out deployment and management scenarios, test compatibility with hardware and applications, and to get hands on experience with Windows 10 Enterprise features.
-
-## Drivers and compatibility
-
-### Where can I find drivers for my devices for Windows 10 Enterprise?
-
-For many devices, drivers will be automatically installed in Windows 10 and there will be no need for additional action.
-- For some devices, Windows 10 may be unable to install drivers that are required for operation. If your device drivers are not automatically installed, visit the manufacturer’s support website for your device to download and manually install the drivers. If Windows 10 drivers are not available, the most up-to-date drivers for Windows 8.1 will often work in Windows 10.
-- For some devices, the manufacturer may provide more up-to-date drivers or drivers that enable additional functionality than the drivers installed by Windows 10. Always follow the recommendations of the device manufacturer for optimal performance and stability.
-- Some computer manufacturers provide packs of drivers for easy implementation in management and deployment solutions like the Microsoft Deployment Toolkit (MDT) or Microsoft Endpoint Configuration Manager. These driver packs contain all of the drivers needed for each device and can greatly simplify the process of deploying Windows to a new make or model of computer. Driver packs for some common manufacturers include:
- - [HP driver pack](http://www8.hp.com/us/en/ads/clientmanagement/drivers-pack.html)
- - [Dell driver packs for enterprise client OS deployment](http://en.community.dell.com/techcenter/enterprise-client/w/wiki/2065.dell-command-deploy-driver-packs-for-enterprise-client-os-deployment)
- - [Lenovo Configuration Manager and MDT package index](https://support.lenovo.com/us/en/documents/ht074984)
- - [Panasonic Driver Pack for Enterprise](http://pc-dl.panasonic.co.jp/itn/drivers/driver_packages.html)
-
-### Where can I find out if an application or device is compatible with Windows 10?
-
-Many existing Win32 and Win64 applications already run reliably on Windows 10 without any changes. You can also expect strong compatibility and support for Web apps and devices. The [Ready for Windows](https://www.readyforwindows.com/) website lists software solutions that are supported and in use for Windows 10. You can find additional guidance to help with application compatibility at [Windows 10 application compatibility](/windows/windows-10/) on the Windows IT Center.
-
-### Is there an easy way to assess if my organization’s devices are ready to upgrade to Windows 10?
-
-[Windows Analytics Upgrade Readiness](/mem/configmgr/desktop-analytics/overview) (formerly known as Upgrade Analytics) provides powerful insights and recommendations about the computers, applications, and drivers in your organization, at no extra cost and without additional infrastructure requirements. This new service guides you through your upgrade and feature update projects using a workflow based on Microsoft recommended practices. Up-to-date inventory data allows you to balance cost and risk in your upgrade projects. You can find additional product information at [Windows Analytics](https://www.microsoft.com/WindowsForBusiness/Windows-Analytics).
-
-## Administration and deployment
-
-### Which deployment tools support Windows 10?
-
-Updated versions of Microsoft deployment tools, including MDT, Configuration Manager, and the Windows Assessment and Deployment Kit (Windows ADK) have been released to support Windows 10.
-- [MDT](https://www.microsoft.com/mdt) is Microsoft’s recommended collection of tools, processes, and guidance for automating desktop and server deployment.
-- Configuration Manager simplifies the deployment and management of Windows 10. If you are not currently using Configuration Manager, you can download a free 180-day trial of [Microsoft Endpoint Manager and Endpoint Protection (current branch)](https://www.microsoft.com/evalcenter/evaluate-system-center-configuration-manager-and-endpoint-protection) from the TechNet Evaluation Center.
-- The [Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit#winADK) has tools that allow you to customize Windows images for large-scale deployment, and test system quality and performance. You can download the latest version of the Windows ADK for Windows 10 from the Hardware Dev Center.
-
-### Can I upgrade computers from Windows 7 or Windows 8.1 without deploying a new image?
-
-Computers running Windows 7 or Windows 8.1 can be upgraded directly to Windows 10 through the in-place upgrade process without a need to reimage the device using MDT and/or Configuration Manager. For more information, see [Upgrade to Windows 10 with Microsoft Endpoint Configuration Manager](../deploy-windows-cm/upgrade-to-windows-10-with-configuraton-manager.md) or [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md).
-
-### Can I upgrade from Windows 7 Enterprise or Windows 8.1 Enterprise to Windows 10 Enterprise for free?
-
-If you have Windows 7 Enterprise or Windows 8.1 Enterprise and current Windows 10 Enterprise E3 or E5 subscription, you are entitled to the upgrade to Windows 10 Enterprise through the rights of Software Assurance. You can find your product keys and installation media at the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx).
-
-For devices that are licensed under a volume license agreement for Windows that does not include Software Assurance, new licenses will be required to upgrade these devices to Windows 10.
-
-## Managing updates
-
-### What is Windows as a service?
-
-The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers. 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. For more information, see [Overview of Windows as a service](../update/waas-overview.md).
-
-### How is servicing different with Windows as a service?
-
-Traditional Windows servicing has included several release types: major revisions (e.g., the Windows 8.1, Windows 8, and Windows 7 operating systems), service packs, and monthly updates. With Windows 10, there are two release types: feature updates that add new functionality two to three times per year, and quality updates that provide security and reliability fixes at least once a month.
-
-### What are the servicing channels?
-
-To align with the new method of delivering feature updates and quality updates in Windows 10, Microsoft introduced the concept of servicing channels to allow customers to designate how aggressively their individual devices are updated. For example, an organization may have test devices that the IT department can update with new features as soon as possible, and then specialized devices that require a longer feature update cycle to ensure continuity. With that in mind, Microsoft offers two servicing channels for Windows 10: Semi-Annual Channel, and Long-Term Servicing Channel (LTSC). For details about the versions in each servicing channel, see [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx). For more information on each channel, see [servicing channels](../update/waas-overview.md#servicing-channels).
-
-### What tools can I use to manage Windows as a service updates?
-
-There are many tools are available. You can choose from these:
-- Windows Update
-- Windows Update for Business
-- Windows Server Update Services
-- Microsoft Endpoint Configuration Manager
-
-For more information on pros and cons for these tools, see [Servicing Tools](../update/waas-overview.md#servicing-tools).
-
-## User experience
-
-### Where can I find information about new features and changes in Windows 10 Enterprise?
-
-For an overview of the new enterprise features in Windows 10 Enterprise, see [What's new in Windows 10](/windows/whats-new/) and [What's new in Windows 10, version 1703](/windows/whats-new/whats-new-windows-10-version-1703) in the Docs library.
-
-Another place to track the latest information about new features of interest to IT professionals is the [Windows for IT Pros blog](https://blogs.technet.microsoft.com/windowsitpro/). Here you’ll find announcements of new features, information on updates to the Windows servicing model, and details about the latest resources to help you more easily deploy and manage Windows 10.
-
-To find out which version of Windows 10 is right for your organization, you can also [compare Windows editions](https://www.microsoft.com/WindowsForBusiness/Compare).
-
-### How will people in my organization adjust to using Windows 10 Enterprise after upgrading from Windows 7 or Windows 8.1?
-
-Windows 10 combines the best aspects of the user experience from Windows 8.1 and Windows 7 to make using Windows simple and straightforward. Users of Windows 7 will find the Start menu in the same location as they always have. In the same place, users of Windows 8.1 will find the live tiles from their Start screen, accessible by the Start button in the same way as they were accessed in Windows 8.1. To help you make the transition a seamless one, download the [Windows 10 Adoption Planning Kit](https://info.microsoft.com/Windows10AdoptionPlanningKit) and see our [end user readiness](/windows/windows-10/) resources.
-
-### How does Windows 10 help people work with applications and data across a variety of devices?
-
-The desktop experience in Windows 10 has been improved to provide a better experience for people that use a traditional mouse and keyboard. Key changes include:
-- Start menu is a launching point for access to apps.
-- Universal apps now open in windows instead of full screen.
-- [Multitasking is improved with adjustable Snap](http://blogs.windows.com/bloggingwindows/2015/06/04/arrange-your-windows-in-a-snap/), which allows you to have more than two windows side-by-side on the same screen and to customize how those windows are arranged.
-- Tablet Mode to simplify using Windows with a finger or pen by using touch input.
-
-## Help and support
-
-### Where can I ask a question about Windows 10?
-
-Use the following resources for additional information about Windows 10.
-- If you are an IT professional or if you have a question about administering, managing, or deploying Windows 10 in your organization or business, visit the [Windows 10 IT Professional forums](https://social.technet.microsoft.com/forums/home?category=windows10itpro) on TechNet.
-- If you are an end user or if you have a question about using Windows 10, visit the [Windows 10 forums on Microsoft Community](https://answers.microsoft.com/windows/forum/windows_10).
-- If you are a developer or if you have a question about making apps for Windows 10, visit the [Windows Desktop Development forums](https://social.msdn.microsoft.com/forums/en-us/home?category=windowsdesktopdev) or [Windows and Windows phone apps forums](https://social.msdn.microsoft.com/forums/en-us/home?category=windowsapps) on MSDN.
-- If you have a question about Internet Explorer, visit the [Internet Explorer forums](https://social.technet.microsoft.com/forums/ie/en-us/home) on TechNet.
\ No newline at end of file
diff --git a/windows/deployment/planning/windows-10-enterprise-faq-itpro.yml b/windows/deployment/planning/windows-10-enterprise-faq-itpro.yml
new file mode 100644
index 0000000000..b832a4fcdd
--- /dev/null
+++ b/windows/deployment/planning/windows-10-enterprise-faq-itpro.yml
@@ -0,0 +1,153 @@
+### YamlMime:FAQ
+metadata:
+ title: Windows 10 Enterprise FAQ for IT pros (Windows 10)
+ description: Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise.
+ keywords: Windows 10 Enterprise, download, system requirements, drivers, appcompat, manage updates, Windows as a service, servicing channels, deployment tools
+ ms.prod: w10
+ ms.mktglfcycl: plan
+ ms.localizationpriority: medium
+ ms.sitesec: library
+ author: greg-lindsay
+ ms.date: 08/18/2017
+ ms.reviewer:
+ manager: laurawi
+ ms.author: greglin
+ audience: itpro
+ ms.topic: article
+
+title: 'Windows 10 Enterprise: FAQ for IT professionals'
+summary: Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise.
+
+
+sections:
+ - name: Download and requirements
+ questions:
+ - question: |
+ Where can I download Windows 10 Enterprise?
+ answer: |
+ If you have Windows volume licenses with Software Assurance, or if you have purchased licenses for Windows 10 Enterprise volume licenses, you can download 32-bit and 64-bit versions of Windows 10 Enterprise from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). If you do not have current Software Assurance for Windows and would like to purchase volume licenses for Windows 10 Enterprise, contact your preferred Microsoft Reseller or see [How to purchase through Volume Licensing](https://www.microsoft.com/Licensing/how-to-buy/how-to-buy.aspx).
+
+ - question: |
+ What are the system requirements?
+ answer: |
+ For details, see [Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752).
+
+ - question: |
+ What are the hardware requirements for Windows 10?
+ answer: |
+ Most computers that are compatible with Windows 8.1 will be compatible with Windows 10. You may need to install updated drivers in Windows 10 for your devices to properly function. See [Windows 10 specifications](https://www.microsoft.com/windows/windows-10-specifications) for more information.
+
+ - question: |
+ Can I evaluate Windows 10 Enterprise?
+ answer: |
+ Yes, a 90-day evaluation of Windows 10 Enterprise is available through the [TechNet Evaluation Center](https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise). The evaluation is available in Chinese (Simplified), Chinese (Traditional), French, German, Italian, Japanese, Korean, Portuguese (Brazil), and Spanish (Spain, International Sort). We highly recommend that organizations make use of the Windows 10 Enterprise 90-day Evaluation to try out deployment and management scenarios, test compatibility with hardware and applications, and to get hands on experience with Windows 10 Enterprise features.
+
+ - name: Drivers and compatibility
+ questions:
+ - question: |
+ Where can I find drivers for my devices for Windows 10 Enterprise?
+ answer: |
+ For many devices, drivers will be automatically installed in Windows 10 and there will be no need for additional action.
+ - For some devices, Windows 10 may be unable to install drivers that are required for operation. If your device drivers are not automatically installed, visit the manufacturer’s support website for your device to download and manually install the drivers. If Windows 10 drivers are not available, the most up-to-date drivers for Windows 8.1 will often work in Windows 10.
+ - For some devices, the manufacturer may provide more up-to-date drivers or drivers that enable additional functionality than the drivers installed by Windows 10. Always follow the recommendations of the device manufacturer for optimal performance and stability.
+ - Some computer manufacturers provide packs of drivers for easy implementation in management and deployment solutions like the Microsoft Deployment Toolkit (MDT) or Microsoft Endpoint Configuration Manager. These driver packs contain all of the drivers needed for each device and can greatly simplify the process of deploying Windows to a new make or model of computer. Driver packs for some common manufacturers include:
+ - [HP driver pack](http://www8.hp.com/us/en/ads/clientmanagement/drivers-pack.html)
+ - [Dell driver packs for enterprise client OS deployment](http://en.community.dell.com/techcenter/enterprise-client/w/wiki/2065.dell-command-deploy-driver-packs-for-enterprise-client-os-deployment)
+ - [Lenovo Configuration Manager and MDT package index](https://support.lenovo.com/us/en/documents/ht074984)
+ - [Panasonic Driver Pack for Enterprise](http://pc-dl.panasonic.co.jp/itn/drivers/driver_packages.html)
+
+ - question: |
+ Where can I find out if an application or device is compatible with Windows 10?
+ answer: |
+ Many existing Win32 and Win64 applications already run reliably on Windows 10 without any changes. You can also expect strong compatibility and support for Web apps and devices. The [Ready for Windows](https://www.readyforwindows.com/) website lists software solutions that are supported and in use for Windows 10. You can find additional guidance to help with application compatibility at [Windows 10 application compatibility](/windows/windows-10/) on the Windows IT Center.
+
+ - question: |
+ Is there an easy way to assess if my organization’s devices are ready to upgrade to Windows 10?
+ answer: |
+ [Windows Analytics Upgrade Readiness](/mem/configmgr/desktop-analytics/overview) (formerly known as Upgrade Analytics) provides powerful insights and recommendations about the computers, applications, and drivers in your organization, at no extra cost and without additional infrastructure requirements. This new service guides you through your upgrade and feature update projects using a workflow based on Microsoft recommended practices. Up-to-date inventory data allows you to balance cost and risk in your upgrade projects. You can find additional product information at [Windows Analytics](https://www.microsoft.com/WindowsForBusiness/Windows-Analytics).
+
+ - name: Administration and deployment
+ questions:
+ - question: |
+ Which deployment tools support Windows 10?
+ answer: |
+ Updated versions of Microsoft deployment tools, including MDT, Configuration Manager, and the Windows Assessment and Deployment Kit (Windows ADK) have been released to support Windows 10.
+ - [MDT](https://www.microsoft.com/mdt) is Microsoft’s recommended collection of tools, processes, and guidance for automating desktop and server deployment.
+ - Configuration Manager simplifies the deployment and management of Windows 10. If you are not currently using Configuration Manager, you can download a free 180-day trial of [Microsoft Endpoint Manager and Endpoint Protection (current branch)](https://www.microsoft.com/evalcenter/evaluate-system-center-configuration-manager-and-endpoint-protection) from the TechNet Evaluation Center.
+ - The [Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit#winADK) has tools that allow you to customize Windows images for large-scale deployment, and test system quality and performance. You can download the latest version of the Windows ADK for Windows 10 from the Hardware Dev Center.
+
+ - question: |
+ Can I upgrade computers from Windows 7 or Windows 8.1 without deploying a new image?
+ answer: |
+ Computers running Windows 7 or Windows 8.1 can be upgraded directly to Windows 10 through the in-place upgrade process without a need to reimage the device using MDT and/or Configuration Manager. For more information, see [Upgrade to Windows 10 with Microsoft Endpoint Configuration Manager](../deploy-windows-cm/upgrade-to-windows-10-with-configuraton-manager.md) or [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md).
+
+ - question: |
+ Can I upgrade from Windows 7 Enterprise or Windows 8.1 Enterprise to Windows 10 Enterprise for free?
+ answer: |
+ If you have Windows 7 Enterprise or Windows 8.1 Enterprise and current Windows 10 Enterprise E3 or E5 subscription, you are entitled to the upgrade to Windows 10 Enterprise through the rights of Software Assurance. You can find your product keys and installation media at the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx).
+
+ For devices that are licensed under a volume license agreement for Windows that does not include Software Assurance, new licenses will be required to upgrade these devices to Windows 10.
+
+ - name: Managing updates
+ questions:
+ - question: |
+ What is Windows as a service?
+ answer: |
+ The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers. 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. For more information, see [Overview of Windows as a service](../update/waas-overview.md).
+
+ - question: |
+ How is servicing different with Windows as a service?
+ answer: |
+ Traditional Windows servicing has included several release types: major revisions (e.g., the Windows 8.1, Windows 8, and Windows 7 operating systems), service packs, and monthly updates. With Windows 10, there are two release types: feature updates that add new functionality two to three times per year, and quality updates that provide security and reliability fixes at least once a month.
+
+ - question: |
+ What are the servicing channels?
+ answer: |
+ To align with the new method of delivering feature updates and quality updates in Windows 10, Microsoft introduced the concept of servicing channels to allow customers to designate how aggressively their individual devices are updated. For example, an organization may have test devices that the IT department can update with new features as soon as possible, and then specialized devices that require a longer feature update cycle to ensure continuity. With that in mind, Microsoft offers two servicing channels for Windows 10: Semi-Annual Channel, and Long-Term Servicing Channel (LTSC). For details about the versions in each servicing channel, see [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx). For more information on each channel, see [servicing channels](../update/waas-overview.md#servicing-channels).
+
+ - question: |
+ What tools can I use to manage Windows as a service updates?
+ answer: |
+ There are many tools are available. You can choose from these:
+ - Windows Update
+ - Windows Update for Business
+ - Windows Server Update Services
+ - Microsoft Endpoint Configuration Manager
+
+ For more information on pros and cons for these tools, see [Servicing Tools](../update/waas-overview.md#servicing-tools).
+
+ - name: User experience
+ questions:
+ - question: |
+ Where can I find information about new features and changes in Windows 10 Enterprise?
+ answer: |
+ For an overview of the new enterprise features in Windows 10 Enterprise, see [What's new in Windows 10](/windows/whats-new/) and [What's new in Windows 10, version 1703](/windows/whats-new/whats-new-windows-10-version-1703) in the Docs library.
+
+ Another place to track the latest information about new features of interest to IT professionals is the [Windows for IT Pros blog](https://blogs.technet.microsoft.com/windowsitpro/). Here you’ll find announcements of new features, information on updates to the Windows servicing model, and details about the latest resources to help you more easily deploy and manage Windows 10.
+
+ To find out which version of Windows 10 is right for your organization, you can also [compare Windows editions](https://www.microsoft.com/WindowsForBusiness/Compare).
+
+ - question: |
+ How will people in my organization adjust to using Windows 10 Enterprise after upgrading from Windows 7 or Windows 8.1?
+ answer: |
+ Windows 10 combines the best aspects of the user experience from Windows 8.1 and Windows 7 to make using Windows simple and straightforward. Users of Windows 7 will find the Start menu in the same location as they always have. In the same place, users of Windows 8.1 will find the live tiles from their Start screen, accessible by the Start button in the same way as they were accessed in Windows 8.1. To help you make the transition a seamless one, download the [Windows 10 Adoption Planning Kit](https://info.microsoft.com/Windows10AdoptionPlanningKit) and see our [end user readiness](/windows/windows-10/) resources.
+
+ - question: |
+ How does Windows 10 help people work with applications and data across a variety of devices?
+ answer: |
+ The desktop experience in Windows 10 has been improved to provide a better experience for people that use a traditional mouse and keyboard. Key changes include:
+ - Start menu is a launching point for access to apps.
+ - Universal apps now open in windows instead of full screen.
+ - [Multitasking is improved with adjustable Snap](http://blogs.windows.com/bloggingwindows/2015/06/04/arrange-your-windows-in-a-snap/), which allows you to have more than two windows side-by-side on the same screen and to customize how those windows are arranged.
+ - Tablet Mode to simplify using Windows with a finger or pen by using touch input.
+
+ - name: Help and support
+ questions:
+ - question: |
+ Where can I ask a question about Windows 10?
+ answer: |
+ Use the following resources for additional information about Windows 10.
+ - If you are an IT professional or if you have a question about administering, managing, or deploying Windows 10 in your organization or business, visit the [Windows 10 IT Professional forums](https://social.technet.microsoft.com/forums/home?category=windows10itpro) on TechNet.
+ - If you are an end user or if you have a question about using Windows 10, visit the [Windows 10 forums on Microsoft Community](https://answers.microsoft.com/windows/forum/windows_10).
+ - If you are a developer or if you have a question about making apps for Windows 10, visit the [Windows Desktop Development forums](https://social.msdn.microsoft.com/forums/en-us/home?category=windowsdesktopdev) or [Windows and Windows phone apps forums](https://social.msdn.microsoft.com/forums/en-us/home?category=windowsapps) on MSDN.
+ - If you have a question about Internet Explorer, visit the [Internet Explorer forums](https://social.technet.microsoft.com/forums/ie/en-us/home) on TechNet.
diff --git a/windows/deployment/planning/windows-to-go-frequently-asked-questions.md b/windows/deployment/planning/windows-to-go-frequently-asked-questions.md
deleted file mode 100644
index 0d77876b13..0000000000
--- a/windows/deployment/planning/windows-to-go-frequently-asked-questions.md
+++ /dev/null
@@ -1,457 +0,0 @@
----
-title: Windows To Go frequently asked questions (Windows 10)
-description: Though Windows To Go is no longer being developed, these frequently asked questions (FAQ) can provide answers about the feature.
-ms.assetid: bfdfb824-4a19-4401-b369-22c5e6ca9d6e
-ms.reviewer:
-manager: laurawi
-ms.author: greglin
-keywords: FAQ, mobile, device, USB
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.pagetype: mobility
-ms.sitesec: library
-audience: itpro
-author: greg-lindsay
-ms.topic: article
----
-
-# Windows To Go: frequently asked questions
-
-
-**Applies to**
-
-- Windows 10
-
-> [!IMPORTANT]
-> Windows To Go is removed in Windows 10, version 2004 and later operating systems. The feature does not support feature updates and therefore does not enable you to stay current. It also requires a specific type of USB that is no longer supported by many OEMs.
-
-The following list identifies some commonly asked questions about Windows To Go.
-
-- [What is Windows To Go?](#wtg-faq-whatis)
-
-- [Does Windows To Go rely on virtualization?](#wtg-faq-virt)
-
-- [Who should use Windows To Go?](#wtg-faq-who)
-
-- [How can Windows To Go be deployed in an organization?](#wtg-faq-deploy)
-
-- [Is Windows To Go supported on both USB 2.0 and USB 3.0 drives?](#wtg-faq-usbvs)
-
-- [Is Windows To Go supported on USB 2.0 and USB 3.0 ports?](#wtg-faq-usbports)
-
-- [How do I identify a USB 3.0 port?](#wtg-faq-usb3port)
-
-- [Does Windows To Go run faster on a USB 3.0 port?](#wtg-faq-usb3speed)
-
-- [Can the user self-provision Windows To Go?](#wtg-faq-selfpro)
-
-- [How can Windows To Go be managed in an organization?](#wtg-faq-mng)
-
-- [How do I make my computer boot from USB?](#wtf-faq-startup)
-
-- [Why isn't my computer booting from USB?](#wtg-faq-noboot)
-
-- [What happens if I remove my Windows To Go drive while it is running?](#wtg-faq-surprise)
-
-- [Can I use BitLocker to protect my Windows To Go drive?](#wtg-faq-bitlocker)
-
-- [Why can't I enable BitLocker from Windows To Go Creator?](#wtg-faq-blfail)
-
-- [What power states does Windows To Go support?](#wtg-faq-power)
-
-- [Why is hibernation disabled in Windows To Go?](#wtg-faq-hibernate)
-
-- [Does Windows To Go support crash dump analysis?](#wtg-faq-crashdump)
-
-- [Do "Windows To Go Startup Options" work with dual boot computers?](#wtg-faq-dualboot)
-
-- [I plugged my Windows To Go drive into a running computer and I can't see the partitions on the drive. Why not?](#wtg-faq-diskpart)
-
-- [I'm booted into Windows To Go, but I can't browse to the internal hard drive of the host computer. Why not?](#wtg-faq-san4)
-
-- [Why does my Windows To Go drive have an MBR disk format with a FAT32 system partition?](#wtg-faq-fatmbr)
-
-- [Is Windows To Go secure if I use it on an untrusted machine?](#wtg-faq-malhost)
-
-- [Does Windows To Go work with ARM processors?](#wtg-faq-arm)
-
-- [Can I synchronize data from Windows To Go with my other computer?](#wtg-faq-datasync)
-
-- [What size USB Flash Drive do I need to make a Windows To Go drive?](#wtg-faq-usbsz)
-
-- [Do I need to activate Windows To Go every time I roam?](#wtg-faq-roamact)
-
-- [Can I use all Windows features on Windows To Go?](#wtg-faq-features)
-
-- [Can I use all my applications on Windows To Go?](#wtg-faq-approam)
-
-- [Does Windows To Go work slower than standard Windows?](#wtg-faq-slow)
-
-- [If I lose my Windows To Go drive, will my data be safe?](#wtg-faq-safeloss)
-
-- [Can I boot Windows To Go on a Mac?](#wtg-faq-mac)
-
-- [Are there any APIs that allow applications to identify a Windows To Go workspace?](#wtg-faq-api)
-
-- [How is Windows To Go licensed?](#wtg-faq-lic)
-
-- [Does Windows Recovery Environment work with Windows To Go? What's the guidance for recovering a Windows To Go drive?](#wtg-faq-recovery)
-
-- [Why won't Windows To Go work on a computer running Windows XP or Windows Vista?](#wtg-faq-oldos)
-
-- [Why does the operating system on the host computer matter?](#wtg-faq-oldos2)
-
-- [My host computer running Windows 7 is protected by BitLocker Drive Encryption. Why did I need to use the recovery key to unlock and reboot my host computer after using Windows To Go?](#wtg-faq-blreckey)
-
-- [I decided to stop using a drive for Windows To Go and reformatted it – why doesn't it have a drive letter assigned and how can I fix it?](#wtg-faq-reformat)
-
-- [Why do I keep on getting the message "Installing devices…" when I boot Windows To Go?](#bkmk-roamconflict)
-
-- [How do I upgrade the operating system on my Windows To Go drive?](#bkmk-upgradewtg)
-
-## What is Windows To Go?
-
-
-Windows To Go is a feature for users of Windows 10 Enterprise and Windows 10 Education that enables users to boot a full version of Windows from external USB drives on host PCs.
-
-## Does Windows To Go rely on virtualization?
-
-
-No. Windows To Go is a native instance of Windows 10 that runs from a USB device. It is just like a laptop hard drive with Windows 8 that has been put into a USB enclosure.
-
-## Who should use Windows To Go?
-
-
-Windows To Go was designed for enterprise usage and targets scenarios such as continuance of operations, contractors, managed free seating, traveling workers, and work from home.
-
-## How can Windows To Go be deployed in an organization?
-
-
-Windows To Go can be deployed using standard Windows deployment tools like Diskpart and DISM. The prerequisites for deploying Windows To Go are:
-
-- A Windows To Go recommended USB drive to provision; See the list of currently available USB drives at [Hardware considerations for Windows To Go](windows-to-go-overview.md#wtg-hardware)
-
-- A Windows 10 Enterprise or Windows 10 Education image
-
-- A Windows 10 Enterprise, Windows 10 Education or Windows 10 Professional host PC that can be used to provision new USB keys
-
-You can use a Windows PowerShell script to target several drives and scale your deployment for a large number of Windows To Go drives. You can also use a USB duplicator to duplicate a Windows To Go drive after it has been provisioned if you are creating a large number of drives. See the [Windows To Go Step by Step](https://go.microsoft.com/fwlink/p/?LinkId=618950) article on the TechNet wiki for a walkthrough of the drive creation process.
-
-## Is Windows To Go supported on both USB 2.0 and USB 3.0 drives?
-
-
-No. Windows To Go is supported on USB 3.0 drives that are certified for Windows To Go.
-
-## Is Windows To Go supported on USB 2.0 and USB 3.0 ports?
-
-
-Yes. Windows To Go is fully supported on either USB 2.0 ports or USB 3.0 ports on PCs certified for Windows 7 or later.
-
-## How do I identify a USB 3.0 port?
-
-
-USB 3.0 ports are usually marked blue or carry a SS marking on the side.
-
-## Does Windows To Go run faster on a USB 3.0 port?
-
-
-Yes. Because USB 3.0 offers significantly faster speeds than USB 2.0, a Windows To Go drive running on a USB 3.0 port will operate considerably faster. This speed increase applies to both drive provisioning and when the drive is being used as a workspace.
-
-## Can the user self-provision Windows To Go?
-
-
-Yes, if the user has administrator permissions they can self-provision a Windows To Go drive using the Windows To Go Creator wizard which is included in Windows 10 Enterprise, Windows 10 Education and Windows 10 Professional. Additionally, System Center 2012 Configuration Manager SP1 and later releases includes support for user self-provisioning of Windows To Go drives. Configuration Manager can be downloaded for evaluation from the [Microsoft TechNet Evaluation Center](https://go.microsoft.com/fwlink/p/?LinkID=618746).
-
-## How can Windows To Go be managed in an organization?
-
-
-Windows To Go can be deployed and managed like a traditional desktop PC using standard Windows enterprise software distribution tools like Microsoft Endpoint Configuration Manager. Computer and user settings for Windows To Go workspaces can be managed using Group Policy setting also in the same manner that you manage Group Policy settings for other PCs in your organization. Windows To Go workspaces can be configured to connect to the organizational resources remotely using DirectAccess or a virtual private network connection so that they can connect securely to your network.
-
-## How do I make my computer boot from USB?
-
-
-For host computers running Windows 10
-
-- Using Cortana, search for **Windows To Go startup options**, and then press Enter.
-- In the **Windows To Go Startup Options** dialog box, select **Yes**, and then click **Save Changes** to configure the computer to boot from USB.
-
-For host computers running Windows 8 or Windows 8.1:
-
-Press **Windows logo key+W** and then search for **Windows To Go startup options** and then press Enter.
-
-In the **Windows To Go Startup Options** dialog box select **Yes** and then click **Save Changes** to configure the computer to boot from USB.
-
-> [!NOTE]
-> Your IT department can use Group Policy to configure Windows To Go Startup Options in your organization.
-
-
-
-If the host computer is running an earlier version of the Windows operating system need to configure the computer to boot from USB manually.
-
-To do this, early during boot time (usually when you see the manufacturer's logo), enter your firmware/BIOS setup. (This method to enter firmware/BIOS setup differs with different computer manufacturers, but is usually entered by pressing one of the function keys, such as F12, F2, F1, Esc, and so forth. You should check the manufacturer's site to be sure if you do not know which key to use to enter firmware setup.)
-
-After you have entered firmware setup, make sure that boot from USB is enabled. Then change the boot order to boot from USB drives first.
-
-Alternatively, if your computer supports it, you can try to use the one-time boot menu (often F12), to select USB boot on a per-boot basis.
-
-For more detailed instructions, see the wiki article, [Tips for configuring your BIOS settings to work with Windows To Go](https://go.microsoft.com/fwlink/p/?LinkID=618951).
-
-**Warning**
-Configuring a computer to boot from USB will cause your computer to attempt to boot from any bootable USB device connected to your computer. This potentially includes malicious devices. Users should be informed of this risk and instructed to not have any bootable USB storage devices plugged in to their computers except for their Windows To Go drive.
-
-
-
-## Why isn't my computer booting from USB?
-
-
-Computers certified for Windows 7 and later are required to have support for USB boot. Check to see if any of the following items apply to your situation:
-
-1. Ensure that your computer has the latest BIOS installed and the BIOS is configured to boot from a USB device.
-
-2. Ensure that the Windows To Go drive is connected directly to a USB port on the computer. Many computers don't support booting from a device connected to a USB 3 PCI add-on card or external USB hubs.
-
-3. If the computer is not booting from a USB 3.0 port, try to boot from a USB 2.0 port.
-
-If none of these items enable the computer to boot from USB, contact the hardware manufacturer for additional support.
-
-## What happens if I remove my Windows To Go drive while it is running?
-
-
-If the Windows To Go drive is removed, the computer will freeze and the user will have 60 seconds to reinsert the Windows To Go drive. If the Windows To Go drive is reinserted into the same port it was removed from, Windows will resume at the point where the drive was removed. If the USB drive is not reinserted, or is reinserted into a different port, the host computer will turn off after 60 seconds.
-
-**Warning**
-You should never remove your Windows To Go drive when your workspace is running. The computer freeze is a safety measure to help mitigate the risk of accidental removal. Removing the Windows To Go drive without shutting down the Windows To Go workspace could result in corruption of the Windows To Go drive.
-
-
-
-## Can I use BitLocker to protect my Windows To Go drive?
-
-
-Yes. In Windows 8 and later, BitLocker has added support for using a password to protect operating system drives. This means that you can use a password to secure your Windows To Go workspace and you will be prompted to enter this password every time you use the Windows To Go workspace.
-
-## Why can't I enable BitLocker from Windows To Go Creator?
-
-
-Several different Group Policies control the use of BitLocker on your organizations computers. These policies are located in the **Computer Configuration\\Policies\\Administrative Templates\\Windows Components\\BitLocker Drive Encryption** folder of the local Group Policy editor. The folder contains three sub-folders for fixed, operating system and removable data drive types.
-
-When you are using Windows To Go Creator, the Windows To Go drive is considered a removable data drive by BitLocker. Review the following setting to see if these settings apply in your situation:
-
-1. **Control use of BitLocker on removable drives**
-
- If this setting is disabled BitLocker cannot be used with removable drives, so the Windows To Go Creator wizard will fail if it attempts to enable BitLocker on the Windows To Go drive.
-
-2. **Configure use of smart cards on removable data drives**
-
- If this setting is enabled and the option **Require use of smart cards on removable data drives** is also selected the creator wizard might fail if you have not already signed on using your smart card credentials before starting the Windows To Go Creator wizard.
-
-3. **Configure use of passwords for removable data drives**
-
- If this setting is enabled and the **Require password complexity option** is selected the computer must be able to connect to the domain controller to verify that the password specified meets the password complexity requirements. If the connection is not available, the Windows To Go Creator wizard will fail to enable BitLocker.
-
-Additionally, the Windows To Go Creator will disable the BitLocker option if the drive does not have any volumes. In this situation, you should initialize the drive and create a volume using the Disk Management console before provisioning the drive with Windows To Go.
-
-## What power states does Windows To Go support?
-
-
-Windows To Go supports all power states except the hibernate class of power states, which include hybrid boot, hybrid sleep, and hibernate. This default behavior can be modified by using Group Policy settings to enable hibernation of the Windows To Go workspace.
-
-## Why is hibernation disabled in Windows To Go?
-
-
-When a Windows To Go workspace is hibernated, it will only successfully resume on the exact same hardware. Therefore, if a Windows To Go workspace is hibernated on one computer and roamed to another, the hibernation state (and therefore user state) will be lost. To prevent this from happening, the default settings for a Windows To Go workspace disable hibernation. If you are confident that you will only attempt to resume on the same computer, you can enable hibernation using the Windows To Go Group Policy setting, **Allow hibernate (S4) when started from a Windows To Go workspace** that is located at **\\\\Computer Configuration\\Administrative Templates\\Windows Components\\Portable Operating System\\** in the Local Group Policy Editor (gpedit.msc).
-
-## Does Windows To Go support crash dump analysis?
-
-
-Yes. Windows 8 and later support crash dump stack analysis for both USB 2.0 and 3.0.
-
-## Do "Windows To Go Startup Options" work with dual boot computers?
-
-
-Yes, if both operating systems are running the Windows 8 operating system. Enabling "Windows To Go Startup Options" should cause the computer to boot from the Windows To Go workspace when the drive is plugged in before the computer is turned on.
-
-If you have configured a dual boot computer with a Windows operating system and another operating system it might work occasionally and fail occasionally. Using this configuration is unsupported.
-
-## I plugged my Windows To Go drive into a running computer and I can't see the partitions on the drive. Why not?
-
-
-Windows To Go Creator and the recommended deployment steps for Windows To Go set the NO\_DEFAULT\_DRIVE\_LETTER flag on the Windows To Go drive. This flag prevents Windows from automatically assigning drive letters to the partitions on the Windows To Go drive. That's why you can't see the partitions on the drive when you plug your Windows To Go drive into a running computer. This helps prevent accidental data leakage between the Windows To Go drive and the host computer. If you really need to access the files on the Windows To Go drive from a running computer, you can use diskmgmt.msc or diskpart to assign a drive letter.
-
-**Warning**
-It is strongly recommended that you do not plug your Windows To Go drive into a running computer. If the computer is compromised, your Windows To Go workspace can also be compromised.
-
-
-
-## I'm booted into Windows To Go, but I can't browse to the internal hard drive of the host computer. Why not?
-
-
-Windows To Go Creator and the recommended deployment steps for Windows To Go set SAN Policy 4 on Windows To Go drive. This policy prevents Windows from automatically mounting internal disk drives. That's why you can't see the internal hard drives of the host computer when you are booted into Windows To Go. This is done to prevent accidental data leakage between Windows To Go and the host system. This policy also prevents potential corruption on the host drives or data loss if the host operating system is in a hibernation state. If you really need to access the files on the internal hard drive, you can use diskmgmt.msc to mount the internal drive.
-
-**Warning**
-It is strongly recommended that you do not mount internal hard drives when booted into the Windows To Go workspace. If the internal drive contains a hibernated Windows 8 or later operating system, mounting the drive will lead to loss of hibernation state and therefor user state or any unsaved user data when the host operating system is booted. If the internal drive contains a hibernated Windows 7 or earlier operating system, mounting the drive will lead to corruption when the host operating system is booted.
-
-
-
-## Why does my Windows To Go drive have an MBR disk format with a FAT32 system partition?
-
-
-This is done to allow Windows To Go to boot from UEFI and legacy systems.
-
-## Is Windows To Go secure if I use it on an untrusted computer?
-
-
-While you are more secure than if you use a completely untrusted operating system, you are still vulnerable to attacks from the firmware or anything that runs before Windows To Go starts. If you plug your Windows To Go drive into a running untrusted computer, your Windows To Go drive can be compromised because any malicious software that might be active on the computer can access the drive.
-
-## Does Windows To Go work with ARM processors?
-
-
-No. Windows RT is a specialized version of Windows designed for ARM processors. Windows To Go is currently only supported on PCs with x86 or x64-based processors.
-
-## Can I synchronize data from Windows To Go with my other computer?
-
-
-To get your data across all your computers, we recommend using folder redirection and client side caching to store copies of your data on a server while giving you offline access to the files you need.
-
-## What size USB flash drive do I need to make a Windows To Go drive?
-
-
-The size constraints are the same as full Windows. To ensure that you have enough space for Windows, your data, and your applications, we recommend USB drives that are a minimum of 20 GB in size.
-
-## Do I need to activate Windows To Go every time I roam?
-
-
-No, Windows To Go requires volume activation; either using the [Key Management Service](/previous-versions/tn-archive/ff793434(v=technet.10)) (KMS) server in your organization or using [Active Directory](/previous-versions/windows/hh852637(v=win.10)) based volume activation. The Windows To Go workspace will not need to be reactivated every time you roam. KMS activates Windows on a local network, eliminating the need for individual computers to connect to Microsoft. To remain activated, KMS client computers must renew their activation by connecting to the KMS host on periodic basis. This typically occurs as soon as the user has access to the corporate network (either through a direct connection on-premises or a through remote connection using DirectAccess or a virtual private network connection), once activated the machine will not need to be activated again until the activation validity interval has passed. In a KMS configuration the activation validity interval is 180 days.
-
-## Can I use all Windows features on Windows To Go?
-
-
-Yes, with some minor exceptions, you can use all Windows features with your Windows To Go workspace. The only currently unsupported features are using the Windows Recovery Environment and PC Reset & Refresh.
-
-## Can I use all my applications on Windows To Go?
-
-
-Yes. Because your Windows To Go workspace is a full Windows 10 environment, all applications that work with Windows 10 should work in your Windows To Go workspace. However, any applications that use hardware binding (usually for licensing and/or digital rights management reasons) may not run when you roam your Windows To Go drive between different host computers, and you may have to use those applications on the same host computer every time.
-
-## Does Windows To Go work slower than standard Windows?
-
-
-If you are using a USB 3.0 port and a Windows To Go certified device, there should be no perceivable difference between standard Windows and Windows To Go. However, if you are booting from a USB 2.0 port, you may notice some slowdown since USB 2.0 transfer speeds are slower than SATA speeds.
-
-## If I lose my Windows To Go drive, will my data be safe?
-
-
-Yes! If you enable BitLocker on your Windows To Go drive, all your data will be encrypted and protected and a malicious user will not be able to access your data without your password. If you don't enable BitLocker, your data will be vulnerable if you lose your Windows To Go drive.
-
-## Can I boot Windows To Go on a Mac?
-
-
-We are committed to give customers a consistent and quality Windows 10 experience with Windows To Go. Windows To Go supports host devices certified for use with Windows 7 or later. Because Mac computers are not certified for use with Windows 7 or later, using Windows To Go is not supported on a Mac.
-
-## Are there any APIs that allow applications to identify a Windows To Go workspace?
-
-
-Yes. You can use a combination of identifiers to determine if the currently running operating system is a Windows To Go workspace. First, check if the **PortableOperatingSystem** property is true. When that value is true it means that the operating system was booted from an external USB device.
-
-Next, check if the **OperatingSystemSKU** property is equal to **4** (for Windows 10 Enterprise) or **121** (for Windows 10 Education). The combination of those two properties represents a Windows To Go workspace environment.
-
-For more information, see the MSDN article on the [Win32\_OperatingSystem class](/windows/win32/cimwin32prov/win32-operatingsystem).
-
-## How is Windows To Go licensed?
-
-
-Windows To Go allows organization to support the use of privately owned PCs at the home or office with more secure access to their organizational resources. With Windows To Go use rights under [Software Assurance](https://go.microsoft.com/fwlink/p/?LinkId=619062), an employee will be able to use Windows To Go on any company PC licensed with Software Assurance as well as from their home PC.
-
-## Does Windows Recovery Environment work with Windows To Go? What's the guidance for recovering a Windows To Go drive?
-
-
-No, use of Windows Recovery Environment is not supported on Windows To Go. It is recommended that you implement user state virtualization technologies like Folder Redirection to centralize and back up user data in the data center. If any corruption occurs on a Windows To Go drive, you should re-provision the workspace.
-
-## Why won't Windows To Go work on a computer running Windows XP or Windows Vista?
-
-
-Actually it might. If you have purchased a computer certified for Windows 7 or later and then installed an older operating system, Windows To Go will boot and run as expected as long as you have configured the firmware to boot from USB. However, if the computer was certified for Windows XP or Windows Vista, it might not meet the hardware requirements for Windows To Go to run. Typically computers certified for Windows Vista and earlier operating systems have less memory, less processing power, reduced video rendering, and slower USB ports.
-
-## Why does the operating system on the host computer matter?
-
-
-It doesn't other than to help visually identify if the PC has compatible hardware. For a PC to be certified for Windows 7 or later it had to support booting from USB. If a computer cannot boot from USB there is no way that it can be used with Windows To Go. The Windows To Go workspace is a full Windows 10 environment, so all of the hardware requirements of Windows 10 with respect to processing speed, memory usage, and graphics rendering need to be supported to be assured that it will work as expected.
-
-## My host computer running Windows 7 is protected by BitLocker Drive Encryption. Why did I need to use the recovery key to unlock and reboot my host computer after using Windows To Go?
-
-
-The default BitLocker protection profile in Windows 7 monitors the host computer for changes to the boot order as part of protecting the computer from tampering. When you change the boot order of the host computer to enable it to boot from the Windows To Go drive, the BitLocker system measurements will reflect that change and boot into recovery mode so that the computer can be inspected if necessary.
-
-You can reset the BitLocker system measurements to incorporate the new boot order using the following steps:
-
-1. Log on to the host computer using an account with administrator privileges.
-
-2. Click **Start**, click **Control Panel**, click **System and Security**, and then click **BitLocker Drive Encryption**.
-
-3. Click **Suspend Protection** for the operating system drive.
-
- A message is displayed, informing you that your data will not be protected while BitLocker is suspended and asking if you want to suspend BitLocker Drive Encryption. Click **Yes** to continue and suspend BitLocker on the drive.
-
-4. Restart the computer and enter the firmware settings to reset the boot order to boot from USB first. For more information on changing the boot order in the BIOS, see [Tips for configuring your BIOS settings to work with Windows To Go](https://go.microsoft.com/fwlink/p/?LinkId=618951) on the TechNet wiki.
-
-5. Restart the computer again and then log on to the host computer using an account with administrator privileges. (Neither your Windows To Go drive nor any other USB drive should be inserted.)
-
-6. Click **Start**, click **Control Panel**, click **System and Security**, and then click **BitLocker Drive Encryption**.
-
-7. Click **Resume Protection** to re-enable BitLocker protection.
-
-The host computer will now be able to be booted from a USB drive without triggering recovery mode.
-
-> [!NOTE]
-> The default BitLocker protection profile in Windows 8 or later does not monitor the boot order.
-
-
-
-## I decided to stop using a drive for Windows To Go and reformatted it – why doesn't it have a drive letter assigned and how can I fix it?
-
-
-Reformatting the drive erases the data on the drive, but doesn't reconfigure the volume attributes. When a drive is provisioned for use as a Windows To Go drive the NODEFAULTDRIVELETTER attribute is set on the volume. To remove this attribute, use the following steps:
-
-1. Open a command prompt with full administrator permissions.
-
- > [!NOTE]
- > If your user account is a member of the Administrators group, but is not the Administrator account itself, then, by default, the programs that you run only have standard user permissions unless you explicitly choose to elevate them.
-
-
-
-2. Start the [diskpart](/windows-server/administration/windows-commands/diskpart) command interpreter, by typing `diskpart` at the command prompt.
-
-3. Use the `select disk` command to identify the drive. If you do not know the drive number, use the `list` command to display the list of disks available.
-
-4. After selecting the disk, run the `clean` command to remove all data, formatting, and initialization information from the drive.
-
-## Why do I keep on getting the message "Installing devices…" when I boot Windows To Go?
-
-
-One of the challenges involved in moving the Windows To Go drive between PCs while seamlessly booting Windows with access to all of their applications and data is that for Windows to be fully functional, specific drivers need to be installed for the hardware in each machine that runs Windows. Windows 8 or later has a process called respecialize which will identify new drivers that need to be loaded for the new PC and disable drivers which are not present on the new configuration. In general this feature is reliable and efficient when roaming between PCs of widely varying hardware configurations.
-
-In certain cases, third party drivers for different hardware models or versions can reuse device ID's, driver file names, registry keys (or any other operating system constructs which do not support side-by-side storage) for similar hardware. For example, Touchpad drivers on different laptops often reuse the same device ID's, and video cards from the same manufacturer may often reuse service names. Windows handles these situations by marking the non-present device node with a flag that indicates the existing driver needs to be reinstalled before continuing to install the new driver.
-
-This process will occur on any boot that a new driver is found and a driver conflict is detected. In some cases that will result in a respecialize progress message "Installing devices…" displaying every time that a Windows to Go drive is roamed between two PCs which require conflicting drivers.
-
-## How do I upgrade the operating system on my Windows To Go drive?
-
-
-There is no support in Windows for upgrading a Windows To Go drive. Deployed Windows To Go drives with older versions of Windows will need to be re-imaged with a new version of Windows in order to transition to the new operating system version.
-
-## Additional resources
-
-
-- [Windows 10 forums](https://go.microsoft.com/fwlink/p/?LinkId=618949)
-
-- [Windows To Go Step by Step Wiki](https://go.microsoft.com/fwlink/p/?LinkId=618950)
-
-- [Windows To Go: feature overview](windows-to-go-overview.md)
-
-- [Prepare your organization for Windows To Go](prepare-your-organization-for-windows-to-go.md)
-
-- [Deployment considerations for Windows To Go](deployment-considerations-for-windows-to-go.md)
-
-- [Security and data protection considerations for Windows To Go](security-and-data-protection-considerations-for-windows-to-go.md)
-
-
-
diff --git a/windows/deployment/planning/windows-to-go-frequently-asked-questions.yml b/windows/deployment/planning/windows-to-go-frequently-asked-questions.yml
new file mode 100644
index 0000000000..408bcd13d0
--- /dev/null
+++ b/windows/deployment/planning/windows-to-go-frequently-asked-questions.yml
@@ -0,0 +1,454 @@
+### YamlMime:FAQ
+metadata:
+ title: Windows To Go frequently asked questions (Windows 10)
+ description: Though Windows To Go is no longer being developed, these frequently asked questions (FAQ) can provide answers about the feature.
+ ms.assetid: bfdfb824-4a19-4401-b369-22c5e6ca9d6e
+ ms.reviewer:
+ manager: laurawi
+ ms.author: greglin
+ keywords: FAQ, mobile, device, USB
+ ms.prod: w10
+ ms.mktglfcycl: deploy
+ ms.pagetype: mobility
+ ms.sitesec: library
+ audience: itpro
+ author: greg-lindsay
+ ms.topic: article
+
+title: 'Windows To Go: frequently asked questions'
+summary: |
+ **Applies to**
+
+ - Windows 10
+
+ > [!IMPORTANT]
+ > Windows To Go is removed in Windows 10, version 2004 and later operating systems. The feature does not support feature updates and therefore does not enable you to stay current. It also requires a specific type of USB that is no longer supported by many OEMs.
+
+ The following list identifies some commonly asked questions about Windows To Go.
+
+ - [What is Windows To Go?](#what-is-windows-to-go-)
+
+ - [Does Windows To Go rely on virtualization?](#does-windows-to-go-rely-on-virtualization-)
+
+ - [Who should use Windows To Go?](#who-should-use-windows-to-go-)
+
+ - [How can Windows To Go be deployed in an organization?](#how-can-windows-to-go-be-deployed-in-an-organization-)
+
+ - [Is Windows To Go supported on both USB 2.0 and USB 3.0 drives?](#is-windows-to-go-supported-on-both-usb-2-0-and-usb-3-0-drives-)
+
+ - [Is Windows To Go supported on USB 2.0 and USB 3.0 ports?](#is-windows-to-go-supported-on-usb-2-0-and-usb-3-0-ports-)
+
+ - [How do I identify a USB 3.0 port?](#how-do-i-identify-a-usb-3-0-port-)
+
+ - [Does Windows To Go run faster on a USB 3.0 port?](#does-windows-to-go-run-faster-on-a-usb-3-0-port-)
+
+ - [Can the user self-provision Windows To Go?](#can-the-user-self-provision-windows-to-go-)
+
+ - [How can Windows To Go be managed in an organization?](#how-can-windows-to-go-be-managed-in-an-organization-)
+
+ - [How do I make my computer boot from USB?](#how-do-i-make-my-computer-boot-from-usb-)
+
+ - [Why isn't my computer booting from USB?](#why-isn-t-my-computer-booting-from-usb-)
+
+ - [What happens if I remove my Windows To Go drive while it is running?](#what-happens-if-i-remove-my-windows-to-go-drive-while-it-is-running-)
+
+ - [Can I use BitLocker to protect my Windows To Go drive?](#can-i-use-bitlocker-to-protect-my-windows-to-go-drive-)
+
+ - [Why can't I enable BitLocker from Windows To Go Creator?](#why-can-t-i-enable-bitlocker-from-windows-to-go-creator-)
+
+ - [What power states does Windows To Go support?](#what-power-states-does-windows-to-go-support-)
+
+ - [Why is hibernation disabled in Windows To Go?](#why-is-hibernation-disabled-in-windows-to-go-)
+
+ - [Does Windows To Go support crash dump analysis?](#does-windows-to-go-support-crash-dump-analysis-)
+
+ - [Do "Windows To Go Startup Options" work with dual boot computers?](#do--windows-to-go-startup-options--work-with-dual-boot-computers-)
+
+ - [I plugged my Windows To Go drive into a running computer and I can't see the partitions on the drive. Why not?](#i-plugged-my-windows-to-go-drive-into-a-running-computer-and-i-can-t-see-the-partitions-on-the-drive--why-not-)
+
+ - [I'm booted into Windows To Go, but I can't browse to the internal hard drive of the host computer. Why not?](#i-m-booted-into-windows-to-go--but-i-can-t-browse-to-the-internal-hard-drive-of-the-host-computer--why-not-)
+
+ - [Why does my Windows To Go drive have an MBR disk format with a FAT32 system partition?](#why-does-my-windows-to-go-drive-have-an-mbr-disk-format-with-a-fat32-system-partition-)
+
+ - [Is Windows To Go secure if I use it on an untrusted machine?](#is-windows-to-go-secure-if-i-use-it-on-an-untrusted-computer-)
+
+ - [Does Windows To Go work with ARM processors?](#does-windows-to-go-work-with-arm-processors-)
+
+ - [Can I synchronize data from Windows To Go with my other computer?](#can-i-synchronize-data-from-windows-to-go-with-my-other-computer-)
+
+ - [What size USB Flash Drive do I need to make a Windows To Go drive?](#what-size-usb-flash-drive-do-i-need-to-make-a-windows-to-go-drive-)
+
+ - [Do I need to activate Windows To Go every time I roam?](#do-i-need-to-activate-windows-to-go-every-time-i-roam-)
+
+ - [Can I use all Windows features on Windows To Go?](#can-i-use-all-windows-features-on-windows-to-go-)
+
+ - [Can I use all my applications on Windows To Go?](#can-i-use-all-my-applications-on-windows-to-go-)
+
+ - [Does Windows To Go work slower than standard Windows?](#does-windows-to-go-work-slower-than-standard-windows-)
+
+ - [If I lose my Windows To Go drive, will my data be safe?](#if-i-lose-my-windows-to-go-drive--will-my-data-be-safe-)
+
+ - [Can I boot Windows To Go on a Mac?](#can-i-boot-windows-to-go-on-a-mac-)
+
+ - [Are there any APIs that allow applications to identify a Windows To Go workspace?](#are-there-any-apis-that-allow-applications-to-identify-a-windows-to-go-workspace-)
+
+ - [How is Windows To Go licensed?](#how-is-windows-to-go-licensed-)
+
+ - [Does Windows Recovery Environment work with Windows To Go? What's the guidance for recovering a Windows To Go drive?](#does-windows-recovery-environment-work-with-windows-to-go--what-s-the-guidance-for-recovering-a-windows-to-go-drive-)
+
+ - [Why won't Windows To Go work on a computer running Windows XP or Windows Vista?](#why-won-t-windows-to-go-work-on-a-computer-running-windows-xp-or-windows-vista-)
+
+ - [Why does the operating system on the host computer matter?](#why-does-the-operating-system-on-the-host-computer-matter-)
+
+ - [My host computer running Windows 7 is protected by BitLocker Drive Encryption. Why did I need to use the recovery key to unlock and reboot my host computer after using Windows To Go?](#my-host-computer-running-windows-7-is-protected-by-bitlocker-drive-encryption--why-did-i-need-to-use-the-recovery-key-to-unlock-and-reboot-my-host-computer-after-using-windows-to-go-)
+
+ - [I decided to stop using a drive for Windows To Go and reformatted it – why doesn't it have a drive letter assigned and how can I fix it?](#i-decided-to-stop-using-a-drive-for-windows-to-go-and-reformatted-it---why-doesn-t-it-have-a-drive-letter-assigned-and-how-can-i-fix-it-)
+
+ - [Why do I keep on getting the message "Installing devices…" when I boot Windows To Go?](#why-do-i-keep-on-getting-the-message--installing-devices---when-i-boot-windows-to-go-)
+
+ - [How do I upgrade the operating system on my Windows To Go drive?](#how-do-i-upgrade-the-operating-system-on-my-windows-to-go-drive-)
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ What is Windows To Go?
+ answer: |
+ Windows To Go is a feature for users of Windows 10 Enterprise and Windows 10 Education that enables users to boot a full version of Windows from external USB drives on host PCs.
+
+ - question: |
+ Does Windows To Go rely on virtualization?
+ answer: |
+ No. Windows To Go is a native instance of Windows 10 that runs from a USB device. It is just like a laptop hard drive with Windows 8 that has been put into a USB enclosure.
+
+ - question: |
+ Who should use Windows To Go?
+ answer: |
+ Windows To Go was designed for enterprise usage and targets scenarios such as continuance of operations, contractors, managed free seating, traveling workers, and work from home.
+
+ - question: |
+ How can Windows To Go be deployed in an organization?
+ answer: |
+ Windows To Go can be deployed using standard Windows deployment tools like Diskpart and DISM. The prerequisites for deploying Windows To Go are:
+
+ - A Windows To Go recommended USB drive to provision; See the list of currently available USB drives at [Hardware considerations for Windows To Go](windows-to-go-overview.md#wtg-hardware)
+
+ - A Windows 10 Enterprise or Windows 10 Education image
+
+ - A Windows 10 Enterprise, Windows 10 Education or Windows 10 Professional host PC that can be used to provision new USB keys
+
+ You can use a Windows PowerShell script to target several drives and scale your deployment for a large number of Windows To Go drives. You can also use a USB duplicator to duplicate a Windows To Go drive after it has been provisioned if you are creating a large number of drives. See the [Windows To Go Step by Step](https://go.microsoft.com/fwlink/p/?LinkId=618950) article on the TechNet wiki for a walkthrough of the drive creation process.
+
+ - question: |
+ Is Windows To Go supported on both USB 2.0 and USB 3.0 drives?
+ answer: |
+ No. Windows To Go is supported on USB 3.0 drives that are certified for Windows To Go.
+
+ - question: |
+ Is Windows To Go supported on USB 2.0 and USB 3.0 ports?
+ answer: |
+ Yes. Windows To Go is fully supported on either USB 2.0 ports or USB 3.0 ports on PCs certified for Windows 7 or later.
+
+ - question: |
+ How do I identify a USB 3.0 port?
+ answer: |
+ USB 3.0 ports are usually marked blue or carry a SS marking on the side.
+
+ - question: |
+ Does Windows To Go run faster on a USB 3.0 port?
+ answer: |
+ Yes. Because USB 3.0 offers significantly faster speeds than USB 2.0, a Windows To Go drive running on a USB 3.0 port will operate considerably faster. This speed increase applies to both drive provisioning and when the drive is being used as a workspace.
+
+ - question: |
+ Can the user self-provision Windows To Go?
+ answer: |
+ Yes, if the user has administrator permissions they can self-provision a Windows To Go drive using the Windows To Go Creator wizard which is included in Windows 10 Enterprise, Windows 10 Education and Windows 10 Professional. Additionally, System Center 2012 Configuration Manager SP1 and later releases includes support for user self-provisioning of Windows To Go drives. Configuration Manager can be downloaded for evaluation from the [Microsoft TechNet Evaluation Center](https://go.microsoft.com/fwlink/p/?LinkID=618746).
+
+ - question: |
+ How can Windows To Go be managed in an organization?
+ answer: |
+ Windows To Go can be deployed and managed like a traditional desktop PC using standard Windows enterprise software distribution tools like Microsoft Endpoint Configuration Manager. Computer and user settings for Windows To Go workspaces can be managed using Group Policy setting also in the same manner that you manage Group Policy settings for other PCs in your organization. Windows To Go workspaces can be configured to connect to the organizational resources remotely using DirectAccess or a virtual private network connection so that they can connect securely to your network.
+
+ - question: |
+ How do I make my computer boot from USB?
+ answer: |
+ For host computers running Windows 10
+
+ - Using Cortana, search for **Windows To Go startup options**, and then press Enter.
+ - In the **Windows To Go Startup Options** dialog box, select **Yes**, and then click **Save Changes** to configure the computer to boot from USB.
+
+ For host computers running Windows 8 or Windows 8.1:
+
+ Press **Windows logo key+W** and then search for **Windows To Go startup options** and then press Enter.
+
+ In the **Windows To Go Startup Options** dialog box select **Yes** and then click **Save Changes** to configure the computer to boot from USB.
+
+ > [!NOTE]
+ > Your IT department can use Group Policy to configure Windows To Go Startup Options in your organization.
+
+
+
+ If the host computer is running an earlier version of the Windows operating system need to configure the computer to boot from USB manually.
+
+ To do this, early during boot time (usually when you see the manufacturer's logo), enter your firmware/BIOS setup. (This method to enter firmware/BIOS setup differs with different computer manufacturers, but is usually entered by pressing one of the function keys, such as F12, F2, F1, Esc, and so forth. You should check the manufacturer's site to be sure if you do not know which key to use to enter firmware setup.)
+
+ After you have entered firmware setup, make sure that boot from USB is enabled. Then change the boot order to boot from USB drives first.
+
+ Alternatively, if your computer supports it, you can try to use the one-time boot menu (often F12), to select USB boot on a per-boot basis.
+
+ For more detailed instructions, see the wiki article, [Tips for configuring your BIOS settings to work with Windows To Go](https://go.microsoft.com/fwlink/p/?LinkID=618951).
+
+ **Warning**
+ Configuring a computer to boot from USB will cause your computer to attempt to boot from any bootable USB device connected to your computer. This potentially includes malicious devices. Users should be informed of this risk and instructed to not have any bootable USB storage devices plugged in to their computers except for their Windows To Go drive.
+
+
+
+ - question: |
+ Why isn't my computer booting from USB?
+ answer: |
+ Computers certified for Windows 7 and later are required to have support for USB boot. Check to see if any of the following items apply to your situation:
+
+ 1. Ensure that your computer has the latest BIOS installed and the BIOS is configured to boot from a USB device.
+
+ 2. Ensure that the Windows To Go drive is connected directly to a USB port on the computer. Many computers don't support booting from a device connected to a USB 3 PCI add-on card or external USB hubs.
+
+ 3. If the computer is not booting from a USB 3.0 port, try to boot from a USB 2.0 port.
+
+ If none of these items enable the computer to boot from USB, contact the hardware manufacturer for additional support.
+
+ - question: |
+ What happens if I remove my Windows To Go drive while it is running?
+ answer: |
+ If the Windows To Go drive is removed, the computer will freeze and the user will have 60 seconds to reinsert the Windows To Go drive. If the Windows To Go drive is reinserted into the same port it was removed from, Windows will resume at the point where the drive was removed. If the USB drive is not reinserted, or is reinserted into a different port, the host computer will turn off after 60 seconds.
+
+ **Warning**
+ You should never remove your Windows To Go drive when your workspace is running. The computer freeze is a safety measure to help mitigate the risk of accidental removal. Removing the Windows To Go drive without shutting down the Windows To Go workspace could result in corruption of the Windows To Go drive.
+
+
+
+ - question: |
+ Can I use BitLocker to protect my Windows To Go drive?
+ answer: |
+ Yes. In Windows 8 and later, BitLocker has added support for using a password to protect operating system drives. This means that you can use a password to secure your Windows To Go workspace and you will be prompted to enter this password every time you use the Windows To Go workspace.
+
+ - question: |
+ Why can't I enable BitLocker from Windows To Go Creator?
+ answer: |
+ Several different Group Policies control the use of BitLocker on your organizations computers. These policies are located in the **Computer Configuration\\Policies\\Administrative Templates\\Windows Components\\BitLocker Drive Encryption** folder of the local Group Policy editor. The folder contains three sub-folders for fixed, operating system and removable data drive types.
+
+ When you are using Windows To Go Creator, the Windows To Go drive is considered a removable data drive by BitLocker. Review the following setting to see if these settings apply in your situation:
+
+ 1. **Control use of BitLocker on removable drives**
+
+ If this setting is disabled BitLocker cannot be used with removable drives, so the Windows To Go Creator wizard will fail if it attempts to enable BitLocker on the Windows To Go drive.
+
+ 2. **Configure use of smart cards on removable data drives**
+
+ If this setting is enabled and the option **Require use of smart cards on removable data drives** is also selected the creator wizard might fail if you have not already signed on using your smart card credentials before starting the Windows To Go Creator wizard.
+
+ 3. **Configure use of passwords for removable data drives**
+
+ If this setting is enabled and the **Require password complexity option** is selected the computer must be able to connect to the domain controller to verify that the password specified meets the password complexity requirements. If the connection is not available, the Windows To Go Creator wizard will fail to enable BitLocker.
+
+ Additionally, the Windows To Go Creator will disable the BitLocker option if the drive does not have any volumes. In this situation, you should initialize the drive and create a volume using the Disk Management console before provisioning the drive with Windows To Go.
+
+ - question: |
+ What power states does Windows To Go support?
+ answer: |
+ Windows To Go supports all power states except the hibernate class of power states, which include hybrid boot, hybrid sleep, and hibernate. This default behavior can be modified by using Group Policy settings to enable hibernation of the Windows To Go workspace.
+
+ - question: |
+ Why is hibernation disabled in Windows To Go?
+ answer: |
+ When a Windows To Go workspace is hibernated, it will only successfully resume on the exact same hardware. Therefore, if a Windows To Go workspace is hibernated on one computer and roamed to another, the hibernation state (and therefore user state) will be lost. To prevent this from happening, the default settings for a Windows To Go workspace disable hibernation. If you are confident that you will only attempt to resume on the same computer, you can enable hibernation using the Windows To Go Group Policy setting, **Allow hibernate (S4) when started from a Windows To Go workspace** that is located at **\\\\Computer Configuration\\Administrative Templates\\Windows Components\\Portable Operating System\\** in the Local Group Policy Editor (gpedit.msc).
+
+ - question: |
+ Does Windows To Go support crash dump analysis?
+ answer: |
+ Yes. Windows 8 and later support crash dump stack analysis for both USB 2.0 and 3.0.
+
+ - question: |
+ Do "Windows To Go Startup Options" work with dual boot computers?
+ answer: |
+ Yes, if both operating systems are running the Windows 8 operating system. Enabling "Windows To Go Startup Options" should cause the computer to boot from the Windows To Go workspace when the drive is plugged in before the computer is turned on.
+
+ If you have configured a dual boot computer with a Windows operating system and another operating system it might work occasionally and fail occasionally. Using this configuration is unsupported.
+
+ - question: |
+ I plugged my Windows To Go drive into a running computer and I can't see the partitions on the drive. Why not?
+ answer: |
+ Windows To Go Creator and the recommended deployment steps for Windows To Go set the NO\_DEFAULT\_DRIVE\_LETTER flag on the Windows To Go drive. This flag prevents Windows from automatically assigning drive letters to the partitions on the Windows To Go drive. That's why you can't see the partitions on the drive when you plug your Windows To Go drive into a running computer. This helps prevent accidental data leakage between the Windows To Go drive and the host computer. If you really need to access the files on the Windows To Go drive from a running computer, you can use diskmgmt.msc or diskpart to assign a drive letter.
+
+ **Warning**
+ It is strongly recommended that you do not plug your Windows To Go drive into a running computer. If the computer is compromised, your Windows To Go workspace can also be compromised.
+
+
+
+ - question: |
+ I'm booted into Windows To Go, but I can't browse to the internal hard drive of the host computer. Why not?
+ answer: |
+ Windows To Go Creator and the recommended deployment steps for Windows To Go set SAN Policy 4 on Windows To Go drive. This policy prevents Windows from automatically mounting internal disk drives. That's why you can't see the internal hard drives of the host computer when you are booted into Windows To Go. This is done to prevent accidental data leakage between Windows To Go and the host system. This policy also prevents potential corruption on the host drives or data loss if the host operating system is in a hibernation state. If you really need to access the files on the internal hard drive, you can use diskmgmt.msc to mount the internal drive.
+
+ **Warning**
+ It is strongly recommended that you do not mount internal hard drives when booted into the Windows To Go workspace. If the internal drive contains a hibernated Windows 8 or later operating system, mounting the drive will lead to loss of hibernation state and therefor user state or any unsaved user data when the host operating system is booted. If the internal drive contains a hibernated Windows 7 or earlier operating system, mounting the drive will lead to corruption when the host operating system is booted.
+
+
+
+ - question: |
+ Why does my Windows To Go drive have an MBR disk format with a FAT32 system partition?
+ answer: |
+ This is done to allow Windows To Go to boot from UEFI and legacy systems.
+
+ - question: |
+ Is Windows To Go secure if I use it on an untrusted computer?
+ answer: |
+ While you are more secure than if you use a completely untrusted operating system, you are still vulnerable to attacks from the firmware or anything that runs before Windows To Go starts. If you plug your Windows To Go drive into a running untrusted computer, your Windows To Go drive can be compromised because any malicious software that might be active on the computer can access the drive.
+
+ - question: |
+ Does Windows To Go work with ARM processors?
+ answer: |
+ No. Windows RT is a specialized version of Windows designed for ARM processors. Windows To Go is currently only supported on PCs with x86 or x64-based processors.
+
+ - question: |
+ Can I synchronize data from Windows To Go with my other computer?
+ answer: |
+ To get your data across all your computers, we recommend using folder redirection and client side caching to store copies of your data on a server while giving you offline access to the files you need.
+
+ - question: |
+ What size USB flash drive do I need to make a Windows To Go drive?
+ answer: |
+ The size constraints are the same as full Windows. To ensure that you have enough space for Windows, your data, and your applications, we recommend USB drives that are a minimum of 20 GB in size.
+
+ - question: |
+ Do I need to activate Windows To Go every time I roam?
+ answer: |
+ No, Windows To Go requires volume activation; either using the [Key Management Service](/previous-versions/tn-archive/ff793434(v=technet.10)) (KMS) server in your organization or using [Active Directory](/previous-versions/windows/hh852637(v=win.10)) based volume activation. The Windows To Go workspace will not need to be reactivated every time you roam. KMS activates Windows on a local network, eliminating the need for individual computers to connect to Microsoft. To remain activated, KMS client computers must renew their activation by connecting to the KMS host on periodic basis. This typically occurs as soon as the user has access to the corporate network (either through a direct connection on-premises or a through remote connection using DirectAccess or a virtual private network connection), once activated the machine will not need to be activated again until the activation validity interval has passed. In a KMS configuration the activation validity interval is 180 days.
+
+ - question: |
+ Can I use all Windows features on Windows To Go?
+ answer: |
+ Yes, with some minor exceptions, you can use all Windows features with your Windows To Go workspace. The only currently unsupported features are using the Windows Recovery Environment and PC Reset & Refresh.
+
+ - question: |
+ Can I use all my applications on Windows To Go?
+ answer: |
+ Yes. Because your Windows To Go workspace is a full Windows 10 environment, all applications that work with Windows 10 should work in your Windows To Go workspace. However, any applications that use hardware binding (usually for licensing and/or digital rights management reasons) may not run when you roam your Windows To Go drive between different host computers, and you may have to use those applications on the same host computer every time.
+
+ - question: |
+ Does Windows To Go work slower than standard Windows?
+ answer: |
+ If you are using a USB 3.0 port and a Windows To Go certified device, there should be no perceivable difference between standard Windows and Windows To Go. However, if you are booting from a USB 2.0 port, you may notice some slowdown since USB 2.0 transfer speeds are slower than SATA speeds.
+
+ - question: |
+ If I lose my Windows To Go drive, will my data be safe?
+ answer: |
+ Yes! If you enable BitLocker on your Windows To Go drive, all your data will be encrypted and protected and a malicious user will not be able to access your data without your password. If you don't enable BitLocker, your data will be vulnerable if you lose your Windows To Go drive.
+
+ - question: |
+ Can I boot Windows To Go on a Mac?
+ answer: |
+ We are committed to give customers a consistent and quality Windows 10 experience with Windows To Go. Windows To Go supports host devices certified for use with Windows 7 or later. Because Mac computers are not certified for use with Windows 7 or later, using Windows To Go is not supported on a Mac.
+
+ - question: |
+ Are there any APIs that allow applications to identify a Windows To Go workspace?
+ answer: |
+ Yes. You can use a combination of identifiers to determine if the currently running operating system is a Windows To Go workspace. First, check if the **PortableOperatingSystem** property is true. When that value is true it means that the operating system was booted from an external USB device.
+
+ Next, check if the **OperatingSystemSKU** property is equal to **4** (for Windows 10 Enterprise) or **121** (for Windows 10 Education). The combination of those two properties represents a Windows To Go workspace environment.
+
+ For more information, see the MSDN article on the [Win32\_OperatingSystem class](/windows/win32/cimwin32prov/win32-operatingsystem).
+
+ - question: |
+ How is Windows To Go licensed?
+ answer: |
+ Windows To Go allows organization to support the use of privately owned PCs at the home or office with more secure access to their organizational resources. With Windows To Go use rights under [Software Assurance](https://go.microsoft.com/fwlink/p/?LinkId=619062), an employee will be able to use Windows To Go on any company PC licensed with Software Assurance as well as from their home PC.
+
+ - question: |
+ Does Windows Recovery Environment work with Windows To Go? What's the guidance for recovering a Windows To Go drive?
+ answer: |
+ No, use of Windows Recovery Environment is not supported on Windows To Go. It is recommended that you implement user state virtualization technologies like Folder Redirection to centralize and back up user data in the data center. If any corruption occurs on a Windows To Go drive, you should re-provision the workspace.
+
+ - question: |
+ Why won't Windows To Go work on a computer running Windows XP or Windows Vista?
+ answer: |
+ Actually it might. If you have purchased a computer certified for Windows 7 or later and then installed an older operating system, Windows To Go will boot and run as expected as long as you have configured the firmware to boot from USB. However, if the computer was certified for Windows XP or Windows Vista, it might not meet the hardware requirements for Windows To Go to run. Typically computers certified for Windows Vista and earlier operating systems have less memory, less processing power, reduced video rendering, and slower USB ports.
+
+ - question: |
+ Why does the operating system on the host computer matter?
+ answer: |
+ It doesn't other than to help visually identify if the PC has compatible hardware. For a PC to be certified for Windows 7 or later it had to support booting from USB. If a computer cannot boot from USB there is no way that it can be used with Windows To Go. The Windows To Go workspace is a full Windows 10 environment, so all of the hardware requirements of Windows 10 with respect to processing speed, memory usage, and graphics rendering need to be supported to be assured that it will work as expected.
+
+ - question: |
+ My host computer running Windows 7 is protected by BitLocker Drive Encryption. Why did I need to use the recovery key to unlock and reboot my host computer after using Windows To Go?
+ answer: |
+ The default BitLocker protection profile in Windows 7 monitors the host computer for changes to the boot order as part of protecting the computer from tampering. When you change the boot order of the host computer to enable it to boot from the Windows To Go drive, the BitLocker system measurements will reflect that change and boot into recovery mode so that the computer can be inspected if necessary.
+
+ You can reset the BitLocker system measurements to incorporate the new boot order using the following steps:
+
+ 1. Log on to the host computer using an account with administrator privileges.
+
+ 2. Click **Start**, click **Control Panel**, click **System and Security**, and then click **BitLocker Drive Encryption**.
+
+ 3. Click **Suspend Protection** for the operating system drive.
+
+ A message is displayed, informing you that your data will not be protected while BitLocker is suspended and asking if you want to suspend BitLocker Drive Encryption. Click **Yes** to continue and suspend BitLocker on the drive.
+
+ 4. Restart the computer and enter the firmware settings to reset the boot order to boot from USB first. For more information on changing the boot order in the BIOS, see [Tips for configuring your BIOS settings to work with Windows To Go](https://go.microsoft.com/fwlink/p/?LinkId=618951) on the TechNet wiki.
+
+ 5. Restart the computer again and then log on to the host computer using an account with administrator privileges. (Neither your Windows To Go drive nor any other USB drive should be inserted.)
+
+ 6. Click **Start**, click **Control Panel**, click **System and Security**, and then click **BitLocker Drive Encryption**.
+
+ 7. Click **Resume Protection** to re-enable BitLocker protection.
+
+ The host computer will now be able to be booted from a USB drive without triggering recovery mode.
+
+ > [!NOTE]
+ > The default BitLocker protection profile in Windows 8 or later does not monitor the boot order.
+
+
+
+ - question: |
+ I decided to stop using a drive for Windows To Go and reformatted it – why doesn't it have a drive letter assigned and how can I fix it?
+ answer: |
+ Reformatting the drive erases the data on the drive, but doesn't reconfigure the volume attributes. When a drive is provisioned for use as a Windows To Go drive the NODEFAULTDRIVELETTER attribute is set on the volume. To remove this attribute, use the following steps:
+
+ 1. Open a command prompt with full administrator permissions.
+
+ > [!NOTE]
+ > If your user account is a member of the Administrators group, but is not the Administrator account itself, then, by default, the programs that you run only have standard user permissions unless you explicitly choose to elevate them.
+
+
+
+ 2. Start the [diskpart](/windows-server/administration/windows-commands/diskpart) command interpreter, by typing `diskpart` at the command prompt.
+
+ 3. Use the `select disk` command to identify the drive. If you do not know the drive number, use the `list` command to display the list of disks available.
+
+ 4. After selecting the disk, run the `clean` command to remove all data, formatting, and initialization information from the drive.
+
+ - question: |
+ Why do I keep on getting the message "Installing devices…" when I boot Windows To Go?
+ answer: |
+ One of the challenges involved in moving the Windows To Go drive between PCs while seamlessly booting Windows with access to all of their applications and data is that for Windows to be fully functional, specific drivers need to be installed for the hardware in each machine that runs Windows. Windows 8 or later has a process called respecialize which will identify new drivers that need to be loaded for the new PC and disable drivers which are not present on the new configuration. In general this feature is reliable and efficient when roaming between PCs of widely varying hardware configurations.
+
+ In certain cases, third party drivers for different hardware models or versions can reuse device ID's, driver file names, registry keys (or any other operating system constructs which do not support side-by-side storage) for similar hardware. For example, Touchpad drivers on different laptops often reuse the same device ID's, and video cards from the same manufacturer may often reuse service names. Windows handles these situations by marking the non-present device node with a flag that indicates the existing driver needs to be reinstalled before continuing to install the new driver.
+
+ This process will occur on any boot that a new driver is found and a driver conflict is detected. In some cases that will result in a respecialize progress message "Installing devices…" displaying every time that a Windows to Go drive is roamed between two PCs which require conflicting drivers.
+
+ - question: |
+ How do I upgrade the operating system on my Windows To Go drive?
+ answer: |
+ There is no support in Windows for upgrading a Windows To Go drive. Deployed Windows To Go drives with older versions of Windows will need to be re-imaged with a new version of Windows in order to transition to the new operating system version.
+
+additionalContent: |
+
+ ## Additional resources
+
+ - [Windows 10 forums](https://go.microsoft.com/fwlink/p/?LinkId=618949)
+ - [Windows To Go Step by Step Wiki](https://go.microsoft.com/fwlink/p/?LinkId=618950)
+ - [Windows To Go: feature overview](windows-to-go-overview.md)
+ - [Prepare your organization for Windows To Go](prepare-your-organization-for-windows-to-go.md)
+ - [Deployment considerations for Windows To Go](deployment-considerations-for-windows-to-go.md)
+ - [Security and data protection considerations for Windows To Go](security-and-data-protection-considerations-for-windows-to-go.md)
+
\ No newline at end of file
diff --git a/windows/deployment/planning/windows-to-go-overview.md b/windows/deployment/planning/windows-to-go-overview.md
index d5e3248369..5dff0dda28 100644
--- a/windows/deployment/planning/windows-to-go-overview.md
+++ b/windows/deployment/planning/windows-to-go-overview.md
@@ -232,7 +232,7 @@ In addition to the USB boot support in the BIOS, the Windows 10 image on your Wi
## Related topics
[Deploy Windows To Go in your organization](../deploy-windows-to-go.md)
-[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.md)
+[Windows To Go: frequently asked questions](windows-to-go-frequently-asked-questions.yml)
[Prepare your organization for Windows To Go](prepare-your-organization-for-windows-to-go.md)
[Deployment considerations for Windows To Go](deployment-considerations-for-windows-to-go.md)
[Security and data protection considerations for Windows To Go](security-and-data-protection-considerations-for-windows-to-go.md)
diff --git a/windows/deployment/update/deployment-service-overview.md b/windows/deployment/update/deployment-service-overview.md
new file mode 100644
index 0000000000..4c034921b7
--- /dev/null
+++ b/windows/deployment/update/deployment-service-overview.md
@@ -0,0 +1,175 @@
+---
+title: Windows Update for Business deployment service
+description: Overview of deployment service to control approval, scheduling, and safeguarding of Windows updates
+ms.custom: seo-marvel-apr2020
+ms.prod: w10
+ms.mktglfcycl: manage
+author: jaimeo
+ms.localizationpriority: medium
+ms.author: jaimeo
+ms.reviewer:
+manager: laurawi
+ms.topic: article
+---
+
+
+
+# Windows Update for Business deployment service
+
+> Applies to: Windows 10
+
+The Windows Update for Business deployment service is a cloud service within the Windows Update for Business product family. It provides control over the approval, scheduling, and safeguarding of updates delivered from Windows Update. It's designed to work in harmony with your existing Windows Update for Business policies.
+
+The deployment service is designed for IT Pros who are looking for more control than is provided through deferral policies and deployment rings. It provides the following abilities:
+
+- You can schedule deployment of updates to start on a specific date (for example, deploy 20H2 to specified devices on March 14, 2021).
+- You can stage deployments over a period of days or weeks by using rich expressions (for example, deploy 20H2 to 500 devices per day, beginning on March 14, 2021).
+- You can bypass pre-configured Windows Update for Business policies to immediately deploy a security update across your organization when emergencies arise.
+- You can benefit from deployments with automatic piloting tailored to your unique device population to ensure coverage of hardware and software in your organization.
+
+The service is privacy focused and backed by leading industry compliance certifications.
+
+## How it works
+
+The deployment service complements existing Windows Update for Business capabilities, including existing device policies and [Update Compliance](update-compliance-monitor.md).
+
+:::image type="content" source="media/wufbds-product-large.png" alt-text="Elements in following text":::
+
+Windows Update for Business comprises three elements:
+- Client policy to govern update experiences and timing – available through Group Policy and CSPs
+- Deployment service APIs to approve and schedule specific updates – available through the Microsoft Graph and associated SDKs (including PowerShell)
+- Update Compliance to monitor update deployment – available through the Azure Marketplace
+
+Unlike existing client policy, the deployment service does not interact with devices directly. The service is native to the cloud and all operations take place between various Microsoft services. It creates a direct communication channel between a management tool (including scripting tools such as Windows PowerShell) and the Windows Update service so that the approval and offering of content can be directly controlled by an IT Pro.
+
+:::image type="content" source="media/wufbds-interaction-small.png" alt-text="Process described in following text":::
+
+Using the deployment service typically follows a common pattern:
+1. IT Pro uses a management tool to select devices and approve content to be deployed. This tool could be PowerShell, a Microsoft Graph app or a more complete management solution such as Microsoft Endpoint Manager.
+2. The chosen tool conveys your approval, scheduling, and device selection information to the deployment service.
+3. The deployment service processes the content approval and compares it with previously approved content. Final update applicability is determined and conveyed to Windows Update, which then offers approved content to devices on their next check for updates.
+
+
+The deployment service exposes these capabilities through Microsoft [Graph REST APIs](/graph/overview). You can call the APIs directly, through a Graph SDK, or integrate them with a management tool such as Microsoft Endpoint Manager.
+
+## Prerequisites
+
+To work with the deployment service, devices must meet all these requirements:
+
+- Be running Windows 10, version 1709 or later
+- Be joined to Azure Active Directory (AD) or Hybrid AD
+- Have one of the following Windows 10 editions installed:
+ - Windows 10 Pro
+ - Windows 10 Enterprise
+ - Windows 10 Education
+ - Windows 10 Pro Education
+ - Windows 10 Pro for Workstations
+
+Additionally, your organization must have one of the following subscriptions:
+- Windows 10 Enterprise E3 or E5 (included in Microsoft 365 F3, E3, or E5)
+- Windows 10 Education A3 or A5 (included in Microsoft 365 A3 or A5)
+- Windows Virtual Desktop Access E3 or E5
+- Microsoft 365 Business Premium
+
+
+## Getting started
+
+To use the deployment service, you use a management tool built on the platform, script common actions using PowerShell, or build your own application.
+
+### Using Microsoft Endpoint Manager
+
+Microsoft Endpoint Manager integrates with the deployment service to provide Windows 10 update management capabilities. For more information, see [Windows 10 feature updates policy in Intune](/mem/intune/protect/windows-10-feature-updates).
+
+### Scripting common actions using PowerShell
+
+The Microsoft Graph SDK includes a PowerShell extension that you can use to script and automate common update actions. For more information, see [Get started with the Microsoft Graph PowerShell SDK](/graph/powershell/get-started).
+
+
+### Building your own application
+
+Microsoft Graph makes deployment service APIs available through. Get started with these learning paths:
+- Learning Path: [Microsoft Graph Fundamentals](/learn/paths/m365-msgraph-fundamentals/)
+- Learning Path: [Build apps with Microsoft Graph](/learn/paths/m365-msgraph-associate/)
+
+Once you are familiar with Microsoft Graph development, see [Windows updates API overview in Microsoft Graph](/graph/windowsupdates-concept-overview) for more.
+
+## Deployment protections
+
+The deployment service protects deployments through a combination of rollout controls and machine-learning algorithms that monitor deployments and react to issues during the rollout.
+
+### Schedule rollouts with automatic piloting
+
+The deployment service allows any update to be deployed over a period of days or weeks. Once an update has been scheduled, the deployment service optimizes the deployment based on the scheduling parameters and unique attributes spanning the devices being updated. The service follows these steps:
+
+1. Determine the number of devices to be updated in each deployment wave, based on scheduling parameters.
+2. Select devices for each deployment wave so that earlier waves have a diversity of hardware and software, to function as pilot device populations.
+3. Start deploying to earlier waves to build coverage of device attributes present in the population.
+4. Continue deploying at a uniform rate until all waves are complete and all devices are updated.
+
+This built-in piloting capability complements your existing ring structure and provides another support for reducing and managing risk during an update. Unlike tools such as Desktop Analytics, this capability is intended to operate within each ring. The deployment service does not provide a workflow for creating rings themselves.
+
+You should continue to use deployment rings as part of the servicing strategy for your organization, but use gradual rollouts to add scheduling convenience and additional protections within each ring.
+
+### Monitoring deployments to detect rollback issues
+
+During a feature update deployment, driver combinations can sometimes result in an unexpected update failure that makes the device revert to the previously installed operating system version. The deployment service can monitor devices for such issues and automatically pause deployments when this happens, giving you time to detect and mitigate issues.
+
+
+### How to enable deployment protections
+
+Deployment scheduling controls are always available, but to take advantage of the unique deployment protections tailored to your organization, devices must share diagnostic data with Microsoft.
+
+#### Device prerequisites
+
+> [!NOTE]
+> Deployment protections are currently in preview and available if you're using Update Compliance. If you set these policies on a a device that isn't enrolled in Update Compliance, there is no effect.
+
+- Diagnostic data is set to *Required* or *Optional*.
+- The **AllowWUfBCloudProcessing** policy is set to **1**.
+
+#### Set the **AllowWUfBCloudProcessing** policy
+
+To enroll devices in Windows Update for Business cloud processing, set the **AllowWUfBCloudProcessing** policy using mobile device management (MDM) policy.
+
+> [!NOTE]
+> Setting this policy by using Group Policy isn't currently supported.
+
+| Policy | Sets registry key under **HKLM\\Software** |
+|--------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------|
+| MDM for Windows 10, version 1809 or later: ../Vendor/MSFT/ Policy/Config/System/**AllowWUfBCloudProcessing** | \\Microsoft\\PolicyManager\\default\\System\\AllowWUfBCloudProcessing |
+
+Following is an example of setting the policy using Microsoft Endpoint Manager:
+
+1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
+2. Select **Devices** > **Configuration profiles** > **Create profile**.
+3. Select **Windows 10 and later** in **Platform**, select **Templates** in **Profile type**, select **Custom** in **Template name**, and then select **Create**.
+4. In **Basics**, enter a meaningful name and a description for the policy, and then select **Next**.
+5. In **Configuration settings**, select **Add**, enter the following settings, select **Save**, and then select **Next**.
+ - Name: **AllowWUfBCloudProcessing**
+ - Description: Enter a description.
+ - OMA-URI: `./Vendor/MSFT/Policy/Config/System/AllowWUfBCloudProcessing`
+ - Data type: **String**
+ - Value: **1**
+6. In **Assignments**, select the groups that will receive the profile, and then select **Next**.
+7. In **Review + create**, review your settings, and then select **Create**.
+8. (Optional) To verify that the policy reached the client, check the value of the following registry entry: **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Microsoft\\PolicyManager \\default\\System\\AllowWUfBCloudProcessing**.
+
+## Best practices
+Follow these suggestions for the best results with the service.
+
+### Device onboarding
+
+- Wait until devices finish provisioning before managing with the service. If a device is being provisioned by Autopilot, it can only be managed by the deployment service after it finishes provisioning (typically one day).
+- Use the deployment service for feature update management without feature update deferral policy. If you want to use the deployment service to manage feature updates on a device that previously used a feature update deferral policy, it's best to set the feature update deferral policy to **0** days to avoid having multiple conditions governing feature updates. You should only change the feature update deferral policy value to 0 days after you've confirmed that the device was enrolled in the service with no errors.
+
+### General
+
+Avoid using different channels to manage the same resources. If you use Microsoft Endpoint Manager along with Microsoft Graph APIs or PowerShell, aspects of resources (such as devices, deployments, updatable asset groups) might be overwritten if you use both channels to manage the same resources. Instead, only manage each resource through the channel that created it.
+
+
+## Next steps
+
+To learn more about the deployment service, try the following:
+
+- [Windows 10 feature updates policy in Intune](/mem/intune/protect/windows-10-feature-updates)
+- [Windows updates API overview in Microsoft Graph](/graph/windowsupdates-concept-overview)
diff --git a/windows/deployment/update/deployment-service-troubleshoot.md b/windows/deployment/update/deployment-service-troubleshoot.md
new file mode 100644
index 0000000000..1f9675d1d9
--- /dev/null
+++ b/windows/deployment/update/deployment-service-troubleshoot.md
@@ -0,0 +1,35 @@
+---
+title: Troubleshoot the Windows Update for Business deployment service
+description: Solutions to common problems with the service
+ms.custom: seo-marvel-apr2020
+ms.prod: w10
+ms.mktglfcycl: manage
+author: jaimeo
+ms.localizationpriority: medium
+ms.author: jaimeo
+ms.reviewer:
+manager: laurawi
+ms.topic: article
+---
+
+
+
+# Troubleshoot the Windows Update for Business deployment service
+
+> Applies to: Windows 10
+
+This troubleshooting guide addresses the most common issues that IT administrators face when using the Windows Update for Business [deployment service](deployment-service-overview.md). For a general troubleshooting guide for Windows Update, see [Windows Update troubleshooting](windows-update-troubleshooting.md).
+
+## The device isn't receiving an update that I deployed
+
+- Check that the device doesn't have updates of the relevant category paused. See [Pause feature updates](waas-configure-wufb.md#pause-feature-updates) and [Pause quality updates](waas-configure-wufb.md#pause-quality-updates).
+- **Feature updates only**: The device might have a safeguard hold applied for the given feature update version. For more about safeguard holds, see [Safeguard holds](safeguard-holds.md) and [Opt out of safeguard holds](safeguard-opt-out.md).
+- Check that the deployment to which the device is assigned has the state *offering*. Deployments that have the states *paused* or *scheduled* won't deploy content to devices.
+- Check that the device has scanned for updates and is scanning the Windows Update service. To learn more about scanning for updates, see [Scanning updates](how-windows-update-works.md#scanning-updates).
+- **Feature updates only**: Check that the device is successfully enrolled in feature update management by the deployment service. A device that is successfully enrolled will be represented by an Azure AD device resource with an update management enrollment for feature updates and have no Azure AD device registration errors.
+- **Expedited quality updates only**: Check that the device has the Update Health Tools installed (available for Windows 10 version 1809 or later in the update described in [KB 4023057 - Update for Windows 10 Update Service components](https://support.microsoft.com/topic/kb4023057-update-for-windows-10-update-service-components-fccad0ca-dc10-2e46-9ed1-7e392450fb3a), or a more recent quality update). The Update Health Tools are required for a device to receive an expedited quality update. On a device, the program can be located at **C:\\Program Files\\Microsoft Update Health Tools**. You can verify its presence by reviewing **Add or Remove Programs** or using the following PowerShell script: `Get-WmiObject -Class Win32\_Product \| Where-Object {$\_.Name -amatch "Microsoft Update Health Tools"}`.
+
+## The device is receiving an update that I didn't deploy
+
+- Check that the device is scanning the Windows Update service and not a different endpoint. If the device is scanning for updates from a WSUS endpoint, for example, it might receive different updates. To learn more about scanning for updates, see [Scanning updates](how-windows-update-works.md#scanning-updates).
+- **Feature updates only**: Check that the device is successfully enrolled in feature update management by the deployment service. A device that is not successfully enrolled might receive different updates according to its feature update deferral period, for example. A device that is successfully enrolled will be represented by an Azure AD device resource with an update management enrollment for feature updates and have no Azure AD device registration errors.
diff --git a/windows/deployment/update/media/wufbds-interaction-small.png b/windows/deployment/update/media/wufbds-interaction-small.png
new file mode 100644
index 0000000000..f06201edde
Binary files /dev/null and b/windows/deployment/update/media/wufbds-interaction-small.png differ
diff --git a/windows/deployment/update/media/wufbds-product-large.png b/windows/deployment/update/media/wufbds-product-large.png
new file mode 100644
index 0000000000..f74c499411
Binary files /dev/null and b/windows/deployment/update/media/wufbds-product-large.png differ
diff --git a/windows/deployment/update/servicing-stack-updates.md b/windows/deployment/update/servicing-stack-updates.md
index b22ca9e870..6b9563437a 100644
--- a/windows/deployment/update/servicing-stack-updates.md
+++ b/windows/deployment/update/servicing-stack-updates.md
@@ -53,7 +53,7 @@ Typically, the improvements are reliability and performance improvements that do
* Servicing stack updates contain the full servicing stack; as a result, typically administrators only need to install the latest servicing stack update for the operating system.
* Installing servicing stack update does not require restarting the device, so installation should not be disruptive.
* Servicing stack update releases are specific to the operating system version (build number), much like quality updates.
-* Search to install latest available [Servicing stack update for Windows 10](https://portal.msrc.microsoft.com/en-us/security-guidance/advisory/ADV990001).
+* Servicing stack updates can be delivered with Windows Update, or you can perform a search to install the latest available at [Servicing stack update for Windows 10](https://portal.msrc.microsoft.com/security-guidance/advisory/ADV990001).
* Once a servicing stack update is installed, it cannot be removed or uninstalled from the machine.
## Simplifying on-premises deployment of servicing stack updates
diff --git a/windows/deployment/update/update-compliance-configuration-manual.md b/windows/deployment/update/update-compliance-configuration-manual.md
index 8618bd7116..ccdb293504 100644
--- a/windows/deployment/update/update-compliance-configuration-manual.md
+++ b/windows/deployment/update/update-compliance-configuration-manual.md
@@ -17,6 +17,9 @@ ms.topic: article
# Manually Configuring Devices for Update Compliance
+> [!NOTE]
+> As of May 10, 2021, a new policy is required to use Update Compliance: "Allow Update Compliance Processing." For more details, see the Mobile Device Management policies and Group policies tables.
+
There are a number of requirements to consider when manually configuring devices for Update Compliance. These can potentially change with newer versions of Windows 10. The [Update Compliance Configuration Script](update-compliance-configuration-script.md) will be updated when any configuration requirements change so only a redeployment of the script will be required.
The requirements are separated into different categories:
@@ -28,9 +31,6 @@ The requirements are separated into different categories:
## Required policies
-> [!NOTE]
-> Windows 10 MDM and Group Policies are backed by registry keys. It is not recommended you set these registry keys directly for configuration as it can lead to unexpected behavior, so the exact registry key locations are not provided, though they are referenced for troubleshooting configuration issues with the [Update Compliance Configuration Script](update-compliance-configuration-script.md).
-
Update Compliance has a number of policies that must be appropriately configured in order for devices to be processed by Microsoft and visible in Update Compliance. They are enumerated below, separated by whether the policies will be configured via [Mobile Device Management](/windows/client-management/mdm/) (MDM) or Group Policy. For both tables:
- **Policy** corresponds to the location and name of the policy.
@@ -47,13 +47,14 @@ Each MDM Policy links to its documentation in the CSP hierarchy, providing its e
|**System/**[**AllowTelemetry**](/windows/client-management/mdm/policy-csp-system#system-allowtelemetry) | 1- Basic |Configures the maximum allowed diagnostic data to be sent to Microsoft. Individual users can still set this value lower than what the policy defines. For more information, see the following policy. |
|**System/**[**ConfigureTelemetryOptInSettingsUx**](/windows/client-management/mdm/policy-csp-system#system-configuretelemetryoptinsettingsux) | 1 - Disable Telemetry opt-in Settings | (in Windows 10, version 1803 and later) Determines whether users of the device can adjust diagnostic data to levels lower than the level defined by AllowTelemetry. We recommend that you disable this policy or the effective diagnostic data level on devices might not be sufficient. |
|**System/**[**AllowDeviceNameInDiagnosticData**](/windows/client-management/mdm/policy-csp-system#system-allowdevicenameindiagnosticdata) | 1 - Allowed | Allows device name to be sent for Windows Diagnostic Data. If this policy is Not Configured or set to 0 (Disabled), Device Name will not be sent and will not be visible in Update Compliance, showing `#` instead. |
+| **System/AllowUpdateComplianceProcessing** | 16 - Allowed | Enables data flow through Update Compliance's data processing system and indicates a device's explicit enrollment to the service. |
> [!NOTE]
> If you use Microsoft Intune, set the **ProviderID** to *MS DM Server*. If you use another MDM product, check with its vendor. See also [DMClient CSP](/windows/client-management/mdm/dmclient-csp).
-### Group Policies
+### Group policies
-All Group Policies that need to be configured for Update Compliance are under **Computer Configuration>Administrative Templates>Windows Components\Data Collection and Preview Builds**. All of these policies must be in the *Enabled* state and set to the defined *Value* below.
+All Group policies that need to be configured for Update Compliance are under **Computer Configuration>Administrative Templates>Windows Components\Data Collection and Preview Builds**. All of these policies must be in the *Enabled* state and set to the defined *Value* below.
| Policy | Value | Function |
|---------------------------|-|-----------------------------------------------------------|
@@ -61,6 +62,7 @@ All Group Policies that need to be configured for Update Compliance are under **
|**Allow Telemetry** | 1 - Basic |Configures the maximum allowed diagnostic data to be sent to Microsoft. Individual users can still set this value lower than what the policy defines. See the following policy for more information. |
|**Configure telemetry opt-in setting user interface** | 1 - Disable diagnostic data opt-in Settings |(in Windows 10, version 1803 and later) Determines whether users of the device can adjust diagnostic data to levels lower than the level defined by AllowTelemetry. We recommend that you disable this policy, otherwise the effective diagnostic data level on devices might not be sufficient. |
|**Allow device name to be sent in Windows diagnostic data** | 1 - Enabled | Allows device name to be sent for Windows Diagnostic Data. If this policy is Not Configured or Disabled, Device Name will not be sent and will not be visible in Update Compliance, showing `#` instead. |
+|**Allow Update Compliance processing** | 16 - Enabled | Enables data flow through Update Compliance's data processing system and indicates a device's explicit enrollment to the service. |
## Required endpoints
@@ -89,4 +91,4 @@ A full Census sync adds a new registry value to Census's path. When this registr
1. For every device you are manually configuring for Update Compliance, add or modify the registry key located at **HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Census** to include a new **DWORD value** named **FullSync** and set to **1**.
2. Run Devicecensus.exe with administrator privileges on every device. Devicecensus.exe is in the System32 folder. No additional run parameters are required.
-3. After Devicecensus.exe has run, the **FullSync** registry value can be removed or set to **0**.
\ No newline at end of file
+3. After Devicecensus.exe has run, the **FullSync** registry value can be removed or set to **0**.
diff --git a/windows/deployment/update/update-compliance-configuration-script.md b/windows/deployment/update/update-compliance-configuration-script.md
index c64828cc34..2bdf88323c 100644
--- a/windows/deployment/update/update-compliance-configuration-script.md
+++ b/windows/deployment/update/update-compliance-configuration-script.md
@@ -17,91 +17,86 @@ ms.topic: article
# Configuring devices through the Update Compliance Configuration Script
-The Update Compliance Configuration Script is the recommended method of configuring devices to send data to Microsoft for use with Update Compliance. The script configures device policies via Group Policy, ensures that required services are running, and more.
+> [!NOTE]
+> A new policy is required to use Update Compliance: "AllowUpdateComplianceProcessing." If you're already using Update Compliance and have configured your devices prior to May 10, 2021, you must rerun the script so the new policy can be configured. We don't recommend using this script if you configure devices using MDM. Instead, configure the policies listed in [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md) by using your MDM provider. You should check devices to ensure that there aren't any policy configurations in any existing tool that conflict with how policies should be configured.
+
+The Update Compliance Configuration Script is the recommended method of configuring devices to send data to Microsoft for use with Update Compliance. The script configures the registry keys backing policies, ensures required services are running, and more.
> [!NOTE]
-> The Update Compliance configuration script does not offer options to configure Delivery Optimization. You have to do that separately.
-
+> The configuration script configures registry keys directly. Registry keys can potentially be overwritten by policy settings like Group Policy or MDM. *Reconfiguring devices with the script does not reconfigure previously set policies, both in the case of Group Policy and MDM*. If there are conflicts between your Group Policy or MDM configurations and the required configurations listed in [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md), there can be issues with device enrollment.
You can download the script from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=101086). Keep reading to learn how to configure the script and interpret error codes that are output in logs for troubleshooting.
-## How the script is organized
+## Script FAQ
-The script is organized into two folders **Pilot** and **Deployment**. Both folders have the same key files: `ConfigScript.ps1` and `RunConfig.bat`. You configure `RunConfig.bat` according to the directions in the .bat itself, which will then execute `ConfigScript.ps1` with the parameters entered to RunConfig.bat.
+- I manage my devices with MDM. Should I use this script?
+No, you should not use this script. Instead configure the policies through your MDM provider.
+- Does this script configure devices for Delivery Optimization?
+No. You must do that separately.
-- The **Pilot** folder and its contents are intended to be used on an initial set of single devices in specific environments (main office & satellite office, for example) for testing and troubleshooting prior to broader deployment. This script is configured to collect and output detailed logs for every device it runs on.
-- The **Deployment** folder is intended to be deployed across an entire device population in a specific environment once devices in that environment have been validated with the Pilot script.
+## How this script is organized
-## How to use the script
+This script's two primary files are `ConfigScript.ps1` and `RunConfig.bat`. You configure `RunConfig.bat` according to the directions in the `.bat` itself, which will then run `ConfigScript.ps1` with the parameters entered to `RunConfig.bat`. There are two ways of using the script: in **Pilot** mode or **Deployment** mode.
-### Piloting and Troubleshooting
-
-> [!IMPORTANT]
-> If you encounter an issue with Update Compliance, the first step should be to run the script in Pilot mode on a device you are encountering issues with, and save these Logs for reference with Support.
-
-> [!IMPORTANT]
-> The script must be run in the System context. To do this, use the PsExec tool included in the file. For more about PsExec, see [PsExec](/sysinternals/downloads/psexec).
+- In **Pilot** mode (`runMode=Pilot`), the script will enter a verbose mode with enhanced diagnostics, and save the results in the path defined with `logpath` in `RunConfig.bat`. Pilot mode is best for a pilot run of the script or for troubleshooting configuration.
+- In **Deployment** mode (`runMode=Deployment`), the script will run quietly.
-When using the script in the context of troubleshooting, use `Pilot`. Enter `RunConfig.bat`, and configure it as follows:
+## How to use this script
-1. Configure `logPath` to a path where the script will have write access and a place you can easily access. This specifies the output of the log files generated when the script is in Verbose mode.
-2. Configure `commercialIDValue` to your CommercialID. To get your CommercialID, see [Getting your CommercialID](update-compliance-get-started.md#get-your-commercialid).
-3. Run the script. The script must be run in System context.
-4. Examine the Logs output for any issues. If there were issues:
- - Compare Logs output with the required settings covered in [Manually Configuring Devices for Update Compliance](update-compliance-configuration-manual.md).
- - Examine the script errors and refer to the [script error reference](#script-error-reference) on how to interpret the codes.
- - Make the necessary corrections and run the script again.
-5. When you no longer have issues, proceed to using the script for more broad deployment with the `Deployment` folder.
+Open `RunConfig.bat` and configure the following (assuming a first-run, with `runMode=Pilot`):
+
+1. Define `logPath` to where you want the logs to be saved. Ensure that `runMode=Pilot`.
+2. Set `commercialIDValue` to your Commercial ID.
+3. Run the script.
+4. Examine the logs for any issues. If there are no issues, then all devices with a similar configuration and network profile are ready for the script to be deployed with `runMode=Deployment`.
+5. If there are issues, gather the logs and provide them to Support.
-### Broad deployment
+## Script errors
-After verifying on a set of devices in a specific environment that everything is configured correctly, you can proceed to broad deployment.
-
-1. Configure `commercialIDValue` in `RunConfig.bat` to [your CommercialID](update-compliance-get-started.md#get-your-commercialid).
-2. Use a management tool like Configuration Manager or Intune to broadly deploy the script to your entire target population.
-
-## Script Error Reference
-
-|Error |Description |
-|-|-------------------|
-| 27 | Not system account. |
-| 37 | Unexpected exception when collecting logs|
-| 1 | General unexpected error|
-| 6 | Invalid CommercialID|
-| 48 | CommercialID is not a GUID|
-| 8 | Couldn't create registry key path to setup CommercialID|
-| 9 | Couldn't write CommercialID at registry key path|
-| 53 | There are conflicting CommercialID values.|
-| 11 | Unexpected result when setting up CommercialID.|
-| 62 | AllowTelemetry registry key is not of the correct type `REG_DWORD`|
-| 63 | AllowTelemetry is not set to the appropriate value and it could not be set by the script.|
-| 64 | AllowTelemetry is not of the correct type `REG_DWORD`.|
-| 99 | Device is not Windows 10.|
-| 40 | Unexpected exception when checking and setting telemetry.|
-| 12 | CheckVortexConnectivity failed, check Log output for more information.|
-| 12 | Unexpected failure when running CheckVortexConnectivity.|
-| 66 | Failed to verify UTC connectivity and recent uploads.|
-| 67 | Unexpected failure when verifying UTC CSP connectivity of the WMI Bridge.|
-| 41 | Unable to impersonate logged-on user.|
-| 42 | Unexpected exception when attempting to impersonate logged-on user.|
-| 43 | Unexpected exception when attempting to impersonate logged-on user.|
-| 16 | Reboot is pending on device, restart device and restart script.|
-| 17 | Unexpected exception in CheckRebootRequired.|
-| 44 | Error when running CheckDiagTrack service.|
-| 45 | DiagTrack.dll not found.|
-| 50 | DiagTrack service not running.|
-| 54 | Microsoft Account Sign In Assistant (MSA) Service disabled.|
-| 55 | Failed to create new registry path for `SetDeviceNameOptIn` of the PowerShell script.|
-| 56 | Failed to create property for `SetDeviceNameOptIn` of the PowerShell script at registry path.|
-| 57 | Failed to update value for `SetDeviceNameOptIn` of the PowerShell script.|
-| 58 | Unexpected exception in `SetDeviceNameOptIn` of the PowerShell script.|
-| 59 | Failed to delete `LastPersistedEventTimeOrFirstBoot` property at registry path when attempting to clean up OneSettings.|
-| 60 | Failed to delete registry key when attempting to clean up OneSettings.|
-| 61 | Unexpected exception when attempting to clean up OneSettings.|
-| 52 | Could not find Census.exe|
-| 51 | Unexpected exception when attempting to run Census.exe|
-| 34 | Unexpected exception when attempting to check Proxy settings.|
-| 30 | Unable to disable Enterprise Auth Proxy. This registry value must be 0 for UTC to operate in an authenticated proxy environment.|
-| 35 | Unexpected exception when checking User Proxy.|
\ No newline at end of file
+|Error |Description |
+|---------|---------|
+| 27 | Not system account. |
+| 37 | Unexpected exception when collecting logs|
+| 1 | General unexpected error|
+| 6 | Invalid CommercialID|
+| 48 | CommercialID is not a GUID|
+| 8 | Couldn't create registry key path to setup CommercialID|
+| 9 | Couldn't write CommercialID at registry key path|
+| 53 | There are conflicting CommercialID values.|
+| 11 | Unexpected result when setting up CommercialID.|
+| 62 | AllowTelemetry registry key is not of the correct type REG_DWORD|
+| 63 | AllowTelemetry is not set to the appropriate value and it could not be set by the script.|
+| 64 | AllowTelemetry is not of the correct type REG_DWORD.|
+| 99 | Device is not Windows 10.|
+| 40 | Unexpected exception when checking and setting telemetry.|
+| 12 | CheckVortexConnectivity failed, check Log output for more information.|
+| 12 | Unexpected failure when running CheckVortexConnectivity.|
+| 66 | Failed to verify UTC connectivity and recent uploads.|
+| 67 | Unexpected failure when verifying UTC CSP.|
+| 41 | Unable to impersonate logged-on user.|
+| 42 | Unexpected exception when attempting to impersonate logged-on user.|
+| 43 | Unexpected exception when attempting to impersonate logged-on user.|
+| 16 | Reboot is pending on device, restart device and restart script.|
+| 17 | Unexpected exception in CheckRebootRequired.|
+| 44 | Error when running CheckDiagTrack service.|
+| 45 | DiagTrack.dll not found.|
+| 50 | DiagTrack service not running.|
+| 54 | Microsoft Account Sign In Assistant (MSA) Service disabled.|
+| 55 | Failed to create new registry path for SetDeviceNameOptIn|
+| 56 | Failed to create property for SetDeviceNameOptIn at registry path|
+| 57 | Failed to update value for SetDeviceNameOptIn|
+| 58 | Unexpected exception in SetrDeviceNameOptIn|
+| 59 | Failed to delete LastPersistedEventTimeOrFirstBoot property at registry path when attempting to clean up OneSettings.|
+| 60 | Failed to delete registry key when attempting to clean up OneSettings.|
+| 61 | Unexpected exception when attempting to clean up OneSettings.|
+| 52 | Could not find Census.exe|
+| 51 | Unexpected exception when attempting to run Census.exe|
+| 34 | Unexpected exception when attempting to check Proxy settings.|
+| 30 | Unable to disable Enterprise Auth Proxy. This registry value must be 0 for UTC to operate in an authenticated proxy environment.|
+| 35 | Unexpected exception when checking User Proxy.|
+| 91 | Failed to create new registry path for EnableAllowUCProcessing|
+| 92 | Failed to create property for EnableAllowUCProcessing at registry path|
+| 93 | Failed to update value for EnableAllowUCProcessing|
+| 94 | Unexpected exception in EnableAllowUCProcessing|
diff --git a/windows/deployment/update/update-compliance-get-started.md b/windows/deployment/update/update-compliance-get-started.md
index e686447597..38f4a539b6 100644
--- a/windows/deployment/update/update-compliance-get-started.md
+++ b/windows/deployment/update/update-compliance-get-started.md
@@ -17,41 +17,74 @@ ms.topic: article
# Get started with Update Compliance
+> [!IMPORTANT]
+> **A new policy is required to use Update Compliance: "AllowUpdateComplianceProcessing"**. If you're already using Update Compliance and have configured your devices prior to May 10, 2021, you must configure devices with this additional policy. You can do this by rerunning the [Update Compliance Configuration Script](update-compliance-configuration-script.md) if you configure your devices through Group Policy, or refer to [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md) for details on manually configuring the new policy for both Group Policy and MDM.
+
This topic introduces the high-level steps required to enroll to the Update Compliance solution and configure devices to send data to it. The following steps cover the enrollment and device configuration workflow.
1. Ensure you can [meet the requirements](#update-compliance-prerequisites) to use Update Compliance.
2. [Add Update Compliance](#add-update-compliance-to-your-azure-subscription) to your Azure subscription.
3. [Configure devices](#enroll-devices-in-update-compliance) to send data to Update Compliance.
-After adding the solution to Azure and configuring devices, there will be a waiting period of up to 72 hours before you can begin to see devices in the solution. Before or as devices appear, you can learn how to [Use Update Compliance](update-compliance-using.md) to monitor Windows Updates and Delivery Optimization.
+After adding the solution to Azure and configuring devices, it could take up to 72 hours before you can begin to see devices in the solution. Before or as devices appear, you can learn how to [Use Update Compliance](update-compliance-using.md) to monitor Windows Updates and Delivery Optimization.
## Update Compliance prerequisites
Before you begin the process to add Update Compliance to your Azure subscription, first ensure you can meet the prerequisites:
-1. **Compatible Operating Systems and Editions**: Update Compliance works only with Windows 10 Professional, Education, and Enterprise editions. Update Compliance supports both the typical Windows 10 Enterprise edition, as well as [Windows 10 Enterprise multi-session](/azure/virtual-desktop/windows-10-multisession-faq). Update Compliance only provides data for the standard Desktop Windows 10 version and is not currently compatible with Windows Server, Surface Hub, IoT, etc.
-2. **Compatible Windows 10 Servicing Channels**: Update Compliance supports Windows 10 devices on the Semi-Annual Channel (SAC) and the Long-term Servicing Channel (LTSC). Update Compliance *counts* Windows Insider Preview (WIP) devices, but does not currently provide detailed deployment insights for them.
-3. **Diagnostic data requirements**: Update Compliance requires devices be configured to send diagnostic data at *Required* level (previously *Basic*). To learn more about what's included in different diagnostic levels, see [Diagnostics, feedback, and privacy in Windows 10](https://support.microsoft.com/help/4468236/diagnostics-feedback-and-privacy-in-windows-10-microsoft-privacy).
-4. **Data transmission requirements**: Devices must be able to contact specific endpoints required to authenticate and send diagnostic data. These are enumerated in detail at [Configuring Devices for Update Compliance manually](update-compliance-configuration-manual.md).
-5. **Showing Device Names in Update Compliance**: For Windows 10 1803+, device names will not appear in Update Compliance unless you individually opt-in devices via policy. The steps to accomplish this is outlined in [Configuring Devices for Update Compliance](update-compliance-configuration-manual.md).
+- **Compatible Operating Systems and Editions**: Update Compliance works only with Windows 10 Professional, Education, and Enterprise editions. Update Compliance supports both the typical Windows 10 Enterprise edition, as well as [Windows 10 Enterprise multi-session](/azure/virtual-desktop/windows-10-multisession-faq). Update Compliance only provides data for the standard Desktop Windows 10 version and is not currently compatible with Windows Server, Surface Hub, IoT, etc.
+- **Compatible Windows 10 Servicing Channels**: Update Compliance supports Windows 10 devices on the Semi-Annual Channel and the Long-term Servicing Channel (LTSC). Update Compliance *counts* Windows Insider Preview (WIP) devices, but does not currently provide detailed deployment insights for them.
+- **Diagnostic data requirements**: Update Compliance requires devices be configured to send diagnostic data at *Required* level (previously *Basic*). To learn more about what's included in different diagnostic levels, see [Diagnostics, feedback, and privacy in Windows 10](https://support.microsoft.com/help/4468236/diagnostics-feedback-and-privacy-in-windows-10-microsoft-privacy).
+- **Data transmission requirements**: Devices must be able to contact specific endpoints required to authenticate and send diagnostic data. These are enumerated in detail at [Configuring Devices for Update Compliance manually](update-compliance-configuration-manual.md).
+- **Showing Device Names in Update Compliance**: For Windows 10, version 1803 or later, device names will not appear in Update Compliance unless you individually opt-in devices by using policy. The steps to accomplish this is outlined in [Configuring Devices for Update Compliance](update-compliance-configuration-manual.md).
## Add Update Compliance to your Azure subscription
Update Compliance is offered as an Azure Marketplace application which is linked to a new or existing [Azure Log Analytics](/azure/log-analytics/query-language/get-started-analytics-portal) workspace within your Azure subscription. To configure this, follow these steps:
-1. Go to the [Update Compliance page in the Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/Microsoft.WaaSUpdateInsights?tab=Overview). You may need to login to your Azure subscription to access this.
+1. Go to the [Update Compliance page in the Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/Microsoft.WaaSUpdateInsights?tab=Overview). You might need to login to your Azure subscription to access this.
2. Select **Get it now**.
-3. Choose an existing or configure a new Log Analytics Workspace. While an Azure subscription is required, you will not be charged for ingestion of Update Compliance data.
- - [Desktop Analytics](/sccm/desktop-analytics/overview) customers are advised to use the same workspace for Update Compliance.
- - [Azure Update Management](/azure/automation/automation-update-management) customers are advised to use the same workspace for Update Compliance.
-4. After your workspace is configured and selected, select **Create**. You will receive a notification when the solution has been successfully created.
+3. Choose an existing or configure a new Log Analytics Workspace, ensuring it is in a **Compatible Log Analytics region** from the following table. Although an Azure subscription is required, you won't be charged for ingestion of Update Compliance data.
+ - [Desktop Analytics](/sccm/desktop-analytics/overview) users should use the same workspace for Update Compliance.
+ - [Azure Update Management](/azure/automation/automation-intro#update-management) users should use the same workspace for Update Compliance.
+4. After your workspace is configured and selected, select **Create**. You'll receive a notification when the solution has been successfully created.
+
+|Compatible Log Analytics regions |
+| ------------------------------- |
+|Australia Central |
+|Australia East |
+|Australia Southeast |
+|Brazil South |
+|Canada Central |
+|Central India |
+|Central US |
+|East Asia |
+|East US |
+|East US 2 |
+|Eastus2euap(canary) |
+|France Central |
+|Japan East |
+|Korea Central |
+|North Central US |
+|North Europe |
+|South Africa North |
+|South Central US |
+|Southeast Asia |
+|Switzerland North |
+|Switzerland West |
+|UK West |
+|UK south |
+|West Central US |
+|West Europe |
+|West US |
+|West US 2 |
> [!NOTE]
> It is not currently supported to programmatically enroll to Update Compliance via the [Azure CLI](/cli/azure) or otherwise. You must manually add Update Compliance to your Azure subscription.
### Get your CommercialID
-A CommercialID is a globally-unique identifier assigned to a specific Log Analytics workspace. The CommercialID is copied to an MDM or Group Policy and is used to identify devices in your environment.
+A CommercialID is a globally unique identifier assigned to a specific Log Analytics workspace. The CommercialID is copied to an MDM or Group Policy and is used to identify devices in your environment.
To find your CommercialID within Azure:
@@ -64,20 +97,16 @@ To find your CommercialID within Azure:
## Enroll devices in Update Compliance
-Once you've added Update Compliance to a workspace in your Azure subscription, you'll need to configure any devices you want to monitor. There are two ways to configure devices to use Update Compliance. After you configure devices, it can take up to 72 hours before devices are visible in the solution. Until then, Update Compliance will indicate it is still assessing devices.
+Once you've added Update Compliance to a workspace in your Azure subscription, you'll need to configure any devices you want to monitor. There are two ways to configure devices to use Update Compliance:
-> [!NOTE]
-> If you use or plan to use [Desktop Analytics](/mem/configmgr/desktop-analytics/overview), follow the steps in [Enroll devices in Desktop Analytics](/mem/configmgr/desktop-analytics/enroll-devices) to also enroll devices in Update Compliance. You should be aware that the Commercial ID and Log Analytics workspace must be the same for both Desktop Analytics and Update Compliance.
+- If you use Group Policy to manage device policies, use the [Update Compliance Configuration Script](update-compliance-configuration-script.md).
+- If you manage devices through MDM providers like Intune, [manually configure device for Update Compliance](update-compliance-configuration-manual.md).
-### Configure devices using the Update Compliance Configuration Script
+After you configure devices, diagnostic data they send will begin to be associated with your Azure AD organization ("tenant"). However, enrolling to Update Compliance doesn't influence the rate at which required data is uploaded from devices. Device connectivity to the internet and generally how active the device is highly influences how long it will take before the device appears in Update Compliance. Devices that are active and connected to the internet daily can expect to be fully uploaded within one week (usually less than 72 hours). Devices that are less active can take up to two weeks before data is fully available.
-The recommended way to configure devices to send data to Update Compliance is using the [Update Compliance Configuration Script](update-compliance-configuration-script.md). The script configures required policies via Group Policy. The script comes with two versions:
+### Update Compliance and Desktop Analytics
-- Pilot is more verbose and is intended to be use on an initial set of devices and for troubleshooting.
-- Deployment is intended to be deployed across the entire device population you want to monitor with Update Compliance.
+If you use or plan to use [Desktop Analytics](/mem/configmgr/desktop-analytics/overview), you must use the same Log Analytics workspace for both solutions.
-To download the script and learn what you need to configure and how to troubleshoot errors, see [Configuring Devices using the Update Compliance Configuration Script](update-compliance-configuration-script.md).
-### Configure devices manually
-It is possible to manually configure devices to send data to Update Compliance, but the recommended method of configuration is to use the [Update Compliance Configuration Script](update-compliance-configuration-script.md). To learn more about configuring devices manually, see [Manually Configuring Devices for Update Compliance](update-compliance-configuration-manual.md).
\ No newline at end of file
diff --git a/windows/deployment/update/waas-delivery-optimization-reference.md b/windows/deployment/update/waas-delivery-optimization-reference.md
index 7f34af0526..df12b64c2c 100644
--- a/windows/deployment/update/waas-delivery-optimization-reference.md
+++ b/windows/deployment/update/waas-delivery-optimization-reference.md
@@ -21,7 +21,7 @@ ms.custom: seo-marvel-apr2020
- Windows 10
-> **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
+> **Looking for more Group Policy settings?** See the master spreadsheet available at the [Download Center](https://www.microsoft.com/download/details.aspx?id=102158).
There are a great many details you can set in Delivery Optimization to customize it to do just what you need it to. This topic summarizes them for your reference. If you just need an overview of Delivery Optimization, see [Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md). If you need information about setting up Delivery Optimization, including tips for the best settings in different scenarios, see [Set up Delivery Optimization for Windows 10 updates](waas-delivery-optimization-setup.md).
@@ -34,7 +34,7 @@ In MDM, the same settings are under **.Vendor/MSFT/Policy/Config/DeliveryOptimiz
[//]: # (something about Intune UX--perhaps link to relevant Intune docs?)
-### Summary of Delivery Optimization settings :
+### Summary of Delivery Optimization settings:
| Group Policy setting | MDM setting | Supported from version |
| --- | --- | --- |
@@ -87,7 +87,7 @@ Additional options available that control the impact Delivery Optimization has o
- [Maximum Download Bandwidth](#maximum-download-bandwidth) and [Percentage of Maximum Download Bandwidth](#percentage-of-maximum-download-bandwidth) control the download bandwidth used by Delivery Optimization.
- [Max Upload Bandwidth](#max-upload-bandwidth) controls the Delivery Optimization upload bandwidth usage.
- [Monthly Upload Data Cap](#monthly-upload-data-cap) controls the amount of data a client can upload to peers each month.
-- [Minimum Background QoS](#minimum-background-qos) lets administrators guarantee a minimum download speed for Windows updates. This is achieved by adjusting the amount of data downloaded directly from Windows Update or WSUS servers, rather than other peers in the network.
+- [Minimum Background QoS](#minimum-background-qos) lets administrators guarantee a minimum download speed for Windows updates. This setting adjusts the amount of data downloaded directly from Windows Update or WSUS servers, rather than other peers in the network.
- [Maximum Foreground Download Bandwidth](#maximum-foreground-download-bandwidth) specifies the **maximum foreground download bandwidth** that Delivery Optimization uses, across all concurrent download activities, as a percentage of available download bandwidth.
- [Maximum Background Download Bandwidth](#maximum-background-download-bandwidth) specifies the **maximum background download bandwidth** that Delivery Optimization uses, across all concurrent download activities, as a percentage of available download bandwidth.
- [Set Business Hours to Limit Background Download Bandwidth](#set-business-hours-to-limit-background-download-bandwidth) specifies the maximum background download bandwidth that Delivery Optimization uses during and outside business hours across all concurrent download activities as a percentage of available download bandwidth.
@@ -110,7 +110,7 @@ Download mode dictates which download sources clients are allowed to use when do
| Download mode option | Functionality when set |
| --- | --- |
| HTTP Only (0) | This setting disables peer-to-peer caching but still allows Delivery Optimization to download content over HTTP from the download's original source. This mode uses additional metadata provided by the Delivery Optimization cloud services for a peerless reliable and efficient download experience. |
-| LAN (1 – Default) | This default operating mode for Delivery Optimization enables peer sharing on the same network. The Delivery Optimization cloud service finds other clients that connect to the Internet using the same public IP as the target client. These clients then attempts to connect to other peers on the same network by using their private subnet IP.|
+| LAN (1 – Default) | This default operating mode for Delivery Optimization enables peer sharing on the same network. The Delivery Optimization cloud service finds other clients that connect to the Internet using the same public IP as the target client. These clients then try to connect to other peers on the same network by using their private subnet IP.|
| Group (2) | When group mode is set, the group is automatically selected based on the device's Active Directory Domain Services (AD DS) site (Windows 10, version 1607) or the domain the device is authenticated to (Windows 10, version 1511). In group mode, peering occurs across internal subnets, between devices that belong to the same group, including devices in remote offices. You can use GroupID option to create your own custom group independently of domains and AD DS sites. Starting with Windows 10, version 1803, you can use the GroupIDSource parameter to take advantage of other method to create groups dynamically. Group download mode is the recommended option for most organizations looking to achieve the best bandwidth optimization with Delivery Optimization. |
| Internet (3) | Enable Internet peer sources for Delivery Optimization. |
| Simple (99) | Simple mode disables the use of Delivery Optimization cloud services completely (for offline environments). Delivery Optimization switches to this mode automatically when the Delivery Optimization cloud services are unavailable, unreachable or when the content file size is less than 10 MB. In this mode, Delivery Optimization provides a reliable download experience, with no peer-to-peer caching. |
@@ -121,7 +121,7 @@ Download mode dictates which download sources clients are allowed to use when do
### Group ID
-By default, peer sharing on clients using the group download mode is limited to the same domain in Windows 10, version 1511, and the same domain and Active Directory Domain Services site in Windows 10, version 1607. By using the Group ID setting, you can optionally create a custom group that contains devices that should participate in Delivery Optimization but do not fall within those domain or Active Directory Domain Services site boundaries, including devices in another domain. Using Group ID, you can further restrict the default group (for example, you could create a sub-group representing an office building), or extend the group beyond the domain, allowing devices in multiple domains in your organization to be peers. This setting requires the custom group to be specified as a GUID on each device that participates in the custom group.
+By default, peer sharing on clients using the group download mode is limited to the same domain in Windows 10, version 1511, and the same domain and Active Directory Domain Services site in Windows 10, version 1607. By using the Group ID setting, you can optionally create a custom group that contains devices that should participate in Delivery Optimization but do not fall within those domain or Active Directory Domain Services site boundaries, including devices in another domain. Using Group ID, you can further restrict the default group (for example, you could create a subgroup representing an office building), or extend the group beyond the domain, allowing devices in multiple domains in your organization to be peers. This setting requires the custom group to be specified as a GUID on each device that participates in the custom group.
[//]: # (Configuration Manager boundary group option; GroupID Source policy)
@@ -144,11 +144,11 @@ When set, the Group ID is assigned automatically from the selected source. If yo
### Minimum RAM (inclusive) allowed to use Peer Caching
-This setting specifies the minimum RAM size in GB required to use Peer Caching. For example if the minimum set is 1 GB, then devices with 1 GB or higher available RAM will be allowed to use Peer caching. The recommended values are 1 to 4 GB, and the default value is 4 GB.
+This setting specifies the minimum RAM size in GB required to use Peer Caching. For example if the minimum set is 1 GB, then devices with 1 GB or higher available RAM will be allowed to use Peer caching. The recommended values are 1 to 4, and the default value is 4 GB.
### Minimum disk size allowed to use Peer Caching
-This setting specifies the required minimum disk size (capacity in GB) for the device to use Peer Caching. The recommended values are 64 to 256 GB, and the default value is 32 GB.
+This setting specifies the required minimum disk size (capacity in GB) for the device to use Peer Caching. The recommended values are 64 to 256, and the default value is 32 GB.
>[!NOTE]
>If the [Modify Cache Drive](#modify-cache-drive) policy is set, the disk size check will apply to the new working directory specified by this policy.
@@ -156,7 +156,7 @@ This setting specifies the required minimum disk size (capacity in GB) for the d
### Max Cache Age
-In environments configured for Delivery Optimization, you might want to set an expiration on cached updates and Windows application installation files. If so, this setting defines the maximum number of seconds each file can be held in the Delivery Optimization cache on each Windows 10 client device. The default Max Cache Age value is 259,200 seconds (3 days). Alternatively, organizations might choose to set this value to "0" which means "unlimited" to avoid peers re-downloading content. When "Unlimited" value is set, Delivery Optimization will hold the files in the cache longer and will clean up the cache as needed (for example when the cache size exceeded the maximum space allowed).
+In environments configured for Delivery Optimization, you might want to set an expiration on cached updates and Windows application installation files. If so, this setting defines the maximum number of seconds each file can be held in the Delivery Optimization cache on each Windows 10 client device. The default Max Cache Age value is 259,200 seconds (three days). Alternatively, organizations might choose to set this value to "0" which means "unlimited" to avoid peers re-downloading content. When "Unlimited" value is set, Delivery Optimization will hold the files in the cache longer and will clean up the cache as needed (for example when the cache size exceeded the maximum space allowed).
### Max Cache Size
@@ -168,19 +168,19 @@ This setting specifies the maximum number of gigabytes the Delivery Optimization
### Minimum Peer Caching Content File Size
-This setting specifies the minimum content file size in MB enabled to use Peer Caching. The recommended values are from 1 to 100000 MB.
+This setting specifies the minimum content file size in MB enabled to use Peer Caching. The recommended values are from 1 to 100000.
### Maximum Download Bandwidth
-This setting specifies the maximum download bandwidth that can be used across all concurrent Delivery Optimization downloads in kilobytes per second (KB/s). A default value of 0 means that Delivery Optimization will dynamically adjust and optimize the maximum bandwidth used.
+This setting specifies the maximum download bandwidth that can be used across all concurrent Delivery Optimization downloads in kilobytes per second (KB/s). A default value of "0" means that Delivery Optimization will dynamically adjust and optimize the maximum bandwidth used.
### Maximum Foreground Download Bandwidth
-Starting in Windows 10, version 1803, specifies the maximum foreground download bandwidth that Delivery Optimization uses across all concurrent download activities as a percentage of available download bandwidth. The default value of 0 means that Delivery Optimization dynamically adjusts to use the available bandwidth for foreground downloads. However, downloads from LAN peers are not throttled even when this policy is set.
+Starting in Windows 10, version 1803, specifies the maximum foreground download bandwidth that Delivery Optimization uses across all concurrent download activities as a percentage of available download bandwidth. The default value of "0" means that Delivery Optimization dynamically adjusts to use the available bandwidth for foreground downloads. However, downloads from LAN peers are not throttled even when this policy is set.
### Maximum Background Download Bandwidth
-Starting in Windows 10, version 1803, specifies the maximum background download bandwidth that Delivery Optimization uses across all concurrent download activities as a percentage of available download bandwidth. The default value of 0 means that Delivery Optimization dynamically adjusts to use the available bandwidth for foreground downloads. However, downloads from LAN peers are not throttled even when this policy is set.
+Starting in Windows 10, version 1803, specifies the maximum background download bandwidth that Delivery Optimization uses across all concurrent download activities as a percentage of available download bandwidth. The default value of "0" means that Delivery Optimization dynamically adjusts to use the available bandwidth for foreground downloads. However, downloads from LAN peers are not throttled even when this policy is set.
### Percentage of Maximum Download Bandwidth
@@ -188,7 +188,7 @@ This setting specifies the maximum download bandwidth that Delivery Optimization
### Max Upload Bandwidth
-This setting allows you to limit the amount of upload bandwidth individual clients can use for Delivery Optimization. Consider this setting when clients are providing content to requesting peers on the network. This option is set in kilobytes per second (KB/s). The default setting is 0, or "unlimited" which means Delivery Optimization dynamically optimizes for minimal usage of upload bandwidth; however it does not cap the upload bandwidth rate at a set rate.
+This setting allows you to limit the number of upload bandwidth individual clients can use for Delivery Optimization. Consider this setting when clients are providing content to requesting peers on the network. This option is set in kilobytes per second (KB/s). The default setting is "0", or "unlimited" which means Delivery Optimization dynamically optimizes for minimal usage of upload bandwidth; however it does not cap the upload bandwidth rate at a set rate.
### Set Business Hours to Limit Background Download Bandwidth
Starting in Windows 10, version 1803, specifies the maximum background download bandwidth that Delivery Optimization uses during and outside business hours across all concurrent download activities as a percentage of available download bandwidth.
@@ -198,7 +198,7 @@ Starting in Windows 10, version 1803, specifies the maximum foreground download
### Select a method to restrict peer selection
Starting in Windows 10, version 1803, set this policy to restrict peer selection via selected option.
-Currently the only available option is **1 = Subnet mask** This option (Subnet mask) applies to both Download Modes LAN (1) and Group (2).
+Currently the only available option is **1 = Subnet mask**. The subnet mask option applies to both Download Modes LAN (1) and Group (2).
### Delay background download from http (in secs)
Starting in Windows 10, version 1803, this allows you to delay the use of an HTTP source in a background download that is allowed to use peer-to-peer.
@@ -214,19 +214,19 @@ Starting in Windows 10, version 1903, set this policy to delay the fallback from
### Minimum Background QoS
-This value specifies the minimum download speed guarantee that a client attempts to achieve and will fulfill by downloading more kilobytes from Windows Update servers or WSUS. Simply put, the lower this value is, the more content will be sourced using peers on the network rather than Windows Update. The higher this value, the more content is received from Windows Update servers or WSUS, versus peers on the local network.
+This value specifies the minimum download speed guarantee that a client attempts to achieve and will fulfill by downloading more kilobytes from Windows Update servers or WSUS. The lower this value is, the more content will be sourced using peers on the network rather than Windows Update. The higher this value, the more content is received from Windows Update servers or WSUS, versus peers on the local network.
### Modify Cache Drive
-This setting allows for an alternate Delivery Optimization cache location on the clients. By default, the cache is stored on the operating system drive through the %SYSTEMDRIVE% environment variable. You can set the value to an environment variable (e.g., %SYSTEMDRIVE%), a drive letter (e.g., D:), or a folder path (e.g., D:\DOCache).
+This setting allows for an alternate Delivery Optimization cache location on the clients. By default, the cache is stored on the operating system drive through the %SYSTEMDRIVE% environment variable. You can set the value to an environment variable (for example, %SYSTEMDRIVE%), a drive letter (for example, D:), or a folder path (for example, D:\DOCache).
### Monthly Upload Data Cap
-This setting specifies the total amount of data in gigabytes that a Delivery Optimization client can upload to Internet peers per month. A value of 0 means that an unlimited amount of data can be uploaded. The default value for this setting is 20 GB.
+This setting specifies the total amount of data in gigabytes that a Delivery Optimization client can upload to Internet peers per month. A value of "0" means that an unlimited amount of data can be uploaded. The default value for this setting is 20 GB.
### Enable Peer Caching while the device connects via VPN
-This setting determines whether a device will be allowed to participate in Peer Caching while connected to VPN. Specify "true" to allow the device to participate in Peer Caching while connected via VPN to the domain network. This means the device can download from or upload to other domain network devices, either on VPN or on the corporate domain network.
+This setting determines whether a device will be allowed to participate in Peer Caching while connected to VPN. Specify "true" to allow the device to participate in Peer Caching while connected via VPN to the domain network. The device can download from or upload to other domain network devices, either on VPN or on the corporate domain network.
### Allow uploads while the device is on battery while under set Battery level
@@ -238,7 +238,7 @@ The device can download from peers while on battery regardless of this policy.
### Cache Server Hostname
-Set this policy to to designate one or more Microsoft Connected Cache servers to be used by Delivery Optimization. You can set one or more FQDNs or IP Addresses that are comma separated, for example: myhost.somerandomhost.com,myhost2.somrandomhost.com,10.10.1.7.
+Set this policy to designate one or more Microsoft Connected Cache servers to be used by Delivery Optimization. You can set one or more FQDNs or IP Addresses that are comma separated, for example: myhost.somerandomhost.com,myhost2.somrandomhost.com,10.10.1.7.
### Cache Server Hostname Source
diff --git a/windows/deployment/update/waas-delivery-optimization.md b/windows/deployment/update/waas-delivery-optimization.md
index 6055bc73bc..96b1bc810e 100644
--- a/windows/deployment/update/waas-delivery-optimization.md
+++ b/windows/deployment/update/waas-delivery-optimization.md
@@ -23,9 +23,9 @@ ms.custom: seo-marvel-apr2020
- Windows 10
-> **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
+> **Looking for Group Policy objects?** See [Delivery Optimization reference](waas-delivery-optimization-reference.md) or the master spreadsheet available at the [Download Center](https://www.microsoft.com/download/details.aspx?id=102158).
-Windows updates, upgrades, and applications can contain packages with very large files. Downloading and distributing updates can consume quite a bit of network resources on the devices receiving them. You can use Delivery Optimization to reduce bandwidth consumption by sharing the work of downloading these packages among multiple devices in your deployment. Delivery Optimization can accomplish this because it is a self-organizing distributed cache that allows clients to download those packages from alternate sources (such as other peers on the network) in addition to the traditional Internet-based servers. You can use Delivery Optimization in conjunction with Windows Update, Windows Server Update Services (WSUS), Windows Update for Business, or Microsoft Endpoint Manager (when installation of Express Updates is enabled).
+Windows updates, upgrades, and applications can contain packages with very large files. Downloading and distributing updates can consume quite a bit of network resources on the devices receiving them. You can use Delivery Optimization to reduce bandwidth consumption by sharing the work of downloading these packages among multiple devices in your deployment. Delivery Optimization is a self-organizing distributed cache that allows clients to download those packages from alternate sources (such as other peers on the network) in addition to the traditional Internet-based servers. You can use Delivery Optimization with Windows Update, Windows Server Update Services (WSUS), Windows Update for Business, or Microsoft Endpoint Manager (when installation of Express Updates is enabled).
Delivery Optimization is a cloud-managed solution. Access to the Delivery Optimization cloud services is a requirement. This means that in order to use the peer-to-peer functionality of Delivery Optimization, devices must have access to the internet.
@@ -54,18 +54,18 @@ For information about setting up Delivery Optimization, including tips for the b
- [DOCacheHost](waas-delivery-optimization-reference.md#cache-server-hostname)
- [DOCacheHostSource](waas-delivery-optimization-reference.md#cache-server-hostname-source)
- [DOMaxForegroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs); replaces DOPercentageMaxDownloadBandwidth
- - [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs)
+ - [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-background-download-bandwidth-in-kbs)
- Removed policy settings (if you set these policies in Windows 10, 2004, they will have no effect):
- - DOMaxDownloadBandwidth; use [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs) or [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs) instead.
- - DOPercentageMaxDownloadBandwidth; use [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs) or [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs) instead.
+ - DOMaxDownloadBandwidth; use [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-background-download-bandwidth-in-kbs) or [DOMaxForegroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs) instead.
+ - DOPercentageMaxDownloadBandwidth; use [DOMaxBackgroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-background-download-bandwidth-in-kbs) or [DOMaxForegroundDownloadBandwidth](waas-delivery-optimization-reference.md#maximum-foreground-download-bandwidth-in-kbs) instead.
- DOMaxUploadBandwidth
- Support for new types of downloads:
- Office installs and updates
- Xbox game pass games
- MSIX apps (HTTP downloads only)
- - Edge browser installs and updates
+ - Microsoft Edge browser installations and updates
- [Dynamic updates](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/the-benefits-of-windows-10-dynamic-update/ba-p/467847)
## Requirements
@@ -132,41 +132,46 @@ For more details, check out the [Adopting Windows as a Service at Microsoft](htt
## Frequently asked questions
-**Does Delivery Optimization work with WSUS?**: Yes. Devices will obtain the update payloads from the WSUS server, but must also have an internet connection as they communicate with the Delivery Optimization cloud service for coordination.
+#### Does Delivery Optimization work with WSUS?
+Yes. Devices will obtain the update payloads from the WSUS server, but must also have an internet connection as they communicate with the Delivery Optimization cloud service for coordination.
-**Which ports does Delivery Optimization use?**: Delivery Optimization listens on port 7680 for requests from other peers by using TCP/IP. The service will register and open this port on the device, but you might need to set this port to accept inbound traffic through your firewall yourself. If you don't allow inbound traffic over port 7680, you can't use the peer-to-peer functionality of Delivery Optimization. However, devices can still successfully download by using HTTP or HTTPS traffic over port 80 (such as for default Windows Update data).
+#### Which ports does Delivery Optimization use?
+Delivery Optimization listens on port 7680 for requests from other peers by using TCP/IP. The service will register and open this port on the device, but you might need to set this port to accept inbound traffic through your firewall yourself. If you don't allow inbound traffic over port 7680, you can't use the peer-to-peer functionality of Delivery Optimization. However, devices can still successfully download by using HTTP or HTTPS traffic over port 80 (such as for default Windows Update data).
If you set up Delivery Optimization to create peer groups that include devices across NATs (or any form of internal subnet that uses gateways or firewalls between subnets), it will use Teredo. For this to work, you must allow inbound TCP/IP traffic over port 3544. Look for a "NAT traversal" setting in your firewall to set this up.
Delivery Optimization also communicates with its cloud service by using HTTP/HTTPS over port 80.
-**What are the requirements if I use a proxy?**: For Delivery Optimization to successfully use the proxy, you should set up the proxy by using Windows proxy settings or Internet Explorer proxy settings. For details see [Using a proxy with Delivery Optimization](./delivery-optimization-proxy.md). Most content downloaded with Delivery Optimization uses byte range requests. Make sure your proxy allows byte range requests. For more information, see [Proxy requirements for Windows Update](https://support.microsoft.com/help/3175743/proxy-requirements-for-windows-update).
+#### What are the requirements if I use a proxy?
+For Delivery Optimization to successfully use the proxy, you should set up the proxy by using Windows proxy settings or Internet Explorer proxy settings. For details see [Using a proxy with Delivery Optimization](./delivery-optimization-proxy.md). Most content downloaded with Delivery Optimization uses byte range requests. Make sure your proxy allows byte range requests. For more information, see [Proxy requirements for Windows Update](https://support.microsoft.com/help/3175743/proxy-requirements-for-windows-update).
-**What hostnames should I allow through my firewall to support Delivery Optimization?**:
+#### What hostnames should I allow through my firewall to support Delivery Optimization?
For communication between clients and the Delivery Optimization cloud service: **\*.do.dsp.mp.microsoft.com**.
-For Delivery Optimization metadata:
+**For Delivery Optimization metadata**:
- *.dl.delivery.mp.microsoft.com
- *.emdl.ws.microsoft.com
-For the payloads (optional):
+**For the payloads (optional)**:
- *.download.windowsupdate.com
- *.windowsupdate.com
-**Does Delivery Optimization use multicast?**: No. It relies on the cloud service for peer discovery, resulting in a list of peers and their IP addresses. Client devices then connect to their peers to obtain download files over TCP/IP.
+#### Does Delivery Optimization use multicast?
+No. It relies on the cloud service for peer discovery, resulting in a list of peers and their IP addresses. Client devices then connect to their peers to obtain download files over TCP/IP.
-**How does Delivery Optimization deal with congestion on the router from peer-to-peer activity on the LAN?**: Starting in Windows 10, version 1903, Delivery Optimization uses LEDBAT to relieve such congestion. For more details see this post on the [Networking Blog](https://techcommunity.microsoft.com/t5/Networking-Blog/Windows-Transport-converges-on-two-Congestion-Providers-Cubic/ba-p/339819).
+#### How does Delivery Optimization deal with congestion on the router from peer-to-peer activity on the LAN?
+Starting in Windows 10, version 1903, Delivery Optimization uses LEDBAT to relieve such congestion. For more details, see this post on the [Networking Blog](https://techcommunity.microsoft.com/t5/Networking-Blog/Windows-Transport-converges-on-two-Congestion-Providers-Cubic/ba-p/339819).
-**How does Delivery Optimization handle VPNs?**
+#### How does Delivery Optimization handle VPNs?
Delivery Optimization attempts to identify VPNs by checking the network adapter type and details and will treat the connection as a VPN if the adapter description contains certain keywords, such as "VPN" or "secure."
-If the connection is identified as a VPN, Delivery Optimization will suspend uploads to other peers. However, you can allow uploads over a VPN by using the [Enable Peer Caching while the device connects via VPN](waas-delivery-optimization-reference.md#enable-peer-caching-while-the-device-connects-via-vpn) policy.
+If the connection is identified as a VPN, Delivery Optimization will suspend uploads to other peers. However, you can allow uploads over a VPN by using the [Enable Peer Caching while the device connects via VPN](waas-delivery-optimization-reference.md#enable-peer-caching-while-the-device-connects-via-vpn) policy.
-If you have defined a boundary group in Configuration Manager for VPN IP ranges, you can set the DownloadMode policy to 0 for that boundary group to ensure that there will be no peer-to-peer activity over the VPN. When the device is not connected via VPN, it can still leverage peer-to-peer with the default of LAN.
+If you have defined a boundary group in Configuration Manager for VPN IP ranges, you can set the DownloadMode policy to 0 for that boundary group to ensure that there will be no peer-to-peer activity over the VPN. When the device is not connected using a VPN, it can still use peer-to-peer with the default of LAN.
With split tunneling, make sure to allow direct access to these endpoints:
@@ -186,6 +191,14 @@ Windows Update and Microsoft Store backend services and Windows Update and Micro
For more information about remote work if you're using Configuration Manager, see this post on the [Configuration Manager blog](https://techcommunity.microsoft.com/t5/configuration-manager-blog/managing-patch-tuesday-with-configuration-manager-in-a-remote/ba-p/1269444).
+
+#### How does Delivery Optimization handle networks where a public IP address is used in place of a private IP address?
+Starting with Windows 10, version 1903 or later, Delivery Optimization no longer restricts connections between LAN peers to those using private IP addresses. If you use public IP addresses instead of private IP addresses, you can use Delivery Optimization in LAN mode.
+
+> [!NOTE]
+> If you use public IP addresses instead of private in LAN mode, the bytes downloaded from or uploaded to LAN peers with public IP addresses might be reported as coming from Internet peers.
+
+
## Troubleshooting
This section summarizes common problems and some solutions to try.
@@ -202,34 +215,39 @@ If you don't see any bytes coming from peers the cause might be one of the follo
### Clients aren't able to reach the Delivery Optimization cloud services.
-If you suspect this is the problem, try these steps:
+Try these steps:
1. Start a download of an app that is larger than 50 MB from the Store (for example "Candy Crush Saga").
2. Run `Get-DeliveryOptimizationStatus` from an elevated PowerShell window and observe the DownloadMode setting. For peering to work, DownloadMode should be 1, 2, or 3.
-3. If **DownloadMode** is 99 it could indicate your device is unable to reach the Delivery Optimization cloud services. Ensure that the Delivery Optimization hostnames are allowed access: most importantly **\*.do.dsp.mp.microsoft.com**.
+3. If **DownloadMode** is 99, it could indicate your device is unable to reach the Delivery Optimization cloud services. Ensure that the Delivery Optimization host names are allowed access: most importantly **\*.do.dsp.mp.microsoft.com**.
### The cloud service doesn't see other peers on the network.
-If you suspect this is the problem, try these steps:
+Try these steps:
1. Download the same app on two different devices on the same network, waiting 10 – 15 minutes between downloads.
2. Run `Get-DeliveryOptimizationStatus` from an elevated PowerShell window and ensure that **DownloadMode** is 1 or 2 on both devices.
3. Run `Get-DeliveryOptimizationPerfSnap` from an elevated PowerShell window on the second device. The **NumberOfPeers** field should be non-zero.
-4. If the number of peers is zero and you have **DownloadMode** = 1, ensure that both devices are using the same public IP address to reach the internet. To do this, open a browser Windows and search for “what is my IP”. You can **DownloadMode 2** (Group) and a custom GroupID (Guid) to fix this if the devices aren’t reporting the same public IP address.
+4. If the number of peers is zero and you have **DownloadMode** = 1, ensure that both devices are using the same public IP address to reach the internet. Open a browser Windows and search for “what is my IP”. You can **DownloadMode 2** (Group) and a custom GroupID (Guid) to fix this if the devices aren’t reporting the same public IP address.
+> [!NOTE]
+> Starting in Windows 10, version 2004, `Get-DeliveryOptimizationStatus` has a new option `-PeerInfo` which returns a real-time list of the connected peers.
### Clients aren't able to connect to peers offered by the cloud service
-If you suspect this is the problem, try a Telnet test between two devices on the network to ensure they can connect using port 7680. To do this, follow these steps:
+Try a Telnet test between two devices on the network to ensure they can connect using port 7680. Follow these steps:
-1. Install Telnet by running **dism /online /Enable-Feature /FeatureName:TelnetClient** from an elevated command prompt.
-2. Run the test. For example, if you are on device with IP 192.168.8.12 and you are trying to test the connection to 192.168.9.17 run **telnet 192.168.9.17 7680** (the syntax is *telnet [destination IP] [port]*. You will either see a connection error or a blinking cursor like this /_. The blinking cursor means success.
+1. Install Telnet by running `dism /online /Enable-Feature /FeatureName:TelnetClient` from an elevated command prompt.
+2. Run the test. For example, if you are on device with IP 192.168.8.12 and you are trying to test the connection to 192.168.9.17 run `telnet 192.168.9.17 7680` (the syntax is *telnet [destination IP] [port]*. You will either see a connection error or a blinking cursor like this /_. The blinking cursor means success.
+> [!NOTE]
+> You can also use [Test-NetConnection](/powershell/module/nettcpip/test-netconnection?view=windowsserver2019-ps) instead of Telnet to run the test.
+> **Test-NetConnection -ComputerName 192.168.9.17 -Port 7680**
### None of the computers on the network are getting updates from peers
-If you suspect this is the problem, check Delivery Optimization settings that could limit participation in peer caching. Check whether the following settings in assigned group policies, local group policies, are MDM policies are too restrictive:
+Check Delivery Optimization settings that could limit participation in peer caching. Check whether the following settings in assigned group policies, local group policies, or MDM policies are too restrictive:
- Minimum RAM (inclusive) allowed to use peer caching
- Minimum disk size allowed to use peer caching
@@ -260,4 +278,4 @@ If you suspect this is the problem, check Delivery Optimization settings that co
- [Walkthrough: use Intune to configure Windows Update for Business](/intune/windows-update-for-business-configure)
- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
- [Deploy Windows 10 updates using Microsoft Endpoint Configuration Manager](/mem/configmgr/osd/deploy-use/manage-windows-as-a-service)
-- [Manage device restarts after updates](waas-restart.md)
\ No newline at end of file
+- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/deployment/update/waas-manage-updates-wsus.md b/windows/deployment/update/waas-manage-updates-wsus.md
index ce105012f6..c41a64b71e 100644
--- a/windows/deployment/update/waas-manage-updates-wsus.md
+++ b/windows/deployment/update/waas-manage-updates-wsus.md
@@ -172,6 +172,7 @@ You can now see these computers in the **Ring 3 Broad IT** computer group.
+
## Use Group Policy to populate deployment rings
The WSUS Administration Console provides a friendly interface from which you can manage Windows 10 quality and feature updates. When you need to add many computers to their correct WSUS deployment ring, however, it can be time-consuming to do so manually in the WSUS Administration Console. For these cases, consider using Group Policy to target the correct computers, automatically adding them to the correct WSUS deployment ring based on an Active Directory security group. This process is called *client-side targeting*. Before enabling client-side targeting in Group Policy, you must configure WSUS to accept Group Policy computer assignment.
@@ -357,4 +358,4 @@ Now that you have the **All Windows 10 Upgrades** view, complete the following s
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](/intune/windows-update-for-business-configure)
- [Deploy Windows 10 updates using Microsoft Endpoint Configuration Manager](/mem/configmgr/osd/deploy-use/manage-windows-as-a-service)
-- [Manage device restarts after updates](waas-restart.md)
\ No newline at end of file
+- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/deployment/update/waas-servicing-channels-windows-10-updates.md b/windows/deployment/update/waas-servicing-channels-windows-10-updates.md
index fb18f2925e..182ef97bfa 100644
--- a/windows/deployment/update/waas-servicing-channels-windows-10-updates.md
+++ b/windows/deployment/update/waas-servicing-channels-windows-10-updates.md
@@ -38,9 +38,6 @@ The Semi-Annual Channel is the default servicing channel for all Windows 10 devi
| Enterprise LTSB |  |  |  |
| Pro Education |  |  |  |
| Education |  |  |  |
-| Mobile |  |  |  |
-| Mobile Enterprise |  |  |  |
-
>[!NOTE]
@@ -70,12 +67,6 @@ The Semi-Annual Channel is the default servicing channel for all Windows 10 devi
../Vendor/MSFT/Policy/Config/Update/**BranchReadinessLevel**
-**To assign Windows 10 Mobile Enterprise devices to the Semi-Annual Channel by using MDM**
-
-
-- In Windows 10 Mobile Enterprise, version 1607 and later releases:
-
- ../Vendor/MSFT/Policy/Config/Update/BranchReadinessLevel
## Enroll devices in the Windows Insider Program
@@ -189,4 +180,4 @@ Administrators can disable the "Check for updates" option for users by enabling
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](/intune/windows-update-for-business-configure)
-- [Manage device restarts after updates](waas-restart.md)
\ No newline at end of file
+- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/deployment/upgrade/log-files.md b/windows/deployment/upgrade/log-files.md
index 3ddc942453..5ebee9c364 100644
--- a/windows/deployment/upgrade/log-files.md
+++ b/windows/deployment/upgrade/log-files.md
@@ -254,7 +254,7 @@ Therefore, Windows Setup failed because it was not able to migrate the corrupt f
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-10-specifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
diff --git a/windows/deployment/upgrade/quick-fixes.md b/windows/deployment/upgrade/quick-fixes.md
index 05fc0cbd93..e044463423 100644
--- a/windows/deployment/upgrade/quick-fixes.md
+++ b/windows/deployment/upgrade/quick-fixes.md
@@ -297,7 +297,7 @@ When you run Disk Cleanup and enable the option to Clean up system files, you ca
> [!TIP]
> It is no longer necessary to open an elevated command prompt to run the [SetupDiag](setupdiag.md) tool. However, this is still the optimal way to run the tool.
-To launch an elevated command prompt, press the Windows key on your keyboard, type **cmd**, press Ctrl+Shift+Enter, and then Alt+C to confirm the elevation prompt. Screenshots and other steps to open an administrator (aka elevated) command prompt are [here](https://answers.microsoft.com/en-us/windows/forum/windows_7-security/command-prompt-admin-windows-7/6a188166-5e23-461f-b468-f325688ec8c7).
+To launch an elevated command prompt, press the Windows key on your keyboard, type **cmd**, press Ctrl+Shift+Enter, and then click **Yes** to confirm the elevation prompt. Screenshots and other steps to open an elevated command prompt are [here](https://answers.microsoft.com/en-us/windows/forum/windows_7-security/command-prompt-admin-windows-7/6a188166-5e23-461f-b468-f325688ec8c7).
Note: When you open an elevated command prompt, you will usually start in the **C:\WINDOWS\system32** directory. To run a program that you recently downloaded, you must change to the directory where the program is located. Alternatively, you can move or copy the program to a location on the computer that is automatically searched. These directories are listed in the [PATH variable](https://answers.microsoft.com/windows/forum/windows_10-other_settings-winpc/adding-path-variable/97300613-20cb-4d85-8d0e-cc9d3549ba23).
@@ -307,7 +307,7 @@ If you downloaded the SetupDiag.exe program to your computer, then copied it to
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-10-specifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
diff --git a/windows/deployment/upgrade/resolution-procedures.md b/windows/deployment/upgrade/resolution-procedures.md
index 692c255cd6..926355e4cc 100644
--- a/windows/deployment/upgrade/resolution-procedures.md
+++ b/windows/deployment/upgrade/resolution-procedures.md
@@ -340,7 +340,7 @@ Also see the following sequential list of modern setup (mosetup) error codes wit
## Related topics
-- [Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+- [Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
- [Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
- [Windows 10 Specifications](https://www.microsoft.com/windows/Windows-10-specifications)
- [Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/home?category=Windows10ITPro)
diff --git a/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md
index f80b6d973e..b22dd3682c 100644
--- a/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md
+++ b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md
@@ -57,7 +57,7 @@ See the following topics in this article:
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-10-specifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
diff --git a/windows/deployment/upgrade/setupdiag.md b/windows/deployment/upgrade/setupdiag.md
index 5dd61858aa..da30d6f337 100644
--- a/windows/deployment/upgrade/setupdiag.md
+++ b/windows/deployment/upgrade/setupdiag.md
@@ -29,7 +29,7 @@ ms.topic: article
## About SetupDiag
-Current downloadable version of SetupDiag: 1.6.0.42
+Current downloadable version of SetupDiag: 1.6.1.0
>Always be sure to run the most recent version of SetupDiag, so that can access new functionality and fixes to known issues.
SetupDiag is a standalone diagnostic tool that can be used to obtain details about why a Windows 10 upgrade was unsuccessful.
@@ -51,6 +51,9 @@ When run by Windows Setup, the following [parameters](#parameters) are used:
The resulting SetupDiag analysis can be found at **%WinDir%\Logs\SetupDiag\SetupDiagResults.xml** and in the registry under **HKLM\SYSTEM\Setup\SetupDiag\Results**.
+> [!IMPORTANT]
+> When SetupDiag indicates that there were multiple failures, the last failure in the log file is typically the fatal error, not the first one.
+
If the upgrade process proceeds normally, the **Sources** directory including **setupdiag.exe** is moved under **%SystemDrive%\Windows.Old** for cleanup. If the **Windows.old** directory is deleted later, **setupdiag.exe** will also be removed.
## Using SetupDiag
@@ -59,13 +62,13 @@ To quickly use SetupDiag on your current computer:
1. Verify that your system meets the [requirements](#requirements) described below. If needed, install the [.NET framework 4.6](https://www.microsoft.com/download/details.aspx?id=48137).
2. [Download SetupDiag](https://go.microsoft.com/fwlink/?linkid=870142).
3. If your web browser asks what to do with the file, choose **Save**. By default, the file will be saved to your **Downloads** folder. You can also save it to a different location if desired by using **Save As**.
-4. When SetupDiag has finished downloading, open the folder where you downloaded the file. By default, this is your **Downloads** folder, which is displayed in File Explorer under **Quick access** in the left navigation pane.
+4. When SetupDiag has finished downloading, open the folder where you downloaded the file. By default, this folder is the **Downloads** folder, which is displayed in File Explorer under **Quick access** in the left navigation pane.
5. Double-click the **SetupDiag** file to run it. Click **Yes** if you are asked to approve running the program.
- Double-clicking the file to run it will automatically close the command window when SetupDiag has completed its analysis. If you wish to keep this window open instead, and review the messages that you see, run the program by typing **SetupDiag** at the command prompt instead of double-clicking it. You will need to change directories to the location of SetupDiag to run it this way.
-6. A command window will open while SetupDiag diagnoses your computer. Wait for this to finish.
+6. A command window will open while SetupDiag diagnoses your computer. Wait for this process to finish.
7. When SetupDiag finishes, two files will be created in the same folder where you double-clicked SetupDiag. One is a configuration file, the other is a log file.
8. Use Notepad to open the log file: **SetupDiagResults.log**.
-9. Review the information that is displayed. If a rule was matched, this can tell you why the computer failed to upgrade, and potentially how to fix the problem. See the [Text log sample](#text-log-sample) below.
+9. Review the information that is displayed. If a rule was matched, this information can tell you why the computer failed to upgrade, and potentially how to fix the problem. See the [Text log sample](#text-log-sample) below.
For instructions on how to run the tool in offline mode and with more advanced options, see the [Parameters](#parameters) and [Examples](#examples) sections below.
@@ -85,19 +88,19 @@ The [Release notes](#release-notes) section at the bottom of this topic has info
| Parameter | Description |
| --- | --- |
| /? | - Displays interactive help
|
-| /Output:\ | - This optional parameter enables you to specify the output file for results. This is where you will find what SetupDiag was able to determine. Only text format output is supported. UNC paths will work, provided the context under which SetupDiag runs has access to the UNC path. If the path has a space in it, you must enclose the entire path in double quotes (see the example section below).
- Default: If not specified, SetupDiag will create the file **SetupDiagResults.log** in the same directory where SetupDiag.exe is run.
|
+| /Output:\ | - This optional parameter enables you to specify the output file for results. This file is where you will find what SetupDiag was able to determine. Only text format output is supported. UNC paths will work, provided the context under which SetupDiag runs has access to the UNC path. If the path has a space in it, you must enclose the entire path in double quotes (see the example section below).
- Default: If not specified, SetupDiag will create the file **SetupDiagResults.log** in the same directory where SetupDiag.exe is run.
|
| /LogsPath:\ | - This optional parameter tells SetupDiag.exe where to find the log files for an offline analysis. These log files can be in a flat folder format, or containing multiple subdirectories. SetupDiag will recursively search all child directories.
|
| /ZipLogs:\ | - This optional parameter tells SetupDiag.exe to create a zip file containing the results and all the log files it parsed. The zip file is created in the same directory where SetupDiag.exe is run.
- Default: If not specified, a value of 'true' is used.
|
| /Format:\ | - This optional parameter can be used to output log files in xml or JSON format. If this parameter is not specified, text format is used by default.
|
| /Scenario:\[Recovery\] | - This optional parameter instructs SetupDiag.exe to look for and process reset and recovery logs and ignore setup/upgrade logs.
|
-| /Verbose | - This optional parameter will output much more data to a log file. By default, SetupDiag will only produce a log file entry for serious errors. Using **/Verbose** will cause SetupDiag to always produce an additional log file with debugging details. These details can be useful when reporting a problem with SetupDiag.
|
+| /Verbose | - This optional parameter will output much more data to a log file. By default, SetupDiag will only produce a log file entry for serious errors. Using **/Verbose** will cause SetupDiag to always produce another log file with debugging details. These details can be useful when reporting a problem with SetupDiag.
|
| /NoTel | - This optional parameter tells SetupDiag.exe not to send diagnostic telemetry to Microsoft.
|
| /AddReg | - This optional parameter instructs SetupDiag.exe to add failure information to the registry in offline mode. By default, SetupDiag will add failure information to the registry in online mode only. Registry data is added to the following location on the system where SetupDiag is run: **HKLM\SYSTEM\Setup\MoSetup\Volatile\SetupDiag**.
|
| /RegPath | - This optional parameter instructs SetupDiag.exe to add failure information to the registry using the specified path. If this parameter is not specified the default path is **HKLM\SYSTEM\Setup\MoSetup\Volatile\SetupDiag**.
|
Note: The **/Mode** parameter is deprecated in version 1.4.0.0 of SetupDiag.
-- In previous versions, this command was used with the LogsPath parameter to specify that SetupDiag should run in an offline manner to analyze a set of log files that were captured from a different computer. In version 1.4.0.0 when you specify /LogsPath then SetupDiag will automatically run in offline mode, therefore the /Mode parameter is not needed.
+- In previous versions, this command was used with the LogsPath parameter to specify that SetupDiag should run in an offline manner to analyze a set of log files that were captured from a different computer. In version 1.4.0.0, when you specify /LogsPath then SetupDiag will automatically run in offline mode, therefore the /Mode parameter is not needed.
### Examples:
@@ -107,7 +110,7 @@ In the following example, SetupDiag is run with default parameters (online mode,
SetupDiag.exe
```
-In the following example, SetupDiag is run in online mode (this is the default). It will know where to look for logs on the current (failing) system, so there is no need to gather logs ahead of time. A custom location for results is specified.
+In the following example, SetupDiag is run in online mode (this mode is the default). It will know where to look for logs on the current (failing) system, so there is no need to gather logs ahead of time. A custom location for results is specified.
```
SetupDiag.exe /Output:C:\SetupDiag\Results.log
@@ -147,15 +150,15 @@ SetupDiag.exe /Scenario:Recovery /Format:xml
\Windows\Panther
\Windows\Panther\NewOS
-If you copy the parent folder and all sub-folders, SetupDiag will automatically search for log files in all subdirectories.
+If you copy the parent folder and all subfolders, SetupDiag will automatically search for log files in all subdirectories.
## Setup bug check analysis
When Microsoft Windows encounters a condition that compromises safe system operation, the system halts. This condition is called a bug check. It is also commonly referred to as a system crash, a kernel error, a Stop error, or BSOD. Typically a hardware device, hardware driver, or related software causes this error.
-If crash dumps [are enabled](/windows-hardware/drivers/debugger/enabling-a-kernel-mode-dump-file) on the system, a crash dump file is created. If the bug check occurs during an upgrade, Windows Setup will extract a minidump (setupmem.dmp) file. SetupDiag can also debug these setup related minidumps.
+If crash dumps [are enabled](/windows-hardware/drivers/debugger/enabling-a-kernel-mode-dump-file) on the system, a crash dump file is created. If the bug check occurs during an upgrade, Windows Setup will extract a minidump (setupmem.dmp) file. SetupDiag can also debug these setup-related minidumps.
-To debug a setup related bug check, you must:
+To debug a setup-related bug check, you must:
- Specify the **/LogsPath** parameter. You cannot debug memory dumps in online mode.
- Gather the setup memory dump file (setupmem.dmp) from the failing system.
- Setupmem.dmp will be created in either **%SystemDrive%\$Windows.~bt\Sources\Rollback**, or in **%WinDir%\Panther\NewOS\Rollback** depending on when the bug check occurs.
@@ -174,7 +177,7 @@ SetupDiag.exe /Output:C:\SetupDiag\Dumpdebug.log /LogsPath:D:\Dump
## Sample output
-The following is an example where SetupDiag is run in offline mode.
+The following command is an example where SetupDiag is run in offline mode.
```
D:\SetupDiag>SetupDiag.exe /output:c:\setupdiag\result.xml /logspath:D:\Tests\Logs\f55be736-beed-4b9b-aedf-c133536c946e /format:xml
@@ -219,7 +222,7 @@ Each rule name and its associated unique rule identifier are listed with a descr
1. CompatScanOnly - FFDAFD37-DB75-498A-A893-472D49A1311D
- This rule indicates that setup.exe was called with a specific command line parameter that indicated setup was to do a compat scan only, not an upgrade.
2. BitLockerHardblock - C30152E2-938E-44B8-915B-D1181BA635AE
- - This is a block when the target OS does not support BitLocker, yet the host OS has BitLocker enabled.
+ - This is an upgrade block when the target OS does not support BitLocker, yet the host OS has BitLocker enabled.
3. VHDHardblock - D9ED1B82-4ED8-4DFD-8EC0-BE69048978CC
- This block happens when the host OS is booted to a VHD image. Upgrade is not supported when the host OS is booted from a VHD image.
4. PortableWorkspaceHardblock - 5B0D3AB4-212A-4CE4-BDB9-37CA404BB280
@@ -233,11 +236,11 @@ Each rule name and its associated unique rule identifier are listed with a descr
8. CompatBlockedApplicationAutoUninstall – BEBA5BC6-6150-413E-8ACE-5E1EC8D34DD5
- This rule indicates there is an application that needs to be uninstalled before setup can continue.
9. CompatBlockedApplicationDismissable - EA52620B-E6A0-4BBC-882E-0686605736D9
- - When running setup in /quiet mode, there are dismissible application messages that turn into blocks unless the command line also specifies “/compat ignorewarning”. This rule indicates setup was executed in /quiet mode but there is an application dismissible block message that have prevented setup from continuing.
+ - When running setup in /quiet mode, there are dismissible application messages that turn into blocks unless the command line also specifies “/compat ignorewarning”. This rule indicates setup was executed in /quiet mode but there is an application dismissible block message that has prevented setup from continuing.
10. CompatBlockedApplicationManualUninstall - 9E912E5F-25A5-4FC0-BEC1-CA0EA5432FF4
- This rule indicates that an application without an Add/Remove Programs entry, is present on the system and blocking setup from continuing. This typically requires manual removal of the files associated with this application to continue.
11. HardblockDeviceOrDriver - ED3AEFA1-F3E2-4F33-8A21-184ADF215B1B
- - This indicates a device driver that is loaded on the host OS is not compatible with the newer OS version and needs to be removed prior to the upgrade.
+ - This error indicates a device driver that is loaded on the host OS is not compatible with the newer OS version and needs to be removed prior to the upgrade.
12. HardblockMismatchedLanguage - 60BA8449-CF23-4D92-A108-D6FCEFB95B45
- This rule indicates the host OS and the target OS language editions do not match.
13. HardblockFlightSigning - 598F2802-3E7F-4697-BD18-7A6371C8B2F8
@@ -336,10 +339,17 @@ Each rule name and its associated unique rule identifier are listed with a descr
- Detects failures in down-level phase before setup platform is invoked.
60. FindSPFatalError - A4028172-1B09-48F8-AD3B-86CDD7D55852
- Captures failure information when setup platform encounters a fatal error.
-
+61. UserProfileSuffixMismatch - B4BBCCCE-F99D-43EB-9090-078213397FD8
+ - Detects when a file or other object causes the migration or creation of a user profile to fail during the update.
## Release notes
+05/06/2021 - SetupDiag v1.6.1.0 is released with 61 rules, as a standalone tool available in the Download Center.
+- This version of SetupDiag is included with Windows 10, version 21H1.
+- A new rule is added: UserProfileSuffixMismatch.
+- All outputs to the command line are now invariant culture for purposes of time/date format
+- Fixed an issue with registry output in which the "no match found" result caused a corrupted REG_SZ value.
+
08/08/2019 - SetupDiag v1.6.0.42 is released with 60 rules, as a standalone tool available from the Download Center.
- Log detection performance is improved. What used to take up to a minute should take around 10 seconds or less.
- Added Setup Operation and Setup Phase information to both the results log and the registry information.
@@ -356,7 +366,7 @@ Each rule name and its associated unique rule identifier are listed with a descr
06/19/2019 - SetupDiag v1.5.0.0 is released with 60 rules, as a standalone tool available from the Download Center.
- All date and time outputs are updated to localized format per user request.
- Added setup Operation and Phase information to /verbose log.
-- Added last Setup Operation and last Setup Phase information to most rules where it make sense (see new output below).
+- Added last Setup Operation and last Setup Phase information to most rules where it makes sense (see new output below).
- Performance improvement in searching setupact.logs to determine correct log to parse.
- Added SetupDiag version number to text report (xml and json always had it).
- Added "no match" reports for xml and json per user request.
@@ -370,7 +380,7 @@ Each rule name and its associated unique rule identifier are listed with a descr
- For an example, see [Sample registry key](#sample-registry-key).
05/17/2019 - SetupDiag v1.4.1.0 is released with 53 rules, as a standalone tool available from the Download Center.
-- This release dds the ability to find and diagnose reset and recovery failures (Push Button Reset).
+- This release dds the ability to find and diagnose reset and recovery failures (Push-Button Reset).
12/18/2018 - SetupDiag v1.4.0.0 is released with 53 rules, as a standalone tool available from the Download Center.
- This release includes major improvements in rule processing performance: ~3x faster rule processing performance!
diff --git a/windows/deployment/upgrade/troubleshoot-upgrade-errors.md b/windows/deployment/upgrade/troubleshoot-upgrade-errors.md
index 9c00cb2116..842e478dcf 100644
--- a/windows/deployment/upgrade/troubleshoot-upgrade-errors.md
+++ b/windows/deployment/upgrade/troubleshoot-upgrade-errors.md
@@ -91,7 +91,7 @@ WIM = Windows image (Microsoft)
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-/ifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
diff --git a/windows/deployment/upgrade/upgrade-error-codes.md b/windows/deployment/upgrade/upgrade-error-codes.md
index dfc535cd63..b5a1b6ea61 100644
--- a/windows/deployment/upgrade/upgrade-error-codes.md
+++ b/windows/deployment/upgrade/upgrade-error-codes.md
@@ -154,7 +154,7 @@ For example: An extend code of **0x4000D**, represents a problem during phase 4
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-/ifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
diff --git a/windows/deployment/upgrade/windows-error-reporting.md b/windows/deployment/upgrade/windows-error-reporting.md
index b032bc97ff..08c4982f9c 100644
--- a/windows/deployment/upgrade/windows-error-reporting.md
+++ b/windows/deployment/upgrade/windows-error-reporting.md
@@ -67,7 +67,7 @@ The event will also contain links to log files that can be used to perform a det
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.md)
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-10-specifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
diff --git a/windows/deployment/usmt/usmt-common-issues.md b/windows/deployment/usmt/usmt-common-issues.md
index 73a37999d2..3b12d21728 100644
--- a/windows/deployment/usmt/usmt-common-issues.md
+++ b/windows/deployment/usmt/usmt-common-issues.md
@@ -325,7 +325,7 @@ You should also reboot the machine.
[User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-[Frequently Asked Questions](usmt-faq.md)
+[Frequently Asked Questions](usmt-faq.yml)
[Return Codes](usmt-return-codes.md)
diff --git a/windows/deployment/usmt/usmt-customize-xml-files.md b/windows/deployment/usmt/usmt-customize-xml-files.md
index 37708b7766..eaaadb905b 100644
--- a/windows/deployment/usmt/usmt-customize-xml-files.md
+++ b/windows/deployment/usmt/usmt-customize-xml-files.md
@@ -120,7 +120,7 @@ To exclude a component from the Config.xml file, set the **migrate** value to **
- For more information about each .xml element, see the [XML Elements Library](usmt-xml-elements-library.md) topic.
-- For answers to common questions, see ".xml files" in the [Frequently Asked Questions](usmt-faq.md) topic.
+- For answers to common questions, see ".xml files" in the [Frequently Asked Questions](usmt-faq.yml) topic.
## Related topics
diff --git a/windows/deployment/usmt/usmt-faq.md b/windows/deployment/usmt/usmt-faq.md
deleted file mode 100644
index 97be09803c..0000000000
--- a/windows/deployment/usmt/usmt-faq.md
+++ /dev/null
@@ -1,138 +0,0 @@
----
-title: Frequently Asked Questions (Windows 10)
-description: Learn about frequently asked questions and recommended solutions for migrations using User State Migration Tool (USMT) 10.0.
-ms.assetid: 813c13a7-6818-4e6e-9284-7ee49493241b
-ms.reviewer:
-manager: laurawi
-ms.author: greglin
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-audience: itpro
-author: greg-lindsay
-ms.date: 04/19/2017
-ms.topic: article
----
-
-# Frequently Asked Questions
-
-
-The following sections provide frequently asked questions and recommended solutions for migrations using User State Migration Tool (USMT) 10.0.
-
-## General
-
-
-### How much space is needed on the destination computer?
-
-The destination computer needs enough available space for the following:
-
-- Operating system
-
-- Applications
-
-- Uncompressed store
-
-### Can I store the files and settings directly on the destination computer or do I need a server?
-
-You do not need to save the files to a server. If you are moving the user state to a new computer, you can create the store on a shared folder, on media that you can remove, such as a USB flash drive (UFD), or you can store it directly on the destination computer, as in the following steps:
-
-1. Create and share the directory C:\\store on the destination computer.
-
-2. Run the ScanState tool on the source computer and save the files and settings to \\\\*DestinationComputerName*\\store
-
-3. Run the LoadState tool on the destination computer and specify C:\\store as the store location.
-
-### Can I migrate data between operating systems with different languages?
-
-No. USMT does not support migrating data between operating systems with different languages; the source computer's operating-system language must match the destination computer's operating-system language.
-
-### Can I change the location of the temporary directory on the destination computer?
-
-Yes. The environment variable USMT\_WORKING\_DIR can be changed to an alternative temporary directory. There are some offline migration scenarios where this is necessary, for example, when the USMT binaries are located on read-only Windows Preinstallation Environment (WinPE) boot media.
-
-### How do I install USMT?
-
-Because USMT is included in Windows Assessment and Deployment Kit (Windows ADK), you need to install the Windows ADK package on at least one computer in your environment. However, the USMT binaries are designed to be deployed using xcopy. This means that they are installed on a computer simply by recursively copying the USMT directory from the computer containing the Windows ADK to each client computer.
-
-### How do I uninstall USMT?
-
-If you have installed the Windows ADK on the computer, uninstalling Windows ADK will uninstall USMT. For client computers that do not have the Windows ADK installed, you can simply delete the USMT directory to uninstall USMT.
-
-## Files and Settings
-
-
-### How can I exclude a folder or a certain type of file from the migration?
-
-You can use the **<unconditionalExclude>** element to globally exclude data from the migration. For example, you can use this element to exclude all MP3 files on the computer or to exclude all files from C:\\UserData. This element excludes objects regardless of any other <include> rules that are in the .xml files. For an example, see <unconditionalExclude> in the [Exclude Files and Settings](usmt-exclude-files-and-settings.md) topic. For the syntax of this element, see [XML Elements Library](usmt-xml-elements-library.md).
-
-### What happens to files that were located on a drive that does not exist on the destination computer?
-
-USMT migrates the files to the %SystemDrive% while maintaining the correct folder hierarchy. For example, if E:\\data\\File.pst is on the source computer, but the destination computer does not have an E:\\ drive, the file will be migrated to C:\\data\\File.pst, if C:\\ is the system drive. This holds true even when <locationModify> rules attempt to move data to a drive that does not exist on the destination computer.
-
-## USMT .xml Files
-
-
-### Where can I get examples of USMT .xml files?
-
-The following topics include examples of USMT .xml files:
-
-- [Exclude Files and Settings](usmt-exclude-files-and-settings.md)
-
-- [Reroute Files and Settings](usmt-reroute-files-and-settings.md)
-
-- [Include Files and Settings](usmt-include-files-and-settings.md)
-
-- [Custom XML Examples](usmt-custom-xml-examples.md)
-
-### Can I use custom .xml files that were written for USMT 5.0?
-
-Yes. You can use custom .xml files that were written for USMT 5.0 with USMT for Windows 10. However, in order to use new USMT functionality, you must revisit your custom USMT files and refresh them to include the new command-line options and XML elements.
-
-### How can I validate the .xml files?
-
-You can use the USMT XML Schema (MigXML.xsd) to write and validate migration .xml files.
-
-### Why must I list the .xml files with both the ScanState and LoadState commands?
-
-The .xml files are not copied to the store as in previous versions of USMT. Because the ScanState and LoadState tools need the .xml files to control the migration, you must specify the same set of .xml files for the **ScanState** and **LoadState** commands. If you used a particular set of mig\*.xml files in the ScanState tool, either called through the "/auto" option, or individually through the "/i" option, then you should use same option to call the exact same mig\*.xml files in the LoadState tool. However, you do not have to specify the Config.xml file, unless you want to exclude some of the files and settings that you migrated to the store. For example, you might want to migrate the My Documents folder to the store, but not to the destination computer. To do this, modify the Config.xml file and specify the updated file with the **LoadState** command. **LoadState** will migrate only the files and settings that you want to migrate.
-
-If you exclude an .xml file from the **LoadState** command, then all of the data that is in the store that was migrated with the missing .xml files will be migrated. However, the migration rules that were specified for the **ScanState** command will not apply. For example, if you exclude a MigApp.xml file that has a rerouting rule such as `MigsysHelperFunction.RelativeMove("c:\data", "%CSIDL_PERSONAL%")`, USMT will not reroute the files. Instead, it will migrate them to C:\\data.
-
-### Which files can I modify and specify on the command line?
-
-You can specify the MigUser.xml and MigApp.xml files on the command line. You can modify each of these files. The migration of operating system settings is controlled by the manifests, which you cannot modify. If you want to exclude certain operating-system settings or any other components, create and modify the Config.xml file.
-
-### What happens if I do not specify the .xml files on the command line?
-
-- **ScanState**
-
- If you do not specify any files with the **ScanState** command, all user accounts and default operating system components are migrated.
-
-- **LoadState**
-
- If you do not specify any files with the **LoadState** command, all data that is in the store is migrated. However, any target-specific migration rules that were specified in .xml files with the **ScanState** command will not apply. For example, if you exclude a MigApp.xml file that has a rerouting rule such as `MigsysHelperFunction.RelativeMove("c:\data", "%CSIDL_PERSONAL%")`, USMT will not reroute the files. Instead, it will migrate them to C:\\data.
-
-## Conflicts and Precedence
-
-
-### What happens when there are conflicting XML rules or conflicting objects on the destination computer?
-
-For more information, see [Conflicts and Precedence](usmt-conflicts-and-precedence.md).
-
-## Related topics
-
-
-[User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-
-[Extract Files from a Compressed USMT Migration Store](usmt-extract-files-from-a-compressed-migration-store.md)
-
-[Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md)
-
-
-
-
-
-
-
-
-
diff --git a/windows/deployment/usmt/usmt-faq.yml b/windows/deployment/usmt/usmt-faq.yml
new file mode 100644
index 0000000000..00d3b1ff23
--- /dev/null
+++ b/windows/deployment/usmt/usmt-faq.yml
@@ -0,0 +1,143 @@
+### YamlMime:FAQ
+metadata:
+ title: 'Frequently Asked Questions (Windows 10)'
+ description: 'Learn about frequently asked questions and recommended solutions for migrations using User State Migration Tool (USMT) 10.0.'
+ ms.assetid: 813c13a7-6818-4e6e-9284-7ee49493241b
+ ms.reviewer:
+ manager: laurawi
+ ms.author: greglin
+ ms.prod: w10
+ ms.mktglfcycl: deploy
+ ms.sitesec: library
+ audience: itpro
+ author: greg-lindsay
+ ms.date: 04/19/2017
+ ms.topic: article
+
+title: Frequently Asked Questions
+summary: |
+ The following sections provide frequently asked questions and recommended solutions for migrations using User State Migration Tool (USMT) 10.0.
+
+
+sections:
+ - name: General
+ questions:
+ - question: |
+ How much space is needed on the destination computer?
+ answer: |
+ The destination computer needs enough available space for the following:
+
+ - Operating system
+
+ - Applications
+
+ - Uncompressed store
+
+ - question: |
+ Can I store the files and settings directly on the destination computer or do I need a server?
+ answer: |
+ You do not need to save the files to a server. If you are moving the user state to a new computer, you can create the store on a shared folder, on media that you can remove, such as a USB flash drive (UFD), or you can store it directly on the destination computer, as in the following steps:
+
+ 1. Create and share the directory C:\\store on the destination computer.
+
+ 2. Run the ScanState tool on the source computer and save the files and settings to \\\\*DestinationComputerName*\\store
+
+ 3. Run the LoadState tool on the destination computer and specify C:\\store as the store location.
+
+ - question: |
+ Can I migrate data between operating systems with different languages?
+ answer: |
+ No. USMT does not support migrating data between operating systems with different languages; the source computer's operating-system language must match the destination computer's operating-system language.
+
+ - question: |
+ Can I change the location of the temporary directory on the destination computer?
+ answer: |
+ Yes. The environment variable USMT\_WORKING\_DIR can be changed to an alternative temporary directory. There are some offline migration scenarios where this is necessary, for example, when the USMT binaries are located on read-only Windows Preinstallation Environment (WinPE) boot media.
+
+ - question: |
+ How do I install USMT?
+ answer: |
+ Because USMT is included in Windows Assessment and Deployment Kit (Windows ADK), you need to install the Windows ADK package on at least one computer in your environment. However, the USMT binaries are designed to be deployed using xcopy. This means that they are installed on a computer simply by recursively copying the USMT directory from the computer containing the Windows ADK to each client computer.
+
+ - question: |
+ How do I uninstall USMT?
+ answer: |
+ If you have installed the Windows ADK on the computer, uninstalling Windows ADK will uninstall USMT. For client computers that do not have the Windows ADK installed, you can simply delete the USMT directory to uninstall USMT.
+
+ - name: Files and Settings
+ questions:
+ - question: |
+ How can I exclude a folder or a certain type of file from the migration?
+ answer: |
+ You can use the **<unconditionalExclude>** element to globally exclude data from the migration. For example, you can use this element to exclude all MP3 files on the computer or to exclude all files from C:\\UserData. This element excludes objects regardless of any other <include> rules that are in the .xml files. For an example, see <unconditionalExclude> in the [Exclude Files and Settings](usmt-exclude-files-and-settings.md) topic. For the syntax of this element, see [XML Elements Library](usmt-xml-elements-library.md).
+
+ - question: |
+ What happens to files that were located on a drive that does not exist on the destination computer?
+ answer: |
+ USMT migrates the files to the %SystemDrive% while maintaining the correct folder hierarchy. For example, if E:\\data\\File.pst is on the source computer, but the destination computer does not have an E:\\ drive, the file will be migrated to C:\\data\\File.pst, if C:\\ is the system drive. This holds true even when <locationModify> rules attempt to move data to a drive that does not exist on the destination computer.
+
+ - name: USMT .xml Files
+ questions:
+ - question: |
+ Where can I get examples of USMT .xml files?
+ answer: |
+ The following topics include examples of USMT .xml files:
+
+ - [Exclude Files and Settings](usmt-exclude-files-and-settings.md)
+
+ - [Reroute Files and Settings](usmt-reroute-files-and-settings.md)
+
+ - [Include Files and Settings](usmt-include-files-and-settings.md)
+
+ - [Custom XML Examples](usmt-custom-xml-examples.md)
+
+ - question: |
+ Can I use custom .xml files that were written for USMT 5.0?
+ answer: |
+ Yes. You can use custom .xml files that were written for USMT 5.0 with USMT for Windows 10. However, in order to use new USMT functionality, you must revisit your custom USMT files and refresh them to include the new command-line options and XML elements.
+
+ - question: |
+ How can I validate the .xml files?
+ answer: |
+ You can use the USMT XML Schema (MigXML.xsd) to write and validate migration .xml files.
+
+ - question: |
+ Why must I list the .xml files with both the ScanState and LoadState commands?
+ answer: |
+ The .xml files are not copied to the store as in previous versions of USMT. Because the ScanState and LoadState tools need the .xml files to control the migration, you must specify the same set of .xml files for the **ScanState** and **LoadState** commands. If you used a particular set of mig\*.xml files in the ScanState tool, either called through the "/auto" option, or individually through the "/i" option, then you should use same option to call the exact same mig\*.xml files in the LoadState tool. However, you do not have to specify the Config.xml file, unless you want to exclude some of the files and settings that you migrated to the store. For example, you might want to migrate the My Documents folder to the store, but not to the destination computer. To do this, modify the Config.xml file and specify the updated file with the **LoadState** command. **LoadState** will migrate only the files and settings that you want to migrate.
+
+ If you exclude an .xml file from the **LoadState** command, then all of the data that is in the store that was migrated with the missing .xml files will be migrated. However, the migration rules that were specified for the **ScanState** command will not apply. For example, if you exclude a MigApp.xml file that has a rerouting rule such as `MigsysHelperFunction.RelativeMove("c:\data", "%CSIDL_PERSONAL%")`, USMT will not reroute the files. Instead, it will migrate them to C:\\data.
+
+ - question: |
+ Which files can I modify and specify on the command line?
+ answer: |
+ You can specify the MigUser.xml and MigApp.xml files on the command line. You can modify each of these files. The migration of operating system settings is controlled by the manifests, which you cannot modify. If you want to exclude certain operating-system settings or any other components, create and modify the Config.xml file.
+
+ - question: |
+ What happens if I do not specify the .xml files on the command line?
+ answer: |
+ - **ScanState**
+
+ If you do not specify any files with the **ScanState** command, all user accounts and default operating system components are migrated.
+
+ - **LoadState**
+
+ If you do not specify any files with the **LoadState** command, all data that is in the store is migrated. However, any target-specific migration rules that were specified in .xml files with the **ScanState** command will not apply. For example, if you exclude a MigApp.xml file that has a rerouting rule such as `MigsysHelperFunction.RelativeMove("c:\data", "%CSIDL_PERSONAL%")`, USMT will not reroute the files. Instead, it will migrate them to C:\\data.
+
+ - name: Conflicts and Precedence
+ questions:
+ - question: |
+ What happens when there are conflicting XML rules or conflicting objects on the destination computer?
+ answer: |
+ For more information, see [Conflicts and Precedence](usmt-conflicts-and-precedence.md).
+
+
+additionalContent: |
+
+ ## Related topics
+
+ [User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
+
+ [Extract Files from a Compressed USMT Migration Store](usmt-extract-files-from-a-compressed-migration-store.md)
+
+ [Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md)
\ No newline at end of file
diff --git a/windows/deployment/usmt/usmt-loadstate-syntax.md b/windows/deployment/usmt/usmt-loadstate-syntax.md
index f421c5d9ee..77e214976c 100644
--- a/windows/deployment/usmt/usmt-loadstate-syntax.md
+++ b/windows/deployment/usmt/usmt-loadstate-syntax.md
@@ -150,7 +150,7 @@ USMT provides the following options to specify what files you want to migrate.
/i:[Path]FileName |
(include)
Specifies an .xml file that contains rules that define what state to migrate. You can specify this option multiple times to include all of your .xml files (MigApp.xml, MigSys.xml, MigDocs.xml and any custom .xml files that you create). Path can be either a relative or full path. If you do not specify the Path variable, then FileName must be located in the current directory.
-For more information about which files to specify, see the "XML files" section of the Frequently Asked Questions topic. |
+For more information about which files to specify, see the "XML files" section of the Frequently Asked Questions topic.
/config:[Path]FileName |
diff --git a/windows/deployment/usmt/usmt-scanstate-syntax.md b/windows/deployment/usmt/usmt-scanstate-syntax.md
index 95c2a5e5ba..eaaf29d214 100644
--- a/windows/deployment/usmt/usmt-scanstate-syntax.md
+++ b/windows/deployment/usmt/usmt-scanstate-syntax.md
@@ -116,7 +116,7 @@ To create an encrypted store using the Config.xml file and the default migration
/encrypt [{/key:<KeyString> | /keyfile:<file>]} |
-Encrypts the store with the specified key. Encryption is disabled by default. With this option, you will need to specify the encryption key in one of the following ways:
+ | Encrypts the store with the specified key. Encryption is disabled by default. With this option, you will need to specify the encryption key-in one of the following ways:
/key:KeyString specifies the encryption key. If there is a space in KeyString, you will need to surround KeyString with quotation marks. /keyfile:FilePathAndName specifies a text (.txt) file that contains the encryption key.
/i:[Path]FileName |
(include)
-Specifies an .xml file that contains rules that define what user, application or system state to migrate. You can specify this option multiple times to include all of your .xml files (MigApp.xml, MigDocs.xml, and any custom .xml files that you create). Path can be either a relative or full path. If you do not specify the Path variable, then FileName must be located in the current directory. For more information about which files to specify, see the "XML Files" section of the Frequently Asked Questions topic. |
+Specifies an .xml file that contains rules that define what user, application, or system state to migrate. You can specify this option multiple times to include all of your .xml files (MigApp.xml, MigDocs.xml, and any custom .xml files that you create). Path can be either a relative or full path. If you do not specify the Path variable, then FileName must be located in the current directory. For more information about which files to specify, see the "XML Files" section of the Frequently Asked Questions topic.
/genconfig:[Path]FileName |
(Generate Config.xml)
-Generates the optional Config.xml file, but does not create a migration store. To ensure that this file contains every component, application and setting that can be migrated, you should create this file on a source computer that contains all the components, applications and settings that will be present on the destination computers. In addition, you should specify the other migration .xml files, using the /i option, when you specify this option.
+Generates the optional Config.xml file, but does not create a migration store. To ensure that this file contains every component, application and setting that can be migrated, you should create this file on a source computer that contains all the components, applications, and settings that will be present on the destination computers. In addition, you should specify the other migration .xml files, using the /i option, when you specify this option.
After you create this file, you will need to make use of it with the ScanState command using the /config option.
The only options that you can specify with this option are the /i, /v, and /l options. You cannot specify StorePath, because the /genconfig option does not create a store. Path can be either a relative or full path. If you do not specify the Path variable, then FileName will be created in the current directory.
Examples:
@@ -246,7 +246,7 @@ USMT provides the following options to specify what files you want to migrate.
|
/auto:path to script files |
-This option enables you to specify the location of the default .xml files and then begin the migration. If no path is specified, USMT will reference the directory where the USMT binaries are located. The /auto option has the same effect as using the following options: /i:MigDocs.xml /i:MigApp.xml /v:5. |
+This option enables you to specify the location of the default .xml files and then begin the migration. If no path is specified, USMT will reference the directory where the USMT binaries are located. The /auto option has the same effect as using the following options: /i: MigDocs.xml /i:MigApp.xml /v:5. |
/genmigxml:path to a file |
@@ -254,7 +254,7 @@ USMT provides the following options to specify what files you want to migrate.
/targetwindows8 |
-Optimizes Scanstate.exe when using USMT 10.0 to migrate a user state to Windows 8 or Windows 8.1 instead of Windows 10. You should use this command line option in the following scenarios:
+ | Optimizes Scanstate.exe when using USMT 10.0 to migrate a user state to Windows 8 or Windows 8.1 instead of Windows 10. You should use this command-line option in the following scenarios:
To create a Config.xml file by using the /genconfig option. Using the /targetwindows8 option optimizes the Config.xml file so that it only contains components that relate to Windows 8 or Windows 8.1. To create a migration store. Using the /targetwindows8 option ensures that the ScanState tool gathers the correct set of operating system settings. Without the /targetwindows8 command-line option, some settings can be lost during the migration. |
/targetwindows7 |
-Optimizes Scanstate.exe when using USMT 10.0 to migrate a user state to Windows 7 instead of Windows 10. You should use this command line option in the following scenarios:
+ | Optimizes Scanstate.exe when using USMT 10.0 to migrate a user state to Windows 7 instead of Windows 10. You should use this command-line option in the following scenarios:
To create a Config.xml file by using the /genconfig option. Using the /targetwindows7 option optimizes the Config.xml file so that it only contains components that relate to Windows 7. To create a migration store. Using the /targetwindows7 option ensures that the ScanState tool gathers the correct set of operating system settings. Without the /targetwindows7 command-line option, some settings can be lost during the migration. /l:[Path]FileName |
Specifies the location and name of the ScanState log.
You cannot store any of the log files in StorePath. Path can be either a relative or full path. If you do not specify the Path variable, then the log will be created in the current directory. You can use the /v option to adjust the amount of output.
-If you run the ScanState or LoadState commands from a shared network resource, you must specify this option or USMT will fail with the following error: "USMT was unable to create the log file(s)". To fix this issue, use the /l:scan.log command. |
+If you run the ScanState or LoadState commands from a shared network resource, you must specify this option or USMT will fail with the following error: "USMT was unable to create the log file(s)". To fix this issue, use the /l: scan.log command. |
/v:<VerbosityLevel> |
@@ -473,7 +473,7 @@ By default, all users are migrated. The only way to specify which users to inclu
/ue:*\* /ui:fabrikam\user2
To migrate all users from the Fabrikam domain, and only the user accounts from other domains that have been active or otherwise modified in the last 30 days, type:
/uel:30 /ui:fabrikam\*
-In this example, a user account from the Contoso domain that was last modified 2 months ago will not be migrated.
+In this example, a user account from the Contoso domain that was last modified two months ago will not be migrated.
For more examples, see the descriptions of the /ue and /ui options in this table.
@@ -484,8 +484,8 @@ By default, all users are migrated. The only way to specify which users to inclu
or
/uel:0 |
(User exclude based on last logon)
-Migrates the users that logged onto the source computer within the specified time period, based on the Last Modified date of the Ntuser.dat file on the source computer. The /uel option acts as an include rule. For example, the /uel:30 option migrates users who logged on, or whose account was modified, within the last 30 days from the date when the ScanState command is run.
-You can specify a number of days or you can specify a date. You cannot use this option with the /all option. USMT retrieves the last logon information from the local computer, so the computer does not need to be connected to the network when you run this option. In addition, if a domain user has logged onto another computer, that logon instance is not considered by USMT.
+Migrates the users that logged on to the source computer within the specified time period, based on the Last Modified date of the Ntuser.dat file on the source computer. The /uel option acts as an include rule. For example, the /uel:30 option migrates users who logged on, or whose account was modified, within the last 30 days from the date when the ScanState command is run.
+You can specify a number of days or you can specify a date. You cannot use this option with the /all option. USMT retrieves the last logon information from the local computer, so the computer does not need to be connected to the network when you run this option. In addition, if a domain user has logged on to another computer, that logon instance is not considered by USMT.
NoteThe /uel option is not valid in offline migrations.
diff --git a/windows/deployment/usmt/usmt-troubleshooting.md b/windows/deployment/usmt/usmt-troubleshooting.md
index 1c629df5ec..1a2fbc4401 100644
--- a/windows/deployment/usmt/usmt-troubleshooting.md
+++ b/windows/deployment/usmt/usmt-troubleshooting.md
@@ -33,7 +33,7 @@ The following table describes topics that address common User State Migration To
| Find troubleshooting solutions for common problems in USMT. |
-Frequently Asked Questions |
+Frequently Asked Questions |
Find answers to questions about how to use USMT. |
diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md
index 3e6aea0068..1179220486 100644
--- a/windows/deployment/windows-10-poc-sc-config-mgr.md
+++ b/windows/deployment/windows-10-poc-sc-config-mgr.md
@@ -854,11 +854,9 @@ Set-VMNetworkAdapter -VMName PC4 -StaticMacAddress 00-15-5D-83-26-FF
6. When a popup dialog box asks if you want to run full discovery, click **Yes**.
7. In the Assets and Compliance workspace, click **Devices** and verify that the computer account names for SRV1 and PC1 are displayed. See the following example (GREGLIN-PC1 is the computer account name of PC1 in this example):
- 
+>If you do not see the computer account for PC1, try clicking the **Refresh** button in the upper right corner of the console.
- >If you do not see the computer account for PC1, try clicking the **Refresh** button in the upper right corner of the console.
-
- The **Client** column indicates that the Configuration Manager client is not currently installed. This procedure will be carried out next.
+The **Client** column indicates that the Configuration Manager client is not currently installed. This procedure will be carried out next.
8. Sign in to PC1 using the contoso\administrator account and type the following at an elevated command prompt to remove any pre-existing client configuration, if it exists. Note: this command requires an elevated command prompt not an elevated Windows PowerShell prompt:
diff --git a/windows/deployment/windows-10-subscription-activation.md b/windows/deployment/windows-10-subscription-activation.md
index 32f6f138c1..6861d74931 100644
--- a/windows/deployment/windows-10-subscription-activation.md
+++ b/windows/deployment/windows-10-subscription-activation.md
@@ -27,7 +27,7 @@ The Subscription Activation feature eliminates the need to manually deploy Windo
## Subscription Activation for Windows 10 Enterprise
-With Windows 10, version 1703 both Windows 10 Enterprise E3 and Windows 10 Enterprise E5 are available as online services via subscription. Deploying [Windows 10 Enterprise](planning/windows-10-enterprise-faq-itpro.md) in your organization can now be accomplished with no keys and no reboots.
+With Windows 10, version 1703 both Windows 10 Enterprise E3 and Windows 10 Enterprise E5 are available as online services via subscription. Deploying [Windows 10 Enterprise](planning/windows-10-enterprise-faq-itpro.yml) in your organization can now be accomplished with no keys and no reboots.
If you are running Windows 10, version 1703 or later:
diff --git a/windows/deployment/windows-autopilot/TOC.md b/windows/deployment/windows-autopilot/TOC.md
deleted file mode 100644
index b2e8164e4c..0000000000
--- a/windows/deployment/windows-autopilot/TOC.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# [Windows Autopilot deployment](index.yml)
-## [Get started](demonstrate-deployment-on-vm.md)
\ No newline at end of file
diff --git a/windows/deployment/windows-autopilot/TOC.yml b/windows/deployment/windows-autopilot/TOC.yml
new file mode 100644
index 0000000000..0881334396
--- /dev/null
+++ b/windows/deployment/windows-autopilot/TOC.yml
@@ -0,0 +1,5 @@
+- name: Windows Autopilot deployment
+ href: index.yml
+ items:
+ - name: Get started
+ href: demonstrate-deployment-on-vm.md
diff --git a/windows/device-security/docfx.json b/windows/device-security/docfx.json
index 40cbd2b6ea..fb05d45e14 100644
--- a/windows/device-security/docfx.json
+++ b/windows/device-security/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/hub/TOC.md b/windows/hub/TOC.md
deleted file mode 100644
index 13fc91f2bb..0000000000
--- a/windows/hub/TOC.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# [Windows 10](index.yml)
-## [What's new](/windows/whats-new)
-## [Release information](/windows/release-health)
-## [Deployment](/windows/deployment)
-## [Configuration](/windows/configuration)
-## [Client management](/windows/client-management)
-## [Application management](/windows/application-management)
-## [Security](/windows/security)
-## [Privacy](/windows/privacy)
-## [Troubleshooting](/windows/client-management/windows-10-support-solutions)
-## [Previous Windows versions](/previous-versions/windows)
\ No newline at end of file
diff --git a/windows/hub/TOC.yml b/windows/hub/TOC.yml
new file mode 100644
index 0000000000..2d99b5fb17
--- /dev/null
+++ b/windows/hub/TOC.yml
@@ -0,0 +1,23 @@
+- name: Windows 10
+ href: index.yml
+ items:
+ - name: What's new
+ href: /windows/whats-new
+ - name: Release information
+ href: /windows/release-health
+ - name: Deployment
+ href: /windows/deployment
+ - name: Configuration
+ href: /windows/configuration
+ - name: Client management
+ href: /windows/client-management
+ - name: Application management
+ href: /windows/application-management
+ - name: Security
+ href: /windows/security
+ - name: Privacy
+ href: /windows/privacy
+ - name: Troubleshooting
+ href: /windows/client-management/windows-10-support-solutions
+ - name: Previous Windows versions
+ href: /previous-versions/windows
diff --git a/windows/keep-secure/docfx.json b/windows/keep-secure/docfx.json
index c7756c160f..d153310b25 100644
--- a/windows/keep-secure/docfx.json
+++ b/windows/keep-secure/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/manage/docfx.json b/windows/manage/docfx.json
index 2e17041b0d..904388daf4 100644
--- a/windows/manage/docfx.json
+++ b/windows/manage/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/plan/docfx.json b/windows/plan/docfx.json
index 78f81bc195..f226ea1fe0 100644
--- a/windows/plan/docfx.json
+++ b/windows/plan/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/privacy/changes-to-windows-diagnostic-data-collection.md b/windows/privacy/changes-to-windows-diagnostic-data-collection.md
index 718909cd4c..692cfa0a09 100644
--- a/windows/privacy/changes-to-windows-diagnostic-data-collection.md
+++ b/windows/privacy/changes-to-windows-diagnostic-data-collection.md
@@ -9,7 +9,7 @@ ms.pagetype: security
ms.localizationpriority: high
audience: ITPro
ms.author: siosulli
-author: DaniHalfin
+author: dansimp
manager: dansimp
ms.collection: M365-security-compliance
ms.topic: article
diff --git a/windows/privacy/data-processor-service-for-windows-enterprise-public-preview-terms.md b/windows/privacy/data-processor-service-for-windows-enterprise-public-preview-terms.md
index 20b56e6e79..170bd2f449 100644
--- a/windows/privacy/data-processor-service-for-windows-enterprise-public-preview-terms.md
+++ b/windows/privacy/data-processor-service-for-windows-enterprise-public-preview-terms.md
@@ -9,7 +9,7 @@ ms.topic: article
f1.keywords:
- NOCSH
ms.author: siosulli
-author: DaniHalfin
+author: dansimp
manager: dansimp
audience: itpro
ms.collection:
diff --git a/windows/privacy/deploy-data-processor-service-windows.md b/windows/privacy/deploy-data-processor-service-windows.md
index dbc0883936..01a6bbec79 100644
--- a/windows/privacy/deploy-data-processor-service-windows.md
+++ b/windows/privacy/deploy-data-processor-service-windows.md
@@ -9,7 +9,7 @@ ms.topic: article
f1.keywords:
- NOCSH
ms.author: siosulli
-author: DaniHalfin
+author: dansimp
manager: dansimp
audience: itpro
ms.collection:
diff --git a/windows/privacy/index.yml b/windows/privacy/index.yml
index da814f7791..ad4c6fefef 100644
--- a/windows/privacy/index.yml
+++ b/windows/privacy/index.yml
@@ -11,8 +11,8 @@ metadata:
ms.product: windows
ms.topic: hub-page # Required
ms.collection: M365-security-compliance
- author: danihalfin
- ms.author: daniha
+ author: dansimp
+ ms.author: dansimp
manager: dansimp
ms.date: 07/21/2020 #Required; mm/dd/yyyy format.
ms.localizationpriority: high
diff --git a/windows/privacy/manage-windows-1809-endpoints.md b/windows/privacy/manage-windows-1809-endpoints.md
index 15d0315e1a..3da8139a20 100644
--- a/windows/privacy/manage-windows-1809-endpoints.md
+++ b/windows/privacy/manage-windows-1809-endpoints.md
@@ -399,7 +399,7 @@ The following endpoint is used to retrieve Skype configuration values. To turn o
## Windows Defender
The following endpoint is used for Windows Defender when Cloud-based Protection is enabled.
-If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-defender), the device will not use Cloud-based Protection. For a detailed list of Microsoft Defender Antivirus cloud service connections, see [Allow connections to the Microsoft Defender Antivirus cloud service](/windows/security/threat-protection/microsoft-defender-antivirus/configure-network-connections-microsoft-defender-antivirus#allow-connections-to-the-microsoft-defender-antivirus-cloud-service).
+If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-defender), the device will not use Cloud-based Protection. For a detailed list of Microsoft Defender Antivirus cloud service connections, see [Allow connections to the Microsoft Defender Antivirus cloud service](/microsoft-365/security/defender-endpoint/configure-network-connections-microsoft-defender-antivirus#allow-connections-to-the-microsoft-defender-antivirus-cloud-service).
| Source process | Protocol | Destination |
|:--------------:|:--------:|:------------|
diff --git a/windows/security/TOC.md b/windows/security/TOC.md
deleted file mode 100644
index 6ac5b43506..0000000000
--- a/windows/security/TOC.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# [Security](index.yml)
-## [Identity and access management](identity-protection/index.md)
-## [Information protection](information-protection/index.md)
-## [Threat protection](threat-protection/index.md)
-
-
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
new file mode 100644
index 0000000000..70e61e303f
--- /dev/null
+++ b/windows/security/TOC.yml
@@ -0,0 +1,9 @@
+- name: Security
+ href: index.yml
+ items:
+ - name: Identity and access management
+ href: identity-protection/index.md
+ - name: Information protection
+ href: information-protection/index.md
+ - name: Threat protection
+ href: threat-protection/index.md
diff --git a/windows/security/identity-protection/TOC.md b/windows/security/identity-protection/TOC.md
deleted file mode 100644
index 16e55efb95..0000000000
--- a/windows/security/identity-protection/TOC.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# [Identity and access management](index.md)
-
-## [Technical support policy for lost or forgotten passwords](password-support-policy.md)
-
-## [Access Control Overview](access-control/access-control.md)
-### [Dynamic Access Control Overview](access-control/dynamic-access-control.md)
-### [Security identifiers](access-control/security-identifiers.md)
-### [Security Principals](access-control/security-principals.md)
-### [Local Accounts](access-control/local-accounts.md)
-### [Active Directory Accounts](access-control/active-directory-accounts.md)
-### [Microsoft Accounts](access-control/microsoft-accounts.md)
-### [Service Accounts](access-control/service-accounts.md)
-### [Active Directory Security Groups](access-control/active-directory-security-groups.md)
-### [Special Identities](access-control/special-identities.md)
-
-### [User Account Control](user-account-control\user-account-control-overview.md)
-#### [How User Account Control works](user-account-control\how-user-account-control-works.md)
-#### [User Account Control security policy settings](user-account-control\user-account-control-security-policy-settings.md)
-#### [User Account Control Group Policy and registry key settings](user-account-control\user-account-control-group-policy-and-registry-key-settings.md)
-
-## [Windows Hello for Business](hello-for-business/index.yml)
-
-## [Protect derived domain credentials with Credential Guard](credential-guard/credential-guard.md)
-### [How Credential Guard works](credential-guard/credential-guard-how-it-works.md)
-### [Credential Guard Requirements](credential-guard/credential-guard-requirements.md)
-### [Manage Credential Guard](credential-guard/credential-guard-manage.md)
-### [Hardware readiness tool](credential-guard/dg-readiness-tool.md)
-### [Credential Guard protection limits](credential-guard/credential-guard-protection-limits.md)
-### [Considerations when using Credential Guard](credential-guard/credential-guard-considerations.md)
-### [Credential Guard: Additional mitigations](credential-guard/additional-mitigations.md)
-### [Credential Guard: Known issues](credential-guard/credential-guard-known-issues.md)
-
-## [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md)
-
-## [Smart Cards](smart-cards/smart-card-windows-smart-card-technical-reference.md)
-### [How Smart Card Sign-in Works in Windows](smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md)
-#### [Smart Card Architecture](smart-cards/smart-card-architecture.md)
-#### [Certificate Requirements and Enumeration](smart-cards/smart-card-certificate-requirements-and-enumeration.md)
-#### [Smart Card and Remote Desktop Services](smart-cards/smart-card-and-remote-desktop-services.md)
-#### [Smart Cards for Windows Service](smart-cards/smart-card-smart-cards-for-windows-service.md)
-#### [Certificate Propagation Service](smart-cards/smart-card-certificate-propagation-service.md)
-#### [Smart Card Removal Policy Service](smart-cards/smart-card-removal-policy-service.md)
-### [Smart Card Tools and Settings](smart-cards/smart-card-tools-and-settings.md)
-#### [Smart Cards Debugging Information](smart-cards/smart-card-debugging-information.md)
-#### [Smart Card Group Policy and Registry Settings](smart-cards/smart-card-group-policy-and-registry-settings.md)
-#### [Smart Card Events](smart-cards/smart-card-events.md)
-
-### [Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-overview.md)
-#### [Understanding and Evaluating Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-understanding-and-evaluating.md)
-##### [Get Started with Virtual Smart Cards: Walkthrough Guide](virtual-smart-cards\virtual-smart-card-get-started.md)
-##### [Use Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-use-virtual-smart-cards.md)
-##### [Deploy Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-deploy-virtual-smart-cards.md)
-##### [Evaluate Virtual Smart Card Security](virtual-smart-cards\virtual-smart-card-evaluate-security.md)
-#### [Tpmvscmgr](virtual-smart-cards\virtual-smart-card-tpmvscmgr.md)
-
-## [Enterprise Certificate Pinning](enterprise-certificate-pinning.md)
-
-## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md)
-
-## [Windows 10 credential theft mitigation guide abstract](windows-credential-theft-mitigation-guide-abstract.md)
-
-## [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md)
-
-## [VPN technical guide](vpn\vpn-guide.md)
-### [VPN connection types](vpn\vpn-connection-type.md)
-### [VPN routing decisions](vpn\vpn-routing.md)
-### [VPN authentication options](vpn\vpn-authentication.md)
-### [VPN and conditional access](vpn\vpn-conditional-access.md)
-### [VPN name resolution](vpn\vpn-name-resolution.md)
-### [VPN auto-triggered profile options](vpn\vpn-auto-trigger-profile.md)
-### [VPN security features](vpn\vpn-security-features.md)
-### [VPN profile options](vpn\vpn-profile-options.md)
-### [How to configure Diffie Hellman protocol over IKEv2 VPN connections](vpn\how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md)
-### [How to use single sign-on (SSO) over VPN and Wi-Fi connections](vpn\how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md)
-### [Optimizing Office 365 traffic with the Windows 10 VPN client](vpn\vpn-office-365-optimization.md)
diff --git a/windows/security/identity-protection/TOC.yml b/windows/security/identity-protection/TOC.yml
new file mode 100644
index 0000000000..6d3b4a3ff6
--- /dev/null
+++ b/windows/security/identity-protection/TOC.yml
@@ -0,0 +1,134 @@
+- name: Identity and access management
+ href: index.md
+ items:
+ - name: Technical support policy for lost or forgotten passwords
+ href: password-support-policy.md
+ - name: Access Control Overview
+ href: access-control/access-control.md
+ items:
+ - name: Dynamic Access Control Overview
+ href: access-control/dynamic-access-control.md
+ - name: Security identifiers
+ href: access-control/security-identifiers.md
+ - name: Security Principals
+ href: access-control/security-principals.md
+ - name: Local Accounts
+ href: access-control/local-accounts.md
+ - name: Active Directory Accounts
+ href: access-control/active-directory-accounts.md
+ - name: Microsoft Accounts
+ href: access-control/microsoft-accounts.md
+ - name: Service Accounts
+ href: access-control/service-accounts.md
+ - name: Active Directory Security Groups
+ href: access-control/active-directory-security-groups.md
+ - name: Special Identities
+ href: access-control/special-identities.md
+ - name: User Account Control
+ href: user-account-control\user-account-control-overview.md
+ items:
+ - name: How User Account Control works
+ href: user-account-control\how-user-account-control-works.md
+ - name: User Account Control security policy settings
+ href: user-account-control\user-account-control-security-policy-settings.md
+ - name: User Account Control Group Policy and registry key settings
+ href: user-account-control\user-account-control-group-policy-and-registry-key-settings.md
+ - name: Windows Hello for Business
+ href: hello-for-business/index.yml
+ - name: Protect derived domain credentials with Credential Guard
+ href: credential-guard/credential-guard.md
+ items:
+ - name: How Credential Guard works
+ href: credential-guard/credential-guard-how-it-works.md
+ - name: Credential Guard Requirements
+ href: credential-guard/credential-guard-requirements.md
+ - name: Manage Credential Guard
+ href: credential-guard/credential-guard-manage.md
+ - name: Hardware readiness tool
+ href: credential-guard/dg-readiness-tool.md
+ - name: Credential Guard protection limits
+ href: credential-guard/credential-guard-protection-limits.md
+ - name: Considerations when using Credential Guard
+ href: credential-guard/credential-guard-considerations.md
+ - name: "Credential Guard: Additional mitigations"
+ href: credential-guard/additional-mitigations.md
+ - name: "Credential Guard: Known issues"
+ href: credential-guard/credential-guard-known-issues.md
+ - name: Protect Remote Desktop credentials with Remote Credential Guard
+ href: remote-credential-guard.md
+ - name: Smart Cards
+ href: smart-cards/smart-card-windows-smart-card-technical-reference.md
+ items:
+ - name: How Smart Card Sign-in Works in Windows
+ href: smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md
+ items:
+ - name: Smart Card Architecture
+ href: smart-cards/smart-card-architecture.md
+ - name: Certificate Requirements and Enumeration
+ href: smart-cards/smart-card-certificate-requirements-and-enumeration.md
+ - name: Smart Card and Remote Desktop Services
+ href: smart-cards/smart-card-and-remote-desktop-services.md
+ - name: Smart Cards for Windows Service
+ href: smart-cards/smart-card-smart-cards-for-windows-service.md
+ - name: Certificate Propagation Service
+ href: smart-cards/smart-card-certificate-propagation-service.md
+ - name: Smart Card Removal Policy Service
+ href: smart-cards/smart-card-removal-policy-service.md
+ - name: Smart Card Tools and Settings
+ href: smart-cards/smart-card-tools-and-settings.md
+ items:
+ - name: Smart Cards Debugging Information
+ href: smart-cards/smart-card-debugging-information.md
+ - name: Smart Card Group Policy and Registry Settings
+ href: smart-cards/smart-card-group-policy-and-registry-settings.md
+ - name: Smart Card Events
+ href: smart-cards/smart-card-events.md
+ - name: Virtual Smart Cards
+ href: virtual-smart-cards\virtual-smart-card-overview.md
+ items:
+ - name: Understanding and Evaluating Virtual Smart Cards
+ href: virtual-smart-cards\virtual-smart-card-understanding-and-evaluating.md
+ items:
+ - name: "Get Started with Virtual Smart Cards: Walkthrough Guide"
+ href: virtual-smart-cards\virtual-smart-card-get-started.md
+ - name: Use Virtual Smart Cards
+ href: virtual-smart-cards\virtual-smart-card-use-virtual-smart-cards.md
+ - name: Deploy Virtual Smart Cards
+ href: virtual-smart-cards\virtual-smart-card-deploy-virtual-smart-cards.md
+ - name: Evaluate Virtual Smart Card Security
+ href: virtual-smart-cards\virtual-smart-card-evaluate-security.md
+ - name: Tpmvscmgr
+ href: virtual-smart-cards\virtual-smart-card-tpmvscmgr.md
+ - name: Enterprise Certificate Pinning
+ href: enterprise-certificate-pinning.md
+ - name: Install digital certificates on Windows 10 Mobile
+ href: installing-digital-certificates-on-windows-10-mobile.md
+ - name: Windows 10 credential theft mitigation guide abstract
+ href: windows-credential-theft-mitigation-guide-abstract.md
+ - name: Configure S/MIME for Windows 10 and Windows 10 Mobile
+ href: configure-s-mime.md
+ - name: VPN technical guide
+ href: vpn\vpn-guide.md
+ items:
+ - name: VPN connection types
+ href: vpn\vpn-connection-type.md
+ - name: VPN routing decisions
+ href: vpn\vpn-routing.md
+ - name: VPN authentication options
+ href: vpn\vpn-authentication.md
+ - name: VPN and conditional access
+ href: vpn\vpn-conditional-access.md
+ - name: VPN name resolution
+ href: vpn\vpn-name-resolution.md
+ - name: VPN auto-triggered profile options
+ href: vpn\vpn-auto-trigger-profile.md
+ - name: VPN security features
+ href: vpn\vpn-security-features.md
+ - name: VPN profile options
+ href: vpn\vpn-profile-options.md
+ - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections
+ href: vpn\how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md
+ - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections
+ href: vpn\how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
+ - name: Optimizing Office 365 traffic with the Windows 10 VPN client
+ href: vpn\vpn-office-365-optimization.md
diff --git a/windows/security/identity-protection/hello-for-business/hello-deployment-guide.md b/windows/security/identity-protection/hello-for-business/hello-deployment-guide.md
index 59b76ac590..1a07013ef3 100644
--- a/windows/security/identity-protection/hello-for-business/hello-deployment-guide.md
+++ b/windows/security/identity-protection/hello-for-business/hello-deployment-guide.md
@@ -37,7 +37,7 @@ This guide assumes that baseline infrastructure exists which meets the requireme
- A well-connected, working network
- Internet access
-- Multi-factor Authentication Server to support MFA during Windows Hello for Business provisioning
+- Multi-factor Authentication is required during Windows Hello for Business provisioning
- Proper name resolution, both internal and external names
- Active Directory and an adequate number of domain controllers per site to support authentication
- Active Directory Certificate Services 2012 or later
@@ -78,4 +78,4 @@ Following are the various deployment guides and models included in this topic:
Windows Hello for Business provisioning begins immediately after the user has signed in, after the user profile is loaded, but before the user receives their desktop. Windows only launches the provisioning experience if all the prerequisite checks pass. You can determine the status of the prerequisite checks by viewing the **User Device Registration** in the **Event Viewer** under **Applications and Services Logs\Microsoft\Windows**.
> [!NOTE]
-> You need to allow access to the URL account.microsoft.com to initiate Windows Hello for Business provisioning. This URL launches the subsequent steps in the provisioning process and is required to successfully complete Windows Hello for Business provisioning. This URL does not require any authentication and as such, does not collect any user data.
\ No newline at end of file
+> You need to allow access to the URL account.microsoft.com to initiate Windows Hello for Business provisioning. This URL launches the subsequent steps in the provisioning process and is required to successfully complete Windows Hello for Business provisioning. This URL does not require any authentication and as such, does not collect any user data.
diff --git a/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md b/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md
index 47f61560aa..453dcb53bb 100644
--- a/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md
+++ b/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md
@@ -14,13 +14,34 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 01/14/2021
+ms.date: 05/03/2021
ms.reviewer:
---
# Windows Hello for Business Known Deployment Issues
The content of this article is to help troubleshoot and workaround known deployment issues for Windows Hello for Business. Each issue below will describe the applicable deployment type Windows versions.
+## PIN Reset on Azure AD Join Devices Fails with "We can't open that page right now" error
+
+Applies to:
+
+- Azure AD joined deployments
+- Windows 10, version 1803 and later
+
+PIN reset on Azure AD joined devices uses a flow called web sign-in to authenticate the user above lock. Web sign in only allows navigation to specific domains. If it attempts to navigate to a domain that is not allowed it will shows a page with the "We can't open that page right now" error message.
+
+### Identifying Azure AD joined PIN Reset Allowed Domains Issue
+
+The user can launch the PIN reset flow from above lock using the "I forgot my PIN" link in the PIN credential provider. Selecting this link will launch a full screen UI for the PIN experience on Azure AD Join devices. Typically, this UI will display an Azure authentication server page where the user will authenticate using Azure AD credentials and complete multi-factor authentication.
+
+In federated environments authentication may be configured to route to AD FS or a third party identity provider. If the PIN reset flow is launched and attempts to navigate to a federated identity provider server page, it will fail and display the "We can't open that page right now" error if the domain for the server page is not included in an allow list.
+
+If you are a customer of Azure US Government cloud, PIN reset will also attempt to navigate to a domain that is not included in the default allow list. This results in the "We can't open that page right now" being shown.
+
+### Resolving Azure AD joined PIN Reset Allowed Domains Issue
+
+To resolve this error, a list of allowed domains for PIN reset can be configured using the [ConfigureWebSignInAllowedUrls](/windows/client-management/mdm/policy-csp-authentication#authentication-configurewebsigninallowedurls) policy. For information on how to configure this policy, see [PIN Reset - Configure Web Sign-in Allowed URLs for Third Party Identity Providers on Azure AD Joined Devices](hello-feature-pin-reset.md#configure-web-sign-in-allowed-urls-for-third-party-identity-providers-on-azure-ad-joined-devices).
+
## Hybrid Key Trust Logon Broken Due to User Public Key Deletion
Applies to:
diff --git a/windows/security/identity-protection/hello-for-business/hello-feature-pin-reset.md b/windows/security/identity-protection/hello-for-business/hello-feature-pin-reset.md
index 542ece9a6b..6d1ae1fbd1 100644
--- a/windows/security/identity-protection/hello-for-business/hello-feature-pin-reset.md
+++ b/windows/security/identity-protection/hello-for-business/hello-feature-pin-reset.md
@@ -13,7 +13,7 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 12/22/2020
+ms.date: 5/3/2021
ms.reviewer:
---
@@ -23,7 +23,54 @@ ms.reviewer:
- Windows 10, version 1709 or later
-## Hybrid Deployments
+Windows Hello for Business provides the capability for users to reset forgotten PINs using the "I forgot my PIN link" from the Sign-in options page in Settings or from above the lock screen. User's are required to authenticate and complete multi-factor authentication to reset their PIN.
+
+There are two forms of PIN reset called destructive and non-destructive. Destructive PIN reset is the default and does not require configuration. During a destructive PIN reset, the user's existing PIN and underlying credentials, including any keys or certificates added to their Windows Hello container, will be deleted from the client and a new logon key and PIN are provisioned. For non-destructive PIN reset, you must deploy the Microsoft PIN reset service and client policy to enable the PIN recovery feature. During a non-destructive PIN reset, the user's Windows Hello for Business container and keys are preserved, but the user's PIN that they use to authorize key usage is changed.
+
+## Using PIN Reset
+
+**Requirements**
+
+- Reset from settings - Windows 10, version 1703
+- Reset above Lock - Windows 10, version 1709
+
+Destructive and non-destructive PIN reset use the same entry points for initiating a PIN reset. If a user has forgotten their PIN, but has an alternate logon method, they can navigate to Sign-in options in Settings and initiate a PIN reset from the PIN options. If they do not have an alternate way to sign into their device, PIN reset can also be initiated from above the lock screen in the PIN credential provider.
+
+>[!IMPORTANT]
+>For hybrid Azure AD joined devices, users must have corporate network connectivity to domain controllers to reset their PIN. If AD FS is being used for certificate trust or for on-premises only deployments, users must also have corporate network connectivity to federation services to reset their PIN.
+
+### Reset PIN from Settings
+
+1. Sign-in to Windows 10, version 1703 or later using an alternate credential.
+2. Open **Settings**, click **Accounts**, click **Sign-in options**.
+3. Under **PIN**, click **I forgot my PIN** and follow the instructions.
+
+### Reset PIN above the Lock Screen
+
+For Azure AD joined devices:
+
+1. If the PIN credential provider is not selected, expand the **Sign-in options** link, and select the PIN pad icon.
+1. Click **I forgot my PIN** from the PIN credential provider
+1. Select an authentication option from the list of presented options. This list will be based on the different authentication methods enabled in your tenant (i.e. Password, PIN, Security key)
+1. Follow the instructions provided by the provisioning process
+1. When finished, unlock your desktop using your newly created PIN.
+
+For Hybrid Azure AD joined devices:
+
+1. If the PIN credential provider is not selected, expand the **Sign-in options** link, and select the PIN pad icon.
+1. Click **I forgot my PIN** from the PIN credential provider
+1. Enter your password and press enter.
+1. Follow the instructions provided by the provisioning process
+1. When finished, unlock your desktop using your newly created PIN.
+
+> [!NOTE]
+> Key trust on hybrid Azure AD joined devices does not support destructive PIN reset from above the Lock Screen. This is due to the sync delay between when a user provisions their Windows Hello for Business credential and being able to use it for sign-in. For this deployment model, you must deploy non-destructive PIN reset for above lock PIN reset to work.
+
+You may find that PIN reset from settings only works post login, and that the "lock screen" PIN reset function will not work if you have any matching limitation of SSPR password reset from the lock screen. For more information, see [Enable Azure Active Directory self-service password reset at the Windows sign-in screen - General ](/azure/active-directory/authentication/howto-sspr-windows#general-limitations).
+
+Visit the [Windows Hello for Business Videos](./hello-videos.md) page and watch [Windows Hello for Business forgotten PIN user experience](./hello-videos.md#windows-hello-for-business-forgotten-pin-user-experience).
+
+## Non-Destructive PIN reset
**Requirements:**
@@ -32,10 +79,13 @@ ms.reviewer:
- Azure AD registered, Azure AD joined, and Hybrid Azure AD joined
- Windows 10, version 1709 to 1809, **Enterprise Edition**. There is no licensing requirement for this feature since version 1903.
-The Microsoft PIN reset services enables you to help users recover who have forgotten their PIN. Using Group Policy, Microsoft Intune or a compatible MDM, you can configure Windows 10 devices to securely use the Microsoft PIN reset service that enables users to reset their forgotten PIN through settings or above the lock screen without requiring re-enrollment.
+When non-destructive PIN reset is enabled on a client, a 256-bit AES key is generated locally and added to a user's Windows Hello for Business container and keys as the PIN reset protector. This PIN reset protector is encrypted using a public key retrieved from the Microsoft PIN reset service and then stored on the client for later use during PIN reset. After a user initiates a PIN reset, completes authentication to Azure, and completes multi-factor authentication, the encrypted PIN reset protector is sent to the Microsoft PIN reset service, decrypted, and returned to the client. The decrypted PIN reset protector is used to change the PIN used to authorize Windows Hello for Business keys and it is then cleared from memory.
+
+Using Group Policy, Microsoft Intune or a compatible MDM, you can configure Windows 10 devices to securely use the Microsoft PIN reset service that enables users to reset their forgotten PIN through settings or above the lock screen without requiring re-enrollment.
>[!IMPORTANT]
> The Microsoft PIN Reset service only works with **Enterprise Edition** for Windows 10, version 1709 to 1809. The feature works with **Enterprise Edition** and **Pro** edition with Windows 10, version 1903 and newer.
+> The Microsoft PIN Reset service is not currently available in Azure Government.
### Onboarding the Microsoft PIN reset service to your Intune tenant
@@ -44,18 +94,14 @@ Before you can remotely reset PINs, you must on-board the Microsoft PIN reset se
### Connect Azure Active Directory with the PIN reset service
1. Go to the [Microsoft PIN Reset Service Production website](https://login.windows.net/common/oauth2/authorize?response_type=code&client_id=b8456c59-1230-44c7-a4a2-99b085333e84&resource=https%3A%2F%2Fgraph.windows.net&redirect_uri=https%3A%2F%2Fcred.microsoft.com&state=e9191523-6c2f-4f1d-a4f9-c36f26f89df0&prompt=admin_consent), and sign in using the Global administrator account you use to manage your Azure Active Directory tenant.
-
-2. After you have logged in, choose **Accept** to give consent for the PIN reset service to access your account.
-
+1. After you have logged in, choose **Accept** to give consent for the PIN reset service to access your account.
-
-3. Go to the [Microsoft PIN Reset Client Production website](https://login.windows.net/common/oauth2/authorize?response_type=code&client_id=9115dd05-fad5-4f9c-acc7-305d08b1b04e&resource=https%3A%2F%2Fcred.microsoft.com%2F&redirect_uri=ms-appx-web%3A%2F%2FMicrosoft.AAD.BrokerPlugin%2F9115dd05-fad5-4f9c-acc7-305d08b1b04e&state=6765f8c5-f4a7-4029-b667-46a6776ad611&prompt=admin_consent), and sign in using the Global administrator account you use to manage your Azure Active Directory tenant.
-
-4. After you have logged in, choose **Accept** to give consent for the PIN reset client to access your account.
+1. Go to the [Microsoft PIN Reset Client Production website](https://login.windows.net/common/oauth2/authorize?response_type=code&client_id=9115dd05-fad5-4f9c-acc7-305d08b1b04e&resource=https%3A%2F%2Fcred.microsoft.com%2F&redirect_uri=ms-appx-web%3A%2F%2FMicrosoft.AAD.BrokerPlugin%2F9115dd05-fad5-4f9c-acc7-305d08b1b04e&state=6765f8c5-f4a7-4029-b667-46a6776ad611&prompt=admin_consent), and sign in using the Global administrator account you use to manage your Azure Active Directory tenant.
+1. After you have logged in, choose **Accept** to give consent for the PIN reset client to access your account.
-> [!NOTE]
-> After you have accepted the PIN reset service and client requests, you will land on a page that states "You do not have permission to view this directory or page." This behavior is expected. Be sure to confirm that the two PIN reset applications are listed for your tenant.
-5. In the [Azure portal](https://portal.azure.com), verify that the Microsoft PIN Reset Service and Microsoft PIN Reset Client are integrated from the **Enterprise applications** blade. Filter to application status "Enabled" and both Microsoft Pin Reset Service Production and Microsoft Pin Reset Client Production will show up in your tenant.
+ > [!NOTE]
+ > After you have accepted the PIN reset service and client requests, you will land on a page that states "You do not have permission to view this directory or page." This behavior is expected. Be sure to confirm that the two PIN reset applications are listed for your tenant.
+1. In the [Azure portal](https://portal.azure.com), verify that the Microsoft PIN Reset Service and Microsoft PIN Reset Client are integrated from the **Enterprise applications** blade. Filter to application status "Enabled" and both Microsoft Pin Reset Service Production and Microsoft Pin Reset Client Production will show up in your tenant.
> [!div class="mx-imgBorder"]
> 
@@ -65,70 +111,103 @@ Before you can remotely reset PINs, you must on-board the Microsoft PIN reset se
You configure Windows 10 to use the Microsoft PIN Reset service using the computer configuration portion of a Group Policy object.
1. Using the Group Policy Management Console (GPMC), scope a domain-based Group Policy to computer accounts in Active Directory.
-
-2. Edit the Group Policy object from Step 1.
-
-3. Enable the **Use PIN Recovery** policy setting located under **Computer Configuration > Administrative Templates > Windows Components > Windows Hello for Business**.
-
-4. Close the Group Policy Management Editor to save the Group Policy object. Close the GPMC.
+1. Edit the Group Policy object from Step 1.
+1. Enable the **Use PIN Recovery** policy setting located under **Computer Configuration > Administrative Templates > Windows Components > Windows Hello for Business**.
+1. Close the Group Policy Management Editor to save the Group Policy object. Close the GPMC.
#### Create a PIN Reset Device configuration profile using Microsoft Intune
1. Sign-in to [Endpoint Manager admin center](https://endpoint.microsoft.com/) using a Global administrator account.
-
-2. Click **Endpoint Security** > **Account Protection** > **Properties**.
-
-3. Set **Enable PIN recovery** to **Yes**.
+1. Click **Endpoint Security** > **Account Protection** > **Properties**.
+1. Set **Enable PIN recovery** to **Yes**.
> [!NOTE]
> You can also setup PIN recovery using configuration profiles.
-> 1. Sign in to Endpoint Manager.
>
-> 2. Click **Devices** > **Configuration Profiles** > Create a new profile or edit an existing profile using the Identity Protection profile type.
->
-> 3. Set **Enable PIN recovery** to **Yes**.
+> 1. Sign in to Endpoint Manager.
+> 1. Click **Devices** > **Configuration Profiles** > Create a new profile or edit an existing profile using the Identity Protection profile type.
+> 1. Set **Enable PIN recovery** to **Yes**.
#### Assign the PIN Reset Device configuration profile using Microsoft Intune
1. Sign in to the [Azure portal](https://portal.azure.com) using a Global administrator account.
+1. Navigate to the Microsoft Intune blade. Choose **Device configuration** > **Profiles**. From the list of device configuration profiles, choose the profile that contains the PIN reset configuration.
+1. In the device configuration profile, select **Assignments**.
+1. Use the **Include** and/or **Exclude** tabs to target the device configuration profile to select groups.
-2. Navigate to the Microsoft Intune blade. Choose **Device configuration** > **Profiles**. From the list of device configuration profiles, choose the profile that contains the PIN reset configuration.
+### Confirm that PIN recovery policy is enforced on the client
-3. In the device configuration profile, select **Assignments**.
+The PIN reset configuration for a user can be viewed by running [**dsregcmd /status**](/azure/active-directory/devices/troubleshoot-device-dsregcmd) from the command line. This state can be found under the output in the user state section as the **CanReset** line item. If **CanReset** reports as DestructiveOnly, then only destructive PIN reset is enabled. If **CanReset** reports DestructiveAndNonDestructive, then non-destructive PIN reset is enabled.
-4. Use the **Include** and/or **Exclude** tabs to target the device configuration profile to select groups.
+#### Sample User state Output for Destructive PIN Reset
-## On-premises Deployments
+```
++----------------------------------------------------------------------+
+| User State |
++----------------------------------------------------------------------+
-**Requirements**
+ NgcSet : YES
+ NgcKeyId : {FA0DB076-A5D7-4844-82D8-50A2FB42EC7B}
+ CanReset : DestructiveOnly
+ WorkplaceJoined : NO
+ WamDefaultSet : YES
+ WamDefaultAuthority : organizations
+ WamDefaultId : https://login.microsoft.com
+ WamDefaultGUID : { B16898C6-A148-4967-9171-64D755DA8520 } (AzureAd)
-* Active Directory
-* On-premises Windows Hello for Business deployment
-* Reset from settings - Windows 10, version 1703, Professional
-* Reset above Lock - Windows 10, version 1709, Professional
++----------------------------------------------------------------------+
+```
-On-premises deployments provide users with the ability to reset forgotten PINs either through the settings page or from above the user's lock screen. Users must know or be provided their password for authentication, must perform a second factor of authentication, and then re-provision Windows Hello for Business.
+#### Sample User state Output for Non-Destructive PIN Reset
->[!IMPORTANT]
->Users must have corporate network connectivity to domain controllers and the federation service to reset their PINs.
+```
++----------------------------------------------------------------------+
+| User State |
++----------------------------------------------------------------------+
-### Reset PIN from Settings
+ NgcSet : YES
+ NgcKeyId : {FA0DB076-A5D7-4844-82D8-50A2FB42EC7B}
+ CanReset : DestructiveAndNonDestructive
+ WorkplaceJoined : NO
+ WamDefaultSet : YES
+ WamDefaultAuthority : organizations
+ WamDefaultId : https://login.microsoft.com
+ WamDefaultGUID : { B16898C6-A148-4967-9171-64D755DA8520 } (AzureAd)
-1. Sign-in to Windows 10, version 1703 or later using an alternate credential.
-2. Open **Settings**, click **Accounts**, click **Sign-in options**.
-3. Under **PIN**, click **I forgot my PIN** and follow the instructions.
++----------------------------------------------------------------------+
+```
-#### Reset PIN above the Lock Screen
+## Configure Web Sign-in Allowed URLs for Third Party Identity Providers on Azure AD Joined Devices
-1. On Windows 10, version 1709, click **I forgot my PIN** from the Windows Sign-in
-2. Enter your password and press enter.
-3. Follow the instructions provided by the provisioning process
-4. When finished, unlock your desktop using your newly created PIN.
+**Applies to:**
-You may find that PIN reset from settings only works post login, and that the "lock screen" PIN reset function will not work if you have any matching limitation of SSPR password reset from the lock screen. For more information, see [Enable Azure Active Directory self-service password reset at the Windows sign-in screen - **General limitations**](/azure/active-directory/authentication/howto-sspr-windows#general-limitations).
+- Windows 10, version 1803 or later
+- Azure AD joined
+
+The [ConfigureWebSignInAllowedUrls](/windows/client-management/mdm/policy-csp-authentication#authentication-configurewebsigninallowedurls) policy allows you to specify a list of domains that are allowed to be navigated to during PIN reset flows on Azure AD joined devices. If you have a federated environment and authentication is handled using AD FS or a third-party identity provider, this policy should be set to ensure that authentication pages from that identity provider can be used during Azure AD joined PIN reset.
+
+### Configuring Policy Using Intune
+
+1. Sign-in to [Endpoint Manager admin center](https://endpoint.microsoft.com/) using a Global administrator account.
+1. Click **Devices**. Click **Configuration profiles**. Click **Create profile**.
+1. For Platform select **Windows 10 and later** and for Profile type select **Templates**. In the list of templates that is loaded, select **Custom** and click Create.
+1. In the **Name** field type **Web Sign In Allowed URLs** and optionally provide a description for the configuration. Click Next.
+1. On the Configuration settings page, click **Add** to add a custom OMA-URI setting. Provide the following information for the custom settings
+ - **Name:** Web Sign In Allowed URLs
+ - **Description:** (Optional) List of domains that are allowed during PIN reset flows.
+ - **OMA-URI:** ./Vendor/MSFT/Policy/Config/Authentication/ConfigureWebSignInAllowedUrls
+ - **Data type:** String
+ - **Value**: Provide a semicolon delimited list of domains needed for authentication during the PIN reset scenario. An example value would be "signin.contoso.com;portal.contoso.com"
+
+ 
+
+1. Click the Save button to save the custom configuration.
+1. On the Assignments page, use the Included groups and Excluded groups sections to define the groups of users or devices that should receive this policy. Once you have completed configuring groups click the Next button.
+1. On the Applicability rules page, click Next.
+1. Review the configuration that is shown on the Review + create page to make sure that it is accurate. Click create to save the profile and apply it to the configured groups.
> [!NOTE]
-> Visit the [Windows Hello for Business Videos](./hello-videos.md) page and watch [Windows Hello for Business forgotten PIN user experience](./hello-videos.md#windows-hello-for-business-forgotten-pin-user-experience).
+> For Azure Government, there is a known issue with PIN reset on Azure AD Joined devices failing. When the user attempts to launch PIN reset, the PIN reset UI shows an error page that says, "We can't open that page right now." The ConfigureWebSignInAllowedUrls policy can be used to work around this issue. If you are experiencing this problem and you are using Azure US Government cloud, set **login.microsoftonline.us** as the value for the ConfigureWebSignInAllowedUrls policy.
## Related topics
diff --git a/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md b/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md
index cb21e54fe3..a90f1587c2 100644
--- a/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md
+++ b/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md
@@ -35,7 +35,7 @@ Azure Active Directory joined devices authenticate to Azure during sign-in and c
| Phase | Description |
| :----: | :----------- |
-|A | Authentication begins when the users dismisses the lock screen, which triggers winlogon to show the Windows Hello for Business credential provider. The user provides their Windows Hello gesture (PIN or biometrics). The credential provider packages these credentials and returns them to winlogon. Winlogon passes the collected credentials to lsass. Lsass passes the collected credentials to the Cloud Authentication security support provider, referred to as the Cloud AP provider.|
+|A | Authentication begins when the user dismisses the lock screen, which triggers winlogon to show the Windows Hello for Business credential provider. The user provides their Windows Hello gesture (PIN or biometrics). The credential provider packages these credentials and returns them to winlogon. Winlogon passes the collected credentials to lsass. Lsass passes the collected credentials to the Cloud Authentication security support provider, referred to as the Cloud AP provider.|
|B | The Cloud AP provider requests a nonce from Azure Active Directory. Azure AD returns a nonce. The Cloud AP provider signs the nonce using the user's private key and returns the signed nonce to the Azure Active Directory.|
|C | Azure Active Directory validates the signed nonce using the user's securely registered public key against the nonce signature. After validating the signature, Azure AD then validates the returned signed nonce. After validating the nonce, Azure AD creates a PRT with session key that is encrypted to the device's transport key and returns it to the Cloud AP provider.|
|D | The Cloud AP provider receives the encrypted PRT with session key. Using the device's private transport key, the Cloud AP provider decrypt the session key and protects the session key using the device's TPM.|
@@ -47,9 +47,12 @@ Azure Active Directory joined devices authenticate to Azure during sign-in and c
| Phase | Description |
| :----: | :----------- |
-|A | Authentication to Active Directory from a Azure AD joined device begins with the user first attempts to use a resource that needs Kerberos authentication. The Kerberos security support provider, hosted in lsass, uses metadata from the Windows Hello for Business key to get a hint of the user's domain. Using the hint, the provider uses the DClocator service to locate a 2016 domain controller. After the provider locates an active 2016 domain controller, the provider uses the private key to sign the Kerberos pre-authentication data.|
+|A | Authentication to Active Directory from an Azure AD joined device begins with the user first attempts to use a resource that needs Kerberos authentication. The Kerberos security support provider, hosted in lsass, uses metadata from the Windows Hello for Business key to get a hint of the user's domain. Using the hint, the provider uses the DClocator service to locate a 2016 domain controller. After the provider locates an active 2016 domain controller, the provider uses the private key to sign the Kerberos pre-authentication data.|
|B | The Kerberos provider sends the signed pre-authentication data and its public key (in the form of a self-signed certificate) to the Key Distribution Center (KDC) service running on the 2016 domain controller in the form of a KERB_AS_REQ.
The 2016 domain controller determines the certificate is a self-signed certificate. It retrieves the public key from the certificate included in the KERB_AS_REQ and searches for the public key in Active Directory. It validates the UPN for authentication request matches the UPN registered in Active Directory and validates the signed pre-authentication data using the public key from Active Directory. On success, the KDC returns a TGT to the client with its certificate in a KERB_AS_REP.|
-|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not be revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating. After passing this criteria, Kerberos returns the TGT to lsass, where it is cached and used for subsequent service ticket requests.|
+|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not been revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating. After passing this criteria, Kerberos returns the TGT to lsass, where it is cached and used for subsequent service ticket requests.|
+
+> [!NOTE]
+> You might have an on-premises domain federated with Azure AD. Once you have successfully provisioned Windows Hello for Business PIN/Bio on the Azure AD joined device, any future login of Windows Hello for Business (PIN/Bio) sign-in will directly authenticate against Azure AD to get PRT and trigger authenticate against your DC (if LOS to DC is available) to get Kerberos. It no longer uses AD FS to authenticate for Windows Hello for Business sign-ins.
## Azure AD join authentication to Active Directory using a Certificate
@@ -57,18 +60,22 @@ Azure Active Directory joined devices authenticate to Azure during sign-in and c
| Phase | Description |
| :----: | :----------- |
-|A | Authentication to Active Directory from a Azure AD joined device begins with the user first attempts to use a resource that needs Kerberos authentication. The Kerberos security support provider, hosted in lsass, uses information from the certificate to get a hint of the user's domain. Kerberos can use the distinguished name of the user found in the subject of the certificate, or it can use the user principal name of the user found in the subject alternate name of the certificate. Using the hint, the provider uses the DClocator service to locate a domain controller. After the provider locates an active domain controller, the provider use the private key to sign the Kerberos pre-authentication data.|
+|A | Authentication to Active Directory from a Azure AD joined device begins with the user first attempts to use a resource that needs Kerberos authentication. The Kerberos security support provider, hosted in lsass, uses information from the certificate to get a hint of the user's domain. Kerberos can use the distinguished name of the user found in the subject of the certificate, or it can use the user principal name of the user found in the subject alternate name of the certificate. Using the hint, the provider uses the DClocator service to locate a domain controller. After the provider locates an active domain controller, the provider uses the private key to sign the Kerberos pre-authentication data.|
|B | The Kerberos provider sends the signed pre-authentication data and user's certificate, which includes the public key, to the Key Distribution Center (KDC) service running on the domain controller in the form of a KERB_AS_REQ.
The domain controller determines the certificate is not self-signed certificate. The domain controller ensures the certificate chains to trusted root certificate, is within its validity period, can be used for authentication, and has not been revoked. It retrieves the public key and UPN from the certificate included in the KERB_AS_REQ and searches for the UPN in Active Directory. It validates the signed pre-authentication data using the public key from the certificate. On success, the KDC returns a TGT to the client with its certificate in a KERB_AS_REP.|
-|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not be revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating. After passing this criteria, Kerberos returns the TGT to lsass, where it is cached and used for subsequent service ticket requests.|
+|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not been revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating. After passing this criteria, Kerberos returns the TGT to lsass, where it is cached and used for subsequent service ticket requests.|
+
+> [!NOTE]
+> You may have an on-premises domain federated with Azure AD. Once you have successfully provisioned Windows Hello for Business PIN/Bio on, any future login of Windows Hello for Business (PIN/Bio) sign-in will directly authenticate against Azure AD to get PRT, as well as authenticate against your DC (if LOS to DC is available) to get Kerberos as mentioned previously. AD FS federation is used only when Enterprise PRT calls are placed from the client. You need to have device write-back enabled to get "Enterprise PRT" from your federation.
+
## Hybrid Azure AD join authentication using a Key
| Phase | Description |
| :----: | :----------- |
-|A | Authentication begins when the users dismisses the lock screen, which triggers winlogon to show the Windows Hello for Business credential provider. The user provides their Windows Hello gesture (PIN or biometrics). The credential provider packages these credentials and returns them to winlogon. Winlogon passes the collected credentials to lsass. Lsass passes the collected credentials to the Kerberos security support provider. The Kerberos provider gets domain hints from the domain joined workstation to locate a domain controller for the user.|
+|A | Authentication begins when the user dismisses the lock screen, which triggers winlogon to show the Windows Hello for Business credential provider. The user provides their Windows Hello gesture (PIN or biometrics). The credential provider packages these credentials and returns them to winlogon. Winlogon passes the collected credentials to lsass. Lsass passes the collected credentials to the Kerberos security support provider. The Kerberos provider gets domain hints from the domain joined workstation to locate a domain controller for the user.|
|B | The Kerberos provider sends the signed pre-authentication data and the user's public key (in the form of a self-signed certificate) to the Key Distribution Center (KDC) service running on the 2016 domain controller in the form of a KERB_AS_REQ.
The 2016 domain controller determines the certificate is a self-signed certificate. It retrieves the public key from the certificate included in the KERB_AS_REQ and searches for the public key in Active Directory. It validates the UPN for authentication request matches the UPN registered in Active Directory and validates the signed pre-authentication data using the public key from Active Directory. On success, the KDC returns a TGT to the client with its certificate in a KERB_AS_REP.|
-|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not be revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating.
+|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not been revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating.
|D | After passing this criteria, Kerberos returns the TGT to lsass, where it is cached and used for subsequent service ticket requests.|
|E | Lsass informs winlogon of the success authentication. Winlogon creates a logon session, loads the user's profile, and starts explorer.exe.|
|F | While Windows loads the user's desktop, lsass passes the collected credentials to the Cloud Authentication security support provider, referred to as the Cloud AP provider. The Cloud AP provider requests a nonce from Azure Active Directory. Azure AD returns a nonce.|
@@ -82,9 +89,9 @@ Azure Active Directory joined devices authenticate to Azure during sign-in and c
| Phase | Description |
| :----: | :----------- |
-|A | Authentication begins when the users dismisses the lock screen, which triggers winlogon to show the Windows Hello for Business credential provider. The user provides their Windows Hello gesture (PIN or biometrics). The credential provider packages these credentials and returns them to winlogon. Winlogon passes the collected credentials to lsass. Lsass passes the collected credentials to the Kerberos security support provider. The Kerberos provider gets domain hints from the domain joined workstation to locate a domain controller for the user.|
+|A | Authentication begins when the user dismisses the lock screen, which triggers winlogon to show the Windows Hello for Business credential provider. The user provides their Windows Hello gesture (PIN or biometrics). The credential provider packages these credentials and returns them to winlogon. Winlogon passes the collected credentials to lsass. Lsass passes the collected credentials to the Kerberos security support provider. The Kerberos provider gets domain hints from the domain joined workstation to locate a domain controller for the user.|
|B | The Kerberos provider sends the signed pre-authentication data and user's certificate, which includes the public key, to the Key Distribution Center (KDC) service running on the domain controller in the form of a KERB_AS_REQ.
The domain controller determines the certificate is not self-signed certificate. The domain controller ensures the certificate chains to trusted root certificate, is within its validity period, can be used for authentication, and has not been revoked. It retrieves the public key and UPN from the certificate included in the KERB_AS_REQ and searches for the UPN in Active Directory. It validates the signed pre-authentication data using the public key from the certificate. On success, the KDC returns a TGT to the client with its certificate in a KERB_AS_REP.|
-|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not be revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating.
+|C | The Kerberos provider ensures it can trust the response from the domain controller. First, it ensures the KDC certificate chains to a root certificate that is trusted by the device. Next, it ensures the certificate is within its validity period and that it has not been revoked. The Kerberos provider then verifies the certificate has the KDC Authentication present and that the subject alternate name listed in the KDC's certificate matches the domain name to which the user is authenticating.
|D | After passing this criteria, Kerberos returns the TGT to lsass, where it is cached and used for subsequent service ticket requests.|
|E | Lsass informs winlogon of the success authentication. Winlogon creates a logon session, loads the user's profile, and starts explorer.exe.|
|F | While Windows loads the user's desktop, lsass passes the collected credentials to the Cloud Authentication security support provider, referred to as the Cloud AP provider. The Cloud AP provider requests a nonce from Azure Active Directory. Azure AD returns a nonce.|
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-new-install.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-new-install.md
index 284db3b991..00aa120b98 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-new-install.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-new-install.md
@@ -1,5 +1,5 @@
---
-title: Windows Hello for Business Trust New Installation (Windows Hello for Business)
+title: Hybrid Azure AD joined Windows Hello for Business Trust New Installation (Windows Hello for Business)
description: Learn about new installations for Windows Hello for Business certificate trust and the various technologies hybrid certificate trust depoyments rely on.
keywords: identity, PIN, biometric, Hello, passport, WHFB
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Windows Hello for Business Certificate Trust New Installation
+# Hybrid Azure AD joined Windows Hello for Business Certificate Trust New Installation
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-devreg.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-devreg.md
index 1abceb0c9a..e80dc75f72 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-devreg.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-devreg.md
@@ -1,5 +1,5 @@
---
-title: Configure Device Registration for Hybrid Windows Hello for Business
+title: Configure Device Registration for Hybrid Azure AD joined Windows Hello for Business
description: Azure Device Registration for Hybrid Certificate Trust Deployment (Windows Hello for Business)
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, cert-trust, device, registration
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/18/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Device Registration for Hybrid Windows Hello for Business
+# Configure Device Registration for Hybrid Azure AD joined Windows Hello for Business
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-prereqs.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-prereqs.md
index 451c829d6c..d867b494ec 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-prereqs.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-trust-prereqs.md
@@ -1,5 +1,5 @@
---
-title: Hybrid Windows Hello for Business Prerequisites
+title: Hybrid Azure AD joined Windows Hello for Business Prerequisites
description: Learn these prerequisites for hybrid Windows Hello for Business deployments using certificate trust.
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, certificate-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Hybrid Windows Hello for Business Prerequisites
+# Hybrid Azure AD joined Windows Hello for Business Prerequisites
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-provision.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-provision.md
index 355c24f66a..cfaf049efd 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-provision.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-provision.md
@@ -1,5 +1,5 @@
---
-title: Hybrid Windows Hello for Business Provisioning (Windows Hello for Business)
+title: Hybrid Azure AD joined Windows Hello for Business Certificate Trust Provisioning (Windows Hello for Business)
description: In this article, learn about provisioning for hybrid certificate trust deployments of Windows Hello for Businesss.
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, certificate-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Hybrid Windows Hello for Business Provisioning
+# Hybrid Azure AD joined Windows Hello for Business Certificate Trust Provisioning
**Applies to**
- Windows 10, version 1703 or later
@@ -27,7 +27,7 @@ ms.reviewer:
## Provisioning
The Windows Hello for Business provisioning begins immediately after the user has signed in, after the user profile is loaded, but before the user receives their desktop. Windows only launches the provisioning experience if all the prerequisite checks pass. You can determine the status of the prerequisite checks by viewing the **User Device Registration** in the **Event Viewer** under **Applications and Services Logs\Microsoft\Windows**.
-
+
The first thing to validate is the computer has processed device registration. You can view this from the User device registration logs where the check **Device is AAD joined (AADJ or DJ++): Yes** appears. Additionally, you can validate this using the **dsregcmd /status** command from a console prompt where the value for **AzureADJoined** reads **Yes**.
@@ -81,4 +81,4 @@ The certificate authority validates the certificate was signed by the registrati
3. [New Installation Baseline](hello-hybrid-cert-new-install.md)
4. [Configure Azure Device Registration](hello-hybrid-cert-trust-devreg.md)
5. [Configure Windows Hello for Business policy settings](hello-hybrid-cert-whfb-settings-policy.md)
-6. Sign-in and Provision (*You are here*)
\ No newline at end of file
+6. Sign-in and Provision (*You are here*)
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-ad.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-ad.md
index b186880166..eeb5ed60a9 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-ad.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-ad.md
@@ -1,5 +1,5 @@
---
-title: Configure Hybrid Windows Hello for Business - Active Directory (AD)
+title: Configure Hybrid Azure AD joined Windows Hello for Business - Active Directory (AD)
description: Discussing the configuration of Active Directory (AD) in a Hybrid deployment of Windows Hello for Business
keywords: identity, PIN, biometric, Hello, passport, WHFB, ad
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Windows Hello for Business: Active Directory
+# Configure Hybrid Azure AD joined Windows Hello for Business: Active Directory
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-adfs.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-adfs.md
index cfb8b164f0..880a1fa1cc 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-adfs.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-adfs.md
@@ -1,5 +1,5 @@
---
-title: Configuring Hybrid Windows Hello for Business - Active Directory Federation Services (ADFS)
+title: Configuring Hybrid Azure AD joined Windows Hello for Business - Active Directory Federation Services (ADFS)
description: Discussing the configuration of Active Directory Federation Services (ADFS) in a Hybrid deployment of Windows Hello for Business
keywords: identity, PIN, biometric, Hello, passport, WHFB, adfs
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 01/14/2021
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Windows Hello for Business: Active Directory Federation Services
+# Configure Hybrid Azure AD joined Windows Hello for Business: Active Directory Federation Services
**Applies to**
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-dir-sync.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-dir-sync.md
index 7adb1b0b6d..b835c4fad1 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-dir-sync.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-dir-sync.md
@@ -1,5 +1,5 @@
---
-title: Configure Hybrid Windows Hello for Business Directory Synch
+title: Configure Hybrid Azure AD joined Windows Hello for Business Directory Synch
description: Discussing Directory Synchronization in a Hybrid deployment of Windows Hello for Business
keywords: identity, PIN, biometric, Hello, passport, WHFB, dirsync, connect
ms.prod: w10
@@ -13,11 +13,11 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 10/23/2017
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business: Directory Synchronization
+# Configure Hybrid Azure AD joined Windows Hello for Business: Directory Synchronization
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-pki.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-pki.md
index 2b5e042c13..25a3d96332 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-pki.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-pki.md
@@ -1,5 +1,5 @@
---
-title: Configuring Hybrid Windows Hello for Business - Public Key Infrastructure (PKI)
+title: Configuring Hybrid Azure AD joined Windows Hello for Business - Public Key Infrastructure (PKI)
description: Discussing the configuration of the Public Key Infrastructure (PKI) in a Hybrid deployment of Windows Hello for Business
keywords: identity, PIN, biometric, Hello, passport, WHFB, PKI
ms.prod: w10
@@ -13,11 +13,11 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 01/14/2021
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business: Public Key Infrastructure
+# Configure Hybrid Azure AD joined Windows Hello for Business: Public Key Infrastructure
**Applies to**
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-policy.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-policy.md
index 80325188e6..9ddd57ccd7 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-policy.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings-policy.md
@@ -1,5 +1,5 @@
---
-title: Configuring Hybrid Windows Hello for Business - Group Policy
+title: Configuring Hybrid Azure AD joined Windows Hello for Business - Group Policy
description: Discussing the configuration of Group Policy in a Hybrid deployment of Windows Hello for Business
keywords: identity, PIN, biometric, Hello, passport, WHFB
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business: Group Policy
+# Configure Hybrid Azure AD joined Windows Hello for Business: Group Policy
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings.md
index 2f6f72752a..73d00fcc58 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-settings.md
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Windows Hello for Business
+# Configure Hybrid Azure AD joined Windows Hello for Business
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-new-install.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-new-install.md
index 3765f94152..a72c7e9f5e 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-new-install.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-new-install.md
@@ -1,5 +1,5 @@
---
-title: Windows Hello for Business Key Trust New Installation
+title: Windows Hello for Business Hybrid Azure AD joined Key Trust New Installation
description: Learn how to configure a hybrid key trust deployment of Windows Hello for Business for systems with no previous installations.
keywords: identity, PIN, biometric, Hello, passport, WHFB
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Windows Hello for Business Key Trust New Installation
+# Windows Hello for Business Hybrid Azure AD joined Key Trust New Installation
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-devreg.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-devreg.md
index e7ab21b989..741d1cd8fc 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-devreg.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-devreg.md
@@ -1,5 +1,5 @@
---
-title: Configure Device Registration for Hybrid key trust Windows Hello for Business
+title: Configure Device Registration for Hybrid Azure AD joined key trust Windows Hello for Business
description: Azure Device Registration for Hybrid Certificate Key Deployment (Windows Hello for Business)
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, key-trust, device, registration
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Device Registration for Hybrid key trust Windows Hello for Business
+# Configure Device Registration for Hybrid Azure AD joined key trust Windows Hello for Business
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-dirsync.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-dirsync.md
index b2515e71f4..a74ecbe0cb 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-dirsync.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-dirsync.md
@@ -1,5 +1,5 @@
---
-title: Configure Directory Synchronization for Hybrid key trust Windows Hello for Business
+title: Configure Directory Synchronization for Hybrid Azure AD joined key trust Windows Hello for Business
description: Azure Directory Synchronization for Hybrid Certificate Key Deployment (Windows Hello for Business)
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, key-trust, directory, synchronization, AADConnect
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Directory Synchronization for Hybrid key trust Windows Hello for Business
+# Configure Directory Synchronization for Hybrid Azure AD joined key trust Windows Hello for Business
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-prereqs.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-prereqs.md
index addb6018f5..b245d6282d 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-prereqs.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust-prereqs.md
@@ -1,5 +1,5 @@
---
-title: Hybrid Key trust Windows Hello for Business Prerequisites (Windows Hello for Business)
+title: Hybrid Azure AD joined Key trust Windows Hello for Business Prerequisites (Windows Hello for Business)
description: Learn about the prerequisites for hybrid Windows Hello for Business deployments using key trust and what the next steps are in the deployment process.
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, key-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/20/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Hybrid Key trust Windows Hello for Business Prerequisites
+# Hybrid Azure AD joined Key trust Windows Hello for Business Prerequisites
**Applies to**
- Windows 10, version 1703 or later
@@ -74,7 +74,7 @@ The minimum required Enterprise certificate authority that can be used with Wind
* The certificate Enhanced Key Usage section must contain Client Authentication (1.3.6.1.5.5.7.3.2), Server Authentication (1.3.6.1.5.5.7.3.1), and KDC Authentication (1.3.6.1.5.2.3.5).
* The certificate Subject Alternative Name section must contain the Domain Name System (DNS) name.
* The certificate template must have an extension that has the value "DomainController", encoded as a [BMPstring](/windows/win32/seccertenroll/about-bmpstring). If you are using Windows Server Enterprise Certificate Authority, this extension is already included in the domain controller certificate template.
-* The domain controller certificate must be installed in the local computer's certificate store. See [Configure Hybrid Windows Hello for Business: Public Key Infrastructure](./hello-hybrid-cert-whfb-settings-pki.md) for details.
+* The domain controller certificate must be installed in the local computer's certificate store. See [Configure Hybrid Windows Hello for Business: Public Key Infrastructure](./hello-hybrid-key-whfb-settings-pki.md) for details.
> [!IMPORTANT]
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-provision.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-provision.md
index 9c149abb04..9caf362da6 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-provision.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-provision.md
@@ -1,5 +1,5 @@
---
-title: Hybrid Windows Hello for Business key trust Provisioning (Windows Hello for Business)
+title: Hybrid Azure AD joined Windows Hello for Business key trust Provisioning (Windows Hello for Business)
description: Learn about provisioning for hybrid key trust deployments of Windows Hello for Business and learn where to find the hybrid key trust deployment guide.
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, certificate-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/20/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Hybrid Windows Hello for Business Provisioning
+# Hybrid Azure AD joined Windows Hello for Business Key Trust Provisioning
**Applies to**
- Windows 10, version 1703 or later
@@ -68,4 +68,4 @@ The remainder of the provisioning includes Windows Hello for Business requesting
4. [Configure Directory Synchronization](hello-hybrid-key-trust-dirsync.md)
5. [Configure Azure Device Registration](hello-hybrid-key-trust-devreg.md)
6. [Configure Windows Hello for Business settings](hello-hybrid-key-whfb-settings.md)
-7. Sign-in and Provision(*You are here*)
\ No newline at end of file
+7. Sign-in and Provision(*You are here*)
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-ad.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-ad.md
index 3d7c456790..c34af8b4ca 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-ad.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-ad.md
@@ -1,5 +1,5 @@
---
-title: Configuring Hybrid key trust Windows Hello for Business - Active Directory (AD)
+title: Configuring Hybrid Azure AD joined key trust Windows Hello for Business - Active Directory (AD)
description: Configuring Hybrid key trust Windows Hello for Business - Active Directory (AD)
keywords: identity, PIN, biometric, Hello, passport, WHFB, ad, key trust, key-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/20/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configuring Hybrid key trust Windows Hello for Business: Active Directory
+# Configuring Hybrid Azure AD joined key trust Windows Hello for Business: Active Directory
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-dir-sync.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-dir-sync.md
index e3fbad8b54..b5a7d75097 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-dir-sync.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-dir-sync.md
@@ -1,5 +1,5 @@
---
-title: Hybrid Windows Hello for Business - Directory Synchronization
+title: Hybrid Azure AD joined Windows Hello for Business - Directory Synchronization
description: How to configure Hybrid key trust Windows Hello for Business - Directory Synchronization
keywords: identity, PIN, biometric, Hello, passport, WHFB, dirsync, connect, Windows Hello, AD Connect, key trust, key-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business: Directory Synchronization
+# Configure Hybrid Azure AD joined Windows Hello for Business: Directory Synchronization
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-pki.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-pki.md
index 7c662edce9..11ea807b5c 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-pki.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-pki.md
@@ -1,5 +1,5 @@
---
-title: Configure Hybrid key trust Windows Hello for Business
+title: Configure Hybrid Azure AD joined key trust Windows Hello for Business
description: Configuring Hybrid key trust Windows Hello for Business - Public Key Infrastructure (PKI)
keywords: identity, PIN, biometric, Hello, passport, WHFB, PKI, Windows Hello, key trust, key-trust
ms.prod: w10
@@ -13,11 +13,11 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 01/14/2021
+ms.date: 04/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business: Public Key Infrastructure
+# Configure Hybrid Azure AD joined Windows Hello for Business: Public Key Infrastructure
**Applies to**
@@ -50,7 +50,8 @@ Sign-in a certificate authority or management workstations with _Domain Admin_ e
3. In the **Certificate Template Console**, right-click the **Kerberos Authentication** template in the details pane and click **Duplicate Template**.
4. On the **Compatibility** tab, clear the **Show resulting changes** check box. Select **Windows Server 2008 R2** from the **Certification Authority** list. Select **Windows 7.Server 2008 R2** from the **Certification Recipient** list.
5. On the **General** tab, type **Domain Controller Authentication (Kerberos)** in Template display name. Adjust the validity and renewal period to meet your enterprise's needs.
- **Note**If you use different template names, you'll need to remember and substitute these names in different portions of the lab.
+ > [!NOTE]
+ > If you use different template names, you'll need to remember and substitute these names in different portions of the lab.
6. On the **Subject Name** tab, select the **Build from this Active Directory information** button if it is not already selected. Select **None** from the **Subject name format** list. Select **DNS name** from the **Include this information in alternate subject** list. Clear all other items.
7. On the **Cryptography** tab, select **Key Storage Provider** from the **Provider Category** list. Select **RSA** from the **Algorithm name** list. Type **2048** in the **Minimum key size** text box. Select **SHA256** from the **Request hash** list. Click **OK**.
8. Close the console.
@@ -81,11 +82,12 @@ Sign-in a certificate authority or management workstations with _Enterprise Admi
The certificate template is configured to supersede all the certificate templates provided in the certificate templates superseded templates list. However, the certificate template and the superseding of certificate templates is not active until you publish the certificate template to one or more certificate authorities.
> [!NOTE]
-> A domain controller's certificate must chain to a certificate in the NTAuth store in Active Directory. By default, online "Enterprise" Active Directory Certificate Authority certificates are added to the NTAuth store at installation time. If you are using a third-party CA, this is not done by default. If the domain controller certificate does not chain to a trusted CA in the NTAuth store, user authentication will fail.
->
-> You can view an AD forest's NTAuth store (NTAuthCertificates) using PKIVIEW.MSC from an ADCS CA. Open PKIView.msc, then click the Action menu -> Manage AD Containers. To see all certificates in the NTAuth store, run **Certutil -viewstore -enterprise NTAuth** from the command-line interface (Cmd.exe).
-
-### Publish Certificate Templates to a Certificate Authority
+> The domain controller's certificate must chain to a root in the NTAuth store. By default, the Active Directory Certificate Authority's root certificate is added to the NTAuth store. If you are using a third-party CA, this may not be done by default. If the domain controller certificate does not chain to a root in the NTAuth store, user authentication will fail.
+>you can view
+>
+>'''powershell
+>Certutil -view
+>Publish Certificate Templates to a Certificate Authority
The certificate authority may only issue certificates for certificate templates that are published to that certificate authority. If you have more than one certificate authority and you want that certificate authority to issue certificates based on a specific certificate template, then you must publish the certificate template to all certificate authorities that are expected to issue the certificate.
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-policy.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-policy.md
index f39befdec4..4e90347c72 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-policy.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings-policy.md
@@ -1,5 +1,5 @@
---
-title: Configure Hybrid Windows Hello for Business - Group Policy
+title: Configure Hybrid Azure AD joined Windows Hello for Business - Group Policy
description: Configuring Hybrid key trust Windows Hello for Business - Group Policy
keywords: identity, PIN, biometric, Hello, passport, WHFB, Windows Hello, key trust, key-trust
ms.prod: w10
@@ -13,10 +13,10 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/20/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business: Group Policy
+# Configure Hybrid Azure AD joined Windows Hello for Business: Group Policy
**Applies to**
- Windows 10, version 1703 or later
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings.md
index 9103431811..72ae9b3df4 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-whfb-settings.md
@@ -1,5 +1,5 @@
---
-title: Configure Hybrid Windows Hello for Business key trust Settings
+title: Configure Hybrid Azure AD joined Windows Hello for Business key trust Settings
description: Begin the process of configuring your hybrid key trust environment for Windows Hello for Business. Start with your Active Directory configuration.
keywords: identity, PIN, biometric, Hello, passport, WHFB, hybrid, certificate-trust
ms.prod: w10
@@ -13,18 +13,17 @@ manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
localizationpriority: medium
-ms.date: 08/19/2018
+ms.date: 4/30/2021
ms.reviewer:
---
-# Configure Hybrid Windows Hello for Business key trust settings
+# Configure Hybrid Azure AD joined Windows Hello for Business key trust settings
**Applies to**
- Windows 10, version 1703 or later
- Hybrid deployment
- Key trust
-
-You are ready to configure your hybrid key trust environment for Windows Hello for Business.
+You are ready to configure your hybrid Azure AD joined key trust environment for Windows Hello for Business.
> [!IMPORTANT]
> Ensure your environment meets all the [prerequisites](hello-hybrid-key-trust-prereqs.md) before proceeding. Review the [New Installation baseline](hello-hybrid-key-new-install.md) section of this deployment document to learn how to prepare your environment for your Windows Hello for Business deployment.
diff --git a/windows/security/identity-protection/hello-for-business/images/pinreset/allowlist.png b/windows/security/identity-protection/hello-for-business/images/pinreset/allowlist.png
new file mode 100644
index 0000000000..097b1e036d
Binary files /dev/null and b/windows/security/identity-protection/hello-for-business/images/pinreset/allowlist.png differ
diff --git a/windows/security/identity-protection/index.md b/windows/security/identity-protection/index.md
index dd87cded73..3a9682cff1 100644
--- a/windows/security/identity-protection/index.md
+++ b/windows/security/identity-protection/index.md
@@ -7,7 +7,7 @@ ms.sitesec: library
ms.pagetype: security
audience: ITPro
author: dansimp
-ms.author: daniha
+ms.author: dansimp
manager: dansimp
ms.collection: M365-identity-device-management
ms.topic: article
diff --git a/windows/security/identity-protection/smart-cards/smart-card-debugging-information.md b/windows/security/identity-protection/smart-cards/smart-card-debugging-information.md
index 1135c404d0..a084d3c132 100644
--- a/windows/security/identity-protection/smart-cards/smart-card-debugging-information.md
+++ b/windows/security/identity-protection/smart-cards/smart-card-debugging-information.md
@@ -57,7 +57,7 @@ To delete a container, type **certutil -delkey -csp "Microsoft Base Smart Card C
## Debugging and tracing using WPP
-WPP simplifies tracing the operation of the trace provider. It provides a mechanism for the trace provider to log real-time binary messages. Logged messages can be converted to a human-readable trace of the operation. For more information, see [Diagnostics with WPP - The NDIS blog](https://blogs.msdn.com/b/ndis/archive/2011/04/06/diagnostics-with-wpp.aspx).
+WPP simplifies tracing the operation of the trace provider. It provides a mechanism for the trace provider to log real-time binary messages. Logged messages can be converted to a human-readable trace of the operation. For more information, see [Diagnostics with WPP - The NDIS blog](/archive/blogs/ndis/diagnostics-with-wpp).
### Enable the trace
@@ -247,4 +247,4 @@ For more information about CryptoAPI 2.0 Diagnostics, see [Troubleshooting an En
## See also
-[Smart Card Technical Reference](smart-card-windows-smart-card-technical-reference.md)
\ No newline at end of file
+[Smart Card Technical Reference](smart-card-windows-smart-card-technical-reference.md)
diff --git a/windows/security/identity-protection/vpn/vpn-auto-trigger-profile.md b/windows/security/identity-protection/vpn/vpn-auto-trigger-profile.md
index e929ec1a15..2c1405d9e0 100644
--- a/windows/security/identity-protection/vpn/vpn-auto-trigger-profile.md
+++ b/windows/security/identity-protection/vpn/vpn-auto-trigger-profile.md
@@ -25,6 +25,10 @@ In Windows 10, a number of features were added to auto-trigger VPN so users won
- Name-based trigger
- Always On
+> [!NOTE]
+> Auto-triggered VPN connections will not work if Folder Redirection for AppData is enabled. Either Folder Redirection for AppData must be disabled or the auto-triggered VPN profile must be deployed in system context, which changes the path to where the rasphone.pbk file is stored.
+
+
## App trigger
VPN profiles in Windows 10 can be configured to connect automatically on the launch of a specified set of applications. You can configure desktop or Universal Windows Platform (UWP) apps to trigger a VPN connection. You can also configure per-app VPN and specify traffic rules for each app. See [Traffic filters](vpn-security-features.md#traffic-filters) for more details.
@@ -100,4 +104,4 @@ After you add an associated app, if you select the **Only these apps can use thi
- [VPN and conditional access](vpn-conditional-access.md)
- [VPN name resolution](vpn-name-resolution.md)
- [VPN security features](vpn-security-features.md)
-- [VPN profile options](vpn-profile-options.md)
\ No newline at end of file
+- [VPN profile options](vpn-profile-options.md)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index d7b6fbe5a3..83e7dcbb53 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -12,8 +12,8 @@ metadata:
ms.product: windows
ms.topic: hub-page # Required
ms.collection: M365-security-compliance # Optional; Remove if no collection is used.
- author: danihalfin #Required; your GitHub user alias, with correct capitalization.
- ms.author: daniha #Required; microsoft alias of author; optional team alias.
+ author: dansimp #Required; your GitHub user alias, with correct capitalization.
+ ms.author: dansimp #Required; microsoft alias of author; optional team alias.
ms.date: 01/08/2018 #Required; mm/dd/yyyy format.
ms.localizationpriority: high
diff --git a/windows/security/information-protection/TOC.md b/windows/security/information-protection/TOC.md
deleted file mode 100644
index 534c27ef47..0000000000
--- a/windows/security/information-protection/TOC.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# [Information protection](index.md)
-
-## [BitLocker](bitlocker\bitlocker-overview.md)
-### [Overview of BitLocker Device Encryption in Windows 10](bitlocker\bitlocker-device-encryption-overview-windows-10.md)
-### [BitLocker frequently asked questions (FAQ)](bitlocker\bitlocker-frequently-asked-questions.md)
-#### [Overview and requirements](bitlocker\bitlocker-overview-and-requirements-faq.yml)
-#### [Upgrading](bitlocker\bitlocker-upgrading-faq.md)
-#### [Deployment and administration](bitlocker\bitlocker-deployment-and-administration-faq.yml)
-#### [Key management](bitlocker\bitlocker-key-management-faq.md)
-#### [BitLocker To Go](bitlocker\bitlocker-to-go-faq.yml)
-#### [Active Directory Domain Services](bitlocker\bitlocker-and-adds-faq.yml)
-#### [Security](bitlocker\bitlocker-security-faq.md)
-#### [BitLocker Network Unlock](bitlocker\bitlocker-network-unlock-faq.md)
-#### [General](bitlocker\bitlocker-using-with-other-programs-faq.md)
-### [Prepare your organization for BitLocker: Planning and policies](bitlocker\prepare-your-organization-for-bitlocker-planning-and-policies.md)
-### [BitLocker basic deployment](bitlocker\bitlocker-basic-deployment.md)
-### [BitLocker: How to deploy on Windows Server 2012 and later](bitlocker\bitlocker-how-to-deploy-on-windows-server.md)
-### [BitLocker: Management for enterprises](bitlocker\bitlocker-management-for-enterprises.md)
-### [BitLocker: How to enable Network Unlock](bitlocker\bitlocker-how-to-enable-network-unlock.md)
-### [BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker](bitlocker\bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md)
-### [BitLocker: Use BitLocker Recovery Password Viewer](bitlocker\bitlocker-use-bitlocker-recovery-password-viewer.md)
-### [BitLocker Group Policy settings](bitlocker\bitlocker-group-policy-settings.md)
-### [BCD settings and BitLocker](bitlocker\bcd-settings-and-bitlocker.md)
-### [BitLocker Recovery Guide](bitlocker\bitlocker-recovery-guide-plan.md)
-### [BitLocker Countermeasures](bitlocker\bitlocker-countermeasures.md)
-### [Protecting cluster shared volumes and storage area networks with BitLocker](bitlocker\protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md)
-### Troubleshoot BitLocker
-#### [Troubleshoot BitLocker](bitlocker\troubleshoot-bitlocker.md)
-#### [BitLocker cannot encrypt a drive: known issues](bitlocker\ts-bitlocker-cannot-encrypt-issues.md)
-#### [Enforcing BitLocker policies by using Intune: known issues](bitlocker\ts-bitlocker-intune-issues.md)
-#### [BitLocker Network Unlock: known issues](bitlocker\ts-bitlocker-network-unlock-issues.md)
-#### [BitLocker recovery: known issues](bitlocker\ts-bitlocker-recovery-issues.md)
-#### [BitLocker configuration: known issues](bitlocker\ts-bitlocker-config-issues.md)
-#### Troubleshoot BitLocker and TPM issues
-##### [BitLocker cannot encrypt a drive: known TPM issues](bitlocker\ts-bitlocker-cannot-encrypt-tpm-issues.md)
-##### [BitLocker and TPM: other known issues](bitlocker\ts-bitlocker-tpm-issues.md)
-##### [Decode Measured Boot logs to track PCR changes](bitlocker\ts-bitlocker-decode-measured-boot-logs.md)
-
-## [Encrypted Hard Drive](encrypted-hard-drive.md)
-
-## [Kernel DMA Protection](kernel-dma-protection-for-thunderbolt.md)
-
-## [Protect your enterprise data using Windows Information Protection (WIP)](windows-information-protection\protect-enterprise-data-using-wip.md)
-### [Create a WIP policy using Microsoft Intune](windows-information-protection\overview-create-wip-policy.md)
-#### [Create a WIP policy with MDM using the Azure portal for Microsoft Intune](windows-information-protection\create-wip-policy-using-intune-azure.md)
-##### [Deploy your WIP policy using the Azure portal for Microsoft Intune](windows-information-protection\deploy-wip-policy-using-intune-azure.md)
-##### [Associate and deploy a VPN policy for WIP using the Azure portal for Microsoft Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune-azure.md)
-#### [Create and verify an 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 WIP](windows-information-protection\wip-app-enterprise-context.md)
-### [Create a WIP policy using Microsoft Endpoint Configuration Manager](windows-information-protection\overview-create-wip-policy-configmgr.md)
-#### [Create and deploy a WIP policy using Microsoft Endpoint Configuration Manager](windows-information-protection\create-wip-policy-using-configmgr.md)
-#### [Create and verify an 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 WIP](windows-information-protection\wip-app-enterprise-context.md)
-### [Mandatory tasks and settings required to turn on WIP](windows-information-protection\mandatory-settings-for-wip.md)
-### [Testing scenarios for WIP](windows-information-protection\testing-scenarios-for-wip.md)
-### [Limitations while using WIP](windows-information-protection\limitations-with-wip.md)
-### [How to collect WIP audit event logs](windows-information-protection\collect-wip-audit-event-logs.md)
-### [General guidance and best practices for WIP](windows-information-protection\guidance-and-best-practices-wip.md)
-#### [Enlightened apps for use with WIP](windows-information-protection\enlightened-microsoft-apps-and-wip.md)
-#### [Unenlightened and enlightened app behavior while using WIP](windows-information-protection\app-behavior-with-wip.md)
-#### [Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP](windows-information-protection\recommended-network-definitions-for-wip.md)
-#### [Using Outlook Web Access with WIP](windows-information-protection\using-owa-with-wip.md)
-### [Fine-tune WIP Learning](windows-information-protection\wip-learning.md)
-
-## [Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md)
-
-## [Trusted Platform Module](tpm/trusted-platform-module-top-node.md)
-### [Trusted Platform Module Overview](tpm/trusted-platform-module-overview.md)
-### [TPM fundamentals](tpm/tpm-fundamentals.md)
-### [How Windows 10 uses the TPM](tpm/how-windows-uses-the-tpm.md)
-### [TPM Group Policy settings](tpm/trusted-platform-module-services-group-policy-settings.md)
-### [Back up the TPM recovery information to AD DS](tpm/backup-tpm-recovery-information-to-ad-ds.md)
-### [View status, clear, or troubleshoot the TPM](tpm/initialize-and-configure-ownership-of-the-tpm.md)
-### [Understanding PCR banks on TPM 2.0 devices](tpm/switch-pcr-banks-on-tpm-2-0-devices.md)
-### [TPM recommendations](tpm/tpm-recommendations.md)
-
-
-
diff --git a/windows/security/information-protection/TOC.yml b/windows/security/information-protection/TOC.yml
new file mode 100644
index 0000000000..9965f322db
--- /dev/null
+++ b/windows/security/information-protection/TOC.yml
@@ -0,0 +1,147 @@
+- name: Information protection
+ href: index.md
+ items:
+ - name: BitLocker
+ href: bitlocker\bitlocker-overview.md
+ items:
+ - name: Overview of BitLocker Device Encryption in Windows 10
+ href: bitlocker\bitlocker-device-encryption-overview-windows-10.md
+ - name: BitLocker frequently asked questions (FAQ)
+ href: bitlocker\bitlocker-frequently-asked-questions.yml
+ items:
+ - name: Overview and requirements
+ href: bitlocker\bitlocker-overview-and-requirements-faq.yml
+ - name: Upgrading
+ href: bitlocker\bitlocker-upgrading-faq.yml
+ - name: Deployment and administration
+ href: bitlocker\bitlocker-deployment-and-administration-faq.yml
+ - name: Key management
+ href: bitlocker\bitlocker-key-management-faq.yml
+ - name: BitLocker To Go
+ href: bitlocker\bitlocker-to-go-faq.yml
+ - name: Active Directory Domain Services
+ href: bitlocker\bitlocker-and-adds-faq.yml
+ - name: Security
+ href: bitlocker\bitlocker-security-faq.yml
+ - name: BitLocker Network Unlock
+ href: bitlocker\bitlocker-network-unlock-faq.yml
+ - name: General
+ href: bitlocker\bitlocker-using-with-other-programs-faq.yml
+ - name: "Prepare your organization for BitLocker: Planning and policies"
+ href: bitlocker\prepare-your-organization-for-bitlocker-planning-and-policies.md
+ - name: BitLocker basic deployment
+ href: bitlocker\bitlocker-basic-deployment.md
+ - name: "BitLocker: How to deploy on Windows Server 2012 and later"
+ href: bitlocker\bitlocker-how-to-deploy-on-windows-server.md
+ - name: "BitLocker: Management for enterprises"
+ href: bitlocker\bitlocker-management-for-enterprises.md
+ - name: "BitLocker: How to enable Network Unlock"
+ href: bitlocker\bitlocker-how-to-enable-network-unlock.md
+ - name: "BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker"
+ href: bitlocker\bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
+ - name: "BitLocker: Use BitLocker Recovery Password Viewer"
+ href: bitlocker\bitlocker-use-bitlocker-recovery-password-viewer.md
+ - name: BitLocker Group Policy settings
+ href: bitlocker\bitlocker-group-policy-settings.md
+ - name: BCD settings and BitLocker
+ href: bitlocker\bcd-settings-and-bitlocker.md
+ - name: BitLocker Recovery Guide
+ href: bitlocker\bitlocker-recovery-guide-plan.md
+ - name: BitLocker Countermeasures
+ href: bitlocker\bitlocker-countermeasures.md
+ - name: Protecting cluster shared volumes and storage area networks with BitLocker
+ href: bitlocker\protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
+ - name: Troubleshoot BitLocker
+ items:
+ - name: Troubleshoot BitLocker
+ href: bitlocker\troubleshoot-bitlocker.md
+ - name: "BitLocker cannot encrypt a drive: known issues"
+ href: bitlocker\ts-bitlocker-cannot-encrypt-issues.md
+ - name: "Enforcing BitLocker policies by using Intune: known issues"
+ href: bitlocker\ts-bitlocker-intune-issues.md
+ - name: "BitLocker Network Unlock: known issues"
+ href: bitlocker\ts-bitlocker-network-unlock-issues.md
+ - name: "BitLocker recovery: known issues"
+ href: bitlocker\ts-bitlocker-recovery-issues.md
+ - name: "BitLocker configuration: known issues"
+ href: bitlocker\ts-bitlocker-config-issues.md
+ - name: Troubleshoot BitLocker and TPM issues
+ items:
+ - name: "BitLocker cannot encrypt a drive: known TPM issues"
+ href: bitlocker\ts-bitlocker-cannot-encrypt-tpm-issues.md
+ - name: "BitLocker and TPM: other known issues"
+ href: bitlocker\ts-bitlocker-tpm-issues.md
+ - name: Decode Measured Boot logs to track PCR changes
+ href: bitlocker\ts-bitlocker-decode-measured-boot-logs.md
+ - name: Encrypted Hard Drive
+ href: encrypted-hard-drive.md
+ - name: Kernel DMA Protection
+ href: kernel-dma-protection-for-thunderbolt.md
+ - name: Protect your enterprise data using Windows Information Protection (WIP)
+ href: windows-information-protection\protect-enterprise-data-using-wip.md
+ items:
+ - name: Create a WIP policy using Microsoft Intune
+ href: windows-information-protection\overview-create-wip-policy.md
+ items:
+ - name: Create a WIP policy with MDM using the Azure portal for Microsoft Intune
+ href: windows-information-protection\create-wip-policy-using-intune-azure.md
+ items:
+ - name: Deploy your WIP policy using the Azure portal for Microsoft Intune
+ href: windows-information-protection\deploy-wip-policy-using-intune-azure.md
+ - name: Associate and deploy a VPN policy for WIP using the Azure portal for Microsoft Intune
+ href: windows-information-protection\create-vpn-and-wip-policy-using-intune-azure.md
+ - name: Create and verify an EFS Data Recovery Agent (DRA) certificate
+ href: windows-information-protection\create-and-verify-an-efs-dra-certificate.md
+ - name: Determine the Enterprise Context of an app running in WIP
+ href: windows-information-protection\wip-app-enterprise-context.md
+ - name: Create a WIP policy using Microsoft Endpoint Configuration Manager
+ href: windows-information-protection\overview-create-wip-policy-configmgr.md
+ items:
+ - name: Create and deploy a WIP policy using Microsoft Endpoint Configuration Manager
+ href: windows-information-protection\create-wip-policy-using-configmgr.md
+ - name: Create and verify an EFS Data Recovery Agent (DRA) certificate
+ href: windows-information-protection\create-and-verify-an-efs-dra-certificate.md
+ - name: Determine the Enterprise Context of an app running in WIP
+ href: windows-information-protection\wip-app-enterprise-context.md
+ - name: Mandatory tasks and settings required to turn on WIP
+ href: windows-information-protection\mandatory-settings-for-wip.md
+ - name: Testing scenarios for WIP
+ href: windows-information-protection\testing-scenarios-for-wip.md
+ - name: Limitations while using WIP
+ href: windows-information-protection\limitations-with-wip.md
+ - name: How to collect WIP audit event logs
+ href: windows-information-protection\collect-wip-audit-event-logs.md
+ - name: General guidance and best practices for WIP
+ href: windows-information-protection\guidance-and-best-practices-wip.md
+ items:
+ - name: Enlightened apps for use with WIP
+ href: windows-information-protection\enlightened-microsoft-apps-and-wip.md
+ - name: Unenlightened and enlightened app behavior while using WIP
+ href: windows-information-protection\app-behavior-with-wip.md
+ - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP
+ href: windows-information-protection\recommended-network-definitions-for-wip.md
+ - name: Using Outlook Web Access with WIP
+ href: windows-information-protection\using-owa-with-wip.md
+ - name: Fine-tune WIP Learning
+ href: windows-information-protection\wip-learning.md
+ - name: Secure the Windows 10 boot process
+ href: secure-the-windows-10-boot-process.md
+ - name: Trusted Platform Module
+ href: tpm/trusted-platform-module-top-node.md
+ items:
+ - name: Trusted Platform Module Overview
+ href: tpm/trusted-platform-module-overview.md
+ - name: TPM fundamentals
+ href: tpm/tpm-fundamentals.md
+ - name: How Windows 10 uses the TPM
+ href: tpm/how-windows-uses-the-tpm.md
+ - name: TPM Group Policy settings
+ href: tpm/trusted-platform-module-services-group-policy-settings.md
+ - name: Back up the TPM recovery information to AD DS
+ href: tpm/backup-tpm-recovery-information-to-ad-ds.md
+ - name: View status, clear, or troubleshoot the TPM
+ href: tpm/initialize-and-configure-ownership-of-the-tpm.md
+ - name: Understanding PCR banks on TPM 2.0 devices
+ href: tpm/switch-pcr-banks-on-tpm-2-0-devices.md
+ - name: TPM recommendations
+ href: tpm/tpm-recommendations.md
diff --git a/windows/security/information-protection/bitlocker/bitlocker-countermeasures.md b/windows/security/information-protection/bitlocker/bitlocker-countermeasures.md
index 9a9e14b5bc..0ad0174199 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-countermeasures.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-countermeasures.md
@@ -196,4 +196,5 @@ For secure administrative workstations, Microsoft recommends TPM with PIN protec
- [Blocking the SBP-2 driver and Thunderbolt controllers to reduce 1394 DMA and Thunderbolt DMA threats to BitLocker](https://support.microsoft.com/help/2516445/blocking-the-sbp-2-driver-and-thunderbolt-controllers-to-reduce-1394-d)
- [BitLocker Group Policy settings](./bitlocker-group-policy-settings.md)
-- [BitLocker CSP](/windows/client-management/mdm/bitlocker-csp)
\ No newline at end of file
+- [BitLocker CSP](/windows/client-management/mdm/bitlocker-csp)
+- [Winlogon automatic restart sign-on (ARSO)](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/winlogon-automatic-restart-sign-on--arso-)
diff --git a/windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.md b/windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.md
deleted file mode 100644
index ff365150c9..0000000000
--- a/windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: BitLocker FAQ (Windows 10)
-description: Find the answers you need by exploring this brief hub page listing FAQ pages for various aspects of BitLocker.
-ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-ms.reviewer:
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 02/28/2019
-ms.custom: bitlocker
----
-
-# BitLocker frequently asked questions (FAQ) resources
-
-**Applies to**
-- Windows 10
-
-This topic links to frequently asked questions about BitLocker. BitLocker is a data protection feature that encrypts drives on your computer to help prevent data theft or exposure. BitLocker-protected computers can also delete data more securely when they are decommissioned because it is much more difficult to recover deleted data from an encrypted drive than from a non-encrypted drive.
-
-- [Overview and requirements](bitlocker-overview-and-requirements-faq.yml)
-- [Upgrading](bitlocker-upgrading-faq.md)
-- [Deployment and administration](bitlocker-deployment-and-administration-faq.yml)
-- [Key management](bitlocker-key-management-faq.md)
-- [BitLocker To Go](bitlocker-to-go-faq.yml)
-- [Active Directory Domain Services (AD DS)](bitlocker-and-adds-faq.yml)
-- [Security](bitlocker-security-faq.md)
-- [BitLocker Network Unlock](bitlocker-network-unlock-faq.md)
-- [Using BitLocker with other programs and general questions](bitlocker-using-with-other-programs-faq.md)
-
-
-## More information
-
-- [Prepare your organization for BitLocker: Planning and Policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
-- [BitLocker Group Policy settings](bitlocker-group-policy-settings.md)
-- [BCD settings and BitLocker](bcd-settings-and-bitlocker.md)
-- [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md)
-- [BitLocker: How to deploy on Windows Server 2012](bitlocker-how-to-deploy-on-windows-server.md)
-- [BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker](bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md)
-- [BitLocker: Use BitLocker Recovery Password Viewer](bitlocker-use-bitlocker-recovery-password-viewer.md)
-- [BitLocker Cmdlets in Windows PowerShell](/powershell/module/bitlocker/index?view=win10-ps&preserve-view=true)
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.yml b/windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.yml
new file mode 100644
index 0000000000..ce3ad7185a
--- /dev/null
+++ b/windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.yml
@@ -0,0 +1,53 @@
+### YamlMime:FAQ
+metadata:
+ title: BitLocker FAQ (Windows 10)
+ description: Find the answers you need by exploring this brief hub page listing FAQ pages for various aspects of BitLocker.
+ ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
+ ms.reviewer:
+ ms.prod: w10
+ ms.mktglfcycl: explore
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: medium
+ author: dansimp
+ ms.author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 02/28/2019
+ ms.custom: bitlocker
+
+title: BitLocker frequently asked questions (FAQ) resources
+summary: |
+ **Applies to**
+ - Windows 10
+
+ This topic links to frequently asked questions about BitLocker. BitLocker is a data protection feature that encrypts drives on your computer to help prevent data theft or exposure. BitLocker-protected computers can also delete data more securely when they are decommissioned because it is much more difficult to recover deleted data from an encrypted drive than from a non-encrypted drive.
+
+ - [Overview and requirements](bitlocker-overview-and-requirements-faq.yml)
+ - [Upgrading](bitlocker-upgrading-faq.yml)
+ - [Deployment and administration](bitlocker-deployment-and-administration-faq.yml)
+ - [Key management](bitlocker-key-management-faq.yml)
+ - [BitLocker To Go](bitlocker-to-go-faq.yml)
+ - [Active Directory Domain Services (AD DS)](bitlocker-and-adds-faq.yml)
+ - [Security](bitlocker-security-faq.yml)
+ - [BitLocker Network Unlock](bitlocker-network-unlock-faq.yml)
+ - [Using BitLocker with other programs and general questions](bitlocker-using-with-other-programs-faq.yml)
+
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ More information
+ answer: |
+ - [Prepare your organization for BitLocker: Planning and Policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
+ - [BitLocker Group Policy settings](bitlocker-group-policy-settings.md)
+ - [BCD settings and BitLocker](bcd-settings-and-bitlocker.md)
+ - [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md)
+ - [BitLocker: How to deploy on Windows Server 2012](bitlocker-how-to-deploy-on-windows-server.md)
+ - [BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker](bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md)
+ - [BitLocker: Use BitLocker Recovery Password Viewer](bitlocker-use-bitlocker-recovery-password-viewer.md)
+ - [BitLocker Cmdlets in Windows PowerShell](/powershell/module/bitlocker/index?view=win10-ps&preserve-view=true)
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-group-policy-settings.md b/windows/security/information-protection/bitlocker/bitlocker-group-policy-settings.md
index 8406b92de0..b07187e9c4 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-group-policy-settings.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-group-policy-settings.md
@@ -211,7 +211,7 @@ This policy setting permits the use of enhanced PINs when you use an unlock meth
Enhanced startup PINs permit the use of characters (including uppercase and lowercase letters, symbols, numbers, and spaces). This policy setting is applied when you turn on BitLocker.
-> [!IMPORANT]
+> [!IMPORTANT]
> Not all computers support enhanced PIN characters in the preboot environment. It is strongly recommended that users perform a system check during the BitLocker setup to verify that enhanced PIN characters can be used.
### Configure minimum PIN length for startup
@@ -1341,6 +1341,6 @@ PCR 7 measurements are a mandatory logo requirement for systems that support Mod
- [Trusted Platform Module](/windows/device-security/tpm/trusted-platform-module-overview)
- [TPM Group Policy settings](/windows/device-security/tpm/trusted-platform-module-services-group-policy-settings)
-- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
+- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml)
- [BitLocker overview](bitlocker-overview.md)
-- [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
\ No newline at end of file
+- [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
diff --git a/windows/security/information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md b/windows/security/information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md
index 4ba7629cc0..5a619e7a83 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md
@@ -106,6 +106,6 @@ Enable-WindowsOptionalFeature -Online -FeatureName BitLocker, BitLocker-Utilitie
## More information
- [BitLocker overview](bitlocker-overview.md)
-- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
+- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml)
- [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
- [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md)
diff --git a/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md b/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md
index b69e88d45f..0327b8ec18 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md
@@ -387,5 +387,5 @@ Follow these steps to configure Network Unlock on these older systems.
## See also
- [BitLocker overview](bitlocker-overview.md)
-- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
+- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml)
- [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
diff --git a/windows/security/information-protection/bitlocker/bitlocker-key-management-faq.md b/windows/security/information-protection/bitlocker/bitlocker-key-management-faq.md
deleted file mode 100644
index 2845de6cfb..0000000000
--- a/windows/security/information-protection/bitlocker/bitlocker-key-management-faq.md
+++ /dev/null
@@ -1,124 +0,0 @@
----
-title: BitLocker Key Management FAQ (Windows 10)
-description: Browse frequently asked questions concerning the requirements to use, upgrade, deploy and administer, and key management policies for BitLocker.
-ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-ms.reviewer:
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 02/28/2019
-ms.custom: bitlocker
----
-
-# BitLocker Key Management FAQ
-
-**Applies to**
-- Windows 10
-
-## How can I authenticate or unlock my removable data drive?
-
-You can unlock removable data drives by using a password, a smart card, or you can configure a SID protector to unlock a drive by using your domain credentials. After you've started encryption, the drive can also be automatically unlocked on a specific computer for a specific user account. System administrators can configure which options are available for users, as well as password complexity and minimum length requirements. To unlock by using a SID protector, use Manage-bde:
-
-Manage-bde -protectors -add e: -sid domain\username
-
-## What is the difference between a recovery password, recovery key, PIN, enhanced PIN, and startup key?
-
-For tables that list and describe elements such as a recovery password, recovery key, and PIN, see [BitLocker key protectors](prepare-your-organization-for-bitlocker-planning-and-policies.md#bitlocker-key-protectors) and [BitLocker authentication methods](prepare-your-organization-for-bitlocker-planning-and-policies.md#bitlocker-authentication-methods).
-
-## How can the recovery password and recovery key be stored?
-
-The recovery password and recovery key for an operating system drive or a fixed data drive can be saved to a folder, saved to one or more USB devices, saved to your Microsoft Account, or printed.
-
-For removable data drives, the recovery password and recovery key can be saved to a folder, saved to your Microsoft Account, or printed. By default, you cannot store a recovery key for a removable drive on a removable drive.
-
-A domain administrator can additionally configure Group Policy to automatically generate recovery passwords and store them in Active Directory Domain Services (AD DS) for any BitLocker-protected drive.
-
-## Is it possible to add an additional method of authentication without decrypting the drive if I only have the TPM authentication method enabled?
-
-You can use the Manage-bde.exe command-line tool to replace your TPM-only authentication mode with a multifactor authentication mode. For example, if BitLocker is enabled with TPM authentication only and you want to add PIN authentication, use the following commands from an elevated command prompt, replacing *4-20 digit numeric PIN* with the numeric PIN you want to use:
-
-manage-bde –protectors –delete %systemdrive% -type tpm
-
-manage-bde –protectors –add %systemdrive% -tpmandpin 4-20 digit numeric PIN
-
-
-## When should an additional method of authentication be considered?
-
-New hardware that meets [Windows Hardware Compatibility Program](/windows-hardware/design/compatibility/) requirements make a PIN less critical as a mitigation, and having a TPM-only protector is likely sufficient when combined with policies like device lockout. For example, Surface Pro and Surface Book do not have external DMA ports to attack.
-For older hardware, where a PIN may be needed, it’s recommended to enable [enhanced PINs](bitlocker-group-policy-settings.md#bkmk-unlockpol2) that allow non-numeric characters such as letters and punctuation marks, and to set the PIN length based on your risk tolerance and the hardware anti-hammering capabilities available to the TPMs in your computers.
-
-## If I lose my recovery information, will the BitLocker-protected data be unrecoverable?
-
-BitLocker is designed to make the encrypted drive unrecoverable without the required authentication. When in recovery mode, the user needs the recovery password or recovery key to unlock the encrypted drive.
-
-> [!IMPORTANT]
-> Store the recovery information in AD DS, along with your Microsoft Account, or another safe location.
-
-## Can the USB flash drive that is used as the startup key also be used to store the recovery key?
-
-While this is technically possible, it is not a best practice to use one USB flash drive to store both keys. If the USB flash drive that contains your startup key is lost or stolen, you also lose access to your recovery key. In addition, inserting this key would cause your computer to automatically boot from the recovery key even if TPM-measured files have changed, which circumvents the TPM's system integrity check.
-
-## Can I save the startup key on multiple USB flash drives?
-
-Yes, you can save a computer's startup key on multiple USB flash drives. Right-clicking a BitLocker-protected drive and selecting **Manage BitLocker** will provide you the options to duplicate the recovery keys as needed.
-
-## Can I save multiple (different) startup keys on the same USB flash drive?
-
-Yes, you can save BitLocker startup keys for different computers on the same USB flash drive.
-
-## Can I generate multiple (different) startup keys for the same computer?
-
-You can generate different startup keys for the same computer through scripting. However, for computers that have a TPM, creating different startup keys prevents BitLocker from using the TPM's system integrity check.
-
-## Can I generate multiple PIN combinations?
-
-You cannot generate multiple PIN combinations.
-
-## What encryption keys are used in BitLocker? How do they work together?
-
-Raw data is encrypted with the full volume encryption key, which is then encrypted with the volume master key. The volume master key is in turn encrypted by one of several possible methods depending on your authentication (that is, key protectors or TPM) and recovery scenarios.
-
-## Where are the encryption keys stored?
-
-The full volume encryption key is encrypted by the volume master key and stored in the encrypted drive. The volume master key is encrypted by the appropriate key protector and stored in the encrypted drive. If BitLocker has been suspended, the clear key that is used to encrypt the volume master key is also stored in the encrypted drive, along with the encrypted volume master key.
-
-This storage process ensures that the volume master key is never stored unencrypted and is protected unless you disable BitLocker. The keys are also saved to two additional locations on the drive for redundancy. The keys can be read and processed by the boot manager.
-
-## Why do I have to use the function keys to enter the PIN or the 48-character recovery password?
-
-The F1 through F10 keys are universally mapped scan codes available in the pre-boot environment on all computers and in all languages. The numeric keys 0 through 9 are not usable in the pre-boot environment on all keyboards.
-
-When using an enhanced PIN, users should run the optional system check during the BitLocker setup process to ensure that the PIN can be entered correctly in the pre-boot environment.
-
-## How does BitLocker help prevent an attacker from discovering the PIN that unlocks my operating system drive?
-
-It is possible that a personal identification number (PIN) can be discovered by an attacker performing a brute force attack. A brute force attack occurs when an attacker uses an automated tool to try different PIN combinations until the correct one is discovered. For BitLocker-protected computers, this type of attack, also known as a dictionary attack, requires that the attacker have physical access to the computer.
-
-The TPM has the built-in ability to detect and react to these types of attacks. Because different manufacturers' TPMs may support different PIN and attack mitigations, contact your TPM's manufacturer to determine how your computer's TPM mitigates PIN brute force attacks.
-After you have determined your TPM's manufacturer, contact the manufacturer to gather the TPM's vendor-specific information. Most manufacturers use the PIN authentication failure count to exponentially increase lockout time to the PIN interface. However, each manufacturer has different policies regarding when and how the failure counter is decreased or reset.
-
-## How can I determine the manufacturer of my TPM?
-
-You can determine your TPM manufacturer in **Windows Defender Security Center** > **Device Security** > **Security processor details**.
-
-## How can I evaluate a TPM's dictionary attack mitigation mechanism?
-
-The following questions can assist you when asking a TPM manufacturer about the design of a dictionary attack mitigation mechanism:
-
-- How many failed authorization attempts can occur before lockout?
-- What is the algorithm for determining the duration of a lockout based on the number of failed attempts and any other relevant parameters?
-- What actions can cause the failure count and lockout duration to be decreased or reset?
-
-## Can PIN length and complexity be managed with Group Policy?
-
-Yes and No. You can configure the minimum personal identification number (PIN) length by using the **Configure minimum PIN length for startup** Group Policy setting and allow the use of alphanumeric PINs by enabling the **Allow enhanced PINs for startup** Group Policy setting. However, you cannot require PIN complexity by Group Policy.
-
-For more info, see [BitLocker Group Policy settings](bitlocker-group-policy-settings.md).
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-key-management-faq.yml b/windows/security/information-protection/bitlocker/bitlocker-key-management-faq.yml
new file mode 100644
index 0000000000..4413577e0b
--- /dev/null
+++ b/windows/security/information-protection/bitlocker/bitlocker-key-management-faq.yml
@@ -0,0 +1,121 @@
+### YamlMime:FAQ
+metadata:
+ title: BitLocker Key Management FAQ (Windows 10)
+ description: Browse frequently asked questions concerning the requirements to use, upgrade, deploy and administer, and key management policies for BitLocker.
+ ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
+ ms.reviewer:
+ ms.prod: w10
+ ms.mktglfcycl: explore
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: medium
+ author: dansimp
+ ms.author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 02/28/2019
+ ms.custom: bitlocker
+
+title: BitLocker Key Management FAQ
+summary: |
+ **Applies to**
+ - Windows 10
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: How can I authenticate or unlock my removable data drive?
+ answer: |
+ You can unlock removable data drives by using a password, a smart card, or you can configure a SID protector to unlock a drive by using your domain credentials. After you've started encryption, the drive can also be automatically unlocked on a specific computer for a specific user account. System administrators can configure which options are available for users, as well as password complexity and minimum length requirements. To unlock by using a SID protector, use Manage-bde:
+
+ Manage-bde -protectors -add e: -sid domain\username
+
+ - question: What is the difference between a recovery password, recovery key, PIN, enhanced PIN, and startup key?
+ answer: |
+ For tables that list and describe elements such as a recovery password, recovery key, and PIN, see [BitLocker key protectors](prepare-your-organization-for-bitlocker-planning-and-policies.md#bitlocker-key-protectors) and [BitLocker authentication methods](prepare-your-organization-for-bitlocker-planning-and-policies.md#bitlocker-authentication-methods).
+
+ - question: How can the recovery password and recovery key be stored?
+ answer: |
+ The recovery password and recovery key for an operating system drive or a fixed data drive can be saved to a folder, saved to one or more USB devices, saved to your Microsoft Account, or printed.
+
+ For removable data drives, the recovery password and recovery key can be saved to a folder, saved to your Microsoft Account, or printed. By default, you cannot store a recovery key for a removable drive on a removable drive.
+
+ A domain administrator can additionally configure Group Policy to automatically generate recovery passwords and store them in Active Directory Domain Services (AD DS) for any BitLocker-protected drive.
+
+ - question: Is it possible to add an additional method of authentication without decrypting the drive if I only have the TPM authentication method enabled?
+ answer: |
+ You can use the Manage-bde.exe command-line tool to replace your TPM-only authentication mode with a multifactor authentication mode. For example, if BitLocker is enabled with TPM authentication only and you want to add PIN authentication, use the following commands from an elevated command prompt, replacing *4-20 digit numeric PIN* with the numeric PIN you want to use:
+
+ manage-bde –protectors –delete %systemdrive% -type tpm
+
+ manage-bde –protectors –add %systemdrive% -tpmandpin 4-20 digit numeric PIN
+
+
+ - question: When should an additional method of authentication be considered?
+ answer: |
+ New hardware that meets [Windows Hardware Compatibility Program](/windows-hardware/design/compatibility/) requirements make a PIN less critical as a mitigation, and having a TPM-only protector is likely sufficient when combined with policies like device lockout. For example, Surface Pro and Surface Book do not have external DMA ports to attack.
+ For older hardware, where a PIN may be needed, it’s recommended to enable [enhanced PINs](bitlocker-group-policy-settings.md#bkmk-unlockpol2) that allow non-numeric characters such as letters and punctuation marks, and to set the PIN length based on your risk tolerance and the hardware anti-hammering capabilities available to the TPMs in your computers.
+
+ - question: If I lose my recovery information, will the BitLocker-protected data be unrecoverable?
+ answer: |
+ BitLocker is designed to make the encrypted drive unrecoverable without the required authentication. When in recovery mode, the user needs the recovery password or recovery key to unlock the encrypted drive.
+
+ > [!IMPORTANT]
+ > Store the recovery information in AD DS, along with your Microsoft Account, or another safe location.
+
+ - question: Can the USB flash drive that is used as the startup key also be used to store the recovery key?
+ answer: While this is technically possible, it is not a best practice to use one USB flash drive to store both keys. If the USB flash drive that contains your startup key is lost or stolen, you also lose access to your recovery key. In addition, inserting this key would cause your computer to automatically boot from the recovery key even if TPM-measured files have changed, which circumvents the TPM's system integrity check.
+
+ - question: Can I save the startup key on multiple USB flash drives?
+ answer: Yes, you can save a computer's startup key on multiple USB flash drives. Right-clicking a BitLocker-protected drive and selecting **Manage BitLocker** will provide you the options to duplicate the recovery keys as needed.
+
+ - question: Can I save multiple (different) startup keys on the same USB flash drive?
+ answer: Yes, you can save BitLocker startup keys for different computers on the same USB flash drive.
+
+ - question: Can I generate multiple (different) startup keys for the same computer?
+ answer: You can generate different startup keys for the same computer through scripting. However, for computers that have a TPM, creating different startup keys prevents BitLocker from using the TPM's system integrity check.
+
+ - question: Can I generate multiple PIN combinations?
+ answer: You cannot generate multiple PIN combinations.
+
+ - question: What encryption keys are used in BitLocker? How do they work together?
+ answer: Raw data is encrypted with the full volume encryption key, which is then encrypted with the volume master key. The volume master key is in turn encrypted by one of several possible methods depending on your authentication (that is, key protectors or TPM) and recovery scenarios.
+
+ - question: Where are the encryption keys stored?
+ answer: |
+ The full volume encryption key is encrypted by the volume master key and stored in the encrypted drive. The volume master key is encrypted by the appropriate key protector and stored in the encrypted drive. If BitLocker has been suspended, the clear key that is used to encrypt the volume master key is also stored in the encrypted drive, along with the encrypted volume master key.
+
+ This storage process ensures that the volume master key is never stored unencrypted and is protected unless you disable BitLocker. The keys are also saved to two additional locations on the drive for redundancy. The keys can be read and processed by the boot manager.
+
+ - question: Why do I have to use the function keys to enter the PIN or the 48-character recovery password?
+ answer: |
+ The F1 through F10 keys are universally mapped scan codes available in the pre-boot environment on all computers and in all languages. The numeric keys 0 through 9 are not usable in the pre-boot environment on all keyboards.
+
+ When using an enhanced PIN, users should run the optional system check during the BitLocker setup process to ensure that the PIN can be entered correctly in the pre-boot environment.
+
+ - question: How does BitLocker help prevent an attacker from discovering the PIN that unlocks my operating system drive?
+ answer: |
+ It is possible that a personal identification number (PIN) can be discovered by an attacker performing a brute force attack. A brute force attack occurs when an attacker uses an automated tool to try different PIN combinations until the correct one is discovered. For BitLocker-protected computers, this type of attack, also known as a dictionary attack, requires that the attacker have physical access to the computer.
+
+ The TPM has the built-in ability to detect and react to these types of attacks. Because different manufacturers' TPMs may support different PIN and attack mitigations, contact your TPM's manufacturer to determine how your computer's TPM mitigates PIN brute force attacks.
+ After you have determined your TPM's manufacturer, contact the manufacturer to gather the TPM's vendor-specific information. Most manufacturers use the PIN authentication failure count to exponentially increase lockout time to the PIN interface. However, each manufacturer has different policies regarding when and how the failure counter is decreased or reset.
+
+ - question: How can I determine the manufacturer of my TPM?
+ answer: You can determine your TPM manufacturer in **Windows Defender Security Center** > **Device Security** > **Security processor details**.
+
+ - question: How can I evaluate a TPM's dictionary attack mitigation mechanism?
+ answer: |
+ The following questions can assist you when asking a TPM manufacturer about the design of a dictionary attack mitigation mechanism:
+
+ - How many failed authorization attempts can occur before lockout?
+ - What is the algorithm for determining the duration of a lockout based on the number of failed attempts and any other relevant parameters?
+ - What actions can cause the failure count and lockout duration to be decreased or reset?
+
+ - question: Can PIN length and complexity be managed with Group Policy?
+ answer: |
+ Yes and No. You can configure the minimum personal identification number (PIN) length by using the **Configure minimum PIN length for startup** Group Policy setting and allow the use of alphanumeric PINs by enabling the **Allow enhanced PINs for startup** Group Policy setting. However, you cannot require PIN complexity by Group Policy.
+
+ For more info, see [BitLocker Group Policy settings](bitlocker-group-policy-settings.md).
diff --git a/windows/security/information-protection/bitlocker/bitlocker-management-for-enterprises.md b/windows/security/information-protection/bitlocker/bitlocker-management-for-enterprises.md
index 50b744ed8a..54f967207f 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-management-for-enterprises.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-management-for-enterprises.md
@@ -101,7 +101,7 @@ Enable-BitLocker -MountPoint "C:" -EncryptionMethod XtsAes256 -UsedSpaceOnly -Pi
## Related Articles
-[BitLocker: FAQs](bitlocker-frequently-asked-questions.md)
+[BitLocker: FAQs](bitlocker-frequently-asked-questions.yml)
[Microsoft BitLocker Administration and Management (MBAM)](/microsoft-desktop-optimization-pack/mbam-v25/)
diff --git a/windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.md b/windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.md
deleted file mode 100644
index 264ee0242a..0000000000
--- a/windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: BitLocker Network Unlock FAQ (Windows 10)
-description: Familiarize yourself with BitLocker Network Unlock. Learn how it can make desktop and server management easier within domain environments.
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 02/28/2019
-ms.reviewer:
-ms.custom: bitlocker
----
-
-# BitLocker Network Unlock FAQ
-
-**Applies to**
-- Windows 10
-
-BitLocker Network Unlock enables easier management for BitLocker-enabled desktops and servers that use the TPM+PIN protection method in a domain environment. When a computer that is connected to a wired corporate network is rebooted, Network Unlock allows the PIN entry prompt to be bypassed. It automatically unlocks BitLocker-protected operating system volumes by using a trusted key that is provided by the Windows Deployment Services server as its secondary authentication method.
-
-To use Network Unlock you must also have a PIN configured for your computer. When your computer is not connected to the network you will need to provide the PIN to unlock it.
-
-BitLocker Network Unlock has software and hardware requirements for both client computers, Windows Deployment services, and domain controllers that must be met before you can use it.
-
-Network Unlock uses two protectors, the TPM protector and the one provided by the network or by your PIN, whereas automatic unlock uses a single protector, the one stored in the TPM. If the computer is joined to a network without the key protector it will prompt you to enter your PIN. If the PIN is
-not available you will need to use the recovery key to unlock the computer if it can ot be connected to the network.
-
-For more info, see [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md).
-
-
diff --git a/windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.yml b/windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.yml
new file mode 100644
index 0000000000..17c1035e0b
--- /dev/null
+++ b/windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.yml
@@ -0,0 +1,40 @@
+### YamlMime:FAQ
+metadata:
+ title: BitLocker Network Unlock FAQ (Windows 10)
+ description: Familiarize yourself with BitLocker Network Unlock. Learn how it can make desktop and server management easier within domain environments.
+ ms.prod: w10
+ ms.mktglfcycl: explore
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: medium
+ author: dansimp
+ ms.author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 02/28/2019
+ ms.reviewer:
+ ms.custom: bitlocker
+
+title: BitLocker Network Unlock FAQ
+summary: |
+ **Applies to**
+ - Windows 10
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ BitLocker Network Unlock FAQ
+ answer: |
+ BitLocker Network Unlock enables easier management for BitLocker-enabled desktops and servers that use the TPM+PIN protection method in a domain environment. When a computer that is connected to a wired corporate network is rebooted, Network Unlock allows the PIN entry prompt to be bypassed. It automatically unlocks BitLocker-protected operating system volumes by using a trusted key that is provided by the Windows Deployment Services server as its secondary authentication method.
+
+ To use Network Unlock you must also have a PIN configured for your computer. When your computer is not connected to the network you will need to provide the PIN to unlock it.
+
+ BitLocker Network Unlock has software and hardware requirements for both client computers, Windows Deployment services, and domain controllers that must be met before you can use it.
+
+ Network Unlock uses two protectors, the TPM protector and the one provided by the network or by your PIN, whereas automatic unlock uses a single protector, the one stored in the TPM. If the computer is joined to a network without the key protector it will prompt you to enter your PIN. If the PIN is
+ not available you will need to use the recovery key to unlock the computer if it can ot be connected to the network.
+
+ For more info, see [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md).
diff --git a/windows/security/information-protection/bitlocker/bitlocker-overview.md b/windows/security/information-protection/bitlocker/bitlocker-overview.md
index fbd06cf9c0..60ab1074cd 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-overview.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-overview.md
@@ -85,7 +85,7 @@ When installing the BitLocker optional component on a server you will also need
| Topic | Description |
| - | - |
| [Overview of BitLocker Device Encryption in Windows 10](bitlocker-device-encryption-overview-windows-10.md) | This topic for the IT professional provides an overview of the ways that BitLocker Device Encryption can help protect data on devices running Windows 10. |
-| [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md) | This topic for the IT professional answers frequently asked questions concerning the requirements to use, upgrade, deploy and administer, and key management policies for BitLocker.|
+| [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml) | This topic for the IT professional answers frequently asked questions concerning the requirements to use, upgrade, deploy and administer, and key management policies for BitLocker.|
| [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)| This topic for the IT professional explains how can you plan your BitLocker deployment. |
| [BitLocker basic deployment](bitlocker-basic-deployment.md) | This topic for the IT professional explains how BitLocker features can be used to protect your data through drive encryption. |
| [BitLocker: How to deploy on Windows Server](bitlocker-how-to-deploy-on-windows-server.md)| This topic for the IT professional explains how to deploy BitLocker on Windows Server.|
diff --git a/windows/security/information-protection/bitlocker/bitlocker-security-faq.md b/windows/security/information-protection/bitlocker/bitlocker-security-faq.md
deleted file mode 100644
index 18684bd289..0000000000
--- a/windows/security/information-protection/bitlocker/bitlocker-security-faq.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: BitLocker Security FAQ (Windows 10)
-description: Learn more about how BitLocker security works. Browse frequently asked questions, such as, "What form of encryption does BitLocker use?"
-ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-ms.reviewer:
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 02/28/2019
-ms.custom: bitlocker
----
-
-# BitLocker Security FAQ
-
-**Applies to**
-- Windows 10
-
-
-## What form of encryption does BitLocker use? Is it configurable?
-
-BitLocker uses Advanced Encryption Standard (AES) as its encryption algorithm with configurable key lengths of 128 bits or 256 bits. The default encryption setting is AES-128, but the options are configurable by using Group Policy.
-
-## What is the best practice for using BitLocker on an operating system drive?
-
-The recommended practice for BitLocker configuration on an operating system drive is to implement BitLocker on a computer with a TPM version 1.2 or higher, and a Trusted Computing Group (TCG)-compliant BIOS or UEFI firmware implementation, along with a PIN. By requiring a PIN that was set by the user in addition to the TPM validation, a malicious user that has physical access to the computer cannot simply start the computer.
-
-## What are the implications of using the sleep or hibernate power management options?
-
-BitLocker on operating system drives in its basic configuration (with a TPM but without other startup authentication) provides extra security for the hibernate mode. However, BitLocker provides greater security when it is configured to use an another startup authentication factor (TPM+PIN, TPM+USB, or TPM+PIN+USB) with the hibernate mode. This method is more secure because returning from hibernation requires authentication. For improved security, we recommend disabling sleep mode and that you use TPM+PIN for the authentication method. Startup authentication can be configured by using [Group Policy](./bitlocker-group-policy-settings.md) or Mobile Device Management with the [BitLocker CSP](/windows/client-management/mdm/bitlocker-csp).
-
-## What are the advantages of a TPM?
-
-Most operating systems use a shared memory space and rely on the operating system to manage physical memory. A TPM is a hardware component that uses its own internal firmware and logic circuits for processing instructions, thus shielding it from external software vulnerabilities. Attacking the TPM requires physical access to the computer. Additionally, the tools and skills necessary to attack hardware are often more expensive, and usually are not as available as the ones used to attack software. And because each TPM is unique to the computer that contains it, attacking multiple TPM computers would be difficult and time-consuming.
-
-> [!NOTE]
-> Configuring BitLocker with an additional factor of authentication provides even more protection against TPM hardware attacks.
diff --git a/windows/security/information-protection/bitlocker/bitlocker-security-faq.yml b/windows/security/information-protection/bitlocker/bitlocker-security-faq.yml
new file mode 100644
index 0000000000..bb50bfcba5
--- /dev/null
+++ b/windows/security/information-protection/bitlocker/bitlocker-security-faq.yml
@@ -0,0 +1,53 @@
+### YamlMime:FAQ
+metadata:
+ title: BitLocker Security FAQ (Windows 10)
+ description: Learn more about how BitLocker security works. Browse frequently asked questions, such as, "What form of encryption does BitLocker use?"
+ ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
+ ms.reviewer:
+ ms.prod: w10
+ ms.mktglfcycl: explore
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: medium
+ author: dansimp
+ ms.author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 02/28/2019
+ ms.custom: bitlocker
+
+title: BitLocker Security FAQ
+summary: |
+ **Applies to**
+ - Windows 10
+
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ What form of encryption does BitLocker use? Is it configurable?
+ answer: |
+ BitLocker uses Advanced Encryption Standard (AES) as its encryption algorithm with configurable key lengths of 128 bits or 256 bits. The default encryption setting is AES-128, but the options are configurable by using Group Policy.
+
+ - question: |
+ What is the best practice for using BitLocker on an operating system drive?
+ answer: |
+ The recommended practice for BitLocker configuration on an operating system drive is to implement BitLocker on a computer with a TPM version 1.2 or higher, and a Trusted Computing Group (TCG)-compliant BIOS or UEFI firmware implementation, along with a PIN. By requiring a PIN that was set by the user in addition to the TPM validation, a malicious user that has physical access to the computer cannot simply start the computer.
+
+ - question: |
+ What are the implications of using the sleep or hibernate power management options?
+ answer: |
+ BitLocker on operating system drives in its basic configuration (with a TPM but without other startup authentication) provides extra security for the hibernate mode. However, BitLocker provides greater security when it is configured to use an another startup authentication factor (TPM+PIN, TPM+USB, or TPM+PIN+USB) with the hibernate mode. This method is more secure because returning from hibernation requires authentication. For improved security, we recommend disabling sleep mode and that you use TPM+PIN for the authentication method. Startup authentication can be configured by using [Group Policy](./bitlocker-group-policy-settings.md) or Mobile Device Management with the [BitLocker CSP](/windows/client-management/mdm/bitlocker-csp).
+
+ - question: |
+ What are the advantages of a TPM?
+ answer: |
+ Most operating systems use a shared memory space and rely on the operating system to manage physical memory. A TPM is a hardware component that uses its own internal firmware and logic circuits for processing instructions, thus shielding it from external software vulnerabilities. Attacking the TPM requires physical access to the computer. Additionally, the tools and skills necessary to attack hardware are often more expensive, and usually are not as available as the ones used to attack software. And because each TPM is unique to the computer that contains it, attacking multiple TPM computers would be difficult and time-consuming.
+
+ > [!NOTE]
+ > Configuring BitLocker with an additional factor of authentication provides even more protection against TPM hardware attacks.
+
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.md b/windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.md
deleted file mode 100644
index 320a07d296..0000000000
--- a/windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: BitLocker Upgrading FAQ (Windows 10)
-description: Learn more about upgrading systems that have BitLocker enabled. Find frequently asked questions, such as, "Can I upgrade to Windows 10 with BitLocker enabled?"
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 02/28/2019
-ms.reviewer:
-ms.custom: bitlocker
----
-
-# BitLocker Upgrading FAQ
-
-**Applies to**
-- Windows 10
-
-## Can I upgrade to Windows 10 with BitLocker enabled?
-
-Yes.
-
-## What is the difference between suspending and decrypting BitLocker?
-
-**Decrypt** completely removes BitLocker protection and fully decrypts the drive.
-
-**Suspend** keeps the data encrypted but encrypts the BitLocker volume master key with a clear key. The clear key is a cryptographic key stored unencrypted and unprotected on the disk drive. By storing this key unencrypted, the **Suspend** option allows for changes or upgrades to the computer without the time and cost of decrypting and re-encrypting the entire drive. After the changes are made and BitLocker is again enabled, BitLocker will reseal the encryption key to the new values of the measured components that changed as a part of the upgrade, the volume master key is changed, the protectors are updated to match and the clear key is erased.
-
-## Do I have to suspend BitLocker protection to download and install system updates and upgrades?
-
-No user action is required for BitLocker in order to apply updates from Microsoft, including [Windows quality updates and feature updates](/windows/deployment/update/waas-quick-start).
-Users need to suspend BitLocker for Non-Microsoft software updates, such as:
-
-- Some TPM firmware updates if these updates clear the TPM outside of the Windows API. Not every TPM firmware update will clear the TPM and this happens if a known vulnerability has been discovered in the TPM firmware. Users don’t have to suspend BitLocker if the TPM firmware update uses Windows API to clear the TPM because in this case, BitLocker will be automatically suspended. We recommend users testing their TPM firmware updates if they don’t want to suspend BitLocker protection.
-- Non-Microsoft application updates that modify the UEFI\BIOS configuration.
-- Manual or third-party updates to secure boot databases (only if BitLocker uses Secure Boot for integrity validation).
-- Updates to UEFI\BIOS firmware, installation of additional UEFI drivers, or UEFI applications without using the Windows update mechanism (only if you update and BitLocker does not use Secure Boot for integrity validation).
- - You can check if BitLocker uses Secure Boot for integrity validation with manage-bde -protectors -get C: (and see if "Uses Secure Boot for integrity validation" is reported).
-
-
-> [!NOTE]
-> If you have suspended BitLocker, you can resume BitLocker protection after you have installed the upgrade or update. Upon resuming protection, BitLocker will reseal the encryption key to the new values of the measured components that changed as a part of the upgrade or update. If these types of upgrades or updates are applied without suspending BitLocker, your computer will enter recovery mode when restarting and will require a recovery key or password to access the computer.
diff --git a/windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.yml b/windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.yml
new file mode 100644
index 0000000000..6cb7eaa23e
--- /dev/null
+++ b/windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.yml
@@ -0,0 +1,55 @@
+### YamlMime:FAQ
+metadata:
+ title: BitLocker Upgrading FAQ (Windows 10)
+ description: Learn more about upgrading systems that have BitLocker enabled. Find frequently asked questions, such as, "Can I upgrade to Windows 10 with BitLocker enabled?"
+ ms.prod: w10
+ ms.mktglfcycl: explore
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: medium
+ author: dansimp
+ ms.author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 02/28/2019
+ ms.reviewer:
+ ms.custom: bitlocker
+
+title: BitLocker Upgrading FAQ
+summary: |
+ **Applies to**
+ - Windows 10
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ Can I upgrade to Windows 10 with BitLocker enabled?
+ answer: |
+ Yes.
+
+ - question: |
+ What is the difference between suspending and decrypting BitLocker?
+ answer: |
+ **Decrypt** completely removes BitLocker protection and fully decrypts the drive.
+
+ **Suspend** keeps the data encrypted but encrypts the BitLocker volume master key with a clear key. The clear key is a cryptographic key stored unencrypted and unprotected on the disk drive. By storing this key unencrypted, the **Suspend** option allows for changes or upgrades to the computer without the time and cost of decrypting and re-encrypting the entire drive. After the changes are made and BitLocker is again enabled, BitLocker will reseal the encryption key to the new values of the measured components that changed as a part of the upgrade, the volume master key is changed, the protectors are updated to match and the clear key is erased.
+
+ - question: |
+ Do I have to suspend BitLocker protection to download and install system updates and upgrades?
+ answer: |
+ No user action is required for BitLocker in order to apply updates from Microsoft, including [Windows quality updates and feature updates](/windows/deployment/update/waas-quick-start).
+ Users need to suspend BitLocker for Non-Microsoft software updates, such as:
+
+ - Some TPM firmware updates if these updates clear the TPM outside of the Windows API. Not every TPM firmware update will clear the TPM and this happens if a known vulnerability has been discovered in the TPM firmware. Users don’t have to suspend BitLocker if the TPM firmware update uses Windows API to clear the TPM because in this case, BitLocker will be automatically suspended. We recommend users testing their TPM firmware updates if they don’t want to suspend BitLocker protection.
+ - Non-Microsoft application updates that modify the UEFI\BIOS configuration.
+ - Manual or third-party updates to secure boot databases (only if BitLocker uses Secure Boot for integrity validation).
+ - Updates to UEFI\BIOS firmware, installation of additional UEFI drivers, or UEFI applications without using the Windows update mechanism (only if you update and BitLocker does not use Secure Boot for integrity validation).
+ - You can check if BitLocker uses Secure Boot for integrity validation with manage-bde -protectors -get C: (and see if "Uses Secure Boot for integrity validation" is reported).
+
+
+ > [!NOTE]
+ > If you have suspended BitLocker, you can resume BitLocker protection after you have installed the upgrade or update. Upon resuming protection, BitLocker will reseal the encryption key to the new values of the measured components that changed as a part of the upgrade or update. If these types of upgrades or updates are applied without suspending BitLocker, your computer will enter recovery mode when restarting and will require a recovery key or password to access the computer.
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md b/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
index 61ab5efe80..c6483a8057 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
@@ -332,7 +332,7 @@ Add-BitLockerKeyProtector C: -ADAccountOrGroupProtector -ADAccountOrGroup S-1-5-
## More information
- [BitLocker overview](bitlocker-overview.md)
-- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
+- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml)
- [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
- [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md)
- [BitLocker: How to deploy on Windows Server 2012](bitlocker-how-to-deploy-on-windows-server.md)
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md b/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md
index 1bc4358ba0..ce88a53275 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md
@@ -58,7 +58,7 @@ By completing the procedures in this scenario, you have viewed and copied the re
## More information
- [BitLocker Overview](bitlocker-overview.md)
-- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
+- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml)
- [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
- [BitLocker: How to deploy on Windows Server 2012](bitlocker-how-to-deploy-on-windows-server.md)
- [BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker](bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md)
diff --git a/windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.md b/windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.md
deleted file mode 100644
index 10c1964f58..0000000000
--- a/windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-title: Using BitLocker with other programs FAQ (Windows 10)
-description: Learn how to integrate BitLocker with other software on your device.
-ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-ms.reviewer:
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: dansimp
-ms.author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 02/28/2019
-ms.custom: bitlocker
----
-
-# Using BitLocker with other programs FAQ
-
-**Applies to**
-- Windows 10
-
-## Can I use EFS with BitLocker?
-
-Yes, you can use Encrypting File System (EFS) to encrypt files on a BitLocker-protected drive. BitLocker helps protect the entire operating system drive against offline attacks, whereas EFS can provide additional user-based file level encryption for security separation between multiple users of the same computer. You can also use EFS in Windows to encrypt files on other drives that are not encrypted by BitLocker. The root secrets of EFS are stored by default on the operating system drive; therefore, if BitLocker is enabled for the operating system drive, data that is encrypted by EFS on other drives is also indirectly protected by BitLocker.
-
-## Can I run a kernel debugger with BitLocker?
-
-Yes. However, the debugger should be turned on before enabling BitLocker. Turning on the debugger ensures that the correct measurements are calculated when sealing to the TPM, allowing the computer to start properly. If you need to turn debugging on or off when using BitLocker, be sure to suspend BitLocker first to avoid putting your computer into recovery mode.
-
-## How does BitLocker handle memory dumps?
-
-BitLocker has a storage driver stack that ensures memory dumps are encrypted when BitLocker is enabled.
-
-## Can BitLocker support smart cards for pre-boot authentication?
-
-BitLocker does not support smart cards for pre-boot authentication. There is no single industry standard for smart card support in the firmware, and most computers either do not implement firmware support for smart cards, or only support specific smart cards and readers. This lack of standardization makes supporting them difficult.
-
-## Can I use a non-Microsoft TPM driver?
-
-Microsoft does not support non-Microsoft TPM drivers and strongly recommends against using them with BitLocker. Attempting to use a non-Microsoft TPM driver with BitLocker may cause BitLocker to report that a TPM is not present on the computer and not allow the TPM to be used with BitLocker.
-
-## Can other tools that manage or modify the master boot record work with BitLocker?
-
-We do not recommend modifying the master boot record on computers whose operating system drives are BitLocker-protected for a number of security, reliability, and product support reasons. Changes to the master boot record (MBR) could change the security environment and prevent the computer from starting normally, as well as complicate any efforts to recover from a corrupted MBR. Changes made to the MBR by anything other than Windows might force the computer into recovery mode or prevent it from booting entirely.
-
-## Why is the system check failing when I am encrypting my operating system drive?
-
-The system check is designed to ensure your computer's BIOS or UEFI firmware is compatible with BitLocker and that the TPM is working correctly. The system check can fail for several reasons:
-
-- The computer's BIOS or UEFI firmware cannot read USB flash drives.
-- The computer's BIOS, uEFI firmware, or boot menu does not have reading USB flash drives enabled.
-- There are multiple USB flash drives inserted into the computer.
-- The PIN was not entered correctly.
-- The computer's BIOS or UEFI firmware only supports using the function keys (F1–F10) to enter numerals in the pre-boot environment.
-- The startup key was removed before the computer finished rebooting.
-- The TPM has malfunctioned and fails to unseal the keys.
-
-## What can I do if the recovery key on my USB flash drive cannot be read?
-
-Some computers cannot read USB flash drives in the pre-boot environment. First, check your BIOS or UEFI firmware and boot settings to ensure that the use of USB drives is enabled. If it is not enabled, enable the use of USB drives in the BIOS or UEFI firmware and boot settings and then try to read the recovery key from the USB flash drive again. If it still cannot be read, you will have to mount the hard drive as a data drive on another computer so that there is an operating system to attempt to read the recovery key from the USB flash drive. If the USB flash drive has been corrupted or damaged, you may need to supply a recovery password or use the recovery information that was backed up to AD DS. Also, if you are using the recovery key in the pre-boot environment, ensure that the drive is formatted by using the NTFS, FAT16, or FAT32 file system.
-
-## Why am I unable to save my recovery key to my USB flash drive?
-
-The **Save to USB** option is not shown by default for removable drives. If the option is unavailable, it means that a system administrator has disallowed the use of recovery keys.
-
-## Why am I unable to automatically unlock my drive?
-
-Automatic unlocking for fixed data drives requires the operating system drive to also be protected by BitLocker. If you are using a computer that does not have a BitLocker-protected operating system drive, the drive cannot be automatically unlocked. For removable data drives, you can add automatic unlocking by right-clicking the drive in Windows Explorer and clicking **Manage BitLocker**. You will still be able to use the password or smart card credentials you supplied when you turned on BitLocker to unlock the removable drive on other computers.
-
-## Can I use BitLocker in Safe Mode?
-
-Limited BitLocker functionality is available in Safe Mode. BitLocker-protected drives can be unlocked and decrypted by using the **BitLocker Drive Encryption** Control Panel item. Right-clicking to access BitLocker options from Windows Explorer is not available in Safe Mode.
-
-## How do I "lock" a data drive?
-
-Both fixed and removable data drives can be locked by using the Manage-bde command-line tool and the –lock command.
-
-> [!NOTE]
-> Ensure all data is saved to the drive before locking it. Once locked, the drive will become inaccessible.
-
-The syntax of this command is:
-
-manage-bde driveletter -lock
-
-Outside of using this command, data drives will be locked on shutdown and restart of the operating system. A removable data drive will also be locked automatically when the drive is removed from the computer.
-
-## Can I use BitLocker with the Volume Shadow Copy Service?
-
-Yes. However, shadow copies made prior to enabling BitLocker will be automatically deleted when BitLocker is enabled on software-encrypted drives. If you are using a hardware encrypted drive, the shadow copies are retained.
-
-## Does BitLocker support virtual hard disks (VHDs)?
-
-BitLocker should work like any specific physical machine within its hardware limitations as long as the environment (physical or virtual) meets Windows Operating System requirements to run.
-- With TPM: Yes, it is supported.
-- Without TPM: Yes, it is supported (with password protector).
-
-BitLocker is also supported on data volume VHDs, such as those used by clusters, if you are running Windows 10, Windows 8.1, Windows 8, Windows Server 2016, Windows Server 2012 R2, or Windows Server 2012.
-
-## Can I use BitLocker with virtual machines (VMs)?
-
-Yes. Password protectors and virtual TPMs can be used with BitLocker to protect virtual machines. VMs can be domain joined, Azure AD-joined, or workplace-joined (via **Settings** > **Accounts** > **Access work or school** > **Connect**) to receive policy. You can enable encryption either while creating the VM or by using other existing management tools such as the BitLocker CSP, or even by using a startup script or logon script delivered by Group Policy. Windows Server 2016 also supports [Shielded VMs and guarded fabric](/windows-server/virtualization/guarded-fabric-shielded-vm/guarded-fabric-and-shielded-vms-top-node) to protect VMs from malicious administrators.
\ No newline at end of file
diff --git a/windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml b/windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml
new file mode 100644
index 0000000000..1a02bc65c8
--- /dev/null
+++ b/windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml
@@ -0,0 +1,124 @@
+### YamlMime:FAQ
+metadata:
+ title: Using BitLocker with other programs FAQ (Windows 10)
+ description: Learn how to integrate BitLocker with other software on your device.
+ ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
+ ms.reviewer:
+ ms.prod: w10
+ ms.mktglfcycl: explore
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: medium
+ author: dansimp
+ ms.author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 02/28/2019
+ ms.custom: bitlocker
+
+title: Using BitLocker with other programs FAQ
+summary: |
+ **Applies to**
+ - Windows 10
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ Can I use EFS with BitLocker?
+ answer: |
+ Yes, you can use Encrypting File System (EFS) to encrypt files on a BitLocker-protected drive. BitLocker helps protect the entire operating system drive against offline attacks, whereas EFS can provide additional user-based file level encryption for security separation between multiple users of the same computer. You can also use EFS in Windows to encrypt files on other drives that are not encrypted by BitLocker. The root secrets of EFS are stored by default on the operating system drive; therefore, if BitLocker is enabled for the operating system drive, data that is encrypted by EFS on other drives is also indirectly protected by BitLocker.
+
+ - question: |
+ Can I run a kernel debugger with BitLocker?
+ answer: |
+ Yes. However, the debugger should be turned on before enabling BitLocker. Turning on the debugger ensures that the correct measurements are calculated when sealing to the TPM, allowing the computer to start properly. If you need to turn debugging on or off when using BitLocker, be sure to suspend BitLocker first to avoid putting your computer into recovery mode.
+
+ - question: |
+ How does BitLocker handle memory dumps?
+ answer: |
+ BitLocker has a storage driver stack that ensures memory dumps are encrypted when BitLocker is enabled.
+
+ - question: |
+ Can BitLocker support smart cards for pre-boot authentication?
+ answer: |
+ BitLocker does not support smart cards for pre-boot authentication. There is no single industry standard for smart card support in the firmware, and most computers either do not implement firmware support for smart cards, or only support specific smart cards and readers. This lack of standardization makes supporting them difficult.
+
+ - question: |
+ Can I use a non-Microsoft TPM driver?
+ answer: |
+ Microsoft does not support non-Microsoft TPM drivers and strongly recommends against using them with BitLocker. Attempting to use a non-Microsoft TPM driver with BitLocker may cause BitLocker to report that a TPM is not present on the computer and not allow the TPM to be used with BitLocker.
+
+ - question: |
+ Can other tools that manage or modify the master boot record work with BitLocker?
+ answer: |
+ We do not recommend modifying the master boot record on computers whose operating system drives are BitLocker-protected for a number of security, reliability, and product support reasons. Changes to the master boot record (MBR) could change the security environment and prevent the computer from starting normally, as well as complicate any efforts to recover from a corrupted MBR. Changes made to the MBR by anything other than Windows might force the computer into recovery mode or prevent it from booting entirely.
+
+ - question: |
+ Why is the system check failing when I am encrypting my operating system drive?
+ answer: |
+ The system check is designed to ensure your computer's BIOS or UEFI firmware is compatible with BitLocker and that the TPM is working correctly. The system check can fail for several reasons:
+
+ - The computer's BIOS or UEFI firmware cannot read USB flash drives.
+ - The computer's BIOS, uEFI firmware, or boot menu does not have reading USB flash drives enabled.
+ - There are multiple USB flash drives inserted into the computer.
+ - The PIN was not entered correctly.
+ - The computer's BIOS or UEFI firmware only supports using the function keys (F1–F10) to enter numerals in the pre-boot environment.
+ - The startup key was removed before the computer finished rebooting.
+ - The TPM has malfunctioned and fails to unseal the keys.
+
+ - question: |
+ What can I do if the recovery key on my USB flash drive cannot be read?
+ answer: |
+ Some computers cannot read USB flash drives in the pre-boot environment. First, check your BIOS or UEFI firmware and boot settings to ensure that the use of USB drives is enabled. If it is not enabled, enable the use of USB drives in the BIOS or UEFI firmware and boot settings and then try to read the recovery key from the USB flash drive again. If it still cannot be read, you will have to mount the hard drive as a data drive on another computer so that there is an operating system to attempt to read the recovery key from the USB flash drive. If the USB flash drive has been corrupted or damaged, you may need to supply a recovery password or use the recovery information that was backed up to AD DS. Also, if you are using the recovery key in the pre-boot environment, ensure that the drive is formatted by using the NTFS, FAT16, or FAT32 file system.
+
+ - question: |
+ Why am I unable to save my recovery key to my USB flash drive?
+ answer: |
+ The **Save to USB** option is not shown by default for removable drives. If the option is unavailable, it means that a system administrator has disallowed the use of recovery keys.
+
+ - question: |
+ Why am I unable to automatically unlock my drive?
+ answer: |
+ Automatic unlocking for fixed data drives requires the operating system drive to also be protected by BitLocker. If you are using a computer that does not have a BitLocker-protected operating system drive, the drive cannot be automatically unlocked. For removable data drives, you can add automatic unlocking by right-clicking the drive in Windows Explorer and clicking **Manage BitLocker**. You will still be able to use the password or smart card credentials you supplied when you turned on BitLocker to unlock the removable drive on other computers.
+
+ - question: |
+ Can I use BitLocker in Safe Mode?
+ answer: |
+ Limited BitLocker functionality is available in Safe Mode. BitLocker-protected drives can be unlocked and decrypted by using the **BitLocker Drive Encryption** Control Panel item. Right-clicking to access BitLocker options from Windows Explorer is not available in Safe Mode.
+
+ - question: |
+ How do I "lock" a data drive?
+ answer: |
+ Both fixed and removable data drives can be locked by using the Manage-bde command-line tool and the –lock command.
+
+ > [!NOTE]
+ > Ensure all data is saved to the drive before locking it. Once locked, the drive will become inaccessible.
+
+ The syntax of this command is:
+
+ manage-bde driveletter -lock
+
+ Outside of using this command, data drives will be locked on shutdown and restart of the operating system. A removable data drive will also be locked automatically when the drive is removed from the computer.
+
+ - question: |
+ Can I use BitLocker with the Volume Shadow Copy Service?
+ answer: |
+ Yes. However, shadow copies made prior to enabling BitLocker will be automatically deleted when BitLocker is enabled on software-encrypted drives. If you are using a hardware encrypted drive, the shadow copies are retained.
+
+ - question: |
+ Does BitLocker support virtual hard disks (VHDs)?
+ answer: |
+ BitLocker should work like any specific physical machine within its hardware limitations as long as the environment (physical or virtual) meets Windows Operating System requirements to run.
+ - With TPM: Yes, it is supported.
+ - Without TPM: Yes, it is supported (with password protector).
+
+ BitLocker is also supported on data volume VHDs, such as those used by clusters, if you are running Windows 10, Windows 8.1, Windows 8, Windows Server 2016, Windows Server 2012 R2, or Windows Server 2012.
+
+ - question: |
+ Can I use BitLocker with virtual machines (VMs)?
+ answer: |
+ Yes. Password protectors and virtual TPMs can be used with BitLocker to protect virtual machines. VMs can be domain joined, Azure AD-joined, or workplace-joined (via **Settings** > **Accounts** > **Access work or school** > **Connect**) to receive policy. You can enable encryption either while creating the VM or by using other existing management tools such as the BitLocker CSP, or even by using a startup script or logon script delivered by Group Policy. Windows Server 2016 also supports [Shielded VMs and guarded fabric](/windows-server/virtualization/guarded-fabric-shielded-vm/guarded-fabric-and-shielded-vms-top-node) to protect VMs from malicious administrators.
diff --git a/windows/security/information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md b/windows/security/information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md
index b35fc616de..b3b6894cac 100644
--- a/windows/security/information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md
+++ b/windows/security/information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md
@@ -196,7 +196,7 @@ However, you cannot use recovery passwords generated on a system in FIPS mode fo
- [Trusted Platform Module](../tpm/trusted-platform-module-top-node.md)
- [TPM Group Policy settings](../tpm/trusted-platform-module-services-group-policy-settings.md)
-- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
+- [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.yml)
- [BitLocker](bitlocker-overview.md)
- [BitLocker Group Policy settings](bitlocker-group-policy-settings.md)
- [BitLocker basic deployment](bitlocker-basic-deployment.md)
\ No newline at end of file
diff --git a/windows/security/threat-protection/TOC.md b/windows/security/threat-protection/TOC.md
deleted file mode 100644
index deecff4786..0000000000
--- a/windows/security/threat-protection/TOC.md
+++ /dev/null
@@ -1,726 +0,0 @@
-# [Threat protection](index.md)
-
-## [Next-generation protection with Microsoft Defender Antivirus]()
-### [Microsoft Defender Antivirus overview](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-in-windows-10)
-### [Evaluate Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/evaluate-microsoft-defender-antivirus)
-
-### [Configure Microsoft Defender Antivirus]()
-#### [Configure Microsoft Defender Antivirus features](/microsoft-365/security/defender-endpoint/configure-microsoft-defender-antivirus-features)
-
-#### [Use Microsoft cloud-delivered protection](/microsoft-365/security/defender-endpoint/cloud-protection-microsoft-defender-antivirus)
-##### [Prevent security settings changes with tamper protection](/microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection)
-##### [Enable Block at first sight](/microsoft-365/security/defender-endpoint/configure-block-at-first-sight-microsoft-defender-antivirus)
-##### [Configure the cloud block timeout period](/microsoft-365/security/defender-endpoint/configure-cloud-block-timeout-period-microsoft-defender-antivirus)
-
-#### [Configure behavioral, heuristic, and real-time protection]()
-##### [Configuration overview](/microsoft-365/security/defender-endpoint/configure-protection-features-microsoft-defender-antivirus)
-##### [Detect and block Potentially Unwanted Applications](/microsoft-365/security/defender-endpoint/detect-block-potentially-unwanted-apps-microsoft-defender-antivirus)
-##### [Enable and configure always-on protection and monitoring](/microsoft-365/security/defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus)
-
-#### [Antivirus on Windows Server](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-on-windows-server)
-
-#### [Antivirus compatibility]()
-##### [Compatibility charts](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility)
-##### [Use limited periodic antivirus scanning](/microsoft-365/security/defender-endpoint/limited-periodic-scanning-microsoft-defender-antivirus)
-
-#### [Manage Microsoft Defender Antivirus in your business]()
-##### [Management overview](/microsoft-365/security/defender-endpoint/configuration-management-reference-microsoft-defender-antivirus)
-##### [Use Microsoft Intune and Microsoft Endpoint Manager to manage Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/use-intune-config-manager-microsoft-defender-antivirus)
-##### [Use Group Policy settings to manage Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/use-group-policy-microsoft-defender-antivirus)
-##### [Use PowerShell cmdlets to manage Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/use-powershell-cmdlets-microsoft-defender-antivirus)
-##### [Use Windows Management Instrumentation (WMI) to manage Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/use-wmi-microsoft-defender-antivirus)
-##### [Use the mpcmdrun.exe command line tool to manage Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/command-line-arguments-microsoft-defender-antivirus)
-
-#### [Deploy, manage updates, and report on Microsoft Defender Antivirus]()
-##### [Preparing to deploy](/microsoft-365/security/defender-endpoint/deploy-manage-report-microsoft-defender-antivirus)
-##### [Deploy and enable Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/deploy-microsoft-defender-antivirus)
-##### [Deployment guide for VDI environments](/microsoft-365/security/defender-endpoint/deployment-vdi-microsoft-defender-antivirus)
-
-##### [Report on antivirus protection]()
-##### [Review protection status and alerts](/microsoft-365/security/defender-endpoint/report-monitor-microsoft-defender-antivirus)
-##### [Troubleshoot antivirus reporting in Update Compliance](/microsoft-365/security/defender-endpoint/troubleshoot-reporting)
-##### [Learn about the recent updates](/microsoft-365/security/defender-endpoint/manage-updates-baselines-microsoft-defender-antivirus)
-##### [Manage protection and security intelligence updates](/microsoft-365/security/defender-endpoint/manage-protection-updates-microsoft-defender-antivirus)
-##### [Manage when protection updates should be downloaded and applied](/microsoft-365/security/defender-endpoint/manage-protection-update-schedule-microsoft-defender-antivirus)
-##### [Manage updates for endpoints that are out of date](/microsoft-365/security/defender-endpoint/manage-outdated-endpoints-microsoft-defender-antivirus)
-##### [Manage event-based forced updates](/microsoft-365/security/defender-endpoint/manage-event-based-updates-microsoft-defender-antivirus)
-##### [Manage updates for mobile devices and VMs](/microsoft-365/security/defender-endpoint/manage-updates-mobile-devices-vms-microsoft-defender-antivirus)
-
-#### [Customize, initiate, and review the results of scans and remediation]()
-##### [Configuration overview](/microsoft-365/security/defender-endpoint/customize-run-review-remediate-scans-microsoft-defender-antivirus)
-
-##### [Configure and validate exclusions in antivirus scans](/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus)
-##### [Configure and validate exclusions based on file name, extension, and folder location](/microsoft-365/security/defender-endpoint/configure-extension-file-exclusions-microsoft-defender-antivirus)
-##### [Configure and validate exclusions for files opened by processes](/microsoft-365/security/defender-endpoint/configure-process-opened-file-exclusions-microsoft-defender-antivirus)
-##### [Configure antivirus exclusions Windows Server](/microsoft-365/security/defender-endpoint/configure-server-exclusions-microsoft-defender-antivirus)
-##### [Common mistakes when defining exclusions](/microsoft-365/security/defender-endpoint/common-exclusion-mistakes-microsoft-defender-antivirus)
-##### [Configure scanning antivirus options](/microsoft-365/security/defender-endpoint/configure-advanced-scan-types-microsoft-defender-antivirus)
-##### [Configure remediation for scans](/microsoft-365/security/defender-endpoint/configure-remediation-microsoft-defender-antivirus)
-##### [Configure scheduled scans](/microsoft-365/security/defender-endpoint/scheduled-catch-up-scans-microsoft-defender-antivirus)
-##### [Configure and run scans](/microsoft-365/security/defender-endpoint/run-scan-microsoft-defender-antivirus)
-##### [Review scan results](/microsoft-365/security/defender-endpoint/review-scan-results-microsoft-defender-antivirus)
-##### [Run and review the results of an offline scan](/microsoft-365/security/defender-endpoint//microsoft-defender-offline)
-
-#### [Restore quarantined files](/microsoft-365/security/defender-endpoint/restore-quarantined-files-microsoft-defender-antivirus)
-
-#### [Manage scans and remediation]()
-##### [Management overview](/microsoft-365/security/defender-endpoint/customize-run-review-remediate-scans-microsoft-defender-antivirus)
-
-##### [Configure and validate exclusions in antivirus scans]()
-##### [Exclusions overview](/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus)
-##### [Configure and validate exclusions based on file name, extension, and folder location](/microsoft-365/security/defender-endpoint/configure-extension-file-exclusions-microsoft-defender-antivirus)
-##### [Configure and validate exclusions for files opened by processes](/microsoft-365/security/defender-endpoint/configure-process-opened-file-exclusions-microsoft-defender-antivirus)
-##### [Configure antivirus exclusions on Windows Server](/microsoft-365/security/defender-endpoint/configure-server-exclusions-microsoft-defender-antivirus)
-
-##### [Configure scanning options](/microsoft-365/security/defender-endpoint/configure-advanced-scan-types-microsoft-defender-antivirus)
-
-#### [Configure remediation for scans](/microsoft-365/security/defender-endpoint/configure-remediation-microsoft-defender-antivirus)
-##### [Configure scheduled scans](/microsoft-365/security/defender-endpoint/scheduled-catch-up-scans-microsoft-defender-antivirus)
-##### [Configure and run scans](/microsoft-365/security/defender-endpoint/run-scan-microsoft-defender-antivirus)
-##### [Review scan results](/microsoft-365/security/defender-endpoint/review-scan-results-microsoft-defender-antivirus)
-##### [Run and review the results of an offline scan](/microsoft-365/security/defender-endpoint/microsoft-defender-offline)
-##### [Restore quarantined files](/microsoft-365/security/defender-endpoint/restore-quarantined-files-microsoft-defender-antivirus)
-
-### [Troubleshoot Microsoft Defender Antivirus]()
-#### [Troubleshoot Microsoft Defender Antivirus issues](/microsoft-365/security/defender-endpoint/troubleshoot-microsoft-defender-antivirus)
-#### [Troubleshoot Microsoft Defender Antivirus migration issues](/microsoft-365/security/defender-endpoint/troubleshoot-microsoft-defender-antivirus-when-migrating)
-
-## [Better together: Microsoft Defender Antivirus and Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/why-use-microsoft-defender-antivirus)
-## [Better together: Microsoft Defender Antivirus and Office 365](/microsoft-365/security/defender-endpoint/office-365-microsoft-defender-antivirus)
-
-## [Hardware-based isolation]()
-
-### [Hardware-based isolation evaluation](microsoft-defender-application-guard/test-scenarios-md-app-guard.md)
-
-### [Application isolation]()
-#### [Application guard overview](microsoft-defender-application-guard/md-app-guard-overview.md)
-#### [System requirements](microsoft-defender-application-guard/reqs-md-app-guard.md)
-#### [Install Microsoft Defender Application Guard](microsoft-defender-application-guard/install-md-app-guard.md)
-#### [Install Microsoft Defender Application Guard Extension](microsoft-defender-application-guard/md-app-guard-browser-extension.md)
-
-### [Application control](windows-defender-application-control/windows-defender-application-control.md)
-#### [Audit Application control policies](windows-defender-application-control/audit-windows-defender-application-control-policies.md)
-
-### [System isolation](windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md)
-
-### [System integrity](windows-defender-system-guard/system-guard-how-hardware-based-root-of-trust-helps-protect-windows.md)
-
-## [Device control]()
-### [Code integrity](device-guard/enable-virtualization-based-protection-of-code-integrity.md)
-### [Control USB devices](device-control/control-usb-devices-using-intune.md)
-### [Device control report](device-control/device-control-report.md)
-## [Network firewall]()
-### [Network firewall overview](windows-firewall/windows-firewall-with-advanced-security.md)
-### [Network firewall evaluation](windows-firewall/evaluating-windows-firewall-with-advanced-security-design-examples.md)
-
-## [Security intelligence](intelligence/index.md)
-### [Understand malware & other threats](intelligence/understanding-malware.md)
-#### [Prevent malware infection](intelligence/prevent-malware-infection.md)
-#### [Malware names](intelligence/malware-naming.md)
-#### [Coin miners](intelligence/coinminer-malware.md)
-#### [Exploits and exploit kits](intelligence/exploits-malware.md)
-#### [Fileless threats](intelligence/fileless-threats.md)
-#### [Macro malware](intelligence/macro-malware.md)
-#### [Phishing](intelligence/phishing.md)
-#### [Ransomware](intelligence/ransomware-malware.md)
-#### [Rootkits](intelligence/rootkits-malware.md)
-#### [Supply chain attacks](intelligence/supply-chain-malware.md)
-#### [Tech support scams](intelligence/support-scams.md)
-#### [Trojans](intelligence/trojans-malware.md)
-#### [Unwanted software](intelligence/unwanted-software.md)
-#### [Worms](intelligence/worms-malware.md)
-### [How Microsoft identifies malware and PUA](intelligence/criteria.md)
-### [Submit files for analysis](intelligence/submission-guide.md)
-### [Safety Scanner download](intelligence/safety-scanner-download.md)
-### [Industry collaboration programs](intelligence/cybersecurity-industry-partners.md)
-#### [Virus information alliance](intelligence/virus-information-alliance-criteria.md)
-#### [Microsoft virus initiative](intelligence/virus-initiative-criteria.md)
-#### [Coordinated malware eradication](intelligence/coordinated-malware-eradication.md)
-### [Information for developers]()
-#### [Software developer FAQ](intelligence/developer-faq.md)
-#### [Software developer resources](intelligence/developer-resources.md)
-
-## [The Windows Security app](windows-defender-security-center/windows-defender-security-center.md)
-### [Customize the Windows Security app for your organization](windows-defender-security-center/wdsc-customize-contact-information.md)
-### [Hide Windows Security app notifications](windows-defender-security-center/wdsc-hide-notifications.md)
-### [Manage Windows Security app in Windows 10 in S mode](windows-defender-security-center/wdsc-windows-10-in-s-mode.md)
-### [Virus and threat protection](windows-defender-security-center/wdsc-virus-threat-protection.md)
-### [Account protection](windows-defender-security-center/wdsc-account-protection.md)
-### [Firewall and network protection](windows-defender-security-center/wdsc-firewall-network-protection.md)
-### [App and browser control](windows-defender-security-center/wdsc-app-browser-control.md)
-### [Device security](windows-defender-security-center/wdsc-device-security.md)
-### [Device performance and health](windows-defender-security-center/wdsc-device-performance-health.md)
-#### [Family options](windows-defender-security-center/wdsc-family-options.md)
-
-## [Microsoft Defender SmartScreen](microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md)
-### [Microsoft Defender SmartScreen Group Policy and mobile device management (MDM) settings](microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings.md)
-### [Set up and use Microsoft Defender SmartScreen on individual devices](microsoft-defender-smartscreen/microsoft-defender-smartscreen-set-individual-device.md)
-
-
-## [Windows Sandbox](windows-sandbox/windows-sandbox-overview.md)
-### [Windows Sandbox architecture](windows-sandbox/windows-sandbox-architecture.md)
-### [Windows Sandbox configuration](windows-sandbox/windows-sandbox-configure-using-wsb-file.md)
-
-### [Windows Defender Device Guard: virtualization-based security and WDAC](device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md)
-
-
-## Windows Certifications
-
-### [FIPS 140 Validations](fips-140-validation.md)
-### [Common Criteria Certifications](windows-platform-common-criteria.md)
-
-
-## More Windows 10 security
-### [Control the health of Windows 10-based devices](protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.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-intrusion-detection.md)
-
-### [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md)
-
-### [Security auditing](auditing/security-auditing-overview.md)
-
-#### [Basic security audit policies](auditing/basic-security-audit-policies.md)
-##### [Create a basic audit policy for an event category](auditing/create-a-basic-audit-policy-settings-for-an-event-category.md)
-##### [Apply a basic audit policy on a file or folder](auditing/apply-a-basic-audit-policy-on-a-file-or-folder.md)
-##### [View the security event log](auditing/view-the-security-event-log.md)
-
-##### [Basic security audit policy settings](auditing/basic-security-audit-policy-settings.md)
-###### [Audit account logon events](auditing/basic-audit-account-logon-events.md)
-###### [Audit account management](auditing/basic-audit-account-management.md)
-###### [Audit directory service access](auditing/basic-audit-directory-service-access.md)
-###### [Audit logon events](auditing/basic-audit-logon-events.md)
-###### [Audit object access](auditing/basic-audit-object-access.md)
-###### [Audit policy change](auditing/basic-audit-policy-change.md)
-###### [Audit privilege use](auditing/basic-audit-privilege-use.md)
-###### [Audit process tracking](auditing/basic-audit-process-tracking.md)
-###### [Audit system events](auditing/basic-audit-system-events.md)
-
-#### [Advanced security audit policies](auditing/advanced-security-auditing.md)
-##### [Planning and deploying advanced security audit policies](auditing/planning-and-deploying-advanced-security-audit-policies.md)
-##### [Advanced security auditing FAQ](auditing/advanced-security-auditing-faq.md)
-###### [Which editions of Windows support advanced audit policy configuration](auditing/which-editions-of-windows-support-advanced-audit-policy-configuration.md)
-###### [How to list XML elements in \](auditing/how-to-list-xml-elements-in-eventdata.md)
-
-###### [Using advanced security auditing options to monitor dynamic access control objects](auditing/using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md)
-####### [Monitor the central access policies that apply on a file server](auditing/monitor-the-central-access-policies-that-apply-on-a-file-server.md)
-####### [Monitor the use of removable storage devices](auditing/monitor-the-use-of-removable-storage-devices.md)
-####### [Monitor resource attribute definitions](auditing/monitor-resource-attribute-definitions.md)
-####### [Monitor central access policy and rule definitions](auditing/monitor-central-access-policy-and-rule-definitions.md)
-####### [Monitor user and device claims during sign-in](auditing/monitor-user-and-device-claims-during-sign-in.md)
-####### [Monitor the resource attributes on files and folders](auditing/monitor-the-resource-attributes-on-files-and-folders.md)
-####### [Monitor the central access policies associated with files and folders](auditing/monitor-the-central-access-policies-associated-with-files-and-folders.md)
-####### [Monitor claim types](auditing/monitor-claim-types.md)
-
-###### [Advanced security audit policy settings](auditing/advanced-security-audit-policy-settings.md)
-####### [Audit Credential Validation](auditing/audit-credential-validation.md)
-####### [Event 4774 S, F: An account was mapped for logon.](auditing/event-4774.md)
-####### [Event 4775 F: An account could not be mapped for logon.](auditing/event-4775.md)
-####### [Event 4776 S, F: The computer attempted to validate the credentials for an account.](auditing/event-4776.md)
-####### [Event 4777 F: The domain controller failed to validate the credentials for an account.](auditing/event-4777.md)
-###### [Audit Kerberos Authentication Service](auditing/audit-kerberos-authentication-service.md)
-####### [Event 4768 S, F: A Kerberos authentication ticket, TGT, was requested.](auditing/event-4768.md)
-####### [Event 4771 F: Kerberos pre-authentication failed.](auditing/event-4771.md)
-####### [Event 4772 F: A Kerberos authentication ticket request failed.](auditing/event-4772.md)
-###### [Audit Kerberos Service Ticket Operations](auditing/audit-kerberos-service-ticket-operations.md)
-####### [Event 4769 S, F: A Kerberos service ticket was requested.](auditing/event-4769.md)
-####### [Event 4770 S: A Kerberos service ticket was renewed.](auditing/event-4770.md)
-####### [Event 4773 F: A Kerberos service ticket request failed.](auditing/event-4773.md)
-###### [Audit Other Account Logon Events](auditing/audit-other-account-logon-events.md)
-###### [Audit Application Group Management](auditing/audit-application-group-management.md)
-###### [Audit Computer Account Management](auditing/audit-computer-account-management.md)
-####### [Event 4741 S: A computer account was created.](auditing/event-4741.md)
-####### [Event 4742 S: A computer account was changed.](auditing/event-4742.md)
-####### [Event 4743 S: A computer account was deleted.](auditing/event-4743.md)
-###### [Audit Distribution Group Management](auditing/audit-distribution-group-management.md)
-####### [Event 4749 S: A security-disabled global group was created.](auditing/event-4749.md)
-####### [Event 4750 S: A security-disabled global group was changed.](auditing/event-4750.md)
-####### [Event 4751 S: A member was added to a security-disabled global group.](auditing/event-4751.md)
-####### [Event 4752 S: A member was removed from a security-disabled global group.](auditing/event-4752.md)
-####### [Event 4753 S: A security-disabled global group was deleted.](auditing/event-4753.md)
-###### [Audit Other Account Management Events](auditing/audit-other-account-management-events.md)
-####### [Event 4782 S: The password hash of an account was accessed.](auditing/event-4782.md)
-####### [Event 4793 S: The Password Policy Checking API was called.](auditing/event-4793.md)
-###### [Audit Security Group Management](auditing/audit-security-group-management.md)
-####### [Event 4731 S: A security-enabled local group was created.](auditing/event-4731.md)
-####### [Event 4732 S: A member was added to a security-enabled local group.](auditing/event-4732.md)
-####### [Event 4733 S: A member was removed from a security-enabled local group.](auditing/event-4733.md)
-####### [Event 4734 S: A security-enabled local group was deleted.](auditing/event-4734.md)
-####### [Event 4735 S: A security-enabled local group was changed.](auditing/event-4735.md)
-####### [Event 4764 S: A group�s type was changed.](auditing/event-4764.md)
-####### [Event 4799 S: A security-enabled local group membership was enumerated.](auditing/event-4799.md)
-###### [Audit User Account Management](auditing/audit-user-account-management.md)
-####### [Event 4720 S: A user account was created.](auditing/event-4720.md)
-####### [Event 4722 S: A user account was enabled.](auditing/event-4722.md)
-####### [Event 4723 S, F: An attempt was made to change an account's password.](auditing/event-4723.md)
-####### [Event 4724 S, F: An attempt was made to reset an account's password.](auditing/event-4724.md)
-####### [Event 4725 S: A user account was disabled.](auditing/event-4725.md)
-####### [Event 4726 S: A user account was deleted.](auditing/event-4726.md)
-####### [Event 4738 S: A user account was changed.](auditing/event-4738.md)
-####### [Event 4740 S: A user account was locked out.](auditing/event-4740.md)
-####### [Event 4765 S: SID History was added to an account.](auditing/event-4765.md)
-####### [Event 4766 F: An attempt to add SID History to an account failed.](auditing/event-4766.md)
-####### [Event 4767 S: A user account was unlocked.](auditing/event-4767.md)
-####### [Event 4780 S: The ACL was set on accounts that are members of administrators groups.](auditing/event-4780.md)
-####### [Event 4781 S: The name of an account was changed.](auditing/event-4781.md)
-####### [Event 4794 S, F: An attempt was made to set the Directory Services Restore Mode administrator password.](auditing/event-4794.md)
-####### [Event 4798 S: A user's local group membership was enumerated.](auditing/event-4798.md)
-####### [Event 5376 S: Credential Manager credentials were backed up.](auditing/event-5376.md)
-####### [Event 5377 S: Credential Manager credentials were restored from a backup.](auditing/event-5377.md)
-###### [Audit DPAPI Activity](auditing/audit-dpapi-activity.md)
-####### [Event 4692 S, F: Backup of data protection master key was attempted.](auditing/event-4692.md)
-####### [Event 4693 S, F: Recovery of data protection master key was attempted.](auditing/event-4693.md)
-####### [Event 4694 S, F: Protection of auditable protected data was attempted.](auditing/event-4694.md)
-####### [Event 4695 S, F: Unprotection of auditable protected data was attempted.](auditing/event-4695.md)
-###### [Audit PNP Activity](auditing/audit-pnp-activity.md)
-####### [Event 6416 S: A new external device was recognized by the System.](auditing/event-6416.md)
-####### [Event 6419 S: A request was made to disable a device.](auditing/event-6419.md)
-####### [Event 6420 S: A device was disabled.](auditing/event-6420.md)
-####### [Event 6421 S: A request was made to enable a device.](auditing/event-6421.md)
-####### [Event 6422 S: A device was enabled.](auditing/event-6422.md)
-####### [Event 6423 S: The installation of this device is forbidden by system policy.](auditing/event-6423.md)
-####### [Event 6424 S: The installation of this device was allowed, after having previously been forbidden by policy.](auditing/event-6424.md)
-###### [Audit Process Creation](auditing/audit-process-creation.md)
-####### [Event 4688 S: A new process has been created.](auditing/event-4688.md)
-####### [Event 4696 S: A primary token was assigned to process.](auditing/event-4696.md)
-###### [Audit Process Termination](auditing/audit-process-termination.md)
-####### [Event 4689 S: A process has exited.](auditing/event-4689.md)
-###### [Audit RPC Events](auditing/audit-rpc-events.md)
-####### [Event 5712 S: A Remote Procedure Call, RPC, was attempted.](auditing/event-5712.md)
-###### [Audit Token Right Adjusted](auditing/audit-token-right-adjusted.md)
-####### [Event 4703 S: A user right was adjusted.](auditing/event-4703.md)
-###### [Audit Detailed Directory Service Replication](auditing/audit-detailed-directory-service-replication.md)
-####### [Event 4928 S, F: An Active Directory replica source naming context was established.](auditing/event-4928.md)
-####### [Event 4929 S, F: An Active Directory replica source naming context was removed.](auditing/event-4929.md)
-####### [Event 4930 S, F: An Active Directory replica source naming context was modified.](auditing/event-4930.md)
-####### [Event 4931 S, F: An Active Directory replica destination naming context was modified.](auditing/event-4931.md)
-####### [Event 4934 S: Attributes of an Active Directory object were replicated.](auditing/event-4934.md)
-####### [Event 4935 F: Replication failure begins.](auditing/event-4935.md)
-####### [Event 4936 S: Replication failure ends.](auditing/event-4936.md)
-####### [Event 4937 S: A lingering object was removed from a replica.](auditing/event-4937.md)
-###### [Audit Directory Service Access](auditing/audit-directory-service-access.md)
-####### [Event 4662 S, F: An operation was performed on an object.](auditing/event-4662.md)
-####### [Event 4661 S, F: A handle to an object was requested.](auditing/event-4661.md)
-###### [Audit Directory Service Changes](auditing/audit-directory-service-changes.md)
-####### [Event 5136 S: A directory service object was modified.](auditing/event-5136.md)
-####### [Event 5137 S: A directory service object was created.](auditing/event-5137.md)
-####### [Event 5138 S: A directory service object was undeleted.](auditing/event-5138.md)
-####### [Event 5139 S: A directory service object was moved.](auditing/event-5139.md)
-####### [Event 5141 S: A directory service object was deleted.](auditing/event-5141.md)
-###### [Audit Directory Service Replication](auditing/audit-directory-service-replication.md)
-####### [Event 4932 S: Synchronization of a replica of an Active Directory naming context has begun.](auditing/event-4932.md)
-####### [Event 4933 S, F: Synchronization of a replica of an Active Directory naming context has ended.](auditing/event-4933.md)
-###### [Audit Account Lockout](auditing/audit-account-lockout.md)
-####### [Event 4625 F: An account failed to log on.](auditing/event-4625.md)
-###### [Audit User/Device Claims](auditing/audit-user-device-claims.md)
-####### [Event 4626 S: User/Device claims information.](auditing/event-4626.md)
-###### [Audit Group Membership](auditing/audit-group-membership.md)
-####### [Event 4627 S: Group membership information.](auditing/event-4627.md)
-###### [Audit IPsec Extended Mode](auditing/audit-ipsec-extended-mode.md)
-###### [Audit IPsec Main Mode](auditing/audit-ipsec-main-mode.md)
-###### [Audit IPsec Quick Mode](auditing/audit-ipsec-quick-mode.md)
-###### [Audit Logoff](auditing/audit-logoff.md)
-####### [Event 4634 S: An account was logged off.](auditing/event-4634.md)
-####### [Event 4647 S: User initiated logoff.](auditing/event-4647.md)
-###### [Audit Logon](auditing/audit-logon.md)
-####### [Event 4624 S: An account was successfully logged on.](auditing/event-4624.md)
-####### [Event 4625 F: An account failed to log on.](auditing/event-4625.md)
-####### [Event 4648 S: A logon was attempted using explicit credentials.](auditing/event-4648.md)
-####### [Event 4675 S: SIDs were filtered.](auditing/event-4675.md)
-###### [Audit Network Policy Server](auditing/audit-network-policy-server.md)
-###### [Audit Other Logon/Logoff Events](auditing/audit-other-logonlogoff-events.md)
-####### [Event 4649 S: A replay attack was detected.](auditing/event-4649.md)
-####### [Event 4778 S: A session was reconnected to a Window Station.](auditing/event-4778.md)
-####### [Event 4779 S: A session was disconnected from a Window Station.](auditing/event-4779.md)
-####### [Event 4800 S: The workstation was locked.](auditing/event-4800.md)
-####### [Event 4801 S: The workstation was unlocked.](auditing/event-4801.md)
-####### [Event 4802 S: The screen saver was invoked.](auditing/event-4802.md)
-####### [Event 4803 S: The screen saver was dismissed.](auditing/event-4803.md)
-####### [Event 5378 F: The requested credentials delegation was disallowed by policy.](auditing/event-5378.md)
-####### [Event 5632 S, F: A request was made to authenticate to a wireless network.](auditing/event-5632.md)
-####### [Event 5633 S, F: A request was made to authenticate to a wired network.](auditing/event-5633.md)
-###### [Audit Special Logon](auditing/audit-special-logon.md)
-####### [Event 4964 S: Special groups have been assigned to a new logon.](auditing/event-4964.md)
-####### [Event 4672 S: Special privileges assigned to new logon.](auditing/event-4672.md)
-###### [Audit Application Generated](auditing/audit-application-generated.md)
-###### [Audit Certification Services](auditing/audit-certification-services.md)
-###### [Audit Detailed File Share](auditing/audit-detailed-file-share.md)
-####### [Event 5145 S, F: A network share object was checked to see whether client can be granted desired access.](auditing/event-5145.md)
-###### [Audit File Share](auditing/audit-file-share.md)
-####### [Event 5140 S, F: A network share object was accessed.](auditing/event-5140.md)
-####### [Event 5142 S: A network share object was added.](auditing/event-5142.md)
-####### [Event 5143 S: A network share object was modified.](auditing/event-5143.md)
-####### [Event 5144 S: A network share object was deleted.](auditing/event-5144.md)
-####### [Event 5168 F: SPN check for SMB/SMB2 failed.](auditing/event-5168.md)
-###### [Audit File System](auditing/audit-file-system.md)
-####### [Event 4656 S, F: A handle to an object was requested.](auditing/event-4656.md)
-####### [Event 4658 S: The handle to an object was closed.](auditing/event-4658.md)
-####### [Event 4660 S: An object was deleted.](auditing/event-4660.md)
-####### [Event 4663 S: An attempt was made to access an object.](auditing/event-4663.md)
-####### [Event 4664 S: An attempt was made to create a hard link.](auditing/event-4664.md)
-####### [Event 4985 S: The state of a transaction has changed.](auditing/event-4985.md)
-####### [Event 5051: A file was virtualized.](auditing/event-5051.md)
-####### [Event 4670 S: Permissions on an object were changed.](auditing/event-4670.md)
-###### [Audit Filtering Platform Connection](auditing/audit-filtering-platform-connection.md)
-####### [Event 5031 F: The Windows Firewall Service blocked an application from accepting incoming connections on the network.](auditing/event-5031.md)
-####### [Event 5150: The Windows Filtering Platform blocked a packet.](auditing/event-5150.md)
-####### [Event 5151: A more restrictive Windows Filtering Platform filter has blocked a packet.](auditing/event-5151.md)
-####### [Event 5154 S: The Windows Filtering Platform has permitted an application or service to listen on a port for incoming connections.](auditing/event-5154.md)
-####### [Event 5155 F: The Windows Filtering Platform has blocked an application or service from listening on a port for incoming connections.](auditing/event-5155.md)
-####### [Event 5156 S: The Windows Filtering Platform has permitted a connection.](auditing/event-5156.md)
-####### [Event 5157 F: The Windows Filtering Platform has blocked a connection.](auditing/event-5157.md)
-####### [Event 5158 S: The Windows Filtering Platform has permitted a bind to a local port.](auditing/event-5158.md)
-####### [Event 5159 F: The Windows Filtering Platform has blocked a bind to a local port.](auditing/event-5159.md)
-###### [Audit Filtering Platform Packet Drop](auditing/audit-filtering-platform-packet-drop.md)
-####### [Event 5152 F: The Windows Filtering Platform blocked a packet.](auditing/event-5152.md)
-####### [Event 5153 S: A more restrictive Windows Filtering Platform filter has blocked a packet.](auditing/event-5153.md)
-###### [Audit Handle Manipulation](auditing/audit-handle-manipulation.md)
-####### [Event 4690 S: An attempt was made to duplicate a handle to an object.](auditing/event-4690.md)
-###### [Audit Kernel Object](auditing/audit-kernel-object.md)
-####### [Event 4656 S, F: A handle to an object was requested.](auditing/event-4656.md)
-####### [Event 4658 S: The handle to an object was closed.](auditing/event-4658.md)
-####### [Event 4660 S: An object was deleted.](auditing/event-4660.md)
-####### [Event 4663 S: An attempt was made to access an object.](auditing/event-4663.md)
-###### [Audit Other Object Access Events](auditing/audit-other-object-access-events.md)
-####### [Event 4671: An application attempted to access a blocked ordinal through the TBS.](auditing/event-4671.md)
-####### [Event 4691 S: Indirect access to an object was requested.](auditing/event-4691.md)
-####### [Event 5148 F: The Windows Filtering Platform has detected a DoS attack and entered a defensive mode; packets associated with this attack will be discarded.](auditing/event-5148.md)
-####### [Event 5149 F: The DoS attack has subsided and normal processing is being resumed.](auditing/event-5149.md)
-####### [Event 4698 S: A scheduled task was created.](auditing/event-4698.md)
-####### [Event 4699 S: A scheduled task was deleted.](auditing/event-4699.md)
-####### [Event 4700 S: A scheduled task was enabled.](auditing/event-4700.md)
-####### [Event 4701 S: A scheduled task was disabled.](auditing/event-4701.md)
-####### [Event 4702 S: A scheduled task was updated.](auditing/event-4702.md)
-####### [Event 5888 S: An object in the COM+ Catalog was modified.](auditing/event-5888.md)
-####### [Event 5889 S: An object was deleted from the COM+ Catalog.](auditing/event-5889.md)
-####### [Event 5890 S: An object was added to the COM+ Catalog.](auditing/event-5890.md)
-###### [Audit Registry](auditing/audit-registry.md)
-####### [Event 4663 S: An attempt was made to access an object.](auditing/event-4663.md)
-####### [Event 4656 S, F: A handle to an object was requested.](auditing/event-4656.md)
-####### [Event 4658 S: The handle to an object was closed.](auditing/event-4658.md)
-####### [Event 4660 S: An object was deleted.](auditing/event-4660.md)
-####### [Event 4657 S: A registry value was modified.](auditing/event-4657.md)
-####### [Event 5039: A registry key was virtualized.](auditing/event-5039.md)
-####### [Event 4670 S: Permissions on an object were changed.](auditing/event-4670.md)
-###### [Audit Removable Storage](auditing/audit-removable-storage.md)
-###### [Audit SAM](auditing/audit-sam.md)
-####### [Event 4661 S, F: A handle to an object was requested.](auditing/event-4661.md)
-###### [Audit Central Access Policy Staging](auditing/audit-central-access-policy-staging.md)
-####### [Event 4818 S: Proposed Central Access Policy does not grant the same access permissions as the current Central Access Policy.](auditing/event-4818.md)
-###### [Audit Audit Policy Change](auditing/audit-audit-policy-change.md)
-####### [Event 4670 S: Permissions on an object were changed.](auditing/event-4670.md)
-####### [Event 4715 S: The audit policy, SACL, on an object was changed.](auditing/event-4715.md)
-####### [Event 4719 S: System audit policy was changed.](auditing/event-4719.md)
-####### [Event 4817 S: Auditing settings on object were changed.](auditing/event-4817.md)
-####### [Event 4902 S: The Per-user audit policy table was created.](auditing/event-4902.md)
-####### [Event 4906 S: The CrashOnAuditFail value has changed.](auditing/event-4906.md)
-####### [Event 4907 S: Auditing settings on object were changed.](auditing/event-4907.md)
-####### [Event 4908 S: Special Groups Logon table modified.](auditing/event-4908.md)
-####### [Event 4912 S: Per User Audit Policy was changed.](auditing/event-4912.md)
-####### [Event 4904 S: An attempt was made to register a security event source.](auditing/event-4904.md)
-####### [Event 4905 S: An attempt was made to unregister a security event source.](auditing/event-4905.md)
-###### [Audit Authentication Policy Change](auditing/audit-authentication-policy-change.md)
-####### [Event 4706 S: A new trust was created to a domain.](auditing/event-4706.md)
-####### [Event 4707 S: A trust to a domain was removed.](auditing/event-4707.md)
-####### [Event 4716 S: Trusted domain information was modified.](auditing/event-4716.md)
-####### [Event 4713 S: Kerberos policy was changed.](auditing/event-4713.md)
-####### [Event 4717 S: System security access was granted to an account.](auditing/event-4717.md)
-####### [Event 4718 S: System security access was removed from an account.](auditing/event-4718.md)
-####### [Event 4739 S: Domain Policy was changed.](auditing/event-4739.md)
-####### [Event 4864 S: A namespace collision was detected.](auditing/event-4864.md)
-####### [Event 4865 S: A trusted forest information entry was added.](auditing/event-4865.md)
-####### [Event 4866 S: A trusted forest information entry was removed.](auditing/event-4866.md)
-####### [Event 4867 S: A trusted forest information entry was modified.](auditing/event-4867.md)
-###### [Audit Authorization Policy Change](auditing/audit-authorization-policy-change.md)
-####### [Event 4703 S: A user right was adjusted.](auditing/event-4703.md)
-####### [Event 4704 S: A user right was assigned.](auditing/event-4704.md)
-####### [Event 4705 S: A user right was removed.](auditing/event-4705.md)
-####### [Event 4670 S: Permissions on an object were changed.](auditing/event-4670.md)
-####### [Event 4911 S: Resource attributes of the object were changed.](auditing/event-4911.md)
-####### [Event 4913 S: Central Access Policy on the object was changed.](auditing/event-4913.md)
-###### [Audit Filtering Platform Policy Change](auditing/audit-filtering-platform-policy-change.md)
-###### [Audit MPSSVC Rule-Level Policy Change](auditing/audit-mpssvc-rule-level-policy-change.md)
-####### [Event 4944 S: The following policy was active when the Windows Firewall started.](auditing/event-4944.md)
-####### [Event 4945 S: A rule was listed when the Windows Firewall started.](auditing/event-4945.md)
-####### [Event 4946 S: A change has been made to Windows Firewall exception list. A rule was added.](auditing/event-4946.md)
-####### [Event 4947 S: A change has been made to Windows Firewall exception list. A rule was modified.](auditing/event-4947.md)
-####### [Event 4948 S: A change has been made to Windows Firewall exception list. A rule was deleted.](auditing/event-4948.md)
-####### [Event 4949 S: Windows Firewall settings were restored to the default values.](auditing/event-4949.md)
-####### [Event 4950 S: A Windows Firewall setting has changed.](auditing/event-4950.md)
-####### [Event 4951 F: A rule has been ignored because its major version number was not recognized by Windows Firewall.](auditing/event-4951.md)
-####### [Event 4952 F: Parts of a rule have been ignored because its minor version number was not recognized by Windows Firewall. The other parts of the rule will be enforced.](auditing/event-4952.md)
-####### [Event 4953 F: Windows Firewall ignored a rule because it could not be parsed.](auditing/event-4953.md)
-####### [Event 4954 S: Windows Firewall Group Policy settings have changed. The new settings have been applied.](auditing/event-4954.md)
-####### [Event 4956 S: Windows Firewall has changed the active profile.](auditing/event-4956.md)
-####### [Event 4957 F: Windows Firewall did not apply the following rule.](auditing/event-4957.md)
-####### [Event 4958 F: Windows Firewall did not apply the following rule because the rule referred to items not configured on this computer.](auditing/event-4958.md)
-###### [Audit Other Policy Change Events](auditing/audit-other-policy-change-events.md)
-####### [Event 4714 S: Encrypted data recovery policy was changed.](auditing/event-4714.md)
-####### [Event 4819 S: Central Access Policies on the machine have been changed.](auditing/event-4819.md)
-####### [Event 4826 S: Boot Configuration Data loaded.](auditing/event-4826.md)
-####### [Event 4909: The local policy settings for the TBS were changed.](auditing/event-4909.md)
-####### [Event 4910: The group policy settings for the TBS were changed.](auditing/event-4910.md)
-####### [Event 5063 S, F: A cryptographic provider operation was attempted.](auditing/event-5063.md)
-####### [Event 5064 S, F: A cryptographic context operation was attempted.](auditing/event-5064.md)
-####### [Event 5065 S, F: A cryptographic context modification was attempted.](auditing/event-5065.md)
-####### [Event 5066 S, F: A cryptographic function operation was attempted.](auditing/event-5066.md)
-####### [Event 5067 S, F: A cryptographic function modification was attempted.](auditing/event-5067.md)
-####### [Event 5068 S, F: A cryptographic function provider operation was attempted.](auditing/event-5068.md)
-####### [Event 5069 S, F: A cryptographic function property operation was attempted.](auditing/event-5069.md)
-####### [Event 5070 S, F: A cryptographic function property modification was attempted.](auditing/event-5070.md)
-####### [Event 5447 S: A Windows Filtering Platform filter has been changed.](auditing/event-5447.md)
-####### [Event 6144 S: Security policy in the group policy objects has been applied successfully.](auditing/event-6144.md)
-####### [Event 6145 F: One or more errors occurred while processing security policy in the group policy objects.](auditing/event-6145.md)
-###### [Audit Sensitive Privilege Use](auditing/audit-sensitive-privilege-use.md)
-####### [Event 4673 S, F: A privileged service was called.](auditing/event-4673.md)
-####### [Event 4674 S, F: An operation was attempted on a privileged object.](auditing/event-4674.md)
-####### [Event 4985 S: The state of a transaction has changed.](auditing/event-4985.md)
-###### [Audit Non Sensitive Privilege Use](auditing/audit-non-sensitive-privilege-use.md)
-####### [Event 4673 S, F: A privileged service was called.](auditing/event-4673.md)
-####### [Event 4674 S, F: An operation was attempted on a privileged object.](auditing/event-4674.md)
-####### [Event 4985 S: The state of a transaction has changed.](auditing/event-4985.md)
-###### [Audit Other Privilege Use Events](auditing/audit-other-privilege-use-events.md)
-####### [Event 4985 S: The state of a transaction has changed.](auditing/event-4985.md)
-###### [Audit IPsec Driver](auditing/audit-ipsec-driver.md)
-###### [Audit Other System Events](auditing/audit-other-system-events.md)
-####### [Event 5024 S: The Windows Firewall Service has started successfully.](auditing/event-5024.md)
-####### [Event 5025 S: The Windows Firewall Service has been stopped.](auditing/event-5025.md)
-####### [Event 5027 F: The Windows Firewall Service was unable to retrieve the security policy from the local storage. The service will continue enforcing the current policy.](auditing/event-5027.md)
-####### [Event 5028 F: The Windows Firewall Service was unable to parse the new security policy. The service will continue with currently enforced policy.](auditing/event-5028.md)
-####### [Event 5029 F: The Windows Firewall Service failed to initialize the driver. The service will continue to enforce the current policy.](auditing/event-5029.md)
-####### [Event 5030 F: The Windows Firewall Service failed to start.](auditing/event-5030.md)
-####### [Event 5032 F: Windows Firewall was unable to notify the user that it blocked an application from accepting incoming connections on the network.](auditing/event-5032.md)
-####### [Event 5033 S: The Windows Firewall Driver has started successfully.](auditing/event-5033.md)
-####### [Event 5034 S: The Windows Firewall Driver was stopped.](auditing/event-5034.md)
-####### [Event 5035 F: The Windows Firewall Driver failed to start.](auditing/event-5035.md)
-####### [Event 5037 F: The Windows Firewall Driver detected critical runtime error. Terminating.](auditing/event-5037.md)
-####### [Event 5058 S, F: Key file operation.](auditing/event-5058.md)
-####### [Event 5059 S, F: Key migration operation.](auditing/event-5059.md)
-####### [Event 6400: BranchCache: Received an incorrectly formatted response while discovering availability of content.](auditing/event-6400.md)
-####### [Event 6401: BranchCache: Received invalid data from a peer. Data discarded.](auditing/event-6401.md)
-####### [Event 6402: BranchCache: The message to the hosted cache offering it data is incorrectly formatted.](auditing/event-6402.md)
-####### [Event 6403: BranchCache: The hosted cache sent an incorrectly formatted response to the client.](auditing/event-6403.md)
-####### [Event 6404: BranchCache: Hosted cache could not be authenticated using the provisioned SSL certificate.](auditing/event-6404.md)
-####### [Event 6405: BranchCache: %2 instances of event id %1 occurred.](auditing/event-6405.md)
-####### [Event 6406: %1 registered to Windows Firewall to control filtering for the following: %2.](auditing/event-6406.md)
-####### [Event 6407: 1%.](auditing/event-6407.md)
-####### [Event 6408: Registered product %1 failed and Windows Firewall is now controlling the filtering for %2.](auditing/event-6408.md)
-####### [Event 6409: BranchCache: A service connection point object could not be parsed.](auditing/event-6409.md)
-###### [Audit Security State Change](auditing/audit-security-state-change.md)
-####### [Event 4608 S: Windows is starting up.](auditing/event-4608.md)
-####### [Event 4616 S: The system time was changed.](auditing/event-4616.md)
-####### [Event 4621 S: Administrator recovered system from CrashOnAuditFail.](auditing/event-4621.md)
-###### [Audit Security System Extension](auditing/audit-security-system-extension.md)
-####### [Event 4610 S: An authentication package has been loaded by the Local Security Authority.](auditing/event-4610.md)
-####### [Event 4611 S: A trusted logon process has been registered with the Local Security Authority.](auditing/event-4611.md)
-####### [Event 4614 S: A notification package has been loaded by the Security Account Manager.](auditing/event-4614.md)
-####### [Event 4622 S: A security package has been loaded by the Local Security Authority.](auditing/event-4622.md)
-####### [Event 4697 S: A service was installed in the system.](auditing/event-4697.md)
-###### [Audit System Integrity](auditing/audit-system-integrity.md)
-####### [Event 4612 S: Internal resources allocated for the queuing of audit messages have been exhausted, leading to the loss of some audits.](auditing/event-4612.md)
-####### [Event 4615 S: Invalid use of LPC port.](auditing/event-4615.md)
-####### [Event 4618 S: A monitored security event pattern has occurred.](auditing/event-4618.md)
-####### [Event 4816 S: RPC detected an integrity violation while decrypting an incoming message.](auditing/event-4816.md)
-####### [Event 5038 F: Code integrity determined that the image hash of a file is not valid.](auditing/event-5038.md)
-####### [Event 5056 S: A cryptographic self-test was performed.](auditing/event-5056.md)
-####### [Event 5062 S: A kernel-mode cryptographic self-test was performed.](auditing/event-5062.md)
-####### [Event 5057 F: A cryptographic primitive operation failed.](auditing/event-5057.md)
-####### [Event 5060 F: Verification operation failed.](auditing/event-5060.md)
-####### [Event 5061 S, F: Cryptographic operation.](auditing/event-5061.md)
-####### [Event 6281 F: Code Integrity determined that the page hashes of an image file are not valid.](auditing/event-6281.md)
-####### [Event 6410 F: Code integrity determined that a file does not meet the security requirements to load into a process.](auditing/event-6410.md)
-###### [Other Events](auditing/other-events.md)
-####### [Event 1100 S: The event logging service has shut down.](auditing/event-1100.md)
-####### [Event 1102 S: The audit log was cleared.](auditing/event-1102.md)
-####### [Event 1104 S: The security log is now full.](auditing/event-1104.md)
-####### [Event 1105 S: Event log automatic backup.](auditing/event-1105.md)
-####### [Event 1108 S: The event logging service encountered an error while processing an incoming event published from %1.](auditing/event-1108.md)
-###### [Appendix A: Security monitoring recommendations for many audit events](auditing/appendix-a-security-monitoring-recommendations-for-many-audit-events.md)
-###### [Registry (Global Object Access Auditing)](auditing/registry-global-object-access-auditing.md)
-###### [File System (Global Object Access Auditing)](auditing/file-system-global-object-access-auditing.md)
-
-
-
-
-
-### [Security policy settings](security-policy-settings/security-policy-settings.md)
-#### [Administer security policy settings](security-policy-settings/administer-security-policy-settings.md)
-##### [Network List Manager policies](security-policy-settings/network-list-manager-policies.md)
-#### [Configure security policy settings](security-policy-settings/how-to-configure-security-policy-settings.md)
-#### [Security policy settings reference](security-policy-settings/security-policy-settings-reference.md)
-##### [Account Policies](security-policy-settings/account-policies.md)
-###### [Password Policy](security-policy-settings/password-policy.md)
-####### [Enforce password history](security-policy-settings/enforce-password-history.md)
-####### [Maximum password age](security-policy-settings/maximum-password-age.md)
-####### [Minimum password age](security-policy-settings/minimum-password-age.md)
-####### [Minimum password length](security-policy-settings/minimum-password-length.md)
-####### [Password must meet complexity requirements](security-policy-settings/password-must-meet-complexity-requirements.md)
-####### [Store passwords using reversible encryption](security-policy-settings/store-passwords-using-reversible-encryption.md)
-###### [Account Lockout Policy](security-policy-settings/account-lockout-policy.md)
-####### [Account lockout duration](security-policy-settings/account-lockout-duration.md)
-####### [Account lockout threshold](security-policy-settings/account-lockout-threshold.md)
-####### [Reset account lockout counter after](security-policy-settings/reset-account-lockout-counter-after.md)
-###### [Kerberos Policy](security-policy-settings/kerberos-policy.md)
-####### [Enforce user logon restrictions](security-policy-settings/enforce-user-logon-restrictions.md)
-####### [Maximum lifetime for service ticket](security-policy-settings/maximum-lifetime-for-service-ticket.md)
-####### [Maximum lifetime for user ticket](security-policy-settings/maximum-lifetime-for-user-ticket.md)
-####### [Maximum lifetime for user ticket renewal](security-policy-settings/maximum-lifetime-for-user-ticket-renewal.md)
-####### [Maximum tolerance for computer clock synchronization](security-policy-settings/maximum-tolerance-for-computer-clock-synchronization.md)
-##### [Audit Policy](security-policy-settings/audit-policy.md)
-##### [Security Options](security-policy-settings/security-options.md)
-###### [Accounts: Administrator account status](security-policy-settings/accounts-administrator-account-status.md)
-###### [Accounts: Block Microsoft accounts](security-policy-settings/accounts-block-microsoft-accounts.md)
-###### [Accounts: Guest account status](security-policy-settings/accounts-guest-account-status.md)
-###### [Accounts: Limit local account use of blank passwords to console logon only](security-policy-settings/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md)
-###### [Accounts: Rename administrator account](security-policy-settings/accounts-rename-administrator-account.md)
-###### [Accounts: Rename guest account](security-policy-settings/accounts-rename-guest-account.md)
-###### [Audit: Audit the access of global system objects](security-policy-settings/audit-audit-the-access-of-global-system-objects.md)
-###### [Audit: Audit the use of Backup and Restore privilege](security-policy-settings/audit-audit-the-use-of-backup-and-restore-privilege.md)
-###### [Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings](security-policy-settings/audit-force-audit-policy-subcategory-settings-to-override.md)
-###### [Audit: Shut down system immediately if unable to log security audits](security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md)
-###### [DCOM: Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax](security-policy-settings/dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md)
-###### [DCOM: Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax](security-policy-settings/dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md)
-###### [Devices: Allow undock without having to log on](security-policy-settings/devices-allow-undock-without-having-to-log-on.md)
-###### [Devices: Allowed to format and eject removable media](security-policy-settings/devices-allowed-to-format-and-eject-removable-media.md)
-###### [Devices: Prevent users from installing printer drivers](security-policy-settings/devices-prevent-users-from-installing-printer-drivers.md)
-###### [Devices: Restrict CD-ROM access to locally logged-on user only](security-policy-settings/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md)
-###### [Devices: Restrict floppy access to locally logged-on user only](security-policy-settings/devices-restrict-floppy-access-to-locally-logged-on-user-only.md)
-###### [Domain controller: Allow server operators to schedule tasks](security-policy-settings/domain-controller-allow-server-operators-to-schedule-tasks.md)
-###### [Domain controller: LDAP server signing requirements](security-policy-settings/domain-controller-ldap-server-signing-requirements.md)
-###### [Domain controller: Refuse machine account password changes](security-policy-settings/domain-controller-refuse-machine-account-password-changes.md)
-###### [Domain member: Digitally encrypt or sign secure channel data (always)](security-policy-settings/domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md)
-###### [Domain member: Digitally encrypt secure channel data (when possible)](security-policy-settings/domain-member-digitally-encrypt-secure-channel-data-when-possible.md)
-###### [Domain member: Digitally sign secure channel data (when possible)](security-policy-settings/domain-member-digitally-sign-secure-channel-data-when-possible.md)
-###### [Domain member: Disable machine account password changes](security-policy-settings/domain-member-disable-machine-account-password-changes.md)
-###### [Domain member: Maximum machine account password age](security-policy-settings/domain-member-maximum-machine-account-password-age.md)
-###### [Domain member: Require strong (Windows 2000 or later) session key](security-policy-settings/domain-member-require-strong-windows-2000-or-later-session-key.md)
-###### [Interactive logon: Display user information when the session is locked](security-policy-settings/interactive-logon-display-user-information-when-the-session-is-locked.md)
-###### [Interactive logon: Don't display last signed-in](security-policy-settings/interactive-logon-do-not-display-last-user-name.md)
-###### [Interactive logon: Don't display username at sign-in](security-policy-settings/interactive-logon-dont-display-username-at-sign-in.md)
-###### [Interactive logon: Do not require CTRL+ALT+DEL](security-policy-settings/interactive-logon-do-not-require-ctrl-alt-del.md)
-###### [Interactive logon: Machine account lockout threshold](security-policy-settings/interactive-logon-machine-account-lockout-threshold.md)
-###### [Interactive logon: Machine inactivity limit](security-policy-settings/interactive-logon-machine-inactivity-limit.md)
-###### [Interactive logon: Message text for users attempting to log on](security-policy-settings/interactive-logon-message-text-for-users-attempting-to-log-on.md)
-###### [Interactive logon: Message title for users attempting to log on](security-policy-settings/interactive-logon-message-title-for-users-attempting-to-log-on.md)
-###### [Interactive logon: Number of previous logons to cache (in case domain controller is not available)](security-policy-settings/interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md)
-###### [Interactive logon: Prompt user to change password before expiration](security-policy-settings/interactive-logon-prompt-user-to-change-password-before-expiration.md)
-###### [Interactive logon: Require Domain Controller authentication to unlock workstation](security-policy-settings/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md)
-###### [Interactive logon: Require smart card](security-policy-settings/interactive-logon-require-smart-card.md)
-###### [Interactive logon: Smart card removal behavior](security-policy-settings/interactive-logon-smart-card-removal-behavior.md)
-###### [Microsoft network client: Digitally sign communications (always)](security-policy-settings/microsoft-network-client-digitally-sign-communications-always.md)
-###### [SMBv1 Microsoft network client: Digitally sign communications (always)](security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-always.md)
-###### [SMBv1 Microsoft network client: Digitally sign communications (if server agrees)](security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-if-server-agrees.md)
-###### [Microsoft network client: Send unencrypted password to third-party SMB servers](security-policy-settings/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md)
-###### [Microsoft network server: Amount of idle time required before suspending session](security-policy-settings/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md)
-###### [Microsoft network server: Attempt S4U2Self to obtain claim information](security-policy-settings/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md)
-###### [Microsoft network server: Digitally sign communications (always)](security-policy-settings/microsoft-network-server-digitally-sign-communications-always.md)
-###### [SMBv1 Microsoft network server: Digitally sign communications (always)](security-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-always.md)
-###### [SMBv1 Microsoft network server: Digitally sign communications (if client agrees)](security-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-if-client-agrees.md)
-###### [Microsoft network server: Disconnect clients when logon hours expire](security-policy-settings/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md)
-###### [Microsoft network server: Server SPN target name validation level](security-policy-settings/microsoft-network-server-server-spn-target-name-validation-level.md)
-###### [Network access: Allow anonymous SID/Name translation](security-policy-settings/network-access-allow-anonymous-sidname-translation.md)
-###### [Network access: Do not allow anonymous enumeration of SAM accounts](security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md)
-###### [Network access: Do not allow anonymous enumeration of SAM accounts and shares](security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md)
-###### [Network access: Do not allow storage of passwords and credentials for network authentication](security-policy-settings/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md)
-###### [Network access: Let Everyone permissions apply to anonymous users](security-policy-settings/network-access-let-everyone-permissions-apply-to-anonymous-users.md)
-###### [Network access: Named Pipes that can be accessed anonymously](security-policy-settings/network-access-named-pipes-that-can-be-accessed-anonymously.md)
-###### [Network access: Remotely accessible registry paths](security-policy-settings/network-access-remotely-accessible-registry-paths.md)
-###### [Network access: Remotely accessible registry paths and subpaths](security-policy-settings/network-access-remotely-accessible-registry-paths-and-subpaths.md)
-###### [Network access: Restrict anonymous access to Named Pipes and Shares](security-policy-settings/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md)
-###### [Network access: Restrict clients allowed to make remote calls to SAM](security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md)
-###### [Network access: Shares that can be accessed anonymously](security-policy-settings/network-access-shares-that-can-be-accessed-anonymously.md)
-###### [Network access: Sharing and security model for local accounts](security-policy-settings/network-access-sharing-and-security-model-for-local-accounts.md)
-###### [Network security: Allow Local System to use computer identity for NTLM](security-policy-settings/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md)
-###### [Network security: Allow LocalSystem NULL session fallback](security-policy-settings/network-security-allow-localsystem-null-session-fallback.md)
-###### [Network security: Allow PKU2U authentication requests to this computer to use online identities](security-policy-settings/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md)
-###### [Network security: Configure encryption types allowed for Kerberos](security-policy-settings/network-security-configure-encryption-types-allowed-for-kerberos.md)
-###### [Network security: Do not store LAN Manager hash value on next password change](security-policy-settings/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md)
-###### [Network security: Force logoff when logon hours expire](security-policy-settings/network-security-force-logoff-when-logon-hours-expire.md)
-###### [Network security: LAN Manager authentication level](security-policy-settings/network-security-lan-manager-authentication-level.md)
-###### [Network security: LDAP client signing requirements](security-policy-settings/network-security-ldap-client-signing-requirements.md)
-###### [Network security: Minimum session security for NTLM SSP based (including secure RPC) clients](security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md)
-###### [Network security: Minimum session security for NTLM SSP based (including secure RPC) servers](security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md)
-###### [Network security: Restrict NTLM: Add remote server exceptions for NTLM authentication](security-policy-settings/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md)
-###### [Network security: Restrict NTLM: Add server exceptions in this domain](security-policy-settings/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md)
-###### [Network security: Restrict NTLM: Audit incoming NTLM traffic](security-policy-settings/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md)
-###### [Network security: Restrict NTLM: Audit NTLM authentication in this domain](security-policy-settings/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md)
-###### [Network security: Restrict NTLM: Incoming NTLM traffic](security-policy-settings/network-security-restrict-ntlm-incoming-ntlm-traffic.md)
-###### [Network security: Restrict NTLM: NTLM authentication in this domain](security-policy-settings/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md)
-###### [Network security: Restrict NTLM: Outgoing NTLM traffic to remote servers](security-policy-settings/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md)
-###### [Recovery console: Allow automatic administrative logon](security-policy-settings/recovery-console-allow-automatic-administrative-logon.md)
-###### [Recovery console: Allow floppy copy and access to all drives and folders](security-policy-settings/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md)
-###### [Shutdown: Allow system to be shut down without having to log on](security-policy-settings/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md)
-###### [Shutdown: Clear virtual memory pagefile](security-policy-settings/shutdown-clear-virtual-memory-pagefile.md)
-###### [System cryptography: Force strong key protection for user keys stored on the computer](security-policy-settings/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md)
-###### [System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing](security-policy-settings/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md)
-###### [System objects: Require case insensitivity for non-Windows subsystems](security-policy-settings/system-objects-require-case-insensitivity-for-non-windows-subsystems.md)
-###### [System objects: Strengthen default permissions of internal system objects (Symbolic Links)](security-policy-settings/system-objects-strengthen-default-permissions-of-internal-system-objects.md)
-###### [System settings: Optional subsystems](security-policy-settings/system-settings-optional-subsystems.md)
-###### [System settings: Use certificate rules on Windows executables for Software Restriction Policies](security-policy-settings/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md)
-###### [User Account Control: Admin Approval Mode for the Built-in Administrator account](security-policy-settings/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md)
-###### [User Account Control: Allow UIAccess applications to prompt for elevation without using the secure desktop](security-policy-settings/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md)
-###### [User Account Control: Behavior of the elevation prompt for administrators in Admin Approval Mode](security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md)
-###### [User Account Control: Behavior of the elevation prompt for standard users](security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md)
-###### [User Account Control: Detect application installations and prompt for elevation](security-policy-settings/user-account-control-detect-application-installations-and-prompt-for-elevation.md)
-###### [User Account Control: Only elevate executables that are signed and validated](security-policy-settings/user-account-control-only-elevate-executables-that-are-signed-and-validated.md)
-###### [User Account Control: Only elevate UIAccess applications that are installed in secure locations](security-policy-settings/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md)
-###### [User Account Control: Run all administrators in Admin Approval Mode](security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode.md)
-###### [User Account Control: Switch to the secure desktop when prompting for elevation](security-policy-settings/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md)
-###### [User Account Control: Virtualize file and registry write failures to per-user locations](security-policy-settings/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md)
-##### [Advanced security audit policy settings](security-policy-settings/secpol-advanced-security-audit-policy-settings.md)
-##### [User Rights Assignment](security-policy-settings/user-rights-assignment.md)
-###### [Access Credential Manager as a trusted caller](security-policy-settings/access-credential-manager-as-a-trusted-caller.md)
-###### [Access this computer from the network](security-policy-settings/access-this-computer-from-the-network.md)
-###### [Act as part of the operating system](security-policy-settings/act-as-part-of-the-operating-system.md)
-###### [Add workstations to domain](security-policy-settings/add-workstations-to-domain.md)
-###### [Adjust memory quotas for a process](security-policy-settings/adjust-memory-quotas-for-a-process.md)
-###### [Allow log on locally](security-policy-settings/allow-log-on-locally.md)
-###### [Allow log on through Remote Desktop Services](security-policy-settings/allow-log-on-through-remote-desktop-services.md)
-###### [Back up files and directories](security-policy-settings/back-up-files-and-directories.md)
-###### [Bypass traverse checking](security-policy-settings/bypass-traverse-checking.md)
-###### [Change the system time](security-policy-settings/change-the-system-time.md)
-###### [Change the time zone](security-policy-settings/change-the-time-zone.md)
-###### [Create a pagefile](security-policy-settings/create-a-pagefile.md)
-###### [Create a token object](security-policy-settings/create-a-token-object.md)
-###### [Create global objects](security-policy-settings/create-global-objects.md)
-###### [Create permanent shared objects](security-policy-settings/create-permanent-shared-objects.md)
-###### [Create symbolic links](security-policy-settings/create-symbolic-links.md)
-###### [Debug programs](security-policy-settings/debug-programs.md)
-###### [Deny access to this computer from the network](security-policy-settings/deny-access-to-this-computer-from-the-network.md)
-###### [Deny log on as a batch job](security-policy-settings/deny-log-on-as-a-batch-job.md)
-###### [Deny log on as a service](security-policy-settings/deny-log-on-as-a-service.md)
-###### [Deny log on locally](security-policy-settings/deny-log-on-locally.md)
-###### [Deny log on through Remote Desktop Services](security-policy-settings/deny-log-on-through-remote-desktop-services.md)
-###### [Enable computer and user accounts to be trusted for delegation](security-policy-settings/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md)
-###### [Force shutdown from a remote system](security-policy-settings/force-shutdown-from-a-remote-system.md)
-###### [Generate security audits](security-policy-settings/generate-security-audits.md)
-###### [Impersonate a client after authentication](security-policy-settings/impersonate-a-client-after-authentication.md)
-###### [Increase a process working set](security-policy-settings/increase-a-process-working-set.md)
-###### [Increase scheduling priority](security-policy-settings/increase-scheduling-priority.md)
-###### [Load and unload device drivers](security-policy-settings/load-and-unload-device-drivers.md)
-###### [Lock pages in memory](security-policy-settings/lock-pages-in-memory.md)
-###### [Log on as a batch job](security-policy-settings/log-on-as-a-batch-job.md)
-###### [Log on as a service](security-policy-settings/log-on-as-a-service.md)
-###### [Manage auditing and security log](security-policy-settings/manage-auditing-and-security-log.md)
-###### [Modify an object label](security-policy-settings/modify-an-object-label.md)
-###### [Modify firmware environment values](security-policy-settings/modify-firmware-environment-values.md)
-###### [Perform volume maintenance tasks](security-policy-settings/perform-volume-maintenance-tasks.md)
-###### [Profile single process](security-policy-settings/profile-single-process.md)
-###### [Profile system performance](security-policy-settings/profile-system-performance.md)
-###### [Remove computer from docking station](security-policy-settings/remove-computer-from-docking-station.md)
-###### [Replace a process level token](security-policy-settings/replace-a-process-level-token.md)
-###### [Restore files and directories](security-policy-settings/restore-files-and-directories.md)
-###### [Shut down the system](security-policy-settings/shut-down-the-system.md)
-###### [Synchronize directory service data](security-policy-settings/synchronize-directory-service-data.md)
-###### [Take ownership of files or other objects](security-policy-settings/take-ownership-of-files-or-other-objects.md)
-
-### Windows security guidance for enterprises
-
-#### [Windows security baselines](windows-security-configuration-framework/windows-security-baselines.md)
-##### [Security Compliance Toolkit](windows-security-configuration-framework/security-compliance-toolkit-10.md)
-##### [Get support](windows-security-configuration-framework/get-support-for-security-baselines.md)
-
-### [Windows 10 Mobile security guide](windows-10-mobile-security-guide.md)
diff --git a/windows/security/threat-protection/TOC.yml b/windows/security/threat-protection/TOC.yml
new file mode 100644
index 0000000000..3c8e12e04c
--- /dev/null
+++ b/windows/security/threat-protection/TOC.yml
@@ -0,0 +1,1412 @@
+- name: Threat protection
+ href: index.md
+ items:
+ - name: Next-generation protection with Microsoft Defender Antivirus
+ items:
+ - name: Microsoft Defender Antivirus overview
+ href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-in-windows-10
+ - name: Evaluate Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/evaluate-microsoft-defender-antivirus
+ - name: Configure Microsoft Defender Antivirus
+ items:
+ - name: Configure Microsoft Defender Antivirus features
+ href: /microsoft-365/security/defender-endpoint/configure-microsoft-defender-antivirus-features
+ - name: Use Microsoft cloud-delivered protection
+ href: /microsoft-365/security/defender-endpoint/cloud-protection-microsoft-defender-antivirus
+ items:
+ - name: Prevent security settings changes with tamper protection
+ href: /microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection
+ - name: Enable Block at first sight
+ href: /microsoft-365/security/defender-endpoint/configure-block-at-first-sight-microsoft-defender-antivirus
+ - name: Configure the cloud block timeout period
+ href: /microsoft-365/security/defender-endpoint/configure-cloud-block-timeout-period-microsoft-defender-antivirus
+ - name: Configure behavioral, heuristic, and real-time protection
+ items:
+ - name: Configuration overview
+ href: /microsoft-365/security/defender-endpoint/configure-protection-features-microsoft-defender-antivirus
+ - name: Detect and block Potentially Unwanted Applications
+ href: /microsoft-365/security/defender-endpoint/detect-block-potentially-unwanted-apps-microsoft-defender-antivirus
+ - name: Enable and configure always-on protection and monitoring
+ href: /microsoft-365/security/defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus
+ - name: Antivirus on Windows Server
+ href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-on-windows-server
+ - name: Antivirus compatibility
+ items:
+ - name: Compatibility charts
+ href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility
+ - name: Use limited periodic antivirus scanning
+ href: /microsoft-365/security/defender-endpoint/limited-periodic-scanning-microsoft-defender-antivirus
+ - name: Manage Microsoft Defender Antivirus in your business
+ items:
+ - name: Management overview
+ href: /microsoft-365/security/defender-endpoint/configuration-management-reference-microsoft-defender-antivirus
+ - name: Use Microsoft Intune and Microsoft Endpoint Manager to manage Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/use-intune-config-manager-microsoft-defender-antivirus
+ - name: Use Group Policy settings to manage Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/use-group-policy-microsoft-defender-antivirus
+ - name: Use PowerShell cmdlets to manage Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/use-powershell-cmdlets-microsoft-defender-antivirus
+ - name: Use Windows Management Instrumentation (WMI) to manage Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/use-wmi-microsoft-defender-antivirus
+ - name: Use the mpcmdrun.exe command line tool to manage Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/command-line-arguments-microsoft-defender-antivirus
+ - name: Deploy, manage updates, and report on Microsoft Defender Antivirus
+ items:
+ - name: Preparing to deploy
+ href: /microsoft-365/security/defender-endpoint/deploy-manage-report-microsoft-defender-antivirus
+ - name: Deploy and enable Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/deploy-microsoft-defender-antivirus
+ - name: Deployment guide for VDI environments
+ href: /microsoft-365/security/defender-endpoint/deployment-vdi-microsoft-defender-antivirus
+ - name: Report on antivirus protection
+ - name: Review protection status and alerts
+ href: /microsoft-365/security/defender-endpoint/report-monitor-microsoft-defender-antivirus
+ - name: Troubleshoot antivirus reporting in Update Compliance
+ href: /microsoft-365/security/defender-endpoint/troubleshoot-reporting
+ - name: Learn about the recent updates
+ href: /microsoft-365/security/defender-endpoint/manage-updates-baselines-microsoft-defender-antivirus
+ - name: Manage protection and security intelligence updates
+ href: /microsoft-365/security/defender-endpoint/manage-protection-updates-microsoft-defender-antivirus
+ - name: Manage when protection updates should be downloaded and applied
+ href: /microsoft-365/security/defender-endpoint/manage-protection-update-schedule-microsoft-defender-antivirus
+ - name: Manage updates for endpoints that are out of date
+ href: /microsoft-365/security/defender-endpoint/manage-outdated-endpoints-microsoft-defender-antivirus
+ - name: Manage event-based forced updates
+ href: /microsoft-365/security/defender-endpoint/manage-event-based-updates-microsoft-defender-antivirus
+ - name: Manage updates for mobile devices and VMs
+ href: /microsoft-365/security/defender-endpoint/manage-updates-mobile-devices-vms-microsoft-defender-antivirus
+ - name: Customize, initiate, and review the results of scans and remediation
+ items:
+ - name: Configuration overview
+ href: /microsoft-365/security/defender-endpoint/customize-run-review-remediate-scans-microsoft-defender-antivirus
+ - name: Configure and validate exclusions in antivirus scans
+ href: /microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus
+ - name: Configure and validate exclusions based on file name, extension, and folder location
+ href: /microsoft-365/security/defender-endpoint/configure-extension-file-exclusions-microsoft-defender-antivirus
+ - name: Configure and validate exclusions for files opened by processes
+ href: /microsoft-365/security/defender-endpoint/configure-process-opened-file-exclusions-microsoft-defender-antivirus
+ - name: Configure antivirus exclusions Windows Server
+ href: /microsoft-365/security/defender-endpoint/configure-server-exclusions-microsoft-defender-antivirus
+ - name: Common mistakes when defining exclusions
+ href: /microsoft-365/security/defender-endpoint/common-exclusion-mistakes-microsoft-defender-antivirus
+ - name: Configure scanning antivirus options
+ href: /microsoft-365/security/defender-endpoint/configure-advanced-scan-types-microsoft-defender-antivirus
+ - name: Configure remediation for scans
+ href: /microsoft-365/security/defender-endpoint/configure-remediation-microsoft-defender-antivirus
+ - name: Configure scheduled scans
+ href: /microsoft-365/security/defender-endpoint/scheduled-catch-up-scans-microsoft-defender-antivirus
+ - name: Configure and run scans
+ href: /microsoft-365/security/defender-endpoint/run-scan-microsoft-defender-antivirus
+ - name: Review scan results
+ href: /microsoft-365/security/defender-endpoint/review-scan-results-microsoft-defender-antivirus
+ - name: Run and review the results of an offline scan
+ href: /microsoft-365/security/defender-endpoint//microsoft-defender-offline
+ - name: Restore quarantined files
+ href: /microsoft-365/security/defender-endpoint/restore-quarantined-files-microsoft-defender-antivirus
+ - name: Manage scans and remediation
+ items:
+ - name: Management overview
+ href: /microsoft-365/security/defender-endpoint/customize-run-review-remediate-scans-microsoft-defender-antivirus
+ - name: Configure and validate exclusions in antivirus scans
+ - name: Exclusions overview
+ href: /microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus
+ - name: Configure and validate exclusions based on file name, extension, and folder location
+ href: /microsoft-365/security/defender-endpoint/configure-extension-file-exclusions-microsoft-defender-antivirus
+ - name: Configure and validate exclusions for files opened by processes
+ href: /microsoft-365/security/defender-endpoint/configure-process-opened-file-exclusions-microsoft-defender-antivirus
+ - name: Configure antivirus exclusions on Windows Server
+ href: /microsoft-365/security/defender-endpoint/configure-server-exclusions-microsoft-defender-antivirus
+ - name: Configure scanning options
+ href: /microsoft-365/security/defender-endpoint/configure-advanced-scan-types-microsoft-defender-antivirus
+ - name: Configure remediation for scans
+ href: /microsoft-365/security/defender-endpoint/configure-remediation-microsoft-defender-antivirus
+ items:
+ - name: Configure scheduled scans
+ href: /microsoft-365/security/defender-endpoint/scheduled-catch-up-scans-microsoft-defender-antivirus
+ - name: Configure and run scans
+ href: /microsoft-365/security/defender-endpoint/run-scan-microsoft-defender-antivirus
+ - name: Review scan results
+ href: /microsoft-365/security/defender-endpoint/review-scan-results-microsoft-defender-antivirus
+ - name: Run and review the results of an offline scan
+ href: /microsoft-365/security/defender-endpoint/microsoft-defender-offline
+ - name: Restore quarantined files
+ href: /microsoft-365/security/defender-endpoint/restore-quarantined-files-microsoft-defender-antivirus
+ - name: Troubleshoot Microsoft Defender Antivirus
+ items:
+ - name: Troubleshoot Microsoft Defender Antivirus issues
+ href: /microsoft-365/security/defender-endpoint/troubleshoot-microsoft-defender-antivirus
+ - name: Troubleshoot Microsoft Defender Antivirus migration issues
+ href: /microsoft-365/security/defender-endpoint/troubleshoot-microsoft-defender-antivirus-when-migrating
+ - name: "Better together: Microsoft Defender Antivirus and Microsoft Defender for Endpoint"
+ href: /microsoft-365/security/defender-endpoint/why-use-microsoft-defender-antivirus
+ - name: "Better together: Microsoft Defender Antivirus and Office 365"
+ href: /microsoft-365/security/defender-endpoint/office-365-microsoft-defender-antivirus
+ - name: Hardware-based isolation
+ items:
+ - name: Hardware-based isolation evaluation
+ href: microsoft-defender-application-guard/test-scenarios-md-app-guard.md
+ - name: Application isolation
+ items:
+ - name: Application guard overview
+ href: microsoft-defender-application-guard/md-app-guard-overview.md
+ - name: System requirements
+ href: microsoft-defender-application-guard/reqs-md-app-guard.md
+ - name: Install Microsoft Defender Application Guard
+ href: microsoft-defender-application-guard/install-md-app-guard.md
+ - name: Install Microsoft Defender Application Guard Extension
+ href: microsoft-defender-application-guard/md-app-guard-browser-extension.md
+ - name: Application control
+ href: windows-defender-application-control/windows-defender-application-control.md
+ items:
+ - name: Audit Application control policies
+ href: windows-defender-application-control/audit-windows-defender-application-control-policies.md
+ - name: System isolation
+ href: windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md
+ - name: System integrity
+ href: windows-defender-system-guard/system-guard-how-hardware-based-root-of-trust-helps-protect-windows.md
+ - name: Code integrity
+ href: device-guard/enable-virtualization-based-protection-of-code-integrity.md
+ - name: Network firewall
+ items:
+ - name: Network firewall overview
+ href: windows-firewall/windows-firewall-with-advanced-security.md
+ - name: Network firewall evaluation
+ href: windows-firewall/evaluating-windows-firewall-with-advanced-security-design-examples.md
+ - name: Security intelligence
+ href: intelligence/index.md
+ items:
+ - name: Understand malware & other threats
+ href: intelligence/understanding-malware.md
+ items:
+ - name: Prevent malware infection
+ href: intelligence/prevent-malware-infection.md
+ - name: Malware names
+ href: intelligence/malware-naming.md
+ - name: Coin miners
+ href: intelligence/coinminer-malware.md
+ - name: Exploits and exploit kits
+ href: intelligence/exploits-malware.md
+ - name: Fileless threats
+ href: intelligence/fileless-threats.md
+ - name: Macro malware
+ href: intelligence/macro-malware.md
+ - name: Phishing
+ href: intelligence/phishing.md
+ - name: Ransomware
+ href: intelligence/ransomware-malware.md
+ - name: Rootkits
+ href: intelligence/rootkits-malware.md
+ - name: Supply chain attacks
+ href: intelligence/supply-chain-malware.md
+ - name: Tech support scams
+ href: intelligence/support-scams.md
+ - name: Trojans
+ href: intelligence/trojans-malware.md
+ - name: Unwanted software
+ href: intelligence/unwanted-software.md
+ - name: Worms
+ href: intelligence/worms-malware.md
+ - name: How Microsoft identifies malware and PUA
+ href: intelligence/criteria.md
+ - name: Submit files for analysis
+ href: intelligence/submission-guide.md
+ - name: Safety Scanner download
+ href: intelligence/safety-scanner-download.md
+ - name: Industry collaboration programs
+ href: intelligence/cybersecurity-industry-partners.md
+ items:
+ - name: Virus information alliance
+ href: intelligence/virus-information-alliance-criteria.md
+ - name: Microsoft virus initiative
+ href: intelligence/virus-initiative-criteria.md
+ - name: Coordinated malware eradication
+ href: intelligence/coordinated-malware-eradication.md
+ - name: Information for developers
+ items:
+ - name: Software developer FAQ
+ href: intelligence/developer-faq.md
+ - name: Software developer resources
+ href: intelligence/developer-resources.md
+ - name: The Windows Security app
+ href: windows-defender-security-center/windows-defender-security-center.md
+ items:
+ - name: Customize the Windows Security app for your organization
+ href: windows-defender-security-center/wdsc-customize-contact-information.md
+ - name: Hide Windows Security app notifications
+ href: windows-defender-security-center/wdsc-hide-notifications.md
+ - name: Manage Windows Security app in Windows 10 in S mode
+ href: windows-defender-security-center/wdsc-windows-10-in-s-mode.md
+ - name: Virus and threat protection
+ href: windows-defender-security-center/wdsc-virus-threat-protection.md
+ - name: Account protection
+ href: windows-defender-security-center/wdsc-account-protection.md
+ - name: Firewall and network protection
+ href: windows-defender-security-center/wdsc-firewall-network-protection.md
+ - name: App and browser control
+ href: windows-defender-security-center/wdsc-app-browser-control.md
+ - name: Device security
+ href: windows-defender-security-center/wdsc-device-security.md
+ - name: Device performance and health
+ href: windows-defender-security-center/wdsc-device-performance-health.md
+ items:
+ - name: Family options
+ href: windows-defender-security-center/wdsc-family-options.md
+ - name: Microsoft Defender SmartScreen
+ href: microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md
+ items:
+ - name: Microsoft Defender SmartScreen Group Policy and mobile device management (MDM) settings
+ href: microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings.md
+ - name: Set up and use Microsoft Defender SmartScreen on individual devices
+ href: microsoft-defender-smartscreen/microsoft-defender-smartscreen-set-individual-device.md
+ - name: Windows Sandbox
+ href: windows-sandbox/windows-sandbox-overview.md
+ items:
+ - name: Windows Sandbox architecture
+ href: windows-sandbox/windows-sandbox-architecture.md
+ - name: Windows Sandbox configuration
+ href: windows-sandbox/windows-sandbox-configure-using-wsb-file.md
+ - name: "Windows Defender Device Guard: virtualization-based security and WDAC"
+ href: device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md
+ - name: Windows Certifications
+ items:
+ - name: FIPS 140 Validations
+ href: fips-140-validation.md
+ - name: Common Criteria Certifications
+ href: windows-platform-common-criteria.md
+ - name: More Windows 10 security
+ items:
+ - name: Control the health of Windows 10-based devices
+ href: protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
+ - name: Mitigate threats by using Windows 10 security features
+ href: overview-of-threat-mitigations-in-windows-10.md
+ - name: Override Process Mitigation Options to help enforce app-related security policies
+ href: override-mitigation-options-for-app-related-security-policies.md
+ - name: Use Windows Event Forwarding to help with intrusion detection
+ href: use-windows-event-forwarding-to-assist-in-intrusion-detection.md
+ - name: Block untrusted fonts in an enterprise
+ href: block-untrusted-fonts-in-enterprise.md
+ - name: Security auditing
+ href: auditing/security-auditing-overview.md
+ items:
+ - name: Basic security audit policies
+ href: auditing/basic-security-audit-policies.md
+ items:
+ - name: Create a basic audit policy for an event category
+ href: auditing/create-a-basic-audit-policy-settings-for-an-event-category.md
+ - name: Apply a basic audit policy on a file or folder
+ href: auditing/apply-a-basic-audit-policy-on-a-file-or-folder.md
+ - name: View the security event log
+ href: auditing/view-the-security-event-log.md
+ - name: Basic security audit policy settings
+ href: auditing/basic-security-audit-policy-settings.md
+ items:
+ - name: Audit account logon events
+ href: auditing/basic-audit-account-logon-events.md
+ - name: Audit account management
+ href: auditing/basic-audit-account-management.md
+ - name: Audit directory service access
+ href: auditing/basic-audit-directory-service-access.md
+ - name: Audit logon events
+ href: auditing/basic-audit-logon-events.md
+ - name: Audit object access
+ href: auditing/basic-audit-object-access.md
+ - name: Audit policy change
+ href: auditing/basic-audit-policy-change.md
+ - name: Audit privilege use
+ href: auditing/basic-audit-privilege-use.md
+ - name: Audit process tracking
+ href: auditing/basic-audit-process-tracking.md
+ - name: Audit system events
+ href: auditing/basic-audit-system-events.md
+ - name: Advanced security audit policies
+ href: auditing/advanced-security-auditing.md
+ items:
+ - name: Planning and deploying advanced security audit policies
+ href: auditing/planning-and-deploying-advanced-security-audit-policies.md
+ - name: Advanced security auditing FAQ
+ href: auditing/advanced-security-auditing-faq.yml
+ items:
+ - name: Which editions of Windows support advanced audit policy configuration
+ href: auditing/which-editions-of-windows-support-advanced-audit-policy-configuration.md
+ - name: How to list XML elements in \
+ href: auditing/how-to-list-xml-elements-in-eventdata.md
+ - name: Using advanced security auditing options to monitor dynamic access control objects
+ href: auditing/using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md
+ items:
+ - name: Monitor the central access policies that apply on a file server
+ href: auditing/monitor-the-central-access-policies-that-apply-on-a-file-server.md
+ - name: Monitor the use of removable storage devices
+ href: auditing/monitor-the-use-of-removable-storage-devices.md
+ - name: Monitor resource attribute definitions
+ href: auditing/monitor-resource-attribute-definitions.md
+ - name: Monitor central access policy and rule definitions
+ href: auditing/monitor-central-access-policy-and-rule-definitions.md
+ - name: Monitor user and device claims during sign-in
+ href: auditing/monitor-user-and-device-claims-during-sign-in.md
+ - name: Monitor the resource attributes on files and folders
+ href: auditing/monitor-the-resource-attributes-on-files-and-folders.md
+ - name: Monitor the central access policies associated with files and folders
+ href: auditing/monitor-the-central-access-policies-associated-with-files-and-folders.md
+ - name: Monitor claim types
+ href: auditing/monitor-claim-types.md
+ - name: Advanced security audit policy settings
+ href: auditing/advanced-security-audit-policy-settings.md
+ items:
+ - name: Audit Credential Validation
+ href: auditing/audit-credential-validation.md
+ - name: "Event 4774 S, F: An account was mapped for logon."
+ href: auditing/event-4774.md
+ - name: "Event 4775 F: An account could not be mapped for logon."
+ href: auditing/event-4775.md
+ - name: "Event 4776 S, F: The computer attempted to validate the credentials for an account."
+ href: auditing/event-4776.md
+ - name: "Event 4777 F: The domain controller failed to validate the credentials for an account."
+ href: auditing/event-4777.md
+ - name: Audit Kerberos Authentication Service
+ href: auditing/audit-kerberos-authentication-service.md
+ items:
+ - name: "Event 4768 S, F: A Kerberos authentication ticket, TGT, was requested."
+ href: auditing/event-4768.md
+ - name: "Event 4771 F: Kerberos pre-authentication failed."
+ href: auditing/event-4771.md
+ - name: "Event 4772 F: A Kerberos authentication ticket request failed."
+ href: auditing/event-4772.md
+ - name: Audit Kerberos Service Ticket Operations
+ href: auditing/audit-kerberos-service-ticket-operations.md
+ items:
+ - name: "Event 4769 S, F: A Kerberos service ticket was requested."
+ href: auditing/event-4769.md
+ - name: "Event 4770 S: A Kerberos service ticket was renewed."
+ href: auditing/event-4770.md
+ - name: "Event 4773 F: A Kerberos service ticket request failed."
+ href: auditing/event-4773.md
+ - name: Audit Other Account Logon Events
+ href: auditing/audit-other-account-logon-events.md
+ - name: Audit Application Group Management
+ href: auditing/audit-application-group-management.md
+ - name: Audit Computer Account Management
+ href: auditing/audit-computer-account-management.md
+ items:
+ - name: "Event 4741 S: A computer account was created."
+ href: auditing/event-4741.md
+ - name: "Event 4742 S: A computer account was changed."
+ href: auditing/event-4742.md
+ - name: "Event 4743 S: A computer account was deleted."
+ href: auditing/event-4743.md
+ - name: Audit Distribution Group Management
+ href: auditing/audit-distribution-group-management.md
+ items:
+ - name: "Event 4749 S: A security-disabled global group was created."
+ href: auditing/event-4749.md
+ - name: "Event 4750 S: A security-disabled global group was changed."
+ href: auditing/event-4750.md
+ - name: "Event 4751 S: A member was added to a security-disabled global group."
+ href: auditing/event-4751.md
+ - name: "Event 4752 S: A member was removed from a security-disabled global group."
+ href: auditing/event-4752.md
+ - name: "Event 4753 S: A security-disabled global group was deleted."
+ href: auditing/event-4753.md
+ - name: Audit Other Account Management Events
+ href: auditing/audit-other-account-management-events.md
+ items:
+ - name: "Event 4782 S: The password hash of an account was accessed."
+ href: auditing/event-4782.md
+ - name: "Event 4793 S: The Password Policy Checking API was called."
+ href: auditing/event-4793.md
+ - name: Audit Security Group Management
+ href: auditing/audit-security-group-management.md
+ items:
+ - name: "Event 4731 S: A security-enabled local group was created."
+ href: auditing/event-4731.md
+ - name: "Event 4732 S: A member was added to a security-enabled local group."
+ href: auditing/event-4732.md
+ - name: "Event 4733 S: A member was removed from a security-enabled local group."
+ href: auditing/event-4733.md
+ - name: "Event 4734 S: A security-enabled local group was deleted."
+ href: auditing/event-4734.md
+ - name: "Event 4735 S: A security-enabled local group was changed."
+ href: auditing/event-4735.md
+ - name: "Event 4764 S: A group�s type was changed."
+ href: auditing/event-4764.md
+ - name: "Event 4799 S: A security-enabled local group membership was enumerated."
+ href: auditing/event-4799.md
+ - name: Audit User Account Management
+ href: auditing/audit-user-account-management.md
+ items:
+ - name: "Event 4720 S: A user account was created."
+ href: auditing/event-4720.md
+ - name: "Event 4722 S: A user account was enabled."
+ href: auditing/event-4722.md
+ - name: "Event 4723 S, F: An attempt was made to change an account's password."
+ href: auditing/event-4723.md
+ - name: "Event 4724 S, F: An attempt was made to reset an account's password."
+ href: auditing/event-4724.md
+ - name: "Event 4725 S: A user account was disabled."
+ href: auditing/event-4725.md
+ - name: "Event 4726 S: A user account was deleted."
+ href: auditing/event-4726.md
+ - name: "Event 4738 S: A user account was changed."
+ href: auditing/event-4738.md
+ - name: "Event 4740 S: A user account was locked out."
+ href: auditing/event-4740.md
+ - name: "Event 4765 S: SID History was added to an account."
+ href: auditing/event-4765.md
+ - name: "Event 4766 F: An attempt to add SID History to an account failed."
+ href: auditing/event-4766.md
+ - name: "Event 4767 S: A user account was unlocked."
+ href: auditing/event-4767.md
+ - name: "Event 4780 S: The ACL was set on accounts that are members of administrators groups."
+ href: auditing/event-4780.md
+ - name: "Event 4781 S: The name of an account was changed."
+ href: auditing/event-4781.md
+ - name: "Event 4794 S, F: An attempt was made to set the Directory Services Restore Mode administrator password."
+ href: auditing/event-4794.md
+ - name: "Event 4798 S: A user's local group membership was enumerated."
+ href: auditing/event-4798.md
+ - name: "Event 5376 S: Credential Manager credentials were backed up."
+ href: auditing/event-5376.md
+ - name: "Event 5377 S: Credential Manager credentials were restored from a backup."
+ href: auditing/event-5377.md
+ - name: Audit DPAPI Activity
+ href: auditing/audit-dpapi-activity.md
+ items:
+ - name: "Event 4692 S, F: Backup of data protection master key was attempted."
+ href: auditing/event-4692.md
+ - name: "Event 4693 S, F: Recovery of data protection master key was attempted."
+ href: auditing/event-4693.md
+ - name: "Event 4694 S, F: Protection of auditable protected data was attempted."
+ href: auditing/event-4694.md
+ - name: "Event 4695 S, F: Unprotection of auditable protected data was attempted."
+ href: auditing/event-4695.md
+ - name: Audit PNP Activity
+ href: auditing/audit-pnp-activity.md
+ items:
+ - name: "Event 6416 S: A new external device was recognized by the System."
+ href: auditing/event-6416.md
+ - name: "Event 6419 S: A request was made to disable a device."
+ href: auditing/event-6419.md
+ - name: "Event 6420 S: A device was disabled."
+ href: auditing/event-6420.md
+ - name: "Event 6421 S: A request was made to enable a device."
+ href: auditing/event-6421.md
+ - name: "Event 6422 S: A device was enabled."
+ href: auditing/event-6422.md
+ - name: "Event 6423 S: The installation of this device is forbidden by system policy."
+ href: auditing/event-6423.md
+ - name: "Event 6424 S: The installation of this device was allowed, after having previously been forbidden by policy."
+ href: auditing/event-6424.md
+ - name: Audit Process Creation
+ href: auditing/audit-process-creation.md
+ items:
+ - name: "Event 4688 S: A new process has been created."
+ href: auditing/event-4688.md
+ - name: "Event 4696 S: A primary token was assigned to process."
+ href: auditing/event-4696.md
+ - name: Audit Process Termination
+ href: auditing/audit-process-termination.md
+ items:
+ - name: "Event 4689 S: A process has exited."
+ href: auditing/event-4689.md
+ - name: Audit RPC Events
+ href: auditing/audit-rpc-events.md
+ items:
+ - name: "Event 5712 S: A Remote Procedure Call, RPC, was attempted."
+ href: auditing/event-5712.md
+ - name: Audit Token Right Adjusted
+ href: auditing/audit-token-right-adjusted.md
+ items:
+ - name: "Event 4703 S: A user right was adjusted."
+ href: auditing/event-4703.md
+ - name: Audit Detailed Directory Service Replication
+ href: auditing/audit-detailed-directory-service-replication.md
+ items:
+ - name: "Event 4928 S, F: An Active Directory replica source naming context was established."
+ href: auditing/event-4928.md
+ - name: "Event 4929 S, F: An Active Directory replica source naming context was removed."
+ href: auditing/event-4929.md
+ - name: "Event 4930 S, F: An Active Directory replica source naming context was modified."
+ href: auditing/event-4930.md
+ - name: "Event 4931 S, F: An Active Directory replica destination naming context was modified."
+ href: auditing/event-4931.md
+ - name: "Event 4934 S: Attributes of an Active Directory object were replicated."
+ href: auditing/event-4934.md
+ - name: "Event 4935 F: Replication failure begins."
+ href: auditing/event-4935.md
+ - name: "Event 4936 S: Replication failure ends."
+ href: auditing/event-4936.md
+ - name: "Event 4937 S: A lingering object was removed from a replica."
+ href: auditing/event-4937.md
+ - name: Audit Directory Service Access
+ href: auditing/audit-directory-service-access.md
+ items:
+ - name: "Event 4662 S, F: An operation was performed on an object."
+ href: auditing/event-4662.md
+ - name: "Event 4661 S, F: A handle to an object was requested."
+ href: auditing/event-4661.md
+ - name: Audit Directory Service Changes
+ href: auditing/audit-directory-service-changes.md
+ items:
+ - name: "Event 5136 S: A directory service object was modified."
+ href: auditing/event-5136.md
+ - name: "Event 5137 S: A directory service object was created."
+ href: auditing/event-5137.md
+ - name: "Event 5138 S: A directory service object was undeleted."
+ href: auditing/event-5138.md
+ - name: "Event 5139 S: A directory service object was moved."
+ href: auditing/event-5139.md
+ - name: "Event 5141 S: A directory service object was deleted."
+ href: auditing/event-5141.md
+ - name: Audit Directory Service Replication
+ href: auditing/audit-directory-service-replication.md
+ items:
+ - name: "Event 4932 S: Synchronization of a replica of an Active Directory naming context has begun."
+ href: auditing/event-4932.md
+ - name: "Event 4933 S, F: Synchronization of a replica of an Active Directory naming context has ended."
+ href: auditing/event-4933.md
+ - name: Audit Account Lockout
+ href: auditing/audit-account-lockout.md
+ items:
+ - name: "Event 4625 F: An account failed to log on."
+ href: auditing/event-4625.md
+ - name: Audit User/Device Claims
+ href: auditing/audit-user-device-claims.md
+ items:
+ - name: "Event 4626 S: User/Device claims information."
+ href: auditing/event-4626.md
+ - name: Audit Group Membership
+ href: auditing/audit-group-membership.md
+ items:
+ - name: "Event 4627 S: Group membership information."
+ href: auditing/event-4627.md
+ - name: Audit IPsec Extended Mode
+ href: auditing/audit-ipsec-extended-mode.md
+ - name: Audit IPsec Main Mode
+ href: auditing/audit-ipsec-main-mode.md
+ - name: Audit IPsec Quick Mode
+ href: auditing/audit-ipsec-quick-mode.md
+ - name: Audit Logoff
+ href: auditing/audit-logoff.md
+ items:
+ - name: "Event 4634 S: An account was logged off."
+ href: auditing/event-4634.md
+ - name: "Event 4647 S: User initiated logoff."
+ href: auditing/event-4647.md
+ - name: Audit Logon
+ href: auditing/audit-logon.md
+ items:
+ - name: "Event 4624 S: An account was successfully logged on."
+ href: auditing/event-4624.md
+ - name: "Event 4625 F: An account failed to log on."
+ href: auditing/event-4625.md
+ - name: "Event 4648 S: A logon was attempted using explicit credentials."
+ href: auditing/event-4648.md
+ - name: "Event 4675 S: SIDs were filtered."
+ href: auditing/event-4675.md
+ - name: Audit Network Policy Server
+ href: auditing/audit-network-policy-server.md
+ - name: Audit Other Logon/Logoff Events
+ href: auditing/audit-other-logonlogoff-events.md
+ items:
+ - name: "Event 4649 S: A replay attack was detected."
+ href: auditing/event-4649.md
+ - name: "Event 4778 S: A session was reconnected to a Window Station."
+ href: auditing/event-4778.md
+ - name: "Event 4779 S: A session was disconnected from a Window Station."
+ href: auditing/event-4779.md
+ - name: "Event 4800 S: The workstation was locked."
+ href: auditing/event-4800.md
+ - name: "Event 4801 S: The workstation was unlocked."
+ href: auditing/event-4801.md
+ - name: "Event 4802 S: The screen saver was invoked."
+ href: auditing/event-4802.md
+ - name: "Event 4803 S: The screen saver was dismissed."
+ href: auditing/event-4803.md
+ - name: "Event 5378 F: The requested credentials delegation was disallowed by policy."
+ href: auditing/event-5378.md
+ - name: "Event 5632 S, F: A request was made to authenticate to a wireless network."
+ href: auditing/event-5632.md
+ - name: "Event 5633 S, F: A request was made to authenticate to a wired network."
+ href: auditing/event-5633.md
+ - name: Audit Special Logon
+ href: auditing/audit-special-logon.md
+ items:
+ - name: "Event 4964 S: Special groups have been assigned to a new logon."
+ href: auditing/event-4964.md
+ - name: "Event 4672 S: Special privileges assigned to new logon."
+ href: auditing/event-4672.md
+ - name: Audit Application Generated
+ href: auditing/audit-application-generated.md
+ - name: Audit Certification Services
+ href: auditing/audit-certification-services.md
+ - name: Audit Detailed File Share
+ href: auditing/audit-detailed-file-share.md
+ items:
+ - name: "Event 5145 S, F: A network share object was checked to see whether client can be granted desired access."
+ href: auditing/event-5145.md
+ - name: Audit File Share
+ href: auditing/audit-file-share.md
+ items:
+ - name: "Event 5140 S, F: A network share object was accessed."
+ href: auditing/event-5140.md
+ - name: "Event 5142 S: A network share object was added."
+ href: auditing/event-5142.md
+ - name: "Event 5143 S: A network share object was modified."
+ href: auditing/event-5143.md
+ - name: "Event 5144 S: A network share object was deleted."
+ href: auditing/event-5144.md
+ - name: "Event 5168 F: SPN check for SMB/SMB2 failed."
+ href: auditing/event-5168.md
+ - name: Audit File System
+ href: auditing/audit-file-system.md
+ items:
+ - name: "Event 4656 S, F: A handle to an object was requested."
+ href: auditing/event-4656.md
+ - name: "Event 4658 S: The handle to an object was closed."
+ href: auditing/event-4658.md
+ - name: "Event 4660 S: An object was deleted."
+ href: auditing/event-4660.md
+ - name: "Event 4663 S: An attempt was made to access an object."
+ href: auditing/event-4663.md
+ - name: "Event 4664 S: An attempt was made to create a hard link."
+ href: auditing/event-4664.md
+ - name: "Event 4985 S: The state of a transaction has changed."
+ href: auditing/event-4985.md
+ - name: "Event 5051: A file was virtualized."
+ href: auditing/event-5051.md
+ - name: "Event 4670 S: Permissions on an object were changed."
+ href: auditing/event-4670.md
+ - name: Audit Filtering Platform Connection
+ href: auditing/audit-filtering-platform-connection.md
+ items:
+ - name: "Event 5031 F: The Windows Firewall Service blocked an application from accepting incoming connections on the network."
+ href: auditing/event-5031.md
+ - name: "Event 5150: The Windows Filtering Platform blocked a packet."
+ href: auditing/event-5150.md
+ - name: "Event 5151: A more restrictive Windows Filtering Platform filter has blocked a packet."
+ href: auditing/event-5151.md
+ - name: "Event 5154 S: The Windows Filtering Platform has permitted an application or service to listen on a port for incoming connections."
+ href: auditing/event-5154.md
+ - name: "Event 5155 F: The Windows Filtering Platform has blocked an application or service from listening on a port for incoming connections."
+ href: auditing/event-5155.md
+ - name: "Event 5156 S: The Windows Filtering Platform has permitted a connection."
+ href: auditing/event-5156.md
+ - name: "Event 5157 F: The Windows Filtering Platform has blocked a connection."
+ href: auditing/event-5157.md
+ - name: "Event 5158 S: The Windows Filtering Platform has permitted a bind to a local port."
+ href: auditing/event-5158.md
+ - name: "Event 5159 F: The Windows Filtering Platform has blocked a bind to a local port."
+ href: auditing/event-5159.md
+ - name: Audit Filtering Platform Packet Drop
+ href: auditing/audit-filtering-platform-packet-drop.md
+ items:
+ - name: "Event 5152 F: The Windows Filtering Platform blocked a packet."
+ href: auditing/event-5152.md
+ - name: "Event 5153 S: A more restrictive Windows Filtering Platform filter has blocked a packet."
+ href: auditing/event-5153.md
+ - name: Audit Handle Manipulation
+ href: auditing/audit-handle-manipulation.md
+ items:
+ - name: "Event 4690 S: An attempt was made to duplicate a handle to an object."
+ href: auditing/event-4690.md
+ - name: Audit Kernel Object
+ href: auditing/audit-kernel-object.md
+ items:
+ - name: "Event 4656 S, F: A handle to an object was requested."
+ href: auditing/event-4656.md
+ - name: "Event 4658 S: The handle to an object was closed."
+ href: auditing/event-4658.md
+ - name: "Event 4660 S: An object was deleted."
+ href: auditing/event-4660.md
+ - name: "Event 4663 S: An attempt was made to access an object."
+ href: auditing/event-4663.md
+ - name: Audit Other Object Access Events
+ href: auditing/audit-other-object-access-events.md
+ items:
+ - name: "Event 4671: An application attempted to access a blocked ordinal through the TBS."
+ href: auditing/event-4671.md
+ - name: "Event 4691 S: Indirect access to an object was requested."
+ href: auditing/event-4691.md
+ - name: "Event 5148 F: The Windows Filtering Platform has detected a DoS attack and entered a defensive mode; packets associated with this attack will be discarded."
+ href: auditing/event-5148.md
+ - name: "Event 5149 F: The DoS attack has subsided and normal processing is being resumed."
+ href: auditing/event-5149.md
+ - name: "Event 4698 S: A scheduled task was created."
+ href: auditing/event-4698.md
+ - name: "Event 4699 S: A scheduled task was deleted."
+ href: auditing/event-4699.md
+ - name: "Event 4700 S: A scheduled task was enabled."
+ href: auditing/event-4700.md
+ - name: "Event 4701 S: A scheduled task was disabled."
+ href: auditing/event-4701.md
+ - name: "Event 4702 S: A scheduled task was updated."
+ href: auditing/event-4702.md
+ - name: "Event 5888 S: An object in the COM+ Catalog was modified."
+ href: auditing/event-5888.md
+ - name: "Event 5889 S: An object was deleted from the COM+ Catalog."
+ href: auditing/event-5889.md
+ - name: "Event 5890 S: An object was added to the COM+ Catalog."
+ href: auditing/event-5890.md
+ - name: Audit Registry
+ href: auditing/audit-registry.md
+ items:
+ - name: "Event 4663 S: An attempt was made to access an object."
+ href: auditing/event-4663.md
+ - name: "Event 4656 S, F: A handle to an object was requested."
+ href: auditing/event-4656.md
+ - name: "Event 4658 S: The handle to an object was closed."
+ href: auditing/event-4658.md
+ - name: "Event 4660 S: An object was deleted."
+ href: auditing/event-4660.md
+ - name: "Event 4657 S: A registry value was modified."
+ href: auditing/event-4657.md
+ - name: "Event 5039: A registry key was virtualized."
+ href: auditing/event-5039.md
+ - name: "Event 4670 S: Permissions on an object were changed."
+ href: auditing/event-4670.md
+ - name: Audit Removable Storage
+ href: auditing/audit-removable-storage.md
+ - name: Audit SAM
+ href: auditing/audit-sam.md
+ items:
+ - name: "Event 4661 S, F: A handle to an object was requested."
+ href: auditing/event-4661.md
+ - name: Audit Central Access Policy Staging
+ href: auditing/audit-central-access-policy-staging.md
+ items:
+ - name: "Event 4818 S: Proposed Central Access Policy does not grant the same access permissions as the current Central Access Policy."
+ href: auditing/event-4818.md
+ - name: Audit Audit Policy Change
+ href: auditing/audit-audit-policy-change.md
+ items:
+ - name: "Event 4670 S: Permissions on an object were changed."
+ href: auditing/event-4670.md
+ - name: "Event 4715 S: The audit policy, SACL, on an object was changed."
+ href: auditing/event-4715.md
+ - name: "Event 4719 S: System audit policy was changed."
+ href: auditing/event-4719.md
+ - name: "Event 4817 S: Auditing settings on object were changed."
+ href: auditing/event-4817.md
+ - name: "Event 4902 S: The Per-user audit policy table was created."
+ href: auditing/event-4902.md
+ - name: "Event 4906 S: The CrashOnAuditFail value has changed."
+ href: auditing/event-4906.md
+ - name: "Event 4907 S: Auditing settings on object were changed."
+ href: auditing/event-4907.md
+ - name: "Event 4908 S: Special Groups Logon table modified."
+ href: auditing/event-4908.md
+ - name: "Event 4912 S: Per User Audit Policy was changed."
+ href: auditing/event-4912.md
+ - name: "Event 4904 S: An attempt was made to register a security event source."
+ href: auditing/event-4904.md
+ - name: "Event 4905 S: An attempt was made to unregister a security event source."
+ href: auditing/event-4905.md
+ - name: Audit Authentication Policy Change
+ href: auditing/audit-authentication-policy-change.md
+ items:
+ - name: "Event 4706 S: A new trust was created to a domain."
+ href: auditing/event-4706.md
+ - name: "Event 4707 S: A trust to a domain was removed."
+ href: auditing/event-4707.md
+ - name: "Event 4716 S: Trusted domain information was modified."
+ href: auditing/event-4716.md
+ - name: "Event 4713 S: Kerberos policy was changed."
+ href: auditing/event-4713.md
+ - name: "Event 4717 S: System security access was granted to an account."
+ href: auditing/event-4717.md
+ - name: "Event 4718 S: System security access was removed from an account."
+ href: auditing/event-4718.md
+ - name: "Event 4739 S: Domain Policy was changed."
+ href: auditing/event-4739.md
+ - name: "Event 4864 S: A namespace collision was detected."
+ href: auditing/event-4864.md
+ - name: "Event 4865 S: A trusted forest information entry was added."
+ href: auditing/event-4865.md
+ - name: "Event 4866 S: A trusted forest information entry was removed."
+ href: auditing/event-4866.md
+ - name: "Event 4867 S: A trusted forest information entry was modified."
+ href: auditing/event-4867.md
+ - name: Audit Authorization Policy Change
+ href: auditing/audit-authorization-policy-change.md
+ items:
+ - name: "Event 4703 S: A user right was adjusted."
+ href: auditing/event-4703.md
+ - name: "Event 4704 S: A user right was assigned."
+ href: auditing/event-4704.md
+ - name: "Event 4705 S: A user right was removed."
+ href: auditing/event-4705.md
+ - name: "Event 4670 S: Permissions on an object were changed."
+ href: auditing/event-4670.md
+ - name: "Event 4911 S: Resource attributes of the object were changed."
+ href: auditing/event-4911.md
+ - name: "Event 4913 S: Central Access Policy on the object was changed."
+ href: auditing/event-4913.md
+ - name: Audit Filtering Platform Policy Change
+ href: auditing/audit-filtering-platform-policy-change.md
+ - name: Audit MPSSVC Rule-Level Policy Change
+ href: auditing/audit-mpssvc-rule-level-policy-change.md
+ items:
+ - name: "Event 4944 S: The following policy was active when the Windows Firewall started."
+ href: auditing/event-4944.md
+ - name: "Event 4945 S: A rule was listed when the Windows Firewall started."
+ href: auditing/event-4945.md
+ - name: "Event 4946 S: A change has been made to Windows Firewall exception list. A rule was added."
+ href: auditing/event-4946.md
+ - name: "Event 4947 S: A change has been made to Windows Firewall exception list. A rule was modified."
+ href: auditing/event-4947.md
+ - name: "Event 4948 S: A change has been made to Windows Firewall exception list. A rule was deleted."
+ href: auditing/event-4948.md
+ - name: "Event 4949 S: Windows Firewall settings were restored to the default values."
+ href: auditing/event-4949.md
+ - name: "Event 4950 S: A Windows Firewall setting has changed."
+ href: auditing/event-4950.md
+ - name: "Event 4951 F: A rule has been ignored because its major version number was not recognized by Windows Firewall."
+ href: auditing/event-4951.md
+ - name: "Event 4952 F: Parts of a rule have been ignored because its minor version number was not recognized by Windows Firewall. The other parts of the rule will be enforced."
+ href: auditing/event-4952.md
+ - name: "Event 4953 F: Windows Firewall ignored a rule because it could not be parsed."
+ href: auditing/event-4953.md
+ - name: "Event 4954 S: Windows Firewall Group Policy settings have changed. The new settings have been applied."
+ href: auditing/event-4954.md
+ - name: "Event 4956 S: Windows Firewall has changed the active profile."
+ href: auditing/event-4956.md
+ - name: "Event 4957 F: Windows Firewall did not apply the following rule."
+ href: auditing/event-4957.md
+ - name: "Event 4958 F: Windows Firewall did not apply the following rule because the rule referred to items not configured on this computer."
+ href: auditing/event-4958.md
+ - name: Audit Other Policy Change Events
+ href: auditing/audit-other-policy-change-events.md
+ items:
+ - name: "Event 4714 S: Encrypted data recovery policy was changed."
+ href: auditing/event-4714.md
+ - name: "Event 4819 S: Central Access Policies on the machine have been changed."
+ href: auditing/event-4819.md
+ - name: "Event 4826 S: Boot Configuration Data loaded."
+ href: auditing/event-4826.md
+ - name: "Event 4909: The local policy settings for the TBS were changed."
+ href: auditing/event-4909.md
+ - name: "Event 4910: The group policy settings for the TBS were changed."
+ href: auditing/event-4910.md
+ - name: "Event 5063 S, F: A cryptographic provider operation was attempted."
+ href: auditing/event-5063.md
+ - name: "Event 5064 S, F: A cryptographic context operation was attempted."
+ href: auditing/event-5064.md
+ - name: "Event 5065 S, F: A cryptographic context modification was attempted."
+ href: auditing/event-5065.md
+ - name: "Event 5066 S, F: A cryptographic function operation was attempted."
+ href: auditing/event-5066.md
+ - name: "Event 5067 S, F: A cryptographic function modification was attempted."
+ href: auditing/event-5067.md
+ - name: "Event 5068 S, F: A cryptographic function provider operation was attempted."
+ href: auditing/event-5068.md
+ - name: "Event 5069 S, F: A cryptographic function property operation was attempted."
+ href: auditing/event-5069.md
+ - name: "Event 5070 S, F: A cryptographic function property modification was attempted."
+ href: auditing/event-5070.md
+ - name: "Event 5447 S: A Windows Filtering Platform filter has been changed."
+ href: auditing/event-5447.md
+ - name: "Event 6144 S: Security policy in the group policy objects has been applied successfully."
+ href: auditing/event-6144.md
+ - name: "Event 6145 F: One or more errors occurred while processing security policy in the group policy objects."
+ href: auditing/event-6145.md
+ - name: Audit Sensitive Privilege Use
+ href: auditing/audit-sensitive-privilege-use.md
+ items:
+ - name: "Event 4673 S, F: A privileged service was called."
+ href: auditing/event-4673.md
+ - name: "Event 4674 S, F: An operation was attempted on a privileged object."
+ href: auditing/event-4674.md
+ - name: "Event 4985 S: The state of a transaction has changed."
+ href: auditing/event-4985.md
+ - name: Audit Non Sensitive Privilege Use
+ href: auditing/audit-non-sensitive-privilege-use.md
+ items:
+ - name: "Event 4673 S, F: A privileged service was called."
+ href: auditing/event-4673.md
+ - name: "Event 4674 S, F: An operation was attempted on a privileged object."
+ href: auditing/event-4674.md
+ - name: "Event 4985 S: The state of a transaction has changed."
+ href: auditing/event-4985.md
+ - name: Audit Other Privilege Use Events
+ href: auditing/audit-other-privilege-use-events.md
+ items:
+ - name: "Event 4985 S: The state of a transaction has changed."
+ href: auditing/event-4985.md
+ - name: Audit IPsec Driver
+ href: auditing/audit-ipsec-driver.md
+ - name: Audit Other System Events
+ href: auditing/audit-other-system-events.md
+ items:
+ - name: "Event 5024 S: The Windows Firewall Service has started successfully."
+ href: auditing/event-5024.md
+ - name: "Event 5025 S: The Windows Firewall Service has been stopped."
+ href: auditing/event-5025.md
+ - name: "Event 5027 F: The Windows Firewall Service was unable to retrieve the security policy from the local storage. The service will continue enforcing the current policy."
+ href: auditing/event-5027.md
+ - name: "Event 5028 F: The Windows Firewall Service was unable to parse the new security policy. The service will continue with currently enforced policy."
+ href: auditing/event-5028.md
+ - name: "Event 5029 F: The Windows Firewall Service failed to initialize the driver. The service will continue to enforce the current policy."
+ href: auditing/event-5029.md
+ - name: "Event 5030 F: The Windows Firewall Service failed to start."
+ href: auditing/event-5030.md
+ - name: "Event 5032 F: Windows Firewall was unable to notify the user that it blocked an application from accepting incoming connections on the network."
+ href: auditing/event-5032.md
+ - name: "Event 5033 S: The Windows Firewall Driver has started successfully."
+ href: auditing/event-5033.md
+ - name: "Event 5034 S: The Windows Firewall Driver was stopped."
+ href: auditing/event-5034.md
+ - name: "Event 5035 F: The Windows Firewall Driver failed to start."
+ href: auditing/event-5035.md
+ - name: "Event 5037 F: The Windows Firewall Driver detected critical runtime error. Terminating."
+ href: auditing/event-5037.md
+ - name: "Event 5058 S, F: Key file operation."
+ href: auditing/event-5058.md
+ - name: "Event 5059 S, F: Key migration operation."
+ href: auditing/event-5059.md
+ - name: "Event 6400: BranchCache: Received an incorrectly formatted response while discovering availability of content."
+ href: auditing/event-6400.md
+ - name: "Event 6401: BranchCache: Received invalid data from a peer. Data discarded."
+ href: auditing/event-6401.md
+ - name: "Event 6402: BranchCache: The message to the hosted cache offering it data is incorrectly formatted."
+ href: auditing/event-6402.md
+ - name: "Event 6403: BranchCache: The hosted cache sent an incorrectly formatted response to the client."
+ href: auditing/event-6403.md
+ - name: "Event 6404: BranchCache: Hosted cache could not be authenticated using the provisioned SSL certificate."
+ href: auditing/event-6404.md
+ - name: "Event 6405: BranchCache: %2 instances of event id %1 occurred."
+ href: auditing/event-6405.md
+ - name: "Event 6406: %1 registered to Windows Firewall to control filtering for the following: %2."
+ href: auditing/event-6406.md
+ - name: "Event 6407: 1%."
+ href: auditing/event-6407.md
+ - name: "Event 6408: Registered product %1 failed and Windows Firewall is now controlling the filtering for %2."
+ href: auditing/event-6408.md
+ - name: "Event 6409: BranchCache: A service connection point object could not be parsed."
+ href: auditing/event-6409.md
+ - name: Audit Security State Change
+ href: auditing/audit-security-state-change.md
+ items:
+ - name: "Event 4608 S: Windows is starting up."
+ href: auditing/event-4608.md
+ - name: "Event 4616 S: The system time was changed."
+ href: auditing/event-4616.md
+ - name: "Event 4621 S: Administrator recovered system from CrashOnAuditFail."
+ href: auditing/event-4621.md
+ - name: Audit Security System Extension
+ href: auditing/audit-security-system-extension.md
+ items:
+ - name: "Event 4610 S: An authentication package has been loaded by the Local Security Authority."
+ href: auditing/event-4610.md
+ - name: "Event 4611 S: A trusted logon process has been registered with the Local Security Authority."
+ href: auditing/event-4611.md
+ - name: "Event 4614 S: A notification package has been loaded by the Security Account Manager."
+ href: auditing/event-4614.md
+ - name: "Event 4622 S: A security package has been loaded by the Local Security Authority."
+ href: auditing/event-4622.md
+ - name: "Event 4697 S: A service was installed in the system."
+ href: auditing/event-4697.md
+ - name: Audit System Integrity
+ href: auditing/audit-system-integrity.md
+ items:
+ - name: "Event 4612 S: Internal resources allocated for the queuing of audit messages have been exhausted, leading to the loss of some audits."
+ href: auditing/event-4612.md
+ - name: "Event 4615 S: Invalid use of LPC port."
+ href: auditing/event-4615.md
+ - name: "Event 4618 S: A monitored security event pattern has occurred."
+ href: auditing/event-4618.md
+ - name: "Event 4816 S: RPC detected an integrity violation while decrypting an incoming message."
+ href: auditing/event-4816.md
+ - name: "Event 5038 F: Code integrity determined that the image hash of a file is not valid."
+ href: auditing/event-5038.md
+ - name: "Event 5056 S: A cryptographic self-test was performed."
+ href: auditing/event-5056.md
+ - name: "Event 5062 S: A kernel-mode cryptographic self-test was performed."
+ href: auditing/event-5062.md
+ - name: "Event 5057 F: A cryptographic primitive operation failed."
+ href: auditing/event-5057.md
+ - name: "Event 5060 F: Verification operation failed."
+ href: auditing/event-5060.md
+ - name: "Event 5061 S, F: Cryptographic operation."
+ href: auditing/event-5061.md
+ - name: "Event 6281 F: Code Integrity determined that the page hashes of an image file are not valid."
+ href: auditing/event-6281.md
+ - name: "Event 6410 F: Code integrity determined that a file does not meet the security requirements to load into a process."
+ href: auditing/event-6410.md
+ - name: Other Events
+ href: auditing/other-events.md
+ items:
+ - name: "Event 1100 S: The event logging service has shut down."
+ href: auditing/event-1100.md
+ - name: "Event 1102 S: The audit log was cleared."
+ href: auditing/event-1102.md
+ - name: "Event 1104 S: The security log is now full."
+ href: auditing/event-1104.md
+ - name: "Event 1105 S: Event log automatic backup."
+ href: auditing/event-1105.md
+ - name: "Event 1108 S: The event logging service encountered an error while processing an incoming event published from %1."
+ href: auditing/event-1108.md
+ - name: "Appendix A: Security monitoring recommendations for many audit events"
+ href: auditing/appendix-a-security-monitoring-recommendations-for-many-audit-events.md
+ - name: Registry (Global Object Access Auditing)
+ href: auditing/registry-global-object-access-auditing.md
+ - name: File System (Global Object Access Auditing)
+ href: auditing/file-system-global-object-access-auditing.md
+ - name: Security policy settings
+ href: security-policy-settings/security-policy-settings.md
+ items:
+ - name: Administer security policy settings
+ href: security-policy-settings/administer-security-policy-settings.md
+ items:
+ - name: Network List Manager policies
+ href: security-policy-settings/network-list-manager-policies.md
+ - name: Configure security policy settings
+ href: security-policy-settings/how-to-configure-security-policy-settings.md
+ - name: Security policy settings reference
+ href: security-policy-settings/security-policy-settings-reference.md
+ items:
+ - name: Account Policies
+ href: security-policy-settings/account-policies.md
+ items:
+ - name: Password Policy
+ href: security-policy-settings/password-policy.md
+ items:
+ - name: Enforce password history
+ href: security-policy-settings/enforce-password-history.md
+ - name: Maximum password age
+ href: security-policy-settings/maximum-password-age.md
+ - name: Minimum password age
+ href: security-policy-settings/minimum-password-age.md
+ - name: Minimum password length
+ href: security-policy-settings/minimum-password-length.md
+ - name: Password must meet complexity requirements
+ href: security-policy-settings/password-must-meet-complexity-requirements.md
+ - name: Store passwords using reversible encryption
+ href: security-policy-settings/store-passwords-using-reversible-encryption.md
+ - name: Account Lockout Policy
+ href: security-policy-settings/account-lockout-policy.md
+ items:
+ - name: Account lockout duration
+ href: security-policy-settings/account-lockout-duration.md
+ - name: Account lockout threshold
+ href: security-policy-settings/account-lockout-threshold.md
+ - name: Reset account lockout counter after
+ href: security-policy-settings/reset-account-lockout-counter-after.md
+ - name: Kerberos Policy
+ href: security-policy-settings/kerberos-policy.md
+ items:
+ - name: Enforce user logon restrictions
+ href: security-policy-settings/enforce-user-logon-restrictions.md
+ - name: Maximum lifetime for service ticket
+ href: security-policy-settings/maximum-lifetime-for-service-ticket.md
+ - name: Maximum lifetime for user ticket
+ href: security-policy-settings/maximum-lifetime-for-user-ticket.md
+ - name: Maximum lifetime for user ticket renewal
+ href: security-policy-settings/maximum-lifetime-for-user-ticket-renewal.md
+ - name: Maximum tolerance for computer clock synchronization
+ href: security-policy-settings/maximum-tolerance-for-computer-clock-synchronization.md
+ - name: Audit Policy
+ href: security-policy-settings/audit-policy.md
+ - name: Security Options
+ href: security-policy-settings/security-options.md
+ items:
+ - name: "Accounts: Administrator account status"
+ href: security-policy-settings/accounts-administrator-account-status.md
+ - name: "Accounts: Block Microsoft accounts"
+ href: security-policy-settings/accounts-block-microsoft-accounts.md
+ - name: "Accounts: Guest account status"
+ href: security-policy-settings/accounts-guest-account-status.md
+ - name: "Accounts: Limit local account use of blank passwords to console logon only"
+ href: security-policy-settings/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
+ - name: "Accounts: Rename administrator account"
+ href: security-policy-settings/accounts-rename-administrator-account.md
+ - name: "Accounts: Rename guest account"
+ href: security-policy-settings/accounts-rename-guest-account.md
+ - name: "Audit: Audit the access of global system objects"
+ href: security-policy-settings/audit-audit-the-access-of-global-system-objects.md
+ - name: "Audit: Audit the use of Backup and Restore privilege"
+ href: security-policy-settings/audit-audit-the-use-of-backup-and-restore-privilege.md
+ - name: "Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings"
+ href: security-policy-settings/audit-force-audit-policy-subcategory-settings-to-override.md
+ - name: "Audit: Shut down system immediately if unable to log security audits"
+ href: security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
+ - name: "DCOM: Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax"
+ href: security-policy-settings/dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
+ - name: "DCOM: Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax"
+ href: security-policy-settings/dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
+ - name: "Devices: Allow undock without having to log on"
+ href: security-policy-settings/devices-allow-undock-without-having-to-log-on.md
+ - name: "Devices: Allowed to format and eject removable media"
+ href: security-policy-settings/devices-allowed-to-format-and-eject-removable-media.md
+ - name: "Devices: Prevent users from installing printer drivers"
+ href: security-policy-settings/devices-prevent-users-from-installing-printer-drivers.md
+ - name: "Devices: Restrict CD-ROM access to locally logged-on user only"
+ href: security-policy-settings/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
+ - name: "Devices: Restrict floppy access to locally logged-on user only"
+ href: security-policy-settings/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
+ - name: "Domain controller: Allow server operators to schedule tasks"
+ href: security-policy-settings/domain-controller-allow-server-operators-to-schedule-tasks.md
+ - name: "Domain controller: LDAP server signing requirements"
+ href: security-policy-settings/domain-controller-ldap-server-signing-requirements.md
+ - name: "Domain controller: Refuse machine account password changes"
+ href: security-policy-settings/domain-controller-refuse-machine-account-password-changes.md
+ - name: "Domain member: Digitally encrypt or sign secure channel data (always)"
+ href: security-policy-settings/domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md
+ - name: "Domain member: Digitally encrypt secure channel data (when possible)"
+ href: security-policy-settings/domain-member-digitally-encrypt-secure-channel-data-when-possible.md
+ - name: "Domain member: Digitally sign secure channel data (when possible)"
+ href: security-policy-settings/domain-member-digitally-sign-secure-channel-data-when-possible.md
+ - name: "Domain member: Disable machine account password changes"
+ href: security-policy-settings/domain-member-disable-machine-account-password-changes.md
+ - name: "Domain member: Maximum machine account password age"
+ href: security-policy-settings/domain-member-maximum-machine-account-password-age.md
+ - name: "Domain member: Require strong (Windows 2000 or later) session key"
+ href: security-policy-settings/domain-member-require-strong-windows-2000-or-later-session-key.md
+ - name: "Interactive logon: Display user information when the session is locked"
+ href: security-policy-settings/interactive-logon-display-user-information-when-the-session-is-locked.md
+ - name: "Interactive logon: Don't display last signed-in"
+ href: security-policy-settings/interactive-logon-do-not-display-last-user-name.md
+ - name: "Interactive logon: Don't display username at sign-in"
+ href: security-policy-settings/interactive-logon-dont-display-username-at-sign-in.md
+ - name: "Interactive logon: Do not require CTRL+ALT+DEL"
+ href: security-policy-settings/interactive-logon-do-not-require-ctrl-alt-del.md
+ - name: "Interactive logon: Machine account lockout threshold"
+ href: security-policy-settings/interactive-logon-machine-account-lockout-threshold.md
+ - name: "Interactive logon: Machine inactivity limit"
+ href: security-policy-settings/interactive-logon-machine-inactivity-limit.md
+ - name: "Interactive logon: Message text for users attempting to log on"
+ href: security-policy-settings/interactive-logon-message-text-for-users-attempting-to-log-on.md
+ - name: "Interactive logon: Message title for users attempting to log on"
+ href: security-policy-settings/interactive-logon-message-title-for-users-attempting-to-log-on.md
+ - name: "Interactive logon: Number of previous logons to cache (in case domain controller is not available)"
+ href: security-policy-settings/interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md
+ - name: "Interactive logon: Prompt user to change password before expiration"
+ href: security-policy-settings/interactive-logon-prompt-user-to-change-password-before-expiration.md
+ - name: "Interactive logon: Require Domain Controller authentication to unlock workstation"
+ href: security-policy-settings/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
+ - name: "Interactive logon: Require smart card"
+ href: security-policy-settings/interactive-logon-require-smart-card.md
+ - name: "Interactive logon: Smart card removal behavior"
+ href: security-policy-settings/interactive-logon-smart-card-removal-behavior.md
+ - name: "Microsoft network client: Digitally sign communications (always)"
+ href: security-policy-settings/microsoft-network-client-digitally-sign-communications-always.md
+ - name: "SMBv1 Microsoft network client: Digitally sign communications (always)"
+ href: security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-always.md
+ - name: "SMBv1 Microsoft network client: Digitally sign communications (if server agrees)"
+ href: security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-if-server-agrees.md
+ - name: "Microsoft network client: Send unencrypted password to third-party SMB servers"
+ href: security-policy-settings/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
+ - name: "Microsoft network server: Amount of idle time required before suspending session"
+ href: security-policy-settings/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
+ - name: "Microsoft network server: Attempt S4U2Self to obtain claim information"
+ href: security-policy-settings/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
+ - name: "Microsoft network server: Digitally sign communications (always)"
+ href: security-policy-settings/microsoft-network-server-digitally-sign-communications-always.md
+ - name: "SMBv1 Microsoft network server: Digitally sign communications (always)"
+ href: security-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-always.md
+ - name: "SMBv1 Microsoft network server: Digitally sign communications (if client agrees)"
+ href: security-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-if-client-agrees.md
+ - name: "Microsoft network server: Disconnect clients when logon hours expire"
+ href: security-policy-settings/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
+ - name: "Microsoft network server: Server SPN target name validation level"
+ href: security-policy-settings/microsoft-network-server-server-spn-target-name-validation-level.md
+ - name: "Network access: Allow anonymous SID/Name translation"
+ href: security-policy-settings/network-access-allow-anonymous-sidname-translation.md
+ - name: "Network access: Do not allow anonymous enumeration of SAM accounts"
+ href: security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
+ - name: "Network access: Do not allow anonymous enumeration of SAM accounts and shares"
+ href: security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
+ - name: "Network access: Do not allow storage of passwords and credentials for network authentication"
+ href: security-policy-settings/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
+ - name: "Network access: Let Everyone permissions apply to anonymous users"
+ href: security-policy-settings/network-access-let-everyone-permissions-apply-to-anonymous-users.md
+ - name: "Network access: Named Pipes that can be accessed anonymously"
+ href: security-policy-settings/network-access-named-pipes-that-can-be-accessed-anonymously.md
+ - name: "Network access: Remotely accessible registry paths"
+ href: security-policy-settings/network-access-remotely-accessible-registry-paths.md
+ - name: "Network access: Remotely accessible registry paths and subpaths"
+ href: security-policy-settings/network-access-remotely-accessible-registry-paths-and-subpaths.md
+ - name: "Network access: Restrict anonymous access to Named Pipes and Shares"
+ href: security-policy-settings/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
+ - name: "Network access: Restrict clients allowed to make remote calls to SAM"
+ href: security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md
+ - name: "Network access: Shares that can be accessed anonymously"
+ href: security-policy-settings/network-access-shares-that-can-be-accessed-anonymously.md
+ - name: "Network access: Sharing and security model for local accounts"
+ href: security-policy-settings/network-access-sharing-and-security-model-for-local-accounts.md
+ - name: "Network security: Allow Local System to use computer identity for NTLM"
+ href: security-policy-settings/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
+ - name: "Network security: Allow LocalSystem NULL session fallback"
+ href: security-policy-settings/network-security-allow-localsystem-null-session-fallback.md
+ - name: "Network security: Allow PKU2U authentication requests to this computer to use online identities"
+ href: security-policy-settings/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
+ - name: "Network security: Configure encryption types allowed for Kerberos"
+ href: security-policy-settings/network-security-configure-encryption-types-allowed-for-kerberos.md
+ - name: "Network security: Do not store LAN Manager hash value on next password change"
+ href: security-policy-settings/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
+ - name: "Network security: Force logoff when logon hours expire"
+ href: security-policy-settings/network-security-force-logoff-when-logon-hours-expire.md
+ - name: "Network security: LAN Manager authentication level"
+ href: security-policy-settings/network-security-lan-manager-authentication-level.md
+ - name: "Network security: LDAP client signing requirements"
+ href: security-policy-settings/network-security-ldap-client-signing-requirements.md
+ - name: "Network security: Minimum session security for NTLM SSP based (including secure RPC) clients"
+ href: security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md
+ - name: "Network security: Minimum session security for NTLM SSP based (including secure RPC) servers"
+ href: security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md
+ - name: "Network security: Restrict NTLM: Add remote server exceptions for NTLM authentication"
+ href: security-policy-settings/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
+ - name: "Network security: Restrict NTLM: Add server exceptions in this domain"
+ href: security-policy-settings/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
+ - name: "Network security: Restrict NTLM: Audit incoming NTLM traffic"
+ href: security-policy-settings/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
+ - name: "Network security: Restrict NTLM: Audit NTLM authentication in this domain"
+ href: security-policy-settings/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
+ - name: "Network security: Restrict NTLM: Incoming NTLM traffic"
+ href: security-policy-settings/network-security-restrict-ntlm-incoming-ntlm-traffic.md
+ - name: "Network security: Restrict NTLM: NTLM authentication in this domain"
+ href: security-policy-settings/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
+ - name: "Network security: Restrict NTLM: Outgoing NTLM traffic to remote servers"
+ href: security-policy-settings/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
+ - name: "Recovery console: Allow automatic administrative logon"
+ href: security-policy-settings/recovery-console-allow-automatic-administrative-logon.md
+ - name: "Recovery console: Allow floppy copy and access to all drives and folders"
+ href: security-policy-settings/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
+ - name: "Shutdown: Allow system to be shut down without having to log on"
+ href: security-policy-settings/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
+ - name: "Shutdown: Clear virtual memory pagefile"
+ href: security-policy-settings/shutdown-clear-virtual-memory-pagefile.md
+ - name: "System cryptography: Force strong key protection for user keys stored on the computer"
+ href: security-policy-settings/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
+ - name: "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing"
+ href: security-policy-settings/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
+ - name: "System objects: Require case insensitivity for non-Windows subsystems"
+ href: security-policy-settings/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
+ - name: "System objects: Strengthen default permissions of internal system objects (Symbolic Links)"
+ href: security-policy-settings/system-objects-strengthen-default-permissions-of-internal-system-objects.md
+ - name: "System settings: Optional subsystems"
+ href: security-policy-settings/system-settings-optional-subsystems.md
+ - name: "System settings: Use certificate rules on Windows executables for Software Restriction Policies"
+ href: security-policy-settings/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
+ - name: "User Account Control: Admin Approval Mode for the Built-in Administrator account"
+ href: security-policy-settings/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
+ - name: "User Account Control: Allow UIAccess applications to prompt for elevation without using the secure desktop"
+ href: security-policy-settings/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
+ - name: "User Account Control: Behavior of the elevation prompt for administrators in Admin Approval Mode"
+ href: security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
+ - name: "User Account Control: Behavior of the elevation prompt for standard users"
+ href: security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
+ - name: "User Account Control: Detect application installations and prompt for elevation"
+ href: security-policy-settings/user-account-control-detect-application-installations-and-prompt-for-elevation.md
+ - name: "User Account Control: Only elevate executables that are signed and validated"
+ href: security-policy-settings/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
+ - name: "User Account Control: Only elevate UIAccess applications that are installed in secure locations"
+ href: security-policy-settings/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
+ - name: "User Account Control: Run all administrators in Admin Approval Mode"
+ href: security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode.md
+ - name: "User Account Control: Switch to the secure desktop when prompting for elevation"
+ href: security-policy-settings/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
+ - name: "User Account Control: Virtualize file and registry write failures to per-user locations"
+ href: security-policy-settings/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
+ - name: Advanced security audit policy settings
+ href: security-policy-settings/secpol-advanced-security-audit-policy-settings.md
+ - name: User Rights Assignment
+ href: security-policy-settings/user-rights-assignment.md
+ items:
+ - name: Access Credential Manager as a trusted caller
+ href: security-policy-settings/access-credential-manager-as-a-trusted-caller.md
+ - name: Access this computer from the network
+ href: security-policy-settings/access-this-computer-from-the-network.md
+ - name: Act as part of the operating system
+ href: security-policy-settings/act-as-part-of-the-operating-system.md
+ - name: Add workstations to domain
+ href: security-policy-settings/add-workstations-to-domain.md
+ - name: Adjust memory quotas for a process
+ href: security-policy-settings/adjust-memory-quotas-for-a-process.md
+ - name: Allow log on locally
+ href: security-policy-settings/allow-log-on-locally.md
+ - name: Allow log on through Remote Desktop Services
+ href: security-policy-settings/allow-log-on-through-remote-desktop-services.md
+ - name: Back up files and directories
+ href: security-policy-settings/back-up-files-and-directories.md
+ - name: Bypass traverse checking
+ href: security-policy-settings/bypass-traverse-checking.md
+ - name: Change the system time
+ href: security-policy-settings/change-the-system-time.md
+ - name: Change the time zone
+ href: security-policy-settings/change-the-time-zone.md
+ - name: Create a pagefile
+ href: security-policy-settings/create-a-pagefile.md
+ - name: Create a token object
+ href: security-policy-settings/create-a-token-object.md
+ - name: Create global objects
+ href: security-policy-settings/create-global-objects.md
+ - name: Create permanent shared objects
+ href: security-policy-settings/create-permanent-shared-objects.md
+ - name: Create symbolic links
+ href: security-policy-settings/create-symbolic-links.md
+ - name: Debug programs
+ href: security-policy-settings/debug-programs.md
+ - name: Deny access to this computer from the network
+ href: security-policy-settings/deny-access-to-this-computer-from-the-network.md
+ - name: Deny log on as a batch job
+ href: security-policy-settings/deny-log-on-as-a-batch-job.md
+ - name: Deny log on as a service
+ href: security-policy-settings/deny-log-on-as-a-service.md
+ - name: Deny log on locally
+ href: security-policy-settings/deny-log-on-locally.md
+ - name: Deny log on through Remote Desktop Services
+ href: security-policy-settings/deny-log-on-through-remote-desktop-services.md
+ - name: Enable computer and user accounts to be trusted for delegation
+ href: security-policy-settings/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
+ - name: Force shutdown from a remote system
+ href: security-policy-settings/force-shutdown-from-a-remote-system.md
+ - name: Generate security audits
+ href: security-policy-settings/generate-security-audits.md
+ - name: Impersonate a client after authentication
+ href: security-policy-settings/impersonate-a-client-after-authentication.md
+ - name: Increase a process working set
+ href: security-policy-settings/increase-a-process-working-set.md
+ - name: Increase scheduling priority
+ href: security-policy-settings/increase-scheduling-priority.md
+ - name: Load and unload device drivers
+ href: security-policy-settings/load-and-unload-device-drivers.md
+ - name: Lock pages in memory
+ href: security-policy-settings/lock-pages-in-memory.md
+ - name: Log on as a batch job
+ href: security-policy-settings/log-on-as-a-batch-job.md
+ - name: Log on as a service
+ href: security-policy-settings/log-on-as-a-service.md
+ - name: Manage auditing and security log
+ href: security-policy-settings/manage-auditing-and-security-log.md
+ - name: Modify an object label
+ href: security-policy-settings/modify-an-object-label.md
+ - name: Modify firmware environment values
+ href: security-policy-settings/modify-firmware-environment-values.md
+ - name: Perform volume maintenance tasks
+ href: security-policy-settings/perform-volume-maintenance-tasks.md
+ - name: Profile single process
+ href: security-policy-settings/profile-single-process.md
+ - name: Profile system performance
+ href: security-policy-settings/profile-system-performance.md
+ - name: Remove computer from docking station
+ href: security-policy-settings/remove-computer-from-docking-station.md
+ - name: Replace a process level token
+ href: security-policy-settings/replace-a-process-level-token.md
+ - name: Restore files and directories
+ href: security-policy-settings/restore-files-and-directories.md
+ - name: Shut down the system
+ href: security-policy-settings/shut-down-the-system.md
+ - name: Synchronize directory service data
+ href: security-policy-settings/synchronize-directory-service-data.md
+ - name: Take ownership of files or other objects
+ href: security-policy-settings/take-ownership-of-files-or-other-objects.md
+ - name: Windows security guidance for enterprises
+ items:
+ - name: Windows security baselines
+ href: windows-security-configuration-framework/windows-security-baselines.md
+ items:
+ - name: Security Compliance Toolkit
+ href: windows-security-configuration-framework/security-compliance-toolkit-10.md
+ - name: Get support
+ href: windows-security-configuration-framework/get-support-for-security-baselines.md
+ - name: Windows 10 Mobile security guide
+ href: windows-10-mobile-security-guide.md
diff --git a/windows/security/threat-protection/auditing/advanced-security-auditing-faq.md b/windows/security/threat-protection/auditing/advanced-security-auditing-faq.md
deleted file mode 100644
index 86a39fc1b7..0000000000
--- a/windows/security/threat-protection/auditing/advanced-security-auditing-faq.md
+++ /dev/null
@@ -1,195 +0,0 @@
----
-title: Advanced security auditing FAQ (Windows 10)
-description: This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
-ms.assetid: 80f8f187-0916-43c2-a7e8-ea712b115a06
-ms.reviewer:
-ms.author: dansimp
-ms.prod: m365-security
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: none
-author: dansimp
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 04/19/2017
-ms.technology: mde
----
-
-# Advanced security auditing FAQ
-
-**Applies to**
-- Windows 10
-
-This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
-
-- [What is Windows security auditing and why might I want to use it?](#bkmk-1)
-- [What is the difference between audit policies located in Local Policies\\Audit Policy and audit policies located in Advanced Audit Policy Configuration?](#bkmk-2)
-- [What is the interaction between basic audit policy settings and advanced audit policy settings?](#bkmk-3)
-- [How are audit settings merged by Group Policy?](#bkmk-4)
-- [What is the difference between an object DACL and an object SACL?](#bkmk-14)
-- [Why are audit policies applied on a per-computer basis rather than per user?](#bkmk-13)
-- [What are the differences in auditing functionality between versions of Windows?](#bkmk-12)
-- [Can I use advanced audit policy from a domain controller running Windows Server 2003 or Windows 2000 Server?](#bkmk-15)
-- [What is the difference between success and failure events? Is something wrong if I get a failure audit?](#bkmk-5)
-- [How can I set an audit policy that affects all objects on a computer?](#bkmk-6)
-- [How do I figure out why someone was able to access a resource?](#bkmk-7)
-- [How do I know when changes are made to access control settings, by whom, and what the changes were?](#bkmk-8)
-- [How can I roll back security audit policies from the advanced audit policy to the basic audit policy?](#bkmk-19)
-- [How can I monitor if changes are made to audit policy settings?](#bkmk-10)
-- [How can I minimize the number of events that are generated?](#bkmk-16)
-- [What are the best tools to model and manage audit policy?](#bkmk-17)
-- [Where can I find information about all the possible events that I might receive?](#bkmk-11)
-- [Where can I find more detailed information?](#bkmk-18)
-
-## What is Windows security auditing and why might I want to use it?
-
-Security auditing is a methodical examination and review of activities that may affect the security of a system. In the Windows operating systems, security auditing is more narrowly defined as the features and services that enable an administrator to log and review events for specified security-related activities.
-
-Hundreds of events occur as the Windows operating system and the applications that run on it perform their tasks. Monitoring these events can provide valuable information to help administrators troubleshoot and investigate security-related activities.
-
-## What is the difference between audit policies located in Local Policies\\Audit Policy and audit policies located in Advanced Audit Policy Configuration?
-
-The basic security audit policy settings in **Security Settings\\Local Policies\\Audit Policy** and the advanced security audit policy settings in **Security Settings\\Advanced Audit Policy Configuration\\System Audit Policies** appear to overlap, but they are recorded and applied differently. When you apply basic audit policy settings to the local computer by using the Local Security Policy snap-in (secpol.msc), you are editing the effective audit policy, so changes made to basic audit policy settings will appear exactly as configured in Auditpol.exe.
-
-There are a number of additional differences between the security audit policy settings in these two locations.
-
-There are nine basic audit policy settings under **Security Settings\\Local Policies\\Audit Policy** and settings under **Advanced Audit Policy Configuration**. The settings available in **Security Settings\\Advanced Audit Policy
-Configuration** address similar issues as the nine basic settings in **Local Policies\\Audit Policy**, but they allow administrators to be more selective in the number and types of events to audit. For example, the basic audit policy provides a single setting for account logon, and the advanced audit policy provides four. Enabling the single basic account logon setting would be the equivalent of setting all four advanced account logon settings. In comparison, setting a single advanced audit policy setting does not generate audit events for activities that you are not interested in tracking.
-
-In addition, if you enable success auditing for the basic **Audit account logon events** setting, only success events will be logged for all account logon–related behaviors. In comparison, depending on the needs of your organization, you can configure success auditing for one advanced account logon setting, failure auditing for a second advanced account logon setting, success and failure auditing for a third advanced account logon setting, or no auditing.
-
-The nine basic settings under **Security Settings\\Local Policies\\Audit Policy** were introduced in Windows 2000. Therefore, they are available in all versions of Windows released since then. The advanced audit policy settings were introduced in Windows Vista and Windows Server 2008. The advanced settings can only be used on computers running Windows 7, Windows Server 2008, and later.
-
-## What is the interaction between basic audit policy settings and advanced audit policy settings?
-
-Basic audit policy settings are not compatible with advanced audit policy settings that are applied by using Group Policy. When advanced audit policy settings are applied by using Group Policy, the current computer's audit policy settings are cleared before the resulting advanced audit policy settings are applied. After you apply advanced audit policy settings by using Group Policy, you can only reliably set system audit policy for the computer by using the advanced audit policy settings.
-
-Editing and applying the advanced audit policy settings in Local Security Policy modifies the local Group Policy Object (GPO), so changes made here may not be exactly reflected in Auditpol.exe if there are policies from other domain GPOs or logon scripts. Both types of policies can be edited and applied by using domain GPOs, and these settings will override any conflicting local audit policy settings. However, because the basic audit policy is recorded in the effective audit policy, that audit policy must be explicitly removed when a change is desired, or it will remain in the effective audit policy. Policy changes that are applied by using local or domain Group Policy settings are reflected as soon as the new policy is applied.
-
-> **Important** Whether you apply advanced audit policies by using Group Policy or by using logon scripts, do not use both the basic audit policy settings under **Local Policies\\Audit Policy** and the advanced settings under **Security Settings\\Advanced Audit Policy Configuration**. Using both advanced and basic audit policy settings can cause unexpected results in audit reporting.
-
-If you use Advanced Audit Policy Configuration settings or use logon scripts to apply advanced audit policies, be sure to enable the **Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings** policy setting under **Local Policies\\Security Options**. This will prevent conflicts between similar settings by forcing basic security auditing to be ignored.
-
-## How are audit settings merged by Group Policy?
-
-By default, policy options that are set in GPOs and linked to higher levels of Active Directory sites, domains, and OUs are inherited by all OUs at lower levels. However, an inherited policy can be overridden by a GPO that is linked at a lower level.
-
-For example, you might use a domain GPO to assign an organization-wide group of audit settings, but want a certain OU to get a defined group of additional settings. To accomplish this, you can link a second GPO to that specific lower-level OU. Therefore, a logon audit setting that is applied at the OU level will override a conflicting logon audit setting that is applied at the domain level (unless you have taken special steps to apply Group Policy loopback processing).
-
-The rules that govern how Group Policy settings are applied propagate to the subcategory level of audit policy settings. This means that audit policy settings configured in different GPOs will be merged if no policy settings configured at a lower level exist. The following table illustrates this behavior.
-
-
-| Auditing subcategory | Setting configured in an OU GPO (higher priority) | Setting configured in a domain GPO (lower priority) | Resulting policy for the target computer |
-| - | - | - | -|
-| Detailed File Share Auditing | Success | Failure | Success |
-| Process Creation Auditing | Disabled | Success | Disabled |
-| Logon Auditing | Failure | Success | Failure |
-
-## What is the difference between an object DACL and an object SACL?
-
-All objects in Active Directory Domain Services (AD DS), and all securable objects on a local computer or on the network, have security descriptors to help control access to the objects. Security descriptors include information about who owns an object, who can access it and in what way, and what types of access are audited. Security descriptors contain the access control list (ACL) of an object, which includes all of the security permissions that apply to that object. An object's security descriptor can contain two types of ACLs:
-
-- A discretionary access control list (DACL) that identifies the users and groups who are allowed or denied access
-- A system access control list (SACL) that controls how access is audited
-
-The access control model that is used in Windows is administered at the object level by setting different levels of access, or permissions, to objects. If permissions are configured for an object, its security descriptor contains a DACL with security identifiers (SIDs) for the users and groups that are allowed or denied access.
-
-If auditing is configured for the object, its security descriptor also contains a SACL that controls how the security subsystem audits attempts to access the object. However, auditing is not completely configured unless a SACL has been configured for an object and a corresponding **Object Access** audit policy setting has been configured and applied.
-
-## Why are audit policies applied on a per-computer basis rather than per user?
-
-In security auditing in Windows, the computer, objects on the computer, and related resources are the primary recipients of actions by clients including applications, other computers, and users. In a security breach, malicious users can use alternate credentials to hide their identity, or malicious applications can impersonate legitimate users to perform undesired tasks. Therefore, the most consistent way to apply an audit policy is to focus on the computer and the objects and resources on that computer.
-
-In addition, because audit policy capabilities can vary between computers running different versions of Windows, the best way to ensure that the audit policy is applied correctly is to base these settings on the computer instead of the user.
-
-However, in cases where you want audit settings to apply only to specified groups of users, you can accomplish this by configuring SACLs on the relevant objects to enable auditing for a security group that contains only the users you specify. For example, you can configure a SACL for a folder called Payroll Data on Accounting Server 1. This can audit attempts by members of the Payroll Processors OU to delete objects from this folder. The **Object Access\\Audit File System** audit policy setting applies to Accounting Server 1, but because it requires a corresponding resource SACL, only actions by members of the Payroll Processors OU on the Payroll Data folder generates audit events.
-
-## What are the differences in auditing functionality between versions of Windows?
-
-Basic audit policy settings are available in all versions of Windows since Windows 2000, and they can be applied locally or by using Group Policy. Advanced audit policy settings were introduced in Windows Vista and Windows Server 2008, but the settings can only be applied by using logon scripts in those versions. Advanced audit policy settings, which were introduced in Windows 7 and Windows Server 2008 R2, can be configured and applied by using local and domain Group Policy settings.
-
-## Can I use advanced audit policies from a domain controller running Windows Server 2003 or Windows 2000 Server?
-
-To use advanced audit policy settings, your domain controller must be installed on a computer running Windows Server 2012 R2, Windows Server 2012, Windows Server 2008 R2, Windows Server 2008, or Windows Server 2003 with Service Pack 2 (SP2). Windows 2000 Server is not supported.
-
-## What is the difference between success and failure events? Is something wrong if I get a failure audit?
-
-A success audit event is triggered when a defined action, such as accessing a file share, is completed successfully.
-
-A failure audit event is triggered when a defined action, such as a user logon, is not completed successfully.
-
-The appearance of failure audit events in the event log does not necessarily mean that something is wrong with your system. For example, if you configure Audit Logon events, a failure event may simply mean that a user mistyped his or her password.
-
-## How can I set an audit policy that affects all objects on a computer?
-
-System administrators and auditors increasingly want to verify that an auditing policy is applied to all objects on a system. This has been difficult to accomplish because the system access control lists (SACLs) that govern auditing are applied on a per-object basis. Thus, to verify that an audit policy has been applied to all objects, you would have to check every object to be sure that no changes have been made—even temporarily to a single SACL.
-Introduced in Windows Server 2008 R2 and Windows 7, security auditing allows administrators to define global object access auditing policies for the entire file system or for the registry on a computer. The specified SACL is then automatically applied to every object of that type. This can be useful for verifying that all critical files, folders, and registry settings on a computer are protected, and for identifying when an issue with a system resource occurs. If a file or folder SACL and a global object access auditing policy (or a single registry setting SACL and a global object access auditing policy) are configured on a computer, the effective SACL is derived from combining the file or folder SACL and the global object access auditing policy. This means that an audit event is generated if an activity matches either the file or folder SACL or the global object access auditing policy.
-
-## How do I figure out why someone was able to access a resource?
-
-Often it is not enough to know simply that an object such as a file or folder was accessed. You may also want to know why the user was able to access this resource. You can obtain this forensic data by configuring the **Audit Handle Manipulation** setting with the **Audit File System** or with the **Audit Registry** audit setting.
-
-## How do I know when changes are made to access control settings, by whom, and what the changes were?
-
-To track access control changes on computers running Windows Server 2016, Windows Server 2012 R2, Windows Server 2012 Windows 7, Windows Server 2008 R2, Windows Vista, or Windows Server 2008, you need to enable the following settings, which track changes to DACLs:
-- **Audit File System** subcategory: Enable for success, failure, or success and failure
-- **Audit Authorization Policy Change** setting: Enable for success, failure, or success and failure
-- A SACL with **Write** and **Take ownership** permissions: Apply to the object that you want to monitor
-
-In Windows XP and Windows Server 2003, you need to use the **Audit policy change** subcategory.
-
-## How can I roll back security audit policies from the advanced audit policy to the basic audit policy?
-
-Applying advanced audit policy settings replaces any comparable basic security audit policy settings. If you subsequently change the advanced audit policy setting to **Not configured**, you need to complete the following steps to restore the original basic security audit policy settings:
-
-1. Set all Advanced Audit Policy subcategories to **Not configured**.
-2. Delete all audit.csv files from the %SYSVOL% folder on the domain controller.
-3. Reconfigure and apply the basic audit policy settings.
-
-Unless you complete all of these steps, the basic audit policy settings will not be restored.
-
-## How can I monitor if changes are made to audit policy settings?
-
-Changes to security audit policies are critical security events. You can use the **Audit Audit Policy Change** setting to determine if the operating system generates audit events when the following types of activities take place:
-
-- Permissions and audit settings on the audit policy object are changed
-- The system audit policy is changed
-- Security event sources are registered or unregistered
-- Per-user audit settings are changed
-- The value of **CrashOnAuditFail** is modified
-- Audit settings on a file or registry key are changed
-- A Special Groups list is changed
-
-## How can I minimize the number of events that are generated?
-
-Finding the right balance between auditing enough network and computer activity and auditing too little network and computer activity can be challenging. You can achieve this balance by identifying the most important resources, critical activities, and users or groups of users. Then design a security audit policy that targets these resources, activities, and users. Useful guidelines and recommendations for developing an effective security auditing strategy can be found in [Planning and deploying advanced security audit policies](planning-and-deploying-advanced-security-audit-policies.md).
-
-## What are the best tools to model and manage audit policies?
-
-The integration of advanced audit policy settings with domain Group Policy, introduced in Windows 7 and Windows Server 2008 R2, is designed to simplify the management and implementation of security audit policies in an organization's network. As such, tools used to plan and deploy Group Policy Objects for a domain can also be used to plan and deploy security audit policies.
-On an individual computer, the Auditpol command-line tool can be used to complete a number of important audit policy–related management tasks.
-
-In addition, there are a number of computer management products, such as the Audit Collection Services in the Microsoft System Center Operations Manager products, which can be used to collect and filter event data.
-
-## Where can I find information about all the possible events that I might receive?
-
-Users who examine the security event log for the first time can be a bit overwhelmed by the number of audit events that are stored there (which can quickly number in the thousands) and by the structured information that is included for each audit event. Additional information about these events, and the settings used to generate them, can be obtained from the following resources:
-
-- [Windows 8 and Windows Server 2012 Security Event Details](https://www.microsoft.com/download/details.aspx?id=35753)
-- [Security Audit Events for Windows 7 and Windows Server 2008 R2](https://go.microsoft.com/fwlink/p/?linkid=157780)
-- [Security Audit Events for Windows Server 2008 and Windows Vista](https://go.microsoft.com/fwlink/p/?linkid=121868)
-- [Advanced security audit policy settings](advanced-security-audit-policy-settings.md)
-
-## Where can I find more detailed information?
-
-To learn more about security audit policies, see the following resources:
-
-- [Planning and deploying advanced security audit policies](planning-and-deploying-advanced-security-audit-policies.md)
-- [Security Monitoring and Attack Detection Planning Guide](https://social.technet.microsoft.com/wiki/contents/articles/325.advanced-security-auditing-in-windows-7-and-windows-server-2008-r2.aspx)
-- [Security Audit Events for Windows 7 and Windows Server 2008 R2](https://go.microsoft.com/fwlink/p/?linkid=157780)
-- [Security Audit Events for Windows Server 2008 and Windows Vista](https://go.microsoft.com/fwlink/p/?LinkId=121868)
-
-
diff --git a/windows/security/threat-protection/auditing/advanced-security-auditing-faq.yml b/windows/security/threat-protection/auditing/advanced-security-auditing-faq.yml
new file mode 100644
index 0000000000..61dfe3d07c
--- /dev/null
+++ b/windows/security/threat-protection/auditing/advanced-security-auditing-faq.yml
@@ -0,0 +1,215 @@
+### YamlMime:FAQ
+metadata:
+ title: Advanced security auditing FAQ (Windows 10)
+ description: This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
+ ms.assetid: 80f8f187-0916-43c2-a7e8-ea712b115a06
+ ms.reviewer:
+ ms.author: dansimp
+ ms.prod: m365-security
+ ms.mktglfcycl: deploy
+ ms.sitesec: library
+ ms.pagetype: security
+ ms.localizationpriority: none
+ author: dansimp
+ manager: dansimp
+ audience: ITPro
+ ms.collection: M365-security-compliance
+ ms.topic: conceptual
+ ms.date: 04/19/2017
+ ms.technology: mde
+
+title: Advanced security auditing FAQ
+summary: |
+ **Applies to**
+ - Windows 10
+
+ This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
+
+ - [What is Windows security auditing and why might I want to use it?](#what-is-windows-security-auditing-and-why-might-i-want-to-use-it-)
+ - [What is the difference between audit policies located in Local Policies\\Audit Policy and audit policies located in Advanced Audit Policy Configuration?](#what-is-the-difference-between-audit-policies-located-in-local-policies--audit-policy-and-audit-policies-located-in-advanced-audit-policy-configuration-)
+ - [What is the interaction between basic audit policy settings and advanced audit policy settings?](#what-is-the-interaction-between-basic-audit-policy-settings-and-advanced-audit-policy-settings-)
+ - [How are audit settings merged by Group Policy?](#how-are-audit-settings-merged-by-group-policy-)
+ - [What is the difference between an object DACL and an object SACL?](#what-is-the-difference-between-an-object-dacl-and-an-object-sacl-)
+ - [Why are audit policies applied on a per-computer basis rather than per user?](#why-are-audit-policies-applied-on-a-per-computer-basis-rather-than-per-user-)
+ - [What are the differences in auditing functionality between versions of Windows?](#what-are-the-differences-in-auditing-functionality-between-versions-of-windows-)
+ - [Can I use advanced audit policy from a domain controller running Windows Server 2003 or Windows 2000 Server?](#can-i-use-advanced-audit-policies-from-a-domain-controller-running-windows-server-2003-or-windows-2000-server-)
+ - [What is the difference between success and failure events? Is something wrong if I get a failure audit?](#what-is-the-difference-between-success-and-failure-events--is-something-wrong-if-i-get-a-failure-audit-)
+ - [How can I set an audit policy that affects all objects on a computer?](#how-can-i-set-an-audit-policy-that-affects-all-objects-on-a-computer-)
+ - [How do I figure out why someone was able to access a resource?](#how-do-i-figure-out-why-someone-was-able-to-access-a-resource-)
+ - [How do I know when changes are made to access control settings, by whom, and what the changes were?](#how-do-i-know-when-changes-are-made-to-access-control-settings--by-whom--and-what-the-changes-were-)
+ - [How can I roll back security audit policies from the advanced audit policy to the basic audit policy?](#how-can-i-roll-back-security-audit-policies-from-the-advanced-audit-policy-to-the-basic-audit-policy-)
+ - [How can I monitor if changes are made to audit policy settings?](#how-can-i-monitor-if-changes-are-made-to-audit-policy-settings-)
+ - [How can I minimize the number of events that are generated?](#how-can-i-minimize-the-number-of-events-that-are-generated-)
+ - [What are the best tools to model and manage audit policy?](#what-are-the-best-tools-to-model-and-manage-audit-policies-)
+ - [Where can I find information about all the possible events that I might receive?](#where-can-i-find-information-about-all-the-possible-events-that-i-might-receive-)
+ - [Where can I find more detailed information?](#where-can-i-find-more-detailed-information-)
+
+
+sections:
+ - name: Ignored
+ questions:
+ - question: |
+ What is Windows security auditing and why might I want to use it?
+ answer: |
+ Security auditing is a methodical examination and review of activities that may affect the security of a system. In the Windows operating systems, security auditing is more narrowly defined as the features and services that enable an administrator to log and review events for specified security-related activities.
+
+ Hundreds of events occur as the Windows operating system and the applications that run on it perform their tasks. Monitoring these events can provide valuable information to help administrators troubleshoot and investigate security-related activities.
+
+ - question: |
+ What is the difference between audit policies located in Local Policies\\Audit Policy and audit policies located in Advanced Audit Policy Configuration?
+ answer: |
+ The basic security audit policy settings in **Security Settings\\Local Policies\\Audit Policy** and the advanced security audit policy settings in **Security Settings\\Advanced Audit Policy Configuration\\System Audit Policies** appear to overlap, but they are recorded and applied differently. When you apply basic audit policy settings to the local computer by using the Local Security Policy snap-in (secpol.msc), you are editing the effective audit policy, so changes made to basic audit policy settings will appear exactly as configured in Auditpol.exe.
+
+ There are a number of additional differences between the security audit policy settings in these two locations.
+
+ There are nine basic audit policy settings under **Security Settings\\Local Policies\\Audit Policy** and settings under **Advanced Audit Policy Configuration**. The settings available in **Security Settings\\Advanced Audit Policy
+ Configuration** address similar issues as the nine basic settings in **Local Policies\\Audit Policy**, but they allow administrators to be more selective in the number and types of events to audit. For example, the basic audit policy provides a single setting for account logon, and the advanced audit policy provides four. Enabling the single basic account logon setting would be the equivalent of setting all four advanced account logon settings. In comparison, setting a single advanced audit policy setting does not generate audit events for activities that you are not interested in tracking.
+
+ In addition, if you enable success auditing for the basic **Audit account logon events** setting, only success events will be logged for all account logon–related behaviors. In comparison, depending on the needs of your organization, you can configure success auditing for one advanced account logon setting, failure auditing for a second advanced account logon setting, success and failure auditing for a third advanced account logon setting, or no auditing.
+
+ The nine basic settings under **Security Settings\\Local Policies\\Audit Policy** were introduced in Windows 2000. Therefore, they are available in all versions of Windows released since then. The advanced audit policy settings were introduced in Windows Vista and Windows Server 2008. The advanced settings can only be used on computers running Windows 7, Windows Server 2008, and later.
+
+ - question: |
+ What is the interaction between basic audit policy settings and advanced audit policy settings?
+ answer: |
+ Basic audit policy settings are not compatible with advanced audit policy settings that are applied by using Group Policy. When advanced audit policy settings are applied by using Group Policy, the current computer's audit policy settings are cleared before the resulting advanced audit policy settings are applied. After you apply advanced audit policy settings by using Group Policy, you can only reliably set system audit policy for the computer by using the advanced audit policy settings.
+
+ Editing and applying the advanced audit policy settings in Local Security Policy modifies the local Group Policy Object (GPO), so changes made here may not be exactly reflected in Auditpol.exe if there are policies from other domain GPOs or logon scripts. Both types of policies can be edited and applied by using domain GPOs, and these settings will override any conflicting local audit policy settings. However, because the basic audit policy is recorded in the effective audit policy, that audit policy must be explicitly removed when a change is desired, or it will remain in the effective audit policy. Policy changes that are applied by using local or domain Group Policy settings are reflected as soon as the new policy is applied.
+
+ > **Important** Whether you apply advanced audit policies by using Group Policy or by using logon scripts, do not use both the basic audit policy settings under **Local Policies\\Audit Policy** and the advanced settings under **Security Settings\\Advanced Audit Policy Configuration**. Using both advanced and basic audit policy settings can cause unexpected results in audit reporting.
+
+ If you use Advanced Audit Policy Configuration settings or use logon scripts to apply advanced audit policies, be sure to enable the **Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings** policy setting under **Local Policies\\Security Options**. This will prevent conflicts between similar settings by forcing basic security auditing to be ignored.
+
+ - question: |
+ How are audit settings merged by Group Policy?
+ answer: |
+ By default, policy options that are set in GPOs and linked to higher levels of Active Directory sites, domains, and OUs are inherited by all OUs at lower levels. However, an inherited policy can be overridden by a GPO that is linked at a lower level.
+
+ For example, you might use a domain GPO to assign an organization-wide group of audit settings, but want a certain OU to get a defined group of additional settings. To accomplish this, you can link a second GPO to that specific lower-level OU. Therefore, a logon audit setting that is applied at the OU level will override a conflicting logon audit setting that is applied at the domain level (unless you have taken special steps to apply Group Policy loopback processing).
+
+ The rules that govern how Group Policy settings are applied propagate to the subcategory level of audit policy settings. This means that audit policy settings configured in different GPOs will be merged if no policy settings configured at a lower level exist. The following table illustrates this behavior.
+
+
+ | Auditing subcategory | Setting configured in an OU GPO (higher priority) | Setting configured in a domain GPO (lower priority) | Resulting policy for the target computer |
+ | - | - | - | -|
+ | Detailed File Share Auditing | Success | Failure | Success |
+ | Process Creation Auditing | Disabled | Success | Disabled |
+ | Logon Auditing | Failure | Success | Failure |
+
+ - question: |
+ What is the difference between an object DACL and an object SACL?
+ answer: |
+ All objects in Active Directory Domain Services (AD DS), and all securable objects on a local computer or on the network, have security descriptors to help control access to the objects. Security descriptors include information about who owns an object, who can access it and in what way, and what types of access are audited. Security descriptors contain the access control list (ACL) of an object, which includes all of the security permissions that apply to that object. An object's security descriptor can contain two types of ACLs:
+
+ - A discretionary access control list (DACL) that identifies the users and groups who are allowed or denied access
+ - A system access control list (SACL) that controls how access is audited
+
+ The access control model that is used in Windows is administered at the object level by setting different levels of access, or permissions, to objects. If permissions are configured for an object, its security descriptor contains a DACL with security identifiers (SIDs) for the users and groups that are allowed or denied access.
+
+ If auditing is configured for the object, its security descriptor also contains a SACL that controls how the security subsystem audits attempts to access the object. However, auditing is not completely configured unless a SACL has been configured for an object and a corresponding **Object Access** audit policy setting has been configured and applied.
+
+ - question: |
+ Why are audit policies applied on a per-computer basis rather than per user?
+ answer: |
+ In security auditing in Windows, the computer, objects on the computer, and related resources are the primary recipients of actions by clients including applications, other computers, and users. In a security breach, malicious users can use alternate credentials to hide their identity, or malicious applications can impersonate legitimate users to perform undesired tasks. Therefore, the most consistent way to apply an audit policy is to focus on the computer and the objects and resources on that computer.
+
+ In addition, because audit policy capabilities can vary between computers running different versions of Windows, the best way to ensure that the audit policy is applied correctly is to base these settings on the computer instead of the user.
+
+ However, in cases where you want audit settings to apply only to specified groups of users, you can accomplish this by configuring SACLs on the relevant objects to enable auditing for a security group that contains only the users you specify. For example, you can configure a SACL for a folder called Payroll Data on Accounting Server 1. This can audit attempts by members of the Payroll Processors OU to delete objects from this folder. The **Object Access\\Audit File System** audit policy setting applies to Accounting Server 1, but because it requires a corresponding resource SACL, only actions by members of the Payroll Processors OU on the Payroll Data folder generates audit events.
+
+ - question: |
+ What are the differences in auditing functionality between versions of Windows?
+ answer: |
+ Basic audit policy settings are available in all versions of Windows since Windows 2000, and they can be applied locally or by using Group Policy. Advanced audit policy settings were introduced in Windows Vista and Windows Server 2008, but the settings can only be applied by using logon scripts in those versions. Advanced audit policy settings, which were introduced in Windows 7 and Windows Server 2008 R2, can be configured and applied by using local and domain Group Policy settings.
+
+ - question: |
+ Can I use advanced audit policies from a domain controller running Windows Server 2003 or Windows 2000 Server?
+ answer: |
+ To use advanced audit policy settings, your domain controller must be installed on a computer running Windows Server 2012 R2, Windows Server 2012, Windows Server 2008 R2, Windows Server 2008, or Windows Server 2003 with Service Pack 2 (SP2). Windows 2000 Server is not supported.
+
+ - question: |
+ What is the difference between success and failure events? Is something wrong if I get a failure audit?
+ answer: |
+ A success audit event is triggered when a defined action, such as accessing a file share, is completed successfully.
+
+ A failure audit event is triggered when a defined action, such as a user logon, is not completed successfully.
+
+ The appearance of failure audit events in the event log does not necessarily mean that something is wrong with your system. For example, if you configure Audit Logon events, a failure event may simply mean that a user mistyped his or her password.
+
+ - question: |
+ How can I set an audit policy that affects all objects on a computer?
+ answer: |
+ System administrators and auditors increasingly want to verify that an auditing policy is applied to all objects on a system. This has been difficult to accomplish because the system access control lists (SACLs) that govern auditing are applied on a per-object basis. Thus, to verify that an audit policy has been applied to all objects, you would have to check every object to be sure that no changes have been made—even temporarily to a single SACL.
+ Introduced in Windows Server 2008 R2 and Windows 7, security auditing allows administrators to define global object access auditing policies for the entire file system or for the registry on a computer. The specified SACL is then automatically applied to every object of that type. This can be useful for verifying that all critical files, folders, and registry settings on a computer are protected, and for identifying when an issue with a system resource occurs. If a file or folder SACL and a global object access auditing policy (or a single registry setting SACL and a global object access auditing policy) are configured on a computer, the effective SACL is derived from combining the file or folder SACL and the global object access auditing policy. This means that an audit event is generated if an activity matches either the file or folder SACL or the global object access auditing policy.
+
+ - question: |
+ How do I figure out why someone was able to access a resource?
+ answer: |
+ Often it is not enough to know simply that an object such as a file or folder was accessed. You may also want to know why the user was able to access this resource. You can obtain this forensic data by configuring the **Audit Handle Manipulation** setting with the **Audit File System** or with the **Audit Registry** audit setting.
+
+ - question: |
+ How do I know when changes are made to access control settings, by whom, and what the changes were?
+ answer: |
+ To track access control changes on computers running Windows Server 2016, Windows Server 2012 R2, Windows Server 2012 Windows 7, Windows Server 2008 R2, Windows Vista, or Windows Server 2008, you need to enable the following settings, which track changes to DACLs:
+ - **Audit File System** subcategory: Enable for success, failure, or success and failure
+ - **Audit Authorization Policy Change** setting: Enable for success, failure, or success and failure
+ - A SACL with **Write** and **Take ownership** permissions: Apply to the object that you want to monitor
+
+ In Windows XP and Windows Server 2003, you need to use the **Audit policy change** subcategory.
+
+ - question: |
+ How can I roll back security audit policies from the advanced audit policy to the basic audit policy?
+ answer: |
+ Applying advanced audit policy settings replaces any comparable basic security audit policy settings. If you subsequently change the advanced audit policy setting to **Not configured**, you need to complete the following steps to restore the original basic security audit policy settings:
+
+ 1. Set all Advanced Audit Policy subcategories to **Not configured**.
+ 2. Delete all audit.csv files from the %SYSVOL% folder on the domain controller.
+ 3. Reconfigure and apply the basic audit policy settings.
+
+ Unless you complete all of these steps, the basic audit policy settings will not be restored.
+
+ - question: |
+ How can I monitor if changes are made to audit policy settings?
+ answer: |
+ Changes to security audit policies are critical security events. You can use the **Audit Audit Policy Change** setting to determine if the operating system generates audit events when the following types of activities take place:
+
+ - Permissions and audit settings on the audit policy object are changed
+ - The system audit policy is changed
+ - Security event sources are registered or unregistered
+ - Per-user audit settings are changed
+ - The value of **CrashOnAuditFail** is modified
+ - Audit settings on a file or registry key are changed
+ - A Special Groups list is changed
+
+ - question: |
+ How can I minimize the number of events that are generated?
+ answer: |
+ Finding the right balance between auditing enough network and computer activity and auditing too little network and computer activity can be challenging. You can achieve this balance by identifying the most important resources, critical activities, and users or groups of users. Then design a security audit policy that targets these resources, activities, and users. Useful guidelines and recommendations for developing an effective security auditing strategy can be found in [Planning and deploying advanced security audit policies](planning-and-deploying-advanced-security-audit-policies.md).
+
+ - question: |
+ What are the best tools to model and manage audit policies?
+ answer: |
+ The integration of advanced audit policy settings with domain Group Policy, introduced in Windows 7 and Windows Server 2008 R2, is designed to simplify the management and implementation of security audit policies in an organization's network. As such, tools used to plan and deploy Group Policy Objects for a domain can also be used to plan and deploy security audit policies.
+ On an individual computer, the Auditpol command-line tool can be used to complete a number of important audit policy–related management tasks.
+
+ In addition, there are a number of computer management products, such as the Audit Collection Services in the Microsoft System Center Operations Manager products, which can be used to collect and filter event data.
+
+ - question: |
+ Where can I find information about all the possible events that I might receive?
+ answer: |
+ Users who examine the security event log for the first time can be a bit overwhelmed by the number of audit events that are stored there (which can quickly number in the thousands) and by the structured information that is included for each audit event. Additional information about these events, and the settings used to generate them, can be obtained from the following resources:
+
+ - [Windows 8 and Windows Server 2012 Security Event Details](https://www.microsoft.com/download/details.aspx?id=35753)
+ - [Security Audit Events for Windows 7 and Windows Server 2008 R2](https://go.microsoft.com/fwlink/p/?linkid=157780)
+ - [Security Audit Events for Windows Server 2008 and Windows Vista](https://go.microsoft.com/fwlink/p/?linkid=121868)
+ - [Advanced security audit policy settings](advanced-security-audit-policy-settings.md)
+
+ - question: |
+ Where can I find more detailed information?
+ answer: |
+ To learn more about security audit policies, see the following resources:
+
+ - [Planning and deploying advanced security audit policies](planning-and-deploying-advanced-security-audit-policies.md)
+ - [Security Monitoring and Attack Detection Planning Guide](https://social.technet.microsoft.com/wiki/contents/articles/325.advanced-security-auditing-in-windows-7-and-windows-server-2008-r2.aspx)
+ - [Security Audit Events for Windows 7 and Windows Server 2008 R2](https://go.microsoft.com/fwlink/p/?linkid=157780)
+ - [Security Audit Events for Windows Server 2008 and Windows Vista](https://go.microsoft.com/fwlink/p/?LinkId=121868)
diff --git a/windows/security/threat-protection/auditing/advanced-security-auditing.md b/windows/security/threat-protection/auditing/advanced-security-auditing.md
index 4a3608816f..691956d81c 100644
--- a/windows/security/threat-protection/auditing/advanced-security-auditing.md
+++ b/windows/security/threat-protection/auditing/advanced-security-auditing.md
@@ -21,7 +21,7 @@ ms.technology: mde
# Advanced security audit policies
**Applies to**
-- Windows 10
+- Windows 10
Advanced security audit policy settings are found in **Security Settings\\Advanced Audit Policy Configuration\\System Audit Policies** and appear to overlap with basic security audit policies, but they are recorded and applied differently.
When you apply basic audit policy settings to the local computer by using the Local Security Policy snap-in, you are editing the effective audit policy, so changes made to basic audit policy settings will appear exactly as configured in Auditpol.exe. In Windows 7 and later, advanced security audit policies can be controlled by using Group Policy.
@@ -31,6 +31,6 @@ When you apply basic audit policy settings to the local computer by using the Lo
| Topic | Description |
| - | - |
| [Planning and deploying advanced security audit policies](planning-and-deploying-advanced-security-audit-policies.md) | This topic for the IT professional explains the options that security policy planners must consider and the tasks they must complete to deploy an effective security audit policy in a network that includes advanced security audit policies |
-| [Advanced security auditing FAQ](advanced-security-auditing-faq.md) | This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
+| [Advanced security auditing FAQ](./advanced-security-auditing-faq.yml) | This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
| [Using advanced security auditing options to monitor dynamic access control objects](using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md) | This guide explains the process of setting up advanced security auditing capabilities that are made possible through settings and events that were introduced in Windows 8 and Windows Server 2012.
-| [Advanced security audit policy settings](advanced-security-audit-policy-settings.md) | This reference for IT professionals provides information about the advanced audit policy settings that are available in Windows and the audit events that they generate.
+| [Advanced security audit policy settings](advanced-security-audit-policy-settings.md) | This reference for IT professionals provides information about the advanced audit policy settings that are available in Windows and the audit events that they generate.
\ No newline at end of file
diff --git a/windows/security/threat-protection/auditing/security-auditing-overview.md b/windows/security/threat-protection/auditing/security-auditing-overview.md
index ba71110680..ec89d5ef53 100644
--- a/windows/security/threat-protection/auditing/security-auditing-overview.md
+++ b/windows/security/threat-protection/auditing/security-auditing-overview.md
@@ -34,7 +34,7 @@ Security auditing is one of the most powerful tools that you can use to maintain
| Topic | Description |
| - | - |
|[Basic security audit policies](basic-security-audit-policies.md) |Before you implement auditing, you must decide on an auditing policy. A basic audit policy specifies categories of security-related events that you want to audit. When this version of Windows is first installed, all auditing categories are disabled. By enabling various auditing event categories, you can implement an auditing policy that suits the security needs of your organization. |
-|[Advanced security audit policies](advanced-security-auditing.md) |Advanced security audit policy settings are found in **Security Settings\Advanced Audit Policy Configuration\System Audit Policies** and appear to overlap with basic security audit policies, but they are recorded and applied differently. |
+|[Advanced security audit policies](./advanced-security-auditing.md) |Advanced security audit policy settings are found in **Security Settings\Advanced Audit Policy Configuration\System Audit Policies** and appear to overlap with basic security audit policies, but they are recorded and applied differently. |
diff --git a/windows/security/threat-protection/device-control/control-usb-devices-using-intune.md b/windows/security/threat-protection/device-control/control-usb-devices-using-intune.md
deleted file mode 100644
index 321ddc79ff..0000000000
--- a/windows/security/threat-protection/device-control/control-usb-devices-using-intune.md
+++ /dev/null
@@ -1,331 +0,0 @@
----
-title: How to control USB devices and other removable media using Intune (Windows 10)
-description: You can configure Intune settings to reduce threats from removable storage such as USB devices.
-ms.prod: m365-security
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-ms.author: dansimp
-author: dansimp
-ms.reviewer: dansimp
-manager: dansimp
-audience: ITPro
-ms.technology: mde
----
-
-# How to control USB devices and other removable media using Microsoft Defender for Endpoint
-
-**Applies to:** [Microsoft Defender for Endpoint](https://go.microsoft.com/fwlink/p/?linkid=2069559)
-
-Microsoft recommends [a layered approach to securing removable media](https://aka.ms/devicecontrolblog), and Microsoft Defender for Endpoint provides multiple monitoring and control features to help prevent threats in unauthorized peripherals from compromising your devices:
-
-1. [Discover plug and play connected events for peripherals in Microsoft Defender for Endpoint advanced hunting](#discover-plug-and-play-connected-events). Identify or investigate suspicious usage activity.
-
-2. Configure to allow or block only certain removable devices and prevent threats.
- 1. [Allow or block removable devices](#allow-or-block-removable-devices) based on granular configuration to deny write access to removable disks and approve or deny devices by using USB device IDs. Flexible policy assignment of device installation settings based on an individual or group of Azure Active Directory (Azure AD) users and devices.
-
- 2. [Prevent threats from removable storage](#prevent-threats-from-removable-storage) introduced by removable storage devices by enabling:
- - Microsoft Defender Antivirus real-time protection (RTP) to scan removable storage for malware.
- - The Attack Surface Reduction (ASR) USB rule to block untrusted and unsigned processes that run from USB.
- - Direct Memory Access (DMA) protection settings to mitigate DMA attacks, including Kernel DMA Protection for Thunderbolt and blocking DMA until a user signs in.
-3. [Create customized alerts and response actions](#create-customized-alerts-and-response-actions) to monitor usage of removable devices based on these plug and play events or any other Microsoft Defender for Endpoint events with [custom detection rules](/windows/security/threat-protection/microsoft-defender-atp/custom-detection-rules).
-
-4. [Respond to threats](#respond-to-threats) from peripherals in real-time based on properties reported by each peripheral.
-
->[!Note]
->These threat reduction measures help prevent malware from coming into your environment. To protect enterprise data from leaving your environment, you can also configure data loss prevention measures. For example, on Windows 10 devices you can configure [BitLocker](../../information-protection/bitlocker/bitlocker-overview.md) and [Windows Information Protection](../../information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md), which will encrypt company data even if it is stored on a personal device, or use the [Storage/RemovableDiskDenyWriteAccess CSP](/windows/client-management/mdm/policy-csp-storage#storage-removablediskdenywriteaccess) to deny write access to removable disks. Additionally, you can [classify and protect files on Windows devices](/windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-overview) (including their mounted USB devices) by using Microsoft Defender for Endpoint and Azure Information Protection.
-
-## Discover plug and play connected events
-
-You can view plug and play connected events in Microsoft Defender for Endpoint advanced hunting to identify suspicious usage activity or perform internal investigations.
-For examples of Defender for Endpoint advanced hunting queries, see the [Microsoft Defender for Endpoint hunting queries GitHub repo](https://github.com/Microsoft/WindowsDefenderATP-Hunting-Queries).
-
-Sample Power BI report templates are available for Microsoft Defender for Endpoint that you can use for Advanced hunting queries. With these sample templates, including one for device control, you can integrate the power of Advanced hunting into Power BI. See the [GitHub repository for PowerBI templates](https://github.com/microsoft/MDATP-PowerBI-Templates) for more information. See [Create custom reports using Power BI](/windows/security/threat-protection/microsoft-defender-atp/api-power-bi) to learn more about Power BI integration.
-
-## Allow or block removable devices
-The following table describes the ways Microsoft Defender for Endpoint can allow or block removable devices based on granular configuration.
-
-| Control | Description |
-|----------|-------------|
-| [Restrict USB drives and other peripherals](#restrict-usb-drives-and-other-peripherals) | You can allow/prevent users to install only the USB drives and other peripherals included on a list of authorized/unauthorized devices or device types. |
-| [Block installation and usage of removable storage](#block-installation-and-usage-of-removable-storage) | You can't install or use removable storage. |
-| [Allow installation and usage of specifically approved peripherals](#allow-installation-and-usage-of-specifically-approved-peripherals) | You can only install and use approved peripherals that report specific properties in their firmware. |
-| [Prevent installation of specifically prohibited peripherals](#prevent-installation-of-specifically-prohibited-peripherals) | You can't install or use prohibited peripherals that report specific properties in their firmware. |
-| [Allow installation and usage of specifically approved peripherals with matching device instance IDs](#allow-installation-and-usage-of-specifically-approved-peripherals-with-matching-device-instance-ids) | You can only install and use approved peripherals that match any of these device instance IDs. |
-| [Prevent installation and usage of specifically prohibited peripherals with matching device instance IDs](#prevent-installation-and-usage-of-specifically-prohibited-peripherals-with-matching-device-instance-ids) | You can't install or use prohibited peripherals that match any of these device instance IDs. |
-| [Limit services that use Bluetooth](#limit-services-that-use-bluetooth) | You can limit the services that can use Bluetooth. |
-| [Use Microsoft Defender for Endpoint baseline settings](#use-microsoft-defender-for-endpoint-baseline-settings) | You can set the recommended configuration for ATP by using the Defender for Endpoint security baseline. |
-
-### Restrict USB drives and other peripherals
-
-To prevent malware infections or data loss, an organization may restrict USB drives and other peripherals. The following table describes the ways Microsoft Defender for Endpoint can help prevent installation and usage of USB drives and other peripherals.
-
-| Control | Description
-|----------|-------------|
-| [Allow installation and usage of USB drives and other peripherals](#allow-installation-and-usage-of-usb-drives-and-other-peripherals) | Allow users to install only the USB drives and other peripherals included on a list of authorized devices or device types |
-| [Prevent installation and usage of USB drives and other peripherals](#prevent-installation-and-usage-of-usb-drives-and-other-peripherals) | Prevent users from installing USB drives and other peripherals included on a list of unauthorized devices and device types |
-
-All of the above controls can be set through the Intune [Administrative Templates](/intune/administrative-templates-windows). The relevant policies are located here in the Intune Administrator Templates:
-
-
-
->[!Note]
->Using Intune, you can apply device configuration policies to Azure AD user and/or device groups.
-The above policies can also be set through the [Device Installation CSP settings](/windows/client-management/mdm/policy-csp-deviceinstallation) and the [Device Installation GPOs](/previous-versions/dotnet/articles/bb530324(v=msdn.10)).
-
-> [!Note]
-> Always test and refine these settings with a pilot group of users and devices first before applying them in production.
-For more information about controlling USB devices, see the [Microsoft Defender for Endpoint blog](https://www.microsoft.com/security/blog/2018/12/19/windows-defender-atp-has-protections-for-usb-and-removable-devices/).
-
-#### Allow installation and usage of USB drives and other peripherals
-
-One way to approach allowing installation and usage of USB drives and other peripherals is to start by allowing everything. Afterwards, you can start reducing the allowable USB drivers and other peripherals.
-
->[!Note]
->Because an unauthorized USB peripheral can have firmware that spoofs its USB properties, we recommend only allowing specifically approved USB peripherals and limiting the users who can access them.
-
-1. Enable **Prevent installation of devices not described by other policy settings** to all users.
-2. Enable **Allow installation of devices using drivers that match these device setup classes** for all [device setup classes](/windows-hardware/drivers/install/system-defined-device-setup-classes-available-to-vendors).
-
-To enforce the policy for already installed devices, apply the prevent policies that have this setting.
-
-When configuring the allow device installation policy, you must allow all parent attributes as well. You can view the parents of a device by opening Device Manager and view by connection.
-
-
-
-In this example, the following classes needed to be added: HID, Keyboard, and {36fc9e60-c465-11cf-8056-444553540000}. See [Microsoft-provided USB drivers](/windows-hardware/drivers/usbcon/supported-usb-classes) for more information.
-
-
-
-If you want to restrict to certain devices, remove the device setup class of the peripheral that you want to limit. Then add the device ID that you want to add. Device ID is based on the vendor ID and product ID values for a device. For information on device ID formats, see [Standard USB Identifiers](/windows-hardware/drivers/install/standard-usb-identifiers).
-
-To find the device IDs, see [Look up device ID](#look-up-device-id).
-
-For example:
-
-1. Remove class USBDevice from the **Allow installation of devices using drivers that match these device setup**.
-2. Add the device ID to allow in the **Allow installation of device that match any of these device IDs**.
-
-
-#### Prevent installation and usage of USB drives and other peripherals
-
-If you want to prevent the installation of a device class or certain devices, you can use the prevent device installation policies:
-
-1. Enable **Prevent installation of devices that match any of these device IDs** and add these devices to the list.
-2. Enable **Prevent installation of devices using drivers that match these device setup classes**.
-
-> [!Note]
-> The prevent device installation policies take precedence over the allow device installation policies.
-
-The **Prevent installation of devices that match any of these device IDs** policy allows you to specify a list of devices that Windows is prevented from installing.
-
-To prevent installation of devices that match any of these device IDs:
-
-1. [Look up device ID](#look-up-device-id) for devices that you want Windows to prevent from installing.
-
-2. Enable **Prevent installation of devices that match any of these device IDs** and add the vendor or product IDs to the list.
-
-
-#### Look up device ID
-You can use Device Manager to look up a device ID.
-
-1. Open Device Manager.
-2. Click **View** and select **Devices by connection**.
-3. From the tree, right-click the device and select **Properties**.
-4. In the dialog box for the selected device, click the **Details** tab.
-5. Click the **Property** drop-down list and select **Hardware Ids**.
-6. Right-click the top ID value and select **Copy**.
-
-For information about Device ID formats, see [Standard USB Identifiers](/windows-hardware/drivers/install/standard-usb-identifiers).
-
-For information on vendor IDs, see [USB members](https://www.usb.org/members).
-
-The following is an example for looking up a device vendor ID or product ID (which is part of the device ID) using PowerShell:
-``` PowerShell
-Get-WMIObject -Class Win32_DiskDrive |
-Select-Object -Property *
-```
-
-The **Prevent installation of devices using drivers that match these device setup classes** policy allows you to specify device setup classes that Windows is prevented from installing.
-
-To prevent installation of particular classes of devices:
-
-1. Find the GUID of the device setup class from [System-Defined Device Setup Classes Available to Vendors](/windows-hardware/drivers/install/system-defined-device-setup-classes-available-to-vendors).
-2. Enable **Prevent installation of devices using drivers that match these device setup classes** and add the class GUID to the list.
-
-
-### Block installation and usage of removable storage
-
-1. Sign in to the [Microsoft Azure portal](https://portal.azure.com/).
-2. Click **Intune** > **Device configuration** > **Profiles** > **Create profile**.
-
- 
-
-3. Use the following settings:
-
- - Name: Type a name for the profile
- - Description: Type a description
- - Platform: Windows 10 and later
- - Profile type: Device restrictions
-
- 
-
-4. Click **Configure** > **General**.
-
-5. For **Removable storage** and **USB connection (mobile only)**, choose **Block**. **Removable storage** includes USB drives, whereas **USB connection (mobile only)** excludes USB charging but includes other USB connections on mobile devices only.
-
- 
-
-6. Click **OK** to close **General** settings and **Device restrictions**.
-
-7. Click **Create** to save the profile.
-
-### Allow installation and usage of specifically approved peripherals
-
-Peripherals that are allowed to be installed can be specified by their [hardware identity](/windows-hardware/drivers/install/device-identification-strings). For a list of common identifier structures, see [Device Identifier Formats](/windows-hardware/drivers/install/device-identifier-formats). Test the configuration prior to rolling it out to ensure it blocks and allows the devices expected. Ideally test various instances of the hardware. For example, test multiple USB keys rather than only one.
-
-For a SyncML example that allows installation of specific device IDs, see [DeviceInstallation/AllowInstallationOfMatchingDeviceIDs CSP](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-allowinstallationofmatchingdeviceids). To allow specific device classes, see [DeviceInstallation/AllowInstallationOfMatchingDeviceSetupClasses CSP](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-allowinstallationofmatchingdevicesetupclasses).
-Allowing installation of specific devices requires also enabling [DeviceInstallation/PreventInstallationOfDevicesNotDescribedByOtherPolicySettings](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-preventinstallationofdevicesnotdescribedbyotherpolicysettings).
-
-### Prevent installation of specifically prohibited peripherals
-
-Microsoft Defender for Endpoint blocks installation and usage of prohibited peripherals by using either of these options:
-
-- [Administrative Templates](/intune/administrative-templates-windows) can block any device with a matching hardware ID or setup class.
-- [Device Installation CSP settings](/windows/client-management/mdm/policy-csp-deviceinstallation) with a custom profile in Intune. You can [prevent installation of specific device IDs](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-preventinstallationofmatchingdeviceids) or [prevent specific device classes](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-preventinstallationofmatchingdevicesetupclasses).
-
-### Allow installation and usage of specifically approved peripherals with matching device instance IDs
-
-Peripherals that are allowed to be installed can be specified by their [device instance IDs](/windows-hardware/drivers/install/device-instance-ids). Test the configuration prior to rolling it out to ensure it allows the devices expected. Ideally test various instances of the hardware. For example, test multiple USB keys rather than only one.
-
-You can allow installation and usage of approved peripherals with matching device instance IDs by configuring [DeviceInstallation/AllowInstallationOfMatchingDeviceInstanceIDs](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-allowinstallationofmatchingdeviceinstanceids) policy setting.
-
-### Prevent installation and usage of specifically prohibited peripherals with matching device instance IDs
-
-Peripherals that are prohibited to be installed can be specified by their [device instance IDs](/windows-hardware/drivers/install/device-instance-ids). Test the configuration prior to rolling it out to ensure it allows the devices expected. Ideally test various instances of the hardware. For example, test multiple USB keys rather than only one.
-
-You can prevent installation of the prohibited peripherals with matching device instance IDs by configuring [DeviceInstallation/PreventInstallationOfMatchingDeviceInstanceIDs](/windows/client-management/mdm/policy-csp-deviceinstallation#deviceinstallation-preventinstallationofmatchingdeviceinstanceids) policy setting.
-
-### Limit services that use Bluetooth
-
-Using Intune, you can limit the services that can use Bluetooth through the ["Bluetooth allowed services"](/windows/client-management/mdm/policy-csp-bluetooth#servicesallowedlist-usage-guide). The default state of "Bluetooth allowed services" settings means everything is allowed. As soon as a service is added, that becomes the allowed list. If the customer adds the Keyboards and Mice values, and doesn’t add the file transfer GUIDs, file transfer should be blocked.
-
-
-
-### Use Microsoft Defender for Endpoint baseline settings
-
-The Microsoft Defender for Endpoint baseline settings represent the recommended configuration for threat protection. Configuration settings for baseline are located in the edit profile page of the configuration settings.
-
-
-
-## Prevent threats from removable storage
-
-Removable storage devices can introduce additional security risk to your organization. Microsoft Defender for Endpoint can help identify and block malicious files on removable storage devices.
-
-Microsoft Defender for Endpoint can also prevent USB peripherals from being used on devices to help prevent external threats. It does this by using the properties reported by USB peripherals to determine whether or not they can be installed and used on the device.
-
-Note that if you block USB devices or any other device classes using the device installation policies, connected devices, such as phones, can still charge.
-
->[!NOTE]
->Always test and refine these settings with a pilot group of users and devices first before widely distributing to your organization.
-
-The following table describes the ways Microsoft Defender for Endpoint can help prevent threats from removable storage.
-
-For more information about controlling USB devices, see the [Microsoft Defender for Endpoint blog](https://aka.ms/devicecontrolblog).
-
-| Control | Description |
-|----------|-------------|
-| [Enable Microsoft Defender Antivirus Scanning](#enable-microsoft-defender-antivirus-scanning) | Enable Microsoft Defender Antivirus scanning for real-time protection or scheduled scans.|
-| [Block untrusted and unsigned processes on USB peripherals](#block-untrusted-and-unsigned-processes-on-usb-peripherals) | Block USB files that are unsigned or untrusted. |
-| [Protect against Direct Memory Access (DMA) attacks](#protect-against-direct-memory-access-dma-attacks) | Configure settings to protect against DMA attacks. |
-
->[!NOTE]
->Because an unauthorized USB peripheral can have firmware that spoofs its USB properties, we recommend only allowing specifically approved USB peripherals and limiting the users who can access them.
-
-### Enable Microsoft Defender Antivirus Scanning
-
-Protecting authorized removable storage with Microsoft Defender Antivirus requires [enabling real-time protection](/microsoft-365/security/defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus) or scheduling scans and configuring removable drives for scans.
-
-- If real-time protection is enabled, files are scanned before they are accessed and executed. The scanning scope includes all files, including those on mounted removable devices such as USB drives. You can optionally [run a PowerShell script to perform a custom scan](/samples/browse/?redirectedfrom=TechNet-Gallery) of a USB drive after it is mounted, so that Microsoft Defender Antivirus starts scanning all files on a removable device once the removable device is attached. However, we recommend enabling real-time protection for improved scanning performance, especially for large storage devices.
-- If scheduled scans are used, then you need to disable the DisableRemovableDriveScanning setting (enabled by default) to scan the removable device during a full scan. Removable devices are scanned during a quick or custom scan regardless of the DisableRemovableDriveScanning setting.
-
->[!NOTE]
->We recommend enabling real-time monitoring for scanning. In Intune, you can enable real-time monitoring for Windows 10 in **Device Restrictions** > **Configure** > **Microsoft Defender Antivirus** > **Real-time monitoring**.
-
-
-
-### Block untrusted and unsigned processes on USB peripherals
-
-End-users might plug in removable devices that are infected with malware.
-To prevent infections, a company can block USB files that are unsigned or untrusted.
-Alternatively, companies can leverage the audit feature of [attack surface reduction rules](/microsoft-365/security/defender-endpoint/attack-surface-reduction) to monitor the activity of untrusted and unsigned processes that execute on a USB peripheral.
-This can be done by setting **Untrusted and unsigned processes that run from USB** to either **Block** or **Audit only**, respectively.
-With this rule, admins can prevent or audit unsigned or untrusted executable files from running from USB removable drives, including SD cards.
-Affected file types include executable files (such as .exe, .dll, or .scr) and script files such as a PowerShell (.ps), VisualBasic (.vbs), or JavaScript (.js) files.
-
-These settings require [enabling real-time protection](/microsoft-365/security/defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus).
-
-1. Sign in to the [Microsoft Endpoint Manager](https://endpoint.microsoft.com/).
-2. Click **Devices** > **Windows** > **Configuration Policies** > **Create profile**.
-
-3. Use the following settings:
- - Platform: Windows 10 and later
- - Profile type: Device restrictions
- 
-4. Click **Create**.
-5. For **Unsigned and untrusted processes that run from USB**, choose **Block**.
- 
-6. Click **OK** to close settings and **Device restrictions**.
-
-### Protect against Direct Memory Access (DMA) attacks
-
-DMA attacks can lead to disclosure of sensitive information residing on a PC, or even injection of malware that allows attackers to bypass the lock screen or control PCs remotely. The following settings help to prevent DMA attacks:
-
-1. Beginning with Windows 10 version 1803, Microsoft introduced [Kernel DMA Protection for Thunderbolt](../../information-protection/kernel-dma-protection-for-thunderbolt.md) to provide native protection against DMA attacks via Thunderbolt ports. Kernel DMA Protection for Thunderbolt is enabled by system manufacturers and cannot be turned on or off by users.
-
- Beginning with Windows 10 version 1809, you can adjust the level of Kernel DMA Protection by configuring the [DMA Guard CSP](/windows/client-management/mdm/policy-csp-dmaguard#dmaguard-deviceenumerationpolicy). This is an additional control for peripherals that don't support device memory isolation (also known as DMA-remapping). Memory isolation allows the OS to leverage the I/O Memory Management Unit (IOMMU) of a device to block unallowed I/O, or memory access, by the peripheral (memory sandboxing). In other words, the OS assigns a certain memory range to the peripheral. If the peripheral attempts to read/write to memory outside of the assigned range, the OS blocks it.
-
- Peripherals that support device memory isolation can always connect. Peripherals that don't can be blocked, allowed, or allowed only after the user signs in (default).
-
-2. On Windows 10 systems that do not support Kernel DMA Protection, you can:
-
- - [Block DMA until a user signs in](/windows/client-management/mdm/policy-csp-dataprotection#dataprotection-allowdirectmemoryaccess)
- - [Block all connections via the Thunderbolt ports (including USB devices)](https://support.microsoft.com/help/2516445/blocking-the-sbp-2-driver-and-thunderbolt-controllers-to-reduce-1394-d)
-
-## Create customized alerts and response actions
-
-You can create custom alerts and response actions with the WDATP Connector and the custom detection rules:
-
-**Wdatp Connector response Actions:**
-
-**Investigate:** Initiate investigations, collect investigation package, and isolate a machine.
-
-**Threat Scanning** on USB devices.
-
-**Restrict execution of all applications** on the machine except a predefined set
-MDATP connector is one of over 200 pre-defined connectors including Outlook, Teams, Slack, etc. Custom connectors can be built.
-- [More information on WDATP Connector Response Actions](/connectors/wdatp/)
-
-**Custom Detection Rules Response Action:**
-Both machine and file level actions can be applied.
-- [More information on Custom Detection Rules Response Actions](/windows/security/threat-protection/microsoft-defender-atp/custom-detection-rules)
-
-For information on device control related advance hunting events and examples on how to create custom alerts, see [Advanced hunting updates: USB events, machine-level actions, and schema changes](https://techcommunity.microsoft.com/t5/Microsoft-Defender-ATP/Advanced-hunting-updates-USB-events-machine-level-actions-and/ba-p/824152).
-
-## Respond to threats
-
-You can create custom alerts and automatic response actions with the [Microsoft Defender for Endpoint Custom Detection Rules](/windows/security/threat-protection/microsoft-defender-atp/custom-detection-rules). Response actions within the custom detection cover both machine and file level actions. You can also create alerts and automatic response actions using [PowerApps](https://powerapps.microsoft.com/) and [Flow](https://flow.microsoft.com/) with the [Microsoft Defender for Endpoint connector](/connectors/wdatp/). The connector supports actions for investigation, threat scanning, and restricting running applications. It is one of over 200 pre-defined connectors including Outlook, Teams, Slack, and more. Custom connectors can also be built. See [Connectors](/connectors/) to learn more about connectors.
-
-For example, using either approach, you can automatically have the Microsoft Defender Antivirus run when a USB device is mounted onto a machine.
-
-## Related topics
-
-- [Configure real-time protection for Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus)
-- [Defender/AllowFullScanRemovableDriveScanning](/windows/client-management/mdm/policy-csp-defender#defender-allowfullscanremovabledrivescanning)
-- [Policy/DeviceInstallation CSP](/windows/client-management/mdm/policy-csp-deviceinstallation)
-- [Perform a custom scan of a removable device](/samples/browse/?redirectedfrom=TechNet-Gallery)
-- [Device Control PowerBI Template for custom reporting](https://github.com/microsoft/MDATP-PowerBI-Templates)
-- [BitLocker](../../information-protection/bitlocker/bitlocker-overview.md)
-- [Windows Information Protection](../../information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md)
\ No newline at end of file
diff --git a/windows/security/threat-protection/device-control/device-control-report.md b/windows/security/threat-protection/device-control/device-control-report.md
deleted file mode 100644
index 2c35de2163..0000000000
--- a/windows/security/threat-protection/device-control/device-control-report.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: Protect your organization’s data with device control
-description: Monitor your organization's data security through device control reports.
-ms.prod: m365-security
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-ms.author: v-ajupudi
-author: alluthewriter
-ms.reviewer: dansimp
-manager: dansimp
-audience: ITPro
-ms.technology: mde
----
-# Protect your organization’s data with device control
-
-**Applies to:** [Microsoft Defender for Endpoint](https://go.microsoft.com/fwlink/p/?linkid=2069559)
-
-Microsoft Defender for Endpoint device control protects against data loss, by monitoring and controlling media use by devices in your organization, such as the use of removable storage devices and USB drives.
-
-With the device control report, you can view events that relate to media usage, such as:
-
-- **Audit events:** Shows the number of audit events that occur when external media is connected.
-- **Policy events:** Shows the number of policy events that occur when a device control policy is triggered.
-
-> [!NOTE]
-> The audit event to track media usage is enabled by default for devices onboarded to Microsoft Defender for Endpoint.
-
-## Understanding the audit events
-
-The audit events include:
-
-- **USB drive mount and unmount:** Audit events that are generated when a USB drive is mounted or unmounted.
-- **PnP:** Plug and Play audit events are generated when removable storage, a printer, or Bluetooth media is connected.
-
-## Monitor device control security
-
-Device control in Microsoft Defender for Endpoint empowers security administrators with tools that enable them to track their organization’s device control security through reports. You can find the device control report in the Microsoft 365 security center by going to **Reports > Device protection**.
-
-The Device protection card on the **Reports** dashboard shows the number of audit events generated by media type, over the last 180 days.
-
-> [!div class="mx-imgBorder"]
-> 
-
-The **View details** button shows more media usage data in the **device control report** page.
-
-The page provides a dashboard with aggregated number of events per type and a list of events. Administrators can filter on time range, media class name, and device ID.
-
-> [!div class="mx-imgBorder"]
-> 
-
-When you select an event, a flyout appears that shows you more information:
-
-- **General details:** Date, Action mode, and the policy of this event.
-- **Media information:** Media information includes Media name, Class name, Class GUID, Device ID, Vendor ID, Volume, Serial number, and Bus type.
-- **Location details:** Device name and MDATP device ID.
-
-> [!div class="mx-imgBorder"]
-> 
-
-To see real-time activity for this media across the organization, select the **Open Advanced hunting** button. This includes an embedded, pre-defined query.
-
-> [!div class="mx-imgBorder"]
-> 
-
-To see the security of the device, select the **Open device page** button on the flyout. This button opens the device entity page.
-
-> [!div class="mx-imgBorder"]
-> 
-
-## Reporting delays
-
-The device control report can have a 12-hour delay from the time a media connection occurs to the time the event is reflected in the card or in the domain list.
diff --git a/windows/security/threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md b/windows/security/threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md
index 8de7febefc..0ecb7c4e45 100644
--- a/windows/security/threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md
+++ b/windows/security/threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md
@@ -16,35 +16,33 @@ ms.technology: mde
# Windows Defender Application Control and virtualization-based protection of code integrity
**Applies to**
-- Windows 10
-- Windows Server 2016
-Windows 10 includes a set of hardware and OS technologies that, when configured together, allow enterprises to "lock down" Windows 10 systems so they operate with many of the properties of mobile devices. In this configuration, specific technologies work together to restrict devices to only run authorized apps by using a feature called configurable code integrity, while simultaneously hardening the OS against kernel memory attacks by using virtualization-based protection of code integrity (more specifically, HVCI).
+- Windows 10
+- Windows Server 2016
-Configurable code integrity policies and HVCI are powerful protections that can be used separately. However, when these two technologies are configured to work together, they present a strong protection capability for Windows 10 devices.
+Windows 10 includes a set of hardware and OS technologies that, when configured together, allow enterprises to "lock down" Windows 10 systems so they behave more like mobile devices. In this configuration, Windows Defender Application Control (WDAC) is used to restrict devices to run only approved apps, while the OS is hardened against kernel memory attacks using hypervisor-protected code integrity (HVCI).
-Using configurable code integrity to restrict devices to only authorized apps has these advantages over other solutions:
+WDAC policies and HVCI are powerful protections that can be used separately. However, when these two technologies are configured to work together, they present a strong protection capability for Windows 10 devices.
-1. Configurable code integrity policy is enforced by the Windows kernel itself. As such, the policy takes effect early in the boot sequence before nearly all other OS code and before traditional antivirus solutions run.
-2. Configurable code integrity allows customers to set application control policy not only over code running in user mode, but also kernel mode hardware and software drivers and even code that runs as part of Windows.
-3. Customers can protect the configurable code integrity policy even from local administrator tampering by digitally signing the policy. This would mean that changing the policy would require both administrative privilege and access to the organization’s digital signing process, making it difficult for an attacker with administrative privilege, or malicious software that managed to gain administrative privilege, to alter the application control policy.
-4. The entire configurable code integrity enforcement mechanism can be protected by HVCI, where even if a vulnerability exists in kernel mode code, the likelihood that an attacker could successfully exploit it is diminished. Why is this relevant? That’s because an attacker that compromises the kernel would otherwise have enough privilege to disable most system defenses and override the application control policies enforced by configurable code integrity or any other application control solution.
+Using WDAC to restrict devices to only authorized apps has these advantages over other solutions:
-## Windows Defender Application Control
+1. WDAC policy is enforced by the Windows kernel itself, and the policy takes effect early in the boot sequence before nearly all other OS code and before traditional antivirus solutions run.
+2. WDAC lets you set application control policy for code that runs in user mode, kernel mode hardware and software drivers, and even code that runs as part of Windows.
+3. Customers can protect the WDAC policy even from local administrator tampering by digitally signing the policy. To change signed policy requires both administrative privilege and access to the organization’s digital signing process. This makes it difficult for an attacker, including one who has managed to gain administrative privilege, to tamper with WDAC policy.
+4. You can protect the entire WDAC enforcement mechanism with HVCI. Even if a vulnerability exists in kernel mode code, HVCI greatly reduces the likelihood that an attacker could successfully exploit it. This is important because an attacker that compromises the kernel could normally disable most system defenses, including those enforced by WDAC or any other application control solution.
-When we originally designed this configuration state, we did so with a specific security promise in mind. Although there were no direct dependencies between configurable code integrity and HVCI, we intentionally focused our discussion around the lockdown state you achieve when deploying them together. However, given that HVCI relies on Windows virtualization-based security, it comes with more hardware, firmware, and kernel driver compatibility requirements that some older systems can’t meet. As a result, many IT Professionals assumed that because some systems couldn't use HVCI, they couldn’t use configurable code integrity either.
+## Why we no longer use the Device Guard brand
-Configurable code integrity carries no specific hardware or software requirements other than running Windows 10, which means many IT professionals were wrongly denied the benefits of this powerful application control capability.
+When we originally promoted Device Guard, we did so with a specific security promise in mind. Although there were no direct dependencies between WDAC and HVCI, we intentionally focused our discussion around the lockdown state achieved when using them together. However, since HVCI relies on Windows virtualization-based security, it has hardware, firmware, and kernel driver compatibility requirements that some older systems can’t meet. This misled many people to assume that if systems couldn't use HVCI, they couldn’t use WDAC either.
-Since the initial release of Windows 10, the world has witnessed numerous hacking and malware attacks where application control alone could have prevented the attack altogether. With this in mind, we are discussing and documenting configurable code integrity as an independent technology within our security stack and giving it a name of its own: [Windows Defender Application Control](../windows-defender-application-control/windows-defender-application-control.md).
-We hope this change will help us better communicate options for adopting application control within an organization.
+WDAC has no specific hardware or software requirements other than running Windows 10, which means customers were denied the benefits of this powerful application control capability due to Device Guard confusion.
+
+Since the initial release of Windows 10, the world has witnessed numerous hacking and malware attacks where application control alone could have prevented the attack altogether. With this in mind, we now discuss and document WDAC as an independent technology within our security stack and gave it a name of its own: [Windows Defender Application Control](../windows-defender-application-control/windows-defender-application-control.md).
+We hope this change will help us better communicate options for adopting application control within your organizations.
## Related articles
-[Windows Defender Application Control](../windows-defender-application-control/windows-defender-application-control.md)
-
-[Dropping the Hammer Down on Malware Threats with Windows 10’s Windows Defender](https://channel9.msdn.com/Events/Ignite/2015/BRK2336)
-
-[Driver compatibility with Windows Defender in Windows 10](https://blogs.msdn.microsoft.com/windows_hardware_certification/2015/05/22/driver-compatibility-with-device-guard-in-windows-10)
-
-[Code integrity](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/dd348642(v=ws.10))
\ No newline at end of file
+- [Windows Defender Application Control](../windows-defender-application-control/windows-defender-application-control.md)
+- [Dropping the Hammer Down on Malware Threats with Windows 10’s Windows Defender](https://channel9.msdn.com/Events/Ignite/2015/BRK2336)
+- [Driver compatibility with Windows Defender in Windows 10](https://blogs.msdn.microsoft.com/windows_hardware_certification/2015/05/22/driver-compatibility-with-device-guard-in-windows-10)
+- [Code integrity](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/dd348642(v=ws.10))
diff --git a/windows/security/threat-protection/intelligence/TOC.md b/windows/security/threat-protection/intelligence/TOC.md
deleted file mode 100644
index 9919f7d8d2..0000000000
--- a/windows/security/threat-protection/intelligence/TOC.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# [Security intelligence](index.md)
-
-## [Understand malware & other threats](understanding-malware.md)
-
-### [Coin miners](coinminer-malware.md)
-
-### [Exploits and exploit kits](exploits-malware.md)
-
-### [Fileless threats](fileless-threats.md)
-
-### [Macro malware](macro-malware.md)
-
-### [Phishing attacks](phishing.md)
-
-#### [Phishing trends and techniques](phishing-trends.md)
-
-### [Ransomware](ransomware-malware.md)
-
-### [Rootkits](rootkits-malware.md)
-
-### [Supply chain attacks](supply-chain-malware.md)
-
-### [Tech support scams](support-scams.md)
-
-### [Trojans](trojans-malware.md)
-
-### [Unwanted software](unwanted-software.md)
-
-### [Worms](worms-malware.md)
-
-## [Prevent malware infection](prevent-malware-infection.md)
-
-## [Malware naming convention](malware-naming.md)
-
-## [How Microsoft identifies malware and PUA](criteria.md)
-
-## [Submit files for analysis](submission-guide.md)
-
-## [Troubleshoot malware submission](portal-submission-troubleshooting.md)
-
-## [Safety Scanner download](safety-scanner-download.md)
-
-## [Industry collaboration programs](cybersecurity-industry-partners.md)
-
-### [Virus information alliance](virus-information-alliance-criteria.md)
-
-### [Microsoft virus initiative](virus-initiative-criteria.md)
-
-### [Coordinated malware eradication](coordinated-malware-eradication.md)
-
-## [Information for developers]()
-
-### [Software developer FAQ](developer-faq.md)
-
-### [Software developer resources](developer-resources.md)
diff --git a/windows/security/threat-protection/intelligence/TOC.yml b/windows/security/threat-protection/intelligence/TOC.yml
new file mode 100644
index 0000000000..6c1f372f77
--- /dev/null
+++ b/windows/security/threat-protection/intelligence/TOC.yml
@@ -0,0 +1,60 @@
+- name: Security intelligence
+ href: index.md
+ items:
+ - name: Understand malware & other threats
+ href: understanding-malware.md
+ items:
+ - name: Coin miners
+ href: coinminer-malware.md
+ - name: Exploits and exploit kits
+ href: exploits-malware.md
+ - name: Fileless threats
+ href: fileless-threats.md
+ - name: Macro malware
+ href: macro-malware.md
+ - name: Phishing attacks
+ href: phishing.md
+ items:
+ - name: Phishing trends and techniques
+ href: phishing-trends.md
+ - name: Ransomware
+ href: ransomware-malware.md
+ - name: Rootkits
+ href: rootkits-malware.md
+ - name: Supply chain attacks
+ href: supply-chain-malware.md
+ - name: Tech support scams
+ href: support-scams.md
+ - name: Trojans
+ href: trojans-malware.md
+ - name: Unwanted software
+ href: unwanted-software.md
+ - name: Worms
+ href: worms-malware.md
+ - name: Prevent malware infection
+ href: prevent-malware-infection.md
+ - name: Malware naming convention
+ href: malware-naming.md
+ - name: How Microsoft identifies malware and PUA
+ href: criteria.md
+ - name: Submit files for analysis
+ href: submission-guide.md
+ - name: Troubleshoot malware submission
+ href: portal-submission-troubleshooting.md
+ - name: Safety Scanner download
+ href: safety-scanner-download.md
+ - name: Industry collaboration programs
+ href: cybersecurity-industry-partners.md
+ items:
+ - name: Virus information alliance
+ href: virus-information-alliance-criteria.md
+ - name: Microsoft virus initiative
+ href: virus-initiative-criteria.md
+ - name: Coordinated malware eradication
+ href: coordinated-malware-eradication.md
+ - name: Information for developers
+ items:
+ - name: Software developer FAQ
+ href: developer-faq.md
+ - name: Software developer resources
+ href: developer-resources.md
diff --git a/windows/security/threat-protection/intelligence/macro-malware.md b/windows/security/threat-protection/intelligence/macro-malware.md
index 9c57408a5d..5bf655b20c 100644
--- a/windows/security/threat-protection/intelligence/macro-malware.md
+++ b/windows/security/threat-protection/intelligence/macro-malware.md
@@ -44,7 +44,7 @@ We've seen macro malware download threats from the following families:
* Delete any emails from unknown people or with suspicious content. Spam emails are the main way macro malware spreads.
-* Enterprises can prevent macro malware from running executable content using [ASR rules](/windows/security/threat-protection/microsoft-defender-atp/attack-surface-reduction)
+* Enterprises can prevent macro malware from running executable content using [ASR rules](/microsoft-365/security/defender-endpoint/attack-surface-reduction)
For more tips on protecting yourself from suspicious emails, see [phishing](phishing.md).
diff --git a/windows/security/threat-protection/intelligence/safety-scanner-download.md b/windows/security/threat-protection/intelligence/safety-scanner-download.md
index 1027ebf999..282c90bd86 100644
--- a/windows/security/threat-protection/intelligence/safety-scanner-download.md
+++ b/windows/security/threat-protection/intelligence/safety-scanner-download.md
@@ -58,4 +58,4 @@ For more information about the Safety Scanner, see the support article on [how t
- [Microsoft Security Essentials](https://support.microsoft.com/help/14210/security-essentials-download)
- [Removing difficult threats](https://support.microsoft.com/help/4466982/windows-10-troubleshoot-problems-with-detecting-and-removing-malware)
- [Submit file for malware analysis](https://www.microsoft.com/wdsi/filesubmission)
-- [Microsoft antimalware and threat protection solutions](/windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-advanced-threat-protection)
\ No newline at end of file
+- [Microsoft antimalware and threat protection solutions](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint)
diff --git a/windows/security/threat-protection/microsoft-defender-application-guard/TOC.md b/windows/security/threat-protection/microsoft-defender-application-guard/TOC.md
deleted file mode 100644
index 52b3bb034e..0000000000
--- a/windows/security/threat-protection/microsoft-defender-application-guard/TOC.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# [Microsoft Defender Application Guard](md-app-guard-overview.md)
-
-## [System requirements](reqs-md-app-guard.md)
-## [Install WDAG](install-md-app-guard.md)
-## [Configure WDAG policies](configure-md-app-guard.md)
-## [Test scenarios](test-scenarios-md-app-guard.md)
-## [Microsoft Defender Application Guard Extension](md-app-guard-browser-extension.md)
-## [FAQ](faq-md-app-guard.md)
\ No newline at end of file
diff --git a/windows/security/threat-protection/microsoft-defender-application-guard/TOC.yml b/windows/security/threat-protection/microsoft-defender-application-guard/TOC.yml
new file mode 100644
index 0000000000..c77a91d3e5
--- /dev/null
+++ b/windows/security/threat-protection/microsoft-defender-application-guard/TOC.yml
@@ -0,0 +1,15 @@
+- name: Microsoft Defender Application Guard
+ href: md-app-guard-overview.md
+ items:
+ - name: System requirements
+ href: reqs-md-app-guard.md
+ - name: Install WDAG
+ href: install-md-app-guard.md
+ - name: Configure WDAG policies
+ href: configure-md-app-guard.md
+ - name: Test scenarios
+ href: test-scenarios-md-app-guard.md
+ - name: Microsoft Defender Application Guard Extension
+ href: md-app-guard-browser-extension.md
+ - name: FAQ
+ href: faq-md-app-guard.md
diff --git a/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md b/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md
index f7cc54d9e4..208da5965e 100644
--- a/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md
+++ b/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md
@@ -8,7 +8,7 @@ ms.pagetype: security
ms.localizationpriority: medium
author: denisebmsft
ms.author: deniseb
-ms.date: 10/17/2017
+ms.date: 05/06/2021
ms.reviewer:
manager: dansimp
ms.custom: asr
@@ -17,27 +17,26 @@ ms.technology: mde
# Configure Microsoft Defender Application Guard policy settings
-**Applies to:**
+**Applies to:**
+
- [Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/)
-Microsoft Defender Application Guard (Application Guard) works with Group Policy to help you manage your organization's computer settings. By using Group Policy, you can configure a setting once, and then copy it onto many computers. For example, you can set up multiple security settings in a GPO, which is linked to a domain, and then apply all those settings to every computer in the domain.
+Microsoft Defender Application Guard (Application Guard) works with Group Policy to help you manage your organization's computer settings. By using Group Policy, you can configure a setting once, and then copy it onto many computers. For example, you can set up multiple security settings in a Group Policy Object, which is linked to a domain, and then apply all those settings to every endpoint in the domain.
Application Guard uses both network isolation and application-specific settings.
## Network isolation settings
-These settings, located at **Computer Configuration\Administrative Templates\Network\Network Isolation**, help you define and manage your company's network boundaries. Application Guard uses this information to automatically transfer any requests to access the non-corporate resources into the Application Guard container.
-
->[!NOTE]
->You must configure either the Enterprise resource domains hosted in the cloud or Private network ranges for apps settings on your employee devices to successfully turn on Application Guard using enterprise mode. Proxy servers must be a neutral resource listed in the "Domains categorized as both work and personal" policy.
-
+These settings, located at **Computer Configuration\Administrative Templates\Network\Network Isolation**, help you define and manage your organization's network boundaries. Application Guard uses this information to automatically transfer any requests to access the non-corporate resources into the Application Guard container.
+> [!NOTE]
+> You must configure either the Enterprise resource domains hosted in the cloud or Private network ranges for apps settings on your employee devices to successfully turn on Application Guard using enterprise mode. Proxy servers must be a neutral resource listed in the "Domains categorized as both work and personal" policy.
|Policy name|Supported versions|Description|
|-----------|------------------|-----------|
-|Private network ranges for apps|At least Windows Server 2012, Windows 8, or Windows RT|A comma-separated list of IP address ranges that are in your corporate network. Included endpoints or endpoints that are included within a specified IP address range, are rendered using Microsoft Edge and won't be accessible from the Application Guard environment.|
-|Enterprise resource domains hosted in the cloud|At least Windows Server 2012, Windows 8, or Windows RT|A pipe-separated (\|) list of your domain cloud resources. Included endpoints are rendered using Microsoft Edge and won't be accessible from the Application Guard environment. Note: This list supports the wildcards detailed in the [Network isolation settings wildcards](#network-isolation-settings-wildcards) table.|
-|Domains categorized as both work and personal|At least Windows Server 2012, Windows 8, or Windows RT|A comma-separated list of domain names used as both work or personal resources. Included endpoints are rendered using Microsoft Edge and will be accessible from the Application Guard and regular Edge environment. Note: This list supports the wildcards detailed in the [Network isolation settings wildcards](#network-isolation-settings-wildcards) table.|
+|Private network ranges for apps | At least Windows Server 2012, Windows 8, or Windows RT| A comma-separated list of IP address ranges that are in your corporate network. Included endpoints or endpoints that are included within a specified IP address range, are rendered using Microsoft Edge and won't be accessible from the Application Guard environment.|
+|Enterprise resource domains hosted in the cloud| At least Windows Server 2012, Windows 8, or Windows RT|A pipe-separated (\|) list of your domain cloud resources. Included endpoints are rendered using Microsoft Edge and won't be accessible from the Application Guard environment. **NOTE**: This list supports the wildcards detailed in the [Network isolation settings wildcards](#network-isolation-settings-wildcards) table.|
+|Domains categorized as both work and personal| At least Windows Server 2012, Windows 8, or Windows RT|A comma-separated list of domain names used as both work or personal resources. Included endpoints are rendered using Microsoft Edge and will be accessible from the Application Guard and regular Edge environment.
**NOTE**: This list supports the wildcards detailed in the [Network isolation settings wildcards](#network-isolation-settings-wildcards) table.|
## Network isolation settings wildcards
@@ -53,13 +52,15 @@ These settings, located at **Computer Configuration\Administrative Templates\Win
|Name|Supported versions|Description|Options|
|-----------|------------------|-----------|-------|
-|Configure Microsoft Defender Application Guard clipboard settings|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether Application Guard can use the clipboard functionality.|**Enabled.** Turns On the clipboard functionality and lets you choose whether to additionally:
-Disable the clipboard functionality completely when Virtualization Security is enabled.
- Enable copying of certain content from Application Guard into Microsoft Edge.
- Enable copying of certain content from Microsoft Edge into Application Guard. **Important:** Allowing copied content to go from Microsoft Edge into Application Guard can cause potential security risks and isn't recommended.
**Disabled or not configured.** Completely turns Off the clipboard functionality for Application Guard.|
-|Configure Microsoft Defender Application Guard print settings|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether Application Guard can use the print functionality.|**Enabled.** Turns On the print functionality and lets you choose whether to additionally:
- Enable Application Guard to print into the XPS format.
- Enable Application Guard to print into the PDF format.
- Enable Application Guard to print to locally attached printers.
- Enable Application Guard to print from previously connected network printers. Employees can't search for additional printers.
**Disabled or not configured.** Completely turns Off the print functionality for Application Guard.|
-|Block enterprise websites to load non-enterprise content in IE and Edge|Windows 10 Enterprise, 1709 or higher|Determines whether to allow Internet access for apps not included on the **Allowed Apps** list.|**Enabled.** Prevents network traffic from both Internet Explorer and Microsoft Edge to non-enterprise sites that can't render in the Application Guard container. **Note:** This may also block assets cached by CDNs and references to analytics sites. Please add them to the trusted enterprise resources to avoid broken pages.
**Disabled or not configured.** Prevents Microsoft Edge to render network traffic to non-enterprise sites that can't render in Application Guard. |
-|Allow Persistence|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether data persists across different sessions in Microsoft Defender Application Guard.|**Enabled.** Application Guard saves user-downloaded files and other items (such as, cookies, Favorites, and so on) for use in future Application Guard sessions.
**Disabled or not configured.** All user data within Application Guard is reset between sessions.
**Note**
If you later decide to stop supporting data persistence for your employees, you can use our Windows-provided utility to reset the container and to discard any personal data.
**To reset the container:**
1. Open a command-line program and navigate to `Windows/System32`.
2. Type `wdagtool.exe cleanup`. The container environment is reset, retaining only the employee-generated data.
3. Type `wdagtool.exe cleanup RESET_PERSISTENCE_LAYER`. The container environment is reset, including discarding all employee-generated data.|
-|Turn on Microsoft Defender Application Guard in Managed Mode|Windows 10 Enterprise, 1809 or higher|Determines whether to turn on Application Guard for Microsoft Edge and Microsoft Office.|**Enabled.** Turns on Application Guard for Microsoft Edge and/or Microsoft Office, honoring the network isolation settings, rendering non-enterprise domains in the Application Guard container. Be aware that Application Guard won't actually be turned On unless the required prerequisites and network isolation settings are already set on the device. Available options:
- Enable Microsoft Defender Application Guard only for Microsoft Edge
- Enable Microsoft Defender Application Guard only for Microsoft Office
- Enable Microsoft Defender Application Guard for both Microsoft Edge and Microsoft Office
**Disabled.** Turns Off Application Guard, allowing all apps to run in Microsoft Edge and Microsoft Office.|
-|Allow files to download to host operating system|Windows 10 Enterprise, 1803 or higher|Determines whether to save downloaded files to the host operating system from the Microsoft Defender Application Guard container.|**Enabled.** Allows users to save downloaded files from the Microsoft Defender Application Guard container to the host operating system.
**Disabled or not configured.** Users are not able to saved downloaded files from Application Guard to the host operating system.|
+|Configure Microsoft Defender Application Guard clipboard settings|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether Application Guard can use the clipboard functionality.|**Enabled.** Turns On the clipboard functionality and lets you choose whether to additionally:
-Disable the clipboard functionality completely when Virtualization Security is enabled.
- Enable copying of certain content from Application Guard into Microsoft Edge.
- Enable copying of certain content from Microsoft Edge into Application Guard. **Important:** Allowing copied content to go from Microsoft Edge into Application Guard can cause potential security risks and isn't recommended.
**Disabled or not configured.** Completely turns Off the clipboard functionality for Application Guard.|
+|Configure Microsoft Defender Application Guard print settings|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether Application Guard can use the print functionality.|**Enabled.** Turns On the print functionality and lets you choose whether to additionally:
- Enable Application Guard to print into the XPS format.
- Enable Application Guard to print into the PDF format.
- Enable Application Guard to print to locally attached printers.
- Enable Application Guard to print from previously connected network printers. Employees can't search for additional printers.
**Disabled or not configured.** Completely turns Off the print functionality for Application Guard.|
+|Block enterprise websites to load non-enterprise content in IE and Edge|Windows 10 Enterprise, 1709 or higher|Determines whether to allow Internet access for apps not included on the **Allowed Apps** list.|**Enabled.** Prevents network traffic from both Internet Explorer and Microsoft Edge to non-enterprise sites that can't render in the Application Guard container.
**NOTE**: This action might also block assets cached by CDNs and references to analytics sites. Add them to the trusted enterprise resources to avoid broken pages.
**Disabled or not configured.** Prevents Microsoft Edge to render network traffic to non-enterprise sites that can't render in Application Guard. |
+|Allow Persistence|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether data persists across different sessions in Microsoft Defender Application Guard.|**Enabled.** Application Guard saves user-downloaded files and other items (such as, cookies, Favorites, and so on) for use in future Application Guard sessions.
**Disabled or not configured.** All user data within Application Guard is reset between sessions.
**NOTE**: If you later decide to stop supporting data persistence for your employees, you can use our Windows-provided utility to reset the container and to discard any personal data.
**To reset the container:**
1. Open a command-line program and navigate to `Windows/System32`.
2. Type `wdagtool.exe cleanup`. The container environment is reset, retaining only the employee-generated data.
3. Type `wdagtool.exe cleanup RESET_PERSISTENCE_LAYER`. The container environment is reset, including discarding all employee-generated data.|
+|Turn on Microsoft Defender Application Guard in Managed Mode|Windows 10 Enterprise, 1809 or higher|Determines whether to turn on Application Guard for Microsoft Edge and Microsoft Office.|**Enabled.** Turns on Application Guard for Microsoft Edge and/or Microsoft Office, honoring the network isolation settings, rendering non-enterprise domains in the Application Guard container. Be aware that Application Guard won't actually be turned on unless the required prerequisites and network isolation settings are already set on the device. Available options:
- Enable Microsoft Defender Application Guard only for Microsoft Edge
- Enable Microsoft Defender Application Guard only for Microsoft Office
- Enable Microsoft Defender Application Guard for both Microsoft Edge and Microsoft Office
**Disabled.** Turns off Application Guard, allowing all apps to run in Microsoft Edge and Microsoft Office.|
+|Allow files to download to host operating system|Windows 10 Enterprise, 1803 or higher|Determines whether to save downloaded files to the host operating system from the Microsoft Defender Application Guard container.|**Enabled.** Allows users to save downloaded files from the Microsoft Defender Application Guard container to the host operating system. This action creates a share between the host and container that also allows for uploads from the host to the Application Guard container.
**Disabled or not configured.** Users are not able to save downloaded files from Application Guard to the host operating system.|
|Allow hardware-accelerated rendering for Microsoft Defender Application Guard|Windows 10 Enterprise, 1803 or higher
Windows 10 Pro, 1803 or higher|Determines whether Microsoft Defender Application Guard renders graphics using hardware or software acceleration.|**Enabled.** Microsoft Defender Application Guard uses Hyper-V to access supported, high-security rendering graphics hardware (GPUs). These GPUs improve rendering performance and battery life while using Microsoft Defender Application Guard, particularly for video playback and other graphics-intensive use cases. If this setting is enabled without connecting any high-security rendering graphics hardware, Microsoft Defender Application Guard will automatically revert to software-based (CPU) rendering. **Important:** Be aware that enabling this setting with potentially compromised graphics devices or drivers might pose a risk to the host device.
**Disabled or not configured.** Microsoft Defender Application Guard uses software-based (CPU) rendering and won’t load any third-party graphics drivers or interact with any connected graphics hardware.|
-|Allow camera and microphone access in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher
Windows 10 Pro, 1809 or higher|Determines whether to allow camera and microphone access inside Microsoft Defender Application Guard.|**Enabled.** Applications inside Microsoft Defender Application Guard are able to access the camera and microphone on the user's device. **Important:** Be aware that enabling this policy with a potentially compromised container could bypass camera and microphone permissions and access the camera and microphone without the user's knowledge.
**Disabled or not configured.** Applications inside Microsoft Defender Application Guard are unable to access the camera and microphone on the user's device.|
-|Allow Microsoft Defender Application Guard to use Root Certificate Authorities from a user's device|Windows 10 Enterprise, 1809 or higher
Windows 10 Pro, 1809 or higher|Determines whether Root Certificates are shared with Microsoft Defender Application Guard.|**Enabled.** Certificates matching the specified thumbprint are transferred into the container. Use a comma to separate multiple certificates.
**Disabled or not configured.** Certificates are not shared with Microsoft Defender Application Guard.|
-|Allow users to trust files that open in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher|Determines whether users are able to manually trust untrusted files to open them on the host.|**Enabled.** Users are able to manually trust files or trust files after an antivirus check.
**Disabled or not configured.** Users are unable to manually trust files and files continue to open in Microsoft Defender Application Guard.|
\ No newline at end of file
+|Allow camera and microphone access in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher
Windows 10 Pro, 1809 or higher|Determines whether to allow camera and microphone access inside Microsoft Defender Application Guard.|**Enabled.** Applications inside Microsoft Defender Application Guard are able to access the camera and microphone on the user's device. **Important:** Be aware that enabling this policy with a potentially compromised container could bypass camera and microphone permissions and access the camera and microphone without the user's knowledge.
**Disabled or not configured.** Applications inside Microsoft Defender Application Guard are unable to access the camera and microphone on the user's device.|
+|Allow Microsoft Defender Application Guard to use Root Certificate Authorities from a user's device|Windows 10 Enterprise, 1809 or higher
Windows 10 Pro, 1809 or higher|Determines whether Root Certificates are shared with Microsoft Defender Application Guard.|**Enabled.** Certificates matching the specified thumbprint are transferred into the container. Use a comma to separate multiple certificates.
**Disabled or not configured.** Certificates are not shared with Microsoft Defender Application Guard.|
+|Allow users to trust files that open in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher|Determines whether users are able to manually trust untrusted files to open them on the host.|**Enabled.** Users are able to manually trust files or trust files after an antivirus check.
**Disabled or not configured.** Users are unable to manually trust files and files continue to open in Microsoft Defender Application Guard.|
+|Allow extensions in the container|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether Application Guard can use extensions.|**Enabled.** Favorites are able to sync from the host browser to the container. Note that this doesn’t work the other way around. The favorites sync to the user’s work profile by default.
**Disabled.** Users are not able to access their favorites from within the Application Guard container.|
+|Allow favorites sync|Windows 10 Enterprise, 1709 or higher
Windows 10 Pro, 1803 or higher|Determines whether favorites can be accessible from Application Guard container.|**Enabled.** Favorites are able to sync from the host browser to the container, but it doesn’t work the other way around. The favorites sync to the user’s work profile by default.
**Disabled.** Users are not able to access their favorites from within the Application Guard container.
diff --git a/windows/security/threat-protection/microsoft-defender-application-guard/faq-md-app-guard.md b/windows/security/threat-protection/microsoft-defender-application-guard/faq-md-app-guard.md
index 5d37b3aa5d..0e4406aaa5 100644
--- a/windows/security/threat-protection/microsoft-defender-application-guard/faq-md-app-guard.md
+++ b/windows/security/threat-protection/microsoft-defender-application-guard/faq-md-app-guard.md
@@ -8,55 +8,57 @@ ms.pagetype: security
ms.localizationpriority: medium
author: denisebmsft
ms.author: deniseb
-ms.date: 01/21/2021
-ms.reviewer:
+ms.date: 05/12/2021
+ms.reviewer:
manager: dansimp
ms.custom: asr
ms.technology: mde
---
-# Frequently asked questions - Microsoft Defender Application Guard
+# Frequently asked questions - Microsoft Defender Application Guard
**Applies to:** [Microsoft Defender for Endpoint](https://go.microsoft.com/fwlink/p/?linkid=2069559)
-Answering frequently asked questions about Microsoft Defender Application Guard (Application Guard) features, integration with the Windows operating system, and general configuration.
+This article lists frequently asked questions with answers for Microsoft Defender Application Guard (Application Guard). Questions span features, integration with the Windows operating system, and general configuration.
## Frequently Asked Questions
### Can I enable Application Guard on machines equipped with 4-GB RAM?
+
We recommend 8-GB RAM for optimal performance but you can use the following registry DWORD values to enable Application Guard on machines that aren't meeting the recommended hardware configuration.
-`HKLM\software\Microsoft\Hvsi\SpecRequiredProcessorCount` (Default is four cores.)
+`HKLM\software\Microsoft\Hvsi\SpecRequiredProcessorCount` (Default is four cores.)
`HKLM\software\Microsoft\Hvsi\SpecRequiredMemoryInGB` (Default is 8 GB.)
`HKLM\software\Microsoft\Hvsi\SpecRequiredFreeDiskSpaceInGB` (Default is 5 GB.)
-### Can employees download documents from the Application Guard Edge session onto host devices?
+### Can employees download documents from the Application Guard Edge session onto host devices?
-In Windows 10 Enterprise edition 1803, users are able to download documents from the isolated Application Guard container to the host PC. This capability is managed by policy.
+In Windows 10 Enterprise edition, version 1803, users are able to download documents from the isolated Application Guard container to the host PC. This capability is managed by policy.
-In Windows 10 Enterprise edition 1709 or Windows 10 Professional edition 1803, it is not possible to download files from the isolated Application Guard container to the host PC. However, employees can use the **Print as PDF** or **Print as XPS** options and save those files to the host device.
+In Windows 10 Enterprise edition, version 1709, or Windows 10 Professional edition, version 1803, it is not possible to download files from the isolated Application Guard container to the host computer. However, employees can use the **Print as PDF** or **Print as XPS** options and save those files to the host device.
-### Can employees copy and paste between the host device and the Application Guard Edge session?
+### Can employees copy and paste between the host device and the Application Guard Edge session?
-Depending on your organization's settings, employees can copy and paste images (.bmp) and text to and from the isolated container.
+Depending on your organization's settings, employees can copy and paste images (.bmp) and text to and from the isolated container.
-### Why don't employees see their Favorites in the Application Guard Edge session?
+### Why don't employees see their favorites in the Application Guard Edge session?
-To help keep the Application Guard Edge session secure and isolated from the host device, we don't copy the Favorites stored in the Application Guard Edge session back to the host device.
+Depending on your organization’s settings, it might be that Favorites Sync is turned off. To manage the policy, see: [Microsoft Edge and Microsoft Defender Application Guard | Microsoft Docs](/deployedge/microsoft-edge-security-windows-defender-application-guard)
-### Why aren’t employees able to see their Extensions in the Application Guard Edge session?
+### Why aren’t employees able to see their extensions in the Application Guard Edge session?
-Currently, the Application Guard Edge session doesn't support Extensions. However, we're closely monitoring your feedback about this.
+Make sure to enable the extensions policy on your Application Guard configuration.
-### How do I configure Microsoft Defender Application Guard to work with my network proxy (IP-Literal Addresses)?
+### How do I configure Microsoft Defender Application Guard to work with my network proxy (IP-Literal Addresses)?
-Microsoft Defender Application Guard requires proxies to have a symbolic name, not just an IP address. IP-Literal proxy settings such as `192.168.1.4:81` can be annotated as `itproxy:81` or using a record such as `P19216810010` for a proxy with an IP address of `192.168.100.10`. This applies to Windows 10 Enterprise edition 1709 or higher. These would be for the proxy policies under Network Isolation in Group Policy or Intune.
+Application Guard requires proxies to have a symbolic name, not just an IP address. IP-Literal proxy settings such as `192.168.1.4:81` can be annotated as `itproxy:81` or using a record such as `P19216810010` for a proxy with an IP address of `192.168.100.10`. This applies to Windows 10 Enterprise edition, version 1709 or higher. These would be for the proxy policies under Network Isolation in Group Policy or Intune.
-### Which Input Method Editors (IME) in 19H1 are not supported?
+### Which Input Method Editors (IME) in 19H1 are not supported?
+
+The following Input Method Editors (IME) introduced in Windows 10, version 1903 are currently not supported in Microsoft Defender Application Guard:
-The following Input Method Editors (IME) introduced in Windows 10, version 1903 are currently not supported in Microsoft Defender Application Guard.
- Vietnam Telex keyboard
- Vietnam number key-based keyboard
- Hindi phonetic keyboard
@@ -70,86 +72,107 @@ The following Input Method Editors (IME) introduced in Windows 10, version 1903
- Odia phonetic keyboard
- Punjabi phonetic keyboard
-### I enabled the hardware acceleration policy on my Windows 10 Enterprise, version 1803 deployment. Why are my users still only getting CPU rendering?
+### I enabled the hardware acceleration policy on my Windows 10 Enterprise, version 1803 deployment. Why are my users still only getting CPU rendering?
This feature is currently experimental only and is not functional without an additional registry key provided by Microsoft. If you would like to evaluate this feature on a deployment of Windows 10 Enterprise, version 1803, contact Microsoft and we’ll work with you to enable the feature.
-### What is the WDAGUtilityAccount local account?
+### What is the WDAGUtilityAccount local account?
-This account is part of Application Guard beginning with Windows 10, version 1709 (Fall Creators Update). This account remains disabled until Application Guard is enabled on your device. This item is integrated to the OS and is not considered as a threat/virus/malware.
+WDAGUtilityAccount is part of Application Guard, beginning with Windows 10, version 1709 (Fall Creators Update). It remains disabled by default, unless Application Guard is enabled on your device. WDAGUtilityAccount is used to sign in to the Application Guard container as a standard user with a random password. It is NOT a malicious account. If *Run as a service* permissions are revoked for this account, you might see the following error:
-### How do I trust a subdomain in my site list?
+**Error: 0x80070569, Ext error: 0x00000001; RDP: Error: 0x00000000, Ext error: 0x00000000 Location: 0x00000000**
-To trust a subdomain, you must precede your domain with two dots, for example: `..contoso.com` ensures that `mail.contoso.com` or `news.contoso.com` are trusted. The first dot represents the strings for the subdomain name (mail or news), the second dot recognizes the start of the domain name (`contoso.com`). This prevents sites such as `fakesitecontoso.com` from being trusted.
+We recommend that you do not modify this account.
-### Are there differences between using Application Guard on Windows Pro vs Windows Enterprise?
+### How do I trust a subdomain in my site list?
-When using Windows Pro or Windows Enterprise, you have access to using Application Guard in Standalone Mode. However, when using Enterprise you have access to Application Guard in Enterprise-Managed Mode. This mode has some extra features that the Standalone Mode does not. For more information, see [Prepare to install Microsoft Defender Application Guard](./install-md-app-guard.md).
+To trust a subdomain, you must precede your domain with two dots (..). For example: `..contoso.com` ensures that `mail.contoso.com` or `news.contoso.com` are trusted. The first dot represents the strings for the subdomain name (mail or news), and the second dot recognizes the start of the domain name (`contoso.com`). This prevents sites such as `fakesitecontoso.com` from being trusted.
+
+### Are there differences between using Application Guard on Windows Pro vs Windows Enterprise?
+
+When using Windows Pro or Windows Enterprise, you have access to using Application Guard in Standalone Mode. However, when using Enterprise you have access to Application Guard in Enterprise-Managed Mode. This mode has some extra features that the Standalone Mode does not. For more information, see [Prepare to install Microsoft Defender Application Guard](./install-md-app-guard.md).
### Is there a size limit to the domain lists that I need to configure?
-Yes, both the Enterprise Resource domains hosted in the cloud and the Domains categorized as both work and personal have a 16383-B limit.
+Yes, both the Enterprise Resource domains that are hosted in the cloud and the domains that are categorized as both work and personal have a 16383-B limit.
### Why does my encryption driver break Microsoft Defender Application Guard?
-Microsoft Defender Application Guard accesses files from a VHD mounted on the host that needs to be written during setup. If an encryption driver prevents a VHD from being mounted or from being written to, Application Guard does not work and results in an error message (`0x80070013 ERROR_WRITE_PROTECT`).
+Microsoft Defender Application Guard accesses files from a VHD mounted on the host that needs to be written during setup. If an encryption driver prevents a VHD from being mounted or from being written to, Application Guard does not work and results in an error message (**0x80070013 ERROR_WRITE_PROTECT**).
### Why do the Network Isolation policies in Group Policy and CSP look different?
There is not a one-to-one mapping among all the Network Isolation policies between CSP and GP. Mandatory network isolation policies to deploy Application Guard are different between CSP and GP.
-Mandatory network isolation GP policy to deploy Application Guard: "DomainSubnets or CloudResources"
-Mandatory network isolation CSP policy to deploy Application Guard: "EnterpriseCloudResources or (EnterpriseIpRange and EnterpriseNetworkDomainNames)"
-For EnterpriseNetworkDomainNames, there is no mapped CSP policy.
+- Mandatory network isolation GP policy to deploy Application Guard: **DomainSubnets or CloudResources**
-Microsoft Defender Application Guard accesses files from a VHD mounted on the host that needs to be written during setup. If an encryption driver prevents a VHD from being mounted or from being written to, Application Guard does not work and results in an error message (`0x80070013 ERROR_WRITE_PROTECT`).
+- Mandatory network isolation CSP policy to deploy Application Guard: **EnterpriseCloudResources or (EnterpriseIpRange and EnterpriseNetworkDomainNames)**
+
+- For EnterpriseNetworkDomainNames, there is no mapped CSP policy.
+
+Application Guard accesses files from a VHD mounted on the host that needs to be written during setup. If an encryption driver prevents a VHD from being mounted or from being written to, Application Guard does not work and results in an error message (**0x80070013 ERROR_WRITE_PROTECT**).
### Why did Application Guard stop working after I turned off hyperthreading?
-If hyperthreading is disabled (because of an update applied through a KB article or through BIOS settings), there is a possibility Application Guard no longer meets the minimum requirements.
+If hyperthreading is disabled (because of an update applied through a KB article or through BIOS settings), there is a possibility Application Guard no longer meets the minimum requirements.
### Why am I getting the error message "ERROR_VIRTUAL_DISK_LIMITATION"?
-Application Guard might not work correctly on NTFS compressed volumes. If this issue persists, try uncompressing the volume.
+Application Guard might not work correctly on NTFS compressed volumes. If this issue persists, try uncompressing the volume.
-### Why am I getting the error message "ERR_NAME_NOT_RESOLVED" after not being able to reach PAC file?
+### Why am I getting the error message "ERR_NAME_NOT_RESOLVED" after not being able to reach the PAC file?
+
+This is a known issue. To mitigate this you need to create two firewall rules. For information about creating a firewall rule by using Group Policy, see the following resources:
-This is a known issue. To mitigate this you need to create two firewall rules.
-For guidance on how to create a firewall rule by using group policy, see:
- [Create an inbound icmp rule](../windows-firewall/create-an-inbound-icmp-rule.md)
- [Open Group Policy management console for Microsoft Defender Firewall](../windows-firewall/open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md)
-First rule (DHCP Server):
+#### First rule (DHCP Server)
1. Program path: `%SystemRoot%\System32\svchost.exe`
+
2. Local Service: `Sid: S-1-5-80-2009329905-444645132-2728249442-922493431-93864177 (Internet Connection Service (SharedAccess))`
+
3. Protocol UDP
+
4. Port 67
-Second rule (DHCP Client)
-This is the same as the first rule, but scoped to local port 68.
-In the Microsoft Defender Firewall user interface go through the following steps:
-1. Right click on inbound rules, create a new rule.
+#### Second rule (DHCP Client)
+This is the same as the first rule, but scoped to local port 68. In the Microsoft Defender Firewall user interface go through the following steps:
+
+1. Right-click on inbound rules, and then create a new rule.
+
2. Choose **custom rule**.
-3. Program path: `%SystemRoot%\System32\svchost.exe`.
-4. Protocol Type: UDP, Specific ports: 67, Remote port: any.
-5. Any IP addresses.
+
+3. Specify the following program path: `%SystemRoot%\System32\svchost.exe`.
+
+4. Specify the following settings:
+ - Protocol Type: UDP
+ - Specific ports: 67
+ - Remote port: any
+
+5. Specify any IP addresses.
+
6. Allow the connection.
-7. All profiles.
+
+7. Specify to use all profiles.
+
8. The new rule should show up in the user interface. Right click on the **rule** > **properties**.
-9. In the **Programs and services** tab, Under the **Services** section click on **settings**. Choose **Apply to this Service** and select **Internet Connection Sharing (ICS) Shared Access**.
+
+9. In the **Programs and services** tab, under the **Services** section, select **settings**.
+
+10. Choose **Apply to this Service** and select **Internet Connection Sharing (ICS) Shared Access**.
### Why can I not launch Application Guard when Exploit Guard is enabled?
There is a known issue such that if you change the Exploit Protection settings for CFG and possibly others, hvsimgr cannot launch. To mitigate this issue, go to **Windows Security** > **App and Browser control** > **Exploit Protection Setting**, and then switch CFG to **use default**.
-
-### How can I have ICS in enabled state yet still use Application Guard?
+### How can I disable portions of ICS without breaking Application Guard?
ICS is enabled by default in Windows, and ICS must be enabled in order for Application Guard to function correctly. We do not recommend disabling ICS; however, you can disable ICS in part by using a Group Policy and editing registry keys.
-1. In the Group Policy setting, **Prohibit use of Internet Connection Sharing on your DNS domain network**, set it to **Disabled**.
+1. In the Group Policy setting, **Prohibit use of Internet Connection Sharing on your DNS domain network**, set it to **Disabled**.
-2. Disable IpNat.sys from ICS load as follows:
+2. Disable IpNat.sys from ICS load as follows:
`System\CurrentControlSet\Services\SharedAccess\Parameters\DisableIpNat = 1`
3. Configure ICS (SharedAccess) to enabled as follows:
@@ -161,27 +184,27 @@ ICS is enabled by default in Windows, and ICS must be enabled in order for Appli
5. Reboot the device.
### Why doesn't the container fully load when device control policies are enabled?
-Allow-listed items must be configured as "allowed" in the Group Policy Object ensure AppGuard works properly.
-Policy: Allow installation of devices that match any of these device IDs
-- `SCSI\DiskMsft____Virtual_Disk____`
-- `{8e7bd593-6e6c-4c52-86a6-77175494dd8e}\msvhdhba`
-- `VMS_VSF`
-- `root\Vpcivsp`
-- `root\VMBus`
-- `vms_mp`
-- `VMS_VSP`
+Allow-listed items must be configured as "allowed" in the Group Policy Object to ensure AppGuard works properly.
+
+Policy: Allow installation of devices that match any of the following device IDs:
+
+- `SCSI\DiskMsft____Virtual_Disk____`
+- `{8e7bd593-6e6c-4c52-86a6-77175494dd8e}\msvhdhba`
+- `VMS_VSF`
+- `root\Vpcivsp`
+- `root\VMBus`
+- `vms_mp`
+- `VMS_VSP`
- `ROOT\VKRNLINTVSP`
-- `ROOT\VID`
-- `root\storvsp`
-- `vms_vsmp`
-- `VMS_PP`
+- `ROOT\VID`
+- `root\storvsp`
+- `vms_vsmp`
+- `VMS_PP`
-Policy: Allow installation of devices using drivers that match these device setup classes
+Policy: Allow installation of devices using drivers that match these device setup classes
- `{71a27cdd-812a-11d0-bec7-08002be2092f}`
-
-
## See also
-[Configure Microsoft Defender Application Guard policy settings](./configure-md-app-guard.md)
\ No newline at end of file
+[Configure Microsoft Defender Application Guard policy settings](./configure-md-app-guard.md)
diff --git a/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md b/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md
index d83d1fadef..8c5b01b506 100644
--- a/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md
+++ b/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md
@@ -106,7 +106,7 @@ Microsoft Defender Antivirus in Windows 10 uses a multi-pronged approach to impr
For more information, see [Windows Defender in Windows 10](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-in-windows-10) and [Windows Defender Overview for Windows Server](/windows-server/security/windows-defender/windows-defender-overview-windows-server).
-For information about Microsoft Defender for Endpoint, a service that helps enterprises to detect, investigate, and respond to advanced and targeted attacks on their networks, see [Microsoft Defender for Endpoint](https://www.microsoft.com/microsoft-365/windows/microsoft-defender-atp) (resources) and [Microsoft Defender for Endpoint](/windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-advanced-threat-protection) (documentation).
+For information about Microsoft Defender for Endpoint, a service that helps enterprises to detect, investigate, and respond to advanced and targeted attacks on their networks, see [Microsoft Defender for Endpoint](https://www.microsoft.com/microsoft-365/windows/microsoft-defender-atp) (resources) and [Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint) (documentation).
### Data Execution Prevention
@@ -451,7 +451,7 @@ Microsoft Consulting Services (MCS) and Microsoft Support/Premier Field Engineer
- [Security and Assurance in Windows Server 2016](/windows-server/security/security-and-assurance)
- [Microsoft Defender for Endpoint - resources](https://www.microsoft.com/microsoft-365/windows/microsoft-defender-atp)
-- [Microsoft Microsoft Defender for Endpoint - documentation](/windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-advanced-threat-protection)
+- [Microsoft Microsoft Defender for Endpoint - documentation](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint)
- [Exchange Online Advanced Threat Protection Service Description](/office365/servicedescriptions/office-365-advanced-threat-protection-service-description)
- [Microsoft Defender for Office 365](https://products.office.com/en-us/exchange/online-email-threat-protection)
-- [Microsoft Malware Protection Center](https://www.microsoft.com/security/portal/mmpc/default.aspx)
\ No newline at end of file
+- [Microsoft Malware Protection Center](https://www.microsoft.com/security/portal/mmpc/default.aspx)
diff --git a/windows/security/threat-protection/windows-defender-application-control/TOC.md b/windows/security/threat-protection/windows-defender-application-control/TOC.md
deleted file mode 100644
index 81a97e652b..0000000000
--- a/windows/security/threat-protection/windows-defender-application-control/TOC.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# [Application Control for Windows](windows-defender-application-control.md)
-## [WDAC and AppLocker Overview](wdac-and-applocker-overview.md)
-### [WDAC and AppLocker Feature Availability](feature-availability.md)
-### [Virtualization-based code integrity](../device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md)
-
-
-## [WDAC design guide](windows-defender-application-control-design-guide.md)
-### [Plan for WDAC policy lifecycle management](plan-windows-defender-application-control-management.md)
-### Design your initial WDAC policy
-#### [Understand WDAC policy design decisions](understand-windows-defender-application-control-policy-design-decisions.md)
-#### [Understand WDAC policy rules and file rules](select-types-of-rules-to-create.md)
-#### [Authorize apps deployed with a WDAC managed installer](use-windows-defender-application-control-with-managed-installer.md)
-##### [Configure a WDAC managed installer](configure-wdac-managed-installer.md)
-#### [Authorize reputable apps with Intelligent Security Graph (ISG)](use-windows-defender-application-control-with-intelligent-security-graph.md)
-#### [Use multiple WDAC policies](deploy-multiple-windows-defender-application-control-policies.md)
-#### [Microsoft recommended block rules](microsoft-recommended-block-rules.md)
-#### [Microsoft recommended driver block rules](microsoft-recommended-driver-block-rules.md)
-### Create your initial WDAC policy
-#### [Example WDAC base policies](example-wdac-base-policies.md)
-#### [Policy creation for common WDAC usage scenarios](types-of-devices.md)
-##### [Create a WDAC policy for lightly-managed devices](create-wdac-policy-for-lightly-managed-devices.md)
-##### [Create a WDAC policy for fully-managed devices](create-wdac-policy-for-fully-managed-devices.md)
-##### [Create a WDAC policy for fixed-workload devices](create-initial-default-policy.md)
-##### [Microsoft recommended block rules](microsoft-recommended-block-rules.md)
-#### [Using the WDAC Wizard tool](wdac-wizard.md)
-##### [Create a base WDAC policy with the Wizard](wdac-wizard-create-base-policy.md)
-##### [Create a supplemental WDAC policy with the Wizard](wdac-wizard-create-supplemental-policy.md)
-##### [Editing a WDAC policy with the Wizard](wdac-wizard-editing-policy.md)
-##### [Merging multiple WDAC policies with the Wizard](wdac-wizard-merging-policies.md)
-
-
-## [Windows Defender Application Control deployment guide](windows-defender-application-control-deployment-guide.md)
-### [Audit WDAC policies](audit-windows-defender-application-control-policies.md)
-### [Merge WDAC policies](merge-windows-defender-application-control-policies.md)
-### [Enforce WDAC policies](enforce-windows-defender-application-control-policies.md)
-### [Deploy WDAC policies using Group Policy](deploy-windows-defender-application-control-policies-using-group-policy.md)
-### [Deploy WDAC policies using Intune](deploy-windows-defender-application-control-policies-using-intune.md)
-### [Allow COM object registration](allow-com-object-registration-in-windows-defender-application-control-policy.md)
-### [Use WDAC with .NET hardening](use-windows-defender-application-control-with-dynamic-code-security.md)
-### [Manage packaged apps with WDAC](manage-packaged-apps-with-windows-defender-application-control.md)
-### [Use a Windows Defender Application Control policy to control specific plug-ins, add-ins, and modules](use-windows-defender-application-control-policy-to-control-specific-plug-ins-add-ins-and-modules.md)
-### [Use code signing to simplify application control for classic Windows applications](use-code-signing-to-simplify-application-control-for-classic-windows-applications.md)
-#### [Optional: Use the WDAC Signing Portal in the Microsoft Store for Business](use-device-guard-signing-portal-in-microsoft-store-for-business.md)
-#### [Optional: Create a code signing cert for WDAC](create-code-signing-cert-for-windows-defender-application-control.md)
-#### [Deploy catalog files to support WDAC](deploy-catalog-files-to-support-windows-defender-application-control.md)
-### [Use signed policies to protect Windows Defender Application Control against tampering](use-signed-policies-to-protect-windows-defender-application-control-against-tampering.md)
-### [Disable WDAC policies](disable-windows-defender-application-control-policies.md)
-### [LOB Win32 Apps on S Mode](LOB-win32-apps-on-s.md)
-
-
-## [Windows Defender Application Control operational guide](windows-defender-application-control-operational-guide.md)
-### [Understanding Application Control event IDs](event-id-explanations.md)
-### [Understanding Application Control event tags](event-tag-explanations.md)
-### [Query WDAC events with Advanced hunting](querying-application-control-events-centrally-using-advanced-hunting.md)
-
-## [AppLocker](applocker\applocker-overview.md)
-### [Administer AppLocker](applocker\administer-applocker.md)
-#### [Maintain AppLocker policies](applocker\maintain-applocker-policies.md)
-#### [Edit an AppLocker policy](applocker\edit-an-applocker-policy.md)
-#### [Test and update an AppLocker policy](applocker\test-and-update-an-applocker-policy.md)
-#### [Deploy AppLocker policies by using the enforce rules setting](applocker\deploy-applocker-policies-by-using-the-enforce-rules-setting.md)
-#### [Use the AppLocker Windows PowerShell cmdlets](applocker\use-the-applocker-windows-powershell-cmdlets.md)
-#### [Use AppLocker and Software Restriction Policies in the same domain](applocker\use-applocker-and-software-restriction-policies-in-the-same-domain.md)
-#### [Optimize AppLocker performance](applocker\optimize-applocker-performance.md)
-#### [Monitor app usage with AppLocker](applocker\monitor-application-usage-with-applocker.md)
-#### [Manage packaged apps with AppLocker](applocker\manage-packaged-apps-with-applocker.md)
-#### [Working with AppLocker rules](applocker\working-with-applocker-rules.md)
-##### [Create a rule that uses a file hash condition](applocker\create-a-rule-that-uses-a-file-hash-condition.md)
-##### [Create a rule that uses a path condition](applocker\create-a-rule-that-uses-a-path-condition.md)
-##### [Create a rule that uses a publisher condition](applocker\create-a-rule-that-uses-a-publisher-condition.md)
-##### [Create AppLocker default rules](applocker\create-applocker-default-rules.md)
-##### [Add exceptions for an AppLocker rule](applocker\configure-exceptions-for-an-applocker-rule.md)
-##### [Create a rule for packaged apps](applocker\create-a-rule-for-packaged-apps.md)
-##### [Delete an AppLocker rule](applocker\delete-an-applocker-rule.md)
-##### [Edit AppLocker rules](applocker\edit-applocker-rules.md)
-##### [Enable the DLL rule collection](applocker\enable-the-dll-rule-collection.md)
-##### [Enforce AppLocker rules](applocker\enforce-applocker-rules.md)
-##### [Run the Automatically Generate Rules wizard](applocker\run-the-automatically-generate-rules-wizard.md)
-#### [Working with AppLocker policies](applocker\working-with-applocker-policies.md)
-##### [Configure the Application Identity service](applocker\configure-the-application-identity-service.md)
-##### [Configure an AppLocker policy for audit only](applocker\configure-an-applocker-policy-for-audit-only.md)
-##### [Configure an AppLocker policy for enforce rules](applocker\configure-an-applocker-policy-for-enforce-rules.md)
-##### [Display a custom URL message when users try to run a blocked app](applocker\display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md)
-##### [Export an AppLocker policy from a GPO](applocker\export-an-applocker-policy-from-a-gpo.md)
-##### [Export an AppLocker policy to an XML file](applocker\export-an-applocker-policy-to-an-xml-file.md)
-##### [Import an AppLocker policy from another computer](applocker\import-an-applocker-policy-from-another-computer.md)
-##### [Import an AppLocker policy into a GPO](applocker\import-an-applocker-policy-into-a-gpo.md)
-##### [Add rules for packaged apps to existing AppLocker rule-set](applocker\add-rules-for-packaged-apps-to-existing-applocker-rule-set.md)
-##### [Merge AppLocker policies by using Set-ApplockerPolicy](applocker\merge-applocker-policies-by-using-set-applockerpolicy.md)
-##### [Merge AppLocker policies manually](applocker\merge-applocker-policies-manually.md)
-##### [Refresh an AppLocker policy](applocker\refresh-an-applocker-policy.md)
-##### [Test an AppLocker policy by using Test-AppLockerPolicy](applocker\test-an-applocker-policy-by-using-test-applockerpolicy.md)
-### [AppLocker design guide](applocker\applocker-policies-design-guide.md)
-#### [Understand AppLocker policy design decisions](applocker\understand-applocker-policy-design-decisions.md)
-#### [Determine your application control objectives](applocker\determine-your-application-control-objectives.md)
-#### [Create a list of apps deployed to each business group](applocker\create-list-of-applications-deployed-to-each-business-group.md)
-##### [Document your app list](applocker\document-your-application-list.md)
-#### [Select the types of rules to create](applocker\select-types-of-rules-to-create.md)
-##### [Document your AppLocker rules](applocker\document-your-applocker-rules.md)
-#### [Determine the Group Policy structure and rule enforcement](applocker\determine-group-policy-structure-and-rule-enforcement.md)
-##### [Understand AppLocker enforcement settings](applocker\understand-applocker-enforcement-settings.md)
-##### [Understand AppLocker rules and enforcement setting inheritance in Group Policy](applocker\understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md)
-##### [Document the Group Policy structure and AppLocker rule enforcement](applocker\document-group-policy-structure-and-applocker-rule-enforcement.md)
-#### [Plan for AppLocker policy management](applocker\plan-for-applocker-policy-management.md)
-### [AppLocker deployment guide](applocker\applocker-policies-deployment-guide.md)
-#### [Understand the AppLocker policy deployment process](applocker\understand-the-applocker-policy-deployment-process.md)
-#### [Requirements for Deploying AppLocker Policies](applocker\requirements-for-deploying-applocker-policies.md)
-#### [Use Software Restriction Policies and AppLocker policies](applocker\using-software-restriction-policies-and-applocker-policies.md)
-#### [Create Your AppLocker policies](applocker\create-your-applocker-policies.md)
-##### [Create Your AppLocker rules](applocker\create-your-applocker-rules.md)
-#### [Deploy the AppLocker policy into production](applocker\deploy-the-applocker-policy-into-production.md)
-##### [Use a reference device to create and maintain AppLocker policies](applocker\use-a-reference-computer-to-create-and-maintain-applocker-policies.md)
-###### [Determine which apps are digitally signed on a reference device](applocker\determine-which-applications-are-digitally-signed-on-a-reference-computer.md)
-###### [Configure the AppLocker reference device](applocker\configure-the-appLocker-reference-device.md)
-### [AppLocker technical reference](applocker\applocker-technical-reference.md)
-#### [What Is AppLocker?](applocker\what-is-applocker.md)
-#### [Requirements to use AppLocker](applocker\requirements-to-use-applocker.md)
-#### [AppLocker policy use scenarios](applocker\applocker-policy-use-scenarios.md)
-#### [How AppLocker works](applocker\how-applocker-works-techref.md)
-##### [Understanding AppLocker rule behavior](applocker\understanding-applocker-rule-behavior.md)
-##### [Understanding AppLocker rule exceptions](applocker\understanding-applocker-rule-exceptions.md)
-##### [Understanding AppLocker rule collections](applocker\understanding-applocker-rule-collections.md)
-##### [Understanding AppLocker allow and deny actions on rules](applocker\understanding-applocker-allow-and-deny-actions-on-rules.md)
-##### [Understanding AppLocker rule condition types](applocker\understanding-applocker-rule-condition-types.md)
-###### [Understanding the publisher rule condition in AppLocker](applocker\understanding-the-publisher-rule-condition-in-applocker.md)
-###### [Understanding the path rule condition in AppLocker](applocker\understanding-the-path-rule-condition-in-applocker.md)
-###### [Understanding the file hash rule condition in AppLocker](applocker\understanding-the-file-hash-rule-condition-in-applocker.md)
-##### [Understanding AppLocker default rules](applocker\understanding-applocker-default-rules.md)
-###### [Executable rules in AppLocker](applocker\executable-rules-in-applocker.md)
-###### [Windows Installer rules in AppLocker](applocker\windows-installer-rules-in-applocker.md)
-###### [Script rules in AppLocker](applocker\script-rules-in-applocker.md)
-###### [DLL rules in AppLocker](applocker\dll-rules-in-applocker.md)
-###### [Packaged apps and packaged app installer rules in AppLocker](applocker\packaged-apps-and-packaged-app-installer-rules-in-applocker.md)
-#### [AppLocker architecture and components](applocker\applocker-architecture-and-components.md)
-#### [AppLocker processes and interactions](applocker\applocker-processes-and-interactions.md)
-#### [AppLocker functions](applocker\applocker-functions.md)
-#### [Security considerations for AppLocker](applocker\security-considerations-for-applocker.md)
-#### [Tools to Use with AppLocker](applocker\tools-to-use-with-applocker.md)
-##### [Using Event Viewer with AppLocker](applocker\using-event-viewer-with-applocker.md)
-#### [AppLocker Settings](applocker\applocker-settings.md)
-
-
diff --git a/windows/security/threat-protection/windows-defender-application-control/TOC.yml b/windows/security/threat-protection/windows-defender-application-control/TOC.yml
new file mode 100644
index 0000000000..eaf0d1aa66
--- /dev/null
+++ b/windows/security/threat-protection/windows-defender-application-control/TOC.yml
@@ -0,0 +1,296 @@
+- name: Application Control for Windows
+ href: windows-defender-application-control.md
+ items:
+ - name: WDAC and AppLocker Overview
+ href: wdac-and-applocker-overview.md
+ items:
+ - name: WDAC and AppLocker Feature Availability
+ href: feature-availability.md
+ - name: Virtualization-based protection of code integrity
+ href: ../device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md
+ - name: WDAC design guide
+ href: windows-defender-application-control-design-guide.md
+ items:
+ - name: Plan for WDAC policy lifecycle management
+ href: plan-windows-defender-application-control-management.md
+ - name: Design your WDAC policy
+ items:
+ - name: Understand WDAC policy design decisions
+ href: understand-windows-defender-application-control-policy-design-decisions.md
+ - name: Understand WDAC policy rules and file rules
+ href: select-types-of-rules-to-create.md
+ items:
+ - name: Allow apps installed by a managed installer
+ href: use-windows-defender-application-control-with-managed-installer.md
+ - name: Configure managed installer rules
+ href: configure-wdac-managed-installer.md
+ - name: Allow reputable apps with Intelligent Security Graph (ISG)
+ href: use-windows-defender-application-control-with-intelligent-security-graph.md
+ - name: Allow COM object registration
+ href: allow-com-object-registration-in-windows-defender-application-control-policy.md
+ - name: Use WDAC with .NET hardening
+ href: use-windows-defender-application-control-with-dynamic-code-security.md
+ - name: Manage packaged apps with WDAC
+ href: manage-packaged-apps-with-windows-defender-application-control.md
+ - name: Use WDAC to control specific plug-ins, add-ins, and modules
+ href: use-windows-defender-application-control-policy-to-control-specific-plug-ins-add-ins-and-modules.md
+ - name: Use multiple WDAC policies
+ href: deploy-multiple-windows-defender-application-control-policies.md
+ - name: Create your WDAC policy
+ items:
+ - name: Example WDAC base policies
+ href: example-wdac-base-policies.md
+ - name: Policy creation for common WDAC usage scenarios
+ href: types-of-devices.md
+ items:
+ - name: Create a WDAC policy for lightly-managed devices
+ href: create-wdac-policy-for-lightly-managed-devices.md
+ - name: Create a WDAC policy for fully-managed devices
+ href: create-wdac-policy-for-fully-managed-devices.md
+ - name: Create a WDAC policy for fixed-workload devices
+ href: create-initial-default-policy.md
+ - name: Microsoft recommended block rules
+ href: microsoft-recommended-block-rules.md
+ - name: Microsoft recommended driver block rules
+ href: microsoft-recommended-driver-block-rules.md
+ - name: Use the WDAC Wizard tool
+ href: wdac-wizard.md
+ items:
+ - name: Create a base WDAC policy with the Wizard
+ href: wdac-wizard-create-base-policy.md
+ - name: Create a supplemental WDAC policy with the Wizard
+ href: wdac-wizard-create-supplemental-policy.md
+ - name: Editing a WDAC policy with the Wizard
+ href: wdac-wizard-editing-policy.md
+ - name: Merging multiple WDAC policies with the Wizard
+ href: wdac-wizard-merging-policies.md
+ - name: WDAC deployment guide
+ href: windows-defender-application-control-deployment-guide.md
+ items:
+ - name: Deploy WDAC policies with MDM
+ href: deploy-windows-defender-application-control-policies-using-intune.md
+ - name: Deploy WDAC policies with MEMCM
+ href: deployment/deploy-wdac-policies-with-memcm.md
+ - name: Deploy WDAC policies with script
+ href: deployment/deploy-wdac-policies-with-script.md
+ - name: Deploy WDAC policies with Group Policy
+ href: deploy-windows-defender-application-control-policies-using-group-policy.md
+ - name: Audit WDAC policies
+ href: audit-windows-defender-application-control-policies.md
+ - name: Merge WDAC policies
+ href: merge-windows-defender-application-control-policies.md
+ - name: Enforce WDAC policies
+ href: enforce-windows-defender-application-control-policies.md
+ - name: Use code signing to simplify application control for classic Windows applications
+ href: use-code-signing-to-simplify-application-control-for-classic-windows-applications.md
+ items:
+ - name: "Optional: Use the WDAC Signing Portal in the Microsoft Store for Business"
+ href: use-device-guard-signing-portal-in-microsoft-store-for-business.md
+ - name: "Optional: Create a code signing cert for WDAC"
+ href: create-code-signing-cert-for-windows-defender-application-control.md
+ - name: Deploy catalog files to support WDAC
+ href: deploy-catalog-files-to-support-windows-defender-application-control.md
+ - name: Use signed policies to protect Windows Defender Application Control against tampering
+ href: use-signed-policies-to-protect-windows-defender-application-control-against-tampering.md
+ - name: Disable WDAC policies
+ href: disable-windows-defender-application-control-policies.md
+ - name: LOB Win32 Apps on S Mode
+ href: LOB-win32-apps-on-s.md
+ - name: Windows Defender Application Control operational guide
+ href: windows-defender-application-control-operational-guide.md
+ items:
+ - name: Understanding Application Control event IDs
+ href: event-id-explanations.md
+ - name: Understanding Application Control event tags
+ href: event-tag-explanations.md
+ - name: Query WDAC events with Advanced hunting
+ href: querying-application-control-events-centrally-using-advanced-hunting.md
+ - name: Known Issues
+ href: operations/known-issues.md
+ - name: AppLocker
+ href: applocker\applocker-overview.md
+ items:
+ - name: Administer AppLocker
+ href: applocker\administer-applocker.md
+ items:
+ - name: Maintain AppLocker policies
+ href: applocker\maintain-applocker-policies.md
+ - name: Edit an AppLocker policy
+ href: applocker\edit-an-applocker-policy.md
+ - name: Test and update an AppLocker policy
+ href: applocker\test-and-update-an-applocker-policy.md
+ - name: Deploy AppLocker policies by using the enforce rules setting
+ href: applocker\deploy-applocker-policies-by-using-the-enforce-rules-setting.md
+ - name: Use the AppLocker Windows PowerShell cmdlets
+ href: applocker\use-the-applocker-windows-powershell-cmdlets.md
+ - name: Use AppLocker and Software Restriction Policies in the same domain
+ href: applocker\use-applocker-and-software-restriction-policies-in-the-same-domain.md
+ - name: Optimize AppLocker performance
+ href: applocker\optimize-applocker-performance.md
+ - name: Monitor app usage with AppLocker
+ href: applocker\monitor-application-usage-with-applocker.md
+ - name: Manage packaged apps with AppLocker
+ href: applocker\manage-packaged-apps-with-applocker.md
+ - name: Working with AppLocker rules
+ href: applocker\working-with-applocker-rules.md
+ items:
+ - name: Create a rule that uses a file hash condition
+ href: applocker\create-a-rule-that-uses-a-file-hash-condition.md
+ - name: Create a rule that uses a path condition
+ href: applocker\create-a-rule-that-uses-a-path-condition.md
+ - name: Create a rule that uses a publisher condition
+ href: applocker\create-a-rule-that-uses-a-publisher-condition.md
+ - name: Create AppLocker default rules
+ href: applocker\create-applocker-default-rules.md
+ - name: Add exceptions for an AppLocker rule
+ href: applocker\configure-exceptions-for-an-applocker-rule.md
+ - name: Create a rule for packaged apps
+ href: applocker\create-a-rule-for-packaged-apps.md
+ - name: Delete an AppLocker rule
+ href: applocker\delete-an-applocker-rule.md
+ - name: Edit AppLocker rules
+ href: applocker\edit-applocker-rules.md
+ - name: Enable the DLL rule collection
+ href: applocker\enable-the-dll-rule-collection.md
+ - name: Enforce AppLocker rules
+ href: applocker\enforce-applocker-rules.md
+ - name: Run the Automatically Generate Rules wizard
+ href: applocker\run-the-automatically-generate-rules-wizard.md
+ - name: Working with AppLocker policies
+ href: applocker\working-with-applocker-policies.md
+ items:
+ - name: Configure the Application Identity service
+ href: applocker\configure-the-application-identity-service.md
+ - name: Configure an AppLocker policy for audit only
+ href: applocker\configure-an-applocker-policy-for-audit-only.md
+ - name: Configure an AppLocker policy for enforce rules
+ href: applocker\configure-an-applocker-policy-for-enforce-rules.md
+ - name: Display a custom URL message when users try to run a blocked app
+ href: applocker\display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md
+ - name: Export an AppLocker policy from a GPO
+ href: applocker\export-an-applocker-policy-from-a-gpo.md
+ - name: Export an AppLocker policy to an XML file
+ href: applocker\export-an-applocker-policy-to-an-xml-file.md
+ - name: Import an AppLocker policy from another computer
+ href: applocker\import-an-applocker-policy-from-another-computer.md
+ - name: Import an AppLocker policy into a GPO
+ href: applocker\import-an-applocker-policy-into-a-gpo.md
+ - name: Add rules for packaged apps to existing AppLocker rule-set
+ href: applocker\add-rules-for-packaged-apps-to-existing-applocker-rule-set.md
+ - name: Merge AppLocker policies by using Set-ApplockerPolicy
+ href: applocker\merge-applocker-policies-by-using-set-applockerpolicy.md
+ - name: Merge AppLocker policies manually
+ href: applocker\merge-applocker-policies-manually.md
+ - name: Refresh an AppLocker policy
+ href: applocker\refresh-an-applocker-policy.md
+ - name: Test an AppLocker policy by using Test-AppLockerPolicy
+ href: applocker\test-an-applocker-policy-by-using-test-applockerpolicy.md
+ - name: AppLocker design guide
+ href: applocker\applocker-policies-design-guide.md
+ items:
+ - name: Understand AppLocker policy design decisions
+ href: applocker\understand-applocker-policy-design-decisions.md
+ - name: Determine your application control objectives
+ href: applocker\determine-your-application-control-objectives.md
+ - name: Create a list of apps deployed to each business group
+ href: applocker\create-list-of-applications-deployed-to-each-business-group.md
+ items:
+ - name: Document your app list
+ href: applocker\document-your-application-list.md
+ - name: Select the types of rules to create
+ href: applocker\select-types-of-rules-to-create.md
+ items:
+ - name: Document your AppLocker rules
+ href: applocker\document-your-applocker-rules.md
+ - name: Determine the Group Policy structure and rule enforcement
+ href: applocker\determine-group-policy-structure-and-rule-enforcement.md
+ items:
+ - name: Understand AppLocker enforcement settings
+ href: applocker\understand-applocker-enforcement-settings.md
+ - name: Understand AppLocker rules and enforcement setting inheritance in Group Policy
+ href: applocker\understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md
+ - name: Document the Group Policy structure and AppLocker rule enforcement
+ href: applocker\document-group-policy-structure-and-applocker-rule-enforcement.md
+ - name: Plan for AppLocker policy management
+ href: applocker\plan-for-applocker-policy-management.md
+ - name: AppLocker deployment guide
+ href: applocker\applocker-policies-deployment-guide.md
+ items:
+ - name: Understand the AppLocker policy deployment process
+ href: applocker\understand-the-applocker-policy-deployment-process.md
+ - name: Requirements for Deploying AppLocker Policies
+ href: applocker\requirements-for-deploying-applocker-policies.md
+ - name: Use Software Restriction Policies and AppLocker policies
+ href: applocker\using-software-restriction-policies-and-applocker-policies.md
+ - name: Create Your AppLocker policies
+ href: applocker\create-your-applocker-policies.md
+ items:
+ - name: Create Your AppLocker rules
+ href: applocker\create-your-applocker-rules.md
+ - name: Deploy the AppLocker policy into production
+ href: applocker\deploy-the-applocker-policy-into-production.md
+ items:
+ - name: Use a reference device to create and maintain AppLocker policies
+ href: applocker\use-a-reference-computer-to-create-and-maintain-applocker-policies.md
+ items:
+ - name: Determine which apps are digitally signed on a reference device
+ href: applocker\determine-which-applications-are-digitally-signed-on-a-reference-computer.md
+ - name: Configure the AppLocker reference device
+ href: applocker\configure-the-appLocker-reference-device.md
+ - name: AppLocker technical reference
+ href: applocker\applocker-technical-reference.md
+ items:
+ - name: What Is AppLocker?
+ href: applocker\what-is-applocker.md
+ - name: Requirements to use AppLocker
+ href: applocker\requirements-to-use-applocker.md
+ - name: AppLocker policy use scenarios
+ href: applocker\applocker-policy-use-scenarios.md
+ - name: How AppLocker works
+ href: applocker\how-applocker-works-techref.md
+ items:
+ - name: Understanding AppLocker rule behavior
+ href: applocker\understanding-applocker-rule-behavior.md
+ - name: Understanding AppLocker rule exceptions
+ href: applocker\understanding-applocker-rule-exceptions.md
+ - name: Understanding AppLocker rule collections
+ href: applocker\understanding-applocker-rule-collections.md
+ - name: Understanding AppLocker allow and deny actions on rules
+ href: applocker\understanding-applocker-allow-and-deny-actions-on-rules.md
+ - name: Understanding AppLocker rule condition types
+ href: applocker\understanding-applocker-rule-condition-types.md
+ items:
+ - name: Understanding the publisher rule condition in AppLocker
+ href: applocker\understanding-the-publisher-rule-condition-in-applocker.md
+ - name: Understanding the path rule condition in AppLocker
+ href: applocker\understanding-the-path-rule-condition-in-applocker.md
+ - name: Understanding the file hash rule condition in AppLocker
+ href: applocker\understanding-the-file-hash-rule-condition-in-applocker.md
+ - name: Understanding AppLocker default rules
+ href: applocker\understanding-applocker-default-rules.md
+ items:
+ - name: Executable rules in AppLocker
+ href: applocker\executable-rules-in-applocker.md
+ - name: Windows Installer rules in AppLocker
+ href: applocker\windows-installer-rules-in-applocker.md
+ - name: Script rules in AppLocker
+ href: applocker\script-rules-in-applocker.md
+ - name: DLL rules in AppLocker
+ href: applocker\dll-rules-in-applocker.md
+ - name: Packaged apps and packaged app installer rules in AppLocker
+ href: applocker\packaged-apps-and-packaged-app-installer-rules-in-applocker.md
+ - name: AppLocker architecture and components
+ href: applocker\applocker-architecture-and-components.md
+ - name: AppLocker processes and interactions
+ href: applocker\applocker-processes-and-interactions.md
+ - name: AppLocker functions
+ href: applocker\applocker-functions.md
+ - name: Security considerations for AppLocker
+ href: applocker\security-considerations-for-applocker.md
+ - name: Tools to Use with AppLocker
+ href: applocker\tools-to-use-with-applocker.md
+ items:
+ - name: Using Event Viewer with AppLocker
+ href: applocker\using-event-viewer-with-applocker.md
+ - name: AppLocker Settings
+ href: applocker\applocker-settings.md
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/TOC.md b/windows/security/threat-protection/windows-defender-application-control/applocker/TOC.md
deleted file mode 100644
index 7bf12c4b20..0000000000
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/TOC.md
+++ /dev/null
@@ -1,89 +0,0 @@
-
-# [AppLocker](applocker-overview.md)
-
-## [Administer AppLocker](administer-applocker.md)
-### [Maintain AppLocker policies](maintain-applocker-policies.md)
-### [Edit an AppLocker policy](edit-an-applocker-policy.md)
-### [Test and update an AppLocker policy](test-and-update-an-applocker-policy.md)
-### [Deploy AppLocker policies by using the enforce rules setting](deploy-applocker-policies-by-using-the-enforce-rules-setting.md)
-### [Use the AppLocker Windows PowerShell cmdlets](use-the-applocker-windows-powershell-cmdlets.md)
-### [Use AppLocker and Software Restriction Policies in the same domain](use-applocker-and-software-restriction-policies-in-the-same-domain.md)
-### [Optimize AppLocker performance](optimize-applocker-performance.md)
-### [Monitor app usage with AppLocker](monitor-application-usage-with-applocker.md)
-### [Manage packaged apps with AppLocker](manage-packaged-apps-with-applocker.md)
-### [Working with AppLocker rules](working-with-applocker-rules.md)
-#### [Create a rule that uses a file hash condition](create-a-rule-that-uses-a-file-hash-condition.md)
-#### [Create a rule that uses a path condition](create-a-rule-that-uses-a-path-condition.md)
-#### [Create a rule that uses a publisher condition](create-a-rule-that-uses-a-publisher-condition.md)
-#### [Create AppLocker default rules](create-applocker-default-rules.md)
-#### [Add exceptions for an AppLocker rule](configure-exceptions-for-an-applocker-rule.md)
-#### [Create a rule for packaged apps](create-a-rule-for-packaged-apps.md)
-#### [Delete an AppLocker rule](delete-an-applocker-rule.md)
-#### [Edit AppLocker rules](edit-applocker-rules.md)
-#### [Enable the DLL rule collection](enable-the-dll-rule-collection.md)
-#### [Enforce AppLocker rules](enforce-applocker-rules.md)
-#### [Run the Automatically Generate Rules wizard](run-the-automatically-generate-rules-wizard.md)
-### [Working with AppLocker policies](working-with-applocker-policies.md)
-#### [Configure the Application Identity service](configure-the-application-identity-service.md)
-#### [Configure an AppLocker policy for audit only](configure-an-applocker-policy-for-audit-only.md)
-#### [Configure an AppLocker policy for enforce rules](configure-an-applocker-policy-for-enforce-rules.md)
-#### [Display a custom URL message when users try to run a blocked app](display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md)
-#### [Export an AppLocker policy from a GPO](export-an-applocker-policy-from-a-gpo.md)
-#### [Export an AppLocker policy to an XML file](export-an-applocker-policy-to-an-xml-file.md)
-#### [Import an AppLocker policy from another computer](import-an-applocker-policy-from-another-computer.md)
-#### [Import an AppLocker policy into a GPO](import-an-applocker-policy-into-a-gpo.md)
-#### [Add rules for packaged apps to existing AppLocker rule-set](add-rules-for-packaged-apps-to-existing-applocker-rule-set.md)
-#### [Merge AppLocker policies by using Set-ApplockerPolicy](merge-applocker-policies-by-using-set-applockerpolicy.md)
-#### [Merge AppLocker policies manually](merge-applocker-policies-manually.md)
-#### [Refresh an AppLocker policy](refresh-an-applocker-policy.md)
-#### [Test an AppLocker policy by using Test-AppLockerPolicy](test-an-applocker-policy-by-using-test-applockerpolicy.md)
-## [AppLocker design guide](applocker-policies-design-guide.md)
-### [Understand AppLocker policy design decisions](understand-applocker-policy-design-decisions.md)
-### [Determine your application control objectives](determine-your-application-control-objectives.md)
-### [Create a list of apps deployed to each business group](create-list-of-applications-deployed-to-each-business-group.md)
-#### [Document your app list](document-your-application-list.md)
-### [Select the types of rules to create](select-types-of-rules-to-create.md)
-#### [Document your AppLocker rules](document-your-applocker-rules.md)
-### [Determine the Group Policy structure and rule enforcement](determine-group-policy-structure-and-rule-enforcement.md)
-#### [Understand AppLocker enforcement settings](understand-applocker-enforcement-settings.md)
-#### [Understand AppLocker rules and enforcement setting inheritance in Group Policy](understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md)
-#### [Document the Group Policy structure and AppLocker rule enforcement](document-group-policy-structure-and-applocker-rule-enforcement.md)
-### [Plan for AppLocker policy management](plan-for-applocker-policy-management.md)
-## [AppLocker deployment guide](applocker-policies-deployment-guide.md)
-### [Understand the AppLocker policy deployment process](understand-the-applocker-policy-deployment-process.md)
-### [Requirements for Deploying AppLocker Policies](requirements-for-deploying-applocker-policies.md)
-### [Use Software Restriction Policies and AppLocker policies](using-software-restriction-policies-and-applocker-policies.md)
-### [Create Your AppLocker policies](create-your-applocker-policies.md)
-#### [Create Your AppLocker rules](create-your-applocker-rules.md)
-### [Deploy the AppLocker policy into production](deploy-the-applocker-policy-into-production.md)
-#### [Use a reference device to create and maintain AppLocker policies](use-a-reference-computer-to-create-and-maintain-applocker-policies.md)
-#### [Determine which apps are digitally signed on a reference device](determine-which-applications-are-digitally-signed-on-a-reference-computer.md)
-### [Configure the AppLocker reference device](configure-the-appLocker-reference-device.md)
-## [AppLocker technical reference](applocker-technical-reference.md)
-### [What Is AppLocker?](what-is-applocker.md)
-### [Requirements to use AppLocker](requirements-to-use-applocker.md)
-### [AppLocker policy use scenarios](applocker-policy-use-scenarios.md)
-### [How AppLocker works](how-applocker-works-techref.md)
-#### [Understanding AppLocker rule behavior](understanding-applocker-rule-behavior.md)
-#### [Understanding AppLocker rule exceptions](understanding-applocker-rule-exceptions.md)
-#### [Understanding AppLocker rule collections](understanding-applocker-rule-collections.md)
-#### [Understanding AppLocker allow and deny actions on rules](understanding-applocker-allow-and-deny-actions-on-rules.md)
-#### [Understanding AppLocker rule condition types](understanding-applocker-rule-condition-types.md)
-##### [Understanding the publisher rule condition in AppLocker](understanding-the-publisher-rule-condition-in-applocker.md)
-##### [Understanding the path rule condition in AppLocker](understanding-the-path-rule-condition-in-applocker.md)
-##### [Understanding the file hash rule condition in AppLocker](understanding-the-file-hash-rule-condition-in-applocker.md)
-#### [Understanding AppLocker default rules](understanding-applocker-default-rules.md)
-##### [Executable rules in AppLocker](executable-rules-in-applocker.md)
-##### [Windows Installer rules in AppLocker](windows-installer-rules-in-applocker.md)
-##### [Script rules in AppLocker](script-rules-in-applocker.md)
-##### [DLL rules in AppLocker](dll-rules-in-applocker.md)
-##### [Packaged apps and packaged app installer rules in AppLocker](packaged-apps-and-packaged-app-installer-rules-in-applocker.md)
-### [AppLocker architecture and components](applocker-architecture-and-components.md)
-### [AppLocker processes and interactions](applocker-processes-and-interactions.md)
-### [AppLocker functions](applocker-functions.md)
-### [Security considerations for AppLocker](security-considerations-for-applocker.md)
-### [Tools to Use with AppLocker](tools-to-use-with-applocker.md)
-#### [Using Event Viewer with AppLocker](using-event-viewer-with-applocker.md)
-### [AppLocker Settings](applocker-settings.md)
-
-
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/TOC.yml b/windows/security/threat-protection/windows-defender-application-control/applocker/TOC.yml
new file mode 100644
index 0000000000..b796c0e95e
--- /dev/null
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/TOC.yml
@@ -0,0 +1,186 @@
+- name: AppLocker
+ href: applocker-overview.md
+ items:
+ - name: Administer AppLocker
+ href: administer-applocker.md
+ items:
+ - name: Maintain AppLocker policies
+ href: maintain-applocker-policies.md
+ - name: Edit an AppLocker policy
+ href: edit-an-applocker-policy.md
+ - name: Test and update an AppLocker policy
+ href: test-and-update-an-applocker-policy.md
+ - name: Deploy AppLocker policies by using the enforce rules setting
+ href: deploy-applocker-policies-by-using-the-enforce-rules-setting.md
+ - name: Use the AppLocker Windows PowerShell cmdlets
+ href: use-the-applocker-windows-powershell-cmdlets.md
+ - name: Use AppLocker and Software Restriction Policies in the same domain
+ href: use-applocker-and-software-restriction-policies-in-the-same-domain.md
+ - name: Optimize AppLocker performance
+ href: optimize-applocker-performance.md
+ - name: Monitor app usage with AppLocker
+ href: monitor-application-usage-with-applocker.md
+ - name: Manage packaged apps with AppLocker
+ href: manage-packaged-apps-with-applocker.md
+ - name: Working with AppLocker rules
+ href: working-with-applocker-rules.md
+ items:
+ - name: Create a rule that uses a file hash condition
+ href: create-a-rule-that-uses-a-file-hash-condition.md
+ - name: Create a rule that uses a path condition
+ href: create-a-rule-that-uses-a-path-condition.md
+ - name: Create a rule that uses a publisher condition
+ href: create-a-rule-that-uses-a-publisher-condition.md
+ - name: Create AppLocker default rules
+ href: create-applocker-default-rules.md
+ - name: Add exceptions for an AppLocker rule
+ href: configure-exceptions-for-an-applocker-rule.md
+ - name: Create a rule for packaged apps
+ href: create-a-rule-for-packaged-apps.md
+ - name: Delete an AppLocker rule
+ href: delete-an-applocker-rule.md
+ - name: Edit AppLocker rules
+ href: edit-applocker-rules.md
+ - name: Enable the DLL rule collection
+ href: enable-the-dll-rule-collection.md
+ - name: Enforce AppLocker rules
+ href: enforce-applocker-rules.md
+ - name: Run the Automatically Generate Rules wizard
+ href: run-the-automatically-generate-rules-wizard.md
+ - name: Working with AppLocker policies
+ href: working-with-applocker-policies.md
+ items:
+ - name: Configure the Application Identity service
+ href: configure-the-application-identity-service.md
+ - name: Configure an AppLocker policy for audit only
+ href: configure-an-applocker-policy-for-audit-only.md
+ - name: Configure an AppLocker policy for enforce rules
+ href: configure-an-applocker-policy-for-enforce-rules.md
+ - name: Display a custom URL message when users try to run a blocked app
+ href: display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md
+ - name: Export an AppLocker policy from a GPO
+ href: export-an-applocker-policy-from-a-gpo.md
+ - name: Export an AppLocker policy to an XML file
+ href: export-an-applocker-policy-to-an-xml-file.md
+ - name: Import an AppLocker policy from another computer
+ href: import-an-applocker-policy-from-another-computer.md
+ - name: Import an AppLocker policy into a GPO
+ href: import-an-applocker-policy-into-a-gpo.md
+ - name: Add rules for packaged apps to existing AppLocker rule-set
+ href: add-rules-for-packaged-apps-to-existing-applocker-rule-set.md
+ - name: Merge AppLocker policies by using Set-ApplockerPolicy
+ href: merge-applocker-policies-by-using-set-applockerpolicy.md
+ - name: Merge AppLocker policies manually
+ href: merge-applocker-policies-manually.md
+ - name: Refresh an AppLocker policy
+ href: refresh-an-applocker-policy.md
+ - name: Test an AppLocker policy by using Test-AppLockerPolicy
+ href: test-an-applocker-policy-by-using-test-applockerpolicy.md
+ - name: AppLocker design guide
+ href: applocker-policies-design-guide.md
+ items:
+ - name: Understand AppLocker policy design decisions
+ href: understand-applocker-policy-design-decisions.md
+ - name: Determine your application control objectives
+ href: determine-your-application-control-objectives.md
+ - name: Create a list of apps deployed to each business group
+ href: create-list-of-applications-deployed-to-each-business-group.md
+ items:
+ - name: Document your app list
+ href: document-your-application-list.md
+ - name: Select the types of rules to create
+ href: select-types-of-rules-to-create.md
+ items:
+ - name: Document your AppLocker rules
+ href: document-your-applocker-rules.md
+ - name: Determine the Group Policy structure and rule enforcement
+ href: determine-group-policy-structure-and-rule-enforcement.md
+ items:
+ - name: Understand AppLocker enforcement settings
+ href: understand-applocker-enforcement-settings.md
+ - name: Understand AppLocker rules and enforcement setting inheritance in Group Policy
+ href: understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md
+ - name: Document the Group Policy structure and AppLocker rule enforcement
+ href: document-group-policy-structure-and-applocker-rule-enforcement.md
+ - name: Plan for AppLocker policy management
+ href: plan-for-applocker-policy-management.md
+ - name: AppLocker deployment guide
+ href: applocker-policies-deployment-guide.md
+ items:
+ - name: Understand the AppLocker policy deployment process
+ href: understand-the-applocker-policy-deployment-process.md
+ - name: Requirements for Deploying AppLocker Policies
+ href: requirements-for-deploying-applocker-policies.md
+ - name: Use Software Restriction Policies and AppLocker policies
+ href: using-software-restriction-policies-and-applocker-policies.md
+ - name: Create Your AppLocker policies
+ href: create-your-applocker-policies.md
+ items:
+ - name: Create Your AppLocker rules
+ href: create-your-applocker-rules.md
+ - name: Deploy the AppLocker policy into production
+ href: deploy-the-applocker-policy-into-production.md
+ items:
+ - name: Use a reference device to create and maintain AppLocker policies
+ href: use-a-reference-computer-to-create-and-maintain-applocker-policies.md
+ - name: Determine which apps are digitally signed on a reference device
+ href: determine-which-applications-are-digitally-signed-on-a-reference-computer.md
+ - name: Configure the AppLocker reference device
+ href: configure-the-appLocker-reference-device.md
+ - name: AppLocker technical reference
+ href: applocker-technical-reference.md
+ items:
+ - name: What Is AppLocker?
+ href: what-is-applocker.md
+ - name: Requirements to use AppLocker
+ href: requirements-to-use-applocker.md
+ - name: AppLocker policy use scenarios
+ href: applocker-policy-use-scenarios.md
+ - name: How AppLocker works
+ href: how-applocker-works-techref.md
+ items:
+ - name: Understanding AppLocker rule behavior
+ href: understanding-applocker-rule-behavior.md
+ - name: Understanding AppLocker rule exceptions
+ href: understanding-applocker-rule-exceptions.md
+ - name: Understanding AppLocker rule collections
+ href: understanding-applocker-rule-collections.md
+ - name: Understanding AppLocker allow and deny actions on rules
+ href: understanding-applocker-allow-and-deny-actions-on-rules.md
+ - name: Understanding AppLocker rule condition types
+ href: understanding-applocker-rule-condition-types.md
+ items:
+ - name: Understanding the publisher rule condition in AppLocker
+ href: understanding-the-publisher-rule-condition-in-applocker.md
+ - name: Understanding the path rule condition in AppLocker
+ href: understanding-the-path-rule-condition-in-applocker.md
+ - name: Understanding the file hash rule condition in AppLocker
+ href: understanding-the-file-hash-rule-condition-in-applocker.md
+ - name: Understanding AppLocker default rules
+ href: understanding-applocker-default-rules.md
+ items:
+ - name: Executable rules in AppLocker
+ href: executable-rules-in-applocker.md
+ - name: Windows Installer rules in AppLocker
+ href: windows-installer-rules-in-applocker.md
+ - name: Script rules in AppLocker
+ href: script-rules-in-applocker.md
+ - name: DLL rules in AppLocker
+ href: dll-rules-in-applocker.md
+ - name: Packaged apps and packaged app installer rules in AppLocker
+ href: packaged-apps-and-packaged-app-installer-rules-in-applocker.md
+ - name: AppLocker architecture and components
+ href: applocker-architecture-and-components.md
+ - name: AppLocker processes and interactions
+ href: applocker-processes-and-interactions.md
+ - name: AppLocker functions
+ href: applocker-functions.md
+ - name: Security considerations for AppLocker
+ href: security-considerations-for-applocker.md
+ - name: Tools to Use with AppLocker
+ href: tools-to-use-with-applocker.md
+ items:
+ - name: Using Event Viewer with AppLocker
+ href: using-event-viewer-with-applocker.md
+ - name: AppLocker Settings
+ href: applocker-settings.md
diff --git a/windows/security/threat-protection/windows-defender-application-control/audit-windows-defender-application-control-policies.md b/windows/security/threat-protection/windows-defender-application-control/audit-windows-defender-application-control-policies.md
index de3ee7f874..5ed5fa1cf7 100644
--- a/windows/security/threat-protection/windows-defender-application-control/audit-windows-defender-application-control-policies.md
+++ b/windows/security/threat-protection/windows-defender-application-control/audit-windows-defender-application-control-policies.md
@@ -1,6 +1,6 @@
---
-title: Audit Windows Defender Application Control policies (Windows 10)
-description: Audits allow admins to discover apps that were missed during an initial policy scan and to identify new apps that were installed since the policy was created.
+title: Use audit events to create WDAC policy rules (Windows 10)
+description: Audits allow admins to discover apps, binaries, and scripts that should be added to the WDAC policy.
keywords: security, malware
ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
@@ -11,94 +11,65 @@ ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
+ms.reviewer: jogeurte
ms.author: dansimp
manager: dansimp
ms.date: 05/03/2018
ms.technology: mde
---
-# Audit Windows Defender Application Control policies
+# Use audit events to create WDAC policy rules
**Applies to:**
-- Windows 10
-- Windows Server 2016
+- Windows 10
+- Windows Server 2016 and above
-Running **Application Control** in audit mode allows administrators to discover any applications that were missed during an initial policy scan and to identify any new applications that have been installed and run since the original policy was created. While a WDAC policy is running in audit mode, any binary that runs and would have been denied had the policy been enforced is logged in the **Applications and Services Logs\\Microsoft\\Windows\\CodeIntegrity\\Operational** event log. When these logged binaries have been validated, they can easily be added to a new WDAC policy. When the new exception policy is created, you can merge it with your existing WDAC policies.
+Running Application Control in audit mode lets you discover applications, binaries, and scripts that are missing from your WDAC policy but should be included.
-Before you begin this process, you need to create a WDAC policy binary file. If you have not already done so, see [Create an initial Windows Defender Application Control policy from a reference computer](create-initial-default-policy.md).
+While a WDAC policy is running in audit mode, any binary that runs but would have been denied is logged in the **Applications and Services Logs\\Microsoft\\Windows\\CodeIntegrity\\Operational** event log. Script and MSI are logged in the **Applications and Services Logs\\Microsoft\\Windows\\AppLocker\\MSI and Script** event log. These events can be used to generate a new WDAC policy that can be merged with the original Base policy or deployed as a separate Supplemental policy, if allowed.
-**To audit a Windows Defender Application Control policy with local policy:**
+## Overview of the process to create WDAC policy to allow apps using audit events
-1. Before you begin, find the *.bin policy file , for example, the DeviceGuardPolicy.bin. Copy the file to C:\\Windows\\System32\\CodeIntegrity.
+> [!Note]
+> You must have already deployed a WDAC audit mode policy to use this process. If you have not already done so, see [Deploying Windows Defender Application Control policies](windows-defender-application-control-deployment-guide.md).
-2. On the computer you want to run in audit mode, open the Local Group Policy Editor by running **GPEdit.msc**.
+To familiarize yourself with creating WDAC rules from audit events, follow these steps on a device with a WDAC audit mode policy.
- > [!Note]
- >
- > - The computer that you will run in audit mode must be clean of viruses or malware. Otherwise, in the process that you follow after auditing the system, you might unintentionally merge in a policy that allows viruses or malware to run.
- >
- > - An alternative method to test a policy is to rename the test file to SIPolicy.p7b and drop it into C:\\Windows\\System32\\CodeIntegrity, rather than deploy it by using the Local Group Policy Editor.
-
-3. Navigate to **Computer Configuration\\Administrative Templates\\System\\Device Guard**, and then select **Deploy Windows Defender Application Control**. Enable this setting by using the appropriate file path, for example, C:\\Windows\\System32\\CodeIntegrity\\DeviceGuardPolicy.bin, as shown in Figure 1.
+1. Install and run an application not allowed by the WDAC policy but that you want to allow.
- > [!Note]
- >
- > - You can copy the WDAC policies to a file share to which all computer accounts have access rather than copy them to every system.
- >
- > - You might have noticed that the GPO setting references a .p7b file and this policy uses a .bin file. Regardless of the type of policy you deploy (.bin, .p7b, or .p7), they are all converted to SIPolicy.p7b when dropped onto the computers running Windows 10. We recommend that you make your WDAC policy names friendly and allow the system to convert the policy names for you. By doing this, it ensures that the policies are easily distinguishable when viewed in a share or any other central repository.
-
- 
-
- Figure 1. Deploy your Windows Defender Application Control policy
-
-4. Restart the reference system for the WDAC policy to take effect.
-
-5. Use the system as you normally would, and monitor code integrity events in the event log. While in audit mode, any exception to the deployed WDAC policy will be logged in the **Applications and Services Logs\\Microsoft\\Windows\\CodeIntegrity\\Operational** event log, as shown in Figure 2.
+2. Review the **CodeIntegrity - Operational** and **AppLocker - MSI and Script** event logs to confirm events, like those shown in Figure 1, are generated related to the application. For information about the types of events you should see, refer to [Understanding Application Control events](event-id-explanations.md).
+ **Figure 1. Exceptions to the deployed WDAC policy**
- Figure 2. Exceptions to the deployed WDAC policy
+3. In an elevated PowerShell session, run the following commands to initialize variables used by this procedure. This procedure builds upon the **Lamna_FullyManagedClients_Audit.xml** policy introduced in [Create a WDAC policy for fully managed devices](create-wdac-policy-for-fully-managed-devices.md) and will produce a new policy called **EventsPolicy.xml**.
- You will be reviewing the exceptions that appear in the event log, and making a list of any applications that should be allowed to run in your environment.
-
-6. If you want to create a catalog file to simplify the process of including unsigned LOB applications in your WDAC policy, this is a good time to create it. For information, see [Deploy catalog files to support Windows Defender Application Control](deploy-catalog-files-to-support-windows-defender-application-control.md).
+ ```powershell
+ $PolicyName= "Lamna_FullyManagedClients_Audit"
+ $LamnaPolicy=$env:userprofile+"\Desktop\"+$PolicyName+".xml"
+ $EventsPolicy=$env:userprofile+"\Desktop\EventsPolicy.xml"
+ $EventsPolicyWarnings=$env:userprofile+"\Desktop\EventsPolicyWarnings.txt"
+ ```
-Now that you have a WDAC policy deployed in audit mode, you can capture any audit information that appears in the event log. This is described in the next section.
+4. Use [New-CIPolicy](/powershell/module/configci/new-cipolicy) to generate a new WDAC policy from logged audit events. This example uses a **FilePublisher** file rule level and a **Hash** fallback level. Warning messages are redirected to a text file **EventsPolicyWarnings.txt**.
-## Create a Windows Defender Application Control policy that captures audit information from the event log
-
-Use the following procedure after you have been running a computer with a WDAC policy in audit mode for a period of time. When you are ready to capture the needed policy information from the event log (so that you can later merge that information into the original WDAC policy), complete the following steps.
-
-
-
-1. Review the audit information in the event log. From the WDAC policy exceptions that you see, make a list of any applications that should be allowed to run in your environment, and decide on the file rule level that should be used to trust these applications.
-
- Although the Hash file rule level will catch all of these exceptions, it may not be the best way to trust all of them. For information about file rule levels, see [Windows Defender Application Control file rule levels](select-types-of-rules-to-create.md) in "Deploy Windows Defender Application Control: policy rules and file rules."
-
- Your event log might also contain exceptions for applications that you eventually want your WDAC policy to block. If these appear, make a list of these also, for a later step in this procedure.
-
-2. In an elevated Windows PowerShell session, initialize the variables that will be used. The example filename shown here is **DeviceGuardAuditPolicy.xml**:
-
- `$CIPolicyPath=$env:userprofile+"\Desktop\"`
-
- `$CIAuditPolicy=$CIPolicyPath+"DeviceGuardAuditPolicy.xml"`
-
-3. Use [New-CIPolicy](/powershell/module/configci/new-cipolicy) to generate a new WDAC policy from logged audit events. This example uses a file rule level of **Hash** and includes `3> CIPolicylog.txt`, which redirects warning messages to a text file, **CIPolicylog.txt**.
-
- `New-CIPolicy -Audit -Level Hash -FilePath $CIAuditPolicy –UserPEs 3> CIPolicylog.txt`
+ ```powershell
+ New-CIPolicy -FilePath $EventsPolicy -Audit -Level FilePublisher -Fallback Hash –UserPEs -MultiplePolicyFormat 3> $EventsPolicyWarnings
+ ```
> [!NOTE]
- > When you create policies from audit events, you should carefully consider the file rule level that you select to trust. The preceding example uses the **Hash** rule level, which is the most specific. Any change to the file (such as replacing the file with a newer version of the same file) will change the Hash value, and require an update to the policy.
+ > When you create policies from audit events, you should carefully consider the file rule level that you select to trust. The preceding example uses the **FilePublisher** rule level with a fallback level of **Hash**, which may be more specific than desired. You can re-run the above command using different **-Level** and **-Fallback** options to meet your needs. For more information about WDAC rule levels, see [Understand WDAC policy rules and file rules](select-types-of-rules-to-create.md).
-4. Find and review the WDAC audit policy .xml file that you created. If you used the example variables as shown, the filename will be **DeviceGuardAuditPolicy.xml**, and it will be on your desktop. Look for the following:
+5. Find and review the WDAC policy file **EventsPolicy.xml** that should be found on your desktop. Ensure that it only includes file and signer rules for applications, binaries, and scripts you wish to allow. You can remove rules by manually editing the policy XML or use the WDAC Policy Wizard tool (see [Editing existing base and supplemental WDAC policies with the Wizard](wdac-wizard-editing-policy.md)).
- - Any applications that were caught as exceptions, but should be allowed to run in your environment. These are applications that should be in the .xml file. Leave these as-is in the file.
-
- - Any applications that actually should not be allowed to run in your environment. Edit these out of the .xml file. If they remain in the .xml file, and the information in the file is merged into your existing WDAC policy, the policy will treat the applications as trusted, and allow them to run.
+6. Find and review the text file **EventsPolicyWarnings.txt** that should be found on your desktop. This file will include a warning for any files that WDAC couldn't create a rule for at either the specified rule level or fallback rule level.
-You can now use this file to update the existing WDAC policy that you ran in audit mode by merging the two policies. For instructions on how to merge this audit policy with the existing WDAC policy, see the next section, [Merge Windows Defender Application Control policies](merge-windows-defender-application-control-policies.md).
+ > [!NOTE]
+ > New-CIPolicy only creates rules for files that can still be found on disk. Files which are no longer present on the system will not have a rule created to allow them. However, the event log should have sufficient information to allow these files by manually editing the policy XML to add rules. You can use an existing rule as a template and verify your results against the WDAC policy schema definition found at **%windir%\schemas\CodeIntegrity\cipolicy.xsd**.
-> [!Note]
-> You may have noticed that you did not generate a binary version of this policy as you did in [Create a Windows Defender Application Control policy from a reference computer](./create-initial-default-policy.md). This is because WDAC policies created from an audit log are not intended to run as stand-alone policies but rather to update existing WDAC policies.
\ No newline at end of file
+7. Merge **EventsPolicy.xml** with the Base policy **Lamna_FullyManagedClients_Audit.xml** or convert it to a supplemental policy.
+
+ For information on merging policies, refer to [Merge Windows Defender Application Control policies](merge-windows-defender-application-control-policies.md) and for information on supplemental policies see [Use multiple Windows Defender Application Control Policies](deploy-multiple-windows-defender-application-control-policies.md).
+
+8. Convert the Base or Supplemental policy to binary and deploy using your preferred method.
diff --git a/windows/security/threat-protection/windows-defender-application-control/deploy-multiple-windows-defender-application-control-policies.md b/windows/security/threat-protection/windows-defender-application-control/deploy-multiple-windows-defender-application-control-policies.md
index a886a623e9..80ef49b096 100644
--- a/windows/security/threat-protection/windows-defender-application-control/deploy-multiple-windows-defender-application-control-policies.md
+++ b/windows/security/threat-protection/windows-defender-application-control/deploy-multiple-windows-defender-application-control-policies.md
@@ -11,7 +11,7 @@ ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
+ms.reviewer: jogeurte
ms.author: dansimp
manager: dansimp
ms.date: 11/13/2020
@@ -22,10 +22,10 @@ ms.technology: mde
**Applies to:**
-- Windows 10
-- Windows Server 2016
+- Windows 10 version 1903 and above
+- Windows Server 2022 and above
-The restriction of only having a single code integrity policy active on a system at any given time has felt limiting for customers in situations where multiple policies with different intents would be useful. Beginning with Windows 10 version 1903, WDAC supports up to 32 active policies on a device at once in order to enable the following scenarios:
+Prior to Windows 10 1903, WDAC only supported a single active on a system at any given time. This significantly limited customers in situations where multiple policies with different intents would be useful. Beginning with Windows 10 version 1903, WDAC supports up to 32 active policies on a device at once in order to enable the following scenarios:
1. Enforce and Audit Side-by-Side
- To validate policy changes before deploying in enforcement mode, users can now deploy an audit-mode base policy side by side with an existing enforcement-mode base policy
@@ -49,7 +49,7 @@ The restriction of only having a single code integrity policy active on a system
## Creating WDAC policies in Multiple Policy Format
-In order to allow multiple policies to exist and take effect on a single system, policies must be created using the new Multiple Policy Format. The "MultiplePolicyFormat" switch in [New-CIPolicy](/powershell/module/configci/new-cipolicy?preserve-view=true&view=win10-ps) results in 1) random GUIDs being generated for the policy ID and 2) the policy type being specified as base. The below is an example of creating a new policy in the multiple policy format.
+In order to allow multiple policies to exist and take effect on a single system, policies must be created using the new Multiple Policy Format. The "MultiplePolicyFormat" switch in [New-CIPolicy](/powershell/module/configci/new-cipolicy?preserve-view=true&view=win10-ps) results in 1) unique GUIDs being generated for the policy ID and 2) the policy type being specified as base. The below is an example of creating a new policy in the multiple policy format.
```powershell
New-CIPolicy -MultiplePolicyFormat -ScanPath "" -UserPEs -FilePath ".\policy.xml" -Level Publisher -Fallback Hash
@@ -104,4 +104,4 @@ To deploy policies locally using the new multiple policy format, follow these st
Multiple WDAC policies can be managed from an MDM server through ApplicationControl configuration service provider (CSP). The CSP also provides support for rebootless policy deployment. See [ApplicationControl CSP](/windows/client-management/mdm/applicationcontrol-csp) for more information on deploying multiple policies, optionally using MEM Intune's Custom OMA-URI capability.
> [!NOTE]
-> WMI and GP do not currently support multiple policies. Instead, customers who cannot directly access the MDM stack should use the [ApplicationControl CSP via the MDM Bridge WMI Provider](/windows/client-management/mdm/applicationcontrol-csp#powershell-and-wmi-bridge-usage-guidance) to manage Multiple Policy Format WDAC policies.
\ No newline at end of file
+> WMI and GP do not currently support multiple policies. Instead, customers who cannot directly access the MDM stack should use the [ApplicationControl CSP via the MDM Bridge WMI Provider](/windows/client-management/mdm/applicationcontrol-csp#powershell-and-wmi-bridge-usage-guidance) to manage Multiple Policy Format WDAC policies.
diff --git a/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-group-policy.md b/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-group-policy.md
index 4246d0b428..8e8fa29002 100644
--- a/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-group-policy.md
+++ b/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-group-policy.md
@@ -11,7 +11,7 @@ ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
+ms.reviewer: jogeurte
ms.author: dansimp
manager: dansimp
ms.date: 02/28/2018
@@ -22,39 +22,36 @@ ms.technology: mde
**Applies to:**
-- Windows 10
-- Windows Server 2016
-
-WDAC policies can easily be deployed and managed with Group Policy. Windows Defender allows you to simplify deployment Windows Defender hardware-based security features and Windows Defender Application Control policies. The following procedure walks you through how to deploy a WDAC policy called **DeviceGuardPolicy.bin** to a test OU called *DG Enabled PCs* by using a GPO called **Contoso GPO Test**.
+- Windows 10
+- Windows Server 2016 and above
> [!NOTE]
-> This walkthrough requires that you have previously created a WDAC policy and have a computer running Windows 10 on which to test a Group Policy deployment. For more information about how to create a WDAC policy, see [Create a Windows Defender Application Control policy from a reference computer](create-initial-default-policy.md), earlier in this topic.
+> Group Policy-based deployment of WDAC policies only supports single-policy format WDAC policies. To use WDAC on devices running Windows 10 1903 and greater, we recommend using an alternative method for policy deployment.
-> [!NOTE]
-> Signed WDAC policies can cause boot failures when deployed. We recommend that signed WDAC policies be thoroughly tested on each hardware platform before enterprise deployment.
+Single-policy format WDAC policies (pre-1903 policy schema) can be easily deployed and managed with Group Policy. The following procedure walks you through how to deploy a WDAC policy called **ContosoPolicy.bin** to a test OU called *WDAC Enabled PCs* by using a GPO called **Contoso GPO Test**.
To deploy and manage a WDAC policy with Group Policy:
-1. On a client computer on which RSAT is installed, open the GPMC by running **GPMC.MSC**
+1. On a client computer on which RSAT is installed, open the GPMC by running **GPMC.MSC**
-2. Create a new GPO: right-click an OU and then click **Create a GPO in this domain, and Link it here**.
+2. Create a new GPO: right-click an OU and then click **Create a GPO in this domain, and Link it here**.
- > [!NOTE]
- > You can use any OU name. Also, security group filtering is an option when you consider different ways of combining WDAC policies (or keeping them separate), as discussed in [Plan for Windows Defender Application Control policy management](plan-windows-defender-application-control-management.md).
+ > [!NOTE]
+ > You can use any OU name. Also, security group filtering is an option when you consider different ways of combining WDAC policies (or keeping them separate), as discussed in [Plan for Windows Defender Application Control policy management](plan-windows-defender-application-control-management.md).
- 
+ 
-3. Name the new GPO. You can choose any name.
+3. Name the new GPO. You can choose any name.
-4. Open the Group Policy Management Editor: right-click the new GPO, and then click **Edit**.
+4. Open the Group Policy Management Editor: right-click the new GPO, and then click **Edit**.
-5. In the selected GPO, navigate to Computer Configuration\\Administrative Templates\\System\\Device Guard. Right-click **Deploy Windows Defender Application Control** and then click **Edit**.
+5. In the selected GPO, navigate to Computer Configuration\\Administrative Templates\\System\\Device Guard. Right-click **Deploy Windows Defender Application Control** and then click **Edit**.
-6. In the **Deploy Windows Defender Application Control** dialog box, select the **Enabled** option, and then specify the code integrity policy deployment path.
+6. In the **Deploy Windows Defender Application Control** dialog box, select the **Enabled** option, and then specify the WDAC policy deployment path.
- In this policy setting, you specify either the local path in which the policy will exist on the client computer or a Universal Naming Convention (UNC) path that the client computers will look to retrieve the latest version of the policy. For example, with DeviceGuardPolicy.bin on the test computer, the example file path would be C:\\Windows\\System32\\CodeIntegrity\\DeviceGuardPolicy.bin.
+ In this policy setting, you specify either the local path in which the policy will exist on the client computer or a Universal Naming Convention (UNC) path that the client computers will look to retrieve the latest version of the policy. For example, with ContosoPolicy.bin on the test computer, the example file path would be C:\\Windows\\System32\\CodeIntegrity\\ContosoPolicy.bin.
> [!NOTE]
> This policy file does not need to be copied to every computer. You can instead copy the WDAC policies to a file share to which all computer accounts have access. Any policy selected here is converted to SIPolicy.p7b when it is deployed to the individual client computers.
@@ -62,6 +59,6 @@ To deploy and manage a WDAC policy with Group Policy:
> [!NOTE]
- > You may have noticed that the GPO setting references a .p7b file and this example uses a .bin file for the policy. Regardless of the type of policy you deploy (.bin, .p7b, or .p7), they are all converted to SIPolicy.p7b when dropped on the client computer running Windows 10. Make your WDAC policies friendly and allow the system to convert the policy names for you to ensure that the policies are easily distinguishable when viewed in a share or any other central repository.
+ > You may have noticed that the GPO setting references a .p7b file and this example uses a .bin file for the policy. Regardless of the type of policy you deploy (.bin, .p7b, or .p7), they are all converted to SIPolicy.p7b when dropped on the client computer running Windows 10. Give your WDAC policies friendly names and allow the system to convert the policy names for you to ensure that the policies are easily distinguishable when viewed in a share or any other central repository.
-7. Close the Group Policy Management Editor, and then restart the Windows 10 test computer. Restarting the computer updates the WDAC policy. For information about how to audit WDAC policies, see [Audit Windows Defender Application Control policies](audit-windows-defender-application-control-policies.md).
+7. Close the Group Policy Management Editor, and then restart the Windows 10 test computer. Restarting the computer updates the WDAC policy.
diff --git a/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md b/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md
index 7dcfa211b1..2a226cb190 100644
--- a/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md
+++ b/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md
@@ -1,6 +1,6 @@
---
-title: Deploy Windows Defender Application Control (WDAC) policies by using Microsoft Intune (Windows 10)
-description: You can use Microsoft Intune to configure Windows Defender Application Control (WDAC). Learn how with this step-by-step guide.
+title: Deploy WDAC policies using Mobile Device Management (MDM) (Windows 10)
+description: You can use an MDM like Microsoft Intune to configure Windows Defender Application Control (WDAC). Learn how with this step-by-step guide.
keywords: security, malware
ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
@@ -18,54 +18,49 @@ ms.date: 04/29/2020
ms.technology: mde
---
-# Deploy Windows Defender Application Control policies by using Microsoft Intune
+# Deploy WDAC policies using Mobile Device Management (MDM)
**Applies to:**
- Windows 10
-You can use Microsoft Endpoint Manager (MEM) Intune to configure Windows Defender Application Control (WDAC) on client machines. Intune includes native support for WDAC, which allows you to configure Windows 10 client computers to only run Windows components and Microsoft Store apps, or to also allow reputable apps as defined by the Intelligent Security Graph (ISG). Using the built-in policies can be a helpful starting point, but many customers may find the available circle-of-trust options to be too limited. In order to deploy a custom policy through Intune and define your own circle of trust, you can configure a profile using Custom OMA-URI.
+You can use a Mobile Device Management (MDM) solution, like Microsoft Endpoint Manager (MEM) Intune, to configure Windows Defender Application Control (WDAC) on client machines. Intune includes native support for WDAC which can be a helpful starting point, but customers may find the available circle-of-trust options too limiting. To deploy a custom policy through Intune and define your own circle of trust, you can configure a profile using Custom OMA-URI. If your organization uses another MDM solution, check with your solution provider for WDAC policy deployment steps.
-## Using Intune's Built-In Policies
+## Use Intune's built-in policies
-Intune's built-in WDAC support enables you to deploy a policy which only allows Windows components and Microsoft Store apps to run. This policy is the non-Multiple Policy Format version of the DefaultWindows policy; the Multiple Policy Format version can be found at C:\Windows\schemas\CodeIntegrity\ExamplePolicies.
+Intune's built-in WDAC support allows you to configure Windows 10 client computers to only run:
-Setting "Trust apps with good reputation" to enabled is equivalent to adding [Option 14 (Enabled: Intelligent Security Graph Authorization)](./select-types-of-rules-to-create.md#windows-defender-application-control-policy-rules) to the DefaultWindows policy.
-
-1. Open the Microsoft Intune portal and click **Device configuration** > **Profiles** > **Create profile**.
-
-2. Type a name for the new profile, select **Windows 10 and later** as the **Platform** and **Endpoint protection** as the **Profile type**.
-
- 
-
-3. Click **Configure** > **Windows Defender Application Control**, choose from the following settings and then click **OK**:
-
- - **Application control code integrity policies**: Select **Audit only** to log events but not block any apps from running or select **Enforce** to allow only Windows components and Store apps to run.
- - **Trust apps with good reputation**: Select **Enable** to allow reputable apps as defined by the Intelligent Security Graph to run in addition to Windows components and Store apps.
-
- 
-
-## Using a Custom OMA-URI Profile
+- Windows components
+- 3rd party hardware and software kernel drivers
+- Microsoft Store-signed apps
+- [Optional] Reputable apps as defined by the Intelligent Security Graph (ISG)
> [!NOTE]
-> Policies deployed through Intune Custom OMA-URI are subject to a 350,000 byte limit. Customers whose devices are running 1903+ builds of Windows are encouraged to use [multiple policies](deploy-multiple-windows-defender-application-control-policies.md) which are more streamlined and less than 350K bytes in size.
+> Intune's built-in policies use the pre-1903 single-policy format version of the DefaultWindows policy. You can use Intune's custom OMA-URI feature to deploy your own multiple-policy format WDAC policies and leverage features available on Windows 10 1903+ as described later in this topic.
-### For 1903+ systems
+> [!NOTE]
+> Intune currently uses the AppLocker CSP to deploy its built-in policies. The AppLocker CSP will always request a reboot when applying WDAC policies. You can use Intune's custom OMA-URI feature with the ApplicationControl CSP to deploy your own WDAC policies rebootlessly.
-Beginning in 1903, Custom OMA-URI policy deployment leverages the [ApplicationControl CSP](/windows/client-management/mdm/applicationcontrol-csp), which has support for multiple policies and rebootless policies.
+To use Intune's built-in WDAC policies, configure [Endpoint Protection for Windows 10 (and later)](https://docs.microsoft.com/mem/intune/protect/endpoint-protection-windows-10?toc=/intune/configuration/toc.json&bc=/intune/configuration/breadcrumb/toc.json).
-#### Deploying policies
-The steps to use Intune's Custom OMA-URI functionality are:
+## Deploy WDAC policies with custom OMA-URI
+
+> [!NOTE]
+> Policies deployed through Intune custom OMA-URI are subject to a 350,000 byte limit. Customers should create WDAC policies that use signature-based rules, the Intelligent Security Graph, and managed installers where practical. Customers whose devices are running 1903+ builds of Windows are also encouraged to use [multiple policies](deploy-multiple-windows-defender-application-control-policies.md) which allow more granular policy.
+
+### Deploy custom WDAC policies on Windows 10 1903+
+
+Beginning with Windows 10 1903, custom OMA-URI policy deployment can use the [ApplicationControl CSP](/windows/client-management/mdm/applicationcontrol-csp), which has support for multiple policies and rebootless policies.
+
+The steps to use Intune's custom OMA-URI functionality are:
1. Know a generated policy's GUID, which can be found in the policy xml as ``
2. Convert the policy XML to binary format using the ConvertFrom-CIPolicy cmdlet in order to be deployed. The binary policy may be signed or unsigned.
-3. Open the Microsoft Intune portal and click **Device configuration** > **Profiles** > **Create profile**.
+3. Open the Microsoft Intune portal and [create a profile with custom settings](/mem/intune/configuration/custom-settings-windows-10).
-4. Type a name for the new profile, select **Windows 10 and later** as the **Platform** and **Custom** as the **Profile type**.
-
-5. Add a row, then give your policy a name and use the following settings:
+4. Specify a **Name** and **Description** and use the following values for the remaining custom OMA-URI settings:
- **OMA-URI**: ./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy
- **Data type**: Base64
- **Certificate file**: upload your binary format policy file. You do not need to upload a Base64 file, as Intune will convert the uploaded .bin file to Base64 on your behalf.
@@ -73,29 +68,31 @@ The steps to use Intune's Custom OMA-URI functionality are:
> [!div class="mx-imgBorder"]
> 
-#### Removing policies
+> [!NOTE]
+> For the _Policy GUID_ value, do not include the curly brackets.
-Upon deletion, policies deployed through Intune via the ApplicationControl CSP are removed from the system but stay in effect until the next reboot. In order to functionally do a rebootless delete, first replace the existing policy with an Allow All policy (found at C:\Windows\schemas\CodeIntegrity\ExamplePolicies\AllowAll.xml) and then delete the updated policy. This will immediately prevent anything from being blocked and fully deactive the policy on the next reboot.
+### Remove WDAC policies on Windows 10 1903+
+
+Upon deletion, policies deployed through Intune via the ApplicationControl CSP are removed from the system but stay in effect until the next reboot. In order to disable WDAC enforcement, first replace the existing policy with a new version of the policy that will "Allow *", like the rules in the example policy at %windir%\schemas\CodeIntegrity\ExamplePolicies\AllowAll.xml. Once the updated policy is deployed, you can then delete the policy from the Intune portal. This will prevent anything from being blocked and fully remove the WDAC policy on the next reboot.
### For pre-1903 systems
#### Deploying policies
+
The steps to use Intune's Custom OMA-URI functionality to leverage the [AppLocker CSP](/windows/client-management/mdm/applocker-csp) and deploy a custom WDAC policy to pre-1903 systems are:
1. Convert the policy XML to binary format using the ConvertFrom-CIPolicy cmdlet in order to be deployed. The binary policy may be signed or unsigned.
-2. Open the Microsoft Intune portal and click **Device configuration** > **Profiles** > **Create profile**.
+2. Open the Microsoft Intune portal and [create a profile with custom settings](/mem/intune/configuration/custom-settings-windows-10).
-3. Type a name for the new profile, select **Windows 10 and later** as the **Platform** and **Custom** as the **Profile type**.
-
-4. Add a row, then give your policy a name and use the following settings:
+3. Specify a **Name** and **Description** and use the following values for the remaining custom OMA-URI settings:
- **OMA-URI**: ./Vendor/MSFT/AppLocker/ApplicationLaunchRestrictions/_Grouping_/CodeIntegrity/Policy)
- **Data type**: Base64
- **Certificate file**: upload your binary format policy file
-
+
> [!NOTE]
> Deploying policies via the AppLocker CSP will force a reboot during OOBE.
#### Removing policies
-Policies deployed through Intune via the AppLocker CSP cannot be deleted through the Intune console. In order to disable WDAC policy enforcement, either deploy an audit-mode policy and/or use a script to delete the existing policy.
\ No newline at end of file
+Policies deployed through Intune via the AppLocker CSP cannot be deleted through the Intune console. In order to disable WDAC policy enforcement, either deploy an audit-mode policy or use a script to delete the existing policy.
diff --git a/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-memcm.md b/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-memcm.md
new file mode 100644
index 0000000000..73357d0809
--- /dev/null
+++ b/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-memcm.md
@@ -0,0 +1,42 @@
+---
+title: Deploy Windows Defender Application Control (WDAC) policies by using Microsoft Endpoint Configuration Manager (MEMCM) (Windows 10)
+description: You can use Microsoft Endpoint Configuration Manager (MEMCM) to configure Windows Defender Application Control (WDAC). Learn how with this step-by-step guide.
+keywords: security, malware
+ms.prod: m365-security
+audience: ITPro
+ms.collection: M365-security-compliance
+author: jsuther1974
+ms.reviewer: jogeurte
+ms.author: jogeurte
+ms.manager: jsuther
+manager: dansimp
+ms.date: 04/14/2021
+ms.technology: mde
+ms.topic: article
+ms.localizationpriority: medium
+---
+
+# Deploy WDAC policies by using Microsoft Endpoint Configuration Manager (MEMCM)
+
+**Applies to:**
+
+- Windows 10
+- Windows Server 2016 and above
+
+You can use Microsoft Endpoint Configuration Manager (MEMCM) to configure Windows Defender Application Control (WDAC) on client machines.
+
+## Use MEMCM's built-in policies
+
+MEMCM includes native support for WDAC, which allows you to configure Windows 10 client computers with a policy that will only allow:
+
+- Windows components
+- Microsoft Store apps
+- Apps installed by MEMCM (MEMCM self-configured as a managed installer)
+- [Optional] Reputable apps as defined by the Intelligent Security Graph (ISG)
+- [Optional] Apps and executables already installed in admin-definable folder locations that MEMCM will allow through a one-time scan during policy creation on managed endpoints.
+
+For more information on using MEMCM's native WDAC policies, see [Windows Defender Application Control management with Configuration Manager](/mem/configmgr/protect/deploy-use/use-device-guard-with-configuration-manager)
+
+## Deploy custom WDAC policies using Packages/Programs or Task Sequences
+
+Using MEMCM's built-in policies can be a helpful starting point, but customers may find the available circle-of-trust options available in MEMCM too limiting. To define your own circle-of-trust, you can use MEMCM to deploy custom WDAC policies using [script-based deployment](deploy-wdac-policies-with-script.md) via Software Distribution Packages and Programs or Operating System Deployment Task Sequences.
diff --git a/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md b/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md
new file mode 100644
index 0000000000..3aed014401
--- /dev/null
+++ b/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md
@@ -0,0 +1,75 @@
+---
+title: Deploy Windows Defender Application Control (WDAC) policies using script (Windows 10)
+description: Use scripts to deploy Windows Defender Application Control (WDAC) policies. Learn how with this step-by-step guide.
+keywords: security, malware
+ms.prod: m365-security
+audience: ITPro
+ms.collection: M365-security-compliance
+author: jsuther1974
+ms.reviewer: jogeurte
+ms.author: jogeurte
+ms.manager: jsuther
+manager: dansimp
+ms.date: 04/14/2021
+ms.technology: mde
+ms.topic: article
+ms.localizationpriority: medium
+---
+
+# Deploy WDAC policies using script
+
+**Applies to:**
+
+- Windows 10
+- Windows Server 2016 and above
+
+This topic describes how to deploy Windows Defender Application Control (WDAC) policies using script. The instructions below use PowerShell but can work with any scripting host.
+
+> [!NOTE]
+> To use this procedure, download and distribute the [WDAC policy refresh tool](https://aka.ms/refreshpolicy) to all managed endpoints. Ensure your WDAC policies allow the WDAC policy refresh tool or use a managed installer to distribute the tool.
+
+## Script-based deployment process for Windows 10 version 1903 and above
+
+1. Initialize the variables to be used by the script.
+
+ ```powershell
+ # Policy binary files should be named as {GUID}.cip for multiple policy format files (where {GUID} = from the Policy XML)
+ $PolicyBinary = ""
+ $DestinationFolder = $env:windir+"\System32\CodeIntegrity\CIPolicies\Active\"
+ $RefreshPolicyTool = ""
+ ```
+
+2. Copy WDAC policy binary to the destination folder.
+
+ ```powershell
+ Copy-Item -Path $PolicyBinary -Destination $DestinationFolder -Force
+ ```
+
+3. Repeat steps 1-2 as appropriate to deploy additional WDAC policies.
+4. Run RefreshPolicy.exe to activate and refresh all WDAC policies on the managed endpoint.
+
+ ```powershell
+ & $RefreshPolicyTool
+ ```
+
+## Script-based deployment process for Windows 10 versions earlier than 1903
+
+1. Initialize the variables to be used by the script.
+
+ ```powershell
+ # Policy binary files should be named as SiPolicy.p7b for Windows 10 versions earlier than 1903
+ $PolicyBinary = ""
+ $DestinationBinary = $env:windir+"\System32\CodeIntegrity\SiPolicy.p7b"
+ ```
+
+2. Copy WDAC policy binary to the destination.
+
+ ```powershell
+ Copy-Item -Path $PolicyBinary -Destination $DestinationBinary -Force
+ ```
+
+3. Refresh and activate WDAC policy using WMI
+
+ ```powershell
+ Invoke-CimMethod -Namespace root\Microsoft\Windows\CI -ClassName PS_UpdateAndCompareCIPolicy -MethodName Update -Arguments @{FilePath = $DestinationBinary}
+ ```
diff --git a/windows/security/threat-protection/windows-defender-application-control/enforce-windows-defender-application-control-policies.md b/windows/security/threat-protection/windows-defender-application-control/enforce-windows-defender-application-control-policies.md
index cb4a9eb73b..784baf06c2 100644
--- a/windows/security/threat-protection/windows-defender-application-control/enforce-windows-defender-application-control-policies.md
+++ b/windows/security/threat-protection/windows-defender-application-control/enforce-windows-defender-application-control-policies.md
@@ -1,69 +1,113 @@
---
title: Enforce Windows Defender Application Control (WDAC) policies (Windows 10)
-description: Learn how to test a Windows Defender Application Control (WDAC) policy in enforced mode by following these steps in an elevated Windows PowerShell session.
+description: Learn how to switch a WDAC policy from audit to enforced mode.
keywords: security, malware
-ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
-ms.author: dansimp
+ms.reviewer: jogeurte
+ms.author: jogeurte
+ms.manager: jsuther
manager: dansimp
-ms.date: 05/03/2018
+ms.date: 04/22/2021
ms.technology: mde
+ms.topic: article
+ms.localizationpriority: medium
---
-# Enforce Windows Defender Application Control policies
+# Enforce Windows Defender Application Control (WDAC) policies
**Applies to:**
-- Windows 10
-- Windows Server 2016
+- Windows 10
+- Windows Server 2016 and above
-Every WDAC policy is created with audit mode enabled. After you have successfully deployed and tested a WDAC policy in audit mode and are ready to test the policy in enforced mode, complete the following steps in an elevated Windows PowerShell session:
+You should now have one or more WDAC policies broadly deployed in audit mode. You have analyzed events collected from the devices with those policies and you're ready to enforce. Use this procedure to prepare and deploy your WDAC policies in enforcement mode.
> [!NOTE]
-> Every WDAC policy should be tested in audit mode first. For information about how to audit WDAC policies, see [Audit Windows Defender Application Control policies](audit-windows-defender-application-control-policies.md), earlier in this topic.
+> Some of the steps described in this article only apply to Windows 10 version 1903 and above. When using this topic to plan your own organization's WDAC policies, consider whether your managed clients can use all or some of these features. Evaluate the impact for any features that may be unavailable on your clients running earlier versions of Windows 10 and Windows Server. You may need to adapt this guidance to meet your specific organization's needs.
-1. Initialize the variables that will be used:
+## Convert WDAC **base** policy from audit to enforced
- `$CIPolicyPath=$env:userprofile+"\Desktop\"`
+As described in [common WDAC deployment scenarios](types-of-devices.md), we'll use the example of **Lamna Healthcare Company (Lamna)** to illustrate this scenario. Lamna is attempting to adopt stronger application policies, including the use of application control to prevent unwanted or unauthorized applications from running on their managed devices.
- `$InitialCIPolicy=$CIPolicyPath+"InitialScan.xml"`
+**Alice Pena** is the IT team lead responsible for Lamna's WDAC rollout.
- `$EnforcedCIPolicy=$CIPolicyPath+"EnforcedPolicy.xml"`
+Alice previously created and deployed a policy for the organization's [fully managed devices](create-wdac-policy-for-fully-managed-devices.md). They updated the policy based on audit event data as described in [Use audit events to create WDAC policy rules](audit-windows-defender-application-control-policies.md) and redeployed it. All remaining audit events are as expected and Alice is ready to switch to enforcement mode.
- `$CIPolicyBin=$CIPolicyPath+"EnforcedDeviceGuardPolicy.bin"`
+1. Initialize the variables that will be used and create the enforced policy by copying the audit version.
+
+ ```powershell
+ $EnforcedPolicyName = "Lamna_FullyManagedClients_Enforced"
+ $AuditPolicyXML = $env:USERPROFILE+"\Desktop\Lamna_FullyManagedClients_Audit.xml"
+ $EnforcedPolicyXML = $env:USERPROFILE+"\Desktop\"+$EnforcedPolicyName+".xml"
+ cp $AuditPolicyXML $EnforcedPolicyXML
+ ```
+
+2. Use [Set-CIPolicyIdInfo](/powershell/module/configci/set-cipolicyidinfo) to give the new policy a unique ID, and descriptive name. Changing the ID and name lets you deploy the enforced policy side by side with the audit policy. Do this step if you plan to harden your WDAC policy over time. If you prefer to replace the audit policy in-place, you can skip this step.
+
+ ```powershell
+ $EnforcedPolicyID = Set-CIPolicyIdInfo -FilePath $EnforcedPolicyXML -PolicyName $EnforcedPolicyName -ResetPolicyID
+ $EnforcedPolicyID = $EnforcedPolicyID.Substring(11)
+ ```
> [!NOTE]
- > The initial WDAC policy that this section refers to was created in the [Create a Windows Defender Application Control policy from a reference computer](create-initial-default-policy.md) section. If you are using a different WDAC policy, update the **CIPolicyPath** and **InitialCIPolicy** variables.
+ > If Set-CIPolicyIdInfo does not output the new PolicyID value on your Windows 10 version, you will need to obtain the *PolicyId* value from the XML directly.
-2. Ensure that rule options 9 (“Advanced Boot Options Menu”) and 10 (“Boot Audit on Failure”) are set the way that you intend for this policy. We strongly recommend that you enable these rule options before you run any enforced policy for the first time. Enabling these options provides administrators with a pre-boot command prompt, and allows Windows to start even if the WDAC policy blocks a kernel-mode driver from running. When ready for enterprise deployment, you can remove these options.
+3. *[Optionally]* Use [Set-RuleOption](/powershell/module/configci/set-ruleoption) to enable rule options 9 (“Advanced Boot Options Menu”) and 10 (“Boot Audit on Failure”). Option 9 allows users to disable WDAC enforcement for a single boot session from a pre-boot menu. Option 10 instructs Windows to switch the policy from enforcement to audit only if a boot critical kernel-mode driver is blocked. We strongly recommend these options when deploying a new enforced policy to your first deployment ring. Then, if no issues are found, you can remove the options and restart your deployment.
- To ensure that these options are enabled in a policy, use [Set-RuleOption](/powershell/module/configci/set-ruleoption) as shown in the following commands. You can run these commands even if you're not sure whether options 9 and 10 are already enabled—if so, the commands have no effect.
-
- `Set-RuleOption -FilePath $InitialCIPolicy -Option 9`
-
- `Set-RuleOption -FilePath $InitialCIPolicy -Option 10`
+ ```powershell
+ Set-RuleOption -FilePath $EnforcedPolicyXML -Option 9
+ Set-RuleOption -FilePath $EnforcedPolicyXML -Option 10
+ ```
-3. Copy the initial file to maintain an original copy:
+4. Use Set-RuleOption to delete the audit mode rule option, which changes the policy to enforcement:
- `copy $InitialCIPolicy $EnforcedCIPolicy`
+ ```powershell
+ Set-RuleOption -FilePath $EnforcedPolicyXML -Option 3 -Delete
+ ```
-4. Use Set-RuleOption to delete the audit mode rule option:
-
- `Set-RuleOption -FilePath $EnforcedCIPolicy -Option 3 -Delete`
+5. Use [ConvertFrom-CIPolicy](/powershell/module/configci/convertfrom-cipolicy) to convert the new WDAC policy to binary:
> [!NOTE]
- > To enforce a WDAC policy, you delete option 3, the **Audit Mode Enabled** option. There is no “enforced” option that can be placed in a WDAC policy.
+ > If you did not use -ResetPolicyID in Step 2 above, then you must replace $EnforcedPolicyID in the following command with the *PolicyID* attribute found in your base policy XML.
-5. Use [ConvertFrom-CIPolicy](/powershell/module/configci/convertfrom-cipolicy) to convert the new WDAC policy to binary format:
+ ```powershell
+ $EnforcedPolicyBinary = $env:USERPROFILE+"\Desktop\"+$EnforcedPolicyName+"_"+$EnforcedPolicyID+".xml"
+ ConvertFrom-CIPolicy $EnforcedPolicyXML $EnforcedPolicyBinary
+ ```
- `ConvertFrom-CIPolicy $EnforcedCIPolicy $CIPolicyBin`
+## Make copies of any needed **supplemental** policies to use with the enforced base policy
-Now that this policy is in enforced mode, you can deploy it to your test computers. Rename the policy to SIPolicy.p7b and copy it to C:\\Windows\\System32\\CodeIntegrity for testing, or deploy the policy through Group Policy by following the instructions in [Deploy and manage Windows Defender Application Control with Group Policy](deploy-windows-defender-application-control-policies-using-group-policy.md). You can also use other client management software to deploy and manage the policy.
\ No newline at end of file
+Since the enforced policy was given a unique PolicyID in the previous procedure, you need to duplicate any needed supplemental policies to use with the enforced policy. Supplemental policies always inherit the Audit or Enforcement mode from the base policy they modify. If you didn't reset the enforcement base policy's PolicyID, you can skip this procedure.
+
+1. Initialize the variables that will be used and create a copy of the current supplemental policy. Some variables and files from the previous procedure will also be used.
+
+ ```powershell
+ $SupplementalPolicyName = "Lamna_Supplemental1"
+ $CurrentSupplementalPolicy = $env:USERPROFILE+"\Desktop\"+$SupplementalPolicyName+"_Audit.xml"
+ $EnforcedSupplementalPolicy = $env:USERPROFILE+"\Desktop\"+$SupplementalPolicyName+"_Enforced.xml"
+ ```
+
+2. Use [Set-CIPolicyIdInfo](/powershell/module/configci/set-cipolicyidinfo) to give the new supplemental policy a unique ID and descriptive name, and change which base policy to supplement.
+
+ ```powershell
+ $SupplementalPolicyID = Set-CIPolicyIdInfo -FilePath $EnforcedSupplementalPolicy -PolicyName $SupplementalPolicyName -SupplementsBasePolicyID $EnforcedPolicyID -BasePolicyToSupplementPath $EnforcedPolicyXML -ResetPolicyID
+ $SupplementalPolicyID = $SupplementalPolicyID.Substring(11)
+ ```
+
+ > [!NOTE]
+ > If Set-CIPolicyIdInfo does not output the new PolicyID value on your Windows 10 version, you will need to obtain the *PolicyId* value from the XML directly.
+
+3. Use [ConvertFrom-CIPolicy](/powershell/module/configci/convertfrom-cipolicy) to convert the new WDAC supplemental policy to binary:
+
+ ```powershell
+ $EnforcedSuppPolicyBinary = $env:USERPROFILE+"\Desktop\"+$SupplementalPolicyName+"_"+$SupplementalPolicyID+".xml"
+ ConvertFrom-CIPolicy $EnforcedSupplementalPolicy $EnforcedSuppPolicyBinary
+ ```
+4. Repeat the steps above if you have other supplemental policies to update.
+
+## Deploy your enforced policy and supplemental policies
+
+Now that your base policy is in enforced mode, you can begin to deploy it to your managed endpoints. For information about deploying policies, see [Deploying Windows Defender Application Control (WDAC) policies](windows-defender-application-control-deployment-guide.md).
diff --git a/windows/security/threat-protection/windows-defender-application-control/example-wdac-base-policies.md b/windows/security/threat-protection/windows-defender-application-control/example-wdac-base-policies.md
index 609418021a..8457a3a69c 100644
--- a/windows/security/threat-protection/windows-defender-application-control/example-wdac-base-policies.md
+++ b/windows/security/threat-protection/windows-defender-application-control/example-wdac-base-policies.md
@@ -1,5 +1,5 @@
---
-title: Example WDAC base policies (Windows 10)
+title: Example Windows Defender Application Control (WDAC) base policies (Windows 10)
description: When creating a WDAC policy for an organization, start from one of the many available example base policies.
keywords: security, malware
ms.topic: article
@@ -12,30 +12,30 @@ ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
+ms.reviewer: jogeurte
ms.author: dansimp
manager: dansimp
ms.date: 11/15/2019
ms.technology: mde
---
-# Windows Defender Application Control example base policies
+# Windows Defender Application Control (WDAC) example base policies
**Applies to:**
- Windows 10
- Windows Server 2016 and above
-When creating policies for use with Windows Defender Application Control (WDAC), it is recommended to start from an existing base policy and then add or remove rules to build your own custom policy XML files. Windows includes several example policies which can be used, or organizations which use the Device Guard Signing Service can download a starter policy from that service.
+When creating policies for use with Windows Defender Application Control (WDAC), start from an existing base policy and then add or remove rules to build your own custom policy. Windows includes several example policies that can be used, or organizations that use the Device Guard Signing Service can download a starter policy from that service.
## Example Base Policies
| **Example Base Policy** | **Description** | **Where it can be found** |
|----------------------------|---------------------------------------------------------------|--------|
-| **DefaultWindows.xml** | This example policy is available in either audit or enforce mode. It includes the rules necessary to ensure that Windows, 3rd party hardware and software kernel drivers, and Windows Store apps will run. Used as the basis for all [Microsoft Endpoint Manager(MEM)](https://www.microsoft.com/microsoft-365/microsoft-endpoint-manager) policies. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
+| **DefaultWindows.xml** | This example policy is available in both audit and enforced mode. It includes rules to allow Windows, third-party hardware and software kernel drivers, and Windows Store apps. Used as the basis for all [Microsoft Endpoint Manager(MEM)](https://www.microsoft.com/microsoft-365/microsoft-endpoint-manager) policies. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
| **AllowMicrosoft.xml** | This example policy is available in audit mode. It includes the rules from DefaultWindows and adds rules to trust apps signed by the Microsoft product root certificate. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
-| **AllowAll.xml** | This example policy is useful when creating a block list policy. All block policies should include rules allowing all other code to run and then add the DENY rules for your organization's needs. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
+| **AllowAll.xml** | This example policy is useful when creating a blocklist. All block policies should include rules allowing all other code to run and then add the DENY rules for your organization's needs. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
| **AllowAll_EnableHVCI.xml** | This example policy can be used to enable [memory integrity](/windows/security/threat-protection/device-guard/memory-integrity) (also known as hypervisor-protected code integrity) using WDAC. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
-| **DenyAllAudit.xml** | This example policy should only be deployed in audit mode and can be used to audit all binaries running on critical systems or to comply with regulatory requirements. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
-| **Device Guard Signing Service (DGSS) DefaultPolicy.xml** | This example policy is available in audit mode. It includes the rules from DefaultWindows and adds rules to trust apps signed with your organization-specific certificates issued by the DGSS. | [DGSS in the Microsoft Store for Business](https://businessstore.microsoft.com/manage/settings/devices) |
-| **MEM Configuration Manager** | Customers who use MEM Configuration Manager (MEMCM), formerly known as System Center Configuration Manager, can deploy a policy to a device using MEMCM's built-in integration with WDAC and then copy the resulting policy XML to use as a custom base policy. | %OSDrive%\Windows\CCM\DeviceGuard on a managed endpoint |
\ No newline at end of file
+| **DenyAllAudit.xml** | Only deploy this example policy in audit mode to track all binaries running on critical systems or to meet regulatory requirements. | %OSDrive%\Windows\schemas\CodeIntegrity\ExamplePolicies |
+| **Device Guard Signing Service (DGSS) DefaultPolicy.xml** | This example policy is available in audit mode. It includes the rules from DefaultWindows and adds rules to trust apps signed with your organization-specific certificates issued by the DGSS. | [Device Guard Signing Service NuGet Package](https://www.nuget.org/packages/Microsoft.Acs.Dgss.Client) |
+| **MEM Configuration Manager** | Customers who use MEM Configuration Manager (MEMCM) can deploy a policy with MEMCM's built-in WDAC integration, and then use the generated policy XML as an example base policy. | %OSDrive%\Windows\CCM\DeviceGuard on a managed endpoint |
diff --git a/windows/security/threat-protection/windows-defender-application-control/images/policyflow.png b/windows/security/threat-protection/windows-defender-application-control/images/policyflow.png
new file mode 100644
index 0000000000..13874b6392
Binary files /dev/null and b/windows/security/threat-protection/windows-defender-application-control/images/policyflow.png differ
diff --git a/windows/security/threat-protection/windows-defender-application-control/merge-windows-defender-application-control-policies.md b/windows/security/threat-protection/windows-defender-application-control/merge-windows-defender-application-control-policies.md
index 96244edf81..a3a2084a23 100644
--- a/windows/security/threat-protection/windows-defender-application-control/merge-windows-defender-application-control-policies.md
+++ b/windows/security/threat-protection/windows-defender-application-control/merge-windows-defender-application-control-policies.md
@@ -1,58 +1,94 @@
---
-title: Merge Windows Defender Application Control policies (Windows 10)
-description: Because each computer running Windows 10 can have only one WDAC policy, you will occasionally need to merge two or more policies. Learn how with this guide.
+title: Merge Windows Defender Application Control policies (WDAC) (Windows 10)
+description: Learn how to merge WDAC policies as part of your policy lifecycle management.
keywords: security, malware
-ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
-ms.author: dansimp
+ms.reviewer: jogeurte
+ms.author: jogeurte
+ms.manager: jsuther
manager: dansimp
-ms.date: 05/03/2018
+ms.date: 04/22/2021
ms.technology: mde
+ms.topic: article
+ms.localizationpriority: medium
---
-# Merge Windows Defender Application Control policies
+# Merge Windows Defender Application Control (WDAC) policies
**Applies to:**
-- Windows 10
-- Windows Server 2016
+- Windows 10
+- Windows Server 2016 and above
-Because each computer running Windows 10 can have only one WDAC policy, you will occasionally need to merge two or more policies. For example, after a WDAC policy is created and audited, you might want to merge audit events from another WDAC policy.
+This article shows how to merge multiple policy XML files together and how to merge rules directly into a policy. WDAC deployments often include a few base policies and optional supplemental policies for specific use cases.
> [!NOTE]
-> Because only one SiPolicy.p7b file can be active on a system, the last management authority to write the policy wins. If there was already a policy deployed by using Group Policy and then a managed installer using Microsoft Endpoint Configuration Manager targeted the same device, the Configuration Manager policy would overwrite the SiPolicy.p7b file.
+> Prior to Windows version 1903, including Windows Server 2019 and earlier, only one WDAC policy can be active on a system at a time. If you need to use WDAC on systems running these earlier versions of Windows, you must merge all policies before deploying.
-To merge two WDAC policies, complete the following steps in an elevated Windows PowerShell session:
+## Merge multiple WDAC policy XML files together
+
+There are many scenarios where you may want to merge two or more policy files together. For example, if you [use audit events to create WDAC policy rules](audit-windows-defender-application-control-policies.md), you can merge those rules with your existing WDAC base policy. To merge the two WDAC policies referenced in that article, complete the following steps in an elevated Windows PowerShell session.
1. Initialize the variables that will be used:
- `$CIPolicyPath=$env:userprofile+"\Desktop\"`
-
- `$InitialCIPolicy=$CIPolicyPath+"InitialScan.xml"`
-
- `$AuditCIPolicy=$CIPolicyPath+"DeviceGuardAuditPolicy.xml"`
-
- `$MergedCIPolicy=$CIPolicyPath+"MergedPolicy.xml"`
-
- `$CIPolicyBin=$CIPolicyPath+"NewDeviceGuardPolicy.bin"`
-
- > [!NOTE]
- > The variables in this section specifically expect to find an initial policy on your desktop called **InitialScan.xml** and an audit WDAC policy called **DeviceGuardAuditPolicy.xml**. If you want to merge other WDAC policies, update the variables accordingly.
+ ```powershell
+ $PolicyName= "Lamna_FullyManagedClients_Audit"
+ $LamnaPolicy=$env:userprofile+"\Desktop\"+$PolicyName+".xml"
+ $EventsPolicy=$env:userprofile+"\Desktop\EventsPolicy.xml"
+ $MergedPolicy=$env:userprofile+"\Desktop\"+$PolicyName+"_Merged.xml"
+ ```
2. Use [Merge-CIPolicy](/powershell/module/configci/merge-cipolicy) to merge two policies and create a new WDAC policy:
- `Merge-CIPolicy -PolicyPaths $InitialCIPolicy,$AuditCIPolicy -OutputFilePath $MergedCIPolicy`
+ ```powershell
+ Merge-CIPolicy -PolicyPaths $LamnaPolicy,$EventsPolicy -OutputFilePath $MergedPolicy
+ ```
-3. Use [ConvertFrom-CIPolicy](/powershell/module/configci/convertfrom-cipolicy) to convert the merged WDAC policy to binary format:
+ > [!NOTE]
+ > You can merge additional policies with the Merge-CIPolicy step above by adding them to the -PolicyPaths parameter separated by commas. The new policy file specified by -OutputFilePath will have the Policy information from the first policy in the list. For example, in the above example, the $MergedPolicy will inherit the policy type, ID, name, and version information from $LamnaPolicy. To change any of those values, use [Set-CIPolicyIdInfo](/powershell/module/configci/set-cipolicyidinfo) and [Set-CIPolicyVersion](/powershell/module/configci/set-cipolicyversion).
- `ConvertFrom-CIPolicy $MergedCIPolicy $CIPolicyBin`
+## Merge WDAC rules directly into a policy XML
-Now that you have created a new WDAC policy, you can deploy the policy binary to systems manually or by using Group Policy or Microsoft client management solutions. For information about how to deploy this new policy with Group Policy, see [Deploy and manage Windows Defender Application Control with Group Policy](deploy-windows-defender-application-control-policies-using-group-policy.md).
\ No newline at end of file
+Besides merging multiple policy XML files, you can also merge rules created with the New-CIPolicyRule cmdlet directly into an existing WDAC policy XML file. Directly merging rules is a convenient way to update your policy without creating extra policy XML files. For example, to add rules that allow the WDAC Wizard and the WDAC RefreshPolicy.exe tool, follow these steps:
+
+1. Install the [WDAC Wizard](wdac-wizard.md) packaged MSIX app.
+2. Download the [Refresh Policy tool](https://aka.ms/refreshpolicy) for your processor architecture and save it to your desktop as RefreshPolicy.exe.
+3. From a PowerShell session, run the following commands to create packaged app allow rules for the WDAC Wizard:
+
+ ```powershell
+ $PackageInfo = Get-AppxPackage -Name Microsoft.WDAC.WDACWizard
+ $Rules = New-CIPolicyRule -Package $PackageInfo
+ ```
+
+4. Add FilePublisher rules for the RefreshPolicy.exe:
+
+ ```powershell
+ $Rules += New-CIPolicyRule -DriverFilePath $env:USERPROFILE\Desktop\RefreshPolicy.exe -Level FilePublisher
+ ```
+
+5. Use [Merge-CIPolicy](/powershell/module/configci/merge-cipolicy) to merge the new rules directly into the MergedPolicy file created in the previous procedure's final step:
+
+ ```powershell
+ Merge-CIPolicy -PolicyPaths $MergedPolicy -OutputFilePath $MergedPolicy -Rules $Rules
+ ```
+
+## Convert and deploy merged policy to managed endpoints
+
+Now that you have your new, merged policy, you can convert and deploy the policy binary to your managed endpoints.
+
+1. Use [ConvertFrom-CIPolicy](/powershell/module/configci/convertfrom-cipolicy) to convert the WDAC policy to a binary format:
+
+ ```powershell
+ $WDACPolicyBin=$env:userprofile+"\Desktop\"+$PolicyName+"_{InsertPolicyID}.bin"
+ ConvertFrom-CIPolicy -XMLFilePath $MergedPolicy -BinaryFilePath $WDACPolicyBin
+ ```
+
+ > [!NOTE]
+ > In the sample commands above, for policies targeting Windows 10 version 1903+, replace the string "{InsertPolicyID}" with the actual PolicyID GUID (including braces **{ }**) found in your policy XML file. For Windows 10 versions prior to 1903, use the name SiPolicy.p7b for the binary file name.
+
+2. Upload your merged policy XML and the associated binary to the source control solution you are using for your WDAC policies. such as [GitHub](https://github.com/) or a document management solution such as [Office 365 SharePoint](https://products.office.com/sharepoint/collaboration).
+
+3. Deploy the merged policy using your preferred deployment solution. See [Deploying Windows Defender Application Control (WDAC) policies](windows-defender-application-control-deployment-guide.md)
diff --git a/windows/security/threat-protection/windows-defender-application-control/operations/known-issues.md b/windows/security/threat-protection/windows-defender-application-control/operations/known-issues.md
new file mode 100644
index 0000000000..c525c8832f
--- /dev/null
+++ b/windows/security/threat-protection/windows-defender-application-control/operations/known-issues.md
@@ -0,0 +1,46 @@
+---
+title: WDAC Admin Tips & Known Issues
+description: WDAC Known Issues
+keywords: security, malware
+ms.prod: m365-security
+audience: ITPro
+ms.collection: M365-security-compliance
+author: jsuther1974
+ms.reviewer: jogeurte
+ms.author: jogeurte
+ms.manager: jsuther
+manager: dansimp
+ms.date: 04/14/2021
+ms.technology: mde
+ms.topic: article
+ms.localizationpriority: medium
+---
+
+# WDAC Admin Tips & Known Issues
+
+**Applies to:**
+
+- Windows 10
+- Windows Server 2016 and above
+
+This topic covers tips and tricks for admins as well as known issues with WDAC.
+Test this configuration in your lab before enabling it in production.
+
+## .NET native images may generate false positive block events
+
+In some cases, the code integrity logs where WDAC errors and warnings are written will contain error events for native images generated for .NET assemblies. Typically, native image blocks are functionally benign as a blocked native image will fallback to its corresponding assembly and .NET will regenerate the native image at its next scheduled maintenance window.
+
+## MSI Installations launched directly from the internet are blocked by WDAC
+
+Installing .msi files directly from the internet to a computer protected by WDAC will fail.
+For example, this command will not work:
+
+```code
+msiexec –i https://download.microsoft.com/download/2/E/3/2E3A1E42-8F50-4396-9E7E-76209EA4F429/Windows10_Version_1511_ADMX.msi
+```
+
+As a workaround, download the MSI file and run it locally:
+
+```code
+msiexec –i c:\temp\Windows10_Version_1511_ADMX.msi
+```
diff --git a/windows/security/threat-protection/windows-defender-application-control/plan-windows-defender-application-control-management.md b/windows/security/threat-protection/windows-defender-application-control/plan-windows-defender-application-control-management.md
index 483e3784a3..7924b31d89 100644
--- a/windows/security/threat-protection/windows-defender-application-control/plan-windows-defender-application-control-management.md
+++ b/windows/security/threat-protection/windows-defender-application-control/plan-windows-defender-application-control-management.md
@@ -31,7 +31,6 @@ This topic describes the decisions you need to make to establish the processes f
The first step in implementing application control is to consider how your policies will be managed and maintained over time. Developing a process for managing WDAC policies helps assure that WDAC continues to effectively control how applications are allowed to run in your organization.
-
Most WDAC policies will evolve over time and proceed through a set of identifiable phases during their lifetime. Typically, these phases include:
1. [Define (or refine) the "circle-of-trust"](understand-windows-defender-application-control-policy-design-decisions.md) for the policy and build an audit mode version of the policy XML. In audit mode, block events are generated but files are not prevented from executing.
@@ -42,6 +41,8 @@ Most WDAC policies will evolve over time and proceed through a set of identifiab
6. Deploy the enforced mode policy to intended devices. We recommend using staged rollouts for enforced policies to detect and respond to issues before deploying the policy broadly.
7. Repeat steps 1-6 anytime the desired "circle-of-trust" changes.
+
+
### Keep WDAC policies in a source control or document management solution
To effectively manage WDAC policies, you should store and maintain your policy XML documents in a central repository that is accessible to everyone responsible for WDAC policy management. We recommend a source control solution such as [GitHub](https://github.com/) or a document management solution such as [Office 365 SharePoint](https://products.office.com/sharepoint/collaboration), which provide version control and allow you to specify metadata about the XML documents.
@@ -66,7 +67,7 @@ Each time that a process is blocked by WDAC, events will be written to either th
Collecting these events in a central location can help you maintain your WDAC policy and troubleshoot rule configuration problems. Event collection technologies such as those available in Windows allow administrators to subscribe to specific event channels and have the events from source computers aggregated into a forwarded event log on a Windows Server operating system collector. For more info about setting up an event subscription, see [Configure Computers to Collect and Forward Events](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc748890(v=ws.11)).
-Additionally, WDAC events are collected by [Microsoft Defender for Endpoint](/windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-advanced-threat-protection) and can be queried using the [advanced hunting](querying-application-control-events-centrally-using-advanced-hunting.md) feature.
+Additionally, WDAC events are collected by [Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint) and can be queried using the [advanced hunting](querying-application-control-events-centrally-using-advanced-hunting.md) feature.
## Application and user support policy
@@ -99,4 +100,4 @@ After deciding how your organization will manage your WDAC policy, record your f
- **End-user support policy.** Document the process that you will use for handling calls from users who have attempted to run a blocked app, and ensure that support personnel have clear escalation steps so that the administrator can update the WDAC policy, if necessary.
- **Event processing.** Document whether events will be collected in a central location called a store, how that store will be archived, and whether the events will be processed for analysis.
-- **Policy management.** Detail what policies are planned, how they will be managed, and how rules will be maintained over time.
\ No newline at end of file
+- **Policy management.** Detail what policies are planned, how they will be managed, and how rules will be maintained over time.
diff --git a/windows/security/threat-protection/windows-defender-application-control/select-types-of-rules-to-create.md b/windows/security/threat-protection/windows-defender-application-control/select-types-of-rules-to-create.md
index ad0435d8f2..1314fa6e21 100644
--- a/windows/security/threat-protection/windows-defender-application-control/select-types-of-rules-to-create.md
+++ b/windows/security/threat-protection/windows-defender-application-control/select-types-of-rules-to-create.md
@@ -1,6 +1,6 @@
---
-title: Understand WDAC policy rules and file rules (Windows 10)
-description: Learn how Windows Defender Application Control provides control over a computer running Windows 10 by using policies that include policy rules and file rules.
+title: Understand Windows Defender Application Control (WDAC) policy rules and file rules (Windows 10)
+description: Learn how WDAC policy rules and file rules can control your Windows 10 computers.
keywords: security, malware
ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
@@ -18,30 +18,30 @@ ms.date: 03/04/2020
ms.technology: mde
---
-# Understand WDAC policy rules and file rules
+# Understand Windows Defender Application Control (WDAC) policy rules and file rules
**Applies to:**
-- Windows 10
-- Windows Server 2016 and above
+- Windows 10
+- Windows Server 2016 and above
-Windows Defender Application Control (WDAC) provides control over a computer running Windows 10 by using policies that specify whether a driver or application is trusted and can be run. A policy includes *policy rules* that control options such as audit mode or whether user mode code integrity (UMCI) is enabled in a WDAC policy, and *file rules* (or *file rule levels*) that specify the level at which applications will be identified and trusted.
+Windows Defender Application Control (WDAC) can control what runs on Windows 10 by setting policies that specify whether a driver or application is trusted. A policy includes *policy rules* that control options such as audit mode, and *file rules* (or *file rule levels*) that specify how applications are identified and trusted.
## Windows Defender Application Control policy rules
To modify the policy rule options of an existing WDAC policy XML, use [Set-RuleOption](/powershell/module/configci/set-ruleoption). The following examples show how to use this cmdlet to add and remove a rule option on an existing WDAC policy:
-- To ensure that UMCI is enabled for a WDAC policy that was created with the `-UserPEs` (user mode) option, add rule option 0 to an existing policy by running the following command:
+- To ensure that UMCI is enabled for a WDAC policy that was created with the `-UserPEs` (user mode) option, add rule option 0 to an existing policy by running the following command:
`Set-RuleOption -FilePath -Option 0`
- Note that a policy that was created without the `-UserPEs` option is empty of user mode executables, that is, applications. If you enable UMCI (Option 0) for such a policy and then attempt to run an application, Windows Defender Application Control will see that the application is not on its list (which is empty of applications), and respond. In audit mode, the response is logging an event, and in enforced mode, the response is blocking the application. To create a policy that includes user mode executables (applications), when you run `New-CIPolicy`, include the `-UserPEs` option.
+ A policy created without the `-UserPEs` option has no rules for user mode code. If you enable UMCI (Option 0) for such a policy, WDAC will block all applications and even critical Windows user session code. In audit mode, WDAC simply logs an event, but when enforced, all user mode code will be blocked. To create a policy that includes user mode executables (applications), run `New-CIPolicy` with the `-UserPEs` option.
-- To disable UMCI on an existing WDAC policy, delete rule option 0 by running the following command:
+- To disable UMCI on an existing WDAC policy, delete rule option 0 by running the following command:
`Set-RuleOption -FilePath -Option 0 -Delete`
-You can set several rule options within a WDAC policy. Table 1 describes each rule option.
+You can set several rule options within a WDAC policy. Table 1 describes each rule option.
> [!NOTE]
> We recommend that you use **Enabled:Audit Mode** initially because it allows you to test new WDAC policies before you enforce them. With audit mode, no application is blocked—instead the policy logs an event whenever an application outside the policy is started. To allow these applications, you can capture the policy information from the event log, and then merge that information into the existing policy. When the **Enabled:Audit Mode** is deleted, the policy runs in enforced mode.
@@ -52,28 +52,28 @@ You can set several rule options within a WDAC policy. Table 1 describes each ru
|------------ | ----------- |
| **0 Enabled:UMCI** | WDAC policies restrict both kernel-mode and user-mode binaries. By default, only kernel-mode binaries are restricted. Enabling this rule option validates user mode executables and scripts. |
| **1 Enabled:Boot Menu Protection** | This option is not currently supported. |
-| **2 Required:WHQL** | By default, legacy drivers that are not Windows Hardware Quality Labs (WHQL) signed are allowed to execute. Enabling this rule requires that every executed driver is WHQL signed and removes legacy driver support. Going forward, every new Windows 10–compatible driver must be WHQL certified. |
-| **3 Enabled:Audit Mode (Default)** | Enables the execution of binaries outside of the WDAC policy but logs each occurrence in the CodeIntegrity event log, which can be used to update the existing policy before enforcement. To begin enforcing a WDAC policy, delete this option. |
-| **4 Disabled:Flight Signing** | If enabled, WDAC policies will not trust flightroot-signed binaries. This would be used in the scenario in which organizations only want to run released binaries, not flighted builds. |
+| **2 Required:WHQL** | By default, legacy drivers that are not Windows Hardware Quality Labs (WHQL) signed are allowed to execute. Enabling this rule requires that every executed driver is WHQL signed and removes legacy driver support. Kernel drivers built for Windows 10 should be WHQL certified. |
+| **3 Enabled:Audit Mode (Default)** | Instructs WDAC to log information about applications, binaries, and scripts that would have been blocked if the policy was enforced. You can use this option to identify the potential impact of your WDAC policy, and use the audit events to refine the policy before enforcement. To enforce a WDAC policy, delete this option. |
+| **4 Disabled:Flight Signing** | If enabled, WDAC policies will not trust flightroot-signed binaries. This option would be used by organizations that only want to run released binaries, not pre-release Windows builds. |
| **5 Enabled:Inherit Default Policy** | This option is reserved for future use and currently has no effect. |
-| **6 Enabled:Unsigned System Integrity Policy (Default)** | Allows the policy to remain unsigned. When this option is removed, the policy must be signed and have UpdatePolicySigners added to the policy to enable future policy modifications. |
+| **6 Enabled:Unsigned System Integrity Policy (Default)** | Allows the policy to remain unsigned. When this option is removed, the policy must be signed and the certificates that are trusted for future policy updates must be identified in the UpdatePolicySigners section. |
| **7 Allowed:Debug Policy Augmented** | This option is not currently supported. |
-| **8 Required:EV Signers** | In addition to being WHQL signed, this rule requires that drivers must have been submitted by a partner that has an Extended Verification (EV) certificate. All future Windows 10 and later drivers will meet this requirement. |
+| **8 Required:EV Signers** | This rule requires that drivers must be WHQL signed and have been submitted by a partner with an Extended Verification (EV) certificate. All Windows 10 and later drivers will meet this requirement. |
| **9 Enabled:Advanced Boot Options Menu** | The F8 preboot menu is disabled by default for all WDAC policies. Setting this rule option allows the F8 menu to appear to physically present users. |
| **10 Enabled:Boot Audit on Failure** | Used when the WDAC policy is in enforcement mode. When a driver fails during startup, the WDAC policy will be placed in audit mode so that Windows will load. Administrators can validate the reason for the failure in the CodeIntegrity event log. |
-| **11 Disabled:Script Enforcement** | This option disables script enforcement options. Unsigned PowerShell scripts and interactive PowerShell are no longer restricted to [Constrained Language Mode](/powershell/module/microsoft.powershell.core/about/about_language_modes). NOTE: This option is supported on 1709, 1803, and 1809 builds with the 2019 10C LCU or higher, as well as on devices with the Windows 10 May 2019 Update (1903) and higher. Using it on pre-1903 versions of Windows 10 without the 10C or later LCU is not supported and may have unintended results. |
+| **11 Disabled:Script Enforcement** | This option disables script enforcement options. Unsigned PowerShell scripts and interactive PowerShell are no longer restricted to [Constrained Language Mode](/powershell/module/microsoft.powershell.core/about/about_language_modes). NOTE: This option is supported on 1709, 1803, and 1809 builds with the 2019 10C LCU or higher, and on devices with the Windows 10 May 2019 Update (1903) and higher. Using it on versions of Windows 10 without the proper update may have unintended results. |
| **12 Required:Enforce Store Applications** | If this rule option is enabled, WDAC policies will also apply to Universal Windows applications. |
-| **13 Enabled:Managed Installer** | Use this option to automatically allow applications installed by a software distribution solution, such as Microsoft Endpoint Configuration Manager, that has been defined as a managed installer. |
+| **13 Enabled:Managed Installer** | Use this option to automatically allow applications installed by a managed installer. For more information, see [Authorize apps deployed with a WDAC managed installer](use-windows-defender-application-control-with-managed-installer.md) |
| **14 Enabled:Intelligent Security Graph Authorization** | Use this option to automatically allow applications with "known good" reputation as defined by Microsoft’s Intelligent Security Graph (ISG). |
-| **15 Enabled:Invalidate EAs on Reboot** | When the Intelligent Security Graph option (14) is used, WDAC sets an extended file attribute that indicates that the file was authorized to run. This option will cause WDAC to periodically re-validate the reputation for files that were authorized by the ISG.|
+| **15 Enabled:Invalidate EAs on Reboot** | When the Intelligent Security Graph option (14) is used, WDAC sets an extended file attribute that indicates that the file was authorized to run. This option will cause WDAC to periodically revalidate the reputation for files that were authorized by the ISG.|
| **16 Enabled:Update Policy No Reboot** | Use this option to allow future WDAC policy updates to apply without requiring a system reboot. NOTE: This option is only supported on Windows 10, version 1709, and above.|
| **17 Enabled:Allow Supplemental Policies** | Use this option on a base policy to allow supplemental policies to expand it. NOTE: This option is only supported on Windows 10, version 1903, and above. |
-| **18 Disabled:Runtime FilePath Rule Protection** | Disable default FilePath rule protection (apps and executables allowed based on file path rules must come from a file path that’s only writable by an administrator) for any FileRule that allows a file based on FilePath. NOTE: This option is only supported on Windows 10, version 1903, and above. |
-| **19 Enabled:Dynamic Code Security** | Enables policy enforcement for .NET applications and dynamically-loaded libraries. NOTE: This option is only supported on Windows 10, version 1803, and above. |
+| **18 Disabled:Runtime FilePath Rule Protection** | This option disables the default runtime check that only allows FilePath rules for paths that are only writable by an administrator. NOTE: This option is only supported on Windows 10, version 1903, and above. |
+| **19 Enabled:Dynamic Code Security** | Enables policy enforcement for .NET applications and dynamically loaded libraries. NOTE: This option is only supported on Windows 10, version 1803, and above. |
## Windows Defender Application Control file rule levels
-File rule levels allow administrators to specify the level at which they want to trust their applications. This level of trust could be as fine-tuned as the hash of each binary or as general as a CA certificate. You specify file rule levels both when you create a new WDAC policy from a scan and when you create a policy from audit events. In addition, to combine rule levels found in multiple policies, you can merge the policies. When merged, WDAC policies combine their file rules, so that any application that would be allowed by either of the original policies will be allowed by the combined policy.
+File rule levels allow administrators to specify the level at which they want to trust their applications. This level of trust could be as granular as the hash of each binary or as general as a CA certificate. You specify file rule levels when using WDAC PowerShell cmdlets to create and modify policies.
Each file rule level has its benefit and disadvantage. Use Table 2 to select the appropriate protection level for your available administrative resources and Windows Defender Application Control deployment scenario.
@@ -81,18 +81,18 @@ Each file rule level has its benefit and disadvantage. Use Table 2 to select the
| Rule level | Description |
|----------- | ----------- |
-| **Hash** | Specifies individual hash values for each discovered binary. Although this level is specific, it can cause additional administrative overhead to maintain the current product versions’ hash values. Each time a binary is updated, the hash value changes, therefore requiring a policy update. |
-| **FileName** | Specifies individual binary file names. Although the hash values for an application are modified when updated, the file names are typically not. This offers less specific security than the hash level but does not typically require a policy update when any binary is modified. |
-| **FilePath** | Beginning with Windows 10 version 1903, this specifies rules that allow execution of binaries contained under specific file path locations. Additional information about FilePath level rules can be found below. |
-| **SignedVersion** | This combines the publisher rule with a version number. This option allows anything from the specified publisher, with a version at or above the specified version number, to run. |
-| **Publisher** | This is a combination of the PcaCertificate level (typically one certificate below the root) and the common name (CN) of the leaf certificate. This rule level allows organizations to trust a certificate from a major CA (such as Symantec), but only if the leaf certificate is from a specific company (such as Intel, for device drivers). |
-| **FilePublisher** | This is a combination of the “FileName” attribute of the signed file, plus “Publisher” (PCA certificate with CN of leaf), plus a minimum version number. This option trusts specific files from the specified publisher, with a version at or above the specified version number. |
-| **LeafCertificate** | Adds trusted signers at the individual signing certificate level. The benefit of using this level versus the individual hash level is that new versions of the product will have different hash values but typically the same signing certificate. Using this level, no policy update would be needed to run the new version of the application. However, leaf certificates have much shorter validity periods than CA certificates, so additional administrative overhead is associated with updating the WDAC policy when these certificates expire. |
-| **PcaCertificate** | Adds the highest available certificate in the provided certificate chain to signers. This is typically one certificate below the root certificate, because the scan does not validate anything beyond the certificates included in the provided signature (it does not go online or check local root stores). |
+| **Hash** | Specifies individual hash values for each discovered binary. This is the most specific level and requires additional effort to maintain the current product versions’ hash values. Each time a binary is updated, the hash value changes, therefore requiring a policy update. |
+| **FileName** | Specifies the original filename for each binary. Although the hash values for an application are modified when updated, the file names are typically not. This level offers less specific security than the hash level but does not typically require a policy update when any binary is modified. |
+| **FilePath** | Beginning with Windows 10 version 1903, this level allows binaries to run from specific file path locations. Additional information about FilePath level rules can be found below. |
+| **SignedVersion** | This level combines the publisher rule with a version number and allows anything to run from the specified publisher with a version at or above the specified version number. |
+| **Publisher** | This level combines the PcaCertificate level (typically one certificate below the root) and the common name (CN) of the leaf certificate. You can use this rule level to trust a certificate issued by a particular CA and issued to a specific company you trust (such as Intel, for device drivers). |
+| **FilePublisher** | This level combines the “FileName” attribute of the signed file, plus “Publisher” (PCA certificate with CN of leaf), plus a minimum version number. This option trusts specific files from the specified publisher, with a version at or above the specified version number. |
+| **LeafCertificate** | Adds trusted signers at the individual signing certificate level. The benefit of using this level versus the individual hash level is that new versions of the product will have different hash values but typically the same signing certificate. Using this level, no policy update would be needed to run the new version of the application. However, leaf certificates have much shorter validity periods than other certificate levels, so the WDAC policy must be updated whenever these certificates change. |
+| **PcaCertificate** | Adds the highest available certificate in the provided certificate chain to signers. This level is typically one certificate below the root certificate, because the scan does not validate anything beyond the certificates included in the provided signature (it does not go online or check local root stores). |
| **RootCertificate** | Currently unsupported. |
-| **WHQL** | Trusts binaries if they have been validated and signed by WHQL. This is primarily for kernel binaries. |
-| **WHQLPublisher** | This is a combination of the WHQL and the CN on the leaf certificate and is primarily for kernel binaries. |
-| **WHQLFilePublisher** | Specifies that the binaries are validated and signed by WHQL, with a specific publisher (WHQLPublisher), and that the binary is the specified version or newer. This is primarily for kernel binaries. |
+| **WHQL** | Trusts binaries if they have been validated and signed by WHQL. This level is primarily for kernel binaries. |
+| **WHQLPublisher** | This level combines the WHQL level and the CN on the leaf certificate and is primarily for kernel binaries. |
+| **WHQLFilePublisher** | Specifies that the binaries are validated and signed by WHQL, with a specific publisher (WHQLPublisher), and that the binary is the specified version or newer. This level is primarily for kernel binaries. |
> [!NOTE]
> When you create WDAC policies with [New-CIPolicy](/powershell/module/configci/new-cipolicy), you can specify a primary file rule level by including the **-Level** parameter. For discovered binaries that cannot be trusted based on the primary file rule criteria, use the **-Fallback** parameter. For example, if the primary file rule level is PCACertificate but you would like to trust the unsigned applications as well, using the Hash rule level as a fallback adds the hash values of binaries that did not have a signing certificate.
@@ -102,37 +102,35 @@ Each file rule level has its benefit and disadvantage. Use Table 2 to select the
## Example of file rule levels in use
-For example, consider some IT professionals in a department that runs many servers. They decide they want their servers to run only software signed by the providers of their software and drivers, that is, the companies that provide their hardware, operating system, antivirus, and other important software. They know that their servers also run an internally written application that is unsigned but is rarely updated. They want to allow this application to run.
+For example, consider an IT professional in a department that runs many servers. They only want to run software signed by the companies that provide their hardware, operating system, antivirus, and other important software. They know that their servers also run an internally written application that is unsigned but is rarely updated. They want to allow this application to run.
-To create the WDAC policy, they build a reference server on their standard hardware, and install all of the software that their servers are known to run. Then they run [New-CIPolicy](/powershell/module/configci/new-cipolicy) with **-Level Publisher** (to allow software from their software providers, the "Publishers") and **-Fallback Hash** (to allow the internal, unsigned application). They enable the policy in auditing mode and gather information about any necessary software that was not included on the reference server. They merge WDAC policies into the original policy to allow that additional software to run. Then they enable the WDAC policy in enforced mode for their servers.
+To create the WDAC policy, they build a reference server on their standard hardware, and install all of the software that their servers are known to run. Then they run [New-CIPolicy](/powershell/module/configci/new-cipolicy) with **-Level Publisher** (to allow software from their software providers, the "Publishers") and **-Fallback Hash** (to allow the internal, unsigned application). They deploy the policy in auditing mode to determine the potential impact from enforcing the policy. Using the audit data, they update their WDAC policies to include any additional software they want to run. Then they enable the WDAC policy in enforced mode for their servers.
-As part of normal operations, they will eventually install software updates, or perhaps add software from the same software providers. Because the "Publisher" remains the same on those updates and software, they will not need to update their WDAC policy. If they come to a time when the internally-written, unsigned application must be updated, they must also update the WDAC policy so that the hash in the policy matches the hash of the updated internal application.
-
-They could also choose to create a catalog that captures information about the unsigned internal application, then sign and distribute the catalog. Then the internal application could be handled by WDAC policies in the same way as any other signed application. An update to the internal application would only require that the catalog be regenerated, signed, and distributed (no restarts would be required).
+As part of normal operations, they will eventually install software updates, or perhaps add software from the same software providers. Because the "Publisher" remains the same on those updates and software, they will not need to update their WDAC policy. If the unsigned, internal application is updated, they must also update the WDAC policy to allow the new version.
## More information about filepath rules
-Filepath rules do not provide the same security guarantees that explicit signer rules do, as they are based on mutable access permissions. Filepath rules are best suited for environments where most users are running as standard rather than admin. IT Pros should take care while crafting path rules to allow paths that they know are likely to remain to be admin-writeable only and deny execution from sub-directories where standard users can modify ACLs on the folder.
+Filepath rules do not provide the same security guarantees that explicit signer rules do, as they are based on mutable access permissions. Filepath rules are best suited for environments where most users are running as standard rather than admin. Path rules are best suited to allow paths that you expect will remain admin-writeable only. You may want to avoid path rules for directories where standard users can modify ACLs on the folder.
-By default, WDAC performs a user-writeability check at runtime which ensures that the current permissions on the specified filepath and its parent directories (recursively) do not allow standard users write access.
+By default, WDAC performs a user-writeability check at runtime that ensures that the current permissions on the specified filepath and its parent directories (recursively) do not allow standard users write access.
-There is a defined list of SIDs which WDAC recognizes as admins. If a filepath allows write permissions for any SID not in this list, the filepath is considered to be user-writeable even if the additional SID is associated to a custom admin user. To handle these special cases, you can override WDAC's runtime admin-writeable check with the **Disabled:Runtime FilePath Rule Protection** option described above.
+There is a defined list of SIDs which WDAC recognizes as admins. If a filepath allows write permissions for any SID not in this list, the filepath is considered to be user-writeable even if the SID is associated to a custom admin user. To handle these special cases, you can override WDAC's runtime admin-writeable check with the **Disabled:Runtime FilePath Rule Protection** option described above.
-WDAC's list of well-known admin SIDs are:
-S-1-3-0; S-1-5-18; S-1-5-19; S-1-5-20; S-1-5-32-544; S-1-5-32-549; S-1-5-32-550; S-1-5-32-551; S-1-5-32-577; S-1-5-32-559; S-1-5-32-568; S-1-15-2-1430448594-2639229838-973813799-439329657-1197984847-4069167804-1277922394; S-1-15-2-95739096-486727260-2033287795-3853587803-1685597119-444378811-2746676523.
+WDAC's list of well-known admin SIDs are:
-When generating filepath rules using [New-CIPolicy](/powershell/module/configci/new-cipolicy), a unique, fully-qualified path rule is generated for every file discovered in the scanned path(s). To create rules that instead allow all files under a specified folder path, use [New-CIPolicyRule](/powershell/module/configci/new-cipolicyrule) to define rules containing wildcards using the [-FilePathRules](/powershell/module/configci/new-cipolicyrule#parameters) switch.
+S-1-3-0; S-1-5-18; S-1-5-19; S-1-5-20; S-1-5-32-544; S-1-5-32-549; S-1-5-32-550; S-1-5-32-551; S-1-5-32-577; S-1-5-32-559; S-1-5-32-568; S-1-15-2-1430448594-2639229838-973813799-439329657-1197984847-4069167804-1277922394; S-1-15-2-95739096-486727260-2033287795-3853587803-1685597119-444378811-2746676523.
-Wildcards can be used at the beginning or end of a path rule; only one wildcard is allowed per path rule. Wildcards placed at the end of a path authorize all files in that path and its subdirectories recursively (ex. `C:\\*` would include `C:\foo\\*` ). Wildcards placed at the beginning of a path will allow the exact specified filename under any path (ex. `*\bar.exe` would allow `C:\bar.exe` and `C:\foo\bar.exe`). Wildcards in the middle of a path are not supported (ex. `C:\\*\foo.exe`). Without a wildcard, the rule will allow only a specific file (ex. `C:\foo\bar.exe`).
The use of macros is also supported and useful in scenarios where the system drive is different from the `C:\` drive. Supported macros: `%OSDRIVE%`, `%WINDIR%`, `%SYSTEM32%`.
+When generating filepath rules using [New-CIPolicy](/powershell/module/configci/new-cipolicy), a unique, fully qualified path rule is generated for every file discovered in the scanned path(s). To create rules that instead allow all files under a specified folder path, use [New-CIPolicyRule](/powershell/module/configci/new-cipolicyrule) to define rules containing wildcards using the [-FilePathRules](/powershell/module/configci/new-cipolicyrule#parameters) switch.
-> [!NOTE]
-> Due to an existing bug, you can not combine Path-based ALLOW rules with any DENY rules in a single policy. Instead, either separate DENY rules into a separate Base policy or move the Path-based ALLOW rules into a supplemental policy as described in [Deploy multiple WDAC policies.](deploy-multiple-windows-defender-application-control-policies.md)
+Wildcards can be used at the beginning or end of a path rule; only one wildcard is allowed per path rule. Wildcards placed at the end of a path authorize all files in that path and its subdirectories recursively (ex. `C:\*` would include `C:\foo\*` ). Wildcards placed at the beginning of a path will allow the exact specified filename under any path (ex. `*\bar.exe` would allow `C:\bar.exe` and `C:\foo\bar.exe`). Wildcards in the middle of a path are not supported (ex. `C:\*\foo.exe`). Without a wildcard, the rule will allow only a specific file (ex. `C:\foo\bar.exe`).
+
+You can also use the following macros when the exact volume may vary: `%OSDRIVE%`, `%WINDIR%`, `%SYSTEM32%`.
## Windows Defender Application Control filename rules
-File name rule levels provide administrators to specify the file attributes off which to base a file name rule. File name rules provide the same security guarantees that explicit signer rules do, as they are based on non-mutable file attributes. Specification of the file name level occurs when creating new policy rules. In addition, to combine file name levels found in multiple policies, you can merge multiple policies.
+File name rule levels let you specify file attributes to base a rule on. File name rules provide the same security guarantees that explicit signer rules do, as they are based on non-mutable file attributes. Specification of the file name level occurs when creating new policy rules.
-Use Table 3 to select the appropriate file name level for your available administrative resources and Windows Defender Application Control deployment scenario. For instance, an LOB or production application and its binaries (eg. DLLs) may all share the same product name. This allows users to easily create targeted policies based on the Product Name filename rule level.
+Use Table 3 to select the appropriate file name level for your use cases. For instance, an LOB or production application and its binaries may all share the same product name. This option lets you easily create targeted policies based on the Product Name filename rule level.
**Table 3. Windows Defender Application Control policy - filename levels**
@@ -142,4 +140,4 @@ Use Table 3 to select the appropriate file name level for your available adminis
| **Internal Name** | Specifies the internal name of the binary. |
| **Original File Name** | Specifies the original file name, or the name with which the file was first created, of the binary. |
| **Package Family Name** | Specifies the package family name of the binary. The package family name consists of two parts: the name of the file and the publisher ID. |
-| **Product Name** | Specifies the name of the product with which the binary ships. |
\ No newline at end of file
+| **Product Name** | Specifies the name of the product with which the binary ships. |
diff --git a/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-intelligent-security-graph.md b/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-intelligent-security-graph.md
index 6fbcea760e..7ad4a8467b 100644
--- a/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-intelligent-security-graph.md
+++ b/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-intelligent-security-graph.md
@@ -18,40 +18,38 @@ ms.date: 03/10/2020
ms.technology: mde
---
-# Authorize reputable apps with the Intelligent Security Graph (ISG)
+# Authorize reputable apps with the Intelligent Security Graph (ISG)
**Applies to:**
- Windows 10
- Windows Server 2016 and above
-Application execution control can be difficult to implement in enterprises that do not have processes to effectively control the deployment of applications centrally through an IT managed system. In such environments, users are empowered to acquire the applications they need for work, making accounting for all the applications that would need to be authorized for execution control a daunting task.
+Application control can be difficult to implement in organizations that don't deploy and manage applications through an IT-managed system. In such environments, users can acquire the applications they want to use for work, making it hard to build an effective application control policy.
-Windows 10, version 1709 (also known as the Windows 10 Fall Creators Update) provides a new option, known as the Microsoft Intelligent Security Graph authorization, that allows IT administrators to automatically authorize applications that the Microsoft Intelligent Security Graph recognizes as having known good reputation. The Microsoft Intelligent Security Graph option helps IT organizations take a significant first step towards going from having no application control at all to a simple means of preventing the execution of unknown and known bad software. To learn more about the Microsoft Intelligent Security Graph, see the Security section in [Major services and features in Microsoft Graph](/graph/overview-major-services).
+Beginning with Windows 10, version 1709, you can set an option to automatically allow applications that the Microsoft Intelligent Security Graph recognizes as having known good reputation. The ISG option helps organizations begin to implement application control even when the organization has limited control over their app ecosystem. To learn more about the Microsoft Intelligent Security Graph, see the Security section in [Major services and features in Microsoft Graph](/graph/overview-major-services).
-## How does the integration between WDAC and the Intelligent Security Graph work?
+## How does the integration between WDAC and the Intelligent Security Graph work?
-The Microsoft Intelligent Security Graph relies on the same vast security intelligence and machine learning analytics which power Microsoft Defender SmartScreen and Microsoft Defender Antivirus to help classify applications as having known good, known bad, or unknown reputation. When an unevaluated file is run on a system with WDAC enabled with the Microsoft Intelligent Security Graph authorization option specified, WDAC queries the file's reputation by sending its hash and signing information to the cloud. If the Microsoft Intelligent Security Graph determines that the file has a known good reputation, the $KERNEL.SMARTLOCKER.ORIGINCLAIM kernel Extended Attribute (EA) is written to the file. Every time the file tries to execute, if there are no explicit deny rules present for the file, it will be allowed to run based on its positive reputation. Conversely, a file that has unknown or known bad reputation will still be allowed to run in the presence of a rule that explicitly allows the file.
+The ISG uses the same vast security intelligence and machine learning analytics that power Microsoft Defender SmartScreen and Microsoft Defender Antivirus to help classify applications as having known good, known bad, or unknown reputation. When a binary runs on a system with WDAC enabled with the ISG option, WDAC checks the file's reputation by sending its hash and signing information to the cloud. If the ISG reports that the file has a known good reputation, the $KERNEL.SMARTLOCKER.ORIGINCLAIM kernel Extended Attribute (EA) is written to the file. Every time the binary runs, it is allowed based on its positive reputation unless there is an explicit deny rule set in the WDAC policy. Conversely, a file that has unknown or known bad reputation will be allowed if your WDAC policy explicitly allows it.
-Additionally, an application installer which is determined to have known good reputation will pass along that positive reputation to any files that it writes. This way, all the files needed to install and run an app are granted positive reputation data.
+If the file with good reputation is an application installer, its reputation will pass along to any files that it writes to disk. This way, all the files needed to install and run an app inherit the positive reputation data from the installer.
WDAC periodically re-queries the reputation data on a file. Additionally, enterprises can specify that any cached reputation results are flushed on reboot by using the **Enabled:Invalidate EAs on Reboot** option.
>[!NOTE]
>Admins should make sure there is a WDAC policy in place to allow the system to boot and run any other authorized applications that may not be classified as being known good by the Intelligent Security Graph, such as custom line-of-business (LOB) apps. Since the Intelligent Security Graph is powered by global prevalence data, internal LOB apps may not be recognized as being known good. Other mechanisms like managed installer and explicit rules will help cover internal applications. Both Microsoft Endpoint Manager Configuration Manager (MEMCM) and Microsoft Endpoint Manager Intune (MEM Intune) can be used to create and push a WDAC policy to your client machines.
-Other examples of WDAC policies are available in `C:\Windows\schemas\CodeIntegrity\ExamplePolicies` and can help authorize Windows OS components, WHQL signed drivers and all Store apps. Admins can reference and customize them as needed for their Windows Defender Application Control deployment or [create a custom WDAC policy](./create-initial-default-policy.md).
+## Configuring Intelligent Security Graph authorization for Windows Defender Application Control
-## Configuring Intelligent Security Graph authorization for Windows Defender Application Control
+Setting up the ISG is easy using any management solution you wish. Configuring the Microsoft Intelligent Security Graph option involves these basic steps:
-Setting up the Microsoft Intelligent Security Graph authorization is easy regardless of what management solution you use. Configuring the Microsoft Intelligent Security Graph option involves these basic steps:
+- [Ensure that the Microsoft Intelligent Security Graph option is enabled in the WDAC policy XML](#ensure-that-the-intelligent-security-graph-option-is-enabled-in-the-wdac-policy-xml)
+- [Enable the necessary services to allow WDAC to use the Microsoft Intelligent Security Graph correctly on the client](#enable-the-necessary-services-to-allow-wdac-to-use-the-isg-correctly-on-the-client)
-- [Ensure that the Microsoft Intelligent Security Graph option is enabled in the WDAC policy XML](#ensure-that-the-intelligent-security-graph-option-is-enabled-in-the-wdac-policy-xml)
-- [Enable the necessary services to allow WDAC to use the Microsoft Intelligent Security Graph correctly on the client](#enable-the-necessary-services-to-allow-wdac-to-use-the-isg-correctly-on-the-client)
+### Ensure that the Intelligent Security Graph option is enabled in the WDAC policy XML
-### Ensure that the Intelligent Security Graph option is enabled in the WDAC policy XML
-
-In order to enable trust for executables based on classifications in the Microsoft Intelligent Security Graph, the **Enabled:Intelligent Security Graph authorization** option must be specified in the WDAC policy. This can be done with the Set-RuleOption cmdlet. In addition, it is recommended from a security perspective to also enable the **Enabled:Invalidate EAs on Reboot** option to invalidate the cached Intelligent Security Graph results on reboot to force rechecking of applications against the Microsoft Intelligent Security Graph. Caution is advised if devices will regularly transition to and from environments that may not be able to access the Microsoft Intelligent Security Graph. The following example shows both options being set.
+To allow apps and binaries based on the Microsoft Intelligent Security Graph, the **Enabled:Intelligent Security Graph authorization** option must be specified in the WDAC policy. This step can be done with the Set-RuleOption cmdlet. You should also enable the **Enabled:Invalidate EAs on Reboot** option so that ISG results are verified again after each reboot. The ISG option is not recommended for devices that don't have regular access to the internet. The following example shows both options being set.
```code
@@ -81,29 +79,27 @@ In order to enable trust for executables based on classifications in the Microso
### Enable the necessary services to allow WDAC to use the ISG correctly on the client
-In order for the heuristics used by the Microsoft Intelligent Security Graph to function properly, a number of component in Windows must be enabled. The easiest way to do this is to run the appidtel executable in `c:\windows\system32`.
+In order for the heuristics used by the ISG to function properly, a number of components in Windows must be enabled. You can configure these components by running the appidtel executable in `c:\windows\system32`.
```
appidtel start
```
-This step is not required for WDAC policies deployed over MDM using the AppLocker CSP, as the CSP will enable the necessary components. This step is also not required when enabling the Microsoft Intelligent Security Graph through the MEMCM WDAC UX. However, if custom policies are being deployed outside of the WDAC UX through MEMCM, then this step is required.
+This step isn't required for WDAC policies deployed over MDM, as the CSP will enable the necessary components. This step is also not required when the ISG is configured using MEMCM's WDAC integration.
-## Security considerations with the Intelligent Security Graph
+## Security considerations with the Intelligent Security Graph
-Since the Microsoft Intelligent Security Graph is a heuristic-based mechanism, it does not provide the same security guarantees that explicit allow or deny rules do. It is best suited for deployment to systems where each user is configured as a standard user and there are other monitoring systems in place like Microsoft Defender for Endpoint to help provide optics into what users are doing.
+Since the Microsoft Intelligent Security Graph is a heuristic-based mechanism, it doesn't provide the same security guarantees that explicit allow or deny rules do. It's best suited where users operate with standard user rights and where a security monitoring solution like Microsoft Defender for Endpoint is used.
-Users with administrator privileges or malware running as an administrator user on the system may be able to circumvent the intent of WDAC when the Microsoft Intelligent Security Graph option is allowed by circumventing or corrupting the heuristics used to assign reputation to application executables. The Microsoft Intelligent Security Graph option uses the same heuristic tracking as managed installer and so for application installers that include an option to automatically run the application at the end of the installation process the heuristic may over-authorize.
+Processes running with kernel privileges can circumvent WDAC by setting the ISG extended file attribute to make a binary appear to have known good reputation. Also, since the ISG option passes along reputation from application installers to the binaries they write to disk, it can over-authorize files in some cases where the installer launches the application upon completion.
## Known limitations with using the Intelligent Security Graph
-Since the Microsoft Intelligent Security Graph relies on identifying executables as being known good, there are cases where it may classify legitimate executables as unknown, leading to blocks that need to be resolved either with a rule in the WDAC policy, a catalog signed by a certificate trusted in the WDAC policy or by deployment through a WDAC managed installer. Typically, this is due to an installer or application using a dynamic file as part of execution. These files do not tend to build up known good reputation. Auto-updating applications have also been observed using this mechanism and may be flagged by the ISG.
+Since the ISG only allows binaries that are known good, there are cases where legitimate software may be unknown to the ISG and will be blocked by WDAC. In this case, you need to allow the software with a rule in your WDAC policy, deploy a catalog signed by a certificate trusted in the WDAC policy, or install the software from a WDAC managed installer. Installers or applications that dynamically create binaries at runtime, as well as self-updating applications, may exhibit this symptom.
-Modern apps are not supported with the Microsoft Intelligent Security Graph heuristics and will need to be separately authorized in your WDAC policy. As modern apps are signed by the Microsoft Store and Microsoft Store for Business, it is straightforward to authorize modern apps with signer rules in the WDAC policy.
+Packaged apps are not supported with the Microsoft Intelligent Security Graph heuristics and will need to be separately authorized in your WDAC policy. Since packaged apps have a strong app identity and must be signed, it is straightforward to authorize these apps with your WDAC policy.
-The Microsoft Intelligent Security Graph heuristics do not authorize kernel mode drivers. The WDAC policy must have rules that allow the necessary drivers to run.
-
-In some cases, the code integrity logs where WDAC errors and warnings are written will contain error events for native images generated for .NET assemblies. Typically, the error is functionally benign as a blocked native image will result in the corresponding assembly being re-interpreted. Review for functionality and performance for the related applications using the native images maybe necessary in some cases.
+The ISG doesn't authorize kernel mode drivers. The WDAC policy must have rules that allow the necessary drivers to run.
>[!NOTE]
-> A rule that explicitly denies or allows a file will take precedence over that file's reputation data. MEM Intune's built-in WDAC support includes the option to trust apps with good reputation via the Microsoft Intelligent Security Graph, but it has no option to add explicit allow or deny rules. In most circumstances, customers enforcing application control need to deploy a custom WDAC policy (which can include the Microsoft Intelligent Security Graph option if desired) using [Intune's OMA-URI functionality](./deploy-windows-defender-application-control-policies-using-intune.md#using-a-custom-oma-uri-profile).
\ No newline at end of file
+> A rule that explicitly denies or allows a file will take precedence over that file's reputation data. MEM Intune's built-in WDAC support includes the option to trust apps with good reputation via the Microsoft Intelligent Security Graph, but it has no option to add explicit allow or deny rules. In most circumstances, customers enforcing application control need to deploy a custom WDAC policy (which can include the Microsoft Intelligent Security Graph option if desired) using [Intune's OMA-URI functionality](deploy-windows-defender-application-control-policies-using-intune.md#deploy-wdac-policies-with-custom-oma-uri).
diff --git a/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-managed-installer.md b/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-managed-installer.md
index c3397bfba4..66afc7f933 100644
--- a/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-managed-installer.md
+++ b/windows/security/threat-protection/windows-defender-application-control/use-windows-defender-application-control-with-managed-installer.md
@@ -1,6 +1,6 @@
---
-title: Authorize apps deployed with a WDAC managed installer (Windows 10)
-description: Explains how you can use a managed installer to automatically authorize applications deployed and installed by a designated software distribution solution, such as Microsoft Endpoint Configuration Manager.
+title: Authorize apps installed by a managed installer (Windows 10)
+description: Explains how to automatically allow applications deployed and installed by a managed installer.
keywords: security, malware
ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
@@ -11,63 +11,49 @@ ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
+ms.reviewer: jogeurte
ms.author: dansimp
manager: dansimp
-ms.date: 08/14/2020
+ms.date: 04/20/2021
ms.technology: mde
---
-# Authorize apps deployed with a WDAC managed installer
+# Authorize apps deployed by a managed installer
**Applies to:**
- Windows 10
- Windows Server 2019
-Windows 10, version 1703 (also known as the Windows 10 Creators Update) provides a new option, known as a managed installer, that allows IT administrators to automatically authorize applications deployed and installed by a designated software distribution solution such as Microsoft Endpoint Configuration Manager.
-A managed installer helps an IT admin balance security and manageability requirements when employing application execution control policies by providing an option that does not require specifying explicit rules for software that is being managed through a software distribution solution.
+Windows 10, version 1703 introduced a new option for Windows Defender Application Control (WDAC), called managed installer, that helps balance security and manageability when enforcing application control policies. This option lets you automatically allow applications installed by a designated software distribution solution such as Microsoft Endpoint Configuration Manager.
## How does a managed installer work?
-A managed installer uses a new rule collection in AppLocker to specify one or more executables that are trusted by the organization as an authorized source for application deployment.
+A new rule collection in AppLocker specifies binaries that are trusted by the organization as an authorized source for application deployment. When one of these binaries runs, Windows will monitor the binary's process (and processes it launches) and tag all files it writes as having originated from a managed installer. The managed installer rule collection is configured using Group Policy and can be applied with the Set-AppLockerPolicy PowerShell cmdlet. You can't currently set managed installers with the AppLocker CSP through MDM.
-Specifying an executable as a managed installer will cause Windows to tag files that are written from the executable's process (or processes it launches) as having originated from a trusted installation authority. The Managed Installer rule collection is currently supported for AppLocker rules in Group Policy and in Configuration Manager, but not in the AppLocker CSP for OMA-URI policies.
+Having defined your managed installers using AppLocker, you can then configure WDAC to trust files installed by a managed installer by adding the Enabled:Managed Installer option to your WDAC policy. Once that option is set, WDAC will check for managed installer origin information when determining whether or not to allow a binary to run. As long as there are no deny rules present for the file, WDAC will allow a file to run based on its managed installer origin.
-Once the IT administrator adds the Allow: Managed Installer option to a WDAC policy, the WDAC component will subsequently check for the presence of the origin information when evaluating other application execution control rules specified in the policy. If there are no deny rules present for the file, it will be authorized based on the managed installer origin information.
+You should ensure that the WDAC policy allows the system to boot and any other authorized applications that can't be deployed through a managed installer.
-Admins needs to ensure that there is a WDAC policy in place to allow the system to boot and run any other authorized applications that may not be deployed through a managed installer.
-An example managed installer use-case can be seen in the guidance for [creating a WDAC policy for fully-managed devices](create-wdac-policy-for-fully-managed-devices.md).
-
-Note that a WDAC policy with managed installer configured will begin to tag files which originated from that managed installer, regardless of whether the policy is in audit or enforced mode.
+For an example of a managed installer use case, see [Creating a WDAC policy for fully managed devices](create-wdac-policy-for-fully-managed-devices.md).
## Security considerations with managed installer
-Since managed installer is a heuristic-based mechanism, it does not provide the same security guarantees that explicit allow or deny rules do.
-It is best suited for deployment to systems where each user is configured as a standard user and where all software is deployed and installed by a software distribution solution, such as Microsoft Endpoint Configuration Manager.
+Since managed installer is a heuristic-based mechanism, it doesn't provide the same security guarantees that explicit allow or deny rules do.
+It is best suited for use where each user operates as a standard user and where all software is deployed and installed by a software distribution solution, such as Microsoft Endpoint Configuration Manager.
Users with administrator privileges or malware running as an administrator user on the system may be able to circumvent the intent of Windows Defender Application Control when the managed installer option is allowed.
-If the authorized managed installer process performs installations in the context of a user with standard privileges, then it is possible that standard users or malware running as standard user may be able to circumvent the intent of Windows Defender Application Control.
-Some application installers include an option to automatically run the application at the end of the installation process. If this happens when the installer is run by a managed installer, then the managed installer's heuristic tracking and authorization may continue to apply to all files created during the first run of the application. This could result in over-authorization for executables that were not intended.
-To avoid this, ensure that the application deployment solution being used as a managed installer limits running applications as part of installation.
+
+If a managed installer process runs in the context of a user with standard privileges, then it is possible that standard users or malware running as standard user may be able to circumvent the intent of Windows Defender Application Control.
+
+Some application installers may automatically run the application at the end of the installation process. If this happens when the installer is run by a managed installer, then the managed installer's heuristic tracking and authorization will extend to all files created during the first run of the application. This could result in over-authorization for executables that were not intended. To avoid that outcome, ensure that the application deployment solution used as a managed installer limits running applications as part of installation.
## Known limitations with managed installer
-- Application execution control based on managed installer does not support applications that self-update/auto-update.
-If an application deployed by a managed installer subsequently updates itself, the updated application files will no longer include the managed installer origin information and will not be authorized to run.
-Enterprises should deploy and install all application updates using the managed installer.
-In some cases, it may be possible to also designate an application binary that performs the self-updates as a managed installer.
-Proper review for functionality and security should be performed for the application before using this method.
+- Application control based on managed installer does not support applications that self-update. If an application deployed by a managed installer later updates itself, the updated application files won't include the managed installer origin information and may not be able to run. When you rely on managed installers, you must deploy and install all application updates using a managed installer or include rules to authorize the app in the WDAC policy. In some cases, it may be possible to also designate an application binary that performs self-updates as a managed installer. Proper review for functionality and security should be performed for the application before using this method.
-- Modern apps deployed through a managed installer will not be tracked by the managed installer heuristic and will need to be separately authorized in your WDAC policy.
+- [Packaged apps (MSIX)](/windows/msix/) deployed through a managed installer aren't tracked by the managed installer heuristic and will need to be separately authorized in your WDAC policy. See [Manage packaged apps with WDAC](manage-packaged-apps-with-windows-defender-application-control.md).
-- Executables that extract files and then attempt to execute may not be allowed by the managed installer heuristic.
-In some cases, it may be possible to also designate an application binary that performs such an operation as a managed installer.
-Proper review for functionality and security should be performed for the application before using this method.
+- Some applications or installers may extract, download, or generate binaries and immediately attempt to run them. Files run by such a process may not be allowed by the managed installer heuristic. In some cases, it may be possible to also designate an application binary that performs such an operation as a managed installer. Proper review for functionality and security should be performed for the application before using this method.
-- The managed installer heuristic does not authorize drivers.
-The WDAC policy must have rules that allow the necessary drivers to run.
-
-- In some cases, the code integrity logs where WDAC errors and warnings are written will contain error events for native images generated for .NET assemblies.
-Typically, the error is functionally benign as a blocked native image will result in the corresponding assembly being re-interpreted.
-Review for functionality and performance for the related applications using the native images maybe necessary in some cases.
+- The managed installer heuristic doesn't authorize kernel drivers. The WDAC policy must have rules that allow the necessary drivers to run.
diff --git a/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control-deployment-guide.md b/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control-deployment-guide.md
index 68c0aa549e..ab280eb0bc 100644
--- a/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control-deployment-guide.md
+++ b/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control-deployment-guide.md
@@ -1,6 +1,6 @@
---
-title: Planning and getting started on the Windows Defender Application Control deployment process (Windows 10)
-description: Learn how to gather information, create a plan, and begin to test initial code integrity policies for a Windows Defender Application Control deployment.
+title: Deploying Windows Defender Application Control (WDAC) policies (Windows 10)
+description: Learn how to plan and implement a WDAC deployment.
keywords: security, malware
ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
ms.prod: m365-security
@@ -11,83 +11,33 @@ ms.localizationpriority: medium
audience: ITPro
ms.collection: M365-security-compliance
author: jsuther1974
-ms.reviewer: isbrahm
+ms.reviewer: jogeurte
ms.author: dansimp
manager: dansimp
ms.date: 05/16/2018
ms.technology: mde
---
-# Planning and getting started on the Windows Defender Application Control deployment process
+# Deploying Windows Defender Application Control (WDAC) policies
**Applies to**
-- Windows 10
-- Windows Server 2016
-This topic provides a roadmap for planning and getting started on the Windows Defender Application Control (WDAC) deployment process, with links to topics that provide additional detail. Planning for WDAC deployment involves looking at both the end-user and the IT pro impact of your choices.
+- Windows 10
+- Windows Server 2016 and above
-## Planning
+You should now have one or more WDAC policies ready to deploy. If you haven't yet completed the steps described in the [WDAC Design Guide](windows-defender-application-control-design-guide.md), do so now before proceeding.
-1. Review requirements, especially hardware requirements for VBS.
+## Plan your deployment
-2. Group devices by degree of control needed. Do most devices fit neatly into a few categories, or are they scattered across all categories? Are users allowed to install any application or must they choose from a list? Are users allowed to use their own peripheral devices?
Deployment is simpler if everything is locked down in the same way, but meeting individual departments' needs, and working with a wide variety of devices, may require a more complicated and flexible deployment.
+As with any significant change to your environment, implementing application control can have unintended consequences. To ensure the best chance for success, you should follow safe deployment practices and plan your deployment carefully. Decide what devices you will manage with WDAC and split them into deployment rings so you can control the scale of the deployment and respond if anything goes wrong. Define the success criteria that will determine when it's safe to continue from one ring to the next.
-3. Review how much variety in software and hardware is needed by roles or departments. The following questions can help you clarify how many WDAC policies to create:
+All WDAC policy changes should be deployed in audit mode before proceeding to enforcement. Carefully monitor events from devices where the policy has been deployed to ensure the block events you observe match your expectation before broadening the deployment to other deployment rings. If your organization uses Microsoft Defender for Endpoint, you can use the Advanced Hunting feature to centrally monitor WDAC-related events. Otherwise, we recommend using an event log forwarding solution to collect relevant events from your managed endpoints.
- - How standardized is the hardware?
This can be relevant because of drivers. You could create a WDAC policy on hardware that uses a particular set of drivers, and if other drivers in your environment use the same signature, they would also be allowed to run. However, you might need to create several WDAC policies on different "reference" hardware, then merge the policies together, to ensure that the resulting policy recognizes all the drivers in your environment.
-
- - What software does each department or role need? Should they be able to install and run other departments' software?
If multiple departments are allowed to run the same list of software, you might be able to merge several WDAC policies to simplify management.
-
- - Are there departments or roles where unique, restricted software is used?
If one department needs to run an application that no other department is allowed, it might require a separate WDAC policy. Similarly, if only one department must run an old version of an application (while other departments allow only the newer version), it might require a separate WDAC policy.
-
- - Is there already a list of accepted applications?
A list of accepted applications can be used to help create a baseline WDAC policy.
As of Windows 10, version 1703, it might also be useful to have a list of plug-ins, add-ins, or modules that you want to allow only in a specific app (such as a line-of-business app). Similarly, it might be useful to have a list of plug-ins, add-ins, or modules that you want to block in a specific app (such as a browser).
-
- - As part of a threat review process, have you reviewed systems for software that can load arbitrary DLLs or run code or scripts?
- In day-to-day operations, your organization's security policy may allow certain applications, code, or scripts to run on your systems depending on their role and the context. However, if your security policy requires that you run only trusted applications, code, and scripts on your systems, you may decide to lock these systems down securely with Windows Defender Application Control policies.
-
- Legitimate applications from trusted vendors provide valid functionality. However, an attacker could also potentially use that same functionality to run malicious executable code that could bypass WDAC.
-
- For operational scenarios that require elevated security, certain applications with known Code Integrity bypasses may represent a security risk if you allow them in your WDAC policies. Other applications, where older versions of the application had vulnerabilities, also represent a risk. Therefore, you may want to deny or block such applications from your WDAC policies. For applications with vulnerabilities, once the vulnerabilities are fixed you can create a rule that only allows the fixed or newer versions of that application. The decision to allow or block applications depends on the context and on how the reference system is being used.
-
- Security professionals collaborate with Microsoft continuously to help protect customers. With the help of their valuable reports, Microsoft has identified a list of known applications that an attacker could potentially use to bypass Windows Defender Application Control. Depending on the context, you may want to block these applications. To view this list of applications and for use case examples, such as disabling msbuild.exe, see [Microsoft recommended block rules](microsoft-recommended-block-rules.md).
-
-4. Identify LOB applications that are currently unsigned. Although requiring signed code (through WDAC) protects against many threats, your organization might use unsigned LOB applications, for which the process of signing might be difficult. You might also have applications that are signed, but you want to add a secondary signature to them. If so, identify these applications, because you will need to create a catalog file for them.
-
-## Getting started on the deployment process
-
-1. Optionally, create a signing certificate for Windows Defender Application Control. As you deploy WDAC, you might need to sign catalog files or WDAC policies internally. To do this, you will either need a publicly issued code signing certificate (that you purchase) or an internal CA. If you choose to use an internal CA, you will need to [create a code signing certificate](create-code-signing-cert-for-windows-defender-application-control.md).
-
-2. Create WDAC policies from reference computers. In this respect, creating and managing WDAC policies to align with the needs of roles or departments can be similar to managing corporate images. From each reference computer, you can create a WDAC policy, and decide how to manage that policy. You can [merge](merge-windows-defender-application-control-policies.md) WDAC policies to create a broader policy or a master policy, or you can manage and deploy each policy individually.
-
-3. Audit the WDAC policy and capture information about applications that are outside the policy. We recommend that you use [audit mode](audit-windows-defender-application-control-policies.md) to carefully test each WDAC policy before you enforce it. With audit mode, no application is blocked—the policy just logs an event whenever an application outside the policy is started. Later, you can expand the policy to allow these applications, as needed.
-
-4. Create a [catalog file](deploy-catalog-files-to-support-windows-defender-application-control.md) for unsigned LOB applications. Use the Package Inspector tool to create and sign a catalog file for your unsigned LOB applications. In later steps, you can merge the catalog file's signature into your WDAC policy, so that applications in the catalog will be allowed by the policy.
-
-6. Capture needed policy information from the event log, and merge information into the existing policy as needed. After a WDAC policy has been running for a time in audit mode, the event log will contain information about applications that are outside the policy. To expand the policy so that it allows for these applications, use Windows PowerShell commands to capture the needed policy information from the event log, and then merge that information into the existing policy. You can merge WDAC policies from other sources also, for flexibility in how you create your final WDAC policies.
-
-7. Deploy WDAC policies and catalog files. After you confirm that you have completed all the preceding steps, you can begin deploying catalog files and taking WDAC policies out of auditing mode. We strongly recommend that you begin this process with a test group of users. This provides a final quality-control validation before you deploy the catalog files and WDAC policies more broadly.
-
-8. Enable desired virtualization-based security (VBS) features. Hardware-based security features—also called virtualization-based security (VBS) features—strengthen the protections offered by Windows Defender Application Control.
-
-## Known issues
-
-This section covers known issues with WDAC. Virtualization-based protection of code integrity may be incompatible with some devices and applications, which might cause unexpected failures, data loss, or a blue screen error (also called a stop error).
-Test this configuration in your lab before enabling it in production.
-
-### MSI Installations are blocked by WDAC
-
-Installing .msi files directly from the internet to a computer protected by WDAC will fail.
-For example, this command will not work:
-
-```code
-msiexec –i https://download.microsoft.com/download/2/E/3/2E3A1E42-8F50-4396-9E7E-76209EA4F429/Windows10_Version_1511_ADMX.msi
-```
-
-As a workaround, download the MSI file and run it locally:
-
-
-```code
-msiexec –i c:\temp\Windows10_Version_1511_ADMX.msi
-```
+## Choose how to deploy WDAC policies
+There are several options to deploy WDAC policies to managed endpoints, including:
+1. [Deploy using a Mobile Device Management (MDM) solution](deploy-windows-defender-application-control-policies-using-intune.md), such as Microsoft Intune
+2. [Deploy using Microsoft Endpoint Configuration Manager (MEMCM)](deployment/deploy-wdac-policies-with-memcm.md)
+3. [Deploy via script](deployment/deploy-wdac-policies-with-script.md)
+4. [Deploy via Group Policy](deploy-windows-defender-application-control-policies-using-group-policy.md)
diff --git a/windows/security/threat-protection/windows-firewall/TOC.md b/windows/security/threat-protection/windows-firewall/TOC.md
deleted file mode 100644
index 00a5fecc08..0000000000
--- a/windows/security/threat-protection/windows-firewall/TOC.md
+++ /dev/null
@@ -1,184 +0,0 @@
-# [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md)
-
-## [Plan deployment]()
-
-### [Design guide](windows-firewall-with-advanced-security-design-guide.md)
-
-### [Design process](understanding-the-windows-firewall-with-advanced-security-design-process.md)
-
-### [Implementation goals]()
-#### [Identify implementation goals](identifying-your-windows-firewall-with-advanced-security-deployment-goals.md)
-#### [Protect devices from unwanted network traffic](protect-devices-from-unwanted-network-traffic.md)
-#### [Restrict access to only trusted devices](restrict-access-to-only-trusted-devices.md)
-#### [Require encryption](require-encryption-when-accessing-sensitive-network-resources.md)
-#### [Restrict access](restrict-access-to-only-specified-users-or-devices.md)
-
-### [Implementation designs]()
-#### [Mapping goals to a design](mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md)
-
-#### [Basic firewall design](basic-firewall-policy-design.md)
-##### [Basic firewall design example](firewall-policy-design-example.md)
-
-
-#### [Domain isolation design](domain-isolation-policy-design.md)
-##### [Domain isolation design example](domain-isolation-policy-design-example.md)
-
-
-#### [Server isolation design](server-isolation-policy-design.md)
-##### [Server Isolation design example](server-isolation-policy-design-example.md)
-
-
-#### [Certificate-based isolation design](certificate-based-isolation-policy-design.md)
-##### [Certificate-based Isolation design example](certificate-based-isolation-policy-design-example.md)
-
-### [Design planning]()
-#### [Planning your design](planning-your-windows-firewall-with-advanced-security-design.md)
-
-#### [Planning settings for a basic firewall policy](planning-settings-for-a-basic-firewall-policy.md)
-
-#### [Planning domain isolation zones]()
-##### [Domain isolation zones](planning-domain-isolation-zones.md)
-##### [Exemption list](exemption-list.md)
-##### [Isolated domain](isolated-domain.md)
-##### [Boundary zone](boundary-zone.md)
-##### [Encryption zone](encryption-zone.md)
-
-#### [Planning server isolation zones](planning-server-isolation-zones.md)
-
-#### [Planning certificate-based authentication](planning-certificate-based-authentication.md)
-##### [Documenting the Zones](documenting-the-zones.md)
-
-##### [Planning group policy deployment for your isolation zones](planning-group-policy-deployment-for-your-isolation-zones.md)
-###### [Planning isolation groups for the zones](planning-isolation-groups-for-the-zones.md)
-###### [Planning network access groups](planning-network-access-groups.md)
-
-###### [Planning the GPOs](planning-the-gpos.md)
-####### [Firewall GPOs](firewall-gpos.md)
-######## [GPO_DOMISO_Firewall](gpo-domiso-firewall.md)
-####### [Isolated domain GPOs](isolated-domain-gpos.md)
-######## [GPO_DOMISO_IsolatedDomain_Clients](gpo-domiso-isolateddomain-clients.md)
-######## [GPO_DOMISO_IsolatedDomain_Servers](gpo-domiso-isolateddomain-servers.md)
-####### [Boundary zone GPOs](boundary-zone-gpos.md)
-######## [GPO_DOMISO_Boundary](gpo-domiso-boundary.md)
-####### [Encryption zone GPOs](encryption-zone-gpos.md)
-######## [GPO_DOMISO_Encryption](gpo-domiso-encryption.md)
-####### [Server isolation GPOs](server-isolation-gpos.md)
-
-###### [Planning GPO deployment](planning-gpo-deployment.md)
-
-
-### [Planning to deploy](planning-to-deploy-windows-firewall-with-advanced-security.md)
-
-
-## [Deployment guide]()
-### [Deployment overview](windows-firewall-with-advanced-security-deployment-guide.md)
-
-### [Implementing your plan](implementing-your-windows-firewall-with-advanced-security-design-plan.md)
-
-### [Basic firewall deployment]()
-#### [Checklist: Implementing a basic firewall policy design](checklist-implementing-a-basic-firewall-policy-design.md)
-
-
-
-### [Domain isolation deployment]()
-#### [Checklist: Implementing a Domain Isolation Policy Design](checklist-implementing-a-domain-isolation-policy-design.md)
-
-
-
-### [Server isolation deployment]()
-#### [Checklist: Implementing a Standalone Server Isolation Policy Design](checklist-implementing-a-standalone-server-isolation-policy-design.md)
-
-
-
-### [Certificate-based authentication]()
-#### [Checklist: Implementing a Certificate-based Isolation Policy Design](checklist-implementing-a-certificate-based-isolation-policy-design.md)
-
-
-
-## [Best practices]()
-### [Configuring the firewall](best-practices-configuring.md)
-### [Securing IPsec](securing-end-to-end-ipsec-connections-by-using-ikev2.md)
-### [PowerShell](windows-firewall-with-advanced-security-administration-with-windows-powershell.md)
-### [Isolating Microsoft Store Apps on Your Network](isolating-apps-on-your-network.md)
-
-
-## [How-to]()
-### [Add Production devices to the membership group for a zone](add-production-devices-to-the-membership-group-for-a-zone.md)
-### [Add test devices to the membership group for a zone](add-test-devices-to-the-membership-group-for-a-zone.md)
-### [Assign security group filters to the GPO](assign-security-group-filters-to-the-gpo.md)
-### [Change rules from request to require mode](Change-Rules-From-Request-To-Require-Mode.Md)
-### [Configure authentication methods](Configure-authentication-methods.md)
-### [Configure data protection (Quick Mode) settings](configure-data-protection-quick-mode-settings.md)
-### [Configure Group Policy to autoenroll and deploy certificates](configure-group-policy-to-autoenroll-and-deploy-certificates.md)
-### [Configure key exchange (main mode) settings](configure-key-exchange-main-mode-settings.md)
-### [Configure the rules to require encryption](configure-the-rules-to-require-encryption.md)
-### [Configure the Windows Firewall log](configure-the-windows-firewall-log.md)
-### [Configure the workstation authentication certificate template](configure-the-workstation-authentication-certificate-template.md)
-### [Configure Windows Firewall to suppress notifications when a program is blocked](configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md)
-### [Confirm that certificates are deployed correctly](confirm-that-certificates-are-deployed-correctly.md)
-### [Copy a GPO to create a new GPO](copy-a-gpo-to-create-a-new-gpo.md)
-### [Create a Group Account in Active Directory](create-a-group-account-in-active-directory.md)
-### [Create a Group Policy Object](create-a-group-policy-object.md)
-### [Create an authentication exemption list rule](create-an-authentication-exemption-list-rule.md)
-### [Create an authentication request rule](create-an-authentication-request-rule.md)
-### [Create an inbound ICMP rule](create-an-inbound-icmp-rule.md)
-### [Create an inbound port rule](create-an-inbound-port-rule.md)
-### [Create an inbound program or service rule](create-an-inbound-program-or-service-rule.md)
-### [Create an outbound port rule](create-an-outbound-port-rule.md)
-### [Create an outbound program or service rule](create-an-outbound-program-or-service-rule.md)
-### [Create inbound rules to support RPC](create-inbound-rules-to-support-rpc.md)
-### [Create WMI filters for the GPO](create-wmi-filters-for-the-gpo.md)
-### [Create Windows Firewall rules in Intune](create-windows-firewall-rules-in-intune.md)
-### [Enable predefined inbound rules](enable-predefined-inbound-rules.md)
-### [Enable predefined outbound rules](enable-predefined-outbound-rules.md)
-### [Exempt ICMP from authentication](exempt-icmp-from-authentication.md)
-### [Link the GPO to the domain](link-the-gpo-to-the-domain.md)
-### [Modify GPO filters](modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md)
-### [Open IP security policies](open-the-group-policy-management-console-to-ip-security-policies.md)
-### [Open Group Policy](open-the-group-policy-management-console-to-windows-firewall.md)
-### [Open Group Policy](open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md)
-### [Open Windows Firewall](open-windows-firewall-with-advanced-security.md)
-### [Restrict server access](restrict-server-access-to-members-of-a-group-only.md)
-### [Enable Windows Firewall](turn-on-windows-firewall-and-configure-default-behavior.md)
-### [Verify Network Traffic](verify-that-network-traffic-is-authenticated.md)
-
-
-## [References]()
-### [Checklist: Creating Group Policy objects](checklist-creating-group-policy-objects.md)
-### [Checklist: Creating inbound firewall rules](checklist-creating-inbound-firewall-rules.md)
-### [Checklist: Creating outbound firewall rules](checklist-creating-outbound-firewall-rules.md)
-### [Checklist: Configuring basic firewall settings](checklist-configuring-basic-firewall-settings.md)
-
-
-### [Checklist: Configuring rules for the isolated domain](checklist-configuring-rules-for-the-isolated-domain.md)
-### [Checklist: Configuring rules for the boundary zone](checklist-configuring-rules-for-the-boundary-zone.md)
-### [Checklist: Configuring rules for the encryption zone](checklist-configuring-rules-for-the-encryption-zone.md)
-### [Checklist: Configuring rules for an isolated server zone](checklist-configuring-rules-for-an-isolated-server-zone.md)
-
-### [Checklist: Configuring rules for servers in a standalone isolated server zone](checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md)
-### [Checklist: Creating rules for clients of a standalone isolated server zone](checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md)
-
-
-### [Appendix A: Sample GPO template files for settings used in this guide](appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md)
-
-
-
-## [Troubleshooting]()
-### [Troubleshooting UWP app connectivity issues in Windows Firewall](troubleshooting-uwp-firewall.md)
-### [Filter origin audit log improvements](filter-origin-documentation.md)
-### [Quarantine behavior](quarantine.md)
-### [Firewall settings lost on upgrade](firewall-settings-lost-on-upgrade.md)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/security/threat-protection/windows-firewall/TOC.yml b/windows/security/threat-protection/windows-firewall/TOC.yml
new file mode 100644
index 0000000000..efaa07fa4e
--- /dev/null
+++ b/windows/security/threat-protection/windows-firewall/TOC.yml
@@ -0,0 +1,252 @@
+- name: Windows Firewall with Advanced Security
+ href: windows-firewall-with-advanced-security.md
+ items:
+ - name: Plan deployment
+ items:
+ - name: Design guide
+ href: windows-firewall-with-advanced-security-design-guide.md
+ - name: Design process
+ href: understanding-the-windows-firewall-with-advanced-security-design-process.md
+ - name: Implementation goals
+ items:
+ - name: Identify implementation goals
+ href: identifying-your-windows-firewall-with-advanced-security-deployment-goals.md
+ - name: Protect devices from unwanted network traffic
+ href: protect-devices-from-unwanted-network-traffic.md
+ - name: Restrict access to only trusted devices
+ href: restrict-access-to-only-trusted-devices.md
+ - name: Require encryption
+ href: require-encryption-when-accessing-sensitive-network-resources.md
+ - name: Restrict access
+ href: restrict-access-to-only-specified-users-or-devices.md
+ - name: Implementation designs
+ items:
+ - name: Mapping goals to a design
+ href: mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md
+ - name: Basic firewall design
+ href: basic-firewall-policy-design.md
+ items:
+ - name: Basic firewall design example
+ href: firewall-policy-design-example.md
+ - name: Domain isolation design
+ href: domain-isolation-policy-design.md
+ items:
+ - name: Domain isolation design example
+ href: domain-isolation-policy-design-example.md
+ - name: Server isolation design
+ href: server-isolation-policy-design.md
+ items:
+ - name: Server Isolation design example
+ href: server-isolation-policy-design-example.md
+ - name: Certificate-based isolation design
+ href: certificate-based-isolation-policy-design.md
+ items:
+ - name: Certificate-based Isolation design example
+ href: certificate-based-isolation-policy-design-example.md
+ - name: Design planning
+ items:
+ - name: Planning your design
+ href: planning-your-windows-firewall-with-advanced-security-design.md
+ - name: Planning settings for a basic firewall policy
+ href: planning-settings-for-a-basic-firewall-policy.md
+ - name: Planning domain isolation zones
+ items:
+ - name: Domain isolation zones
+ href: planning-domain-isolation-zones.md
+ - name: Exemption list
+ href: exemption-list.md
+ - name: Isolated domain
+ href: isolated-domain.md
+ - name: Boundary zone
+ href: boundary-zone.md
+ - name: Encryption zone
+ href: encryption-zone.md
+ - name: Planning server isolation zones
+ href: planning-server-isolation-zones.md
+ - name: Planning certificate-based authentication
+ href: planning-certificate-based-authentication.md
+ items:
+ - name: Documenting the Zones
+ href: documenting-the-zones.md
+ - name: Planning group policy deployment for your isolation zones
+ href: planning-group-policy-deployment-for-your-isolation-zones.md
+ items:
+ - name: Planning isolation groups for the zones
+ href: planning-isolation-groups-for-the-zones.md
+ - name: Planning network access groups
+ href: planning-network-access-groups.md
+ - name: Planning the GPOs
+ href: planning-the-gpos.md
+ items:
+ - name: Firewall GPOs
+ href: firewall-gpos.md
+ items:
+ - name: GPO_DOMISO_Firewall
+ href: gpo-domiso-firewall.md
+ - name: Isolated domain GPOs
+ href: isolated-domain-gpos.md
+ items:
+ - name: GPO_DOMISO_IsolatedDomain_Clients
+ href: gpo-domiso-isolateddomain-clients.md
+ - name: GPO_DOMISO_IsolatedDomain_Servers
+ href: gpo-domiso-isolateddomain-servers.md
+ - name: Boundary zone GPOs
+ href: boundary-zone-gpos.md
+ items:
+ - name: GPO_DOMISO_Boundary
+ href: gpo-domiso-boundary.md
+ - name: Encryption zone GPOs
+ href: encryption-zone-gpos.md
+ items:
+ - name: GPO_DOMISO_Encryption
+ href: gpo-domiso-encryption.md
+ - name: Server isolation GPOs
+ href: server-isolation-gpos.md
+ - name: Planning GPO deployment
+ href: planning-gpo-deployment.md
+ - name: Planning to deploy
+ href: planning-to-deploy-windows-firewall-with-advanced-security.md
+ - name: Deployment guide
+ items:
+ - name: Deployment overview
+ href: windows-firewall-with-advanced-security-deployment-guide.md
+ - name: Implementing your plan
+ href: implementing-your-windows-firewall-with-advanced-security-design-plan.md
+ - name: Basic firewall deployment
+ items:
+ - name: "Checklist: Implementing a basic firewall policy design"
+ href: checklist-implementing-a-basic-firewall-policy-design.md
+ - name: Domain isolation deployment
+ items:
+ - name: "Checklist: Implementing a Domain Isolation Policy Design"
+ href: checklist-implementing-a-domain-isolation-policy-design.md
+ - name: Server isolation deployment
+ items:
+ - name: "Checklist: Implementing a Standalone Server Isolation Policy Design"
+ href: checklist-implementing-a-standalone-server-isolation-policy-design.md
+ - name: Certificate-based authentication
+ items:
+ - name: "Checklist: Implementing a Certificate-based Isolation Policy Design"
+ href: checklist-implementing-a-certificate-based-isolation-policy-design.md
+ - name: Best practices
+ items:
+ - name: Configuring the firewall
+ href: best-practices-configuring.md
+ - name: Securing IPsec
+ href: securing-end-to-end-ipsec-connections-by-using-ikev2.md
+ - name: PowerShell
+ href: windows-firewall-with-advanced-security-administration-with-windows-powershell.md
+ - name: Isolating Microsoft Store Apps on Your Network
+ href: isolating-apps-on-your-network.md
+ - name: How-to
+ items:
+ - name: Add Production devices to the membership group for a zone
+ href: add-production-devices-to-the-membership-group-for-a-zone.md
+ - name: Add test devices to the membership group for a zone
+ href: add-test-devices-to-the-membership-group-for-a-zone.md
+ - name: Assign security group filters to the GPO
+ href: assign-security-group-filters-to-the-gpo.md
+ - name: Change rules from request to require mode
+ href: Change-Rules-From-Request-To-Require-Mode.Md
+ - name: Configure authentication methods
+ href: Configure-authentication-methods.md
+ - name: Configure data protection (Quick Mode) settings
+ href: configure-data-protection-quick-mode-settings.md
+ - name: Configure Group Policy to autoenroll and deploy certificates
+ href: configure-group-policy-to-autoenroll-and-deploy-certificates.md
+ - name: Configure key exchange (main mode) settings
+ href: configure-key-exchange-main-mode-settings.md
+ - name: Configure the rules to require encryption
+ href: configure-the-rules-to-require-encryption.md
+ - name: Configure the Windows Firewall log
+ href: configure-the-windows-firewall-log.md
+ - name: Configure the workstation authentication certificate template
+ href: configure-the-workstation-authentication-certificate-template.md
+ - name: Configure Windows Firewall to suppress notifications when a program is blocked
+ href: configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md
+ - name: Confirm that certificates are deployed correctly
+ href: confirm-that-certificates-are-deployed-correctly.md
+ - name: Copy a GPO to create a new GPO
+ href: copy-a-gpo-to-create-a-new-gpo.md
+ - name: Create a Group Account in Active Directory
+ href: create-a-group-account-in-active-directory.md
+ - name: Create a Group Policy Object
+ href: create-a-group-policy-object.md
+ - name: Create an authentication exemption list rule
+ href: create-an-authentication-exemption-list-rule.md
+ - name: Create an authentication request rule
+ href: create-an-authentication-request-rule.md
+ - name: Create an inbound ICMP rule
+ href: create-an-inbound-icmp-rule.md
+ - name: Create an inbound port rule
+ href: create-an-inbound-port-rule.md
+ - name: Create an inbound program or service rule
+ href: create-an-inbound-program-or-service-rule.md
+ - name: Create an outbound port rule
+ href: create-an-outbound-port-rule.md
+ - name: Create an outbound program or service rule
+ href: create-an-outbound-program-or-service-rule.md
+ - name: Create inbound rules to support RPC
+ href: create-inbound-rules-to-support-rpc.md
+ - name: Create WMI filters for the GPO
+ href: create-wmi-filters-for-the-gpo.md
+ - name: Create Windows Firewall rules in Intune
+ href: create-windows-firewall-rules-in-intune.md
+ - name: Enable predefined inbound rules
+ href: enable-predefined-inbound-rules.md
+ - name: Enable predefined outbound rules
+ href: enable-predefined-outbound-rules.md
+ - name: Exempt ICMP from authentication
+ href: exempt-icmp-from-authentication.md
+ - name: Link the GPO to the domain
+ href: link-the-gpo-to-the-domain.md
+ - name: Modify GPO filters
+ href: modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md
+ - name: Open IP security policies
+ href: open-the-group-policy-management-console-to-ip-security-policies.md
+ - name: Open Group Policy
+ href: open-the-group-policy-management-console-to-windows-firewall.md
+ - name: Open Group Policy
+ href: open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md
+ - name: Open Windows Firewall
+ href: open-windows-firewall-with-advanced-security.md
+ - name: Restrict server access
+ href: restrict-server-access-to-members-of-a-group-only.md
+ - name: Enable Windows Firewall
+ href: turn-on-windows-firewall-and-configure-default-behavior.md
+ - name: Verify Network Traffic
+ href: verify-that-network-traffic-is-authenticated.md
+ - name: References
+ items:
+ - name: "Checklist: Creating Group Policy objects"
+ href: checklist-creating-group-policy-objects.md
+ - name: "Checklist: Creating inbound firewall rules"
+ href: checklist-creating-inbound-firewall-rules.md
+ - name: "Checklist: Creating outbound firewall rules"
+ href: checklist-creating-outbound-firewall-rules.md
+ - name: "Checklist: Configuring basic firewall settings"
+ href: checklist-configuring-basic-firewall-settings.md
+ - name: "Checklist: Configuring rules for the isolated domain"
+ href: checklist-configuring-rules-for-the-isolated-domain.md
+ - name: "Checklist: Configuring rules for the boundary zone"
+ href: checklist-configuring-rules-for-the-boundary-zone.md
+ - name: "Checklist: Configuring rules for the encryption zone"
+ href: checklist-configuring-rules-for-the-encryption-zone.md
+ - name: "Checklist: Configuring rules for an isolated server zone"
+ href: checklist-configuring-rules-for-an-isolated-server-zone.md
+ - name: "Checklist: Configuring rules for servers in a standalone isolated server zone"
+ href: checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md
+ - name: "Checklist: Creating rules for clients of a standalone isolated server zone"
+ href: checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md
+ - name: "Appendix A: Sample GPO template files for settings used in this guide"
+ href: appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md
+ - name: Troubleshooting
+ items:
+ - name: Troubleshooting UWP app connectivity issues in Windows Firewall
+ href: troubleshooting-uwp-firewall.md
+ - name: Filter origin audit log improvements
+ href: filter-origin-documentation.md
+ - name: Quarantine behavior
+ href: quarantine.md
+ - name: Firewall settings lost on upgrade
+ href: firewall-settings-lost-on-upgrade.md
diff --git a/windows/security/threat-protection/windows-firewall/isolated-domain.md b/windows/security/threat-protection/windows-firewall/isolated-domain.md
index 1b9d83e173..b9656fd06d 100644
--- a/windows/security/threat-protection/windows-firewall/isolated-domain.md
+++ b/windows/security/threat-protection/windows-firewall/isolated-domain.md
@@ -20,9 +20,10 @@ ms.technology: mde
# Isolated Domain
-**Applies to**
-- Windows 10
-- Windows Server 2016
+**Applies to:**
+- Windows 10
+- Windows Server 2016
+- Windows Server 2019
The isolated domain is the primary zone for trusted devices. The devices in this zone use connection security and firewall rules to control the communications that can be sent between devices in the zone.
diff --git a/windows/security/threat-protection/windows-security-configuration-framework/TOC.md b/windows/security/threat-protection/windows-security-configuration-framework/TOC.md
deleted file mode 100644
index 10de1f0c1c..0000000000
--- a/windows/security/threat-protection/windows-security-configuration-framework/TOC.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Windows security guidance for enterprises
-
-## [Windows security baselines](windows-security-baselines.md)
-### [Security Compliance Toolkit](security-compliance-toolkit-10.md)
-### [Get support](get-support-for-security-baselines.md)
\ No newline at end of file
diff --git a/windows/security/threat-protection/windows-security-configuration-framework/TOC.yml b/windows/security/threat-protection/windows-security-configuration-framework/TOC.yml
new file mode 100644
index 0000000000..f7e0955409
--- /dev/null
+++ b/windows/security/threat-protection/windows-security-configuration-framework/TOC.yml
@@ -0,0 +1,9 @@
+- name: Windows security guidance for enterprises
+ items:
+ - name: Windows security baselines
+ href: windows-security-baselines.md
+ items:
+ - name: Security Compliance Toolkit
+ href: security-compliance-toolkit-10.md
+ - name: Get support
+ href: get-support-for-security-baselines.md
diff --git a/windows/sv/TOC.yml b/windows/sv/TOC.yml
new file mode 100644
index 0000000000..b5ef71ac32
--- /dev/null
+++ b/windows/sv/TOC.yml
@@ -0,0 +1,2 @@
+- name: Index
+ href: index.md
\ No newline at end of file
diff --git a/windows/sv/breadcrumb/toc.yml b/windows/sv/breadcrumb/toc.yml
new file mode 100644
index 0000000000..61d8fca61e
--- /dev/null
+++ b/windows/sv/breadcrumb/toc.yml
@@ -0,0 +1,3 @@
+- name: Docs
+ tocHref: /
+ topicHref: /
\ No newline at end of file
diff --git a/windows/sv/docfx.json b/windows/sv/docfx.json
new file mode 100644
index 0000000000..7035c4cd69
--- /dev/null
+++ b/windows/sv/docfx.json
@@ -0,0 +1,51 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md",
+ "**/*.yml"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "_themes/**",
+ "_themes.pdf/**",
+ "**/docfx.json",
+ "_repo.en-us/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices.md"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "_themes/**",
+ "_themes.pdf/**",
+ "**/docfx.json",
+ "_repo.en-us/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "breadcrumb_path": "/windows/sv/breadcrumb/toc.json",
+ "extendBreadcrumb": true,
+ "feedback_system": "None"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "SV",
+ "markdownEngineName": "markdig"
+ }
+}
\ No newline at end of file
diff --git a/windows/sv/index.md b/windows/sv/index.md
new file mode 100644
index 0000000000..8f7cbe8630
--- /dev/null
+++ b/windows/sv/index.md
@@ -0,0 +1 @@
+# Welcome to SV!
\ No newline at end of file
diff --git a/windows/threat-protection/docfx.json b/windows/threat-protection/docfx.json
index ed96201d45..7576fcf3df 100644
--- a/windows/threat-protection/docfx.json
+++ b/windows/threat-protection/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/update/docfx.json b/windows/update/docfx.json
index 10a5192bee..723941b24a 100644
--- a/windows/update/docfx.json
+++ b/windows/update/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
diff --git a/windows/whats-new/ltsc/TOC.md b/windows/whats-new/ltsc/TOC.md
deleted file mode 100644
index a16525cda0..0000000000
--- a/windows/whats-new/ltsc/TOC.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# [Windows 10 Enterprise LTSC](index.md)
-## [What's new in Windows 10 Enterprise LTSC 2019](whats-new-windows-10-2019.md)
-## [What's new in Windows 10 Enterprise LTSC 2016](whats-new-windows-10-2016.md)
-## [What's new in Windows 10 Enterprise LTSC 2015](whats-new-windows-10-2015.md)
diff --git a/windows/whats-new/ltsc/TOC.yml b/windows/whats-new/ltsc/TOC.yml
new file mode 100644
index 0000000000..aaabcc56ee
--- /dev/null
+++ b/windows/whats-new/ltsc/TOC.yml
@@ -0,0 +1,9 @@
+- name: Windows 10 Enterprise LTSC
+ href: index.md
+ items:
+ - name: What's new in Windows 10 Enterprise LTSC 2019
+ href: whats-new-windows-10-2019.md
+ - name: What's new in Windows 10 Enterprise LTSC 2016
+ href: whats-new-windows-10-2016.md
+ - name: What's new in Windows 10 Enterprise LTSC 2015
+ href: whats-new-windows-10-2015.md
diff --git a/windows/whats-new/ltsc/whats-new-windows-10-2019.md b/windows/whats-new/ltsc/whats-new-windows-10-2019.md
index b1d44ab68b..74b961fb89 100644
--- a/windows/whats-new/ltsc/whats-new-windows-10-2019.md
+++ b/windows/whats-new/ltsc/whats-new-windows-10-2019.md
@@ -74,7 +74,7 @@ But these protections can also be configured separately. And, unlike HVCI, code
Endpoint detection and response is improved. Enterprise customers can now take advantage of the entire Windows security stack with Microsoft Defender Antivirus **detections** and Device Guard **blocks** being surfaced in the Microsoft Defender for Endpoint portal.
- Windows Defender is now called Microsoft Defender Antivirus and now shares detection status between M365 services and interoperates with Microsoft Defender for Endpoint. Additional policies have also been implemented to enhance cloud based protection, and new channels are available for emergency protection. For more information, see [Virus and threat protection](/windows/security/threat-protection/windows-defender-security-center/wdsc-virus-threat-protection) and [Use next-gen technologies in Microsoft Defender Antivirus through cloud-delivered protection](/windows/security/threat-protection/microsoft-defender-antivirus/utilize-microsoft-cloud-protection-microsoft-defender-antivirus).
+ Windows Defender is now called Microsoft Defender Antivirus and now shares detection status between M365 services and interoperates with Microsoft Defender for Endpoint. Additional policies have also been implemented to enhance cloud based protection, and new channels are available for emergency protection. For more information, see [Virus and threat protection](/windows/security/threat-protection/windows-defender-security-center/wdsc-virus-threat-protection) and [Use next-gen technologies in Microsoft Defender Antivirus through cloud-delivered protection](/microsoft-365/security/defender-endpoint/utilize-microsoft-cloud-protection-microsoft-defender-antivirus).
We've also [increased the breadth of the documentation library for enterprise security admins](/windows/threat-protection/microsoft-defender-antivirus/microsoft-defender-antivirus-in-windows-10). The new library includes information on:
- [Deploying and enabling AV protection](/windows/threat-protection/microsoft-defender-antivirus/deploy-microsoft-defender-antivirus)
diff --git a/windows/whats-new/whats-new-windows-10-version-1709.md b/windows/whats-new/whats-new-windows-10-version-1709.md
index b07a154aa5..6386e1bddd 100644
--- a/windows/whats-new/whats-new-windows-10-version-1709.md
+++ b/windows/whats-new/whats-new-windows-10-version-1709.md
@@ -95,7 +95,7 @@ Windows Defender Application Guard hardens a favorite attacker entry-point by is
### Window Defender Exploit Guard
-Window Defender Exploit Guard provides intrusion prevention capabilities to reduce the attack and exploit surface of applications. Exploit Guard has many of the threat mitigations that were available in Enhanced Mitigation Experience Toolkit (EMET) toolkit, a deprecated security download. These mitigations are now built into Windows and configurable with Exploit Guard. These mitigations include [Exploit protection](/windows/security/threat-protection/microsoft-defender-atp/enable-exploit-protection), [Attack surface reduction protection](/windows/security/threat-protection/microsoft-defender-atp/evaluate-attack-surface-reduction), [Controlled folder access](/windows/security/threat-protection/microsoft-defender-atp/evaluate-controlled-folder-access), and [Network protection](/windows/security/threat-protection/microsoft-defender-atp/enable-network-protection).
+Window Defender Exploit Guard provides intrusion prevention capabilities to reduce the attack and exploit surface of applications. Exploit Guard has many of the threat mitigations that were available in Enhanced Mitigation Experience Toolkit (EMET) toolkit, a deprecated security download. These mitigations are now built into Windows and configurable with Exploit Guard. These mitigations include [Exploit protection](/microsoft-365/security/defender-endpoint/enable-exploit-protection), [Attack surface reduction protection](/microsoft-365/security/defender-endpoint/evaluate-attack-surface-reduction), [Controlled folder access](/microsoft-365/security/defender-endpoint/evaluate-controlled-folder-access), and [Network protection](/microsoft-365/security/defender-endpoint/enable-network-protection).
### Windows Defender Device Guard
diff --git a/windows/whats-new/whats-new-windows-10-version-1803.md b/windows/whats-new/whats-new-windows-10-version-1803.md
index 38bb41cfbf..0f28f72c7e 100644
--- a/windows/whats-new/whats-new-windows-10-version-1803.md
+++ b/windows/whats-new/whats-new-windows-10-version-1803.md
@@ -78,14 +78,13 @@ For more information, see [Windows 10 Subscription Activation](/windows/deployme
The following new DISM commands have been added to manage feature updates:
- DISM /Online /Initiate-OSUninstall
- – Initiates a OS uninstall to take the computer back to the previous installation of windows.
- DISM /Online /Remove-OSUninstall
- – Removes the OS uninstall capability from the computer.
- DISM /Online /Get-OSUninstallWindow
- – Displays the number of days after upgrade during which uninstall can be performed.
- DISM /Online /Set-OSUninstallWindow
- – Sets the number of days after upgrade during which uninstall can be performed.
+| Command | Description |
+|---|---|
+| `DISM /Online /Initiate-OSUninstall` | Initiates a OS uninstall to take the computer back to the previous installation of windows. |
+| `DISM /Online /Remove-OSUninstall` | Removes the OS uninstall capability from the computer. |
+| `DISM /Online /Get-OSUninstallWindow` | Displays the number of days after upgrade during which uninstall can be performed. |
+| `DISM /Online /Set-OSUninstallWindow` | Sets the number of days after upgrade during which uninstall can be performed. |
+
For more information, see [DISM operating system uninstall command-line options](/windows-hardware/manufacture/desktop/dism-uninstallos-command-line-options).
@@ -99,20 +98,19 @@ Prerequisites:
For more information, see [Run custom actions during feature update](/windows-hardware/manufacture/desktop/windows-setup-enable-custom-actions).
-It is also now possible to run a script if the user rolls back their version of Windows using the PostRollback option.
+It is also now possible to run a script if the user rolls back their version of Windows using the PostRollback option:
- /PostRollback [\setuprollback.cmd] [/postrollback {system / admin}]
+`/PostRollback [\setuprollback.cmd] [/postrollback {system / admin}]`
For more information, see [Windows Setup Command-Line Options](/windows-hardware/manufacture/desktop/windows-setup-command-line-options#21)
New command-line switches are also available to control BitLocker:
- Setup.exe /BitLocker AlwaysSuspend
- – Always suspend bitlocker during upgrade.
- Setup.exe /BitLocker TryKeepActive
- – Enable upgrade without suspending bitlocker but if upgrade, does not work then suspend bitlocker and complete the upgrade.
- Setup.exe /BitLocker ForceKeepActive
- – Enable upgrade without suspending bitlocker, but if upgrade does not work, fail the upgrade.
+| Command | Description |
+|---|---|
+| `Setup.exe /BitLocker AlwaysSuspend` | Always suspend BitLocker during upgrade. |
+| `Setup.exe /BitLocker TryKeepActive` | Enable upgrade without suspending BitLocker, but if upgrade does not work, then suspend BitLocker and complete the upgrade. |
+| `Setup.exe /BitLocker ForceKeepActive` | Enable upgrade without suspending BitLocker, but if upgrade does not work, fail the upgrade. |
For more information, see [Windows Setup Command-Line Options](/windows-hardware/manufacture/desktop/windows-setup-command-line-options#33)
@@ -144,7 +142,7 @@ The OS uninstall period is a length of time that users are given when they can o
### Windows Hello for Business
-[Windows Hello](/windows/security/identity-protection/hello-for-business/hello-features) now supports FIDO 2.0 authentication for Azure AD Joined Windows 10 devices and has enhanced support for shared devices, as described in the [Kiosk configuration](#windows-10-kiosk-and-kiosk-browser) section.
+[Windows Hello](/windows/security/identity-protection/hello-for-business/hello-overview) now supports FIDO 2.0 authentication for Azure AD Joined Windows 10 devices and has enhanced support for shared devices, as described in the [Kiosk configuration](#windows-10-kiosk-and-kiosk-browser) section.
- Windows Hello is now [password-less on S-mode](https://www.windowslatest.com/2018/02/12/microsoft-make-windows-10-password-less-platform/).
- Support for S/MIME with Windows Hello for Business and APIs for non-Microsoft identity lifecycle management solutions.
@@ -173,27 +171,27 @@ The new [security baseline for Windows 10 version 1803](/windows/security/threat
### Microsoft Defender Antivirus
-Microsoft Defender Antivirus now shares detection status between M365 services and interoperates with Microsoft Defender for Endpoint. Additional policies have also been implemented to enhance cloud based protection, and new channels are available for emergency protection. For more information, see [Virus and threat protection](/windows/security/threat-protection/windows-defender-security-center/wdsc-virus-threat-protection) and [Use next-gen technologies in Microsoft Defender Antivirus through cloud-delivered protection](/windows/security/threat-protection/microsoft-defender-antivirus/utilize-microsoft-cloud-protection-microsoft-defender-antivirus).
+Microsoft Defender Antivirus now shares detection status between M365 services and interoperates with Microsoft Defender for Endpoint. Additional policies have also been implemented to enhance cloud based protection, and new channels are available for emergency protection. For more information, see [Virus and threat protection](/windows/security/threat-protection/windows-defender-security-center/wdsc-virus-threat-protection) and [Use next-gen technologies in Microsoft Defender Antivirus through cloud-delivered protection](/microsoft-365/security/defender-endpoint/utilize-microsoft-cloud-protection-microsoft-defender-antivirus).
### Windows Defender Exploit Guard
Windows Defender Exploit Guard enhanced attack surface area reduction, extended support to Microsoft Office applications, and now supports Windows Server. [Virtualization-based Security](https://techcommunity.microsoft.com/t5/Windows-Insider-Program/Windows-Defender-System-Guard-Making-a-leap-forward-in-platform/m-p/167303) (VBS) and Hypervisor-protected code integrity (HVCI) can now be enabled across the Windows 10 ecosystem. These Exploit Guard features can now be enabled through the Windows Defender Security Center.
-For more information, see [Reduce attack surfaces](/windows/security/threat-protection/windows-defender-exploit-guard/attack-surface-reduction)
+For more information, see [Reduce attack surfaces](/microsoft-365/security/defender-endpoint/attack-surface-reduction).
### Microsoft Defender for Endpoint
-[Microsoft Defender for Endpoint](/windows/security/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection) has been enhanced with many new capabilities. For more information, see the following topics:
+[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/advanced-hunting-query-language) has been enhanced with many new capabilities. For more information, see the following topics:
-- [Query data using Advanced hunting in Microsoft Defender for Endpoint](/windows/security/threat-protection/windows-defender-atp/advanced-hunting-windows-defender-advanced-threat-protection)
-- [Use Automated investigations to investigate and remediate threats](/windows/security/threat-protection/windows-defender-atp/automated-investigations-windows-defender-advanced-threat-protection)
-- [Enable conditional access to better protect users, devices, and data](/windows/security/threat-protection/windows-defender-atp/conditional-access-windows-defender-advanced-threat-protection)
+- [Query data using Advanced hunting in Microsoft Defender for Endpoint](/microsoft-365/security/defender/advanced-hunting-query-language)
+- [Use Automated investigations to investigate and remediate threats](/microsoft-365/security/defender-endpoint/automated-investigations)
+- [Enable conditional access to better protect users, devices, and data](/microsoft-365/security/defender-endpoint/conditional-access)
-Also see [New capabilities of Microsoft Defender for Endpoint further maximizing the effectiveness and robustness of endpoint security](https://blogs.windows.com/business/2018/04/17/new-capabilities-of-windows-defender-atp-further-maximizing-the-effectiveness-and-robustness-of-endpoint-security/#62FUJ3LuMXLQidVE.97)
+Also see [New capabilities of Microsoft Defender for Endpoint further maximizing the effectiveness and robustness of endpoint security](https://blogs.windows.com/business/2018/04/17/new-capabilities-of-windows-defender-atp-further-maximizing-the-effectiveness-and-robustness-of-endpoint-security/#62FUJ3LuMXLQidVE.97).
### Windows Defender Application Guard
-Windows Defender Application Guard has added support for Edge. For more information, see [System requirements for Windows Defender Application Guard](/windows/security/threat-protection/windows-defender-application-guard/reqs-wd-app-guard#software-requirements)
+Windows Defender Application Guard has added support for Edge. For more information, see [System requirements for Windows Defender Application Guard](/windows/security/threat-protection/windows-defender-application-guard/reqs-wd-app-guard#software-requirements).
### Windows Defender Device Guard
@@ -205,21 +203,21 @@ This release enables support for WIP with Files on Demand, allows file encryptio
### Office 365 Ransomware Detection
-For Office 365 Home and Office 365 Personal subscribers, Ransomware Detection notifies you when your OneDrive files have been attacked and guides you through the process of restoring your files. For more information, see [Ransomware detection and recovering your files](https://support.office.com/en-us/article/ransomware-detection-and-recovering-your-files-0d90ec50-6bfd-40f4-acc7-b8c12c73637f?ui=en-US&rs=en-US&ad=US)
+For Office 365 Home and Office 365 Personal subscribers, Ransomware Detection notifies you when your OneDrive files have been attacked and guides you through the process of restoring your files. For more information, see [Ransomware detection and recovering your files](https://support.office.com/en-us/article/ransomware-detection-and-recovering-your-files-0d90ec50-6bfd-40f4-acc7-b8c12c73637f?ui=en-US&rs=en-US&ad=US).
## Windows Analytics
### Upgrade Readiness
-Upgrade Readiness has added the ability to assess Spectre and Meltdown protections on your devices. This addition allows you to see if your devices have Windows OS and firmware updates with Spectre and Meltdown mitigations installed, as well as whether your antivirus client is compatible with these updates. For more information, see [Upgrade Readiness now helps assess Spectre and Meltdown protections](/archive/blogs/upgradeanalytics/upgrade-readiness-now-helps-assess-spectre-and-meltdown-protections)
+Upgrade Readiness has added the ability to assess Spectre and Meltdown protections on your devices. This addition allows you to see if your devices have Windows OS and firmware updates with Spectre and Meltdown mitigations installed, as well as whether your antivirus client is compatible with these updates. For more information, see [Upgrade Readiness now helps assess Spectre and Meltdown protections](/archive/blogs/upgradeanalytics/upgrade-readiness-now-helps-assess-spectre-and-meltdown-protections).
### Update Compliance
-Update Compliance has added Delivery Optimization to assess the bandwidth consumption of Windows Updates. For more information, see [Delivery Optimization in Update Compliance](/windows/deployment/update/update-compliance-delivery-optimization)
+Update Compliance has added Delivery Optimization to assess the bandwidth consumption of Windows Updates. For more information, see [Delivery Optimization in Update Compliance](/windows/deployment/update/update-compliance-delivery-optimization).
### Device Health
-Device Health’s new App Reliability reports enable you to see where app updates or configuration changes may be needed to reduce crashes. The Login Health reports reveal adoption, success rates, and errors for Windows Hello and for passwords— for a smooth migration to the password-less future. For more information, see [Using Device Health](/windows/deployment/update/device-health-using)
+Device Health’s new App Reliability reports enable you to see where app updates or configuration changes may be needed to reduce crashes. The Login Health reports reveal adoption, success rates, and errors for Windows Hello and for passwords— for a smooth migration to the password-less future. For more information, see [Using Device Health](/windows/deployment/update/device-health-using).
## Microsoft Edge
diff --git a/windows/whats-new/whats-new-windows-10-version-1903.md b/windows/whats-new/whats-new-windows-10-version-1903.md
index 805067c0cb..82419adcf5 100644
--- a/windows/whats-new/whats-new-windows-10-version-1903.md
+++ b/windows/whats-new/whats-new-windows-10-version-1903.md
@@ -83,7 +83,7 @@ The draft release of the [security configuration baseline settings](/archive/blo
### Microsoft Defender for Endpoint
- [Attack surface area reduction](/windows/security/threat-protection/windows-defender-atp/overview-attack-surface-reduction) – IT admins can configure devices with advanced web protection that enables them to define allow and deny lists for specific URL’s and IP addresses.
-- [Next generation protection](/windows/security/threat-protection/microsoft-defender-antivirus/microsoft-defender-antivirus-in-windows-10) – Controls have been extended to protection from ransomware, credential misuse, and attacks that are transmitted through removable storage.
+- [Next generation protection](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-in-windows-10) – Controls have been extended to protection from ransomware, credential misuse, and attacks that are transmitted through removable storage.
- Integrity enforcement capabilities – Enable remote runtime attestation of Windows 10 platform.
- Tamper-proofing capabilities – Uses virtualization-based security to isolate critical Microsoft Defender for Endpoint security capabilities away from the OS and attackers.
- [Platform support](https://techcommunity.microsoft.com/t5/Windows-Defender-ATP/Protecting-Windows-Server-with-Windows-Defender-ATP/ba-p/267114) – In addition to Windows 10, Microsoft Defender for Endpoint’s functionality has been extended to support Windows 7 and Windows 8.1 clients, as well as macOS, Linux, and Windows Server with both its Endpoint Detection (EDR) and Endpoint Protection Platform (EPP) capabilities.
@@ -138,7 +138,7 @@ This new feature is displayed under the Device Security page with the string “
- [Windows Defender Firewall now supports Windows Subsystem for Linux (WSL)](https://blogs.windows.com/windowsexperience/2018/04/19/announcing-windows-10-insider-preview-build-17650-for-skip-ahead/#II14f7VlSBcZ0Gs4.97): Lets you add rules for WSL process, just like for Windows processes.
- [Windows Security app](/windows/security/threat-protection/windows-defender-security-center/windows-defender-security-center) improvements now include Protection history, including detailed and easier to understand information about threats and available actions, Controlled Folder Access blocks are now in the Protection history, Windows Defender Offline Scanning tool actions, and any pending recommendations.
-- [Tamper Protection](/windows/security/threat-protection/microsoft-defender-antivirus/prevent-changes-to-security-settings-with-tamper-protection) lets you prevent others from tampering with important security features.
+- [Tamper Protection](/microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection) lets you prevent others from tampering with important security features.
## Microsoft Edge