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/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..de568c9e0a
--- /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.md
+ - 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.md
+- 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.md
+ - 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/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/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/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..9cccc2d19c 100644
--- a/windows/application-management/add-apps-and-features.md
+++ b/windows/application-management/add-apps-and-features.md
@@ -6,7 +6,7 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: article
ms.author: dansimp
-author: msfttracyp
+author: dansimp
ms.localizationpriority: medium
ms.date: 04/26/2018
ms.reviewer:
diff --git a/windows/application-management/apps-in-windows-10.md b/windows/application-management/apps-in-windows-10.md
index 31da1afc51..9e81170cc7 100644
--- a/windows/application-management/apps-in-windows-10.md
+++ b/windows/application-management/apps-in-windows-10.md
@@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
ms.author: dansimp
-author: msfttracyp
+author: dansimp
ms.localizationpriority: medium
ms.topic: article
---
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..4e7caf9110 100644
--- a/windows/application-management/deploy-app-upgrades-windows-10-mobile.md
+++ b/windows/application-management/deploy-app-upgrades-windows-10-mobile.md
@@ -6,7 +6,7 @@ ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
ms.author: dansimp
-author: msfttracyp
+author: dansimp
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/msix-app-packaging-tool.md b/windows/application-management/msix-app-packaging-tool.md
index 030d1c6a31..8464d6261e 100644
--- a/windows/application-management/msix-app-packaging-tool.md
+++ b/windows/application-management/msix-app-packaging-tool.md
@@ -11,7 +11,7 @@ ms.topic: article
ms.date: 12/03/2018
ms.reviewer:
manager: dansimp
-author: msfttracyp
+author: dansimp
---
# 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..a703d5ccae 100644
--- a/windows/application-management/per-user-services-in-windows.md
+++ b/windows/application-management/per-user-services-in-windows.md
@@ -6,7 +6,7 @@ ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
ms.author: dansimp
-author: msfttracyp
+author: dansimp
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..591d3ebfe3 100644
--- a/windows/application-management/remove-provisioned-apps-during-update.md
+++ b/windows/application-management/remove-provisioned-apps-during-update.md
@@ -5,7 +5,7 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.author: dansimp
-author: msfttracyp
+author: dansimp
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..153f2d49e5 100644
--- a/windows/application-management/sideload-apps-in-windows-10.md
+++ b/windows/application-management/sideload-apps-in-windows-10.md
@@ -9,7 +9,7 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
-author: msfttracyp
+author: dansimp
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..7960d238c7 100644
--- a/windows/application-management/svchost-service-refactoring.md
+++ b/windows/application-management/svchost-service-refactoring.md
@@ -6,7 +6,7 @@ ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: mobile
ms.author: dansimp
-author: msfttracyp
+author: dansimp
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..4b58a06cd0
--- /dev/null
+++ b/windows/application-management/toc.yml
@@ -0,0 +1,245 @@
+items:
+- name: Manage applications in Windows 10
+ href: index.md
+ 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) for Windows
+ href: app-v/appv-for-windows.md
+ items:
+ - name: Getting Started with App-V
+ href: app-v/appv-getting-started.md
+ items:
+ - name: What's new in App-V for Windows 10, version 1703 and earlier
+ href: app-v/appv-about-appv.md
+ items:
+ - 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 for App-V
+ href: app-v/appv-planning-for-appv.md
+ items:
+ - name: Preparing Your Environment for App-V
+ href: app-v/appv-preparing-your-environment.md
+ items:
+ - 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 App-V
+ href: app-v/appv-planning-to-deploy-appv.md
+ items:
+ - 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 App-V
+ href: app-v/appv-deploying-appv.md
+ items:
+ - name: Deploying the App-V Sequencer and Configuring the Client
+ href: app-v/appv-deploying-the-appv-sequencer-and-client.md
+ items:
+ - 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: Deploying the App-V Server
+ href: app-v/appv-deploying-the-appv-server.md
+ items:
+ - 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 for App-V
+ href: app-v/appv-operations.md
+ items:
+ - name: Creating and Managing App-V Virtualized Applications
+ href: app-v/appv-creating-and-managing-virtualized-applications.md
+ items:
+ - 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 Virtual Applications by Using the Management Console
+ href: app-v/appv-administering-virtual-applications-with-the-management-console.md
+ items:
+ - 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: Managing Connection Groups
+ href: app-v/appv-managing-connection-groups.md
+ items:
+ - 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 by Using Electronic Software Distribution (ESD)
+ href: app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
+ items:
+ - 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 App-V Client Management Console
+ href: app-v/appv-using-the-client-management-console.md
+ items:
+ - name: Automatically clean-up unpublished packages on the App-V client
+ href: app-v/appv-auto-clean-unpublished-packages.md
+ - name: Migrating to App-V from a Previous Version
+ href: app-v/appv-migrating-to-appv-from-a-previous-version.md
+ items:
+ - 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: Maintaining App-V
+ href: app-v/appv-maintaining-appv.md
+ items:
+ - 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 by Using Windows PowerShell
+ href: app-v/appv-administering-appv-with-powershell.md
+ items:
+ - 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 for App-V
+ href: app-v/appv-technical-reference.md
+ items:
+ - 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: 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: Change history for Application management
+ href: change-history-for-application-management.md
+ - name: How to keep apps removed from Windows 10 from returning during an update
+ href: remove-provisioned-apps-during-update.md
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/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/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/defender-csp.md b/windows/client-management/mdm/defender-csp.md
index 9f021cbaac..8e18c596ad 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.
@@ -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/diagnosticlog-csp.md b/windows/client-management/mdm/diagnosticlog-csp.md
index 3ef1008019..ef43f3c484 100644
--- a/windows/client-management/mdm/diagnosticlog-csp.md
+++ b/windows/client-management/mdm/diagnosticlog-csp.md
@@ -13,23 +13,24 @@ ms.date: 11/19/2019
---
# DiagnosticLog CSP
-The DiagnosticLog configuration service provider (CSP) provides the following feature areas:
+
+The DiagnosticLog configuration service provider (CSP) provides the following feature areas:
- [DiagnosticArchive area](#diagnosticarchive-area). Capture and upload event logs, log files, and registry values for troubleshooting.
- [Policy area](#policy-area). Configure Windows event log policies, such as maximum log size.
- [EtwLog area](#etwlog-area). Control ETW trace sessions.
- [DeviceStateData area](#devicestatedata-area). Provide additional device information.
- [FileDownload area](#filedownload-area). Pull trace and state data directly from the device.
-The following are the links to different versions of the DiagnosticLog CSP DDF files:
+The following are the links to different versions of the DiagnosticLog CSP DDF files:
- [DiagnosticLog CSP version 1.4](diagnosticlog-ddf.md#version-1-4)
- [DiagnosticLog CSP version 1.3](diagnosticlog-ddf.md#version-1-3)
- [DiagnosticLog CSP version 1.2](diagnosticlog-ddf.md#version-1-2)
The following shows the DiagnosticLog CSP in tree format.
+
```
-./Vendor/MSFT
-DiagnosticLog
+./Vendor/MSFT/DiagnosticLog
----EtwLog
--------Collectors
------------CollectorName
@@ -59,7 +60,8 @@ DiagnosticLog
----------------DataBlocks
--------------------BlockNumber
```
-**./Vendor/MSFT/DiagnosticLog**
+
+**./Vendor/MSFT/DiagnosticLog**
The root node for the DiagnosticLog CSP.
Rest of the nodes in the DiagnosticLog CSP are described within their respective feature area sections.
@@ -68,18 +70,18 @@ Rest of the nodes in the DiagnosticLog CSP are described within their respective
The DiagnosticArchive functionality within the DiagnosticLog CSP is used to trigger devices to gather troubleshooting data into a zip archive file and upload that archive to cloud storage. DiagnosticArchive is designed for ad-hoc troubleshooting scenarios, such as an IT admin investigating an app installation failure using a collection of event log events, registry values, and app or OS log files.
-> [!Note]
+> [!NOTE]
> DiagnosticArchive is a "break glass" backstop option for device troubleshooting. Diagnostic data such as log files can grow to many gigabytes. Gathering, transferring, and storing large amounts of data may burden the user's device, the network and cloud storage. Management servers invoking DiagnosticArchive must take care to minimize data gathering frequency and scope.
The following section describes the nodes for the DiagnosticArchive functionality.
-**DiagnosticArchive**
-Added in version 1.4 of the CSP in Windows 10, version 1903. Root node for the DiagnosticArchive functionality.
+**DiagnosticArchive**
+Added in version 1.4 of the CSP in Windows 10, version 1903. Root node for the DiagnosticArchive functionality.
The supported operation is Get.
-**DiagnosticArchive/ArchiveDefinition**
-Added in version 1.4 of the CSP in Windows 10, version 1903.
+**DiagnosticArchive/ArchiveDefinition**
+Added in version 1.4 of the CSP in Windows 10, version 1903.
The supported operations are Add and Execute.
@@ -87,7 +89,7 @@ The data type is string.
Expected value:
Set and Execute are functionality equivalent, and each accepts a `Collection` XML snippet (as a string) describing what data to gather and where to upload it. The results are zipped and uploaded to the specified SasUrl. The zipped filename format is "DiagLogs-{ComputerName}-YYYYMMDDTHHMMSSZ.zip".
-
+
The following is an example of a `Collection` XML.
``` xml
@@ -107,16 +109,16 @@ The following is an example of a `Collection` XML.
```
The XML should include the following elements within the `Collection` element:
-**ID**
+**ID**
The ID value uniquely identifies this data-gathering request. To avoid accidental repetition of data gathering, the CSP ignores subsequent Set or Execute invocations with the same ID value. The CSP expects the value to be populated when the request is received, so it must be generated by the IT admin or the management server.
-**SasUrl**
+**SasUrl**
The SasUrl value is the target URI to which the CSP uploads the zip file containing the gathered data. It is the responsibility of the management server to provision storage in such a way that the storage server accepts the device's HTTP PUT to this URL. For example, the device management service could:
- Provision cloud storage reachable by the target device, such as a Microsoft Azure blob storage container
- Generate a Shared Access Signature URL granting the possessor (the target device) time-limited write access to the storage container
-- Pass this value to the CSP on the target device through the `Collection` XML as the `SasUrl` value.
+- Pass this value to the CSP on the target device through the `Collection` XML as the `SasUrl` value.
-**One or more data gathering directives, which may include any of the following:**
+**One or more data gathering directives, which may include any of the following:**
- **RegistryKey**
- Exports all of the key names and values under a given path (recursive).
@@ -133,53 +135,53 @@ The SasUrl value is the target URI to which the CSP uploads the zip file contain
- This directive type allows the execution of specific commands such as ipconfig.exe. Note that DiagnosticArchive and the Commands directives are not a general-purpose scripting platform. These commands are allowed in the DiagnosticArchive context to handle cases where critical device information may not be available through existing log files.
- Expected input value: The full command line including path and any arguments, such as `%windir%\\system32\\ipconfig.exe /all`.
- Output format: Console text output from the command is captured in a text file and included in the overall output archive. For commands which may generate file output rather than console output, a subsequent FolderFiles directive would be used to capture that output. The example XML above demonstrates this pattern with mdmdiagnosticstool.exe's -out parameter.
- - Privacy guardrails: To enable diagnostic data capture while reducing the risk of an IT admin inadvertently capturing user-generated documents, only the following commands are allowed:
- - %windir%\\system32\\certutil.exe
- - %windir%\\system32\\dxdiag.exe
- - %windir%\\system32\\gpresult.exe
- - %windir%\\system32\\msinfo32.exe
- - %windir%\\system32\\netsh.exe
- - %windir%\\system32\\nltest.exe
- - %windir%\\system32\\ping.exe
- - %windir%\\system32\\powercfg.exe
- - %windir%\\system32\\w32tm.exe
- - %windir%\\system32\\wpr.exe
- - %windir%\\system32\\dsregcmd.exe
- - %windir%\\system32\\dispdiag.exe
- - %windir%\\system32\\ipconfig.exe
- - %windir%\\system32\\logman.exe
- - %windir%\\system32\\tracelog.exe
- - %programfiles%\\windows defender\\mpcmdrun.exe
- - %windir%\\system32\\MdmDiagnosticsTool.exe
- - %windir%\\system32\\pnputil.exe
+ - Privacy guardrails: To enable diagnostic data capture while reducing the risk of an IT admin inadvertently capturing user-generated documents, only the following commands are allowed:
+ - %windir%\\system32\\certutil.exe
+ - %windir%\\system32\\dxdiag.exe
+ - %windir%\\system32\\gpresult.exe
+ - %windir%\\system32\\msinfo32.exe
+ - %windir%\\system32\\netsh.exe
+ - %windir%\\system32\\nltest.exe
+ - %windir%\\system32\\ping.exe
+ - %windir%\\system32\\powercfg.exe
+ - %windir%\\system32\\w32tm.exe
+ - %windir%\\system32\\wpr.exe
+ - %windir%\\system32\\dsregcmd.exe
+ - %windir%\\system32\\dispdiag.exe
+ - %windir%\\system32\\ipconfig.exe
+ - %windir%\\system32\\logman.exe
+ - %windir%\\system32\\tracelog.exe
+ - %programfiles%\\windows defender\\mpcmdrun.exe
+ - %windir%\\system32\\MdmDiagnosticsTool.exe
+ - %windir%\\system32\\pnputil.exe
- **FoldersFiles**
- Captures log files from a given path (without recursion).
- Expected input value: File path with or without wildcards, such as "%windir%\\System32", or "%programfiles%\\*.log".
- - Privacy guardrails: To enable diagnostic log capture while reducing the risk of an IT admin inadvertently capturing user-generated documents, only paths under the following roots are allowed:
- - %PROGRAMFILES%
- - %PROGRAMDATA%
- - %PUBLIC%
- - %WINDIR%
- - %TEMP%
- - %TMP%
- - Additionally, only files with the following extensions are captured:
- - .log
- - .txt
- - .dmp
- - .cab
- - .zip
- - .xml
- - .html
- - .evtx
- - .etl
+ - Privacy guardrails: To enable diagnostic log capture while reducing the risk of an IT admin inadvertently capturing user-generated documents, only paths under the following roots are allowed:
+ - %PROGRAMFILES%
+ - %PROGRAMDATA%
+ - %PUBLIC%
+ - %WINDIR%
+ - %TEMP%
+ - %TMP%
+ - Additionally, only files with the following extensions are captured:
+ - .log
+ - .txt
+ - .dmp
+ - .cab
+ - .zip
+ - .xml
+ - .html
+ - .evtx
+ - .etl
-**DiagnosticArchive/ArchiveResults**
-Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting displays the results of the last archive run.
+**DiagnosticArchive/ArchiveResults**
+Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting displays the results of the last archive run.
The supported operation is Get.
-The data type is string.
+The data type is string.
A Get to the above URI will return the results of the data gathering for the last diagnostics request. For the example above it returns:
@@ -230,6 +232,7 @@ A Get to the above URI will return the results of the data gathering for the las
Each data gathering node is annotated with the HRESULT of the action and the collection is also annotated with an overall HRESULT. In this example, note that the mdmdiagnosticstool.exe command failed.
### Making use of the uploaded data
+
The zip archive which is created and uploaded by the CSP contains a folder structure like the following:
```powershell
@@ -313,7 +316,7 @@ foreach( $element in $resultElements )
Copy-Item $file.FullName -Destination (Join-Path -Path $reformattedArchivePath -ChildPath $leafSummaryString)
}
}
-#endregion
+#endregion
Remove-Item -Path $diagnosticArchiveTempUnzippedPath -Force -Recurse
```
That example script produces a set of files similar to the following, which can be a useful view for an administrator interactively browsing the results without needing to navigate any sub-folders or refer to `results.xml` repeatedly:
@@ -341,17 +344,17 @@ The Policy functionality within the DiagnosticLog CSP configures Windows event l
The following section describes the nodes for the Policy functionality.
-**Policy**
+**Policy**
Added in version 1.4 of the CSP in Windows 10, version 1903. Root node to control settings for channels in Event Log.
The supported operation is Get.
-**Policy/Channels**
+**Policy/Channels**
Added in version 1.4 of the CSP in Windows 10, version 1903. Node that contains Event Log channel settings.
The supported operation is Get.
-**Policy/Channels/_ChannelName_**
+**Policy/Channels/_ChannelName_**
Added in version 1.4 of the CSP in Windows 10, version 1903. Dynamic node to represent a registered channel. The node name must be a valid Windows event log channel name, such as ``Microsoft-Client-Licensing-Platform%2FAdmin``. When specifying the name in the LocURI, it must be URL encoded, otherwise it may unexpectedly translate into a different URI.
Supported operations are Add, Delete, and Get.
@@ -414,7 +417,7 @@ Get **Channel**
```
-**Policy/Channels/_ChannelName_/MaximumFileSize**
+**Policy/Channels/_ChannelName_/MaximumFileSize**
Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting specifies the maximum size of the log file in megabytes.
If you enable this policy setting, you can configure the maximum log file size to be between 1 megabyte and 2 terabytes in megabyte increments.
@@ -510,7 +513,7 @@ Replace **MaximumFileSize**
```
-**Policy/Channels/_ChannelName_/SDDL**
+**Policy/Channels/_ChannelName_/SDDL**
Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting represents SDDL string controlling access to the channel.
Supported operations are Add, Delete, Get, and Replace.
@@ -519,7 +522,7 @@ The data type is string.
Default string is as follows:
-https://docs.microsoft.com/windows/desktop/WES/eventmanifestschema-channeltype-complextype.
+https://docs.microsoft.com/windows/desktop/WES/eventmanifestschema-channeltype-complextype.
Add **SDDL**
``` xml
@@ -608,14 +611,14 @@ Replace **SDDL**
```
-**Policy/Channels/_ChannelName_/ActionWhenFull**
-Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting controls Event Log behavior when the log file reaches its maximum size.
+**Policy/Channels/_ChannelName_/ActionWhenFull**
+Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting controls Event Log behavior when the log file reaches its maximum size.
Supported operations are Add, Delete, Get, and Replace.
The data type is string.
-The following are the possible values:
+The following are the possible values:
- Truncate — When the log file reaches its maximum file size, new events are not written to the log and are lost.
- Overwrite — When the log file reaches its maximum file size, new events overwrite old events.
- Archive — When the log file reaches its maximum size, the log file is saved to the location specified by the "Archive Location" policy setting. If archive location value is not set, the new file is saved in the same directory as current log file.
@@ -709,14 +712,14 @@ Replace **ActionWhenFull**
```
-**Policy/Channels/_ChannelName_/Enabled**
+**Policy/Channels/_ChannelName_/Enabled**
Added in version 1.4 of the CSP in Windows 10, version 1903. This policy setting specifies whether the channel should be enabled or disabled.
Supported operations are Add, Delete, Get, and Replace.
The data type is boolean.
-The following are the possible values:
+The following are the possible values:
- TRUE — Enables the channel.
- FALSE — Disables the channel.
@@ -828,22 +831,22 @@ The DiagnosticLog CSP maintains a log file for each collector node and the log f
For each collector node, the user can:
-- Start or stop the session with all registered and enabled providers
-- Query session status
-- Change trace log file mode
-- Change trace log file size limit
+- Start or stop the session with all registered and enabled providers
+- Query session status
+- Change trace log file mode
+- Change trace log file size limit
The configurations log file mode and log file size limit does not take effect while trace session is in progress. These are applied when user stops the current session and then starts it again for this collector.
For each registered provider in this collector, the user can:
-- Specify keywords to filter events from this provider
-- Change trace level to filter events from this provider
-- Enable or disable the provider in the trace session
+- Specify keywords to filter events from this provider
+- Change trace level to filter events from this provider
+- Enable or disable the provider in the trace session
The changes on **State**, **Keywords**, and **TraceLevel** takes effect immediately while trace session is in progress.
-> [!Note]
+> [!NOTE]
> Microsoft-WindowsPhone-Enterprise-Diagnostics-Provider (GUID - 3da494e4-0fe2-415C-b895-fb5265c5c83b) has the required debug resource files built into Windows OS, which will allow the logs files to be decoded on the remote machine. Any other logs may not have the debug resources required to decode.
### Channel-based tracing
@@ -864,34 +867,34 @@ For more information about using DiagnosticLog to collect logs remotely from a P
To gather diagnostics using this CSP:
-1. Specify a *CollectorName* for the container of the target ETW providers.
-2. (Optional) Set logging and log file parameters using the following options:
+1. Specify a *CollectorName* for the container of the target ETW providers.
+2. (Optional) Set logging and log file parameters using the following options:
- TraceLogFileMode
- LogFileSizeLimitMB
-3. Indicate one or more target ETW providers by supplying its *ProviderGUID* to the Add operation of EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*.
-4. (Optional) Set logging and log file parameters using the following options:
+3. Indicate one or more target ETW providers by supplying its *ProviderGUID* to the Add operation of EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*.
+4. (Optional) Set logging and log file parameters using the following options:
- TraceLevel
- Keywords
-5. Start logging using **TraceControl** EXECUTE command “START”.
-6. Perform actions on the target device that will generate activity in the log files.
-7. Stop logging using **TraceControl** EXECUTE command “STOP”.
-8. Collect the log file located in the `%temp%` folder using the method described in [Reading a log file](#reading-a-log-file).
+5. Start logging using **TraceControl** EXECUTE command “START”.
+6. Perform actions on the target device that will generate activity in the log files.
+7. Stop logging using **TraceControl** EXECUTE command “STOP”.
+8. Collect the log file located in the `%temp%` folder using the method described in [Reading a log file](#reading-a-log-file).
The following section describes the nodes for EtwLog functionality.
-**EtwLog**
+**EtwLog**
Node to contain the Error Tracing for Windows log.
The supported operation is Get.
-**EtwLog/Collectors**
+**EtwLog/Collectors**
Interior node to contain dynamic child interior nodes for active providers.
The supported operation is Get.
-**EtwLog/Collectors/***CollectorName*
+**EtwLog/Collectors/_CollectorName_**
Dynamic nodes to represent active collector configuration.
Supported operations are Add, Delete, and Get.
@@ -937,7 +940,7 @@ Delete a collector
```
-**EtwLog/Collectors/*CollectorName*/TraceStatus**
+**EtwLog/Collectors/*CollectorName*/TraceStatus**
Specifies whether the current logging status is running.
The data type is an integer.
@@ -947,11 +950,11 @@ The supported operation is Get.
The following table represents the possible values:
| Value | Description |
-|-------|-------------|
+| ----- | ----------- |
| 0 | Stopped |
| 1 | Started |
-**EtwLog/Collectors/*CollectorName*/TraceLogFileMode**
+**EtwLog/Collectors/*CollectorName*/TraceLogFileMode**
Specifies the log file logging mode.
The data type is an integer.
@@ -961,11 +964,11 @@ Supported operations are Get and Replace.
The following table lists the possible values:
| Value | Description |
-|-------|--------------------|
+| ----- | ------------------ |
| EVENT_TRACE_FILE_MODE_SEQUENTIAL (0x00000001) | Writes events to a log file sequentially; stops when the file reaches its maximum size. |
-| EVENT_TRACE_FILE_MODE_CIRCULAR (0x00000002) | Writes events to a log file. After the file reaches the maximum size, the oldest events are replaced with incoming events. |
+| EVENT_TRACE_FILE_MODE_CIRCULAR (0x00000002) | Writes events to a log file. After the file reaches the maximum size, the oldest events are replaced with incoming events. |
-**EtwLog/Collectors/*CollectorName*/TraceControl**
+**EtwLog/Collectors/*CollectorName*/TraceControl**
Specifies the logging and report action state.
The data type is a string.
@@ -973,9 +976,9 @@ The data type is a string.
The following table lists the possible values:
| Value | Description |
-|-------|--------------------|
+| ----- | ------------------ |
| START | Start log tracing. |
-| STOP | Stop log tracing |
+| STOP | Stop log tracing. |
The supported operation is Execute.
@@ -1029,7 +1032,7 @@ Stop collector trace logging
```
-**EtwLog/Collectors/*CollectorName*/LogFileSizeLimitMB**
+**EtwLog/Collectors/*CollectorName*/LogFileSizeLimitMB**
Sets the log file size limit, in MB.
The data type is an integer.
@@ -1038,15 +1041,15 @@ Valid values are 1-2048. The default value is 4.
Supported operations are Get and Replace.
-**EtwLog/Collectors/*CollectorName*/Providers**
+**EtwLog/Collectors/*CollectorName*/Providers**
Interior node to contain dynamic child interior nodes for active providers.
The supported operation is Get.
-**EtwLog/Collectors/*CollectorName*/Providers/***ProviderGUID*
+**EtwLog/Collectors/*CollectorName*/Providers/_ProviderGUID_**
Dynamic nodes to represent active provider configuration per provider GUID.
-> [!Note]
+> [!NOTE]
> Microsoft-WindowsPhone-Enterprise-Diagnostics-Provider (GUID - 3da494e4-0fe2-415C-b895-fb5265c5c83b) has the required debug resource files built into Windows OS, which will allow the logs files to be decoded on the remote machine. Any other logs may not have the debug resources required to decode.
Supported operations are Add, Delete, and Get.
@@ -1092,7 +1095,7 @@ Delete a provider
```
-**EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*/TraceLevel**
+**EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*/TraceLevel**
Specifies the level of detail included in the trace log.
The data type is an integer.
@@ -1102,12 +1105,12 @@ Supported operations are Get and Replace.
The following table lists the possible values:
| Value | Description |
-|-------|--------------------|
+| ----- | ------------------ |
| 1 – TRACE_LEVEL_CRITICAL | Abnormal exit or termination events |
-| 2 – TRACE_LEVEL_ERROR | Severe error events |
-| 3 – TRACE_LEVEL_WARNING | Warning events such as allocation failures |
-| 4 – TRACE_LEVEL_INFORMATION | Non-error events, such as entry or exit events |
-| 5 – TRACE_LEVEL_VERBOSE | Detailed information |
+| 2 – TRACE_LEVEL_ERROR | Severe error events |
+| 3 – TRACE_LEVEL_WARNING | Warning events such as allocation failures |
+| 4 – TRACE_LEVEL_INFORMATION | Non-error events, such as entry or exit events |
+| 5 – TRACE_LEVEL_VERBOSE | Detailed information |
Set provider **TraceLevel**
@@ -1132,7 +1135,7 @@ Set provider **TraceLevel**
```
-**EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*/Keywords**
+**EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*/Keywords**
Specifies the provider keywords to be used as MatchAnyKeyword for this provider.
The data type is a string.
@@ -1156,7 +1159,7 @@ Get provider **Keywords**
-
+
```
@@ -1181,24 +1184,24 @@ Set provider **Keywords**
12345678FFFFFFFF
-
+
```
-**EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*/State**
+**EtwLog/Collectors/*CollectorName*/Providers/*ProviderGUID*/State**
Specifies if this provider is enabled in the trace session.
The data type is a boolean.
Supported operations are Get and Replace. This change will be effective during active trace session.
-The following table lists the possible values:
+The following table lists the possible values:
| Value | Description |
-|-------|--------------------|
-| TRUE | Provider is enabled in the trace session. This is the default. |
-| FALSE | Provider is disabled in the trace session. |
+| ----- | ------------------ |
+| TRUE | Provider is enabled in the trace session. This is the default. |
+| FALSE | Provider is disabled in the trace session. |
Set provider **State**
@@ -1223,12 +1226,12 @@ Set provider **State**
```
-**EtwLog/Channels**
+**EtwLog/Channels**
Interior node to contain dynamic child interior nodes for registered channels.
The supported operation is Get.
-**EtwLog/Channels/***ChannelName*
+**EtwLog/Channels/_ChannelName_**
Dynamic nodes to represent a registered channel. The node name must be a valid Windows event log channel name, such as "Microsoft-Client-Licensing-Platform%2FAdmin"
Supported operations are Add, Delete, and Get.
@@ -1274,7 +1277,7 @@ Delete a channel
```
-**EtwLog/Channels/*ChannelName*/Export**
+**EtwLog/Channels/*ChannelName*/Export**
Node to trigger the command to export channel event data into the log file.
The supported operation is Execute.
@@ -1298,7 +1301,7 @@ Export channel event data
```
-**EtwLog/Channels/*ChannelName*/Filter**
+**EtwLog/Channels/*ChannelName*/Filter**
Specifies the XPath query string to filter the events while exporting.
The data type is a string.
@@ -1326,7 +1329,7 @@ Get channel **Filter**
```
-**EtwLog/Channels/*ChannelName*/State**
+**EtwLog/Channels/*ChannelName*/State**
Specifies if the Channel is enabled or disabled.
The data type is a boolean.
@@ -1335,10 +1338,10 @@ Supported operations are Get and Replace.
The following table lists the possible values:
-| Value | Description |
-|-------|--------------------|
-| TRUE | Channel is enabled. |
-| FALSE | Channel is disabled. |
+| Value | Description |
+| ----- | -------------------- |
+| TRUE | Channel is enabled. |
+| FALSE | Channel is disabled. |
Get channel **State**
@@ -1388,10 +1391,10 @@ The DeviceStateData functionality within the DiagnosticLog CSP provides addition
The following section describes the nodes for the DeviceStateData functionality.
-**DeviceStateData**
+**DeviceStateData**
Added in version 1.3 of the CSP in Windows 10, version 1607. Node for all types of device state data that are exposed.
-**DeviceStateData/MdmConfiguration**
+**DeviceStateData/MdmConfiguration**
Added in version 1.3 of the CSP in Windows 10, version 1607. Triggers the snapping of device management state data with SNAP.
The supported value is Execute.
@@ -1418,9 +1421,11 @@ The supported value is Execute.
```
## FileDownload area
+
The FileDownload feature of the DiagnosticLog CSP enables a management server to pull data directly from the device. In the FileDownload context the client and server roles are conceptually reversed, with the management server acting as a client to download the data from the managed device.
### Comparing FileDownload and DiagnosticArchive
+
Both the FileDownload and DiagnosticArchive features can be used to get data from the device to the management server, but they are optimized for different workflows.
- FileDownload enables the management server to directly pull byte-level trace data from the managed device. The data transfer takes place through the existing OMA-DM/SyncML context. It is typically used together with the EtwLogs feature as part of an advanced monitoring or diagnostic flow. FileDownlod requires granular orchestration by the management server, but avoids the need for dedicated cloud storage.
@@ -1428,16 +1433,16 @@ Both the FileDownload and DiagnosticArchive features can be used to get data fro
The following section describes the nodes for the FileDownload functionality.
-**FileDownload**
+**FileDownload**
Node to contain child nodes for log file transportation protocols and corresponding actions.
-**FileDownload/DMChannel**
+**FileDownload/DMChannel**
Node to contain child nodes using DM channel for transport protocol.
-**FileDownload/DMChannel/***FileContext*
-Dynamic interior nodes that represents per log file context.
+**FileDownload/DMChannel/_FileContext_**
+Dynamic interior nodes that represent per log file context.
-**FileDownload/DMChannel/*FileContext*/BlockSizeKB**
+**FileDownload/DMChannel/*FileContext*/BlockSizeKB**
Sets the log read buffer, in KB.
The data type is an integer.
@@ -1488,7 +1493,7 @@ Get **BlockSizeKB**
```
-**FileDownload/DMChannel/*FileContext*/BlockCount**
+**FileDownload/DMChannel/*FileContext*/BlockCount**
Represents the total read block count for the log file.
The data type is an integer.
@@ -1514,7 +1519,7 @@ Get **BlockCount**
```
-**FileDownload/DMChannel/*FileContext*/BlockIndexToRead**
+**FileDownload/DMChannel/*FileContext*/BlockIndexToRead**
Represents the read block start location.
The data type is an integer.
@@ -1567,7 +1572,7 @@ Set **BlockIndexToRead** at 1
```
-**FileDownload/DMChannel/*FileContext*/BlockData**
+**FileDownload/DMChannel/*FileContext*/BlockData**
The data type is Base64.
The only supported operation is Get.
@@ -1591,21 +1596,22 @@ Get **BlockData**
```
-**FileDownload/DMChannel/*FileContext*/DataBlocks**
+**FileDownload/DMChannel/*FileContext*/DataBlocks**
Node to transfer the selected log file block to the DM server.
-**FileDownload/DMChannel/*FileContext*/DataBlocks/***BlockNumber*
+**FileDownload/DMChannel/*FileContext*/DataBlocks/_BlockNumber_**
The data type is Base64.
The supported operation is Get.
### Reading a log file
-To read a log file:
-1. Enumerate log file under **./Vendor/MSFT/DiagnosticLog/FileDownload/DMChannel**.
-2. Select a log file in the Enumeration result.
-3. Set **BlockSizeKB** per DM server payload limitation.
-4. Get **BlockCount** to determine total read request.
-5. Set **BlockIndexToRead** to initialize read start point.
-6. Get **BlockData** for upload log block.
-7. Increase **BlockIndexToRead**.
-8. Repeat steps 5 to 7 until **BlockIndexToRead == (BlockIndexToRead – 1)**.
\ No newline at end of file
+
+To read a log file:
+1. Enumerate log file under **./Vendor/MSFT/DiagnosticLog/FileDownload/DMChannel**.
+2. Select a log file in the Enumeration result.
+3. Set **BlockSizeKB** per DM server payload limitation.
+4. Get **BlockCount** to determine total read request.
+5. Set **BlockIndexToRead** to initialize read start point.
+6. Get **BlockData** for upload log block.
+7. Increase **BlockIndexToRead**.
+8. Repeat steps 5 to 7 until **BlockIndexToRead == (BlockIndexToRead – 1)**.
diff --git a/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md b/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
index 45373ce3f7..75c2d3f601 100644
--- a/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
+++ b/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
@@ -84,9 +84,13 @@ The following steps demonstrate required settings using the Intune service:
You may contact your domain administrators to verify if the group policy has been deployed successfully.
8. Verify that the device is not enrolled with the old Intune client used on the Intune Silverlight Portal (this is the Intune portal used before the Azure portal).
+
9. Verify that Azure AD allows the logon user to enroll devices.
+

+
10. Verify that Microsoft Intune should allow enrollment of Windows devices.
+

## Configure the auto-enrollment Group Policy for a single PC
@@ -108,18 +112,21 @@ Requirements:
3. In **Local Computer Policy**, click **Administrative Templates** > **Windows Components** > **MDM**.
- 
+ > [!div class="mx-imgBorder"]
+ > 
4. Double-click **Enable automatic MDM enrollment using default Azure AD credentials** (previously called **Auto MDM Enrollment with AAD Token** in Windows 10, version 1709). For ADMX files in Windows 10, version 1903 and later, select **User Credential** as the Selected Credential Type to use.
> [!NOTE]
> **Device Credential** Credential Type may work, however, it is not yet supported by Intune. We don't recommend using this option until it's supported.
+

5. Click **Enable**, and select **User Credential** from the dropdown **Select Credential Type to Use**, then click **OK**.
> [!NOTE]
> In Windows 10, version 1903, the MDM.admx file was updated to include an option to select which credential is used to enroll the device. **Device Credential** is a new option that will only have an effect on clients that have installed Windows 10, version 1903 or later.
+ >
> The default behavior for older releases is to revert to **User Credential**.
> **Device Credential** is not supported for enrollment type when you have a ConfigMgr Agent on your device.
@@ -158,7 +165,10 @@ Requirements:
To see the result of the task, move the scroll bar to the right to see the **Last Run Result**. Note that **0x80180026** is a failure message (MENROLL\_E_DEVICE\_MANAGEMENT_BLOCKED). You can see the logs in the **History** tab.
- If the device enrollment is blocked, your IT admin may have enabled the **Disable MDM Enrollment** policy. Note that the GPEdit console does not reflect the status of policies set by your IT admin on your device. It is only used by the user to set policies.
+ If the device enrollment is blocked, your IT admin may have enabled the **Disable MDM Enrollment** policy.
+
+ > [!NOTE]
+ > The GPEdit console does not reflect the status of policies set by your IT admin on your device. It is only used by the user to set policies.
## Configure the auto-enrollment for a group of devices
@@ -203,11 +213,11 @@ Requirements:
4. Rename the extracted Policy Definitions folder to **PolicyDefinitions**.
-5. Copy PolicyDefinitions folder to **C:\Windows\SYSVOL\domain\Policies**.
+5. Copy PolicyDefinitions folder to **\\contoso.com\SYSVOL\contoso.com\policies\PolicyDefinitions**.
If this folder does not exist, then be aware that you will be switching to a [central policy store](https://support.microsoft.com/help/3087759/how-to-create-and-manage-the-central-store-for-group-policy-administra) for your entire domain.
-6. Restart the Domain Controller for the policy to be available.
+6. Wait for the SYSVOL DFSR replication to be completed and then restart the Domain Controller for the policy to be available.
This procedure will work for any future version as well.
@@ -231,16 +241,22 @@ To collect Event Viewer logs:
> For guidance on how to collect event logs for Intune, see [Collect MDM Event Viewer Log YouTube video](https://www.youtube.com/watch?v=U_oCe2RmQEc).
3. Search for event ID 75, which represents a successful auto-enrollment. Here is an example screenshot that shows the auto-enrollment completed successfully:
+

If you cannot find event ID 75 in the logs, it indicates that the auto-enrollment failed. This can happen because of the following reasons:
+
- The enrollment failed with error. In this case, search for event ID 76, which represents failed auto-enrollment. Here is an example screenshot that shows that the auto-enrollment failed:
- 
- To troubleshoot, check the error code that appears in the event. See [Troubleshooting Windows device enrollment problems in Microsoft Intune](https://support.microsoft.com/en-ph/help/4469913/troubleshooting-windows-device-enrollment-problems-in-microsoft-intune) for more information.
+
+ 
+
+ To troubleshoot, check the error code that appears in the event. See [Troubleshooting Windows device enrollment problems in Microsoft Intune](https://support.microsoft.com/en-ph/help/4469913/troubleshooting-windows-device-enrollment-problems-in-microsoft-intune) for more information.
+
- The auto-enrollment did not trigger at all. In this case, you will not find either event ID 75 or event ID 76. To know the reason, you must understand the internal mechanisms happening on the device as described in the following section.
- The auto-enrollment process is triggered by a task (**Microsoft > Windows > EnterpriseMgmt**) within the task-scheduler. This task appears if the *Enable automatic MDM enrollment using default Azure AD credentials* group policy (**Computer Configuration > Policies > Administrative Templates > Windows Components > MDM**) is successfully deployed to the target machine as shown in the following screenshot:
- 
+ The auto-enrollment process is triggered by a task (**Microsoft > Windows > EnterpriseMgmt**) within the task-scheduler. This task appears if the *Enable automatic MDM enrollment using default Azure AD credentials* group policy (**Computer Configuration > Policies > Administrative Templates > Windows Components > MDM**) is successfully deployed to the target machine as shown in the following screenshot:
+
+ 
> [!Note]
> This task isn't visible to standard users - run Scheduled Tasks with administrative credentials to find the task.
@@ -252,6 +268,7 @@ To collect Event Viewer logs:

When the task is completed, a new event ID 102 is logged.
+

Note that the task scheduler log displays event ID 102 (task completed) regardless of the auto-enrollment success or failure. This means that the task scheduler log is only useful to confirm if the auto-enrollment task is triggered or not. It does not indicate the success or failure of auto-enrollment.
@@ -262,6 +279,7 @@ To collect Event Viewer logs:

By default, these entries are removed when the device is un-enrolled, but occasionally the registry key remains even after un-enrollment. In this case, `gpupdate /force` fails to initiate the auto-enrollment task and error code 2149056522 is displayed in the **Applications and Services Logs > Microsoft > Windows > Task Scheduler > Operational** event log file under event ID 7016.
+
A resolution to this issue is to remove the registry key manually. If you do not know which registry key to remove, go for the key which displays most entries as the screenshot above. All other keys will display fewer entries as shown in the following screenshot:

@@ -279,4 +297,4 @@ To collect Event Viewer logs:
- [Windows 10 Administrative Templates for Windows 10 November 2019 Update 1909](https://www.microsoft.com/download/details.aspx?id=100591)
- [Windows 10 Administrative Templates for Windows 10 May 2019 Update 1903](https://www.microsoft.com/download/details.aspx?id=58495)
-- [Windows 10 Administrative Templates for Windows 10 October 2018 Update 1809](https://www.microsoft.com/download/details.aspx?id=57576)
\ No newline at end of file
+- [Windows 10 Administrative Templates for Windows 10 October 2018 Update 1809](https://www.microsoft.com/download/details.aspx?id=57576)
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 97803c60b7..fbe229c166 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -37,7 +37,7 @@ The Policy configuration service provider has the following sub-categories:
> - **./Device/Vendor/MSFT/Policy/Config/_AreaName/PolicyName_** to configure the policy.
> - **./Device/Vendor/MSFT/Policy/Result/_AreaName/PolicyName_** to get the result.
>
-> For device wide configuration the **_Device/_** portion may be omitted from the path, deeming the following paths respectively equivalent:
+> For device wide configuration the **_Device/_** portion may be omitted from the path, deeming the following paths respectively equivalent to the paths provided above:
>
> - **./Vendor/MSFT/Policy/Config/_AreaName/PolicyName_** to configure the policy.
> - **./Vendor/MSFT/Policy/Result/_AreaName/PolicyName_** to get the result.
@@ -57,12 +57,12 @@ The following diagram shows the Policy configuration service provider in tree fo
Supported operation is Get.
-**Policy/Config/***AreaName*
+**Policy/Config/_AreaName_**
The area group that can be configured by a single technology for a single provider. Once added, you cannot change the value.
Supported operations are Add, Get, and Delete.
-**Policy/Config/***AreaName/PolicyName*
+**Policy/Config/_AreaName/PolicyName_**
Specifies the name/value pair used in the policy.
The following list shows some tips to help you when configuring policies:
@@ -81,12 +81,12 @@ The following diagram shows the Policy configuration service provider in tree fo
Supported operation is Get.
-**Policy/Result/***AreaName*
+**Policy/Result/_AreaName_**
The area group that can be configured by a single technology independent of the providers.
Supported operation is Get.
-**Policy/Result/***AreaName/PolicyName*
+**Policy/Result/_AreaName/PolicyName_**
Specifies the name/value pair used in the policy.
Supported operation is Get.
@@ -102,31 +102,31 @@ The following diagram shows the Policy configuration service provider in tree fo
> [!NOTE]
> The OPAX settings that are managed by the Microsoft Office Customization Tool are not supported by MDM. For more information about this tool, see [Office Customization Tool](/previous-versions/office/office-2013-resource-kit/cc179097(v=office.15)).
-
ADMX files that have been installed by using ConfigOperations/ADMXInstall can later be deleted by using the URI delete operation. Deleting an ADMX file will delete the ADMX file from disk, remove the metadata from the ADMXdefault registry hive, and delete all the policies that were set from the file. The MDM server can also delete all ADMX policies that are tied to a particular app by calling delete on the URI, ./Vendor/MSFT/Policy/ConfigOperations/ADMXInstall/{AppName}
.
+
ADMX files that have been installed by using **ConfigOperations/ADMXInstall** can later be deleted by using the URI delete operation. Deleting an ADMX file will delete the ADMX file from disk, remove the metadata from the ADMXdefault registry hive, and delete all the policies that were set from the file. The MDM server can also delete all ADMX policies that are tied to a particular app by calling delete on the URI, ./Vendor/MSFT/Policy/ConfigOperations/ADMXInstall/{AppName}
.
Supported operations are Add, Get, and Delete.
-**Policy/ConfigOperations/ADMXInstall/***AppName*
+**Policy/ConfigOperations/ADMXInstall/_AppName_**
Added in Windows 10, version 1703. Specifies the name of the Win32 or Desktop Bridge app associated with the ADMX file.
Supported operations are Add, Get, and Delete.
-**Policy/ConfigOperations/ADMXInstall/***AppName*/Policy
+**Policy/ConfigOperations/ADMXInstall/_AppName_/Policy**
Added in Windows 10, version 1703. Specifies that a Win32 or Desktop Bridge app policy is to be imported.
Supported operations are Add, Get, and Delete.
-**Policy/ConfigOperations/ADMXInstall/***AppName*/Policy/*UniqueID*
+**Policy/ConfigOperations/ADMXInstall/_AppName_/Policy/_UniqueID_**
Added in Windows 10, version 1703. Specifies the unique ID of the app ADMX file that contains the policy to import.
Supported operations are Add and Get. Does not support Delete.
-**Policy/ConfigOperations/ADMXInstall/***AppName*/Preference
+**Policy/ConfigOperations/ADMXInstall/_AppName_/Preference**
Added in Windows 10, version 1703. Specifies that a Win32 or Desktop Bridge app preference is to be imported.
Supported operations are Add, Get, and Delete.
-**Policy/ConfigOperations/ADMXInstall/***AppName*/Preference/*UniqueID*
+**Policy/ConfigOperations/ADMXInstall/_AppName_/Preference/_UniqueID_**
Added in Windows 10, version 1703. Specifies the unique ID of the app ADMX file that contains the preference to import.
Supported operations are Add and Get. Does not support Delete.
@@ -8611,4 +8611,4 @@ The following diagram shows the Policy configuration service provider in tree fo
## 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/policy-csp-admx-activexinstallservice.md b/windows/client-management/mdm/policy-csp-admx-activexinstallservice.md
index 2b4c414ae7..a4020d12f2 100644
--- a/windows/client-management/mdm/policy-csp-admx-activexinstallservice.md
+++ b/windows/client-management/mdm/policy-csp-admx-activexinstallservice.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-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-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-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-experience.md b/windows/client-management/mdm/policy-csp-experience.md
index 4cf594449d..c1d07bfa0a 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
@@ -436,6 +439,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**
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/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/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/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/toc.yml b/windows/client-management/toc.yml
new file mode 100644
index 0000000000..dcc2ba1ca9
--- /dev/null
+++ b/windows/client-management/toc.yml
@@ -0,0 +1,84 @@
+items:
+- name: Manage clients in Windows 10
+ href: index.md
+ items:
+ - name: Administrative Tools in Windows 10
+ href: administrative-tools-in-windows-10.md
+ items:
+ - 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: Join Windows 10 Mobile to Azure Active Directory
+ href: join-windows-10-mobile-to-azure-active-directory.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: Reset a Windows 10 Mobile device
+ href: reset-a-windows-10-mobile-device.md
+ - name: Transitioning to modern management
+ href: manage-windows-10-in-your-organization-modern-management.md
+ - name: Windows 10 Mobile deployment and management guide
+ href: windows-10-mobile-and-mdm.md
+ - name: Windows libraries
+ href: windows-libraries.md
+ - name: Troubleshoot Windows 10 clients
+ href: windows-10-support-solutions.md
+ items:
+ - 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
+ - name: Mobile device management for solution providers
+ href: mdm/index.md
+ - name: Change history for Client management
+ href: change-history-for-client-management.md
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..97f7d9d55a 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:
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/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-get-started.md b/windows/deployment/update/update-compliance-get-started.md
index e686447597..9bd21c5fd2 100644
--- a/windows/deployment/update/update-compliance-get-started.md
+++ b/windows/deployment/update/update-compliance-get-started.md
@@ -41,10 +41,40 @@ Update Compliance is offered as an Azure Marketplace application which is linked
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.
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.
@@ -80,4 +110,4 @@ To download the script and learn what you need to configure and how to troublesh
### 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
+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).
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..29a17c8870 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.
@@ -65,7 +65,7 @@ For information about setting up Delivery Optimization, including tips for the b
- 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
@@ -159,14 +159,14 @@ For the payloads (optional):
**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?**
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 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:
@@ -202,34 +202,34 @@ 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.
### 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.
### 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 +260,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-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/quick-fixes.md b/windows/deployment/upgrade/quick-fixes.md
index 05fc0cbd93..92ca5252da 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).
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/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-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/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/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..2b6ed2739b
--- /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.md
+ items:
+ - name: Overview and requirements
+ href: bitlocker\bitlocker-overview-and-requirements-faq.yml
+ - name: Upgrading
+ href: bitlocker\bitlocker-upgrading-faq.md
+ - name: Deployment and administration
+ href: bitlocker\bitlocker-deployment-and-administration-faq.yml
+ - name: Key management
+ href: bitlocker\bitlocker-key-management-faq.md
+ - 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.md
+ - name: BitLocker Network Unlock
+ href: bitlocker\bitlocker-network-unlock-faq.md
+ - name: General
+ href: bitlocker\bitlocker-using-with-other-programs-faq.md
+ - 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/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..9e2e05229f
--- /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.md
+ 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/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/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/faq-md-app-guard.md b/windows/security/threat-protection/microsoft-defender-application-guard/faq-md-app-guard.md
index 5d37b3aa5d..ca6667c273 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,7 +8,7 @@ ms.pagetype: security
ms.localizationpriority: medium
author: denisebmsft
ms.author: deniseb
-ms.date: 01/21/2021
+ms.date: 04/28/2021
ms.reviewer:
manager: dansimp
ms.custom: asr
@@ -19,11 +19,12 @@ ms.technology: mde
**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.)
@@ -34,25 +35,25 @@ We recommend 8-GB RAM for optimal performance but you can use the following regi
### 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?
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.
+To help keep the Application Guard Edge session secure and isolated from the host device, favorites that are stored in the Application Guard Edge session are not copied back to the host device.
-### 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.
+Currently, the Application Guard Edge session doesn't support extensions. However, we're closely monitoring your feedback about this.
### 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?
@@ -76,11 +77,15 @@ This feature is currently experimental only and is not functional without an add
### 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:
+
+**Error: 0x80070569, Ext error: 0x00000001; RDP: Error: 0x00000000, Ext error: 0x00000000 Location: 0x00000000**
+
+We recommend that you do not modify this account.
### How do I trust a subdomain in my site list?
-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.
+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?
@@ -88,21 +93,23 @@ When using Windows Pro or Windows Enterprise, you have access to using Applicati
### 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?
@@ -128,22 +135,25 @@ First rule (DHCP Server):
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.
+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.
-6. Allow the connection.
-7. 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**.
+3. Specify the following program path: `%SystemRoot%\System32\svchost.exe`.
+4. Specify the following settings:
+ - Protocol Type: UDP
+ - Specific ports: 67
+ - Remote port: any
+6. Specify any IP addresses.
+7. Allow the connection.
+8. Specify to use all profiles.
+9. The new rule should show up in the user interface. Right click on the **rule** > **properties**.
+10. In the **Programs and services** tab, under the **Services** section, select **settings**.
+11. 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.
@@ -161,6 +171,7 @@ 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
@@ -184,4 +195,4 @@ Policy: Allow installation of devices using drivers that match these device setu
## 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/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..e9fddbd043 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,28 @@ The steps to use Intune's Custom OMA-URI functionality are:
> [!div class="mx-imgBorder"]
> 
-#### Removing policies
+### 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 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.
+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..8c0156d01b 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.
@@ -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/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