diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 1965f039f3..1261e72c0f 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -1,5 +1,65 @@
{
"redirections": [
+ {
+ "source_path": "windows/client-management/mdm/maps-ddf-file.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/maps-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/hotspot-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/filesystem-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/EnterpriseExtFileSystem-ddf.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/EnterpriseExtFileSystem-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/enterpriseext-ddf.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/enterpriseext-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/enterpriseassignedaccess-xsd.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/enterpriseassignedaccess-ddf.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/enterpriseassignedaccess-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/client-management/mdm/enterpriseappmanagement-csp.md",
+ "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+ "redirect_document_id": false
+ },
{
"source_path": "windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md",
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
@@ -16411,7 +16471,7 @@
"redirect_document_id": false
},
{
- "source_path": "windows/security/threat-protection/microsoft-defender-atp/commercial-gov.md.md",
+ "source_path": "windows/security/threat-protection/microsoft-defender-atp/commercial-gov.md",
"redirect_url": "/microsoft-365/security/defender-endpoint/gov",
"redirect_document_id": false
},
diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md
index 4790193f0a..36a38d6c45 100644
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@@ -35,9 +35,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -47,9 +47,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -59,9 +59,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -71,9 +71,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -83,9 +83,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -95,9 +95,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -107,9 +107,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -119,9 +119,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -131,9 +131,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -143,9 +143,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -155,9 +155,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -167,9 +167,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -179,9 +179,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -191,9 +191,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -203,9 +203,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -215,9 +215,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -227,9 +227,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -239,9 +239,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|Yes|Yes|Yes|
@@ -251,9 +251,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -263,9 +263,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -275,9 +275,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -287,9 +287,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -299,9 +299,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -311,9 +311,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -323,9 +323,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -335,9 +335,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -347,9 +347,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -359,9 +359,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -371,9 +371,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -383,9 +383,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -395,9 +395,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -407,9 +407,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|Yes|Yes|
@@ -419,9 +419,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -431,9 +431,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -443,9 +443,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -455,9 +455,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -467,9 +467,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|Yes|Yes|
@@ -479,9 +479,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -491,9 +491,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes [Only for mobile application management (MAM)](/windows/client-management/mdm/implement-server-side-mobile-application-management#integration-with-windows-information-protection)|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes [Only for mobile application management (MAM)](/windows/client-management/mdm/implement-server-side-mobile-application-management#integration-with-windows-information-protection)|Yes|Yes|Yes|Yes|
@@ -503,9 +503,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -515,10 +515,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
-
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -527,9 +526,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -539,9 +538,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -551,9 +550,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -563,9 +562,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -575,9 +574,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -587,9 +586,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -599,9 +598,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -611,9 +610,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|Mobile Enterprise|
-|--- |--- |--- |--- |--- |--- |--- |
-|Yes|Yes|No|Yes|Yes|No|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|No|Yes|Yes|
@@ -622,9 +621,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -634,9 +633,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -646,9 +645,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -658,9 +657,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -670,9 +669,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -682,9 +681,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -694,9 +693,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -706,9 +705,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -718,9 +717,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -730,9 +729,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -742,9 +741,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -754,9 +753,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -766,9 +765,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|Yes|Yes|
@@ -778,9 +777,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -790,9 +789,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -802,9 +801,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -814,9 +813,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -826,9 +825,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -838,9 +837,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -850,9 +849,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -862,9 +861,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -874,9 +873,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -886,9 +885,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -898,9 +897,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -910,9 +909,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -922,9 +921,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -934,9 +933,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -946,9 +945,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -958,9 +957,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -970,9 +969,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|||||||
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+||||||
@@ -982,9 +981,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -994,9 +993,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1006,9 +1005,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1018,9 +1017,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|Yes|Yes|Yes|
@@ -1030,9 +1029,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -1042,9 +1041,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -1054,9 +1053,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -1066,9 +1065,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-||||||Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+||||||
@@ -1078,9 +1077,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -1090,9 +1089,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1102,9 +1101,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1114,9 +1113,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1126,9 +1125,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|No|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1139,9 +1138,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|Yes|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|Yes|Yes|Yes|Yes|Yes|
@@ -1151,9 +1150,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|No|No|No|No|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|No|No|No|No|
@@ -1163,9 +1162,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-|No|Yes|Yes|Yes|Yes|Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+|No|Yes|Yes|Yes|Yes|
@@ -1175,9 +1174,9 @@ Additional lists:
-|Home|Pro|Business|Enterprise|Education|Mobile|
-|--- |--- |--- |--- |--- |--- |
-||||||Yes|
+|Home|Pro|Business|Enterprise|Education|
+|--- |--- |--- |--- |--- |
+||||||
diff --git a/windows/client-management/mdm/devdetail-csp.md b/windows/client-management/mdm/devdetail-csp.md
index 788d14f999..7a1c219d01 100644
--- a/windows/client-management/mdm/devdetail-csp.md
+++ b/windows/client-management/mdm/devdetail-csp.md
@@ -77,7 +77,7 @@ For Windows 10 for desktop editions (Home, Pro, Enterprise, and Education), it r
Supported operation is Get.
**SwV**
-Required. Returns the Windows 10 OS software version in the format MajorVersion.MinorVersion.BuildNumber.QFEnumber. Currently the BuildNumber returns the build number on the desktop and mobile build number on the phone. In the future, the build numbers may converge.
+Required. Returns the Windows 10 OS software version in the format MajorVersion.MinorVersion.BuildNumber.QFEnumber. Currently the BuildNumber returns the build number on the client device. In the future, the build numbers may converge.
Supported operation is Get.
@@ -114,6 +114,8 @@ Supported operation is Get.
This value is the largest number of characters that the device can support in a single URI segment. The default value zero (0) indicates that the device supports URI segment of unlimited length.
+
+
**Ext/Microsoft/RadioSwV**
Required. Returns the radio stack software version number.
diff --git a/windows/client-management/mdm/enterpriseappmanagement-csp.md b/windows/client-management/mdm/enterpriseappmanagement-csp.md
deleted file mode 100644
index 2b9c043f7c..0000000000
--- a/windows/client-management/mdm/enterpriseappmanagement-csp.md
+++ /dev/null
@@ -1,535 +0,0 @@
----
-title: EnterpriseAppManagement CSP
-description: Handle enterprise application management tasks using EnterpriseAppManagement configuration service provider (CSP).
-ms.assetid: 698b8bf4-652e-474b-97e4-381031357623
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# EnterpriseAppManagement CSP
-
-
-The EnterpriseAppManagement enterprise configuration service provider is used to handle enterprise application management tasks such as installing an enterprise application token, the first auto-downloadable app link, querying installed enterprise applications (name and version), auto updating already installed enterprise applications, and removing all installed enterprise apps (including the enterprise app token) during unenrollment.
-
-> [!NOTE]
-> The EnterpriseAppManagement CSP is only supported in Windows 10 Mobile.
-
-
-
-The following shows the EnterpriseAppManagement configuration service provider in tree format.
-
-```console
-./Vendor/MSFT
-EnterpriseAppManagement
-----EnterpriseID
---------EnrollmentToken
---------StoreProductID
---------StoreUri
---------CertificateSearchCriteria
---------Status
---------CRLCheck
---------EnterpriseApps
-------------Inventory
-----------------ProductID
---------------------Version
---------------------Title
---------------------Publisher
---------------------InstallDate
-------------Download
-----------------ProductID
---------------------Version
---------------------Name
---------------------URL
---------------------Status
---------------------LastError
---------------------LastErrorDesc
---------------------DownloadInstall
-```
-
-***EnterpriseID***
-Optional. A dynamic node that represents the EnterpriseID as a GUID. It is used to enroll or unenroll enterprise applications.
-
-Supported operations are Add, Delete, and Get.
-
-***EnterpriseID*/EnrollmentToken**
-Required. Used to install or update the binary representation of the application enrollment token (AET) and initiate "phone home" token validation. Scope is dynamic.
-
-Supported operations are Get, Add, and Replace.
-
-***EnterpriseID*/StoreProductID**
-Required. The node to host the ProductId node. Scope is dynamic.
-
-Supported operation is Get.
-
-**/StoreProductID/ProductId**
-The character string that contains the ID of the first enterprise application (usually a Company Hub app), which is automatically installed on the device. Scope is dynamic.
-
-Supported operations are Get and Add.
-
-***EnterpriseID*/StoreUri**
-Optional. The character string that contains the URI of the first enterprise application to be installed on the device. The enrollment client downloads and installs the application from this URI. Scope is dynamic.
-
-Supported operations are Get and Add.
-
-***EnterpriseID*/CertificateSearchCriteria**
-Optional. The character string that contains the search criteria to search for the DM-enrolled client certificate. The certificate is used for client authentication during enterprise application download. The company's application content server should use the enterprise-enrolled client certificate to authenticate the device. The value must be a URL encoded representation of the X.500 distinguished name of the client certificates Subject property. The X.500 name must conform to the format required by the [CertStrToName](/windows/win32/api/wincrypt/nf-wincrypt-certstrtonamea) function. This search parameter is case sensitive. Scope is dynamic.
-
-Supported operations are Get and Add.
-
-> [!NOTE]
-> Do NOT use Subject=CN%3DB1C43CD0-1624-5FBB-8E54-34CF17DFD3A1\\x00. The server must replace this value in the supplied client certificate. If your server returns a client certificate containing the same Subject value, this can cause unexpected behavior. The server should always override the subject value and not use the default device-provided Device ID Subject= Subject=CN%3DB1C43CD0-1624-5FBB-8E54-34CF17DFD3A1\\x00
-
-
-
-***EnterpriseID*/Status**
-Required. The integer value that indicates the current status of the application enrollment. Valid values are 0 (ENABLED), 1 (INSTALL\_DISABLED), 2 (REVOKED), and 3 (INVALID). Scope is dynamic.
-
-Supported operation is Get.
-
-***EnterpriseID*/CRLCheck**
-Optional. Character value that specifies whether the device should do a CRL check when using a certificate to authenticate the server. Valid values are "1" (CRL check required), "0" (CRL check not required). Scope is dynamic.
-
-Supported operations are Get, Add, and Replace.
-
-***EnterpriseID*/EnterpriseApps**
-Required. The root node to for individual enterprise application related settings. Scope is dynamic (this node is automatically created when EnterpriseID is added to the configuration service provider).
-
-Supported operation is Get.
-
-**/EnterpriseApps/Inventory**
-Required. The root node for individual enterprise application inventory settings. Scope is dynamic (this node is automatically created when EnterpriseID is added to the configuration service provider).
-
-Supported operation is Get.
-
-**/Inventory/***ProductID*
-Optional. A node that contains s single enterprise application product ID in GUID format. Scope is dynamic.
-
-Supported operation is Get.
-
-**/Inventory/*ProductID*/Version**
-Required. The character string that contains the current version of the installed enterprise application. Scope is dynamic.
-
-Supported operation is Get.
-
-**/Inventory/*ProductID*/Title**
-Required. The character string that contains the name of the installed enterprise application. Scope is dynamic.
-
-Supported operation is Get.
-
-**/Inventory/*ProductID*/Publisher**
-Required. The character string that contains the name of the publisher of the installed enterprise application. Scope is dynamic.
-
-Supported operation is Get.
-
-**/Inventory/*ProductID*/InstallDate**
-Required. The time (in the character format YYYY-MM-DD-HH:MM:SS) that the application was installed or updated. Scope is dynamic.
-
-Supported operation is Get.
-
-**/EnterpriseApps/Download**
-Required. This node groups application download-related parameters. The enterprise server can only automatically update currently installed enterprise applications. The end user controls which enterprise applications to download and install. Scope is dynamic.
-
-Supported operation is Get.
-
-**/Download/***ProductID*
-Optional. This node contains the GUID for the installed enterprise application. Each installed application has a unique ID. Scope is dynamic.
-
-Supported operations are Get, Add, and Replace.
-
-**/Download/*ProductID*/Version**
-Optional. The character string that contains version information (set by the caller) for the application currently being downloaded. Scope is dynamic.
-
-Supported operations are Get, Add, and Replace.
-
-**/Download/*ProductID*/Name**
-Required. The character string that contains the name of the installed application. Scope is dynamic.
-
-Supported operation is Get.
-
-**/Download/*ProductID*/URL**
-Optional. The character string that contains the URL for the updated version of the installed application. The device will download application updates from this link. Scope is dynamic.
-
-Supported operations are Get, Add, and Replace.
-
-**/Download/*ProductID*/Status**
-Required. The integer value that indicates the status of the current download process. The following table shows the possible values.
-
-|Value|Description|
-|--- |--- |
-|0: CONFIRM|Waiting for confirmation from user.|
-|1: QUEUED|Waiting for download to start.|
-|2: DOWNLOADING|In the process of downloading.|
-|3: DOWNLOADED|Waiting for installation to start.|
-|4: INSTALLING|Handed off for installation.|
-|5: INSTALLED|Successfully installed|
-|6: FAILED|Application was rejected (not signed properly, bad XAP format, not enrolled properly, etc.)|
-|7:DOWNLOAD_FAILED|Unable to connect to server, file doesn't exist, etc.|
-
-Scope is dynamic. Supported operations are Get, Add, and Replace.
-
-**/Download/*ProductID*/LastError**
-Required. The integer value that indicates the HRESULT of the last error code. If there are no errors, the value is 0 (S\_OK). Scope is dynamic.
-
-Supported operation is Get.
-
-**/Download/*ProductID*/LastErrorDesc**
-Required. The character string that contains the human readable description of the last error code.
-
-**/Download/*ProductID*/DownloadInstall**
-Required. The node to allow the server to trigger the download and installation for an updated version of the user installed application. The format for this node is null. The server must query the device later to determine the status. For each product ID, the status field is retained for up to one week. Scope is dynamic.
-
-Supported operation is Exec.
-
-## Remarks
-
-
-### Install and Update Line of Business (LOB) applications
-
-A workplace can automatically install and update Line of Business applications during a management session. Line of Business applications support a variety of file types including XAP (8.0 and 8.1), AppX, and AppXBundles. A workplace can also update applications from XAP file formats to Appx and AppxBundle formats through the same channel. For more information, see the Examples section.
-
-### Uninstall Line of Business (LOB) applications
-
-A workplace can also remotely uninstall Line of Business applications on the device. It is not possible to use this mechanism to uninstall Store applications on the device or Line of Business applications that are not installed by the enrolled workplace (for side-loaded application scenarios). For more information, see the Examples section
-
-### Query installed Store application
-
-You can determine if a Store application is installed on a system. First, you need the Store application GUID. You can get the Store application GUID by going to the URL for the Store application.
-
-The Microsoft Store application has a GUID of d5dc1ebb-a7f1-df11-9264-00237de2db9e.
-
-Use the following SyncML format to query to see if the application is installed on a managed device:
-
-```xml
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7B D5DC1EBB-A7F1-DF11-9264-00237DE2DB9E%7D
-
-
-
-```
-
-Response from the device (it contains list of subnodes if this app is installed in the device).
-
-```xml
-
- 3
- 1
- 2
-
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7B D5DC1EBB-A7F1-DF11-9264-00237DE2DB9E%7D
-
-
- node
-
-
-Version/Title/Publisher/InstallDate
-
-
-```
-
-### Node Values
-
-All node values under the ProviderID interior node represent the policy values that the management server wants to set.
-
-- An Add or Replace command on those nodes returns success in both of the following cases:
-
- - The value is actually applied to the device.
-
- - The value isn’t applied to the device because the device has a more secure value set already.
-
-From a security perspective, the device complies with the policy request that is at least as secure as the one requested.
-
-- A Get command on those nodes returns the value that the server pushes down to the device.
-
-- If a Replace command fails, the node value is set to be the previous value before Replace command was applied.
-
-- If an Add command fails, the node is not created.
-
-The value actually applied to the device can be queried via the nodes under the DeviceValue interior node.
-
-## OMA DM examples
-
-
-Enroll enterprise ID “4000000001” for the first time:
-
-```xml
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnrollmentToken
-
-
- chr
-
- InsertTokenHere
-
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/CertificateSearchCriteria
-
-
-
- chr
-
- SearchCriteriaInsertedHere
-
-
-```
-
-Update the enrollment token (for example, to update an expired application enrollment token):
-
-```xml
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnrollmentToken
-
-
- chr
-
- InsertUpdaedTokenHere
-
-
-```
-
-Query all installed applications that belong to enterprise id “4000000001”:
-
-```xml
-
- 2
-
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory?list=StructData
-
-
-
-
-```
-
-Response from the device (that contains two installed applications):
-
-```xml
-
- 3
- 1
- 2
-
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory
-
-
-
- node
-
-
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D
-
-
-
- node
-
-
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D
-
-
-
- node
-
-
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/Version
-
-
- 1.0.0.0
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/Title
-
-
- Sample1
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/Publisher
-
-
- ExamplePublisher
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/InstallDate
-
-
- 2012-10-30T21:09:52Z
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/Version
-
-
- 1.0.0.0
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/Title
-
-
- Sample2
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/Publisher
-
-
- Contoso
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB0322158-C3C2-44EB-8A31-D14A9FEC450E%7D/InstallDate
-
-
- 2012-10-31T21:23:31Z
-
-
-```
-
-## Install and update an enterprise application
-
-
-Install or update the installed app with the product ID “{B316008A-141D-4A79-810F-8B764C4CFDFB}”.
-
-To perform an XAP update, create the Name, URL, Version, and DownloadInstall nodes first, then perform an “execute” on the “DownloadInstall” node (all within an “Atomic” operation). If the application does not exist, the application will be silently installed without any user interaction. If the application cannot be installed, the user will be notified with an Alert dialog.
-
-> [!NOTE]
-> - If a previous app-update node existed for this product ID (the node can persist for up to 1 week or 7 days after an installation has completed), then a 418 (already exist) error would be returned on the “Add”. To get around the 418 error, the server should issue a Replace command for the Name, URL, and Version nodes, and then execute on the “DownloadInstall” (within an “Atomic” operation).
->
-> - The application product ID curly braces need to be escaped where { is %7B and } is %7D.
-
-
-
-```xml
-
- 2
-
-
- 3
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Download/%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D/Name
-
-
-
- chr
-
- ContosoApp1
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Download/%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D/URL
-
-
-
- chr
-
- http://contoso.com/enterpriseapps/ContosoApp1.xap
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Download/%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D/Version
-
-
- chr
-
- 2.0.0.0
-
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Download%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D/DownloadInstall
-
-
- 1
-
-
-
- 4
-
-
-
-./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Download/%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D/DownloadInstall
-
-
-
- int
-
- 0
-
-
-
-```
-
-## Uninstall enterprise application
-
-
-Uninstall an installed enterprise application with product ID “{7BB316008A-141D-4A79-810F-8B764C4CFDFB }”:
-
-```xml
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAppManagement/4000000001/EnterpriseApps/Inventory/%7BB316008A-141D-4A79-810F-8B764C4CFDFB%7D
-
-
-
-
-
-
-```
-
-## Related topics
-
-
-[Configuration service provider reference](configuration-service-provider-reference.md)
-
-
-
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-csp.md b/windows/client-management/mdm/enterpriseassignedaccess-csp.md
deleted file mode 100644
index d13206d6cb..0000000000
--- a/windows/client-management/mdm/enterpriseassignedaccess-csp.md
+++ /dev/null
@@ -1,1116 +0,0 @@
----
-title: EnterpriseAssignedAccess CSP
-description: Use the EnterpriseAssignedAccess configuration service provider (CSP) to configure custom layouts on a device.
-ms.assetid: 5F88E567-77AA-4822-A0BC-3B31100639AA
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 07/12/2017
----
-
-# EnterpriseAssignedAccess CSP
-
-
-The EnterpriseAssignedAccess configuration service provider allows IT administrators to configure settings, such as language and themes, lock down a device, and configure custom layouts on a device. For example, the administrator can lock down a device so that only applications specified in an Allow list are available. Apps not on the Allow list remain installed on the device, but are hidden from view and blocked from launching.
-
-> [!NOTE]
-> The EnterpriseAssignedAccess CSP is only supported in Windows 10 Mobile.
-
-For more information about how to interact with the lockdown XML at runtime, see [**DeviceLockdownProfile class**](/uwp/api/Windows.Embedded.DeviceLockdown.DeviceLockdownProfile).
-
-The following shows the EnterpriseAssignedAccess configuration service provider in tree format as used by both the Open Mobile Alliance (OMA) Device Management (DM) and OMA Client Provisioning.
-
-```console
-./Vendor/MSFT
-EnterpriseAssignedAccess
-----AssignedAccess
---------AssignedAccessXml
-----LockScreenWallpaper
---------BGFileName
-----Theme
---------ThemeBackground
---------ThemeAccentColorID
---------ThemeAccentColorValue
-----Clock
---------TimeZone
-----Locale
---------Language
-```
-
-The following list shows the characteristics and parameters.
-
-**./Vendor/MSFT/EnterpriseAssignedAccess/**
-The root node for the EnterpriseAssignedAccess configuration service provider. Supported operations are Add, Delete, Get and Replace.
-
-**AssignedAccess/**
-The parent node of assigned access XML.
-
-**AssignedAccess/AssignedAccessXml**
-The XML code that controls the assigned access settings that will be applied to the device.
-
-Supported operations are Add, Delete, Get and Replace.
-
-The Apps and Settings sections of lockdown XML constitute an Allow list. Any app or setting that is not specified in AssignedAccessXML will not be available on the device to users. The following table describes the entries in lockdown XML.
-
-> [!IMPORTANT]
-> When using the AssignedAccessXml in the EnterpriseAssignedAccess CSP through an MDM, the XML must use escaped characters, such as \< instead of < because it is embedded in an XML. The examples provided in the topic are formatted for readability.
-
-When using the AssignedAccessXml in a provisioning package using the Windows Configuration Designer tool, do not use escaped characters.
-
-Entry | Description
------------ | ------------
-ActionCenter | You can enable or disable the Action Center (formerly known as Notification Center) on the device. Set to true to enable the Action Center, or set to false to disable the Action Center.
-ActionCenter | Example: ``
-ActionCenter | In Windows 10, when the Action Center is disabled, Above Lock notifications and toasts are also disabled. When the Action Center is enabled, the following policies are also enabled; **AboveLock/AllowActionCenterNotifications** and **AboveLock/AllowToasts**. For more information about these policies, see [Policy CSP](policy-configuration-service-provider.md)
-ActionCenter | You can also add the following optional attributes to the ActionCenter element to override the default behavior: **aboveLockToastEnabled** and **actionCenterNotificationEnabled**. Valid values are 0 (policy disabled), 1 (policy enabled), and -1 (not set, policy enabled). In this example, the Action Center is enabled and both policies are disabled.: ``
-ActionCenter | These optional attributes are independent of each other. In this example, Action Center is enabled, the notifications policy is disabled, and the toast policy is enabled by default because it is not set. ``
-StartScreenSize | Specify the size of the Start screen. In addition to 4/6 columns, you can also use 4/6/8 depending on screen resolutions. Valid values: **Small** - sets the width to 4 columns on device with short axis <400epx or 6 columns on devices with short axis >=400epx. **Large** - sets the width to 6 columns on devices with short axis <400epx or 8 columns on devices with short axis >=400epx.
-StartScreenSize | If you have existing lockdown XML, you must update it if your device has >=400epx on its short axis so that tiles on Start can fill all 8 columns if you want to use all 8 columns instead of 6, or use 6 columns instead of 4. Example: `Large`
-Application | Provide the product ID for each app that will be available on the device. You can find the product ID for a locally developed app in the AppManifest.xml file of the app.
-Application | To turn on the notification for a Windows app, you must include the application's AUMID in the lockdown XML. However, the user can change the setting at any time from user interface. Example: ``
-Application |
-Application | Include PinToStart to display an app on the Start screen. For apps pinned to the Start screen, identify a tile size (small, medium, or large), and a location. The size of a small tile is 1 column x 1 row, a medium tile is 2 x 2, and a large tile is 4 x 2. For the tile location, the first value indicates the column and the second value indicates the row. A value of 0 (zero) indicates the first column, a value of 1 indicates the second column, and so on. Include autoRun as an attribute to configure the application to run automatically.
-
-Application example:
-```xml
-
-
- Large
-
- 0
- 2
-
-
-
-```
-
-Entry | Description
------------ | ------------
-Application | Multiple App Packages enable multiple apps to exist inside the same package. Since ProductIds identify packages and not applications, specifying a ProductId is not enough to distinguish between individual apps inside a multiple app package. Trying to include application from a multiple app package with just a ProductId can result in unexpected behavior. To support pinning applications in multiple app packages, use an AUMID parameter in lockdown XML. The following example shows how to pin both Outlook mail and Outlook calendar.
-
-Application example:
-```xml
-
-
-
-
- Large
-
- 1
- 4
-
-
-
-
-
-
- Large
-
- 1
- 6
-
-
-
-
-```
-
-Entry | Description
------------ | ------------
-Folder | A folder should be contained in `` node among with other `` nodes, it shares most grammar with the Application Node, **folderId** is mandatory, **folderName** is optional, which is the folder name displayed on Start. **folderId** is a unique unsigned integer for each folder.
-
-Folder example:
-```xml
-
-
- Large
-
- 0
- 2
-
-
-
-```
-An application that belongs in the folder would add an optional attribute **ParentFolderId**, which maps to **folderId** of the folder. In this case, the location of this application will be located inside the folder.
-
-```xml
-
-
- Medium
-
- 0
- 0
-
- 2
-
-
-```
-
-Entry | Description
------------ | ------------
-Settings | Starting in Windows 10, version 1511, you can specify the following settings pages in the lockdown XML file. For Windows 10, version 1703, see the instructions below for the new way to specify the settings pages.
-
-
-
-Entry | Description
------------ | ------------
-Settings | Starting in Windows 10, version 1703, you can specify the settings pages using the settings URI.
-
-For example, in place of SettingPageDisplay, you would use ms-settings:display. See [ms-settings: URI scheme reference](/windows/uwp/launch-resume/launch-settings-app#ms-settings-uri-scheme-reference) to find the URI for each settings page.
-
-Here is an example for Windows 10, version 1703.
-
-```xml
-
-
-
-
-
-
-
-
-
-```
-
-**Quick action settings**
-
-Starting in Windows 10, version 1511, you can specify the following quick action settings in the lockdown XML file. The following list shows the quick action settings and settings page dependencies (group and page).
-
-> [!NOTE]
-> Only Windows 10, versions 1511 and 1607, the dependent settings group and pages are automatically added when the quick action item is specified in the lockdown XML. In Windows 10, version 1703, Quick action settings no longer require any dependencies from related group or page.
-
-
-
-Starting in Windows 10, version 1703, Quick action settings no longer require any dependencies from related group or page. Here is the list:
-- QuickActions_Launcher_AllSettings
-- QuickActions_Launcher_DeviceDiscovery
-- SystemSettings_BatterySaver_LandingPage_OverrideControl
-- SystemSettings_Device_BluetoothQuickAction
-- SystemSettings_Flashlight_Toggle
-- SystemSettings_Launcher_QuickNote
-- SystemSettings_Network_VPN_QuickAction
-- SystemSettings_Privacy_LocationEnabledUserPhone
-- SystemSettings_QuickAction_AirplaneMode
-- SystemSettings_QuickAction_Camera
-- SystemSettings_QuickAction_CellularData
-- SystemSettings_QuickAction_InternetSharing
-- SystemSettings_QuickAction_QuietHours
-- SystemSettings_QuickAction_WiFi
-- SystemSettings_System_Display_Internal_Rotation
-- SystemSettings_System_Display_QuickAction_Brightness
-
-
-In this example, all settings pages and quick action settings are allowed. An empty \ node indicates that none of the settings are blocked.
-
-```xml
-
-
-```
-
-In this example for Windows 10, version 1511, all System setting pages are enabled. Note that the System page group is added as well as all of the System subpage names.
-
-```xml
-
-
-
-
-
-
-
-
-
-
-
-
-```
-Here is an example for Windows 10, version 1703.
-
-```xml
-
-
-
-
-
-
-
-
-
-```
-
-Entry | Description
------------ | ------------
-Buttons | The following list identifies the hardware buttons on the device that you can lock down in ButtonLockdownList. When a user taps a button that is in the lockdown list, nothing will happen.
-
-
-
Start
-
Back
-
Search
-
Camera
-
Custom1
-
Custom2
-
Custom3
-
-
-> [!NOTE]
-> Lock down of the Start button only prevents the press and hold event.
->
-> Custom buttons are hardware buttons that can be added to devices by OEMs.
-
-Buttons example:
-```xml
-
-
-
-
-
-
-
-
-
-```
-The Search and custom buttons can be remapped or configured to open a specific application. Button remapping takes effect for the device and applies to all users.
-
-> [!NOTE]
-> The lockdown settings for a button, per user role, will apply regardless of the button mapping.
->
-> Button remapping can enable a user to open an application that is not in the Allow list. Use button lock down to prevent application access for a user role.
-
-To remap a button in lockdown XML, you supply the button name, the button event (typically "press"), and the product ID for the application the button will open.
-
-```xml
-
-
-
-```
-**Disabling navigation buttons**
-To disable navigation buttons (such as Home or Back) in lockdown XML, you supply the name (for example, Start) and button event (typically "press").
-
-The following section contains a sample lockdown XML file that shows how to disable navigation buttons.
-
-```xml
-
-
-
-
-
-
-
-
- Large
-
- 0
- 0
-
-
-
-
-
-
-
- Small
-
- 2
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Small
-
-
-```
-
-Entry | Description
------------ | ------------
-MenuItems | Use **DisableMenuItems** to prevent use of the context menu, which is displayed when a user presses and holds an application in the All Programs list. You can include this entry in the default profile and in any additional user role profiles that you create.
-
-> [!IMPORTANT]
-> If **DisableMenuItems** is not included in a profile, users of that profile can uninstall apps.
-
-MenuItems example:
-
-```xml
-
-
-
-```
-
-Entry | Description
------------ | ------------
-Tiles | **Turning-on tile manipulation** - By default, under Assigned Access, tile manipulation is turned off (blocked) and only available if enabled in the user’s profile. If tile manipulation is enabled in the user’s profile, they can pin/unpin, move, and resize tiles based on their preferences. When multiple people use one device and you want to enable tile manipulation for multiple users, you must enable it for each user in their user profile.
-
-> [!IMPORTANT]
-> If a device is turned off then back on, the tiles reset to their predefined layout. If a device has only one profile, the only way to reset the tiles is to turn off then turn on the device. If a device has multiple profiles, the device resets the tiles to the predefined layout based on the logged-in user’s profile.
-
-The following sample file contains configuration for enabling tile manipulation.
-
-> [!NOTE]
-> Tile manipulation is disabled when you don’t have a `` node in lockdown XML, or if you have a `` node but don’t have the `` node.
-
-```xml
-
-
-
-
-
-
-
-
- Large
-
- 0
- 0
-
-
-
-
-
-
-
- Small
-
- 2
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Small
-
-
-```
-
-Entry | Description
------------ | ------------
-CSP Runner | Allows CSPs to be executed on the device per user role. You can use this to implement role specific policies, such as changing the color scheme when an admin logs on the device, or to set configurations per role.
-
-
-**LockscreenWallpaper/**
-The parent node of the lock screen-related parameters that let administrators query and manage the lock screen image on devices. Supported operations are Add, Delete, Get and Replace.
-
-**LockscreenWallpaper/BGFileName**
-The file name of the lock screen. The image file for the lock screen can be in .jpg or .png format and must not exceed 2 MB. The file name can also be in the Universal Naming Convention (UNC) format, in which case the device downloads it from the shared network and then sets it as the lock screen wallpaper.
-
-Supported operations are Add, Get, and Replace.
-
-**Theme/**
-The parent node of theme-related parameters.
-
-Supported operations are Add, Delete, Get and Replace.
-
-**Theme/ThemeBackground**
-Indicates whether the background color is light or dark. Set to **0** for light; set to **1** for dark.
-
-Supported operations are Get and Replace.
-
-**Theme/ThemeAccentColorID**
-The accent color to apply as the foreground color for tiles, controls, and other visual elements on the device. The following table shows the possible values.
-
-|Value|Description|
-|--- |--- |
-|0|Lime|
-|1|Green|
-|2|Emerald|
-|3|Teal (Viridian)|
-|4|Cyan (Blue)|
-|5|Cobalt|
-|6|Indigo|
-|7|Violet (Purple)|
-|8|Pink|
-|9|Magenta|
-|10|Crimson|
-|11|Red|
-|12|Orange (Mango)|
-|13|Amber|
-|14|Yellow|
-|15|Brown|
-|16|Olive|
-|17|Steel|
-|18|Mauve|
-|19|Sienna|
-|101 through 104|Optional colors, as defined by the OEM|
-|151|Custom accent color for Enterprise|
-
-Supported operations are Get and Replace.
-
-**Theme/ThemeAccentColorValue**
-A 6-character string for the accent color to apply to controls and other visual elements.
-
-To use a custom accent color for Enterprise, enter **151** for *ThemeAccentColorID* before *ThemeAccentColorValue* in lockdown XML. *ThemeAccentColorValue* configures the custom accent color using hex values for red, green, and blue, in RRGGBB format. For example, enter FF0000 for red.
-
-Supported operations are Get and Replace.
-
-**PersistData**
-Not supported in Windows 10.
-
-The parent node of whether to persist data that has been provisioned on the device.
-
-**PersistData/PersistProvisionedData**
-Not supported in Windows 10. Use doWipePersistProvisionedData in [RemoteWipe CSP](remotewipe-csp.md) instead.
-
-**Clock/TimeZone/**
-An integer that specifies the time zone of the device. The following table shows the possible values.
-
-Supported operations are Get and Replace.
-
-|Value|Time zone|
-|--- |--- |
-|0|UTC-12 International Date Line West|
-|100|UTC+13 Samoa|
-|110|UTC-11 Coordinated Universal Time-11|
-|200|UTC-10 Hawaii|
-|300|UTC-09 Alaska|
-|400|UTC-08 Pacific Time (US & Canada)|
-|410|UTC-08 Baja California|
-|500|UTC-07 Mountain Time (US & Canada)|
-|510|UTC-07 Chihuahua, La Paz, Mazatlan|
-|520|UTC-07 Arizona|
-|600|UTC-06 Saskatchewan|
-|610|UTC-06 Central America|
-|620|UTC-06 Central Time (US & Canada)|
-|630|UTC-06 Guadalajara, Mexico City, Monterrey|
-|700|UTC-05 Eastern Time (US & Canada)|
-|710|UTC-05 Bogota, Lima, Quito|
-|720|UTC-05 Indiana (East)|
-|800|UTC-04 Atlantic Time (Canada)|
-|810|UTC-04 Cuiaba|
-|820|UTC-04 Santiago|
-|830|UTC-04 Georgetown, La Paz, Manaus, San Juan|
-|840|UTC-04 Caracas|
-|850|UTC-04 Asuncion|
-|900|UTC-03:30 Newfoundland|
-|910|UTC-03 Brasilia|
-|920|UTC-03 Greenland|
-|930|UTC-03 Montevideo|
-|940|UTC-03 Cayenne, Fortaleza|
-|950|UTC-03 Buenos Aires|
-|960|UTC-03 Salvador|
-|1000|UTC-02 Mid-Atlantic|
-|1010|UTC-02 Coordinated Universal Time-02|
-|1100|UTC-01 Azores|
-|1110|UTC-01 Cabo Verde|
-|1200|UTC Dublin, Edinburgh, Lisbon, London|
-|1210|UTC Monrovia, Reykjavik|
-|1220|UTC Casablanca|
-|1230|UTC Coordinated Universal Time|
-|1300|UTC+01 Belgrade, Bratislava, Budapest, Ljubljana, Prague|
-|1310|UTC+01 Sarajevo, Skopje, Warsaw, Zagreb|
-|1320|UTC+01 Brussels, Copenhagen, Madrid, Paris|
-|1330|UTC+01 West Central Africa|
-|1340|UTC+01 Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna|
-|1350|UTC+01 Windhoek|
-|1360|UTC+01 Tripoli|
-|1400|UTC+02 E. Europe|
-|1410|UTC+02 Cairo|
-|1420|UTC+02 Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius|
-|1430|UTC+02 Athens, Bucharest|
-|1440|UTC+02 Jerusalem|
-|1450|UTC+02 Amman|
-|1460|UTC+02 Beirut|
-|1470|UTC+02 Harare, Pretoria|
-|1480|UTC+02 Damascus|
-|1490|UTC+02 Istanbul|
-|1500|UTC+03 Kuwait, Riyadh|
-|1510|UTC+03 Baghdad|
-|1520|UTC+03 Nairobi|
-|1530|UTC+03 Kaliningrad, Minsk|
-|1540|UTC+04 Moscow, St. Petersburg, Volgograd|
-|1550|UTC+03 Tehran|
-|1600|UTC+04 Abu Dhabi, Muscat|
-|1610|UTC+04 Baku|
-|1620|UTC+04 Yerevan|
-|1630|UTC+04 Kabul|
-|1640|UTC+04 Tbilisi|
-|1650|UTC+04 Port Louis|
-|1700|UTC+06 Ekaterinburg|
-|1710|UTC+05 Tashkent|
-|1720|UTC+05 Chennai, Kolkata, Mumbai, New Delhi|
-|1730|UTC+05 Sri Jayawardenepura|
-|1740|UTC+05 Kathmandu|
-|1750|UTC+05 Islamabad, Karachi|
-|1800|UTC+06 Astana|
-|1810|UTC+07 Novosibirsk|
-|1820|UTC+06 Yangon (Rangoon)|
-|1830|UTC+06 Dhaka|
-|1900|UTC+08 Krasnoyarsk|
-|1910|UTC+07 Bangkok, Hanoi, Jakarta|
-|1900|UTC+08 Krasnoyarsk|
-|2000|UTC+08 Beijing, Chongqing, Hong Kong SAR, Urumqi|
-|2010|UTC+09 Irkutsk|
-|2020|UTC+08 Kuala Lumpur, Singapore|
-|2030|UTC+08 Taipei|
-|2040|UTC+08 Perth|
-|2050|UTC+08 Ulaanbaatar|
-|2100|UTC+09 Seoul|
-|2110|UTC+09 Osaka, Sapporo, Tokyo|
-|2120|UTC+10 Yakutsk|
-|2130|UTC+09 Darwin|
-|2140|UTC+09 Adelaide|
-|2200|UTC+10 Canberra, Melbourne, Sydney|
-|2210|UTC+10 Brisbane|
-|2220|UTC+10 Hobart|
-|2230|UTC+11 Vladivostok|
-|2240|UTC+10 Guam, Port Moresby|
-|2300|UTC+11 Solomon Is., New Caledonia|
-|2310|UTC+12 Magadan|
-|2400|UTC+12 Fiji|
-|2410|UTC+12 Auckland, Wellington|
-|2420|UTC+12 Petropavlovsk-Kamchatsky|
-|2430|UTC+12 Coordinated Universal Time +12|
-|2500|UTC+13 Nuku'alofa|
-
-**Locale/Language/**
-The culture code that identifies the language to display on a device, and specifies the formatting of numbers, currencies, time, and dates. For language values, see [Locale IDs Assigned by Microsoft](/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c).
-
-The language setting is configured in the Default User profile only.
-
-> [!NOTE]
-> Apply the Locale ID only after the corresponding language packs are built into and supported for the OS image running on the device. The specified language will be applied as the phone language and a restart may be required.
-
-Supported operations are Get and Replace.
-
-## OMA client provisioning examples
-
-
-The XML examples in this section show how to perform various tasks by using OMA client provisioning.
-
-> [!NOTE]
-> These examples are XML snippets and do not include all sections that are required for a complete lockdown XML file.
-
-
-
-### Assigned Access settings
-
-The following example shows how to add a new policy.
-
-```xml
-
-
-
- "/>
-
-
-
-```
-
-### Language
-
-The following example shows how to specify the language to display on the device.
-
-```xml
-
-
-
-
-
-
-```
-
-## OMA DM examples
-
-
-These XML examples show how to perform various tasks using OMA DM.
-
-### Assigned access settings
-
-The following example shows how to lock down a device.
-
-```xml
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/AssignedAccess/AssignedAccessXml
-
-
-
-
-
-
-
-```
-
-### Theme
-
-The following example shows how to change the accent color to one of the standard colors.
-
-```xml
-
-
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Theme/ThemeAccentColorID
-
-
- int
-
-
- 7
-
-
-
-
-
-```
-
-The following example shows how to change the theme.
-
-```xml
-
-
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Theme/ThemeBackground
-
-
- int
-
-
- 1
-
-
-
-
-
-```
-
-The following example shows how to set a custom theme accent color for the enterprise environment.
-
-```xml
-
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Theme/ThemeAccentColorID
-
-
- int
-
-
- 151
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Theme/ThemeAccentColorValue
-
-
- chr
-
-
- FF0000
-
-
-
-
-```
-
-### Lock screen
-
-Use the examples in this section to set a new lock screen and manage the lock screen features. If using a UNC path, format the LocURI as \\\\host\\share\\image.jpg.
-
-```xml
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/LockScreenWallpaper/BGFileName
-
- chr
- text/plain
-
- c:\windows\system32\lockscreen\480x800\Wallpaper_015.jpg
-
-
-
-```
-
-The following example shows how to query the device for the file being used as the lock screen.
-
-```xml
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/LockScreenWallpaper/BGFileName
-
-
-
-```
-
-The following example shows how to change the existing lock screen image to one of your choosing.
-
-```xml
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/LockScreenWallpaper/BGFileName
-
-
- chr
- text/plain
-
- c:\windows\system32\lockscreen\480x800\Wallpaper_015.jpg
-
-
-
-
-
-```
-
-### Time zone
-
-The following example shows how to set the time zone to UTC-07 Mountain Time (US & Canada).
-
-```xml
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Clock/TimeZone
-
-
- int
-
- 500
-
-
-
-
-
-```
-
-The following example shows how to set the time zone to Pacific Standard Time (UTC-08:00) without observing daylight savings time (UTC+01:00).
-
-```xml
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Clock/TimeZone
-
-
- int
-
- 400
-
-
-
-
-
-```
-
-### Language
-
-The following example shows how to set the language.
-
-```xml
-
-
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseAssignedAccess/Locale/Language
-
-
- int
-
- 1033
-
-
-
-
-
-```
-
-## Product IDs in Windows 10 Mobile
-
-The following table lists the product ID and AUMID for each app that is included in Windows 10 Mobile.
-
-|App|Product ID|AUMID|
-|--- |--- |--- |
-|Alarms and clock|44F7D2B4-553D-4BEC-A8B7-634CE897ED5F|Microsoft.WindowsAlarms_8wekyb3d8bbwe!App|
-|Calculator|B58171C6-C70C-4266-A2E8-8F9C994F4456|Microsoft.WindowsCalculator_8wekyb3d8bbwe!App|
-|Camera|F0D8FEFD-31CD-43A1-A45A-D0276DB069F1|Microsoft.WindowsCamera_8wekyb3d8bbwe!App|
-|Contact Support|0DB5FCFF-4544-458A-B320-E352DFD9CA2B|Windows.ContactSupport_cw5n1h2txyewy!App|
-|Cortana|FD68DCF4-166F-4C55-A4CA-348020F71B94|Microsoft.Windows.Cortana_cw5n1h2txyewy!CortanaUI|
-|Excel|EAD3E7C0-FAE6-4603-8699-6A448138F4DC|Microsoft.Office.Excel_8wekyb3d8bbwe!microsoft.excel|
-|Facebook|82A23635-5BD9-DF11-A844-00237DE2DB9E|Microsoft.MSFacebook_8wekyb3d8bbwe!x82a236355bd9df11a84400237de2db9e|
-|File Explorer|C5E2524A-EA46-4F67-841F-6A9465D9D515|c5e2524a-ea46-4f67-841f-6a9465d9d515_cw5n1h2txyewy!App|
-|FM Radio|F725010E-455D-4C09-AC48-BCDEF0D4B626|N/A|
-|Get Started|B3726308-3D74-4A14-A84C-867C8C735C3C|Microsoft.Getstarted_8wekyb3d8bbwe!App|
-|Groove Music|D2B6A184-DA39-4C9A-9E0A-8B589B03DEC0|Microsoft.ZuneMusic_8wekyb3d8bbwe!Microsoft.ZuneMusic|
-|Maps|ED27A07E-AF57-416B-BC0C-2596B622EF7D|Microsoft.WindowsMaps_8wekyb3d8bbwe!App|
-|Messaging|27E26F40-E031-48A6-B130-D1F20388991A|Microsoft.Messaging_8wekyb3d8bbwe!x27e26f40ye031y48a6yb130yd1f20388991ax|
-|Microsoft Edge|395589FB-5884-4709-B9DF-F7D558663FFD|Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge|
-|Money|1E0440F1-7ABF-4B9A-863D-177970EEFB5E|Microsoft.BingFinance_8wekyb3d8bbwe!AppexFinance|
-|Movies and TV|6AFFE59E-0467-4701-851F-7AC026E21665|Microsoft.ZuneVideo_8wekyb3d8bbwe!Microsoft.ZuneVideo|
-|News|9C3E8CAD-6702-4842-8F61-B8B33CC9CAF1|Microsoft.BingNews_8wekyb3d8bbwe!AppexNews|
-|OneDrive|AD543082-80EC-45BB-AA02-FFE7F4182BA8|Microsoft.MicrosoftSkydrive_8wekyb3d8bbwe!App|
-|OneNote|CA05B3AB-F157-450C-8C49-A1F127F5E71D|Microsoft.Office.OneNote_8wekyb3d8bbwe!microsoft.onenoteim|
-|Outlook Calendar|A558FEBA-85D7-4665-B5D8-A2FF9C19799B|Microsoft.WindowsCommunicationsApps_8wekyb3d8bbwe!Microsoft.WindowsLive.Calendar|
-|Outlook Mail|A558FEBA-85D7-4665-B5D8-A2FF9C19799B|Microsoft.WindowsCommunicationsApps_8wekyb3d8bbwe!Microsoft.WindowsLive.Mail|
-|People|60BE1FB8-3291-4B21-BD39-2221AB166481|Microsoft.People_8wekyb3d8bbwe!xb94d6231y84ddy49a8yace3ybc955e769e85x|
-|Phone (dialer)|F41B5D0E-EE94-4F47-9CFE-3D3934C5A2C7|Microsoft.CommsPhone_8wekyb3d8bbwe!App|
-|Photos|FCA55E1B-B9A4-4289-882F-084EF4145005|Microsoft.Windows.Photos_8wekyb3d8bbwe!App|
-|Podcasts|C3215724-B279-4206-8C3E-61D1A9D63ED3|Microsoft.MSPodcast_8wekyb3d8bbwe!xc3215724yb279y4206y8c3ey61d1a9d63ed3x|
-|PowerPoint|B50483C4-8046-4E1B-81BA-590B24935798|Microsoft.Office.PowerPoint_8wekyb3d8bbwe!microsoft.pptim|
-|Settings|2A4E62D8-8809-4787-89F8-69D0F01654FB|2a4e62d8-8809-4787-89f8-69d0f01654fb_8wekyb3d8bbwe!App|
-|Skype|C3F8E570-68B3-4D6A-BDBB-C0A3F4360A51|Microsoft.SkypeApp_kzf8qxf38zg5c!Skype.AppId|
-|Skype Video|27E26F40-E031-48A6-B130-D1F20388991A|Microsoft.Messaging_8wekyb3d8bbwe!App|
-|Sports|0F4C8C7E-7114-4E1E-A84C-50664DB13B17|Microsoft.BingSports_8wekyb3d8bbwe!AppexSports|
-|Storage|5B04B775-356B-4AA0-AAF8-6491FFEA564D|N/A|
-|Store|7D47D89A-7900-47C5-93F2-46EB6D94C159|Microsoft.WindowsStore_8wekyb3d8bbwe!App|
-|Voice recorder|7311B9C5-A4E9-4C74-BC3C-55B06BA95AD0|Microsoft.WindowsSoundRecorder_8wekyb3d8bbwe!App|
-|Wallet|587A4577-7868-4745-A29E-F996203F1462|Microsoft.MicrosoftWallet_8wekyb3d8bbwe!App|
-|Weather|63C2A117-8604-44E7-8CEF-DF10BE3A57C8|Microsoft.BingWeather_8wekyb3d8bbwe!App|
-|Windows Feedback|7604089D-D13F-4A2D-9998-33FC02B63CE3|Microsoft.WindowsFeedback_8wekyb3d8bbwe!App|
-|Word|258F115C-48F4-4ADB-9A68-1387E634459B|Microsoft.Office.Word_8wekyb3d8bbwe!microsoft.word|
-|Xbox|B806836F-EEBE-41C9-8669-19E243B81B83|Microsoft.XboxApp_8wekyb3d8bbwe!Microsoft.XboxApp|
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md b/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
deleted file mode 100644
index 07c553f82a..0000000000
--- a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
+++ /dev/null
@@ -1,328 +0,0 @@
----
-title: EnterpriseAssignedAccess DDF
-description: Utilize the OMA DM device description framework (DDF) for the EnterpriseAssignedAccess configuration service provider.
-ms.assetid: 8BD6FB05-E643-4695-99A2-633995884B37
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 12/05/2017
----
-
-# EnterpriseAssignedAccess DDF
-
-
-This topic shows the OMA DM device description framework (DDF) for the **EnterpriseAssignedAccess** configuration service provider. DDF files are used only with OMA DM provisioning XML.
-
-Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download).
-
-```xml
-
-]>
-
- 1.2
-
- EnterpriseAssignedAccess
- ./Vendor/MSFT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- com.microsoft/1.1/MDM/EnterpriseAssignedAccess
-
-
-
- AssignedAccess
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AssignedAccessXml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
- LockScreenWallpaper
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BGFileName
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
- Theme
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ThemeBackground
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- ThemeAccentColorID
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- ThemeAccentColorValue
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
- Clock
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- TimeZone
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
- Locale
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Language
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
-
-```
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md b/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
deleted file mode 100644
index e92dc7393a..0000000000
--- a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
+++ /dev/null
@@ -1,270 +0,0 @@
----
-title: EnterpriseAssignedAccess XSD
-description: This XSD can be used to validate that the lockdown XML in the \ block of the AssignedAccessXML node.
-ms.assetid: BB3B633E-E361-4B95-9D4A-CE6E08D67ADA
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# EnterpriseAssignedAccess XSD
-
-
-This XSD can be used to validate that the lockdown XML in the \ block of the AssignedAccessXML node.
-
-```xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/enterprisedataprotection-csp.md b/windows/client-management/mdm/enterprisedataprotection-csp.md
index 75acd88843..e406d98d74 100644
--- a/windows/client-management/mdm/enterprisedataprotection-csp.md
+++ b/windows/client-management/mdm/enterprisedataprotection-csp.md
@@ -38,7 +38,6 @@ EnterpriseDataProtection
--------EDPEnforcementLevel
--------EnterpriseProtectedDomainNames
--------AllowUserDecryption
---------RequireProtectionUnderLockConfig
--------DataRecoveryCertificate
--------RevokeOnUnenroll
--------RMSTemplateIDForEDP
@@ -95,24 +94,6 @@ The following list shows the supported values:
Most restricted value is 0.
-Supported operations are Add, Get, Replace, and Delete. Value type is integer.
-
-**Settings/RequireProtectionUnderLockConfig**
-Specifies whether the protection under lock feature (also known as encrypt under pin) should be configured. A PIN must be configured on the device before you can apply this policy.
-
-The following list shows the supported values:
-
-- 0 (default) – Not required.
-- 1 – Required.
-
-Most restricted value is 1.
-
-The CSP checks the current edition and hardware support (TPM), and returns an error message if the device does not have the required hardware.
-
-> [!Note]
-> This setting is only supported in Windows 10 Mobile.
-
-
Supported operations are Add, Get, Replace, and Delete. Value type is integer.
**Settings/DataRecoveryCertificate**
@@ -250,7 +231,7 @@ For EFSCertificate KeyTag, it is expected to be a DER ENCODED binary certificate
Supported operations are Add, Get, Replace, and Delete. Value type is base-64 encoded certificate.
**Settings/RevokeOnUnenroll**
-This policy controls whether to revoke the WIP keys when a device unenrolls from the management service. If set to 0 (Don't revoke keys), the keys will not be revoked and the user will continue to have access to protected files after unenrollment. If the keys are not revoked, there will be no revoked file cleanup subsequently. Prior to sending the unenroll command, when you want a device to do a selective wipe when it is unenrolled, then you should explicitly set this policy to 1.
+This policy controls whether to revoke the WIP keys when a device unenrolls from the management service. If set to 0 (Don't revoke keys), the keys will not be revoked and the user will continue to have access to protected files after unenrollment. If the keys are not revoked, there will be no revoked file cleanup subsequently. Prior to sending the unenroll command, when you want a device to do a selective wipe when it is unenrolled, then you should explicitly set this policy to 1.
The following list shows the supported values:
@@ -260,7 +241,7 @@ The following list shows the supported values:
Supported operations are Add, Get, Replace, and Delete. Value type is integer.
**Settings/RevokeOnMDMHandoff**
-Added in Windows 10, version 1703. This policy controls whether to revoke the WIP keys when a device upgrades from mobile application management (MAM) to MDM. If set to 0 (Don't revoke keys), the keys will not be revoked and the user will continue to have access to protected files after upgrade. This is recommended if the MDM service is configured with the same WIP EnterpriseID as the MAM service.
+Added in Windows 10, version 1703. This policy controls whether to revoke the WIP keys when a device upgrades from mobile application management (MAM) to MDM. If set to 0 (Don't revoke keys), the keys will not be revoked and the user will continue to have access to protected files after upgrade. This is recommended if the MDM service is configured with the same WIP EnterpriseID as the MAM service.
- 0 - Don't revoke keys
- 1 (default) - Revoke keys
diff --git a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
index 88a7fa3127..1b0ee74568 100644
--- a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
@@ -141,29 +141,6 @@ The XML below is the current version for this CSP.
-
- RequireProtectionUnderLockConfig
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
- DataRecoveryCertificate
diff --git a/windows/client-management/mdm/enterpriseext-csp.md b/windows/client-management/mdm/enterpriseext-csp.md
deleted file mode 100644
index 7f3b2f1e9e..0000000000
--- a/windows/client-management/mdm/enterpriseext-csp.md
+++ /dev/null
@@ -1,386 +0,0 @@
----
-title: EnterpriseExt CSP
-description: Learn how the EnterpriseExt CSP allows OEMs to set their own unique ID for their devices, set display brightness values, and set the LED behavior.
-ms.assetid: ACA5CD79-BBD5-4DD1-86DA-0285B93982BD
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# EnterpriseExt CSP
-
-
-The EnterpriseExt configuration service provider allows OEMs to set their own unique ID for their devices, set display brightness values, and set the LED behavior.
-
-> **Note** The EnterpriseExt CSP is only supported in Windows 10 Mobile.
-
-
-
-The following shows the EnterpriseExt configuration service provider in tree format as used by both the Open Mobile Alliance (OMA) Device Management (DM) and OMA Client Provisioning.
-```
-./Vendor/MSFT
-EnterpriseExt
-----DeviceCustomData
---------CustomID
---------CustomString
-----Brightness
---------Default
---------MaxAuto
-----LedAlertNotification
---------State
---------Intensity
---------Period
---------DutyCycle
---------Cyclecount
-```
-The following list shows the characteristics and parameters.
-
-**./Vendor/MSFT/EnterpriseExt**
-The root node for the EnterpriseExt configuration service provider. Supported operations is Get.
-
-**DeviceCustomData**
-Node for setting the custom device ID and string.
-
-**DeviceCustomData/CustomID**
-Any string value as the device ID. This value appears in **Settings** > **About** > **Info**.
-
-Here's an example for getting custom data.
-
-```xml
-
-
-
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseExt/DeviceCustomData/CustomID
-
-
-
-
- ./Vendor/MSFT/EnterpriseExt/DeviceCustomData/CustomString
-
-
-
-
-
-
-```
-
-**DeviceCustomData/CustomString**
-Any string value that is associated with the device.
-
-Here's an example for setting custom data.
-
-```xml
-
-
-
-
- 1
-
-
- ./Vendor/MSFT/EnterpriseExt/DeviceCustomData/CustomID
-
- urn:uuid:130CCE0D-0187-5866-855A-DE7406F76046
-
-
-
- ./Vendor/MSFT/EnterpriseExt/DeviceCustomData/CustomString
-
- {"firstName":"John","lastName":"Doe"}
-
-
-
-
-
-```
-
-**Brightness**
-Node for setting device brightness values.
-
-**Brightness/Default**
-Default display brightness value. For example, you can maximize battery life by reducing the default value or set it to medium in a facility that is generally darker.
-
-The valid values are:
-
-- Automatic - the device determines the brightness
-- Low
-- Medium
-- High
-
-The supported operations are Get and Replace.
-
-Here's an example for getting the current default value.
-
-```xml
-
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseExt/Brightness/Default
-
-
-
-
-
-
-```
-
-Here's an example for setting the default value to medium.
-
-```xml
-
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseExt/Brightness/Default
-
- medium
-
-
-
-
-
-```
-
-**Brightness/MaxAuto**
-Maximum display brightness value when the device is set to automatic mode. The device brightness will never be higher than the MaxAuto value. The value values are:
-
-- Low
-- Medium
-- High
-
-The supported operations are Get and Replace.
-
-Here's an example for setting the maximum auto-brightness to medium.
-
-```xml
-
-
-
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseExt/Brightness/MaxAuto
-
- medium
-
-
-
-
-
-```
-
-**LedAlertNotification**
-Node for setting LED behavior of the device.
-
-**LedAlertNotification/State**
-LED state. The valid values are:
-
-- 0 - off
-- 1 - on
-- 2 - blink
-
-Example: LED On
-
-```xml
-
-
-
-
- 3
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/Intensity
-
-
- int
-
- 100
-
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/State
-
-
- int
-
- 1
-
-
-
-
-
-```
-
-Example: LED Off
-
-```xml
-
-
-
-
- 3
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/State
-
-
- int
-
- 0
-
-
-
-
-
-```
-
-**LedAlertNotification/Intensity**
-Intensity of the LED brightness. You can set the value between 1 - 100.
-
-Example: LED blink
-
-```xml
-
-
-
-
- 3
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/Period
-
-
- int
-
- 500
-
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/Dutycycle
-
-
- int
-
- 70
-
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/Intensity
-
-
- int
-
- 100
-
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/Cyclecount
-
-
- int
-
- 543210
-
-
-
- ./Vendor/MSFT/EnterpriseExt/LedAlertNotification/State
-
-
- int
-
- 2
-
-
-
-
-
-```
-
-**LedAlertNotification/Period**
-Duration of each blink, which is the time of ON + OFF. The value is in milliseconds. This is valid only for blink.
-
-**LedAlertNotification/DutyCycle**
-LED ON duration during one blink cycle. You can set the value between 1 - 100. This is valid only for blink.
-
-**LedAlertNotification/Cyclecount**
-Number of blink cycles. The data type is a 4-byte signed integer. Any negative value or zero results in an error. This node is only valid for blink.
-
-**DeviceReboot**
-Removed in Windows 10.
-
-**DeviceReboot/WaitTime**
-Removed in Windows 10.
-
-**MaintenanceWindow**
-Removed in Windows 10.
-
-**MaintenanceWindow/MaintenanceAllowed**
-Removed in Windows 10.
-
-**MaintenanceWindow/MWMandatory**
-Removed in Windows 10.
-
-**MaintenanceWindow/ScheduleXML**
-Removed in Windows 10.
-
-**MaintenanceWindow/MWNotificationDuration**
-Removed in Windows 10.
-
-**MaintenanceWindow/MWminimumDuration**
-Removed in Windows 10.
-
-**DeviceUpdate**
-Removed in Windows 10.
-
-**DeviceUpdate/DateTimeStamp**
-Removed in Windows 10.
-
-**DeviceUpdate/UpdateResultXml**
-Removed in Windows 10.
-
-**MDM**
-Removed in Windows 10.
-
-**MDM/Server**
-Removed in Windows 10.
-
-**MDM/Username**
-Removed in Windows 10.
-
-**MDM/Password**
-Removed in Windows 10.
-
-**MDM/EnableDeviceEnrollment**
-Removed in Windows 10.
-
-**Pfx**
-Removed in Windows 10.
-
-**DisableEnterpriseValidation**
-Removed in Windows 10.
-
-
-
-
-
-10/10/2016
-
-
-
-
diff --git a/windows/client-management/mdm/enterpriseext-ddf.md b/windows/client-management/mdm/enterpriseext-ddf.md
deleted file mode 100644
index a5f3dfb274..0000000000
--- a/windows/client-management/mdm/enterpriseext-ddf.md
+++ /dev/null
@@ -1,320 +0,0 @@
----
-title: EnterpriseExt DDF
-description: Learn about the OMA DM device description framework (DDF) for the EnterpriseExt configuration service provider (CSP).
-ms.assetid: 71BF81D4-FBEC-4B03-BF99-F7A5EDD4F91B
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 12/05/2017
----
-
-# EnterpriseExt DDF
-
-
-This topic shows the OMA DM device description framework (DDF) for the **EnterpriseExt** configuration service provider. DDF files are used only with OMA DM provisioning XML.
-
-Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download).
-
-```xml
-
-]>
-
- 1.2
-
- EnterpriseExt
- ./Vendor/MSFT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DeviceCustomData
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CustomID
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- CustomString
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
- Brightness
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Default
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- MaxAuto
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
- LedAlertNotification
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- State
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- Intensity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- Period
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- DutyCycle
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
- Cyclecount
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
-
-```
-
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/enterpriseextfilessystem-csp.md b/windows/client-management/mdm/enterpriseextfilessystem-csp.md
deleted file mode 100644
index 335caebb7d..0000000000
--- a/windows/client-management/mdm/enterpriseextfilessystem-csp.md
+++ /dev/null
@@ -1,140 +0,0 @@
----
-title: EnterpriseExtFileSystem CSP
-description: Add, retrieve, or change files through the Mobile Device Management (MDM) service using the EnterpriseExtFileSystem CSP.
-ms.assetid: F773AD72-A800-481A-A9E2-899BA56F4426
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# EnterpriseExtFileSystem CSP
-
-
-The EnterpriseExtFileSystem configuration service provider (CSP) allows IT administrators to add, retrieve, or change files in the file system through the Mobile Device Management (MDM) service. For example, you can use this configuration service provider to push a provisioning XML file or a new lock screen background image file to a device through the MDM service, and also retrieve logs from the device in the enterprise environment.
-
-> **Note** The EnterpriseExtFileSystem CSP is only supported in Windows 10 Mobile.
-
-
-
-File contents are embedded directly into the syncML message, so there is a limit to the size of the file that can be retrieved from the device. The default limit is 0x100000 (1 MB). You can configure this limit by using the following registry key: **Software\\Microsoft\\Provisioning\\CSPs\\.\\Vendor\\MSFT\\EnterpriseExtFileSystem\\MaxFileReadSize**.
-
-The following shows the EnterpriseExtFileSystem configuration service provider in tree format as used by the Open Mobile Alliance (OMA) Device Management (DM).
-```
-./Vendor/MSFT
-EnterpriseExtFileSystem
-----Persistent
---------Files_abc1
---------Directory_abc2
-----NonPersistent
---------Files_abc3
---------Directory_abc4
-----OemProfile
---------Directory_abc5
---------Files_abc6
-```
-The following list describes the characteristics and parameters.
-
-**./Vendor/MSFT/EnterpriseExtFileSystem**
-
The root node for the EnterpriseExtFileSystem configuration service provider. Supported operations are Add and Get.
-
-**Persistent**
-
The EnterpriseExtFileSystem CSP allows an enterprise to read, write, delete and list files in this folder. When an app writes data to the Persistent folder, it accesses that data from the EnterpriseExtFileSystem\Persistent node. Files written to the Persistent folder persists over ordinary power cycles.
-
-> **Important** There is a limit to the amount of data that can be persisted, which varies depending on how much disk space is available on one of the partitions. This data cap amount (that can be persisted) varies by manufacturer.
->
->
->
-> **Note** When the IT admin triggers a **doWipePersistProvisionedData** action using [RemoteWipe CSP](remotewipe-csp.md), items stored in the Persistent folder are persisted over wipe and restored when the device boots again. The contents are not persisted if a **doWipe** action is triggered.
-
-
-
-**NonPersistent**
-
The EnterpriseExtFileSystem CSP allows an enterprise to read, write, delete and list files in this folder. When an app writes data to the Non-Persistent folder, it accesses that data from the EnterpriseExtFileSystem\NonPersistent node. Files written to the NonPersistent folder will persist over ordinary power cycles.
-
-
When the device is wiped, any data stored in the NonPersistent folder is deleted.
-
-**OemProfile**
-
Added in Windows 10, version 1511. The EnterpriseExtFileSystem CSP allows an enterprise to deploy an OEM profile on the device, such as a barcode scanner profile then can be consumed by the OEM barcode scanner driver. The file is placed into the \data\shareddata\oem\public\profile\ folder of the device.
-
-***Directory***
-
The name of a directory in the device file system. Any Directory node can have directories and files as child nodes.
-
-
Use the Add command to create a new directory. You cannot use it to add a new directory under a file system root.
-
-
Use the Get command to return the list of child node names under Directory.
-
-
Use the Get command with ?List=Struct to recursively return all child node names, including subdirectory names, under Directory.
-
-***Filename***
-
The name of a file in the device file system.
-
-Supported operations is Get.
-
-## OMA DM examples
-
-
-The following example shows how to retrieve a file from the device.
-
-```xml
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseExtFileSystem/Persistent/file.txt
-
-
-
-```
-
-The following example shows the file name that is returned in the body of the response syncML code. In this example, the full path of the file on the device is C:/data/test/bin/filename.txt.
-
-```xml
-
- 3
- 1
- 2
-
-
- ./Vendor/MSFT/EnterpriseExtFileSystem/Persistent/filename.txt
-
-
- b64
- application/octet-stream
-
- aGVsbG8gd29ybGQ=
-
-
-```
-
-The following example shows how to push a file to the device.
-
-```xml
-
- 2
-
-
- ./Vendor/MSFT/EnterpriseExtFileSystem/Persistent/new.txt
-
-
- b64
- application/octet-stream
-
- aGVsbG8gd29ybGQ=
-
-
-```
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md b/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
deleted file mode 100644
index f910743b9b..0000000000
--- a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
+++ /dev/null
@@ -1,273 +0,0 @@
----
-title: EnterpriseExtFileSystem DDF
-description: Learn about the OMA DM device description framework (DDF) for the EnterpriseExtFileSystem configuration service provider (CSP).
-ms.assetid: 2D292E4B-15EE-4AEB-8884-6FEE8B92D2D1
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 12/05/2017
----
-
-# EnterpriseExtFileSystem DDF
-
-
-This topic shows the OMA DM device description framework (DDF) for the **EnterpriseExtFileSystem** configuration service provider. DDF files are used only with OMA DM provisioning XML.
-
-Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download).
-
-```xml
-
-]>
-
- 1.2
-
- EnterpriseExtFileSystem
- ./Vendor/MSFT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Persistent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Files_abc1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Files
-
-
-
-
-
-
- Directory_abc2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Directory
-
- text/plain
-
-
-
-
-
- NonPersistent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Files_abc3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Files
-
- text/plain
-
-
-
-
- Directory_abc4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Directory
-
- text/plain
-
-
-
-
-
- OemProfile
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Directory_abc5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Directory
-
- text/plain
-
-
-
-
- Files_abc6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Files
-
- text/plain
-
-
-
-
-
-
-```
-
-## Related topics
-
-
-[EnterpriseExtFileSystem configuration service provider](enterpriseextfilessystem-csp.md)
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
index 7929c9bf66..107d0c3745 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
@@ -68,7 +68,7 @@ EnterpriseModernAppManagement
For user context, use **./User/Vendor/MSFT** path and for device context, use **./Device/Vendor/MSFT** path.
> [!Note]
-> Windows Holographic and Windows 10 Mobile only support per-user configuration of the EnterpriseModernAppManagement CSP.
+> Windows Holographic only supports per-user configuration of the EnterpriseModernAppManagement CSP.
**AppManagement**
Required. Used for inventory and app management (post-install).
@@ -120,7 +120,7 @@ Query parameters:
- Bundle - returns installed bundle packages.
- Framework - returns installed framework packages.
- Resource - returns installed resources packages. Resources are either language, scale, or DirectX resources. They are parts of a bundle.
- - XAP - returns XAP package types. This filter is not supported on devices other than Windows Mobile.
+ - XAP - returns XAP package types. This filter is only supported on Windows Mobile.
- All - returns all package types.
If no value is specified, the combination of Main, Bundle, and Framework are returned.
diff --git a/windows/client-management/mdm/filesystem-csp.md b/windows/client-management/mdm/filesystem-csp.md
deleted file mode 100644
index 5c9fd56269..0000000000
--- a/windows/client-management/mdm/filesystem-csp.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-title: FileSystem CSP
-description: Learn how the FileSystem CSP is used to query, add, modify, and delete files, file directories, and file attributes on the mobile device.
-ms.assetid: 9117ee16-ca7a-4efa-9270-c9ac8547e541
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# FileSystem CSP
-
-The FileSystem configuration service provider is used to query, add, modify, and delete files, file directories, and file attributes on the mobile device. It can retrieve information about or manage files in ROM, files in persistent store and files on any removable storage card that is present in the device. It works for files that are hidden from the user as well as those that are visible to the user.
-
-> [!NOTE]
-> FileSystem CSP is only supported in Windows 10 Mobile.
-
-> [!NOTE]
-> This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_CSP\_OEM capabilities to be accessed from a network configuration application.
-
-The following shows the FileSystem 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.
-
-```console
-./Vendor/MSFT
-FileSystem
-----file name
-----file directory
---------file name
---------file directory
-```
-
-**FileSystem**
-Required. Defines the root of the file system management object. It functions as the root directory for file system queries.
-
-Recursive queries or deletes are not supported for this element. Add commands will add a new file or directory under the root path.
-
-The following properties are supported for the root node:
-
-- `Name`: The root node name. The Get command is the only supported command.
-
-- `Type`: The MIME type of the file, which is com.microsoft/windowsmobile/1.1/FileSystemMO. The Get command is the only supported command.
-
-- `Format`: The format, which is `node`. The Get command is the only supported command.
-
-- `TStamp`: A standard OMA property that indicates the last time the file directory was changed. The value is represented by a string containing a UTC based, ISO 8601 basic format, complete representation of a date and time value, e.g. 20010711T163817Z means July 11, 2001 at 16 hours, 38 minutes and 17 seconds. The Get command is the only supported command.
-
-- `Size`: Not supported.
-
-- `msft:SystemAttributes`: A custom property that contains file directory attributes. This value is an integer bit mask that corresponds to the FILE\_ATTRIBUTE values and flags defined in the header file winnt.h. This supports the Get command and the Replace command.
-
-***file directory***
-Optional. Returns the name of a directory in the device file system. Any *file directory* element can contain directories and files as child elements.
-
-The Get command returns the name of the file directory. The Get command with `?List=Struct` will recursively return all child element names (including sub-directory names). The Get command with `?list=StructData` query is not supported and returns a 406 error code.
-
-The Add command is used to create a new directory. Adding a new directory under the file system root is not supported and returns a 405 error code.
-
-The Replace command is not supported.
-
-The Delete command is used to delete all files and subfolders under this *file directory*.
-
-The following properties are supported for file directories:
-
-- `Name`: The file directory name. The Get command is the only supported command.
-
-- `Type`: The MIME type of the file, which is an empty string for directories that are not the root node. The Get command is the only supported command.
-
-- `Format`: The format, which is `node`. The Get command is the only supported command.
-
-- `TStamp`: A standard OMA property that indicates the last time the file directory was changed. The value is represented by a string containing a UTC based, ISO 8601 basic format, complete representation of a date and time value, e.g. 20010711T163817Z means July 11, 2001 at 16 hours, 38 minutes and 17 seconds. The Get command is the only supported command.
-
-- `Size`: Not supported.
-
-- `msft:SystemAttributes`: A custom property that contains file directory attributes. This value is an integer bit mask that corresponds to the FILE\_ATTRIBUTE values and flags defined in the header file `winnt.h`. This supports the Get command and the Replace command.
-
-***file name***
-Optional. Return a file in binary format. If the file is too large for the configuration service to return, it returns error code 413 (Request entity too large) instead.
-
-The Delete command deletes the file.
-
-The Replace command updates an entire file with new file contents.
-
-The Add command adds the file to the file directory
-
-The Get command is not supported on a *file name* element, only on the properties of the element.
-
-The following properties are supported for files:
-
-- `Name`: The file name. The Get command is the only supported command.
-
-- `Type`: The MIME type of the file. This value is always set to the generic MIME type: `application/octet-stream`. The Get command is the only supported command.
-
-- `Format`: The format, which is b64 encoded for binary data is sent over XML, and bin format for binary data sent over WBXML. The Get command is the only supported command.
-
-- `TStamp`: A standard OMA property that indicates the last time the file was changed. The value is represented by a string containing a UTC based, ISO 8601 basic format, complete representation of a date and time value, e.g. 20010711T163817Z means July 11, 2001 at 16 hours, 38 minutes and 17 seconds. The Get command is the only supported command.
-
-- `Size`: The unencoded file content size in bytes. The Get command is the only supported command.
-
-- `msft:SystemAttributes`: A custom property that contains file attributes. This value is an integer bit mask that corresponds to the FILE\_ATTRIBUTE values and flags defined in the header file winnt.h. This supports the Get command and the Replace command.
-
-## Related topics
-
-[Configuration service provider reference](configuration-service-provider-reference.md)
diff --git a/windows/client-management/mdm/healthattestation-csp.md b/windows/client-management/mdm/healthattestation-csp.md
index 47da5c6353..2513599a28 100644
--- a/windows/client-management/mdm/healthattestation-csp.md
+++ b/windows/client-management/mdm/healthattestation-csp.md
@@ -1075,7 +1075,7 @@ If a device is expected to use a third-party antivirus program, ignore the repor
If a device is expected to use Windows Defender and ELAMDriverLoaded = 1 (True), then allow access.
-If a device is expected to use Windows Defender and ELAMDriverLoaded = 0 (False), then take one of the following actions that align with your enterprise policies, also accounting for whether it is a desktop or mobile device:
+If a device is expected to use Windows Defender and ELAMDriverLoaded = 0 (False), then take one of the following actions that align with your enterprise policies:
- Disallow all access
- Disallow access to HBI assets
diff --git a/windows/client-management/mdm/hotspot-csp.md b/windows/client-management/mdm/hotspot-csp.md
deleted file mode 100644
index 079281dcbe..0000000000
--- a/windows/client-management/mdm/hotspot-csp.md
+++ /dev/null
@@ -1,200 +0,0 @@
----
-title: HotSpot CSP
-description: Learn how HotSpot configuration service provider (CSP) is used to configure and enable Internet sharing on a device.
-ms.assetid: ec49dec1-fa79-420a-a9a7-e86668b3eebf
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# HotSpot CSP
-
-
-The HotSpot configuration service provider is used to configure and enable Internet sharing on the device, in which the device can be configured to share its cellular connection over Wi-Fi with up to eight client devices or computers.
-
-> [!Note]
-> HotSpot CSP is only supported in Windows 10 Mobile.
->
-> This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION capability to be accessed from a network configuration application.
-
-The following shows the HotSpot configuration service provider management object in tree format as used by OMA Client Provisioning. The OMA DM protocol is not supported by this configuration service provider.
-
-```console
-./Vendor/MSFT
-HotSpot
--------Enabled
--------DedicatedConnections
--------TetheringNAIConnection
--------MaxUsers
--------MaxBluetoothUsers
--------MOHelpNumber
--------MOInfoLink
--------MOAppLink
--------MOHelpMessage
--------EntitlementRequired
--------EntitlementDll
--------EntitlementInterval
--------PeerlessTimeout
--------PublicConnectionTimeout
-```
-
-**Enabled**
-Required. Specifies whether to enable Internet sharing on the device. The default is false.
-
-If this is initially set to false, the feature is turned off and the Internet sharing screen is removed from Settings so that the user cannot access it. Configuration changes or connection sharing state changes will not be possible.
-
-When this is set to true, the Internet sharing screen is added to Settings, though sharing is turned off by default until the user turns it on.
-
-This setting can be provisioned over the air, but it may require a reboot if Settings was open when this was enabled for the first time.
-
-**DedicatedConnections**
-Optional. Specifies the semicolon separated list of Connection Manager cellular connections that Internet sharing will use as the public connections.
-
-By default, any available connection will be used as a public connection. However, this node allows a mobile operator to specify one or more connection names to use as public connections.
-
-Specified connections will be mapped, by policy, to the Internet sharing service. All attempts to enumerate Connection Manager connections for the Internet sharing service will return only the mapped connections.
-
-> [!Note]
-> The mapping policy will also include the connection specified in the **TetheringNAIConnection** value as well.
-
-
-If the specified connections do not exist, Internet sharing will not start because it will not have any cellular connections available to share
-
-If the Internet sharing service is already in a sharing state, setting this node will not take effect until sharing is stopped and restarted.
-
-**TetheringNAIConnection**
-Optional. Specifies the CDMA TetheringNAI Connection Manager cellular connection that Internet sharing will use as a public connection.
-
-If a CDMA mobile operator requires using a Tethering NAI during Internet sharing, they must use the [CM\_CellularEntries configuration service provider](cm-cellularentries-csp.md) to provision a TetheringNAI connection and then specify the provisioned connection in this node.
-
-Specified connections will be mapped, by policy, to the Internet sharing service. All attempts to enumerate Connection Manager connections for the Internet sharing service will return only the mapped connections.
-
-> [!Note]
-> The mapping policy will also include the connections specified in the **DedicatedConnections** as well.
-
-If the specified connections do not exist, Internet sharing will not start because it will not have any cellular connections available to share
-
-If the Internet sharing service is already in a sharing state, setting this node will not take effect until sharing is stopped and restarted.
-
-**MaxUsers**
-Optional. Specifies the maximum number of simultaneous users that can be connected to a device while in a sharing state. The value must be between 1 and 8 inclusive. The default value is 5.
-
-If the Internet sharing service is already in a sharing state, setting this node will not take effect until sharing is stopped and restarted.
-
-**MaxBluetoothUsers**
-Optional. Specifies the maximum number of simultaneous Bluetooth users that can be connected to a device while sharing over Bluetooth. The value must be between 1 and 7 inclusive. The default value is 7.
-
-**MOHelpNumber**
-Optional. A mobile operator–specified device number that is displayed to the user when the Internet sharing service fails to start. The user interface displays a message informing the user that they can call the specified number for help.
-
-**MOInfoLink**
-Optional. A mobile operator–specified HTTP link that is displayed to the user when Internet sharing is disabled or the device is not entitled. The user interface displays a message informing the user that they can visit the specified link for more information about how to enable the feature.
-
-**MOAppLink**
-Optional. A Windows device application link that points to a preinstalled application, provided by the mobile operator, that will help a user to subscribe to the mobile operator’s Internet sharing service when Internet sharing is not provisioned or entitlement fails. The general format for the link is `app://MOapp`.
-
-**MOHelpMessage**
-Optional. Reference to a localized string, provided by the mobile operator, that is displayed when Internet sharing is not enabled due to entitlement failure. The node takes a language-neutral registry value string, which has the following form:
-
-`@,-`
-
-Where `` is the path to the resource dll that contains the string and `` is the string identifier. For more information on language-neutral string resource registry values, see [Using Registry String Redirection](/windows/win32/intl/using-registry-string-redirection) on MSDN.
-
-> [!Note]
-> MOAppLink is required to use the MOHelpMessage setting.
-
-
-**EntitlementRequired**
-Optional. Specifies whether the device requires an entitlement check to determine if Internet sharing should be enabled. This node is set to a Boolean value. The default value is **True**.
-
-By default the Internet sharing service will check entitlement every time an attempt is made to enable Internet sharing. Internet sharing should be set to **False** for carrier-unlocked devices.
-
-**EntitlementDll**
-Required if `EntitlementRequired` is set to true. The path to the entitlement DLL used to make entitlement checks that verify that the device is entitled to use the Internet sharing service on a mobile operator’s network. The value is a string that represents a valid file system path to the entitlement DLL. By default, the Internet sharing service fails entitlement checks if this setting is missing or empty. For more information, see [Creating an Entitlement DLL](#creating-entitlement-dll) later in this topic.
-
-**EntitlementInterval**
-Optional. The time interval, in seconds, between entitlement checks. The default value is 86,400 seconds (24 hours).
-
-If a periodic entitlement check fails, Internet sharing is automatically disabled.
-
-**PeerlessTimeout**
-Optional. The time-out period, in minutes, after which Internet sharing should automatically turn off if there are no longer any active clients. This node can be set to any value between 1 and 120 inclusive. A value of 0 is not supported. The default value is 5 minutes.
-
-A reboot may be required before changes to this node take effect.
-
-**PublicConnectionTimeout**
-Optional. The time-out value, in minutes, after which Internet sharing is automatically turned off if a cellular connection is not available. This node can be set to any value between 1 and 60 inclusive. The default value is 20 minutes. A time-out is required, so a value of 0 is not supported.
-
-Changes to this node require a reboot.
-
-**MinWifiKeyLength**
-
-> [!Important]
-> This parm is no longer supported for Windows Phone 8.1. The enforced minimum allowed length of the Wi-Fi key is 8.
-
-**MinWifiSSIDLength**
-
-> [!Important]
-> This parm is no longer supported for Windows Phone 8.1. The enforced minimum allowed length of the Wi-Fi SSID is 1.
-
-## Additional requirements for CDMA networks
-
-
-For CDMA networks that use a separate Network Access Identity (NAI) for Internet sharing, a new parm, TetheringNAI, has been added in the [CM\_CellularEntries configuration service provider](cm-cellularentries-csp.md) configuration service provider. The following sample demonstrates how to specify the connection.
-
-```xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-> [!Note]
-> CDMA devices are limited to one active data connection at a time. This means any application or service (such as email or MMS) that is bound to another connection may not work while Internet sharing is turned on.
-
-
-
-## Creating an Entitlement DLL
-
-
-For mobile operator networks that require an entitlement check, the OEM must provide a DLL in the device image that implements a function with the following signature:
-
-`ICS_ENTITLEMENT_RESULT IsEntitled(void);`
-
-The `EntitlementDll` parm of the HotSpot configuration service provider must be set to a string that is the path to this DLL.
-
-The DLL must be code signed in a specific way, see [Sign binaries and packages](/previous-versions/windows/hardware/code-signing/dn789217(v=vs.85)).
-
-During an entitlement check the Internet Sharing service loads the specified DLL and then call the `IsEntitled` function. The function must connect to the server to perform any required validation, then return one of the following **ICS\_ENTITLEMENT\_RESULT** enumeration values.
-
-|Value|Description|
-|--- |--- |
-|**ENTITLEMENT_SUCCESS**|The device is allowed to connect to the server.|
-|**ENTITLEMENT_FAILED**|The device is not allowed to connect to the server|
-|**ENTITLEMENT_UNAVAILABLE**|The entitlement check failed because the device could not contact the server or acquire a connection to verify entitlement.|
-
-The definition for the **ICS\_ENTITLEMENT\_RESULT** is in the header file `IcsEntitlementh`, which ships with the Windows Adaptation Kit.
-
-## Related topics
-
-
-[Configuration service provider reference](configuration-service-provider-reference.md)
-
-
-
diff --git a/windows/client-management/mdm/management-tool-for-windows-store-for-business.md b/windows/client-management/mdm/management-tool-for-windows-store-for-business.md
index 417d67f777..b0d72bed4a 100644
--- a/windows/client-management/mdm/management-tool-for-windows-store-for-business.md
+++ b/windows/client-management/mdm/management-tool-for-windows-store-for-business.md
@@ -26,7 +26,7 @@ Here's the list of the available capabilities:
- License reclaim and re-use – Enables an enterprise to retain value in their purchases by allowing the ability to un-assign access to an application, and then reassign the application to another user. In Microsoft Store today, when a user with a Microsoft account leaves the organization he retains ownership of the application.
- Flexible distribution models for Microsoft Store apps – Allows the enterprise to integrate with an organization's infrastructure the processes to distribute applications to devices that are connected to Store for Business services and to devices without connectivity to the Store for Business services.
- Custom Line of Business app support –Enables management and distribution of enterprise applications through the Store for Business.
-- Support for Windows desktop and mobile devices - The Store for Business supports both desktop and mobile devices.
+- Support for Windows client devices - The Store for Business supports client devices.
For additional information about Store for Business, see the TechNet topics in [Microsoft Store for Business](/microsoft-store/).
diff --git a/windows/client-management/mdm/maps-csp.md b/windows/client-management/mdm/maps-csp.md
deleted file mode 100644
index aa5eed4990..0000000000
--- a/windows/client-management/mdm/maps-csp.md
+++ /dev/null
@@ -1,175 +0,0 @@
----
-title: Maps CSP
-description: The Maps configuration service provider (CSP) is used to configure the maps to download to the device. This CSP was added in Windows 10, version 1511.
-ms.assetid: E5157296-7C31-4B08-8877-15304C9F6F26
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 06/26/2017
----
-
-# Maps CSP
-
-
-The Maps configuration service provider (CSP) is used to configure the maps to download to the device. This CSP was added in Windows 10, version 1511.
-
-> **Note** The Maps CSP is only supported in Windows 10 Mobile.
-
-
-
-The following shows the Maps configuration service provider in tree format.
-```
-./Vendor/MSFT
-Maps
-----Packages
---------Package
-------------Status
-```
-**Maps**
-Root node.
-
-**Packages**
-Represents the map packages installed on the device.
-
-**Packages/***Package*
-A GUID that represents a map package. When you add a *Package* node, Windows adds it to the queue for download to the device. See the table below for the list of various maps and corresponding GUIDS.
-
-**Packages/*Package*/Status**
-Represents the stat of the package installed on the device.
-
-Valid values:
-
-- 1 - the specified map package is queued for download.
-- 2 - the specified map package is downloading or installed.
-
-Supported operation is Get. If the map is neither queued, downloading, or installed, then you will get a 404 from a Get request.
-
-## Examples
-
-
-Here is a list of GUIDs of the most downloaded reqions.
-
-| Region | GUID |
-|-------------------------------|--------------------------------------|
-| **Germany** | |
-| Baden-Wuerttemberg | bab02b93-31c4-413a-b0fe-95a43e186d8c |
-| Bavaria | dceea482-12e9-458e-9f0f-21def9a70ed7 |
-| Berlin/Brandenburg | d8a80d64-07ef-4145-82e5-97910f1012df |
-| Hesse | b28e2071-678b-4671-8eff-97e1c124f2fb |
-| Lower Saxony/Bremen | e3ac0f21-7209-4f42-93bf-a0d12c7df2e5 |
-| Mecklenburg-Western Pomerania | 75760c3d-e651-4b4a-abfb-c22e2bf1ed93 |
-| North Rhine-Westphalia | 3846905a-891e-46a9-bc6a-53ec43edcab0 |
-| Rhineland-Palatinate/Saarland | b4c18bb5-1bfe-4da8-a951-833046e37c90 |
-| Saxony | 8899e1a8-fc79-4f3a-a591-85f15dfb1adb |
-| Saxony-Anhalt | fdd9a3eb-4253-4c4b-b34d-66265775518d |
-| Schleswig-Holstein/Hamburg | 74d868dd-99a7-492f-93ee-2b9c0a6b7ebc |
-| Thuringia | 399a3387-a545-4249-9925-04660426ef1c |
-| **United Kingdom** | |
-| England | bf612bb8-4094-4158-ac06-96171fa7ffdf |
-| Northern Ireland | 07f1d10f-cd72-4801-912a-7ba75ef5a627 |
-| Scotland | cade44ea-4421-4023-9498-bf1f92025c9e |
-| Wales | 869f9131-e3c7-41df-b106-9d787c633a10 |
-| **USA** | |
-| Alabama | 4fdaabf4-0160-4075-b7ad-7a8a71e69e7e |
-| Alaska | f691e35f-a6b9-4d6c-b657-0f092d5f2f0e |
-| Arizona | 4a179b8e-c993-4c4b-a242-51f69068d73b |
-| Arkansas | 4d152d48-92aa-4696-b8b2-c0bbacd421b6 |
-| California | 1859bd60-854a-40e3-9216-6e9cf1fcfdce |
-| Colorado | d7b4de3d-370c-44dc-8dc7-dcafe676d5ff |
-| Connecticut | 47fbdbe0-6c4d-4966-9a02-8decc94a5a1c |
-| Delaware | b2882156-e75c-4bdf-8f9f-45cbfac6b915 |
-| Florida | 1769c37c-f22a-4212-bd4b-47036693b034 |
-| Georgia | ad34ec5d-d84c-42fa-bec1-fe6143d2e68d |
-| Hawaii | 4019c8a1-0d8f-43c6-baa6-7ff5a7888f21 |
-| Idaho | 008d318b-5004-4e13-a4a4-f520e7969026 |
-| Illinois | a2c35505-daf5-432d-a4df-544a5c2987c2 |
-| Indiana | 4c3b6963-e380-45a9-8b25-2bdc4ce1ab26 |
-| Iowa | e07df1bc-01e6-4ffb-9a20-a142a6d38218 |
-| Kansas | 3397467d-3fb9-4ded-b6ad-3ab7313f8ff1 |
-| Kentucky | bc751324-a591-4ecd-b27a-af15b5518051 |
-| Louisiana | d11a119c-9e25-40d9-aef9-ed2f161113b0 |
-| Maine | db5e6077-f4dd-4548-b50e-ebd147d20c37 |
-| Maryland | 17739d09-a70a-4a23-859c-eabc57418d2f |
-| Massachusetts | d168d0d5-7683-45a4-afd4-767fd1359ad8 |
-| Michigan | 0abd961b-9602-4a2e-b093-c43a2a80aab5 |
-| Minnesota | 2946ed46-b171-4e38-9278-e33a6967f143 |
-| Mississippi | 78a38671-a8e8-48f1-a23b-3576df370437 |
-| Missouri | 5c885acb-5fdc-4305-84f1-e18d3163724b |
-| Montana | baf84353-89cf-4abd-9226-b932fd2294a4 |
-| Nebraska | e389c2f8-41a0-4121-a654-77c52fbd61ed |
-| Nevada | 8c321bdc-8e37-4be6-96e0-1d85c77c89f0 |
-| New Hampshire | 38c35895-98ce-4ee4-bb47-7291b5e8543a |
-| New Jersey | 70b1d647-ff93-415f-b2be-da06ee800516 |
-| New Mexico | b434ea36-03ca-405c-8332-044b602e7b49 |
-| New York | 93f2ba61-e03d-4b30-9be3-6e10728302d4 |
-| North Carolina | d07208ed-50da-42f2-bade-cb26f283e113 |
-| North Dakota | 8c6f0ebb-f282-431e-b4be-8faca5f12be0 |
-| Ohio | 36553594-8197-497f-911e-f1cd976c2e00 |
-| Oklahoma | 4e3a77ff-9dca-4add-93e9-2a9d6bc244a6 |
-| Oregon | cf99c8ce-1b11-4972-9e12-f8c2717ade98 |
-| Pennsylvania | cb7c0dea-1f9d-41ae-b81c-e683488d260c |
-| Rhode Island | 737c2fca-efd3-4f5a-9359-0c301ecc0813 |
-| South Carolina | c0a5542f-5efb-49ae-9d80-3914faa4cf77 |
-| South Dakota | dbd8268b-7502-4f71-ba1c-2d452d496b18 |
-| Tennessee | b51f7ae4-9eac-4a2b-b605-c2f9736b3481 |
-| Texas | 4cc26a23-596f-4164-b9c2-ce0267b1ada7 |
-| Utah | 50b2e947-e7b3-41b2-b595-8446f3f425ca |
-| Vermont | a888d9cc-9f2a-4f18-a00a-15fa860d355d |
-| Virginia | bfb4cce0-8fa5-4e70-a3c7-a69adce17fc9 |
-| Washington | 1734acf4-3f87-47db-aec2-2b24c08f5a60 |
-| Washington D.C. | 271328d6-8409-4975-ba8c-ba44e02fd3e0 |
-| West Virginia | 638b6499-749b-4908-bfe6-1b9dcf5eb675 |
-| Wisconsin | 0b5a98f7-489d-4a07-859b-4e01fe9e1b32 |
-| Wyoming | 360e0c25-a3bb-4e29-939a-3631eae46e9a |
-
-
-
-Here is an example queuing a map package of New York for download.
-
-```xml
-
-
-
- 1
-
-
- ./Vendor/MSFT/Maps/Packages/93f2ba61-e03d-4b30-9be3-6e10728302d4
-
-
-
-
-
-
-```
-
-Here is an example that gets the status of the New York map package on the device.
-
-```xml
-
-
-
- 1
-
-
- ./Vendor/MSFT/Maps/Packages/93f2ba61-e03d-4b30-9be3-6e10728302d4/Status
-
-
-
-
-
-
-```
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/maps-ddf-file.md b/windows/client-management/mdm/maps-ddf-file.md
deleted file mode 100644
index 0db7720713..0000000000
--- a/windows/client-management/mdm/maps-ddf-file.md
+++ /dev/null
@@ -1,125 +0,0 @@
----
-title: Maps DDF file
-description: This topic shows the OMA DM device description framework (DDF) for the Maps configuration service provider. This CSP was added in Windows 10, version 1511.
-ms.assetid: EF22DBB6-0578-4FD0-B8A6-19DC03288FAF
-ms.reviewer:
-manager: dansimp
-ms.author: dansimp
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: dansimp
-ms.date: 12/05/2017
----
-
-# Maps DDF file
-
-
-This topic shows the OMA DM device description framework (DDF) for the Maps configuration service provider. This CSP was added in Windows 10, version 1511.
-
-Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download).
-
-The XML below is the current version for this CSP.
-
-```xml
-
-]>
-
- 1.2
-
- Maps
- ./Vendor/MSFT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Packages
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Package
-
-
-
-
-
- Status
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain
-
-
-
-
-
-
-
-```
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/networkproxy-csp.md b/windows/client-management/mdm/networkproxy-csp.md
index b27fb3fd10..743fe416fa 100644
--- a/windows/client-management/mdm/networkproxy-csp.md
+++ b/windows/client-management/mdm/networkproxy-csp.md
@@ -15,21 +15,16 @@ manager: dansimp
The NetworkProxy configuration service provider (CSP) is used to configure a proxy server for ethernet and Wi-Fi connections. These settings do not apply to VPN connections. This CSP was added in Windows 10, version 1703.
-> [!NOTE]
-> In Windows 10 Mobile, the NetworkProxy CSP only works in ethernet connections. Use the WiFi CSP to configure per-network proxy for Wi-Fi connections in mobile devices.
-
How the settings work:
-
-
If auto-detect is enabled, the system tries to find the path to a proxy auto config (PAC) script and download it.
-
If #1 fails and a setup script is specified, the system tries to download the explicitly configured PAC script.
-
If #2 fails and a proxy server is specified, the system tries to use the explicitly configured proxy server.
-
Otherwise, the system tries to reach the site directly.
-
-
+- If auto-detect is enabled, the system tries to find the path to a proxy auto config (PAC) script and download it.
+- If #1 fails and a setup script is specified, the system tries to download the explicitly configured PAC script.
+- If #2 fails and a proxy server is specified, the system tries to use the explicitly configured proxy server.
+- Otherwise, the system tries to reach the site directly.
The following shows the NetworkProxy configuration service provider in tree format.
-```
+
+```console
./Vendor/MSFT
NetworkProxy
----ProxySettingsPerUser
@@ -40,8 +35,9 @@ NetworkProxy
--------Exceptions
--------UseProxyForLocalAddresses
```
+
**./Vendor/MSFT/NetworkProxy**
-The root node for the NetworkProxy configuration service provider..
+The root node for the NetworkProxy configuration service provider.
**ProxySettingsPerUser**
Added in Windows 10, version 1803. When set to 0, it enables proxy configuration as global, machine wide.
@@ -55,10 +51,9 @@ Supported operations are Add, Get, Replace, and Delete.
Automatically detect settings. If enabled, the system tries to find the path to a PAC script.
Valid values:
-
-
0 - Disabled
-
1 (default) - Enabled
-
+
+- 0 - Disabled
+- 1 (default) - Enabled
The data type is integer. Supported operations are Get and Replace. Starting in Windows 10, version 1803, the Delete operation is also supported.
@@ -84,17 +79,18 @@ The data type is string. Supported operations are Get and Replace. Starting in W
**UseProxyForLocalAddresses**
Specifies whether the proxy server should be used for local (intranet) addresses.
+
Valid values:
-
-
0 (default) - Use proxy server for local addresses
-
1 - Do not use proxy server for local addresses
-
+
+- 0 (default) - Use proxy server for local addresses
+- 1 - Do not use proxy server for local addresses
The data type is integer. Supported operations are Get and Replace. Starting in Windows 10, version 1803, the Delete operation is also supported.
## Configuration Example
These generic code portions for the options **ProxySettingsPerUser**, **Autodetect**, and **SetupScriptURL** can be used for a specific operation, for example Replace. Only enter the portion of code needed in the **Replace** section.
+
```xml
1
diff --git a/windows/client-management/mdm/oma-dm-protocol-support.md b/windows/client-management/mdm/oma-dm-protocol-support.md
index eaf420e5e6..8249c0eca9 100644
--- a/windows/client-management/mdm/oma-dm-protocol-support.md
+++ b/windows/client-management/mdm/oma-dm-protocol-support.md
@@ -52,7 +52,7 @@ Common elements are used by other OMA DM element types. The following table list
|MsgID|Specifies a unique identifier for an OMA DM session message.|
|MsgRef|Specifies the ID of the corresponding request message. This element takes the value of the request message MsgID element.|
|RespURI|Specifies the URI that the recipient must use when sending a response to this message.|
-|SessionID|Specifies the identifier of the OMA DM session associated with the containing message.
**Note** If the server does not notify the device that it supports a new version (through SyncApplicationVersion node in the DMClient CSP), the desktop client returns the SessionID in integer in decimal format and the mobile device client returns 2 bytes as a string. If the server supports DM session sync version 2.0, which is used in Windows 10, the desktop and mobile device client returns 2 bytes.
|
+|SessionID|Specifies the identifier of the OMA DM session associated with the containing message.
**Note** If the server does not notify the device that it supports a new version (through SyncApplicationVersion node in the DMClient CSP), the client returns the SessionID in integer in decimal format. If the server supports DM session sync version 2.0, which is used in Windows 10, the device client returns 2 bytes.
|
|Source|Specifies the message source address.|
|SourceRef|Specifies the source of the corresponding request message. This element takes the value of the request message Source element and is returned in the Status or Results element.|
|Target|Specifies the address of the node, in the DM Tree, that is the target of the OMA DM command.|
diff --git a/windows/client-management/mdm/passportforwork-csp.md b/windows/client-management/mdm/passportforwork-csp.md
index bea182054a..68bd28dd1e 100644
--- a/windows/client-management/mdm/passportforwork-csp.md
+++ b/windows/client-management/mdm/passportforwork-csp.md
@@ -96,7 +96,7 @@ Node for defining the Windows Hello for Business policy settings.
***TenantId*/Policies/UsePassportForWork**
Boolean value that sets Windows Hello for Business as a method for signing into Windows.
-Default value is true. If you set this policy to false, the user cannot provision Windows Hello for Business except on Azure Active Directory joined mobile phones where provisioning is required.
+Default value is true. If you set this policy to false, the user cannot provision Windows Hello for Business.
Supported operations are Add, Get, Delete, and Replace.
diff --git a/windows/client-management/mdm/policy-csp-accounts.md b/windows/client-management/mdm/policy-csp-accounts.md
index eceea61bd6..ffbfabf801 100644
--- a/windows/client-management/mdm/policy-csp-accounts.md
+++ b/windows/client-management/mdm/policy-csp-accounts.md
@@ -47,8 +47,6 @@ manager: dansimp
|Pro|Yes|Yes|
|Enterprise|Yes|Yes|
|Education|Yes|Yes|
-|Mobile|Yes|Yes|
-|Mobile Enterprise|Yes|Yes|
@@ -94,8 +92,6 @@ The following list shows the supported values:
|Business|Yes|Yes|
|Enterprise|Yes|Yes|
|Education|Yes|Yes|
-|Mobile|Yes|Yes|
-|Mobile Enterprise|Yes|Yes|
@@ -138,8 +134,6 @@ The following list shows the supported values:
|Business|Yes|Yes|
|Enterprise|Yes|Yes|
|Education|Yes|Yes|
-|Mobile|Yes|Yes|
-|Mobile Enterprise|Yes|Yes|
diff --git a/windows/client-management/mdm/policy-csp-browser.md b/windows/client-management/mdm/policy-csp-browser.md
index d0ae5fd271..ba8ac722c2 100644
--- a/windows/client-management/mdm/policy-csp-browser.md
+++ b/windows/client-management/mdm/policy-csp-browser.md
@@ -415,7 +415,7 @@ Most restricted value: 0
To verify AllowCookies is set to 0 (not allowed):
-1. Open Microsoft Edge or Microsoft Edge for Windows 10 Mobile.
+1. Open Microsoft Edge.
2. In the upper-right corner of the browser, click **…**.
3. Click **Settings** in the drop down list, and select **View Advanced Settings**.
4. Verify the setting **Cookies** is disabled.
@@ -453,8 +453,6 @@ To verify AllowCookies is set to 0 (not allowed):
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
[!INCLUDE [allow-developer-tools-shortdesc](../includes/allow-developer-tools-shortdesc.md)]
@@ -530,7 +528,7 @@ Most restricted value: 1
To verify AllowDoNotTrack is set to 0 (not allowed):
-1. Open Microsoft Edge or Microsoft Edge for Windows 10 Mobile.
+1. Open Microsoft Edge.
2. In the upper-right corner of the browser, click **…**.
3. Click **Settings** in the drop down list, and select **View Advanced Settings**.
4. Verify the setting **Send Do Not Track requests** is grayed out.
@@ -2223,11 +2221,6 @@ Most restricted value: 0
[!INCLUDE [configure-enterprise-mode-site-list-shortdesc](../includes/configure-enterprise-mode-site-list-shortdesc.md)]
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
-
-
-
ADMX Info:
@@ -2314,9 +2307,6 @@ Supported values:
-> [!NOTE]
-> This policy is only available for Windows for desktop and not supported in Windows Mobile.
-
[!INCLUDE [configure-start-pages-shortdesc](../includes/configure-start-pages-shortdesc.md)]
@@ -2813,8 +2803,6 @@ Supported values:
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
[!INCLUDE [prevent-using-localhost-ip-address-for-webrtc-shortdesc](../includes/prevent-using-localhost-ip-address-for-webrtc-shortdesc.md)]
@@ -2931,10 +2919,6 @@ ADMX Info:
[!INCLUDE [send-all-intranet-sites-to-ie-shortdesc](../includes/send-all-intranet-sites-to-ie-shortdesc.md)]
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
-
-
ADMX Info:
@@ -3163,10 +3147,6 @@ Supported values:
[!INCLUDE [show-message-when-opening-sites-in-ie-shortdesc](../includes/show-message-when-opening-sites-in-ie-shortdesc.md)]
-
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
-
ADMX Info:
@@ -3221,9 +3201,6 @@ This policy allows Enterprise Admins to turn off the notification for company de
By default, a notification will be presented to the user informing them of this upon application startup.
With this policy, you can either allow (default) or suppress this notification.
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
-
ADMX Info:
@@ -3273,9 +3250,6 @@ Supported values:
[!INCLUDE [keep-favorites-in-sync-between-ie-and-edge-shortdesc](../includes/keep-favorites-in-sync-between-ie-and-edge-shortdesc.md)]
-> [!NOTE]
-> This policy is only enforced in Windows for desktop and not supported in Windows Mobile.
-
ADMX Info:
diff --git a/windows/client-management/mdm/policy-csp-connectivity.md b/windows/client-management/mdm/policy-csp-connectivity.md
index 76c31ff34a..a4eb170e5c 100644
--- a/windows/client-management/mdm/policy-csp-connectivity.md
+++ b/windows/client-management/mdm/policy-csp-connectivity.md
@@ -105,7 +105,7 @@ manager: dansimp
Allows the user to enable Bluetooth or restrict access.
> [!NOTE]
-> This value is not supported in Windows Phone 8.1 MDM and EAS, Windows 10 for desktop, or Windows 10 Mobile.
+> This value is not supported in Windows 10.
If this is not set or it is deleted, the default value of 2 (Allow) is used.
@@ -217,7 +217,7 @@ The following list shows the supported values:
To validate, the enterprise can confirm by observing the roaming enable switch in the UX. It will be inactive if the roaming policy is being enforced by the enterprise policy.
-To validate on mobile devices, do the following:
+To validate on devices, do the following:
1. Go to Cellular & SIM.
2. Click on the SIM (next to the signal strength icon) and select **Properties**.
diff --git a/windows/client-management/mdm/toc.yml b/windows/client-management/mdm/toc.yml
index 10ee337fe8..7e192e7cb4 100644
--- a/windows/client-management/mdm/toc.yml
+++ b/windows/client-management/mdm/toc.yml
@@ -257,20 +257,11 @@ items:
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:
@@ -283,16 +274,6 @@ items:
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:
@@ -305,8 +286,6 @@ items:
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:
@@ -317,13 +296,6 @@ items:
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: