diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index d9d23b1445..f897a39dbc 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -423,7 +423,12 @@
"master": [
"Publish",
"Pdf"
+ ],
+ "msesdemo": [
+ "Publish",
+ "Pdf"
]
+
},
"need_generate_pdf_url_template": true,
"Targets": {
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index b7d933aee0..d8e96bc586 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -1,6 +1,11 @@
{
"redirections": [
{
+"source_path": "education/windows/windows-10-pro-to-pro-edu-upgrade.md",
+"redirect_url": "/education/windows/switch-to-pro-education",
+"redirect_document_id": true
+},
+{
"source_path": "windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md",
"redirect_url": "/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune",
"redirect_document_id": false
diff --git a/education/get-started/get-started-with-microsoft-education.md b/education/get-started/get-started-with-microsoft-education.md
index 572a8caa85..d82cbe9b63 100644
--- a/education/get-started/get-started-with-microsoft-education.md
+++ b/education/get-started/get-started-with-microsoft-education.md
@@ -518,6 +518,30 @@ We recommend using the latest build of Windows 10, version 1703 on your educatio
**Option 1: Set up a device using the Set up School PCs app**
+IT administrators and technical teachers can use the Set up School PCs app to quickly set up PCs for students. A student PC set up using the app is tailored to provide students with the tools they need for learning while removing apps and features that they don't need.
+
+
+
+Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recommended education settings, using a quick USB setup. This app guides you through the creation of a student PC provisioning package and helps you save it to a USB drive. From there, just plug the USB drive into student PCs running Windows 10 Creators Update (version 1703). It automatically:
+- Joins each student PC to your organization's Office 365 and Azure Active Directory tenant
+- Enrolls each student PC into a mobile device management (MDM) provider, like Intune for Education, if licensed in your tenant. You can manage all the settings Set up School PCs sets later through MDM.
+- Removes OEM preinstalled software from each student PC
+- Auto-configures and saves a wireless network profile on each student PC
+- Gives a friendly and unique name to each student device for future management
+- Sets Microsoft-recommended school PC settings, including shared PC mode which provides faster sign-in and automatic account cleanup
+- Enables optional guest account for younger students, lost passwords, or visitors
+- Enables optional secure testing account
+- Locks down the student PC to prevent mischievous activity:
+ * Prevents students from removing the PC from the school's device management system
+ * Prevents students from removing the Set up School PCs settings
+- Keeps student PCs up-to-date without interfering with class time using Windows Update and maintenance hours
+- Customizes the Start layout with Office
+- Installs OneDrive for storing cloud-based documents and Sway for creating interactive reports, presentations, and more
+- Uninstalls apps not specific to education, such as Solitaire
+- Prevents students from adding personal Microsoft accounts to the PC
+
+**To set up a device using the Set up School PCs app**
+
1. Follow the steps in Use the Set up School PCs app to quickly set up one or more student PCs.
2. Follow the steps in [5.2 Verify correct device setup](#52-verify-correct-device-setup).
diff --git a/education/get-started/images/suspc_getstarted_050817.PNG b/education/get-started/images/suspc_getstarted_050817.PNG
new file mode 100644
index 0000000000..124905676a
Binary files /dev/null and b/education/get-started/images/suspc_getstarted_050817.PNG differ
diff --git a/education/windows/TOC.md b/education/windows/TOC.md
index 51cbe0a694..a121e92d2e 100644
--- a/education/windows/TOC.md
+++ b/education/windows/TOC.md
@@ -17,6 +17,6 @@
### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md)
## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
-## [Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)
+## [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)
## [Chromebook migration guide](chromebook-migration-guide.md)
## [Change history for Windows 10 for Education](change-history-edu.md)
diff --git a/education/windows/change-history-edu.md b/education/windows/change-history-edu.md
index f4a79c2366..00af76258b 100644
--- a/education/windows/change-history-edu.md
+++ b/education/windows/change-history-edu.md
@@ -12,6 +12,12 @@ author: CelesteDG
This topic lists new and updated topics in the [Windows 10 for Education](index.md) documentation.
+## May 2017
+
+| New or changed topic | Description |
+| --- | ---- |
+| [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md) | New. If you have an education tenant and use devices Windows 10 Pro or Windows 10 S in your schools, find out how you can opt-in to a free switch to Windows 10 Pro Education. |
+
## RELEASE: Windows 10, version 1703 (Creators Update)
| New or changed topic | Description|
@@ -35,7 +41,7 @@ This topic lists new and updated topics in the [Windows 10 for Education](index.
| New or changed topic | Description |
| --- | --- |
-| [Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md) | New. Learn how to opt-in to a free upgrade to Windows 10 Pro Education. |
+| [Upgrade Windows 10 Pro to Pro Education from Windows Store for Business] | New. Learn how to opt-in to a free upgrade to Windows 10 Pro Education. As of May 2017, this topic has been replaced with [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md). |
## November 2016
diff --git a/education/windows/images/1_howtosetup.png b/education/windows/images/1_howtosetup.png
new file mode 100644
index 0000000000..7eb8222ed3
Binary files /dev/null and b/education/windows/images/1_howtosetup.png differ
diff --git a/education/windows/images/2_signinwithms.png b/education/windows/images/2_signinwithms.png
new file mode 100644
index 0000000000..e4b5f27f12
Binary files /dev/null and b/education/windows/images/2_signinwithms.png differ
diff --git a/education/windows/images/i4e_editionupgrade.png b/education/windows/images/i4e_editionupgrade.png
new file mode 100644
index 0000000000..ed5b281086
Binary files /dev/null and b/education/windows/images/i4e_editionupgrade.png differ
diff --git a/education/windows/images/msfe_clickemaillink_switchtoproedu.png b/education/windows/images/msfe_clickemaillink_switchtoproedu.png
new file mode 100644
index 0000000000..ca70e35a6a
Binary files /dev/null and b/education/windows/images/msfe_clickemaillink_switchtoproedu.png differ
diff --git a/education/windows/images/msfe_manage.png b/education/windows/images/msfe_manage.png
new file mode 100644
index 0000000000..0fd5802786
Binary files /dev/null and b/education/windows/images/msfe_manage.png differ
diff --git a/education/windows/images/msfe_manage_benefits_checktoconfirm.png b/education/windows/images/msfe_manage_benefits_checktoconfirm.png
new file mode 100644
index 0000000000..90df941e00
Binary files /dev/null and b/education/windows/images/msfe_manage_benefits_checktoconfirm.png differ
diff --git a/education/windows/images/msfe_manage_benefits_switchtoproedu.png b/education/windows/images/msfe_manage_benefits_switchtoproedu.png
new file mode 100644
index 0000000000..12ba470cc9
Binary files /dev/null and b/education/windows/images/msfe_manage_benefits_switchtoproedu.png differ
diff --git a/education/windows/images/msfe_manage_reverttowin10pro.png b/education/windows/images/msfe_manage_reverttowin10pro.png
new file mode 100644
index 0000000000..30d0313f9b
Binary files /dev/null and b/education/windows/images/msfe_manage_reverttowin10pro.png differ
diff --git a/education/windows/images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png b/education/windows/images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png
new file mode 100644
index 0000000000..581a1c1e8c
Binary files /dev/null and b/education/windows/images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png differ
diff --git a/education/windows/images/settings_connectedtoazuread_3.png b/education/windows/images/settings_connectedtoazuread_3.png
new file mode 100644
index 0000000000..7311392405
Binary files /dev/null and b/education/windows/images/settings_connectedtoazuread_3.png differ
diff --git a/education/windows/images/settings_setupworkorschoolaccount_2.png b/education/windows/images/settings_setupworkorschoolaccount_2.png
new file mode 100644
index 0000000000..78237cfa31
Binary files /dev/null and b/education/windows/images/settings_setupworkorschoolaccount_2.png differ
diff --git a/education/windows/images/settings_workorschool_1.png b/education/windows/images/settings_workorschool_1.png
new file mode 100644
index 0000000000..4c53e6b3e2
Binary files /dev/null and b/education/windows/images/settings_workorschool_1.png differ
diff --git a/education/windows/images/wcd_productkey.png b/education/windows/images/wcd_productkey.png
new file mode 100644
index 0000000000..fbbfda7eb9
Binary files /dev/null and b/education/windows/images/wcd_productkey.png differ
diff --git a/education/windows/index.md b/education/windows/index.md
index 1228691020..49ea89c1eb 100644
--- a/education/windows/index.md
+++ b/education/windows/index.md
@@ -37,16 +37,17 @@ author: CelesteDG
[Take tests in Windows 10](take-tests-in-windows-10.md)
Take a Test is a new app that lets you create the right environment for taking tests. Learn how to use and get it set up.
[Chromebook migration guide](chromebook-migration-guide.md)
Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.
-##  Deploy
+##  Deploy
[Set up Windows devices for education](set-up-windows-10.md)
Depending on your school's device management needs, you can use the Set up School PCs app or the Windows Configuration Designer tool to quickly set up student PCs.
[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
Get step-by-step guidance to help you deploy Windows 10 in a school environment.
[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.
Try it out: Windows 10 deployment (for education)
Learn how to upgrade devices running the Windows 7 operating system to Windows 10 Anniversary Update, and how to manage devices, apps, and users in Windows 10 Anniversary Update.
For the best experience, use this guide in tandem with the TechNet Virtual Lab: IT Pro Try-It-Out.
-##  Upgrade
+###  Switch
+
+
[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)
If you have an education tenant and use Windows 10 Pro or Windows 10 S in your schools, find out how you can opt-in to a free switch to Windows 10 Pro Education.
-
[Switch Windows 10 Pro to Pro Education from Microsoft Store for Education](windows-10-pro-to-pro-edu-upgrade.md)
If you have an education tenant and use Windows 10 Pro in your schools now, find out how you can opt-in to a free switch to Windows 10 Pro Education.
## Windows 8.1
diff --git a/education/windows/switch-to-pro-education.md b/education/windows/switch-to-pro-education.md
new file mode 100644
index 0000000000..e5affe8444
--- /dev/null
+++ b/education/windows/switch-to-pro-education.md
@@ -0,0 +1,378 @@
+---
+title: Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S
+description: Learn how IT Pros can opt into switching to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S.
+keywords: switch, free switch, Windows 10 Pro to Windows 10 Pro Education, Windows 10 S to Windows 10 Pro Education, education customers, Windows 10 Pro Education, Windows 10 Pro, Windows 10 S
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: edu
+localizationpriority: high
+author: CelesteDG
+---
+
+# Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S
+Windows 10 Pro Education is a new offering in Windows 10, version 1607. This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings.
+
+If you have an education tenant and use devices with Windows 10 Pro or Windows 10 S, global administrators can opt-in to a free switch to Windows 10 Pro Education depending on your scenario.
+- [Switch from Windows 10 S to Windows 10 Pro Education](#switch-from-windows-10-s-to-windows-10-pro-education)
+- [Switch from Windows 10 Pro to Windows 10 Pro Education](#switch-from-windows-10-pro-to-windows-10-pro-education)
+
+To take advantage of this offering, make sure you meet the [requirements for switching](#requirements-for-switching). For academic customers who are eligible to switch to Windows 10 Pro Education, but are unable to use the above methods, contact Microsoft Support for assistance.
+
+## Requirements for switching
+Before you switch to Windows 10 Pro Education, make sure you meet these requirements:
+- Devices must be running Windows 10 Pro, version 1607 or higher; or running Windows 10 S, version 1703
+- Devices must be Azure Active Directory joined, or domain joined with Azure AD Connect. Customers who are federated with Azure AD are also eligible. For more information, see [Review requirements on devices](#review-requirements-on-devices).
+
+ If you haven't domain joined your devices already, [prepare for deployment of Windows 10 Pro Education licenses](#preparing-for-deployment-of-windows-10-pro-education-licenses).
+
+- The Azure AD tenant must be recognized as an education approved tenant.
+- You must have a Microsoft Store for Education account.
+- The user making the changes must be a member of the Azure AD global administrator group.
+
+## Compare Windows 10 Pro and Pro Education editions
+You can [compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare) to find out more about the features we support in other editions of Windows 10.
+
+For more info about Windows 10 default settings and recommendations for education customers, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md).
+
+
+## Switch from Windows 10 S to Windows 10 Pro Education
+There are two ways to switch from Windows 10 S to Windows 10 Pro Education, outlined below. Regardless of how you switch to Windows 10 Pro Education, note that you can only switch devices back to Windows 10 S through reimaging.
+
+1. **Bulk switch through Microsoft Store for Education**
+
+ In this scenario, the global admin for the Azure AD education tenant can use Microsoft Store to switch all Windows 10 S devices on the tenant to Windows 10 Pro Education. See [Switch using Microsoft Store for Education](#switch-using-microsoft-store-for-education) for details on how to do this.
+
+2. **Asynchronous switch**
+
+ In this scenario, the global admin must acquire the necessary keys and then select a method for key distribution.
+
+ **Key acquisition options:**
+
+ - Volume Licensing customers - For schools with active Microsoft Volume Licensing agreements, global admins can obtain free MAK keys for Windows 10 Pro Education.
+
+ > [!NOTE]
+ > Windows 10 S is a Qualified OS (QOS) for Academic Volume Licensing only.
+
+ - Non-Volume Licensing customers - For schools without an active Microsoft Volume Licensing agreement, the global admin can contact CSS, fill out a form and provide a proof of purchase to receive MAK keys for Windows 10 Pro Education.
+
+ **Key distribution options:**
+
+ - Bulk key distribution - You can apply MAK keys to switch the operating system on select devices or groups of devices using one of these methods:
+ - Use Microsoft Intune for Education. See [Switch using Intune for Education](#switch-using-intune-for-education) for details on how to do this.
+ - Use Windows Configuration Designer to create a provisioning package that will provision the switch on the device(s). See [Switch using Windows Configuration Designer](#switch-using-windows-configuration-designer) for details on how to do this.
+ - Use the mobile device management (MDM) policy, **UpgradeEditionWithProductKey**. See [Switch using MDM](#switch-using-mdm) for details on how to do this.
+ - Use scripting. See [Switch using scripting](#switch-using-scripting) for details on how to do this.
+
+ - Manual key entry - You can also manually apply the MAK key using one of these methods:
+ - Enter the MAK key in the Windows **Settings > Activation** page. See [Switch using the Activation page](#switch-using-the-activation-page) for details on how to do this.
+ - Install with a media and key through Windows setup. We don't recommend this option due to the potential for multi-reboot requirements.
+
+
+## Switch from Windows 10 Pro to Windows 10 Pro Education
+
+For schools that want to standardize all their Windows 10 Pro devices to Windows 10 Pro Education, a global admin for the school can opt-in to a free switch through the Microsoft Store for Education.
+
+In this scenario:
+
+- The IT admin of the tenant chooses to turn on the switch for all Azure AD joined devices.
+- Any device that joins the Azure AD will switch automatically to Windows 10 Pro Education.
+- The IT admin has the option to automatically roll back to Windows 10 Pro, if desired. See [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro).
+
+See [Switch using Microsoft Store for Education](#switch-using-microsoft-store-for-education) for details on how to do this.
+
+## Switch options from Windows 10 S to Windows 10 Pro Education
+If you want to switch only a few or a select group of Windows 10 S devices to Windows 10 Pro Education, you can use one of the following key distribution options once you've obtained the MAK keys for Windows 10 Pro Education. See [Switch from Windows 10 S to Windows 10 Pro Education](#switch-from-windows-10-s-to-windows-10-pro-education) for more info.
+
+### Switch using Intune for Education
+
+1. In Intune for Education, select **Groups** and then choose the group that you want to apply the MAK license key to.
+
+ For example, to apply the switch for all teachers, select **All Teachers** and then select **Settings**.
+
+2. In the settings page, find **Edition upgrade** and then:
+ 1. Select the edition in the **Edition to upgrade to** field
+ 2. Enter the MAK license key in the **Product key** field
+
+ **Figure 1** - Enter the details for the Windows edition switch
+
+ 
+
+3. The switch will automatically be applied to the group you selected.
+
+
+### Switch using Windows Configuration Designer
+You can use Windows Configuration Designer to create a provisioning package that you can use to switch the Windows edition for your device(s). [Install Windows Configuration Designer from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4tx22) to create a provisioning package.
+
+1. In Windows Configuration Designer, select **Provision desktop devices** to open the simple editor and create a provisioning package for Windows desktop editions.
+2. In the **Set up device** page, enter the MAK license key in the **Enter product key** field to switch to Windows 10 Pro Education.
+
+ **Figure 2** - Enter the license key
+
+ 
+
+3. Complete the rest of the process for creating a provisioning package and then apply the package to the devices you want to switch to Windows 10 Pro Education.
+
+ For more information about using Windows Configuration Designer, see [Set up student PCs to join domain](https://technet.microsoft.com/en-us/edu/windows/set-up-students-pcs-to-join-domain).
+
+### Switch using MDM
+
+To switch Windows 10 S to Windows 10 Pro Education, enter the product key for the Windows 10 Pro Education edition in the **UpgradeEditionWithProductKey** policy setting of the [WindowsLicensing CSP](https://msdn.microsoft.com/en-us/windows/hardware/commercialize/customize/mdm/windowslicensing-csp).
+
+### Switch using scripting
+
+You can switch from Windows 10 S to Windows 10 Pro Education by running the changepk.exe command-line tool. To do this, run the following command:
+
+```
+changepk.exe /ProductKey MAK_key_or_product_key
+```
+
+Replace *MAK_key_or_product_key* with the MAK key that you obtained for the Windows 10 edition switch.
+
+
+### Switch using the Activation page
+
+1. On the Windows device that you want to switch, open the **Settings** app.
+2. Select **Update & security** > **Activation**, and then click **Change product key**.
+3. In the **Enter a product key** window, enter the MAK key for Windows 10 Pro Education and click **Next**.
+
+
+## Education customers with Azure AD joined devices
+
+Academic institutions can easily move from Windows 10 S or Windows 10 Pro to Windows 10 Pro Education without using activation keys or reboots. When one of your users enters their Azure AD credentials associated with a Windows 10 Pro Education license, the operating system switches to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have an Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
+
+When you switch to Windows 10 Pro Education, you get the following benefits:
+
+- **Windows 10 Pro Education edition**. Devices currently running Windows 10 Pro, version 1607 or higher, or Windows 10 S, version 1703, can get Windows 10 Pro Education Current Branch (CB). This benefit does not include Long Term Service Branch (LTSB).
+- **Support from one to hundreds of users**. The Windows 10 Pro Education program does not have a limitation on the number of licenses an organization can have.
+- **Roll back options to Windows 10 Pro**
+ - When a user leaves the domain or you turn off the setting to automatically switch to Windows 10 Pro Education, the device reverts seamlessly to Windows 10 Pro edition (after a grace period of up to 30 days).
+ - For devices that originally had Windows 10 Pro edition installed, when a license expires or is transferred to another user, the Windows 10 Pro Education device seamlessly steps back down to Windows 10 Pro.
+
+ See [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro) for more info.
+
+ For devices that originally had Windows 10 S installed, Windows 10 Pro Education cannot step back down to Windows 10 S. You will need to reimage these devices with Windows 10 S if you need to step down from Windows 10 Pro Education to Windows 10 S.
+
+
+### Switch using Microsoft Store for Education
+Once you enable the setting to switch to Windows 10 Pro Education, the switch will begin only after a user signs in to their device. The setting applies to the entire organization or tenant, so you cannot select which users will receive the switch. The switch will only apply to Windows 10 S and Windows 10 Pro devices.
+
+**To turn on the automatic switch to Windows 10 Pro Education**
+
+1. Sign in to [Microsoft Store for Education](https://businessstore.microsoft.com/) with your work or school account.
+
+ If this is the first time you're signing into the Microsoft Store for Education, you'll be prompted to accept the Microsoft Store for Education Terms of Use.
+
+2. Click **Manage** from the top menu and then select the **Benefits tile**.
+3. In the **Benefits** tile, look for the **Switch to Windows 10 Pro Education for free** link and then click it.
+
+ You will see the following page informing you that your school is eligible to switch free to Windows 10 Pro Education from Windows 10 S or Windows 10 Pro.
+
+ **Figure 3** - Switch Windows 10 Pro to Windows 10 Pro Education
+
+ 
+
+4. In the **Switch all your devices to Windows 10 Pro Education for free** page, check box next to **I understand enabling this setting will switch all domain-joined devices running Windows 10 Pro or Windows 10 S in my organization**.
+
+ **Figure 4** - Check the box to confirm
+
+ 
+
+5. Click **Switch all my devices**.
+
+ A confirmation window pops up to let you know that an email has been sent to you to enable the switch.
+
+6. Close the confirmation window and check the email to proceed to the next step.
+7. In the email, click the link to **Switch to Windows 10 Pro Education**. Once you click the link, this will take you back to the Microsoft Store for Education portal.
+
+ **Figure 5** - Click the link in the email to switch to Windows 10 Pro Education
+
+ 
+
+8. Click **Switch now** in the **Switching your device to Windows 10 Pro Education for free** page in the Microsoft Store.
+
+ You will see a window that confirms you've successfully switched all the devices in your organization to Windows 10 Pro Education, and each Azure AD joined device running Windows 10 Pro or Windows 10 S will automatically switch the next time someone in your organization signs in to the device.
+
+9. Click **Close** in the **Success** window.
+
+Enabling the automatic switch also triggers an email message notifying all global administrators in your organization about the switch. It also contains a link that enables any global administrators to cancel the switch if they choose. For more info about rolling back or canceling the switch, see [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro).\
+
+**Figure 6** - Email notifying all global admins about the switch
+
+
+
+
+## Explore the switch experience
+
+So what will users experience? How will they switch their devices?
+
+### For existing Azure AD joined devices
+Existing Azure AD domain joined devices will be switched to Windows 10 Pro Education the next time the user logs in. That's it! No additional steps are needed.
+
+### For new devices that are not Azure AD joined
+Now that you've turned on the setting to automatically switch to Windows 10 Pro Education, the users are ready to switch their devices running Windows 10 Pro, version 1607 or higher or Windows 10 S, version 1703 to Windows 10 Pro Education edition.
+
+#### Step 1: Join users’ devices to Azure AD
+
+Users can join a device to Azure AD the first time they start the device (during setup), or they can join a device that they already use running Windows 10 Pro, version 1607 or higher, or Windows 10 S, version 1703.
+
+**To join a device to Azure AD the first time the device is started**
+
+There are different methods you can use to join a device to Azure AD:
+- For multiple devices, we recommend using the [Set up School PCs app](use-set-up-school-pcs-app.md) to create a provisioning package to quickly provision and set up Windows 10 devices for education.
+- For individual devices, you can use the Set up School PCs app or go through the Windows 10 device setup experience. If you choose this option, see the following steps.
+
+**To join a device to Azure AD using Windows device setup**
+
+If the Windows device is running Windows 10, version 1703, follow these steps.
+
+1. During initial device setup, on the **How would you like to set up?** page, select **Set up for an organization**, and then click **Next**.
+
+ **Figure 7** - Select how you'd like to set up the device
+
+ 
+
+2. On the **Sign in with Microsoft** page, enter the username and password to use with Office 365 or other services from Microsoft, and then click **Next**.
+
+ **Figure 8** - Enter the account details
+
+ 
+
+3. Go through the rest of Windows device setup. Once you're done, the device will be Azure AD joined to your school's subscription.
+
+
+**To join a device to Azure AD when the device already has Windows 10 Pro, version 1703 or Windows 10 S, version 1703 installed and set up**
+
+If the Windows device is running Windows 10, version 1703, follow these steps.
+
+1. Go to **Settings > Accounts > Access work or school**.
+
+ **Figure 9** - Go to **Access work or school** in Settings
+
+ 
+
+2. In **Access work or school**, click **Connect**.
+3. In the **Set up a work or school account** window, click the **Join this device to Azure Active Directory** option at the bottom.
+
+ **Figure 10** - Select the option to join the device to Azure Active Directory
+
+ 
+
+4. On the **Let's get you signed in** window, enter the Azure AD credentials (username and password) and sign in. This will join the device to the school's Azure AD.
+5. To verify that the device was successfully joined to Azure AD, go back to **Settings > Accounts > Access work or school**. You should now see a connection under the **Connect to work or school** section that indicates the device is connected to Azure AD.
+
+ **Figure 11** - Verify the device connected to Azure AD
+
+ 
+
+
+#### Step 2: Sign in using Azure AD account
+
+Once the device is joined to your Azure AD subscription, the user will sign in by using his or her Azure AD account. The Windows 10 Pro Education license associated with the user will enable Windows 10 Pro Education edition capabilities on the device.
+
+
+#### Step 3: Verify that Pro Education edition is enabled
+
+You can verify the Windows 10 Pro Education in **Settings > Update & Security > Activation**.
+
+**Figure 12** - Windows 10 Pro Education in Settings
+
+

+
+If there are any problems with the Windows 10 Pro Education license or the activation of the license, the **Activation** panel will display the appropriate error message or status. You can use this information to help you diagnose the licensing and activation process.
+
+### Troubleshoot the user experience
+
+In some instances, users may experience problems with the Windows 10 Pro Education switch. The most common problems that users may experience are as follows:
+
+- The existing operating system (Windows 10 Pro, version 1607 or higher, or Windows 10 S, version 1703) is not activated.
+- The Windows 10 Pro Education switch has lapsed or has been removed.
+
+Use the following figures to help you troubleshoot when users experience these common problems:
+
+**Figure 13** - Illustrates a device in a healthy state, where the existing operating system is activated, and the Windows 10 Pro Education switch is active.
+
+

+
+
+**Figure 14** - Illustrates a device on which the existing operating system is not activated, but the Windows 10 Pro Education switch is active.
+
+

+
+
+### Review requirements on devices
+
+Devices must be running Windows 10 Pro, version 1607 or higher, or Windows 10 S, version 1703 and be Azure AD joined, or domain joined with Azure AD Connect. Customers who are federated with Azure AD are also eligible. You can use the following procedures to review whether a particular device meets requirements.
+
+**To determine if a device is Azure AD joined**
+
+1. Open a command prompt and type the following:
+
+ ```
+ dsregcmd /status
+ ```
+
+2. Review the output under Device State. If the **AzureAdJoined** status is YES, the device is Azure Active Directory joined.
+
+**To determine the version of Windows 10**
+
+- At a command prompt, type:
+
+ ```
+ winver
+ ```
+
+ A popup window will display the Windows 10 version number and detailed OS build information.
+
+ > [!NOTE]
+ > If a device is running a previous version of Windows 10 Pro (for example, version 1511), it will not be switched to Windows 10 Pro Education when a user signs in, even if the user has been assigned a license.
+
+### Roll back Windows 10 Pro Education to Windows 10 Pro
+
+If your organization has the Windows 10 Pro to Windows 10 Pro Education switch enabled, and you decide to roll back to Windows 10 Pro or to cancel the switch, you can do this by:
+
+- Logging into Microsoft Store for Education page and turning off the automatic switch.
+- Selecting the link to turn off the automatic switch from the notification email sent to all global administrators.
+
+Once the automatic switch to Windows 10 Pro Education is turned off, the change is effective immediately. Devices that were switched will revert to Windows 10 Pro only after the license has been refreshed (every 30 days) and the next time the user signs in. This means that a user whose device was switched may not immediately see Windows 10 Pro Education rolled back to Windows 10 Pro for up to 30 days. However, users who haven't signed in during the time that a switch was enabled and then turned off will never see their device change from Windows 10 Pro.
+
+> [!NOTE]
+> Devices that were switched from Windows 10 S to Windows 10 Pro Education cannot roll back to Windows 10 S.
+
+**To roll back Windows 10 Pro Education to Windows 10 Pro**
+
+1. Log in to [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/Store/Apps) with your school or work account, or follow the link from the notification email to turn off the automatic switch.
+2. Select **Manage > Benefits** and locate the section **Windows 10 Pro Education** and follow the link.
+3. In the **Revert to Windows 10 Pro** page, click **Revert to Windows 10 Pro**.
+
+ **Figure 15** - Revert to Windows 10 Pro
+
+ 
+
+4. You will be asked if you're sure that you want to turn off automatic switches to Windows 10 Pro Education. Click **Yes**.
+5. Click **Close** in the **Success** page.
+
+ All global admins get a confirmation email that a request was made to roll back your organization to Windows 10 Pro. If you, or another global admin, decide later that you want to turn on automatic switches again, you can do this by selecting **Switch to Windows 10 Pro Education for free** from the **Manage > Benefits** in the Microsoft Store for Education.
+
+
+## Preparing for deployment of Windows 10 Pro Education licenses
+
+If you have on-premises Active Directory Domain Services (AD DS) domains, users will use their domain-based credentials to sign in to the AD DS domain. Before you start deploying Windows 10 Pro Education to users, you need to synchronize the identities in the on-premises AD DS domain with Azure AD.
+
+You need to synchronize these identities so that users will have a *single identity* that they can use to access their on-premises apps and cloud services that use Azure AD (such as Windows 10 Pro Education). This means that users can use their existing credentials to sign in to Azure AD and access the cloud services that you provide and manage for them.
+
+Figure 11 illustrates the integration between the on-premises AD DS domain with Azure AD. [Microsoft Azure Active Directory Connect](http://www.microsoft.com/en-us/download/details.aspx?id=47594) (Azure AD Connect) is responsible for synchronization of identities between the on-premises AD DS domain and Azure AD. Azure AD Connect is a service that you can install on-premises or in a virtual machine in Azure.
+
+**Figure 16** - On-premises AD DS integrated with Azure AD
+
+
+
+For more information about integrating on-premises AD DS domains with Azure AD, see these resources:
+- [Integrating your on-premises identities with Azure Active Directory](http://azure.microsoft.com/en-us/documentation/articles/active-directory-aadconnect/)
+- [Azure AD + Domain Join + Windows 10](https://blogs.technet.microsoft.com/enterprisemobility/2016/02/17/azure-ad-domain-join-windows-10/)
+
+## Related topics
+
+[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
+[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
+[Compare Windows 10 editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)
diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md
index 8512b79b49..7338cfbdc0 100644
--- a/education/windows/use-set-up-school-pcs-app.md
+++ b/education/windows/use-set-up-school-pcs-app.md
@@ -34,13 +34,10 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
* Prevents students from removing the PC from the school's device management system
* Prevents students from removing the Set up School PCs settings
- Keeps student PCs up-to-date without interfering with class time using Windows Update and maintenance hours
-
-A student PC that's set up using the Set up School PCs provisioning package is tailored to provide students with the tools they need for learning while removing apps and features that they don't need.
- * Customizes the Start layout with Office
- * Installs OneDrive for cloud-based documents and places it on the Start menu and taskbar
- * Uninstalls apps not specific to education, such as Solitaire
- * [Gets the student PC ready for use in an education environment](configure-windows-for-education.md)
- * Prevents students from adding personal Microsoft accounts to the PC
+- Customizes the Start layout with Office
+- Installs OneDrive for storing cloud-based documents and Sway for creating interactive reports, presentations, and more
+- Uninstalls apps not specific to education, such as Solitaire
+- Prevents students from adding personal Microsoft accounts to the PC
## Tips for success
diff --git a/education/windows/windows-10-pro-to-pro-edu-upgrade.md b/education/windows/windows-10-pro-to-pro-edu-upgrade.md
deleted file mode 100644
index 373293b8ac..0000000000
--- a/education/windows/windows-10-pro-to-pro-edu-upgrade.md
+++ /dev/null
@@ -1,263 +0,0 @@
----
-title: Switch Windows 10 Pro to Pro Education
-description: Describes how IT Pros can opt into switching from Windows 10 Pro to Windows 10 Pro Education from the Microsoft Store for Education.
-keywords: switch, Pro to Pro Education, education customers
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: edu
-localizationpriority: high
-author: CelesteDG
----
-
-# Switch Windows 10 Pro to Pro Education from Microsoft Store for Education
-
-Windows 10 Pro Education is a new offering in Windows 10 Anniversary Update (Windows 10, version 1607). This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings.
-
-If you have an education tenant and use Windows 10 Pro in your schools now, global administrators can opt-in to a free switch to Windows 10 Pro Education through the Microsoft Store for Education. To take advantage of this offering, make sure you meet the [requirements for switching](#requirements-for-switching).
-
-Starting with Windows 10, version 1607, academic institutions can easily move from Windows 10 Pro to Windows 10 Pro Education—no keys and no reboots. After one of your users enters the Azure AD credentials associated with a Windows 10 Pro Education license, the operating system turns from Windows 10 Pro to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. When a license expires or is transferred to another user, the Windows 10 Pro Education device seamlessly steps back down to Windows 10 Pro.
-
-Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have a Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
-
-When you switch to Windows 10 Pro Education, you get the following benefits:
-
-- **Windows 10 Pro Education edition**. Devices currently running Windows 10 Pro, version 1607 can get Windows 10 Pro Education Current Branch (CB). This benefit does not include Long Term Service Branch (LTSB).
-- **Support from one to hundreds of users**. The Windows 10 Pro Education program does not have a limitation on the number of licenses an organization can have.
-- **Roll back to Windows 10 Pro at any time**. When a user leaves the domain or you turn off the setting to automatic switch to Windows 10 Pro Education, the device reverts seamlessly to Windows 10 Pro edition (after a grace period of up to 30 days).
-
-In summary, the Windows 10 Pro Education free switch through the Microsoft Store for Education is an offering that provides organizations easier, more flexible access to the benefits of Windows 10 Pro Education edition.
-
-## Compare Windows 10 Pro and Pro Education editions
-
-In Windows 10, version 1607, the Windows 10 Pro Education edition contains the same features as the Windows 10 Pro edition except for the following differences:
-
-- Cortana is removed from Windows 10 Pro Education
-- Options to manage Windows 10 tips and tricks and Windows Store suggestions
-
-See [Windows 10 editions for education customers](windows-editions-for-education-customers.md) for more info about Windows 10 Pro Education and you can also [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare) to find out more about the features we support in other editions of Windows 10.
-
-## Requirements for switching
-
-Before you switch from Windows 10 Pro to Windows 10 Pro Education, make sure you meet these requirements:
-- Devices must be:
- - Running Windows 10 Pro, version 1607
- - Must be Azure Active Directory joined, or domain joined with Azure AD Connect. Customers who are federated with Azure Active Directory are also eligible. For more information, see [Review requirements on devices](#review-requirements-on-devices).
-
- If you haven't domain joined your devices already, [prepare for deployment of Windows 10 Pro Education licenses](#preparing-for-deployment-of-windows-10-pro-education-licenses).
-- The user making the changes must be a member of the Azure AD global administrator group.
-- The Azure AD tenant must be recognized as an education approved tenant.
-- You must have a Microsoft Store for Education account.
-
-## Switch from Windows 10 Pro to Windows 10 Pro Education
-Once you enable the setting to switch Windows 10 Pro to Windows 10 Pro Education, the switch will begin only after a user signs in to their device. The setting applies to the entire organization so you cannot select which users will receive the switch.
-
-**To turn on the automatic switch from Windows 10 Pro to Windows 10 Pro Education**
-
-1. Sign in to [Microsoft Store for Education](https://businessstore.microsoft.com/en-us/Store/Apps) with your work or school account.
-
- If this is the first time you're signing into the Microsoft Store, you'll be prompted to accept the Microsoft Store for Business and Education License Agreement.
-
-2. Go to **Manage > Account information**.
-3. In the **Account information** page, look for the **Automatic Windows 10 Pro Education upgrade** section and follow the link.
-
- You will see the following page informing you that your school is eligible for a free automatic switch from Windows 10 Pro to Windows 10 Pro Education.
-
- 
-
- **Figure 1** - Switch Windows 10 Pro to Windows 10 Pro Education
-
-4. Select **I understand enabling this setting will impact all devices running Windows 10 Pro in my organization**.
-5. Click **Send me email with a link to enable this upgrade** to receive an email with a link to the switch.
-
- 
-
- **Figure 2** - Email notification with a link to enable the switch
-
-6. Click **Enable the automatic upgrade now** to turn on automatic switches.
-
- .
-
- **Figure 3** - Enable the automatic switch
-
- Enabling the automatic switch also triggers an email message notifying all global administrators in your organization about the switch. It also contains a link that enables any global administrators to cancel the switch, if they choose. For more info about rolling back or canceling the switch, see [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro).
-
- .
-
- **Figure 4** - Notification email sent to all global administrators
-
-7. Click **Close** in the **Success** page.
-
- In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, you will see a message informing you when the switch was enabled and the name of the admin who enabled the switch.
-
- 
-
- **Figure 5** - Details about the automatic switch
-
-
-## Explore the switch experience
-
-So what will the users experience? How will they switch their devices?
-
-### For existing Azure AD domain joined devices
-Existing Azure AD domain joined devices will be switched from Windows 10 Pro to Windows 10 Pro Education the next time the user logs in. That's it! No additional steps are needed.
-
-### For new devices that are not Azure AD domain joined
-Now that you've turned on the setting to automatically switch Windows 10 Pro to Windows 10 Pro Education, the users are ready to switch their devices running Windows 10 Pro, version 1607 edition to Windows 10 Pro Education edition.
-
-#### Step 1: Join users’ devices to Azure AD
-
-Users can join a device to Azure AD the first time they start the device (during setup), or they can join a device that they already use running Windows 10 Pro, version 1607.
-
-**To join a device to Azure AD the first time the device is started**
-
-1. During the initial setup, on the **Who owns this PC?** page, select **My organization**, and then click **Next**, as illustrated in **Figure 6**.
-
-

-
- **Figure 6** - The “Who owns this PC?” page in initial Windows 10 setup
-
-2. On the **Choose how you’ll connect** page, select **Join Azure AD**, and then click **Next**, as illustrated in **Figure 7**.
-
-

-
- **Figure 7** - The “Choose how you’ll connect” page in initial Windows 10 setup
-
-3. On the **Let’s get you signed in** page, enter the Azure AD credentials, and then click **Sign in**, as illustrated in **Figure 8**.
-
-

-
- **Figure 8** - The “Let’s get you signed in” page in initial Windows 10 setup
-
-Now the device is Azure AD joined to the company’s subscription.
-
-**To join a device to Azure AD when the device already has Windows 10 Pro, version 1607 installed and set up**
-
-1. Go to **Settings > Accounts > Access work or school**, as illustrated in **Figure 9**.
-
-

-
- **Figure 9** - Connect to work or school configuration in Settings
-
-2. In **Set up a work or school account**, click **Join this device to Azure Active Directory**, as illustrated in **Figure 10**.
-
-

-
- **Figure 10** - Set up a work or school account
-
-3. On the **Let’s get you signed in** page, enter the Azure AD credentials, and then click **Sign in**, as illustrated in **Figure 11**.
-
-

-
- **Figure 11** - The “Let’s get you signed in” dialog box
-
-Now the device is Azure AD joined to the company’s subscription.
-
-#### Step 2: Sign in using Azure AD account
-
-Once the device is joined to your Azure AD subscription, the user will sign in by using his or her Azure AD account, as illustrated in **Figure 12**. The Windows 10 Pro Education license associated with the user will enable Windows 10 Pro Education edition capabilities on the device.
-
-

-
-**Figure 12** - Sign in by using Azure AD account
-
-#### Step 3: Verify that Pro Education edition is enabled
-
-You can verify the Windows 10 Pro Education in **Settings > Update & Security > Activation**, as illustrated in **Figure 13**.
-
-
-
-**Figure 13** - Windows 10 Pro Education in Settings
-
-

-
-If there are any problems with the Windows 10 Pro Education license or the activation of the license, the **Activation** panel will display the appropriate error message or status. You can use this information to help you diagnose the licensing and activation process.
-
-## Troubleshoot the user experience
-
-In some instances, users may experience problems with the Windows 10 Pro Education switch. The most common problems that users may experience are as follows:
-
-- The existing Windows 10 Pro, version 1607 operating system is not activated.
-
-- The Windows 10 Pro Education switch has lapsed or has been removed.
-
-Use the following figures to help you troubleshoot when users experience these common problems:
-
-
-
-**Figure 13** - Illustrates a device in a healthy state, where Windows 10 Pro, version 1607 is activated and the Windows 10 Pro Education switch is active.
-
-

-
-
-
-**Figure 14** - Illustrates a device on which Windows 10 Pro, version 1607 is not activated, but the Windows 10 Pro Education switch is active.
-
-

-
-
-### Review requirements on devices
-
-Devices must be running Windows 10 Pro, version 1607, and be Azure Active Directory joined, or domain joined with Azure AD Connect. Customers who are federated with Azure Active Directory are also eligible. You can use the following procedures to review whether a particular device meets requirements.
-
-**To determine if a device is Azure Active Directory joined**
-
-1. Open a command prompt and type **dsregcmd /status**.
-
-2. Review the output under Device State. If the **AzureAdJoined** status is YES, the device is Azure Active Directory joined.
-
-**To determine the version of Windows 10**
-
-- At a command prompt, type:
- **winver**
-
- A popup window will display the Windows 10 version number and detailed OS build information.
-
- If a device is running a previous version of Windows 10 Pro (for example, version 1511), it will not be switched to Windows 10 Pro Education when a user signs in, even if the user has been assigned a license.
-
-## Roll back Windows 10 Pro Education to Windows 10 Pro
-
-If your organization has the Windows 10 Pro to Windows 10 Pro Education switch enabled, and you decide to roll back to Windows 10 Pro or to cancel the switch, you can do this by:
-- Logging into Microsoft Store for Education page and turning off the automatic switch.
-- Selecting the link to turn off the automatic switch from the notification email sent to all global administrators.
-
-Once the automatic switch to Windows 10 Pro Education is turned off, the change is effective immediately. Devices that were switched will revert to Windows 10 Pro only after the license has been refreshed (every 30 days) and the next time the user signs in. This means that a user whose device was switched may not immediately see Windows 10 Pro Education rolled back to Windows 10 Pro for up to 30 days. However, users who haven't signed in during the time that an switch was enabled and then turned off will never see their device change from Windows 10 Pro.
-
-**To roll back Windows 10 Pro Education to Windows 10 Pro**
-1. Log in to [Microsoft Store for Education](https://businessstore.microsoft.com/en-us/Store/Apps) with your school or work account, or follow the link from the notification email to turn off the automatic switch.
-2. Select **Manage > Account information** and locate the section **Automatic Windows 10 Pro Education upgrade** and follow the link.
-3. In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, select **Turn off the automatic upgrade to Windows 10 Pro Education**.
-
- 
-
- **Figure 15** - Link to turn off the automatic switch
-
-4. You will be asked if you're sure that you want to turn off automatic switches to Windows 10 Pro Education. Click **Yes**.
-5. Click **Close** in the **Success** page.
-6. In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, you will see information on when the switch was disabled.
-
- If you decide later that you want to turn on automatic switches again, you can do this from the **Upgrade Windows 10 Pro to Windows 10 Pro Education**.
-
-## Preparing for deployment of Windows 10 Pro Education licenses
-
-If you have on-premises Active Directory Domain Services (AD DS) domains, users will use their domain-based credentials to sign in to the AD DS domain. Before you start deploying Windows 10 Pro Education to users, you need to synchronize the identities in the on-premises AD DS domain with Azure AD.
-
-You need to synchronize these identities so that users will have a *single identity* that they can use to access their on-premises apps and cloud services that use Azure AD (such as Windows 10 Pro Education). This means that users can use their existing credentials to sign in to Azure AD and access the cloud services that you provide and manage for them.
-
-**Figure 16** illustrates the integration between the on-premises AD DS domain with Azure AD. [Microsoft Azure Active Directory Connect](http://www.microsoft.com/en-us/download/details.aspx?id=47594) (Azure AD Connect) is responsible for synchronization of identities between the on-premises AD DS domain and Azure AD. Azure AD Connect is a service that you can install on-premises or in a virtual machine in Azure.
-
-
-
-**Figure 16** - On-premises AD DS integrated with Azure AD
-
-For more information about integrating on-premises AD DS domains with Azure AD, see these resources:
-- [Integrating your on-premises identities with Azure Active Directory](http://azure.microsoft.com/en-us/documentation/articles/active-directory-aadconnect/)
-- [Azure AD + Domain Join + Windows 10](https://blogs.technet.microsoft.com/enterprisemobility/2016/02/17/azure-ad-domain-join-windows-10/)
-
-## Related topics
-
-[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
-
-[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
-
-[Compare Windows 10 editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)
diff --git a/windows/access-protection/docfx.json b/windows/access-protection/docfx.json
index 627724bbe5..22574d09a4 100644
--- a/windows/access-protection/docfx.json
+++ b/windows/access-protection/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/access-protection/enterprise-certificate-pinning.md b/windows/access-protection/enterprise-certificate-pinning.md
index 26876a7fac..130251d4b2 100644
--- a/windows/access-protection/enterprise-certificate-pinning.md
+++ b/windows/access-protection/enterprise-certificate-pinning.md
@@ -6,7 +6,7 @@ author: MikeStephens-MS
description: Enterprise certificate pinning is a Windows feature for remembering, or “pinning” a root, issuing certificate authority, or end entity certificate to a given domain name.
manager: alanth
ms.prod: w10
-ms.technology: security
+ms.technology: windows
ms.sitesec: library
ms.pagetype: security
localizationpriority: high
@@ -71,141 +71,41 @@ Each PinRule element contains a sequence of one or more Site elements and a sequ
The PinRules element can have the following attributes.
For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml) or [Representing a Duration in XML](#representing-a-duration-in-xml).
-- **Duration** or **NextUpdate**
-
- Specifies when the Pin Rules will expire.
- Either is required.
- **NextUpdate** takes precedence if both are specified.
-
- **Duration**, represented as an XML TimeSpan data type, does not allow years and months.
- You represent the **NextUpdate** attribute as a XML DateTime data type in UTC.
-
- **Required?** Yes. At least one is required.
-
-- **LogDuration** or **LogEndDate**
-
- Configures auditing only to extend beyond the expiration of enforcing the Pin Rules.
-
- **LogEndDate**, represented as an XML DateTime data type in UTC, takes precedence if both are specified.
-
- You represent **LogDuration** as an XML TimeSpan data type, which does not allow years and months.
-
- If neither attribute is specified, auditing expiration uses **Duration** or **NextUpdate** attributes.
-
- **Required?** No.
-
-- **ListIdentifier**
-
- Provides a friendly name for the list of pin rules.
- Windows does not use this attribute for certificate pinning enforcement, however it is included when the pin rules are converted to a certificate trust list (CTL).
-
- **Required?** No.
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **Duration** or **NextUpdate** | Specifies when the Pin Rules will expire. Either is required. **NextUpdate** takes precedence if both are specified.
**Duration**, represented as an XML TimeSpan data type, does not allow years and months. You represent the **NextUpdate** attribute as a XML DateTime data type in UTC. | **Required?** Yes. At least one is required. |
+| **LogDuration** or **LogEndDate** | Configures auditing only to extend beyond the expiration of enforcing the Pin Rules.
**LogEndDate**, represented as an XML DateTime data type in UTC, takes precedence if both are specified.
You represent **LogDuration** as an XML TimeSpan data type, which does not allow years and months.
If neither attribute is specified, auditing expiration uses **Duration** or **NextUpdate** attributes. | No. |
+| **ListIdentifier** | Provides a friendly name for the list of pin rules. Windows does not use this attribute for certificate pinning enforcement, however it is included when the pin rules are converted to a certificate trust list (CTL). | No. |
#### PinRule Element
-The **PinRule** element can have the following attributes:
+The **PinRule** element can have the following attributes.
-- **Name**
-
- Uniquely identifies the **PinRule**.
- Windows uses this attribute to identify the element for a parsing error or for verbose output.
- The attribute is not included in the generated certificate trust list (CTL).
-
- **Required?** Yes.
-
-- **Error**
-
- Describes the action Windows performs when it encounters a PIN mismatch.
- You can choose from the following string values:
- - **Revoked** - Windows reports the certificate protecting the site as if it was revoked. This typically prevents the user from accessing the site.
- - **InvalidName** - Windows reports the certificate protecting the site as if the name on the certificate does not match the name of the site. This typically results in prompting the user before accessing the site.
- - **None** - The default value. No error is returned. You can use this setting to audit the pin rules without introducing any user friction.
-
- **Required?** No.
-
-- **Log**
-
- A Boolean value represent as string that equals **true** or **false**.
- By default, logging is enabled (**true**).
-
- **Required?** No.
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **Name** | Uniquely identifies the **PinRule**. Windows uses this attribute to identify the element for a parsing error or for verbose output. The attribute is not included in the generated certificate trust list (CTL). | Yes.|
+| **Error** | Describes the action Windows performs when it encounters a PIN mismatch. You can choose from the following string values:
- **Revoked** - Windows reports the certificate protecting the site as if it was revoked. This typically prevents the user from accessing the site.
- **InvalidName** - Windows reports the certificate protecting the site as if the name on the certificate does not match the name of the site. This typically results in prompting the user before accessing the site.
- **None** - The default value. No error is returned. You can use this setting to audit the pin rules without introducing any user friction. | No. |
+| **Log** | A Boolean value represent as string that equals **true** or **false**. By default, logging is enabled (**true**). | No. |
#### Certificate element
-The **Certificate** element can have the following attributes:
+The **Certificate** element can have the following attributes.
-- **File**
-
- Path to a file containing one or more certificates.
- Where the certificate(s) can be encoded as:
- - single certificate
- - p7b
- - sst.
-
- These files can also be Base64 formatted.
- All **Site** elements included in the same **PinRule** element can match any of these certificates.
-
- **Required?** Yes (File, Directory or Base64 must be present).
-
-- **Directory**
-
- Path to a directory containing one or more of the above certificate files.
- Skips any files not containing any certificates.
-
- **Required?** Yes (File, Directory or Base64 must be present).
-
-- **Base64**
-
- Base64 encoded certificate(s).
- Where the certificate(s) can be encoded as:
- - single certificate
- - p7b
- - sst.
-
- This allows the certificates to be included in the XML file without a file directory dependency.
-
- > [!Note]
- > You can use **certutil -encode** to a .cer file into base64. You can then use Notepad to copy and paste the base64 encoded certificate into the pin rule.
-
- **Required?** Yes (File, Directory or Base64 must be present).
-
-- **EndDate**
-
- Enables you to configure an expiration date for when the certificate is no longer valid in the pin rule.
-
- If you are in the process of switching to a new root or CA, you can set the **EndDate** to allow matching of this element’s certificates.
-
- If the current time is past the **EndDate**, then, when creating the certificate trust list (CTL), the parser outputs a warning message and exclude the certificate(s) from the Pin Rule in the generated CTL.
-
- For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml).
-
- **Required?** No.
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **File** | Path to a file containing one or more certificates. Where the certificate(s) can be encoded as:
- single certificate
- p7b
- sst
These files can also be Base64 formatted. All **Site** elements included in the same **PinRule** element can match any of these certificates. | Yes (File, Directory or Base64 must be present). |
+| **Directory** | Path to a directory containing one or more of the above certificate files. Skips any files not containing any certificates. | Yes (File, Directory or Base64 must be present). |
+| **Base64** | Base64 encoded certificate(s). Where the certificate(s) can be encoded as:
- single certificate
- p7b
- sst
This allows the certificates to be included in the XML file without a file directory dependency.
Note:
You can use **certutil -encode** to convert a .cer file into base64. You can then use Notepad to copy and paste the base64 encoded certificate into the pin rule. | Yes (File, Directory or Base64 must be present). |
+| **EndDate** | Enables you to configure an expiration date for when the certificate is no longer valid in the pin rule.
If you are in the process of switching to a new root or CA, you can set the **EndDate** to allow matching of this element’s certificates.
If the current time is past the **EndDate**, then, when creating the certificate trust list (CTL), the parser outputs a warning message and exclude the certificate(s) from the Pin Rule in the generated CTL.
For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml).| No.|
#### Site element
-The **Site** element can have the following attributes:
+The **Site** element can have the following attributes.
-- **Domain**
-
- Contains the DNS name to be matched for this pin rule.
- When creating the certificate trust list, the parser normalizes the input name string value as follows:
- - If the DNS name has a leading "*" it is removed.
- - Non-ASCII DNS name are converted to ASCII Puny Code.
- - Upper case ASCII characters are converted to lower case.
-
- If the normalized name has a leading ".", then, wildcard left hand label matching is enabled.
- For example, ".xyz.com" would match "abc.xyz.com".
-
- **Required?** Yes.
-
-- **AllSubdomains**
-
- By default, wildcard left hand label matching is restricted to a single left hand label.
- This attribute can be set to "true" to enable wildcard matching of all of the left hand labels.
-
- For example, setting this attribute would also match "123.abc.xyz.com" for the ".xyz.com" domain value.
-
- **Required?** No.
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **Domain** | Contains the DNS name to be matched for this pin rule. When creating the certificate trust list, the parser normalizes the input name string value as follows:
- If the DNS name has a leading "*" it is removed.
- Non-ASCII DNS name are converted to ASCII Puny Code.
- Upper case ASCII characters are converted to lower case.
If the normalized name has a leading ".", then, wildcard left hand label matching is enabled. For example, ".xyz.com" would match "abc.xyz.com". | Yes.|
+| **AllSubdomains** | By default, wildcard left hand label matching is restricted to a single left hand label. This attribute can be set to "true" to enable wildcard matching of all of the left-hand labels.
For example, setting this attribute would also match "123.abc.xyz.com" for the ".xyz.com" domain value.| No.|
### Create a Pin Rules Certificate Trust List
@@ -302,10 +202,6 @@ Sign-in to the reference computer using domain administrator equivalent credenti
To assist in constructing certificate pinning rules, you can configure the **PinRulesLogDir** setting under the certificate chain configuration registry key to include a parent directory to log pin rules.
-```code
-HKLM\SOFTWARE\Microsoft\Cryptography\OID\EncodingType0\CertDllCreateCertificateChainEngine\Config
-```
-
| Name | Value |
|------|-------|
| Key | HKLM\SOFTWARE\Microsoft\Cryptography\OID\EncodingType0\CertDllCreateCertificateChainEngine\Config |
diff --git a/windows/access-protection/windows-firewall/create-wmi-filters-for-the-gpo.md b/windows/access-protection/windows-firewall/create-wmi-filters-for-the-gpo.md
index 80474a70be..d8344768fc 100644
--- a/windows/access-protection/windows-firewall/create-wmi-filters-for-the-gpo.md
+++ b/windows/access-protection/windows-firewall/create-wmi-filters-for-the-gpo.md
@@ -85,7 +85,7 @@ First, create the WMI filter and configure it to look for a specified version (o
After you have created a filter with the correct query, link the filter to the GPO. Filters can be reused with many GPOs simultaneously; you do not have to create a new one for each GPO if an existing one meets your needs.
-1. Open theGroup Policy Management console.
+1. Open the Group Policy Management console.
2. In the navigation pane, find and then click the GPO that you want to modify.
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index a0c06828be..cc2687ac6a 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index 107c56cde2..b42d904675 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/client-management/mdm/activesync-csp.md b/windows/client-management/mdm/activesync-csp.md
index 11681a3787..a395891a14 100644
--- a/windows/client-management/mdm/activesync-csp.md
+++ b/windows/client-management/mdm/activesync-csp.md
@@ -1,15 +1,12 @@
---
title: ActiveSync CSP
description: ActiveSync CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: c65093ef-bd36-4f32-9dab-edb7bcfb3188
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ActiveSync CSP
diff --git a/windows/client-management/mdm/activesync-ddf-file.md b/windows/client-management/mdm/activesync-ddf-file.md
index 691947b55a..8aa90d6d7c 100644
--- a/windows/client-management/mdm/activesync-ddf-file.md
+++ b/windows/client-management/mdm/activesync-ddf-file.md
@@ -1,15 +1,12 @@
---
title: ActiveSync DDF file
description: ActiveSync DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: c4cd4816-ad8f-45b2-9b81-8abb18254096
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ActiveSync DDF file
diff --git a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
index 3cea96c4cd..e1c6986fe5 100644
--- a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
+++ b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
@@ -1,15 +1,12 @@
---
title: Add an Azure AD tenant and Azure AD subscription
description: Here's a step-by-step guide to adding an Azure Active Directory tenant, adding an Azure AD subscription, and registering your subscription.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 36D94BEC-A6D8-47D2-A547-EBD7B7D163FA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Add an Azure AD tenant and Azure AD subscription
diff --git a/windows/client-management/mdm/alljoynmanagement-csp.md b/windows/client-management/mdm/alljoynmanagement-csp.md
index 196534eb9b..0746ed4175 100644
--- a/windows/client-management/mdm/alljoynmanagement-csp.md
+++ b/windows/client-management/mdm/alljoynmanagement-csp.md
@@ -1,15 +1,12 @@
---
title: AllJoynManagement CSP
description: The AllJoynManagement configuration service provider (CSP) allows an IT administrator to enumerate the AllJoyn devices that are connected to the AllJoyn bus.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 468E0EE5-EED3-48FF-91C0-89F9D159AA8C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AllJoynManagement CSP
diff --git a/windows/client-management/mdm/alljoynmanagement-ddf.md b/windows/client-management/mdm/alljoynmanagement-ddf.md
index d7de78a5f4..ebc2840da3 100644
--- a/windows/client-management/mdm/alljoynmanagement-ddf.md
+++ b/windows/client-management/mdm/alljoynmanagement-ddf.md
@@ -1,15 +1,12 @@
---
title: AllJoynManagement DDF
description: AllJoynManagement DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 540C2E60-A041-4749-A027-BBAF0BB046E4
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AllJoynManagement DDF
diff --git a/windows/client-management/mdm/application-csp.md b/windows/client-management/mdm/application-csp.md
index 9ed4ad4239..463b2e0c07 100644
--- a/windows/client-management/mdm/application-csp.md
+++ b/windows/client-management/mdm/application-csp.md
@@ -1,15 +1,12 @@
---
title: APPLICATION configuration service provider
description: APPLICATION configuration service provider
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 0705b5e9-a1e7-4d70-a73d-7f758ffd8099
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# APPLICATION configuration service provider
diff --git a/windows/client-management/mdm/applicationrestrictions-xsd.md b/windows/client-management/mdm/applicationrestrictions-xsd.md
index c1c0a561a1..312d90524e 100644
--- a/windows/client-management/mdm/applicationrestrictions-xsd.md
+++ b/windows/client-management/mdm/applicationrestrictions-xsd.md
@@ -1,15 +1,12 @@
---
title: ApplicationRestrictions XSD
description: Here's the XSD for the ApplicationManagement/ApplicationRestrictions policy.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A5AA2B59-3736-473E-8F70-A90FD61EE426
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ApplicationRestrictions XSD
diff --git a/windows/client-management/mdm/applocker-csp.md b/windows/client-management/mdm/applocker-csp.md
index a8104b8cd5..a73544002c 100644
--- a/windows/client-management/mdm/applocker-csp.md
+++ b/windows/client-management/mdm/applocker-csp.md
@@ -1,15 +1,12 @@
---
title: AppLocker CSP
description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AppLocker CSP
diff --git a/windows/client-management/mdm/applocker-ddf-file.md b/windows/client-management/mdm/applocker-ddf-file.md
index d743bc90b9..e332216b02 100644
--- a/windows/client-management/mdm/applocker-ddf-file.md
+++ b/windows/client-management/mdm/applocker-ddf-file.md
@@ -1,15 +1,12 @@
---
title: AppLocker DDF file
description: AppLocker DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 79E199E0-5454-413A-A57A-B536BDA22496
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AppLocker DDF file
diff --git a/windows/client-management/mdm/applocker-xsd.md b/windows/client-management/mdm/applocker-xsd.md
index 8a5ed59bcb..1d578d006d 100644
--- a/windows/client-management/mdm/applocker-xsd.md
+++ b/windows/client-management/mdm/applocker-xsd.md
@@ -1,15 +1,12 @@
---
title: AppLocker XSD
description: Here's the XSD for the AppLocker CSP.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 70CF48DD-AD7D-4BCF-854F-A41BFD95F876
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AppLocker XSD
diff --git a/windows/client-management/mdm/appv-deploy-and-config.md b/windows/client-management/mdm/appv-deploy-and-config.md
index 1583fe4479..d7f18cf787 100644
--- a/windows/client-management/mdm/appv-deploy-and-config.md
+++ b/windows/client-management/mdm/appv-deploy-and-config.md
@@ -1,14 +1,11 @@
---
title: Deploy and configure App-V apps using MDM
description: Deploy and configure App-V apps using MDM
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Deploy and configure App-V apps using MDM
diff --git a/windows/client-management/mdm/assign-seats.md b/windows/client-management/mdm/assign-seats.md
index 0e0aedaff6..b39d6d9cdf 100644
--- a/windows/client-management/mdm/assign-seats.md
+++ b/windows/client-management/mdm/assign-seats.md
@@ -1,15 +1,12 @@
---
title: Assign seat
description: The Assign seat operation assigns seat for a specified user in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: B42BF490-35C9-405C-B5D6-0D9F0E377552
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Assign seat
diff --git a/windows/client-management/mdm/assignedaccess-csp.md b/windows/client-management/mdm/assignedaccess-csp.md
index bc9933dc97..aad87ff0e5 100644
--- a/windows/client-management/mdm/assignedaccess-csp.md
+++ b/windows/client-management/mdm/assignedaccess-csp.md
@@ -1,15 +1,12 @@
---
title: AssignedAccess CSP
description: The AssignedAccess configuration service provider (CSP) is used set the device to run in kiosk mode.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 421CC07D-6000-48D9-B6A3-C638AAF83984
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AssignedAccess CSP
diff --git a/windows/client-management/mdm/assignedaccess-ddf.md b/windows/client-management/mdm/assignedaccess-ddf.md
index 7bff2aad34..4f2fae2306 100644
--- a/windows/client-management/mdm/assignedaccess-ddf.md
+++ b/windows/client-management/mdm/assignedaccess-ddf.md
@@ -1,15 +1,12 @@
---
title: AssignedAccess DDF
description: AssignedAccess DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 224FADDB-0EFD-4E5A-AE20-1BD4ABE24306
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# AssignedAccess DDF
diff --git a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
index 9c47fe110e..ebdb1d406e 100644
--- a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
+++ b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
@@ -1,15 +1,12 @@
---
title: Azure Active Directory integration with MDM
description: Azure Active Directory is the world largest enterprise cloud identity management service.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D03B0765-5B5F-4C7B-9E2B-18E747D504EE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/bitlocker-csp.md b/windows/client-management/mdm/bitlocker-csp.md
index 1c046fef02..d7d5beca50 100644
--- a/windows/client-management/mdm/bitlocker-csp.md
+++ b/windows/client-management/mdm/bitlocker-csp.md
@@ -1,14 +1,11 @@
---
title: BitLocker CSP
description: BitLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# BitLocker CSP
diff --git a/windows/client-management/mdm/bitlocker-ddf-file.md b/windows/client-management/mdm/bitlocker-ddf-file.md
index dd2461a0fe..2b0491ab35 100644
--- a/windows/client-management/mdm/bitlocker-ddf-file.md
+++ b/windows/client-management/mdm/bitlocker-ddf-file.md
@@ -1,14 +1,11 @@
---
title: BitLocker DDF file
description: BitLocker DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# BitLocker DDF file
diff --git a/windows/client-management/mdm/bootstrap-csp.md b/windows/client-management/mdm/bootstrap-csp.md
index 11a4e027aa..86259803e4 100644
--- a/windows/client-management/mdm/bootstrap-csp.md
+++ b/windows/client-management/mdm/bootstrap-csp.md
@@ -1,15 +1,12 @@
---
title: BOOTSTRAP CSP
description: BOOTSTRAP CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b8acbddc-347f-4543-a45b-ad2ffae3ffd0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# BOOTSTRAP CSP
diff --git a/windows/client-management/mdm/browserfavorite-csp.md b/windows/client-management/mdm/browserfavorite-csp.md
index d14fdefbb2..e762d03a4f 100644
--- a/windows/client-management/mdm/browserfavorite-csp.md
+++ b/windows/client-management/mdm/browserfavorite-csp.md
@@ -1,15 +1,12 @@
---
title: BrowserFavorite CSP
description: BrowserFavorite CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5d2351ff-2d6a-4273-9b09-224623723cbf
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# BrowserFavorite CSP
diff --git a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
index b148b5db51..3d370d247f 100644
--- a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
+++ b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
@@ -1,15 +1,12 @@
---
title: Bulk assign and reclaim seats from users
description: The Bulk assign and reclaim seats from users operation returns reclaimed or assigned seats in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 99E2F37D-1FF3-4511-8969-19571656780A
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Bulk assign and reclaim seats from users
diff --git a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
index 4ce31253a5..dca0fac617 100644
--- a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
+++ b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
@@ -4,15 +4,12 @@ description: Bulk enrollment is an efficient way to set up a large number of dev
MS-HAID:
- 'p\_phdevicemgmt.bulk\_enrollment'
- 'p\_phDeviceMgmt.bulk\_enrollment\_using\_Windows\_provisioning\_tool'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: DEB98FF3-CC5C-47A1-9277-9EF939716C87
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/cellularsettings-csp.md b/windows/client-management/mdm/cellularsettings-csp.md
index 10e529e3a5..2eb3f56669 100644
--- a/windows/client-management/mdm/cellularsettings-csp.md
+++ b/windows/client-management/mdm/cellularsettings-csp.md
@@ -1,15 +1,12 @@
---
title: CellularSettings CSP
description: CellularSettings CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ce8b6f16-37ca-4aaf-98b0-306d12e326df
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CellularSettings CSP
diff --git a/windows/client-management/mdm/certificate-authentication-device-enrollment.md b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
index 367df2f366..06d6f265b6 100644
--- a/windows/client-management/mdm/certificate-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
@@ -1,15 +1,12 @@
---
title: Certificate authentication device enrollment
description: This section provides an example of the mobile device enrollment protocol using certificate authentication policy.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 57DB3C9E-E4C9-4275-AAB5-01315F9D3910
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Certificate authentication device enrollment
diff --git a/windows/client-management/mdm/certificate-renewal-windows-mdm.md b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
index 0bf2184006..03875bfea6 100644
--- a/windows/client-management/mdm/certificate-renewal-windows-mdm.md
+++ b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
@@ -4,15 +4,12 @@ description: The enrolled client certificate expires after a period of use.
MS-HAID:
- 'p\_phdevicemgmt.certificate\_renewal'
- 'p\_phDeviceMgmt.certificate\_renewal\_windows\_mdm'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F910C50C-FF67-40B0-AAB0-CA7CE02A9619
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Certificate Renewal
diff --git a/windows/client-management/mdm/certificatestore-csp.md b/windows/client-management/mdm/certificatestore-csp.md
index edb293593a..20bda706fb 100644
--- a/windows/client-management/mdm/certificatestore-csp.md
+++ b/windows/client-management/mdm/certificatestore-csp.md
@@ -1,15 +1,12 @@
---
title: CertificateStore CSP
description: CertificateStore CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 0fe28629-3cc3-42a0-91b3-3624c8462fd3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CertificateStore CSP
diff --git a/windows/client-management/mdm/certificatestore-ddf-file.md b/windows/client-management/mdm/certificatestore-ddf-file.md
index c13145b854..dce1073030 100644
--- a/windows/client-management/mdm/certificatestore-ddf-file.md
+++ b/windows/client-management/mdm/certificatestore-ddf-file.md
@@ -1,15 +1,12 @@
---
title: CertificateStore DDF file
description: This topic shows the OMA DM device description framework (DDF) for the CertificateStore configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D9A12D4E-3122-45C3-AD12-CC4FFAEC08B8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CertificateStore DDF file
diff --git a/windows/client-management/mdm/cleanpc-csp.md b/windows/client-management/mdm/cleanpc-csp.md
index f74ca54b1e..4f2d5cc211 100644
--- a/windows/client-management/mdm/cleanpc-csp.md
+++ b/windows/client-management/mdm/cleanpc-csp.md
@@ -1,14 +1,11 @@
---
title: CleanPC CSP
description: The CleanPC configuration service provider (CSP) allows removal of user-installed and pre-installed applications, with the option to persist user data. This CSP was added in Windows 10, version 1703.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CleanPC CSP
diff --git a/windows/client-management/mdm/cleanpc-ddf.md b/windows/client-management/mdm/cleanpc-ddf.md
index ffee599925..cfbd44cc65 100644
--- a/windows/client-management/mdm/cleanpc-ddf.md
+++ b/windows/client-management/mdm/cleanpc-ddf.md
@@ -1,15 +1,12 @@
---
title: CleanPC DDF
description: This topic shows the OMA DM device description framework (DDF) for the CleanPC configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A2182898-1577-4675-BAE5-2A3A9C2AAC9B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CleanPC DDF
diff --git a/windows/client-management/mdm/clientcertificateinstall-csp.md b/windows/client-management/mdm/clientcertificateinstall-csp.md
index 32c811f242..6391e50c7d 100644
--- a/windows/client-management/mdm/clientcertificateinstall-csp.md
+++ b/windows/client-management/mdm/clientcertificateinstall-csp.md
@@ -1,15 +1,12 @@
---
title: ClientCertificateInstall CSP
description: ClientCertificateInstall CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: B624EB73-2972-47F2-9D7E-826D641BF8A7
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ClientCertificateInstall CSP
diff --git a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
index ffc094694c..d94173af03 100644
--- a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
+++ b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
@@ -1,15 +1,12 @@
---
title: ClientCertificateInstall DDF file
description: ClientCertificateInstall DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7F65D045-A750-4CDE-A1CE-7D152AA060CA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ClientCertificateInstall DDF file
diff --git a/windows/client-management/mdm/cm-cellularentries-csp.md b/windows/client-management/mdm/cm-cellularentries-csp.md
index 49a14d9096..94a6e27f51 100644
--- a/windows/client-management/mdm/cm-cellularentries-csp.md
+++ b/windows/client-management/mdm/cm-cellularentries-csp.md
@@ -1,15 +1,12 @@
---
title: CM\_CellularEntries CSP
description: CM\_CellularEntries CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: f8dac9ef-b709-4b76-b6f5-34c2e6a3c847
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CM\_CellularEntries CSP
diff --git a/windows/client-management/mdm/cm-proxyentries-csp.md b/windows/client-management/mdm/cm-proxyentries-csp.md
index 0b449eaa36..693b4feb34 100644
--- a/windows/client-management/mdm/cm-proxyentries-csp.md
+++ b/windows/client-management/mdm/cm-proxyentries-csp.md
@@ -1,15 +1,12 @@
---
title: CM\_ProxyEntries CSP
description: CM\_ProxyEntries CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: f4c3dc71-c85a-4c68-9ce9-19f408ff7a0a
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CM\_ProxyEntries CSP
diff --git a/windows/client-management/mdm/cmpolicy-csp.md b/windows/client-management/mdm/cmpolicy-csp.md
index baacc5ed3d..e83953965b 100644
--- a/windows/client-management/mdm/cmpolicy-csp.md
+++ b/windows/client-management/mdm/cmpolicy-csp.md
@@ -1,15 +1,12 @@
---
title: CMPolicy CSP
description: CMPolicy CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 62623915-9747-4eb1-8027-449827b85e6b
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CMPolicy CSP
diff --git a/windows/client-management/mdm/cmpolicyenterprise-csp.md b/windows/client-management/mdm/cmpolicyenterprise-csp.md
index 93a0476d26..a3c9b663bf 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-csp.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-csp.md
@@ -1,15 +1,12 @@
---
title: CMPolicyEnterprise CSP
description: CMPolicyEnterprise CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A0BE3458-ABED-4F80-B467-F842157B94BF
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CMPolicyEnterprise CSP
diff --git a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
index 0b3d130038..6305ea17c3 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
@@ -1,15 +1,12 @@
---
title: CMPolicyEnterprise DDF file
description: CMPolicyEnterprise DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 065EF07A-0CF3-4EE5-B620-3464A75B7EED
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CMPolicyEnterprise DDF file
diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md
index a66594ccb7..f92fff6839 100644
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@@ -1,957 +1,2332 @@
---
title: Configuration service provider reference
description: A configuration service provider (CSP) is an interface to read, set, modify, or delete configuration settings on the device.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 71823658-951f-4163-9c40-c4d4adceaaec
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Configuration service provider reference
A configuration service provider (CSP) is an interface to read, set, modify, or delete configuration settings on the device. These settings map to registry keys or files. Some configuration service providers support the WAP format, some support SyncML, and some support both. SyncML is only used over–the–air for Open Mobile Alliance Device Management (OMA DM), whereas WAP can be used over–the–air for OMA Client Provisioning, or it can be included in the phone image as a .provxml file that is installed during boot.
-For information about the bridge WMI provider classes that map to these CSPs, see [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/hardware/dn905224). See the [list of CSPs supported in Windows Holographic](#hololens) and the [list of CSPs supported in Microsoft Surface Hub ](#surfacehubcspsupport) for additional information.
+For information about the bridge WMI provider classes that map to these CSPs, see [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/hardware/dn905224).
-The following table show the configuration service providers supported in Windows 10.
+Additional lists:
+- [List of CSPs supported in Windows Holographic](#hololens)
+- [List of CSPs supported in Microsoft Surface Hub ](#surfacehubcspsupport)
+- [List of CSPs supported in Windows 10 IoT Core](#iotcoresupport)
+- [List of CSPs supported in Windows 10 S](#windows10s)
-> [!Important]
-> To navigate the table horizontally, click on the table and then use the left and right scroll keys on your keyboard or use the scroll bar at the bottom of the table.
+The following tables show the configuration service providers support in Windows 10.
+
+
+
+## CSP support
+
+
+[APPLICATION CSP](application-csp.md)
+
+
+
+
+
+
+[ActiveSync CSP](activesync-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[AllJoynManagement CSP](alljoynmanagement-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[AppLocker CSP](applocker-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[AssignedAccess CSP](assignedaccess-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[BOOTSTRAP CSP](bootstrap-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[BitLocker CSP](bitlocker-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+
+
+
+
+
+
+
+[BrowserFavorite CSP](browserfavorite-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[CMPolicy CSP](cmpolicy-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[CMPolicyEnterprise CSP](cmpolicyenterprise-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+ 1 |
+ 1 |
+
+
+
+
+
+
+
+[CM_CellularEntries CSP](cm-cellularentries-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ 2 |
+ 2 |
+ |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[CM_ProxyEntries CSP](cm-proxyentries-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[CellularSettings CSP](cellularsettings-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ 2 |
+ 2 |
+ |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[CertificateStore CSP](certificatestore-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[CleanPC CSP](cleanpc-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ 2 |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[ClientCertificateInstall CSP](clientcertificateinstall-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[CustomDeviceUI CSP](customdeviceui-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DMAcc CSP](dmacc-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DMClient CSP](dmclient-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Defender CSP](defender-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DevDetail CSP](devdetail-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DevInfo CSP](devinfo-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DeveloperSetup CSP](developersetup-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DeviceInstanceService CSP](deviceinstanceservice-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DeviceLock CSP](devicelock-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DeviceManageability CSP](devicemanageability-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DeviceStatus CSP](devicestatus-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DiagnosticLog CSP](diagnosticlog-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[DynamicManagement CSP](dynamicmanagement-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+
+
+
+
+
+
+
+[EMAIL2 CSP](email2-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseAPN CSP](enterpriseapn-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ 2 |
+ 2 |
+ |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseAppManagement CSP](enterpriseappmanagement-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseAppVManagement CSP](enterpriseappvmanagement-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseAssignedAccess CSP](enterpriseassignedaccess-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseDataProtection CSP](enterprisedataprotection-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseDesktopAppManagement CSP](enterprisedesktopappmanagement-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseExt CSP](enterpriseext-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseExtFileSystem CSP](enterpriseextfilessystem-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[FileSystem CSP](filesystem-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+ (Provisioning only) |
+ (Provisioning only) |
+
+
+
+
+
+
+
+[HealthAttestation CSP](healthattestation-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[HotSpot CSP](hotspot-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Maps CSP](maps-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Messaging CSP](messaging-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+ 2 |
+ 2 |
+
+
+
+
+
+
+
+[NAP CSP](nap-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[NAPDEF CSP](napdef-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[NetworkProxy CSP](networkproxy-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+
+
+
+
+
+
+
+[NetworkQoSPolicy CSP](networkqospolicy-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[NodeCache CSP](nodecache-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Office CSP](office-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+ 2 |
+ 2 |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[PROXY CSP](proxy-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[PXLOGICAL CSP](pxlogical-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[PassportForWork CSP](passportforwork-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Personalization CSP](personalization-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+ 2 |
+ 2 |
+  |
+  |
+
+
+
+
+
+
+
+[Policy CSP](policy-configuration-service-provider.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[PolicyManager CSP](policymanager-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Provisioning CSP](provisioning-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ (Provisioning only) |
+ (Provisioning only) |
+ |
+ (Provisioning only) |
+ (Provisioning only) |
+ (Provisioning only) |
+ (Provisioning only) |
+
+
+
+
+
+
+
+[Reboot CSP](reboot-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Registry CSP](registry-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[RemoteFind CSP](remotefind-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[RemoteLock](remotelock-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[RemoteRing CSP](remotering-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[RemoteWipe CSP](remotewipe-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Reporting CSP](reporting-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[RootCATrustedCertificates CSP](rootcacertificates-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[SUPL CSP](supl-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[SecureAssessment CSP](secureassessment-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+ 1 |
+ |
+ 1 |
+ 1 |
+  |
+  |
+
+
+
+
+
+
+
+[SecurityPolicy CSP](securitypolicy-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[SharedPC CSP](sharedpc-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+ 1 |
+ |
+ 1 |
+ 1 |
+  |
+  |
+
+
+
+
+
+
+
+[Storage CSP](storage-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[SurfaceHub](surfacehub-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+[UnifiedWriteFilter CSP](unifiedwritefilter-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Update CSP](update-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[VPN CSP](vpn-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[VPNv2 CSP](vpnv2-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[W4 APPLICATION CSP](w4-application-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ |
+ |
+ |
+ |
+  |
+ |
+
+
+
+
+
+
+
+[WiFi CSP](wifi-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[Win32AppInventory CSP](win32appinventory-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+ 1 |
+ |
+ 1 |
+ 1 |
+  |
+  |
+
+
+
+
+
+
+
+[WindowsAdvancedThreatProtection CSP](windowsadvancedthreatprotection-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+ 1 |
+ |
+ 1 |
+ 1 |
+  |
+  |
+
+
+
+
+
+
+
+[WindowsLicensing CSP](windowslicensing-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[WindowsSecurityAuditing CSP](windowssecurityauditing-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+ |
+  |
+  |
+  |
+  |
+
+
+
+
+
+
+
+[w7 APPLICATION CSP](w7-application-csp.md)
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ |
+ |
+ |
+ |
+  |
+ |
+
+
+
+
+
+
+
+
+
Footnotes:
- 1 - Added in Windows 10, version 1607
@@ -1057,4 +2432,55 @@ Footnotes:
- [RootCATrustedCertificates CSP](rootcacertificates-csp.md)
- [Update CSP](update-csp.md)
- [VPNv2 CSP](vpnv2-csp.md)
-- [WiFi CSP](wifi-csp.md)
\ No newline at end of file
+- [WiFi CSP](wifi-csp.md)
+
+##
CSPs supported in Windows 10 S
+
+The CSPs supported in Windows 10 S is the same as in Windows 10 Pro except that Office CSP and EnterpriseDesktop CSP are not available in Windows 10 S. Here is the list:
+
+- [ActiveSync CSP](activesync-csp.md)
+- [APPLICATION CSP](application-csp.md)
+- [AppLocker CSP](applocker-csp.md)
+- [BOOTSTRAP CSP](bootstrap-csp.md)
+- [CellularSettings CSP](cellularsettings-csp.md)
+- [CertificateStore CSP](certificatestore-csp.md)
+- [ClientCertificateInstall CSP](clientcertificateinstall-csp.md)
+- [CM_CellularEntries CSP](cm-cellularentries-csp.md)
+- [Defender CSP](defender-csp.md)
+- [DevDetail CSP](devdetail-csp.md)
+- [DeviceManageability CSP](devicemanageability-csp.md)
+- [DeviceStatus CSP](devicestatus-csp.md)
+- [DevInfo CSP](devinfo-csp.md)
+- [DiagnosticLog CSP](diagnosticlog-csp.md)
+- [DMAcc CSP](dmacc-csp.md)
+- [DMClient CSP](dmclient-csp.md)
+- [EMAIL2 CSP](email2-csp.md)
+- [EnterpriseAPN CSP](enterpriseapn-csp.md)
+- [EnterpriseDataProtection CSP](enterprisedataprotection-csp.md)
+- [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md)
+- [HealthAttestation CSP](healthattestation-csp.md)
+- [NAP CSP](nap-csp.md)
+- [NAPDEF CSP](napdef-csp.md)
+- [NetworkProxy CSP](networkproxy-csp.md)
+- [NodeCache CSP](nodecache-csp.md)
+- [PassportForWork CSP](passportforwork-csp.md)
+- [Policy CSP](policy-configuration-service-provider.md)
+- [Provisioning CSP](provisioning-csp.md)
+- [PROXY CSP](proxy-csp.md)
+- [PXLOGICAL CSP](pxlogical-csp.md)
+- [Reboot CSP](reboot-csp.md)
+- [RemoteFind CSP](remotefind-csp.md)
+- [RemoteWipe CSP](remotewipe-csp.md)
+- [Reporting CSP](reporting-csp.md)
+- [RootCATrustedCertificates CSP](rootcacertificates-csp.md)
+- [SecureAssessment CSP](secureassessment-csp.md)
+- [SecurityPolicy CSP](securitypolicy-csp.md)
+- [SharedPC CSP](sharedpc-csp.md)
+- [Storage CSP](storage-csp.md)
+- [SUPL CSP](supl-csp.md)
+- [Update CSP](update-csp.md)
+- [VPNv2 CSP](vpnv2-csp.md)
+- [WiFi CSP](wifi-csp.md)
+- [Win32AppInventory CSP](win32appinventory-csp.md)
+- [WindowsAdvancedThreatProtection CSP](windowsadvancedthreatprotection-csp.md)
+- [WindowsLicensing CSP](windowslicensing-csp.md)
diff --git a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
index c2611732f7..1d424f8364 100644
--- a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
+++ b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
@@ -1,15 +1,12 @@
---
title: Create a custom configuration service provider
description: Create a custom configuration service provider
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 0cb37f03-5bf2-4451-8276-23f4a1dee33f
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Create a custom configuration service provider
diff --git a/windows/client-management/mdm/customdeviceui-csp.md b/windows/client-management/mdm/customdeviceui-csp.md
index 383d5c9222..955159f333 100644
--- a/windows/client-management/mdm/customdeviceui-csp.md
+++ b/windows/client-management/mdm/customdeviceui-csp.md
@@ -1,15 +1,12 @@
---
title: CustomDeviceUI CSP
description: CustomDeviceUI CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 20ED1867-7B9E-4455-B397-53B8B15C95A3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CustomDeviceUI CSP
diff --git a/windows/client-management/mdm/customdeviceui-ddf.md b/windows/client-management/mdm/customdeviceui-ddf.md
index 062cbc615c..d44a97a49e 100644
--- a/windows/client-management/mdm/customdeviceui-ddf.md
+++ b/windows/client-management/mdm/customdeviceui-ddf.md
@@ -1,15 +1,12 @@
---
title: CustomDeviceUI DDF
description: CustomDeviceUI DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E6D6B902-C57C-48A6-9654-CCBA3898455E
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# CustomDeviceUI DDF
diff --git a/windows/client-management/mdm/data-structures-windows-store-for-business.md b/windows/client-management/mdm/data-structures-windows-store-for-business.md
index 0232b01dbe..18b093df38 100644
--- a/windows/client-management/mdm/data-structures-windows-store-for-business.md
+++ b/windows/client-management/mdm/data-structures-windows-store-for-business.md
@@ -3,16 +3,13 @@ title: Data structures for Windows Store for Business
MS-HAID:
- 'p\_phdevicemgmt.business\_store\_data\_structures'
- 'p\_phDeviceMgmt.data\_structures\_windows\_store\_for\_business'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ABE44EC8-CBE5-4775-BA8A-4564CB73531B
description:
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Data structures for Windows Store for Business
diff --git a/windows/client-management/mdm/defender-csp.md b/windows/client-management/mdm/defender-csp.md
index 4bd4c9f828..71e91e480e 100644
--- a/windows/client-management/mdm/defender-csp.md
+++ b/windows/client-management/mdm/defender-csp.md
@@ -1,15 +1,12 @@
---
title: Defender CSP
description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Defender CSP
diff --git a/windows/client-management/mdm/defender-ddf.md b/windows/client-management/mdm/defender-ddf.md
index 007b3ddb41..f6856761c6 100644
--- a/windows/client-management/mdm/defender-ddf.md
+++ b/windows/client-management/mdm/defender-ddf.md
@@ -1,15 +1,12 @@
---
title: Defender DDF file
description: Defender DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 39B9E6CF-4857-4199-B3C3-EC740A439F65
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Defender DDF file
diff --git a/windows/client-management/mdm/design-a-custom-windows-csp.md b/windows/client-management/mdm/design-a-custom-windows-csp.md
index a774358ba9..ed969ccbee 100644
--- a/windows/client-management/mdm/design-a-custom-windows-csp.md
+++ b/windows/client-management/mdm/design-a-custom-windows-csp.md
@@ -4,15 +4,12 @@ description: Design a custom configuration service provider
MS-HAID:
- 'p\_phDeviceMgmt.designing\_a\_custom\_configuration\_service\_provider'
- 'p\_phDeviceMgmt.design\_a\_custom\_windows\_csp'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 0fff9516-a71a-4036-a57b-503ef1a81a37
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Design a custom configuration service provider
diff --git a/windows/client-management/mdm/devdetail-csp.md b/windows/client-management/mdm/devdetail-csp.md
index 7995dfe17d..40ee770991 100644
--- a/windows/client-management/mdm/devdetail-csp.md
+++ b/windows/client-management/mdm/devdetail-csp.md
@@ -1,15 +1,12 @@
---
title: DevDetail CSP
description: DevDetail CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 719bbd2d-508d-439b-b175-0874c7e6c360
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DevDetail CSP
diff --git a/windows/client-management/mdm/devdetail-ddf-file.md b/windows/client-management/mdm/devdetail-ddf-file.md
index 44978a8d9f..e7fbbcac7a 100644
--- a/windows/client-management/mdm/devdetail-ddf-file.md
+++ b/windows/client-management/mdm/devdetail-ddf-file.md
@@ -1,15 +1,12 @@
---
title: DevDetail DDF file
description: DevDetail DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 645fc2b5-2d2c-43b1-9058-26bedbe9f00d
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DevDetail DDF file
diff --git a/windows/client-management/mdm/developersetup-csp.md b/windows/client-management/mdm/developersetup-csp.md
index 2d0adc299e..1a00b5f67c 100644
--- a/windows/client-management/mdm/developersetup-csp.md
+++ b/windows/client-management/mdm/developersetup-csp.md
@@ -1,15 +1,12 @@
---
title: DeveloperSetup CSP
description: The DeveloperSetup configuration service provider (CSP) is used to configure developer mode on the device. This CSP was added in the next major update of Windows 10.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid:
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeveloperSetup CSP
diff --git a/windows/client-management/mdm/developersetup-ddf.md b/windows/client-management/mdm/developersetup-ddf.md
index b5f6b24d0a..b9a3348cca 100644
--- a/windows/client-management/mdm/developersetup-ddf.md
+++ b/windows/client-management/mdm/developersetup-ddf.md
@@ -1,15 +1,12 @@
---
title: DeveloperSetup DDF file
description: This topic shows the OMA DM device description framework (DDF) for the DeveloperSetup configuration service provider. This CSP was added in Windows 10, version 1703.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid:
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeveloperSetup DDF file
diff --git a/windows/client-management/mdm/device-update-management.md b/windows/client-management/mdm/device-update-management.md
index 4b038d4122..724d2abe69 100644
--- a/windows/client-management/mdm/device-update-management.md
+++ b/windows/client-management/mdm/device-update-management.md
@@ -1,15 +1,12 @@
---
title: Device update management
description: In the current device landscape of PC, tablets, phones, and IoT devices, the Mobile Device Management (MDM) solutions are becoming prevalent as a lightweight device management technology.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: C27BAEE7-2890-4FB7-9549-A6EACC790777
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/deviceinstanceservice-csp.md b/windows/client-management/mdm/deviceinstanceservice-csp.md
index d79ad2c02d..55339fb966 100644
--- a/windows/client-management/mdm/deviceinstanceservice-csp.md
+++ b/windows/client-management/mdm/deviceinstanceservice-csp.md
@@ -1,15 +1,12 @@
---
title: DeviceInstanceService CSP
description: DeviceInstanceService CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: f113b6bb-6ce1-45ad-b725-1b6610721e2d
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceInstanceService CSP
diff --git a/windows/client-management/mdm/devicelock-csp.md b/windows/client-management/mdm/devicelock-csp.md
index 38770ab2e9..47a36d95c3 100644
--- a/windows/client-management/mdm/devicelock-csp.md
+++ b/windows/client-management/mdm/devicelock-csp.md
@@ -1,15 +1,12 @@
---
title: DeviceLock CSP
description: DeviceLock CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9a547efb-738e-4677-95d3-5506d350d8ab
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceLock CSP
diff --git a/windows/client-management/mdm/devicelock-ddf-file.md b/windows/client-management/mdm/devicelock-ddf-file.md
index b5e4ffdda4..466bcbbf38 100644
--- a/windows/client-management/mdm/devicelock-ddf-file.md
+++ b/windows/client-management/mdm/devicelock-ddf-file.md
@@ -1,15 +1,12 @@
---
title: DeviceLock DDF file
description: DeviceLock DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 46a691b9-6350-4987-bfc7-f8b1eece3ad9
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceLock DDF file
diff --git a/windows/client-management/mdm/devicemanageability-csp.md b/windows/client-management/mdm/devicemanageability-csp.md
index 32076d5301..8adc363d59 100644
--- a/windows/client-management/mdm/devicemanageability-csp.md
+++ b/windows/client-management/mdm/devicemanageability-csp.md
@@ -1,15 +1,12 @@
---
title: DeviceManageability CSP
description: The DeviceManageability configuration service provider (CSP) is used retrieve the general information about MDM configuration capabilities on the device. This CSP was added in Windows 10, version 1607.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: FE563221-D5B5-4EFD-9B60-44FE4066B0D2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceManageability CSP
diff --git a/windows/client-management/mdm/devicemanageability-ddf.md b/windows/client-management/mdm/devicemanageability-ddf.md
index e09aa33beb..1adb50855e 100644
--- a/windows/client-management/mdm/devicemanageability-ddf.md
+++ b/windows/client-management/mdm/devicemanageability-ddf.md
@@ -1,15 +1,12 @@
---
title: DeviceManageability DDF
description: This topic shows the OMA DM device description framework (DDF) for the DeviceManageability configuration service provider. This CSP was added in Windows 10, version 1607.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D7FA8D51-95ED-40D2-AA84-DCC4BBC393AB
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceManageability DDF
diff --git a/windows/client-management/mdm/devicestatus-csp.md b/windows/client-management/mdm/devicestatus-csp.md
index 5402d8bf31..e89043b5c1 100644
--- a/windows/client-management/mdm/devicestatus-csp.md
+++ b/windows/client-management/mdm/devicestatus-csp.md
@@ -1,15 +1,12 @@
---
title: DeviceStatus CSP
description: The DeviceStatus configuration service provider is used by the enterprise to keep track of device inventory and query the state of compliance of these devices with their enterprise policies.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 039B2010-9290-4A6E-B77B-B2469B482360
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceStatus CSP
diff --git a/windows/client-management/mdm/devicestatus-ddf.md b/windows/client-management/mdm/devicestatus-ddf.md
index 54ca1a523e..b0e6ad935c 100644
--- a/windows/client-management/mdm/devicestatus-ddf.md
+++ b/windows/client-management/mdm/devicestatus-ddf.md
@@ -1,15 +1,12 @@
---
title: DeviceStatus DDF
description: This topic shows the OMA DM device description framework (DDF) for the DeviceStatus configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 780DC6B4-48A5-4F74-9F2E-6E0D88902A45
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DeviceStatus DDF
diff --git a/windows/client-management/mdm/devinfo-csp.md b/windows/client-management/mdm/devinfo-csp.md
index 221125f2b6..b11d4a12cf 100644
--- a/windows/client-management/mdm/devinfo-csp.md
+++ b/windows/client-management/mdm/devinfo-csp.md
@@ -1,15 +1,12 @@
---
title: DevInfo CSP
description: DevInfo CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: d3eb70db-1ce9-4c72-a13d-651137c1713c
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DevInfo CSP
diff --git a/windows/client-management/mdm/devinfo-ddf-file.md b/windows/client-management/mdm/devinfo-ddf-file.md
index 8e41569f6f..0ee45fd363 100644
--- a/windows/client-management/mdm/devinfo-ddf-file.md
+++ b/windows/client-management/mdm/devinfo-ddf-file.md
@@ -1,15 +1,12 @@
---
title: DevInfo DDF file
description: DevInfo DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: beb07cc6-4133-4c0f-aa05-64db2b4a004f
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DevInfo DDF file
diff --git a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
index b64b4d7e22..d4c94639bd 100644
--- a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
+++ b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
@@ -1,15 +1,12 @@
---
title: Diagnose MDM failures in Windows 10
description: To help diagnose enrollment or device management issues in Windows 10 devices managed by an MDM server, you can examine the MDM logs collected from the desktop or mobile device. The following sections describe the procedures for collecting MDM logs.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 12D8263B-D839-4B19-9346-31E0CDD0CBF9
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Diagnose MDM failures in Windows 10
diff --git a/windows/client-management/mdm/diagnosticlog-csp.md b/windows/client-management/mdm/diagnosticlog-csp.md
index 9ca2099bf6..da0d026cab 100644
--- a/windows/client-management/mdm/diagnosticlog-csp.md
+++ b/windows/client-management/mdm/diagnosticlog-csp.md
@@ -1,15 +1,12 @@
---
title: DiagnosticLog CSP
description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DiagnosticLog CSP
diff --git a/windows/client-management/mdm/diagnosticlog-ddf.md b/windows/client-management/mdm/diagnosticlog-ddf.md
index eac5538d83..48154f0bad 100644
--- a/windows/client-management/mdm/diagnosticlog-ddf.md
+++ b/windows/client-management/mdm/diagnosticlog-ddf.md
@@ -1,15 +1,12 @@
---
title: DiagnosticLog DDF
description: DiagnosticLog DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9DD75EDA-5913-45B4-9BED-20E30CDEBE16
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DiagnosticLog DDF
diff --git a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
index f9d18d62b9..29889b69f1 100644
--- a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
+++ b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
@@ -4,15 +4,12 @@ description: Disconnecting may be initiated either locally by the user from the
MS-HAID:
- 'p\_phdevicemgmt.disconnecting\_from\_the\_management\_infrastructure\_\_unenrollment\_'
- 'p\_phDeviceMgmt.disconnecting\_from\_mdm\_unenrollment'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 33B2B248-631B-451F-B534-5DA095C4C8E8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/dmacc-csp.md b/windows/client-management/mdm/dmacc-csp.md
index d88c945408..df7701702a 100644
--- a/windows/client-management/mdm/dmacc-csp.md
+++ b/windows/client-management/mdm/dmacc-csp.md
@@ -1,15 +1,12 @@
---
title: DMAcc CSP
description: DMAcc CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 43e73d8a-6617-44e7-8459-5c96f4422e63
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMAcc CSP
diff --git a/windows/client-management/mdm/dmacc-ddf-file.md b/windows/client-management/mdm/dmacc-ddf-file.md
index ec803dc8cc..dbca78b881 100644
--- a/windows/client-management/mdm/dmacc-ddf-file.md
+++ b/windows/client-management/mdm/dmacc-ddf-file.md
@@ -1,15 +1,12 @@
---
title: DMAcc DDF file
description: DMAcc DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 44dc99aa-2a85-498b-8f52-a81863765606
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMAcc DDF file
diff --git a/windows/client-management/mdm/dmclient-csp.md b/windows/client-management/mdm/dmclient-csp.md
index ef09308e53..59c7ae444e 100644
--- a/windows/client-management/mdm/dmclient-csp.md
+++ b/windows/client-management/mdm/dmclient-csp.md
@@ -1,15 +1,12 @@
---
title: DMClient CSP
description: The DMClient configuration service provider is used to specify additional enterprise-specific mobile device management configuration settings for identifying the device in the enterprise domain, security mitigation for certificate renewal, and server-triggered enterprise unenrollment.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: a5cf35d9-ced0-4087-a247-225f102f2544
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMClient CSP
diff --git a/windows/client-management/mdm/dmclient-ddf-file.md b/windows/client-management/mdm/dmclient-ddf-file.md
index 1e585b2aae..85bc763412 100644
--- a/windows/client-management/mdm/dmclient-ddf-file.md
+++ b/windows/client-management/mdm/dmclient-ddf-file.md
@@ -1,15 +1,12 @@
---
title: DMClient DDF file
description: DMClient DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A21B33AF-DB76-4059-8170-FADF2CB898A0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMClient DDF file
diff --git a/windows/client-management/mdm/dmprocessconfigxmlfiltered.md b/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
index b4cb648b0b..c78e43cc7d 100644
--- a/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
+++ b/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
@@ -1,9 +1,6 @@
---
title: DMProcessConfigXMLFiltered function
description: Configures phone settings by using OMA Client Provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
Search.Refinement.TopicID: 184
ms.assetid: 31D79901-6206-454C-AE78-9B85A3B3487F
keywords: ["DMProcessConfigXMLFiltered function"]
@@ -15,11 +12,11 @@ api_location:
- dmprocessxmlfiltered.dll
api_type:
- DllExport
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMProcessConfigXMLFiltered function
diff --git a/windows/client-management/mdm/dmsessionactions-csp.md b/windows/client-management/mdm/dmsessionactions-csp.md
index ac58e9d890..17fa2ec201 100644
--- a/windows/client-management/mdm/dmsessionactions-csp.md
+++ b/windows/client-management/mdm/dmsessionactions-csp.md
@@ -1,14 +1,11 @@
---
title: DMSessionActions CSP
description: DMSessionActions CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMSessionActions CSP
diff --git a/windows/client-management/mdm/dmsessionactions-ddf.md b/windows/client-management/mdm/dmsessionactions-ddf.md
index 02f826d653..1983b804cc 100644
--- a/windows/client-management/mdm/dmsessionactions-ddf.md
+++ b/windows/client-management/mdm/dmsessionactions-ddf.md
@@ -1,14 +1,11 @@
---
title: DMSessionActions DDF file
description: DMSessionActions DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DMSessionActions DDF file
diff --git a/windows/client-management/mdm/dynamicmanagement-csp.md b/windows/client-management/mdm/dynamicmanagement-csp.md
index 0d1719a0f7..b0a286169f 100644
--- a/windows/client-management/mdm/dynamicmanagement-csp.md
+++ b/windows/client-management/mdm/dynamicmanagement-csp.md
@@ -1,14 +1,11 @@
---
title: DynamicManagement CSP
description: DynamicManagement CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DynamicManagement CSP
diff --git a/windows/client-management/mdm/dynamicmanagement-ddf.md b/windows/client-management/mdm/dynamicmanagement-ddf.md
index 85d5d0d84d..c1b15243de 100644
--- a/windows/client-management/mdm/dynamicmanagement-ddf.md
+++ b/windows/client-management/mdm/dynamicmanagement-ddf.md
@@ -1,15 +1,12 @@
---
title: DynamicManagement DDF file
description: DynamicManagement DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7e266db0-2fd9-4412-b428-4550f41a1738
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# DynamicManagement DDF file
diff --git a/windows/client-management/mdm/eap-configuration.md b/windows/client-management/mdm/eap-configuration.md
index 73dba1be35..23d7112ba0 100644
--- a/windows/client-management/mdm/eap-configuration.md
+++ b/windows/client-management/mdm/eap-configuration.md
@@ -1,15 +1,12 @@
---
title: EAP configuration
description: The topic provides a step-by-step guide for creating an Extensible Authentication Protocol (EAP) configuration XML for the VPN profile and information about EAP certificate filtering in Windows 10.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: DD3F2292-4B4C-4430-A57F-922FED2A8FAE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EAP configuration
diff --git a/windows/client-management/mdm/email2-csp.md b/windows/client-management/mdm/email2-csp.md
index 0447cef4b7..54fe0d1273 100644
--- a/windows/client-management/mdm/email2-csp.md
+++ b/windows/client-management/mdm/email2-csp.md
@@ -1,15 +1,12 @@
---
title: EMAIL2 CSP
description: EMAIL2 CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: bcfc9d98-bc2e-42c6-9b81-0b5bf65ce2b8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EMAIL2 CSP
diff --git a/windows/client-management/mdm/email2-ddf-file.md b/windows/client-management/mdm/email2-ddf-file.md
index c43030646c..58614e459a 100644
--- a/windows/client-management/mdm/email2-ddf-file.md
+++ b/windows/client-management/mdm/email2-ddf-file.md
@@ -1,15 +1,12 @@
---
title: EMAIL2 DDF file
description: EMAIL2 DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7e266db0-2fd9-4412-b428-4550f41a1738
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EMAIL2 DDF file
diff --git a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
index 3ba2111904..6fc5284a64 100644
--- a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
+++ b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
@@ -1,15 +1,12 @@
---
title: Enable offline upgrades to Windows 10 for Windows Embedded 8.1 Handheld devices
description: Like any Windows devices, Windows 10 Mobile devices use Microsoft Update by default to download updates over the Internet.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ED3DAF80-847C-462B-BDB1-486577906772
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Enable offline upgrades to Windows 10 for Windows Embedded 8.1 Handheld devices
diff --git a/windows/client-management/mdm/enterprise-app-management.md b/windows/client-management/mdm/enterprise-app-management.md
index 39b6750b5c..d6b71a088d 100644
--- a/windows/client-management/mdm/enterprise-app-management.md
+++ b/windows/client-management/mdm/enterprise-app-management.md
@@ -1,15 +1,12 @@
---
title: Enterprise app management
description: This topic covers one of the key mobile device management (MDM) features in Windows 10 for managing the lifecycle of apps across all of Windows.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 225DEE61-C3E3-4F75-BC79-5068759DFE99
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Enterprise app management
diff --git a/windows/client-management/mdm/enterpriseapn-csp.md b/windows/client-management/mdm/enterpriseapn-csp.md
index b68a89083d..c61db977e9 100644
--- a/windows/client-management/mdm/enterpriseapn-csp.md
+++ b/windows/client-management/mdm/enterpriseapn-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseAPN CSP
description: The EnterpriseAPN configuration service provider is used by the enterprise to provision an APN for the Internet.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E125F6A5-EE44-41B1-A8CC-DF295082E6B2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAPN CSP
diff --git a/windows/client-management/mdm/enterpriseapn-ddf.md b/windows/client-management/mdm/enterpriseapn-ddf.md
index 80ddc0cd38..8d656ebb72 100644
--- a/windows/client-management/mdm/enterpriseapn-ddf.md
+++ b/windows/client-management/mdm/enterpriseapn-ddf.md
@@ -1,15 +1,12 @@
---
title: EnterpriseAPN DDF
description: EnterpriseAPN DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A953ADEF-4523-425F-926C-48DA62EB9E21
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAPN DDF
diff --git a/windows/client-management/mdm/enterpriseappmanagement-csp.md b/windows/client-management/mdm/enterpriseappmanagement-csp.md
index bc20aed7de..4067c76438 100644
--- a/windows/client-management/mdm/enterpriseappmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappmanagement-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseAppManagement CSP
description: EnterpriseAppManagement CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 698b8bf4-652e-474b-97e4-381031357623
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAppManagement CSP
diff --git a/windows/client-management/mdm/enterpriseappvmanagement-csp.md b/windows/client-management/mdm/enterpriseappvmanagement-csp.md
index 18fc2e083f..17b4288eb5 100644
--- a/windows/client-management/mdm/enterpriseappvmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappvmanagement-csp.md
@@ -1,14 +1,11 @@
---
title: EnterpriseAppVManagement CSP
description: EnterpriseAppVManagement CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAppVManagement CSP
diff --git a/windows/client-management/mdm/enterpriseappvmanagement-ddf.md b/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
index 05d5811f5b..19c14ddfc4 100644
--- a/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
+++ b/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
@@ -1,14 +1,11 @@
---
title: EnterpriseAppVManagement DDF file
description: EnterpriseAppVManagement DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAppVManagement DDF file
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-csp.md b/windows/client-management/mdm/enterpriseassignedaccess-csp.md
index 36a8f79379..069a8486f3 100644
--- a/windows/client-management/mdm/enterpriseassignedaccess-csp.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseAssignedAccess CSP
description: EnterpriseAssignedAccess CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5F88E567-77AA-4822-A0BC-3B31100639AA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAssignedAccess CSP
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md b/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
index 8612e7474d..f98ed740fe 100644
--- a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
@@ -1,15 +1,12 @@
---
title: EnterpriseAssignedAccess DDF
description: EnterpriseAssignedAccess DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 8BD6FB05-E643-4695-99A2-633995884B37
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAssignedAccess DDF
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md b/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
index f1ca1209d9..6d19a5aedd 100644
--- a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
@@ -1,15 +1,12 @@
---
title: EnterpriseAssignedAccess XSD
description: EnterpriseAssignedAccess XSD
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: BB3B633E-E361-4B95-9D4A-CE6E08D67ADA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseAssignedAccess XSD
diff --git a/windows/client-management/mdm/enterprisedataprotection-csp.md b/windows/client-management/mdm/enterprisedataprotection-csp.md
index 4f92f7850b..d75ed17826 100644
--- a/windows/client-management/mdm/enterprisedataprotection-csp.md
+++ b/windows/client-management/mdm/enterprisedataprotection-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseDataProtection CSP
description: The EnterpriseDataProtection configuration service provider (CSP) is used to configure Windows Information Protection (WIP) (formerly known as Enterprise Data Protection) specific settings.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E2D4467F-A154-4C00-9208-7798EF3E25B3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseDataProtection CSP
diff --git a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
index 496f553310..a7914046b2 100644
--- a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
@@ -1,15 +1,12 @@
---
title: EnterpriseDataProtection DDF file
description: The following topic shows the OMA DM device description framework (DDF) for the EnterpriseDataProtection configuration service provider.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: C6427C52-76F9-4EE0-98F9-DE278529D459
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseDataProtection DDF file
diff --git a/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md b/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
index d3bdfb8e84..bc056caa35 100644
--- a/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseDesktopAppManagement CSP
description: The EnterpriseDesktopAppManagement configuration service provider is used to handle enterprise desktop application management tasks, such as querying installed enterprise applications, installing applications, or removing applications.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 2BFF7491-BB01-41BA-9A22-AB209EE59FC5
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseDesktopAppManagement CSP
diff --git a/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md b/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
index 3b4164d39c..5bd96246ec 100644
--- a/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
@@ -1,15 +1,12 @@
---
title: EnterpriseDesktopAppManagement DDF
description: This topic shows the OMA DM device description framework (DDF) for the EnterpriseDesktopAppManagement configuration service provider.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: EF448602-65AC-4D59-A0E8-779876542FE3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseDesktopAppManagement DDF
diff --git a/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md b/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
index bb50c5d323..d5e415b890 100644
--- a/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
@@ -1,15 +1,12 @@
---
title: EnterpriseDesktopAppManagement XSD
description: This topic contains the XSD schema file for the EnterpriseDesktopAppManagement configuration service provider’s DownloadInstall parameter.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 60980257-4F48-4A68-8E8E-1EF0A3F090E2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseDesktopAppManagement XSD
diff --git a/windows/client-management/mdm/enterpriseext-csp.md b/windows/client-management/mdm/enterpriseext-csp.md
index 867a193685..2bb98165d4 100644
--- a/windows/client-management/mdm/enterpriseext-csp.md
+++ b/windows/client-management/mdm/enterpriseext-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseExt CSP
description: EnterpriseExt CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ACA5CD79-BBD5-4DD1-86DA-0285B93982BD
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseExt CSP
diff --git a/windows/client-management/mdm/enterpriseext-ddf.md b/windows/client-management/mdm/enterpriseext-ddf.md
index 76b9534272..06bc4c0198 100644
--- a/windows/client-management/mdm/enterpriseext-ddf.md
+++ b/windows/client-management/mdm/enterpriseext-ddf.md
@@ -1,15 +1,12 @@
---
title: EnterpriseExt DDF
description: EnterpriseExt DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 71BF81D4-FBEC-4B03-BF99-F7A5EDD4F91B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseExt DDF
diff --git a/windows/client-management/mdm/enterpriseextfilessystem-csp.md b/windows/client-management/mdm/enterpriseextfilessystem-csp.md
index 9cc709a3a7..f6b332a182 100644
--- a/windows/client-management/mdm/enterpriseextfilessystem-csp.md
+++ b/windows/client-management/mdm/enterpriseextfilessystem-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseExtFileSystem CSP
description: EnterpriseExtFileSystem CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F773AD72-A800-481A-A9E2-899BA56F4426
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseExtFileSystem CSP
diff --git a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md b/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
index 14ac906b77..dc371ba33a 100644
--- a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
+++ b/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
@@ -1,15 +1,12 @@
---
title: EnterpriseExtFileSystem DDF
description: EnterpriseExtFileSystem DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 2D292E4B-15EE-4AEB-8884-6FEE8B92D2D1
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseExtFileSystem DDF
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
index 85be2efaa7..23fea75c17 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
@@ -1,15 +1,12 @@
---
title: EnterpriseModernAppManagement CSP
description: EnterpriseModernAppManagement CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9DD0741A-A229-41A0-A85A-93E185207C42
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseModernAppManagement CSP
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md b/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
index 18c8f75db8..4da9c4b384 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
@@ -1,15 +1,12 @@
---
title: EnterpriseModernAppManagement DDF
description: EnterpriseModernAppManagement DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid:
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseModernAppManagement DDF
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md b/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
index eb5fdeb742..74d0c2cb31 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
@@ -1,15 +1,12 @@
---
title: EnterpriseModernAppManagement XSD
description: Here is the XSD for the application parameters.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D393D094-25E5-4E66-A60F-B59CC312BF57
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# EnterpriseModernAppManagement XSD
diff --git a/windows/client-management/mdm/federated-authentication-device-enrollment.md b/windows/client-management/mdm/federated-authentication-device-enrollment.md
index 188c3894f9..4855aaefd7 100644
--- a/windows/client-management/mdm/federated-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/federated-authentication-device-enrollment.md
@@ -1,15 +1,12 @@
---
title: Federated authentication device enrollment
description: This section provides an example of the mobile device enrollment protocol using federated authentication policy.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 049ECA6E-1AF5-4CB2-8F1C-A5F22D722DAA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Federated authentication device enrollment
diff --git a/windows/client-management/mdm/filesystem-csp.md b/windows/client-management/mdm/filesystem-csp.md
index 569737c50a..7b22236bf3 100644
--- a/windows/client-management/mdm/filesystem-csp.md
+++ b/windows/client-management/mdm/filesystem-csp.md
@@ -1,15 +1,12 @@
---
title: FileSystem CSP
description: FileSystem CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9117ee16-ca7a-4efa-9270-c9ac8547e541
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# FileSystem CSP
diff --git a/windows/client-management/mdm/get-inventory.md b/windows/client-management/mdm/get-inventory.md
index 8305769663..405f3c7a29 100644
--- a/windows/client-management/mdm/get-inventory.md
+++ b/windows/client-management/mdm/get-inventory.md
@@ -4,15 +4,12 @@ description: The Get Inventory operation retrieves information from the Windows
MS-HAID:
- 'p\_phdevicemgmt.get\_seatblock'
- 'p\_phDeviceMgmt.get\_inventory'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: C5485722-FC49-4358-A097-74169B204E74
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get Inventory
diff --git a/windows/client-management/mdm/get-localized-product-details.md b/windows/client-management/mdm/get-localized-product-details.md
index d9ef11678f..16f29cb848 100644
--- a/windows/client-management/mdm/get-localized-product-details.md
+++ b/windows/client-management/mdm/get-localized-product-details.md
@@ -1,15 +1,12 @@
---
title: Get localized product details
description: The Get localized product details operation retrieves the localization information of a product from the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: EF6AFCA9-8699-46C9-A3BB-CD2750C07901
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get localized product details
diff --git a/windows/client-management/mdm/get-offline-license.md b/windows/client-management/mdm/get-offline-license.md
index 8877b2cf4e..cf3a27b38c 100644
--- a/windows/client-management/mdm/get-offline-license.md
+++ b/windows/client-management/mdm/get-offline-license.md
@@ -1,15 +1,12 @@
---
title: Get offline license
description: The Get offline license operation retrieves the offline license information of a product from the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 08DAD813-CF4D-42D6-A783-994A03AEE051
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get offline license
diff --git a/windows/client-management/mdm/get-product-details.md b/windows/client-management/mdm/get-product-details.md
index c05f6502b7..c602332f9b 100644
--- a/windows/client-management/mdm/get-product-details.md
+++ b/windows/client-management/mdm/get-product-details.md
@@ -1,15 +1,12 @@
---
title: Get product details
description: The Get product details operation retrieves the product information from the Windows Store for Business for a specific application.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: BC432EBA-CE5E-43BD-BD54-942774767286
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get product details
diff --git a/windows/client-management/mdm/get-product-package.md b/windows/client-management/mdm/get-product-package.md
index 448c3933a2..ef80b65d3b 100644
--- a/windows/client-management/mdm/get-product-package.md
+++ b/windows/client-management/mdm/get-product-package.md
@@ -1,15 +1,12 @@
---
title: Get product package
description: The Get product package operation retrieves the information about a specific application in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4314C65E-6DDC-405C-A591-D66F799A341F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get product package
diff --git a/windows/client-management/mdm/get-product-packages.md b/windows/client-management/mdm/get-product-packages.md
index 448a755ac2..24d354e7c2 100644
--- a/windows/client-management/mdm/get-product-packages.md
+++ b/windows/client-management/mdm/get-product-packages.md
@@ -1,15 +1,12 @@
---
title: Get product packages
description: The Get product packages operation retrieves the information about applications in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 039468BF-B9EE-4E1C-810C-9ACDD55C0835
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get product packages
diff --git a/windows/client-management/mdm/get-seat.md b/windows/client-management/mdm/get-seat.md
index 2d24e0e3ab..301be7db93 100644
--- a/windows/client-management/mdm/get-seat.md
+++ b/windows/client-management/mdm/get-seat.md
@@ -1,15 +1,12 @@
---
title: Get seat
description: The Get seat operation retrieves the information about an active seat for a specified user in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 715BAEB2-79FD-4945-A57F-482F9E7D07C6
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get seat
diff --git a/windows/client-management/mdm/get-seats-assigned-to-a-user.md b/windows/client-management/mdm/get-seats-assigned-to-a-user.md
index b755a4fc0f..77e13c0706 100644
--- a/windows/client-management/mdm/get-seats-assigned-to-a-user.md
+++ b/windows/client-management/mdm/get-seats-assigned-to-a-user.md
@@ -1,15 +1,12 @@
---
title: Get seats assigned to a user
description: The Get seats assigned to a user operation retrieves information about assigned seats in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: CB963E44-8C7C-46F9-A979-89BBB376172B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get seats assigned to a user
diff --git a/windows/client-management/mdm/get-seats.md b/windows/client-management/mdm/get-seats.md
index ba26bb6f6b..1e5fbe93dd 100644
--- a/windows/client-management/mdm/get-seats.md
+++ b/windows/client-management/mdm/get-seats.md
@@ -1,15 +1,12 @@
---
title: Get seats
description: The Get seats operation retrieves the information about active seats in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 32945788-47AC-4259-B616-F359D48F4F2F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Get seats
diff --git a/windows/client-management/mdm/healthattestation-csp.md b/windows/client-management/mdm/healthattestation-csp.md
index 6eb645cf52..fb44d96773 100644
--- a/windows/client-management/mdm/healthattestation-csp.md
+++ b/windows/client-management/mdm/healthattestation-csp.md
@@ -1,15 +1,12 @@
---
title: Device HealthAttestation CSP
description: Device HealthAttestation CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 6F2D783C-F6B4-4A81-B9A2-522C4661D1AC
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Device HealthAttestation CSP
diff --git a/windows/client-management/mdm/healthattestation-ddf.md b/windows/client-management/mdm/healthattestation-ddf.md
index 3c50a72760..f3e857ee6f 100644
--- a/windows/client-management/mdm/healthattestation-ddf.md
+++ b/windows/client-management/mdm/healthattestation-ddf.md
@@ -1,15 +1,12 @@
---
title: HealthAttestation DDF
description: HealthAttestation DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D20AC78D-D2D4-434B-B9FD-294BCD9D1DDE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# HealthAttestation DDF
diff --git a/windows/client-management/mdm/hotspot-csp.md b/windows/client-management/mdm/hotspot-csp.md
index 905181c7ee..181c625ca6 100644
--- a/windows/client-management/mdm/hotspot-csp.md
+++ b/windows/client-management/mdm/hotspot-csp.md
@@ -1,15 +1,12 @@
---
title: HotSpot CSP
description: HotSpot CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ec49dec1-fa79-420a-a9a7-e86668b3eebf
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# HotSpot CSP
diff --git a/windows/client-management/mdm/iconfigserviceprovider2.md b/windows/client-management/mdm/iconfigserviceprovider2.md
index f241ae1aa4..be59397ff3 100644
--- a/windows/client-management/mdm/iconfigserviceprovider2.md
+++ b/windows/client-management/mdm/iconfigserviceprovider2.md
@@ -1,15 +1,12 @@
---
title: IConfigServiceProvider2
description: IConfigServiceProvider2
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 8deec0fb-59a6-4d08-8ddb-6d0d3d868a10
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# IConfigServiceProvider2
diff --git a/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md b/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md
index eed45454d3..2d72418a32 100644
--- a/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md
+++ b/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md
@@ -1,15 +1,12 @@
---
title: IConfigServiceProvider2 ConfigManagerNotification
description: IConfigServiceProvider2 ConfigManagerNotification
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b1f0fe0f-afbe-4b36-a75d-34239a86a75c
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# IConfigServiceProvider2::ConfigManagerNotification
diff --git a/windows/client-management/mdm/iconfigserviceprovider2getnode.md b/windows/client-management/mdm/iconfigserviceprovider2getnode.md
index 8ad2ca892a..d9efa4d469 100644
--- a/windows/client-management/mdm/iconfigserviceprovider2getnode.md
+++ b/windows/client-management/mdm/iconfigserviceprovider2getnode.md
@@ -1,15 +1,12 @@
---
title: IConfigServiceProvider2 GetNode
description: IConfigServiceProvider2 GetNode
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4dc10a59-f6a2-45c0-927c-d594afc9bb91
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# IConfigServiceProvider2::GetNode
diff --git a/windows/client-management/mdm/icspnode.md b/windows/client-management/mdm/icspnode.md
index e5155263e0..5da7ad4b29 100644
--- a/windows/client-management/mdm/icspnode.md
+++ b/windows/client-management/mdm/icspnode.md
@@ -1,15 +1,12 @@
---
title: ICSPNode
description: ICSPNode
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 023466e6-a8ab-48ad-8548-291409686ac2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode
diff --git a/windows/client-management/mdm/icspnodeadd.md b/windows/client-management/mdm/icspnodeadd.md
index 97a7e667cc..20be80123e 100644
--- a/windows/client-management/mdm/icspnodeadd.md
+++ b/windows/client-management/mdm/icspnodeadd.md
@@ -1,15 +1,12 @@
---
title: ICSPNode Add
description: ICSPNode Add
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5f03d350-c82b-4747-975f-385fd8b5b3a8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::Add
diff --git a/windows/client-management/mdm/icspnodeclear.md b/windows/client-management/mdm/icspnodeclear.md
index 213e75a31a..5c0f660fa3 100644
--- a/windows/client-management/mdm/icspnodeclear.md
+++ b/windows/client-management/mdm/icspnodeclear.md
@@ -1,15 +1,12 @@
---
title: ICSPNode Clear
description: ICSPNode Clear
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b414498b-110a-472d-95c0-2d5b38cd78a6
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/icspnodecopy.md b/windows/client-management/mdm/icspnodecopy.md
index b5008ab367..cf113766b6 100644
--- a/windows/client-management/mdm/icspnodecopy.md
+++ b/windows/client-management/mdm/icspnodecopy.md
@@ -1,15 +1,12 @@
---
title: ICSPNode Copy
description: ICSPNode Copy
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: cd5ce0bc-a08b-4f82-802d-c7ff8701b41f
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::Copy
diff --git a/windows/client-management/mdm/icspnodedeletechild.md b/windows/client-management/mdm/icspnodedeletechild.md
index 158c31361e..686df037ea 100644
--- a/windows/client-management/mdm/icspnodedeletechild.md
+++ b/windows/client-management/mdm/icspnodedeletechild.md
@@ -1,15 +1,12 @@
---
title: ICSPNode DeleteChild
description: ICSPNode DeleteChild
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 8cf3663d-a4cf-4d11-b03a-f1d096ad7f9c
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::DeleteChild
diff --git a/windows/client-management/mdm/icspnodedeleteproperty.md b/windows/client-management/mdm/icspnodedeleteproperty.md
index 2280c6e984..74126c9679 100644
--- a/windows/client-management/mdm/icspnodedeleteproperty.md
+++ b/windows/client-management/mdm/icspnodedeleteproperty.md
@@ -1,15 +1,12 @@
---
title: ICSPNode DeleteProperty
description: ICSPNode DeleteProperty
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7e21851f-d663-4558-b3e8-590d24b4f6c4
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::DeleteProperty
diff --git a/windows/client-management/mdm/icspnodeexecute.md b/windows/client-management/mdm/icspnodeexecute.md
index 97a0b3f76b..ef2c4dfa1a 100644
--- a/windows/client-management/mdm/icspnodeexecute.md
+++ b/windows/client-management/mdm/icspnodeexecute.md
@@ -1,15 +1,12 @@
---
title: ICSPNode Execute
description: ICSPNode Execute
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5916e7b7-256d-49fd-82b6-db0547a215ec
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::Execute
diff --git a/windows/client-management/mdm/icspnodegetchildnodenames.md b/windows/client-management/mdm/icspnodegetchildnodenames.md
index 420ed62d10..aa63ca5b8e 100644
--- a/windows/client-management/mdm/icspnodegetchildnodenames.md
+++ b/windows/client-management/mdm/icspnodegetchildnodenames.md
@@ -1,15 +1,12 @@
---
title: ICSPNode GetChildNodeNames
description: ICSPNode GetChildNodeNames
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: dc057f2b-282b-49ac-91c4-bb83bd3ca4dc
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::GetChildNodeNames
diff --git a/windows/client-management/mdm/icspnodegetproperty.md b/windows/client-management/mdm/icspnodegetproperty.md
index 8d4a28d933..673d9e8e15 100644
--- a/windows/client-management/mdm/icspnodegetproperty.md
+++ b/windows/client-management/mdm/icspnodegetproperty.md
@@ -1,15 +1,12 @@
---
title: ICSPNode GetProperty
description: ICSPNode GetProperty
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: a2bdc158-72e0-4cdb-97ce-f5cf1a44b7db
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::GetProperty
diff --git a/windows/client-management/mdm/icspnodegetpropertyidentifiers.md b/windows/client-management/mdm/icspnodegetpropertyidentifiers.md
index a4624bfac7..55fabbe552 100644
--- a/windows/client-management/mdm/icspnodegetpropertyidentifiers.md
+++ b/windows/client-management/mdm/icspnodegetpropertyidentifiers.md
@@ -1,15 +1,12 @@
---
title: ICSPNode GetPropertyIdentifiers
description: ICSPNode GetPropertyIdentifiers
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 8a052cd3-d74c-40c4-845f-f804b920deb4
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::GetPropertyIdentifiers
diff --git a/windows/client-management/mdm/icspnodegetvalue.md b/windows/client-management/mdm/icspnodegetvalue.md
index 95d95c5813..fe58b75211 100644
--- a/windows/client-management/mdm/icspnodegetvalue.md
+++ b/windows/client-management/mdm/icspnodegetvalue.md
@@ -1,15 +1,12 @@
---
title: ICSPNode GetValue
description: ICSPNode GetValue
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: c684036d-98be-4659-8ce8-f72436a39b90
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::GetValue
diff --git a/windows/client-management/mdm/icspnodemove.md b/windows/client-management/mdm/icspnodemove.md
index b106a7cb80..53c5047934 100644
--- a/windows/client-management/mdm/icspnodemove.md
+++ b/windows/client-management/mdm/icspnodemove.md
@@ -1,15 +1,12 @@
---
title: ICSPNode Move
description: ICSPNode Move
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: efb359c3-5c86-4975-bf6f-a1c33922442a
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::Move
diff --git a/windows/client-management/mdm/icspnodesetproperty.md b/windows/client-management/mdm/icspnodesetproperty.md
index 7805bd3a38..daae584a37 100644
--- a/windows/client-management/mdm/icspnodesetproperty.md
+++ b/windows/client-management/mdm/icspnodesetproperty.md
@@ -1,15 +1,12 @@
---
title: ICSPNode SetProperty
description: ICSPNode SetProperty
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: e235c38f-ea04-4cd8-adec-3c6c0ce7172d
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::SetProperty
diff --git a/windows/client-management/mdm/icspnodesetvalue.md b/windows/client-management/mdm/icspnodesetvalue.md
index cc4c4dcf3f..ccb5ff6c76 100644
--- a/windows/client-management/mdm/icspnodesetvalue.md
+++ b/windows/client-management/mdm/icspnodesetvalue.md
@@ -1,15 +1,12 @@
---
title: ICSPNode SetValue
description: ICSPNode SetValue
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b218636d-fe8b-4a0f-b4e8-a621f65619d3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNode::SetValue
diff --git a/windows/client-management/mdm/icspnodetransactioning.md b/windows/client-management/mdm/icspnodetransactioning.md
index 34e1557544..536708cb7d 100644
--- a/windows/client-management/mdm/icspnodetransactioning.md
+++ b/windows/client-management/mdm/icspnodetransactioning.md
@@ -1,15 +1,12 @@
---
title: ICSPNodeTransactioning
description: ICSPNodeTransactioning
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 24dc518a-4a8d-41fe-9bc6-217bbbdf6a3f
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPNodeTransactioning
diff --git a/windows/client-management/mdm/icspvalidate.md b/windows/client-management/mdm/icspvalidate.md
index db4a3ea48f..42828da848 100644
--- a/windows/client-management/mdm/icspvalidate.md
+++ b/windows/client-management/mdm/icspvalidate.md
@@ -1,15 +1,12 @@
---
title: ICSPValidate
description: ICSPValidate
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b0993f2d-6269-412f-a329-af25fff34ca2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ICSPValidate
diff --git a/windows/client-management/mdm/implement-server-side-mobile-application-management.md b/windows/client-management/mdm/implement-server-side-mobile-application-management.md
index 360eca3308..904aabcc23 100644
--- a/windows/client-management/mdm/implement-server-side-mobile-application-management.md
+++ b/windows/client-management/mdm/implement-server-side-mobile-application-management.md
@@ -1,14 +1,11 @@
---
title: Implement server-side support for mobile application management on Windows
description: The Windows version of mobile application management (MAM) is a lightweight solution for managing company data access and security on personal devices. MAM support is built into Windows on top of Windows Information Protection (WIP).
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/index.md b/windows/client-management/mdm/index.md
index 6c42d88644..70a844c704 100644
--- a/windows/client-management/mdm/index.md
+++ b/windows/client-management/mdm/index.md
@@ -4,15 +4,12 @@ description: Windows 10 provides an enterprise management solution to help IT p
MS-HAID:
- 'p\_phDeviceMgmt.provisioning\_and\_device\_management'
- 'p\_phDeviceMgmt.mobile\_device\_management\_windows\_mdm'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 50ac90a7-713e-4487-9cb9-b6d6fdaa4e5b
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Mobile device management
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 eef8e355a3..98510df8a0 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
@@ -4,15 +4,12 @@ description: The Windows Store for Business has a new web service designed for t
MS-HAID:
- 'p\_phdevicemgmt.business\_store\_portal\_management\_tool'
- 'p\_phDeviceMgmt.management\_tool\_for\_windows\_store\_for\_business'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 0E39AE85-1703-4B24-9A7F-831C6455068F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Management tool for the Windows Store for Business
diff --git a/windows/client-management/mdm/maps-csp.md b/windows/client-management/mdm/maps-csp.md
index dfe6a73a3b..7a5f26f5ef 100644
--- a/windows/client-management/mdm/maps-csp.md
+++ b/windows/client-management/mdm/maps-csp.md
@@ -1,15 +1,12 @@
---
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.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E5157296-7C31-4B08-8877-15304C9F6F26
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Maps CSP
diff --git a/windows/client-management/mdm/maps-ddf-file.md b/windows/client-management/mdm/maps-ddf-file.md
index b4b0100012..e91dbca47e 100644
--- a/windows/client-management/mdm/maps-ddf-file.md
+++ b/windows/client-management/mdm/maps-ddf-file.md
@@ -1,15 +1,12 @@
---
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.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: EF22DBB6-0578-4FD0-B8A6-19DC03288FAF
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Maps DDF file
diff --git a/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md b/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md
index 26b3ed04f0..c2896dd7cd 100644
--- a/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md
+++ b/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md
@@ -4,15 +4,12 @@ description: MDM enrollment of Windows-based devices
MS-HAID:
- 'p\_phdevicemgmt.enrollment\_ui'
- 'p\_phDeviceMgmt.mdm\_enrollment\_of\_windows\_devices'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4651C81B-D2D6-446A-AA24-04D01C1D0883
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# MDM enrollment of Windows-based devices
diff --git a/windows/client-management/mdm/messaging-csp.md b/windows/client-management/mdm/messaging-csp.md
index 1d14736623..25454c6580 100644
--- a/windows/client-management/mdm/messaging-csp.md
+++ b/windows/client-management/mdm/messaging-csp.md
@@ -1,14 +1,11 @@
---
title: Messaging CSP
description: Messaging CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Messaging CSP
diff --git a/windows/client-management/mdm/messaging-ddf.md b/windows/client-management/mdm/messaging-ddf.md
index 87fbd0072f..8a3d8d7e7d 100644
--- a/windows/client-management/mdm/messaging-ddf.md
+++ b/windows/client-management/mdm/messaging-ddf.md
@@ -1,14 +1,11 @@
---
title: Messaging DDF file
description: Messaging DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Messaging DDF file
diff --git a/windows/client-management/mdm/mobile-device-enrollment.md b/windows/client-management/mdm/mobile-device-enrollment.md
index 9192197a28..e0a4d74fa3 100644
--- a/windows/client-management/mdm/mobile-device-enrollment.md
+++ b/windows/client-management/mdm/mobile-device-enrollment.md
@@ -1,15 +1,12 @@
---
title: Mobile device enrollment
description: Mobile device enrollment is the first phase of enterprise management.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 08C8B3DB-3263-414B-A368-F47B94F47A11
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Mobile device enrollment
diff --git a/windows/client-management/mdm/nap-csp.md b/windows/client-management/mdm/nap-csp.md
index b4660ca511..d62bf09a6c 100644
--- a/windows/client-management/mdm/nap-csp.md
+++ b/windows/client-management/mdm/nap-csp.md
@@ -1,15 +1,12 @@
---
title: NAP CSP
description: NAP CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 82f04492-88a6-4afd-af10-a62b8d444d21
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NAP CSP
diff --git a/windows/client-management/mdm/napdef-csp.md b/windows/client-management/mdm/napdef-csp.md
index 8df98c23fd..0019bd057b 100644
--- a/windows/client-management/mdm/napdef-csp.md
+++ b/windows/client-management/mdm/napdef-csp.md
@@ -1,15 +1,12 @@
---
title: NAPDEF CSP
description: NAPDEF CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9bcc65dd-a72b-4f90-aba7-4066daa06988
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NAPDEF CSP
diff --git a/windows/client-management/mdm/networkproxy-csp.md b/windows/client-management/mdm/networkproxy-csp.md
index 17bfecb9bd..2e9efd2de6 100644
--- a/windows/client-management/mdm/networkproxy-csp.md
+++ b/windows/client-management/mdm/networkproxy-csp.md
@@ -1,14 +1,11 @@
---
title: NetworkProxy CSP
description: NetworkProxy CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NetworkProxy CSP
diff --git a/windows/client-management/mdm/networkproxy-ddf.md b/windows/client-management/mdm/networkproxy-ddf.md
index 47e68fe01b..6657bc67ee 100644
--- a/windows/client-management/mdm/networkproxy-ddf.md
+++ b/windows/client-management/mdm/networkproxy-ddf.md
@@ -1,14 +1,11 @@
---
title: NetworkProxy DDF file
description: AppNetworkProxyLocker DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NetworkProxy DDF file
diff --git a/windows/client-management/mdm/networkqospolicy-csp.md b/windows/client-management/mdm/networkqospolicy-csp.md
index 99983160de..eb09ca2909 100644
--- a/windows/client-management/mdm/networkqospolicy-csp.md
+++ b/windows/client-management/mdm/networkqospolicy-csp.md
@@ -1,14 +1,11 @@
---
title: NetworkQoSPolicy CSP
description: he NetworkQoSPolicy CSP applies the Quality of Service (QoS) policy for Microsoft Surface Hub. This CSP was added in Windows 10, version 1703.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NetworkQoSPolicy CSP
diff --git a/windows/client-management/mdm/networkqospolicy-ddf.md b/windows/client-management/mdm/networkqospolicy-ddf.md
index a8a04b9de5..e22f1a5ac3 100644
--- a/windows/client-management/mdm/networkqospolicy-ddf.md
+++ b/windows/client-management/mdm/networkqospolicy-ddf.md
@@ -1,15 +1,12 @@
---
title: NetworkQoSPolicy DDF
description: This topic shows the OMA DM device description framework (DDF) for the NetworkQoSPolicy configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid:
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NetworkQoSPolicy DDF
diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
index 4bb5eecbe0..01c9aace26 100644
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@@ -4,15 +4,12 @@ description: This topic provides information about what's new and breaking chang
MS-HAID:
- 'p\_phdevicemgmt.mdm\_enrollment\_and\_management\_overview'
- 'p\_phDeviceMgmt.new\_in\_windows\_mdm\_enrollment\_management'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9C42064F-091C-4901-BC73-9ABE79EE4224
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# What's new in MDM enrollment and management
@@ -883,6 +880,14 @@ For details about Microsoft mobile device management protocols for Windows 10 s
Ownership
+
+MDM support for Windows 10 S |
+Updated the following topics to indicate MDM support in Windows 10 S.
+
+- [Configuration service provider reference](configuration-service-provider-reference.md)
+- [Policy CSP](policy-configuration-service-provider.md)
+
+ |
@@ -1223,6 +1228,14 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
Ownership
+
+MDM support for Windows 10 S |
+Updated the following topics to indicate MDM support in Windows 10 S.
+
+- [Configuration service provider reference](configuration-service-provider-reference.md)
+- [Policy CSP](policy-configuration-service-provider.md)
+
+ |
diff --git a/windows/client-management/mdm/nodecache-csp.md b/windows/client-management/mdm/nodecache-csp.md
index 459eb5b6a1..66ec4f198b 100644
--- a/windows/client-management/mdm/nodecache-csp.md
+++ b/windows/client-management/mdm/nodecache-csp.md
@@ -1,15 +1,12 @@
---
title: NodeCache CSP
description: NodeCache CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b4dd2b0d-79ef-42ac-ab5b-ee07b3097876
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NodeCache CSP
diff --git a/windows/client-management/mdm/nodecache-ddf-file.md b/windows/client-management/mdm/nodecache-ddf-file.md
index 5cc96df8bb..1d3eb141bc 100644
--- a/windows/client-management/mdm/nodecache-ddf-file.md
+++ b/windows/client-management/mdm/nodecache-ddf-file.md
@@ -1,15 +1,12 @@
---
title: NodeCache DDF file
description: NodeCache DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: d7605098-12aa-4423-89ae-59624fa31236
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# NodeCache DDF file
diff --git a/windows/client-management/mdm/office-csp.md b/windows/client-management/mdm/office-csp.md
index dbc41f165d..ca215622b9 100644
--- a/windows/client-management/mdm/office-csp.md
+++ b/windows/client-management/mdm/office-csp.md
@@ -1,14 +1,11 @@
---
title: Office CSP
description: The Office configuration service provider (CSP) enables a Microsoft Office client to be installed on a device. This CSP was added in Windows 10, version 1703.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Office CSP
diff --git a/windows/client-management/mdm/office-ddf.md b/windows/client-management/mdm/office-ddf.md
index ead5845d21..85f2f48531 100644
--- a/windows/client-management/mdm/office-ddf.md
+++ b/windows/client-management/mdm/office-ddf.md
@@ -1,15 +1,12 @@
---
title: Office DDF
description: This topic shows the OMA DM device description framework (DDF) for the Office configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid:
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Office DDF
diff --git a/windows/client-management/mdm/oma-dm-protocol-support.md b/windows/client-management/mdm/oma-dm-protocol-support.md
index 62ad8a9ebb..8ebb0eebf3 100644
--- a/windows/client-management/mdm/oma-dm-protocol-support.md
+++ b/windows/client-management/mdm/oma-dm-protocol-support.md
@@ -1,15 +1,12 @@
---
title: OMA DM protocol support
description: OMA DM protocol support
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: e882aaae-447e-4bd4-9275-463824da4fa0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/on-premise-authentication-device-enrollment.md b/windows/client-management/mdm/on-premise-authentication-device-enrollment.md
index b9a90f2614..2ecd4d724f 100644
--- a/windows/client-management/mdm/on-premise-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/on-premise-authentication-device-enrollment.md
@@ -1,15 +1,12 @@
---
title: On-premise authentication device enrollment
description: This section provides an example of the mobile device enrollment protocol using on-premise authentication policy.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 626AC8B4-7575-4C41-8D59-185D607E3A47
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# On-premise authentication device enrollment
diff --git a/windows/client-management/mdm/passportforwork-csp.md b/windows/client-management/mdm/passportforwork-csp.md
index ba168ff230..8faa4ccb96 100644
--- a/windows/client-management/mdm/passportforwork-csp.md
+++ b/windows/client-management/mdm/passportforwork-csp.md
@@ -1,15 +1,12 @@
---
title: PassportForWork CSP
description: The PassportForWork configuration service provider is used to provision Windows Hello for Business (formerly Microsoft Passport for Work).
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 3BAE4827-5497-41EE-B47F-5C071ADB2C51
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# PassportForWork CSP
diff --git a/windows/client-management/mdm/passportforwork-ddf.md b/windows/client-management/mdm/passportforwork-ddf.md
index d143881755..e425bb220d 100644
--- a/windows/client-management/mdm/passportforwork-ddf.md
+++ b/windows/client-management/mdm/passportforwork-ddf.md
@@ -1,15 +1,12 @@
---
title: PassportForWork DDF
description: This topic shows the OMA DM device description framework (DDF) for the PassportForWork configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A2182898-1577-4675-BAE5-2A3A9C2AAC9B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# PassportForWork DDF
diff --git a/windows/client-management/mdm/personalization-csp.md b/windows/client-management/mdm/personalization-csp.md
index 0a01a02817..85c52cab60 100644
--- a/windows/client-management/mdm/personalization-csp.md
+++ b/windows/client-management/mdm/personalization-csp.md
@@ -1,14 +1,11 @@
---
title: Personalization CSP
description: Personalization CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Personalization CSP
diff --git a/windows/client-management/mdm/personalization-ddf.md b/windows/client-management/mdm/personalization-ddf.md
index ee0e9087ca..85d8ef7bb0 100644
--- a/windows/client-management/mdm/personalization-ddf.md
+++ b/windows/client-management/mdm/personalization-ddf.md
@@ -1,14 +1,11 @@
---
title: Personalization DDF file
description: Personalization DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Personalization DDF file
diff --git a/windows/client-management/mdm/policy-admx-backed.md b/windows/client-management/mdm/policy-admx-backed.md
index 4643ba8bb8..643af44e7a 100644
--- a/windows/client-management/mdm/policy-admx-backed.md
+++ b/windows/client-management/mdm/policy-admx-backed.md
@@ -1,15 +1,12 @@
---
title: Policy CSP - ADMX-backed policies
description: Policy CSP - ADMX-backed policies
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4F3A1134-D401-44FC-A583-6EDD3070BA4F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Policy CSP - ADMX-backed policies
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 497278c57e..6a2a63b9e5 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -1,15 +1,12 @@
---
title: Policy CSP
description: Policy CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4F3A1134-D401-44FC-A583-6EDD3070BA4F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Policy CSP
@@ -110,6 +107,9 @@ The following diagram shows the Policy configuration service provider in tree fo
Supported operations are Add and Get. Does not support Delete.
+> [!Note]
+> The policies supported in Windows 10 S is the same as in Windows 10 Pro, except that policies under AppliationsDefaults are not suppported in Windows 10 S.
+
diff --git a/windows/client-management/mdm/policy-ddf-file.md b/windows/client-management/mdm/policy-ddf-file.md
index 3edb63ebe7..3a2d11e3db 100644
--- a/windows/client-management/mdm/policy-ddf-file.md
+++ b/windows/client-management/mdm/policy-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Policy DDF file
description: Policy DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D90791B5-A772-4AF8-B058-5D566865AF8D
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Policy DDF file
diff --git a/windows/client-management/mdm/policymanager-csp.md b/windows/client-management/mdm/policymanager-csp.md
index c20fa69027..8124940a17 100644
--- a/windows/client-management/mdm/policymanager-csp.md
+++ b/windows/client-management/mdm/policymanager-csp.md
@@ -1,15 +1,12 @@
---
title: PolicyManager CSP
description: PolicyManager CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 048427b1-6024-4660-8660-bd91c583f7f9
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# PolicyManager CSP
diff --git a/windows/client-management/mdm/provisioning-csp.md b/windows/client-management/mdm/provisioning-csp.md
index 9d7fe6b775..9ae10f0f2c 100644
--- a/windows/client-management/mdm/provisioning-csp.md
+++ b/windows/client-management/mdm/provisioning-csp.md
@@ -1,15 +1,12 @@
---
title: Provisioning CSP
description: The Provisioning configuration service provider is used for bulk user enrollment to an MDM service.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5D6C17BE-727A-4AFA-9F30-B34C1EA1D2AE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Provisioning CSP
diff --git a/windows/client-management/mdm/proxy-csp.md b/windows/client-management/mdm/proxy-csp.md
index 2c69cb99be..65e4ceb727 100644
--- a/windows/client-management/mdm/proxy-csp.md
+++ b/windows/client-management/mdm/proxy-csp.md
@@ -1,15 +1,12 @@
---
title: PROXY CSP
description: PROXY CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9904d44c-4a1e-4ae7-a6c7-5dba06cb16ce
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# PROXY CSP
diff --git a/windows/client-management/mdm/push-notification-windows-mdm.md b/windows/client-management/mdm/push-notification-windows-mdm.md
index ae58089129..e34d5f94f2 100644
--- a/windows/client-management/mdm/push-notification-windows-mdm.md
+++ b/windows/client-management/mdm/push-notification-windows-mdm.md
@@ -4,15 +4,12 @@ description: The DMClient CSP supports the ability to configure push-initiated d
MS-HAID:
- 'p\_phdevicemgmt.push\_notification\_support\_for\_device\_management'
- 'p\_phDeviceMgmt.push\_notification\_windows\_mdm'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 9031C4FE-212A-4481-A1B0-4C3190B388AE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
diff --git a/windows/client-management/mdm/pxlogical-csp.md b/windows/client-management/mdm/pxlogical-csp.md
index 16e33e0a5e..d3391b6066 100644
--- a/windows/client-management/mdm/pxlogical-csp.md
+++ b/windows/client-management/mdm/pxlogical-csp.md
@@ -1,15 +1,12 @@
---
title: PXLOGICAL configuration service provider
description: PXLOGICAL configuration service provider
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b5fc84d4-aa32-4edd-95f1-a6a9c0feb459
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# PXLOGICAL configuration service provider
diff --git a/windows/client-management/mdm/reboot-csp.md b/windows/client-management/mdm/reboot-csp.md
index 8b7546365e..6180829e89 100644
--- a/windows/client-management/mdm/reboot-csp.md
+++ b/windows/client-management/mdm/reboot-csp.md
@@ -1,15 +1,12 @@
---
title: Reboot CSP
description: Reboot CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4E3F1225-BBAD-40F5-A1AB-FF221B6BAF48
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Reboot CSP
diff --git a/windows/client-management/mdm/reboot-ddf-file.md b/windows/client-management/mdm/reboot-ddf-file.md
index 1854905947..714d7255ec 100644
--- a/windows/client-management/mdm/reboot-ddf-file.md
+++ b/windows/client-management/mdm/reboot-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Reboot DDF file
description: This topic shows the OMA DM device description framework (DDF) for the Reboot configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ABBD850C-E744-462C-88E7-CA3F43D80DB1
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Reboot DDF file
diff --git a/windows/client-management/mdm/reclaim-seat-from-user.md b/windows/client-management/mdm/reclaim-seat-from-user.md
index 8f29cf0f62..ee5bc80e60 100644
--- a/windows/client-management/mdm/reclaim-seat-from-user.md
+++ b/windows/client-management/mdm/reclaim-seat-from-user.md
@@ -1,15 +1,12 @@
---
title: Reclaim seat from user
description: The Reclaim seat from user operation returns reclaimed seats for a user in the Windows Store for Business.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E2C3C899-D0AD-469A-A319-31A420472A4C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Reclaim seat from user
diff --git a/windows/client-management/mdm/register-your-free-azure-active-directory-subscription.md b/windows/client-management/mdm/register-your-free-azure-active-directory-subscription.md
index 0b4b04eb62..344a2176e6 100644
--- a/windows/client-management/mdm/register-your-free-azure-active-directory-subscription.md
+++ b/windows/client-management/mdm/register-your-free-azure-active-directory-subscription.md
@@ -1,15 +1,12 @@
---
title: Register your free Azure Active Directory subscription
description: If you have paid subscriptions to Office 365, Microsoft Dynamics CRM Online, Enterprise Mobility Suite, or other Microsoft services, you have a free subscription to Azure AD.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 97DCD303-BB11-4AFF-84FE-B7F14CDF64F7
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Register your free Azure Active Directory subscription
diff --git a/windows/client-management/mdm/registry-csp.md b/windows/client-management/mdm/registry-csp.md
index fdd8e867f6..3874d0f2d7 100644
--- a/windows/client-management/mdm/registry-csp.md
+++ b/windows/client-management/mdm/registry-csp.md
@@ -1,15 +1,12 @@
---
title: Registry CSP
description: Registry CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 2307e3fd-7b61-4f00-94e1-a639571f2c9d
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Registry CSP
diff --git a/windows/client-management/mdm/registry-ddf-file.md b/windows/client-management/mdm/registry-ddf-file.md
index 179ce9f272..5ee429e5ca 100644
--- a/windows/client-management/mdm/registry-ddf-file.md
+++ b/windows/client-management/mdm/registry-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Registry DDF file
description: Registry DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 29b5cc07-f349-4567-8a77-387d816a9d15
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Registry DDF file
diff --git a/windows/client-management/mdm/remotefind-csp.md b/windows/client-management/mdm/remotefind-csp.md
index f11afd65e5..29447d3ed2 100644
--- a/windows/client-management/mdm/remotefind-csp.md
+++ b/windows/client-management/mdm/remotefind-csp.md
@@ -1,15 +1,12 @@
---
title: RemoteFind CSP
description: The RemoteFind configuration service provider retrieves the location information for a particular device.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 2EB02824-65BF-4B40-A338-672D219AF5A0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteFind CSP
diff --git a/windows/client-management/mdm/remotefind-ddf-file.md b/windows/client-management/mdm/remotefind-ddf-file.md
index 746dc26f77..c30856f87d 100644
--- a/windows/client-management/mdm/remotefind-ddf-file.md
+++ b/windows/client-management/mdm/remotefind-ddf-file.md
@@ -1,15 +1,12 @@
---
title: RemoteFind DDF file
description: This topic shows the OMA DM device description framework (DDF) for the RemoteFind configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5864CBB8-2030-459E-BCF6-9ACB69206FEA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteFind DDF file
diff --git a/windows/client-management/mdm/remotelock-csp.md b/windows/client-management/mdm/remotelock-csp.md
index 6afa9644ad..1ac58b24af 100644
--- a/windows/client-management/mdm/remotelock-csp.md
+++ b/windows/client-management/mdm/remotelock-csp.md
@@ -1,15 +1,12 @@
---
title: RemoteLock CSP
description: RemoteLock CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: c7889331-5aa3-4efe-9a7e-20d3f433659b
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteLock CSP
diff --git a/windows/client-management/mdm/remotelock-ddf-file.md b/windows/client-management/mdm/remotelock-ddf-file.md
index 186a01cf7e..1f09e6508c 100644
--- a/windows/client-management/mdm/remotelock-ddf-file.md
+++ b/windows/client-management/mdm/remotelock-ddf-file.md
@@ -1,15 +1,12 @@
---
title: RemoteLock DDF file
description: RemoteLock DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: A301AE26-1BF1-4328-99AB-1ABBA4960797
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteLock DDF file
diff --git a/windows/client-management/mdm/remotering-csp.md b/windows/client-management/mdm/remotering-csp.md
index 9e472ec2d6..4f16070cb7 100644
--- a/windows/client-management/mdm/remotering-csp.md
+++ b/windows/client-management/mdm/remotering-csp.md
@@ -1,15 +1,12 @@
---
title: RemoteRing CSP
description: RemoteRing CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 70015243-c07f-46cb-a0f9-4b4ad13a5609
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteRing CSP
diff --git a/windows/client-management/mdm/remotering-ddf-file.md b/windows/client-management/mdm/remotering-ddf-file.md
index 388027a75e..8d690e645e 100644
--- a/windows/client-management/mdm/remotering-ddf-file.md
+++ b/windows/client-management/mdm/remotering-ddf-file.md
@@ -1,15 +1,12 @@
---
title: RemoteRing DDF file
description: This topic shows the OMA DM device description framework (DDF) for the RemoteRing configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 6815267F-212B-4370-8B72-A457E8000F7B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteRing DDF file
diff --git a/windows/client-management/mdm/remotewipe-csp.md b/windows/client-management/mdm/remotewipe-csp.md
index 5d39d7b7b5..81a742eab8 100644
--- a/windows/client-management/mdm/remotewipe-csp.md
+++ b/windows/client-management/mdm/remotewipe-csp.md
@@ -1,15 +1,12 @@
---
title: RemoteWipe CSP
description: RemoteWipe CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 6e89bd37-7680-4940-8a67-11ed062ffb70
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteWipe CSP
diff --git a/windows/client-management/mdm/remotewipe-ddf-file.md b/windows/client-management/mdm/remotewipe-ddf-file.md
index 8bcac9fb38..fa91cdb835 100644
--- a/windows/client-management/mdm/remotewipe-ddf-file.md
+++ b/windows/client-management/mdm/remotewipe-ddf-file.md
@@ -1,15 +1,12 @@
---
title: RemoteWipe DDF file
description: RemoteWipe DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 10ec4fb7-f911-4d0c-9a8f-e96bf5faea0c
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RemoteWipe DDF file
diff --git a/windows/client-management/mdm/reporting-csp.md b/windows/client-management/mdm/reporting-csp.md
index 498de35717..83d3d3f5b5 100644
--- a/windows/client-management/mdm/reporting-csp.md
+++ b/windows/client-management/mdm/reporting-csp.md
@@ -1,15 +1,12 @@
---
title: Reporting CSP
description: The Reporting configuration service provider is used to retrieve Windows Information Protection (formerly known as Enterprise Data Protection) and security auditing logs.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 148441A6-D9E1-43D8-ADEE-FB62E85A39F7
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Reporting CSP
diff --git a/windows/client-management/mdm/reporting-ddf-file.md b/windows/client-management/mdm/reporting-ddf-file.md
index 97a063b1d3..ff3de3aab3 100644
--- a/windows/client-management/mdm/reporting-ddf-file.md
+++ b/windows/client-management/mdm/reporting-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Reporting DDF file
description: This topic shows the OMA DM device description framework (DDF) for the Reporting configuration service provider. This CSP was added in Windows 10, version 1511. Support for desktop security auditing was added for the desktop in Windows 10, version 1607.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7A5B79DB-9571-4F7C-ABED-D79CD08C1E35
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Reporting DDF file
diff --git a/windows/client-management/mdm/rest-api-reference-windows-store-for-business.md b/windows/client-management/mdm/rest-api-reference-windows-store-for-business.md
index 7f7b8824d9..87ad349555 100644
--- a/windows/client-management/mdm/rest-api-reference-windows-store-for-business.md
+++ b/windows/client-management/mdm/rest-api-reference-windows-store-for-business.md
@@ -4,15 +4,12 @@ description: REST API reference for Windows Store for Business
MS-HAID:
- 'p\_phdevicemgmt.business\_store\_portal\_management\_rest\_api\_reference'
- 'p\_phDeviceMgmt.rest\_api\_reference\_windows\_store\_for\_Business'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 8C48A879-525A-471F-B0FD-506E743A7D2F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# REST API reference for Windows Store for Business
diff --git a/windows/client-management/mdm/rootcacertificates-csp.md b/windows/client-management/mdm/rootcacertificates-csp.md
index 669dbc6dab..ae0852dd78 100644
--- a/windows/client-management/mdm/rootcacertificates-csp.md
+++ b/windows/client-management/mdm/rootcacertificates-csp.md
@@ -1,15 +1,12 @@
---
title: RootCATrustedCertificates CSP
description: RootCATrustedCertificates CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F2F25DEB-9DB3-40FB-BC3C-B816CE470D61
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RootCATrustedCertificates CSP
diff --git a/windows/client-management/mdm/rootcacertificates-ddf-file.md b/windows/client-management/mdm/rootcacertificates-ddf-file.md
index b9af3d73bd..e825e38ead 100644
--- a/windows/client-management/mdm/rootcacertificates-ddf-file.md
+++ b/windows/client-management/mdm/rootcacertificates-ddf-file.md
@@ -1,15 +1,12 @@
---
title: RootCATrustedCertificates DDF file
description: RootCATrustedCertificates DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 06D8787B-D3E1-4D4B-8A21-8045A8F85C1C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# RootCATrustedCertificates DDF file
diff --git a/windows/client-management/mdm/samples-for-writing-a-custom-configuration-service-provider.md b/windows/client-management/mdm/samples-for-writing-a-custom-configuration-service-provider.md
index 8af994de2c..8ab213e4cf 100644
--- a/windows/client-management/mdm/samples-for-writing-a-custom-configuration-service-provider.md
+++ b/windows/client-management/mdm/samples-for-writing-a-custom-configuration-service-provider.md
@@ -1,15 +1,12 @@
---
title: Samples for writing a custom configuration service provider
description: Samples for writing a custom configuration service provider
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ccda4d62-7ce1-483b-912f-25d50c974270
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Samples for writing a custom configuration service provider
diff --git a/windows/client-management/mdm/secureassessment-csp.md b/windows/client-management/mdm/secureassessment-csp.md
index e94006221c..8f671e0d21 100644
--- a/windows/client-management/mdm/secureassessment-csp.md
+++ b/windows/client-management/mdm/secureassessment-csp.md
@@ -1,15 +1,12 @@
---
title: SecureAssessment CSP
description: SecureAssessment CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 6808BE4B-961E-4638-BF15-FD7841D1C00A
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SecureAssessment CSP
diff --git a/windows/client-management/mdm/secureassessment-ddf-file.md b/windows/client-management/mdm/secureassessment-ddf-file.md
index fa93e99ad4..57601f53e0 100644
--- a/windows/client-management/mdm/secureassessment-ddf-file.md
+++ b/windows/client-management/mdm/secureassessment-ddf-file.md
@@ -1,15 +1,12 @@
---
title: SecureAssessment DDF file
description: This topic shows the OMA DM device description framework (DDF) for the SecureAssessment configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 68D17F2A-FAEA-4608-8727-DBEC1D7BE48A
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SecureAssessment DDF file
diff --git a/windows/client-management/mdm/securitypolicy-csp.md b/windows/client-management/mdm/securitypolicy-csp.md
index 6fc15e30bb..28e87b7c43 100644
--- a/windows/client-management/mdm/securitypolicy-csp.md
+++ b/windows/client-management/mdm/securitypolicy-csp.md
@@ -1,15 +1,12 @@
---
title: SecurityPolicy CSP
description: SecurityPolicy CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 6014f8fe-f91b-49f3-a357-bdf625545bc9
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SecurityPolicy CSP
diff --git a/windows/client-management/mdm/server-requirements-windows-mdm.md b/windows/client-management/mdm/server-requirements-windows-mdm.md
index bc372c4f37..0ced05ef07 100644
--- a/windows/client-management/mdm/server-requirements-windows-mdm.md
+++ b/windows/client-management/mdm/server-requirements-windows-mdm.md
@@ -4,15 +4,12 @@ description: Server requirements for using OMA DM to manage Windows devices
MS-HAID:
- 'p\_phDeviceMgmt.server\_requirements\_for\_oma\_dm'
- 'p\_phDeviceMgmt.server\_requirements\_windows\_mdm'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 5b90b631-62a6-4949-b53a-01275fd304b2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Server requirements for using OMA DM to manage Windows devices
diff --git a/windows/client-management/mdm/sharedpc-csp.md b/windows/client-management/mdm/sharedpc-csp.md
index fd508bddc8..e8b16b4a18 100644
--- a/windows/client-management/mdm/sharedpc-csp.md
+++ b/windows/client-management/mdm/sharedpc-csp.md
@@ -1,15 +1,12 @@
---
title: SharedPC CSP
description: SharedPC CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 31273166-1A1E-4F96-B176-CB42ECB80957
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SharedPC CSP
diff --git a/windows/client-management/mdm/sharedpc-ddf-file.md b/windows/client-management/mdm/sharedpc-ddf-file.md
index fe6259624e..e666ac45e9 100644
--- a/windows/client-management/mdm/sharedpc-ddf-file.md
+++ b/windows/client-management/mdm/sharedpc-ddf-file.md
@@ -1,15 +1,12 @@
---
title: SharedPC DDF file
description: SharedPC DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 70234197-07D4-478E-97BB-F6C651C0B970
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SharedPC DDF file
diff --git a/windows/client-management/mdm/storage-csp.md b/windows/client-management/mdm/storage-csp.md
index 53b364243d..e383685013 100644
--- a/windows/client-management/mdm/storage-csp.md
+++ b/windows/client-management/mdm/storage-csp.md
@@ -1,15 +1,12 @@
---
title: Storage CSP
description: Storage CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: b19bdb54-53ed-42ce-a5a1-269379013f57
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Storage CSP
diff --git a/windows/client-management/mdm/storage-ddf-file.md b/windows/client-management/mdm/storage-ddf-file.md
index 087e36a61f..2cf0a17551 100644
--- a/windows/client-management/mdm/storage-ddf-file.md
+++ b/windows/client-management/mdm/storage-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Storage DDF file
description: Storage DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 247062A3-4DFB-4B14-A3D1-68D02C27703C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Storage DDF file
diff --git a/windows/client-management/mdm/structure-of-oma-dm-provisioning-files.md b/windows/client-management/mdm/structure-of-oma-dm-provisioning-files.md
index c8e61157a6..031e69f53b 100644
--- a/windows/client-management/mdm/structure-of-oma-dm-provisioning-files.md
+++ b/windows/client-management/mdm/structure-of-oma-dm-provisioning-files.md
@@ -1,15 +1,12 @@
---
title: Structure of OMA DM provisioning files
description: Structure of OMA DM provisioning files
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7bd3ef57-c76c-459b-b63f-c5a333ddc2bc
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Structure of OMA DM provisioning files
diff --git a/windows/client-management/mdm/supl-csp.md b/windows/client-management/mdm/supl-csp.md
index 25acb22d8e..150ca95701 100644
--- a/windows/client-management/mdm/supl-csp.md
+++ b/windows/client-management/mdm/supl-csp.md
@@ -1,15 +1,12 @@
---
title: SUPL CSP
description: SUPL CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: afad0120-1126-4fc5-8e7a-64b9f2a5eae1
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SUPL CSP
diff --git a/windows/client-management/mdm/supl-ddf-file.md b/windows/client-management/mdm/supl-ddf-file.md
index eedb7f2b31..266c2dcaf6 100644
--- a/windows/client-management/mdm/supl-ddf-file.md
+++ b/windows/client-management/mdm/supl-ddf-file.md
@@ -1,15 +1,12 @@
---
title: SUPL DDF file
description: This topic shows the OMA DM device description framework (DDF) for the SUPL configuration service provider.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 514B7854-80DC-4ED9-9805-F5276BF38034
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SUPL DDF file
diff --git a/windows/client-management/mdm/surfacehub-csp.md b/windows/client-management/mdm/surfacehub-csp.md
index aa210d64d8..f751e53b34 100644
--- a/windows/client-management/mdm/surfacehub-csp.md
+++ b/windows/client-management/mdm/surfacehub-csp.md
@@ -1,15 +1,12 @@
---
title: SurfaceHub CSP
description: The SurfaceHub configuration service provider (CSP) is used to configure Microsoft Surface Hub settings. This CSP was added in Windows 10, version 1511.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 36FBBC32-AD6A-41F1-86BF-B384891AA693
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SurfaceHub CSP
diff --git a/windows/client-management/mdm/surfacehub-ddf-file.md b/windows/client-management/mdm/surfacehub-ddf-file.md
index d47a546466..590539f3bb 100644
--- a/windows/client-management/mdm/surfacehub-ddf-file.md
+++ b/windows/client-management/mdm/surfacehub-ddf-file.md
@@ -1,15 +1,12 @@
---
title: SurfaceHub DDF file
description: This topic shows the OMA DM device description framework (DDF) for the SurfaceHub configuration service provider. This CSP was added in Windows 10, version 1511.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: D34DA1C2-09A2-4BA3-BE99-AC483C278436
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# SurfaceHub DDF file
diff --git a/windows/client-management/mdm/understanding-admx-backed-policies.md b/windows/client-management/mdm/understanding-admx-backed-policies.md
index 6844ac7526..a308149484 100644
--- a/windows/client-management/mdm/understanding-admx-backed-policies.md
+++ b/windows/client-management/mdm/understanding-admx-backed-policies.md
@@ -1,11 +1,11 @@
---
title: Understanding ADMX-backed policies
description: Starting in Windows 10, version 1703, you can use ADMX-backed policies for Windows 10 mobile device management (MDM) across Windows 10 devices.
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Understanding ADMX-backed policies
diff --git a/windows/client-management/mdm/unifiedwritefilter-csp.md b/windows/client-management/mdm/unifiedwritefilter-csp.md
index a63264b46d..8ef347d5c5 100644
--- a/windows/client-management/mdm/unifiedwritefilter-csp.md
+++ b/windows/client-management/mdm/unifiedwritefilter-csp.md
@@ -1,15 +1,12 @@
---
title: UnifiedWriteFilter CSP
description: The UnifiedWriteFilter (UWF) configuration service provider enables the IT administrator to remotely manage the UWF to help protect physical storage media including any writable storage type.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F4716AC6-0AA5-4A67-AECE-E0F200BA95EB
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# UnifiedWriteFilter CSP
diff --git a/windows/client-management/mdm/unifiedwritefilter-ddf.md b/windows/client-management/mdm/unifiedwritefilter-ddf.md
index 5e72b27c72..ae3e8f02e5 100644
--- a/windows/client-management/mdm/unifiedwritefilter-ddf.md
+++ b/windows/client-management/mdm/unifiedwritefilter-ddf.md
@@ -1,15 +1,12 @@
---
title: UnifiedWriteFilter DDF File
description: UnifiedWriteFilter DDF File
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 23A7316E-A298-43F7-9407-A65155C8CEA6
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# UnifiedWriteFilter DDF File
diff --git a/windows/client-management/mdm/update-csp.md b/windows/client-management/mdm/update-csp.md
index 0d4d052ca3..61923798e2 100644
--- a/windows/client-management/mdm/update-csp.md
+++ b/windows/client-management/mdm/update-csp.md
@@ -1,15 +1,12 @@
---
title: Update CSP
description: Update CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F1627B57-0749-47F6-A066-677FDD3D7359
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Update CSP
diff --git a/windows/client-management/mdm/update-ddf-file.md b/windows/client-management/mdm/update-ddf-file.md
index 564b1a164c..a7617b44d2 100644
--- a/windows/client-management/mdm/update-ddf-file.md
+++ b/windows/client-management/mdm/update-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Update DDF file
description: Update DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E236E468-88F3-402A-BA7A-834ED38DD388
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Update DDF file
diff --git a/windows/client-management/mdm/using-powershell-scripting-with-the-wmi-bridge-provider.md b/windows/client-management/mdm/using-powershell-scripting-with-the-wmi-bridge-provider.md
index 779ba4eec8..8eda2844e1 100644
--- a/windows/client-management/mdm/using-powershell-scripting-with-the-wmi-bridge-provider.md
+++ b/windows/client-management/mdm/using-powershell-scripting-with-the-wmi-bridge-provider.md
@@ -1,15 +1,12 @@
---
title: Using PowerShell scripting with the WMI Bridge Provider
description: This topic covers using PowerShell Cmdlet scripts to configure per-user and per-device policy settings, as well as how to invoke methods through the WMI Bridge Provider.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 238D45AD-3FD8-46F9-B7FB-6AEE42BE4C08
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Using PowerShell scripting with the WMI Bridge Provider
diff --git a/windows/client-management/mdm/vpn-csp.md b/windows/client-management/mdm/vpn-csp.md
index d087514fd2..7310156f21 100644
--- a/windows/client-management/mdm/vpn-csp.md
+++ b/windows/client-management/mdm/vpn-csp.md
@@ -1,15 +1,12 @@
---
title: VPN CSP
description: VPN CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 05ca946a-1c0b-4e11-8d7e-854e14740707
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# VPN CSP
diff --git a/windows/client-management/mdm/vpn-ddf-file.md b/windows/client-management/mdm/vpn-ddf-file.md
index f742ca010e..d5e1303442 100644
--- a/windows/client-management/mdm/vpn-ddf-file.md
+++ b/windows/client-management/mdm/vpn-ddf-file.md
@@ -1,15 +1,12 @@
---
title: VPN DDF file
description: VPN DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 728FCD9C-0B8E-413B-B54A-CD72C9F2B9EE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# VPN DDF file
diff --git a/windows/client-management/mdm/vpnv2-csp.md b/windows/client-management/mdm/vpnv2-csp.md
index 5aaa8632b7..5b48d34a09 100644
--- a/windows/client-management/mdm/vpnv2-csp.md
+++ b/windows/client-management/mdm/vpnv2-csp.md
@@ -1,15 +1,12 @@
---
title: VPNv2 CSP
description: VPNv2 CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 51ADA62E-1EE5-4F15-B2AD-52867F5B2AD2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# VPNv2 CSP
diff --git a/windows/client-management/mdm/vpnv2-ddf-file.md b/windows/client-management/mdm/vpnv2-ddf-file.md
index 88ce8c7589..b91f59555f 100644
--- a/windows/client-management/mdm/vpnv2-ddf-file.md
+++ b/windows/client-management/mdm/vpnv2-ddf-file.md
@@ -1,15 +1,12 @@
---
title: VPNv2 DDF file
description: This topic shows the OMA DM device description framework (DDF) for the VPNv2 configuration service provider.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 4E2F36B7-D2EE-4F48-AD1A-6BDE7E72CC94
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# VPNv2 DDF file
diff --git a/windows/client-management/mdm/vpnv2-profile-xsd.md b/windows/client-management/mdm/vpnv2-profile-xsd.md
index 96e6d32e57..8099da7143 100644
--- a/windows/client-management/mdm/vpnv2-profile-xsd.md
+++ b/windows/client-management/mdm/vpnv2-profile-xsd.md
@@ -1,15 +1,12 @@
---
title: ProfileXML XSD
description: Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some profile examples.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 2F32E14B-F9B9-4760-AE94-E57F1D4DFDB3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# ProfileXML XSD
diff --git a/windows/client-management/mdm/w4-application-csp.md b/windows/client-management/mdm/w4-application-csp.md
index 82856c77c2..1559b6350d 100644
--- a/windows/client-management/mdm/w4-application-csp.md
+++ b/windows/client-management/mdm/w4-application-csp.md
@@ -1,15 +1,12 @@
---
title: w4 APPLICATION CSP
description: w4 APPLICATION CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: ef42b82a-1f04-49e4-8a48-bd4e439fc43a
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# w4 APPLICATION CSP
diff --git a/windows/client-management/mdm/w7-application-csp.md b/windows/client-management/mdm/w7-application-csp.md
index 71bb224ad9..cc931c7f9a 100644
--- a/windows/client-management/mdm/w7-application-csp.md
+++ b/windows/client-management/mdm/w7-application-csp.md
@@ -1,15 +1,12 @@
---
title: w7 APPLICATION CSP
description: w7 APPLICATION CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 10f8aa16-5c89-455d-adcd-d7fb45d4e768
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# w7 APPLICATION CSP
diff --git a/windows/client-management/mdm/wifi-csp.md b/windows/client-management/mdm/wifi-csp.md
index a93b8c9e3f..d1ed9593eb 100644
--- a/windows/client-management/mdm/wifi-csp.md
+++ b/windows/client-management/mdm/wifi-csp.md
@@ -1,15 +1,12 @@
---
title: WiFi CSP
description: WiFi CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: f927cb5f-9555-4029-838b-03fb68937f06
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WiFi CSP
diff --git a/windows/client-management/mdm/wifi-ddf-file.md b/windows/client-management/mdm/wifi-ddf-file.md
index c8ca454737..4443fab25f 100644
--- a/windows/client-management/mdm/wifi-ddf-file.md
+++ b/windows/client-management/mdm/wifi-ddf-file.md
@@ -1,15 +1,12 @@
---
title: WiFi DDF file
description: WiFi DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 00DE1DA7-23DE-4871-B3F0-28EB29A62D61
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WiFi DDF file
diff --git a/windows/client-management/mdm/win32-and-centennial-app-policy-configuration.md b/windows/client-management/mdm/win32-and-centennial-app-policy-configuration.md
index 4fdd9516e1..17d48bf9fe 100644
--- a/windows/client-management/mdm/win32-and-centennial-app-policy-configuration.md
+++ b/windows/client-management/mdm/win32-and-centennial-app-policy-configuration.md
@@ -1,11 +1,11 @@
---
title: Win32 and Desktop Bridge app policy configuration
description: Starting in Windows 10, version 1703, you can import ADMX files and set those ADMX-backed policies for Win32 and Desktop Bridge apps.
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Win32 and Desktop Bridge app policy configuration
diff --git a/windows/client-management/mdm/win32appinventory-csp.md b/windows/client-management/mdm/win32appinventory-csp.md
index 67ef056dbe..935df946c0 100644
--- a/windows/client-management/mdm/win32appinventory-csp.md
+++ b/windows/client-management/mdm/win32appinventory-csp.md
@@ -1,15 +1,12 @@
---
title: Win32AppInventory CSP
description: Win32AppInventory CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: C0DEDD51-4EAD-4F8E-AEE2-CBE9658BCA22
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Win32AppInventory CSP
diff --git a/windows/client-management/mdm/win32appinventory-ddf-file.md b/windows/client-management/mdm/win32appinventory-ddf-file.md
index 893b52b222..97eafeb66c 100644
--- a/windows/client-management/mdm/win32appinventory-ddf-file.md
+++ b/windows/client-management/mdm/win32appinventory-ddf-file.md
@@ -1,15 +1,12 @@
---
title: Win32AppInventory DDF file
description: Win32AppInventory DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: F6BCC10B-BFE4-40AB-AEEE-34679A4E15B0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Win32AppInventory DDF file
diff --git a/windows/client-management/mdm/windows-mdm-enterprise-settings.md b/windows/client-management/mdm/windows-mdm-enterprise-settings.md
index f50b20ad5e..51943be64f 100644
--- a/windows/client-management/mdm/windows-mdm-enterprise-settings.md
+++ b/windows/client-management/mdm/windows-mdm-enterprise-settings.md
@@ -4,15 +4,12 @@ description: The actual management interaction between the device and server is
MS-HAID:
- 'p\_phdevicemgmt.enterprise\_settings\_\_policies\_\_and\_app\_management'
- 'p\_phDeviceMgmt.windows\_mdm\_enterprise\_settings'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 92711D65-3022-4789-924B-602BE3187E23
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# Enterprise settings, policies, and app management
diff --git a/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md b/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md
index ba5104057e..bced249094 100644
--- a/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md
+++ b/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md
@@ -1,15 +1,12 @@
---
title: WindowsAdvancedThreatProtection CSP
description: WindowsAdvancedThreatProtection CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 6C3054CA-9890-4C08-9DB6-FBEEB74699A8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WindowsAdvancedThreatProtection CSP
diff --git a/windows/client-management/mdm/windowsadvancedthreatprotection-ddf.md b/windows/client-management/mdm/windowsadvancedthreatprotection-ddf.md
index 06cf87d740..135648a616 100644
--- a/windows/client-management/mdm/windowsadvancedthreatprotection-ddf.md
+++ b/windows/client-management/mdm/windowsadvancedthreatprotection-ddf.md
@@ -1,15 +1,12 @@
---
title: WindowsAdvancedThreatProtection DDF file
description: WindowsAdvancedThreatProtection DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 0C62A790-4351-48AF-89FD-7D46C42D13E0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WindowsAdvancedThreatProtection DDF file
diff --git a/windows/client-management/mdm/windowslicensing-csp.md b/windows/client-management/mdm/windowslicensing-csp.md
index edff8cdb64..bdc1b02533 100644
--- a/windows/client-management/mdm/windowslicensing-csp.md
+++ b/windows/client-management/mdm/windowslicensing-csp.md
@@ -1,15 +1,12 @@
---
title: WindowsLicensing CSP
description: WindowsLicensing CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: E6BC6B0D-1F16-48A5-9AC4-76D69A7EDDA6
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WindowsLicensing CSP
diff --git a/windows/client-management/mdm/windowslicensing-ddf-file.md b/windows/client-management/mdm/windowslicensing-ddf-file.md
index 68cec1698d..5ac78fc98d 100644
--- a/windows/client-management/mdm/windowslicensing-ddf-file.md
+++ b/windows/client-management/mdm/windowslicensing-ddf-file.md
@@ -1,15 +1,12 @@
---
title: WindowsLicensing DDF file
description: WindowsLicensing DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 2A24C922-A167-4CEE-8F74-08E7453800D2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WindowsLicensing DDF file
diff --git a/windows/client-management/mdm/windowssecurityauditing-csp.md b/windows/client-management/mdm/windowssecurityauditing-csp.md
index 231a3c0329..686a058d93 100644
--- a/windows/client-management/mdm/windowssecurityauditing-csp.md
+++ b/windows/client-management/mdm/windowssecurityauditing-csp.md
@@ -1,15 +1,12 @@
---
title: WindowsSecurityAuditing CSP
description: The WindowsSecurityAuditing configuration service provider (CSP) is used to enable logging of security audit events. This CSP was added in Windows 10, version 1511.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 611DF7FF-21CE-476C-AAB5-3D09C1CDF08A
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WindowsSecurityAuditing CSP
diff --git a/windows/client-management/mdm/windowssecurityauditing-ddf-file.md b/windows/client-management/mdm/windowssecurityauditing-ddf-file.md
index ec06383f5d..cd9ef72d61 100644
--- a/windows/client-management/mdm/windowssecurityauditing-ddf-file.md
+++ b/windows/client-management/mdm/windowssecurityauditing-ddf-file.md
@@ -1,15 +1,12 @@
---
title: WindowsSecurityAuditing DDF file
description: This topic shows the OMA DM device description framework (DDF) for the WindowsSecurityAuditing configuration service provider. This CSP was added in Windows 10, version 1511.
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: B1F9A5FA-185B-48C6-A7F4-0F0F23B971F0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WindowsSecurityAuditing DDF file
diff --git a/windows/client-management/mdm/wmi-providers-supported-in-windows.md b/windows/client-management/mdm/wmi-providers-supported-in-windows.md
index 45bb1e69fe..ade8ecd858 100644
--- a/windows/client-management/mdm/wmi-providers-supported-in-windows.md
+++ b/windows/client-management/mdm/wmi-providers-supported-in-windows.md
@@ -4,15 +4,12 @@ description: WMI providers supported in Windows 10
MS-HAID:
- 'p\_phdevicemgmt.wmi\_providers\_supported\_in\_windows\_10\_technical\_preview'
- 'p\_phDeviceMgmt.wmi\_providers\_supported\_in\_windows'
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
ms.assetid: 7D533044-AAD7-4B8F-B71B-9D52C15A168A
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
---
# WMI providers supported in Windows 10
diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json
index 07ca5a5dc2..9e4397cd87 100644
--- a/windows/configuration/docfx.json
+++ b/windows/configuration/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/configuration/windows-10-start-layout-options-and-policies.md b/windows/configuration/windows-10-start-layout-options-and-policies.md
index d8b003ff30..5fc6d0a993 100644
--- a/windows/configuration/windows-10-start-layout-options-and-policies.md
+++ b/windows/configuration/windows-10-start-layout-options-and-policies.md
@@ -64,7 +64,7 @@ There are three categories of apps that might be pinned to a taskbar:
* Apps pinned by the enterprise, such as in an unattended Windows setup
>[!NOTE]
- >The earlier method of using [TaskbarLinks](https://go.microsoft.com/fwlink/p/?LinkId=761230) in an unattended Windows setup file is deprecated in Windows 10, version 1607.
+ >We recommend using [the layoutmodification.xml method](configure-windows-10-taskbar.md) to configure taskbar options, rather than the earlier method of using [TaskbarLinks](https://go.microsoft.com/fwlink/p/?LinkId=761230) in an unattended Windows setup file.
The following example shows how apps will be pinned - Windows default apps to the left (blue circle), apps pinned by the user in the center (orange triangle), and apps that you pin using XML to the right (green square).
diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json
index 652028bf85..3c58607382 100644
--- a/windows/deployment/docfx.json
+++ b/windows/deployment/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/device-security/auditing/audit-other-object-access-events.md b/windows/device-security/auditing/audit-other-object-access-events.md
index 4501674589..ed9fe36ec9 100644
--- a/windows/device-security/auditing/audit-other-object-access-events.md
+++ b/windows/device-security/auditing/audit-other-object-access-events.md
@@ -22,9 +22,9 @@ Audit Other Object Access Events allows you to monitor operations with scheduled
| Computer Type | General Success | General Failure | Stronger Success | Stronger Failure | Comments |
|-------------------|-----------------|-----------------|------------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Domain Controller | Yes | Yes | Yes | Yes | We recommend Success auditing first of all because of scheduled tasks events.
We recommend Failure auditing to get events about possible ICPM DoS attack. |
-| Member Server | Yes | Yes | Yes | Yes | We recommend Success auditing first of all because of scheduled tasks events.
We recommend Failure auditing to get events about possible ICPM DoS attack. |
-| Workstation | Yes | Yes | Yes | Yes | We recommend Success auditing first of all because of scheduled tasks events.
We recommend Failure auditing to get events about possible ICPM DoS attack. |
+| Domain Controller | Yes | Yes | Yes | Yes | We recommend Success auditing first of all because of scheduled tasks events.
We recommend Failure auditing to get events about possible ICMP DoS attack. |
+| Member Server | Yes | Yes | Yes | Yes | We recommend Success auditing first of all because of scheduled tasks events.
We recommend Failure auditing to get events about possible ICMP DoS attack. |
+| Workstation | Yes | Yes | Yes | Yes | We recommend Success auditing first of all because of scheduled tasks events.
We recommend Failure auditing to get events about possible ICMP DoS attack. |
**Events List:**
diff --git a/windows/device-security/auditing/event-5148.md b/windows/device-security/auditing/event-5148.md
index 7751cd9686..305afcbee8 100644
--- a/windows/device-security/auditing/event-5148.md
+++ b/windows/device-security/auditing/event-5148.md
@@ -15,7 +15,7 @@ author: Mir0sh
- Windows Server 2016
-In most circumstances, this event occurs very rarely. It is designed to be generated when an ICPM DoS attack starts or was detected.
+In most circumstances, this event occurs very rarely. It is designed to be generated when an ICMP DoS attack starts or was detected.
There is no example of this event in this document.
diff --git a/windows/device-security/auditing/event-5149.md b/windows/device-security/auditing/event-5149.md
index 24b3f6ab89..82a1d84b8e 100644
--- a/windows/device-security/auditing/event-5149.md
+++ b/windows/device-security/auditing/event-5149.md
@@ -15,7 +15,7 @@ author: Mir0sh
- Windows Server 2016
-In most circumstances, this event occurs very rarely. It is designed to be generated when an ICPM DoS attack ended.
+In most circumstances, this event occurs very rarely. It is designed to be generated when an ICMP DoS attack ended.
There is no example of this event in this document.
diff --git a/windows/device-security/docfx.json b/windows/device-security/docfx.json
index b0f818ea94..c0e36621af 100644
--- a/windows/device-security/docfx.json
+++ b/windows/device-security/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/device-security/security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md b/windows/device-security/security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md
index f28eab1191..6c96f4605e 100644
--- a/windows/device-security/security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md
+++ b/windows/device-security/security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md
@@ -1,4 +1,4 @@
----
+---
title: Network access - Restrict clients allowed to make remote calls to SAM
description: Security policy setting that controls which users can enumerate users and groups in the local Security Accounts Manager (SAM) database.
ms.prod: w10
@@ -6,7 +6,7 @@ ms.mktglfcycl: explore
ms.sitesec: library
ms.pagetype: security
localizationpriority: high
-author: brianlic-msft
+author: justinha
---
# Network access: Restrict clients allowed to make remote calls to SAM
@@ -23,64 +23,77 @@ author: brianlic-msft
- Windows Server 2008 R2 with [KB 4012218](https://support.microsoft.com/en-us/help/4012218/march-2017-preview-of-monthly-quality-rollup-for-windows-7-sp1-and-windows-server-2008-r2-sp1) installed
-The **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting controls which users can enumerate users and groups in the local Security Accounts Manager (SAM) database. The setting was first supported by Windows 10 version 1607 and Windows Server 2016 (RTM) and can be configured on earlier Windows client and server operating systems by installing updates from the the KB articles listed in **Applies to** section of this topic.
+The **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting controls which users can enumerate users and groups in the local Security Accounts Manager (SAM) database and Active Directory.
+The setting was first supported by Windows 10 version 1607 and Windows Server 2016 (RTM) and can be configured on earlier Windows client and server operating systems by installing updates from the the KB articles listed in **Applies to** section of this topic.
-This topic describes the default values for this security policy setting in different versions of Windows, related events, and how to enable audit mode before constraining the security principals that are allowed to remotely enumerate users and groups in the SAM so that your environment remains secure without adversely impacting application compatibility.
+This topic describes the default values for this security policy setting in different versions of Windows.
+By default, computers beginning with Windows 10 version 1607 and Windows Server 2016 are more restrictive than earlier versions of Windows.
+This means that if you have a mix of computers, such as member servers that run both Windows Server 2016 and Windows Server 2012 R2, the servers that run Windows Server 2016 may fail to enumerate accounts by default where the servers that run Windows Server 2012 R2 succeed.
+
+This topic also covers related events, and how to enable audit mode before constraining the security principals that are allowed to remotely enumerate users and groups so that your environment remains secure without impacting application compatibility.
## Reference
-The SAMRPC protocol makes it possible for a low privileged user to query a machine on a network for data. For example, a user can use SAMRPC to enumerate users, including privileged accounts such as local or domain administrators, or to enumerate groups and group memberships from the local SAM and Active Directory. This information can provide important context and serve as a starting point for an attacker to compromise a domain or networking environment.
+The SAMRPC protocol makes it possible for a low privileged user to query a machine on a network for data.
+For example, a user can use SAMRPC to enumerate users, including privileged accounts such as local or domain administrators, or to enumerate groups and group memberships from the local SAM and Active Directory.
+This information can provide important context and serve as a starting point for an attacker to compromise a domain or networking environment.
-To mitigate this risk, you can configure the **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting to force the security accounts manager (SAM) to do an access check against remote calls. The access check allows or denies remote RPC connections to SAM and Active Directory for users and groups that you define.
+To mitigate this risk, you can configure the **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting to force the security accounts manager (SAM) to do an access check against remote calls.
+The access check allows or denies remote RPC connections to SAM and Active Directory for users and groups that you define.
-By default, the **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting is not defined. If you define it, you can edit the default Security Descriptor Definition Language (SDDL) string to explicitly allow or deny users and groups to make remote calls to the SAM. If the policy setting is left blank after the policy is defined, the policy is not enforced.
+By default, the **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting is not defined.
+If you define it, you can edit the default Security Descriptor Definition Language (SDDL) string to explicitly allow or deny users and groups to make remote calls to the SAM.
+If the policy setting is left blank after the policy is defined, the policy is not enforced.
-The default security descriptor on computers beginning with Windows 10 version 1607 and Windows Server 2016 allows only the local (built-in) Administrators group remote access to SAM on non-domain controllers, and allows Everyone access on domain controllers. You can edit the default security descriptor to allow or deny other users and groups, including the built-in Administrators.
+The default security descriptor on computers beginning with Windows 10 version 1607 and Windows Server 2016 allows only the local (built-in) Administrators group remote access to SAM on non-domain controllers, and allows Everyone access on domain controllers.
+You can edit the default security descriptor to allow or deny other users and groups, including the built-in Administrators.
-The default security descriptor on computers that run earlier versions of Windows does not restrict any remote calls to SAM, but an administrator can edit the security descriptor to enforce restrictions. This less restrictive default allows for testing the impact of enabling restrictions on existing applications.
+The default security descriptor on computers that run earlier versions of Windows does not restrict any remote calls to SAM, but an administrator can edit the security descriptor to enforce restrictions.
+This less restrictive default allows for testing the impact of enabling restrictions on existing applications.
-This means that if you have a mix of computers, such as servers that run both Windows Server 2016 and Windows Server 2012 R2, the servers that run Windows Server 2016 may fail to enumerate accounts by default where the servers that run Windows Server 2012 R2 succeed.
+## Policy and Registry Names
-## Possible values
-- Not defined
-- Defined, along with the security descriptor for users and groups who are allowed or denied remote access to local SAM and Active directory using SAMRPC.
+| | |
+|----|---|
+| Policy Name | Network access: Restrict clients allowed to make remote calls to SAM |
+| Location | Computer Configuration\|Windows Settings\|Security Settings\|Local Policies\|Security Options |
+| Possible values |
- Not defined
- Defined, along with the security descriptor for users and groups who are allowed or denied to use SAMRPC to remotely access either the local SAM or Active Directory. |
+| Registry location | `HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa\RestrictRemoteSam` |
+| Registry type | REG_SZ |
+| Registry value | A string that will contain the SDDL of the security descriptor to be deployed. |
-## Location
+The Group Policy setting is only available on computers that run Windows Server 2016 or Windows 10, version 1607 and later.
+This is the only option to configure this setting by using a user interface (UI).
-Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options
-
-This policy setting controls a string that will contain the SDDL of the security descriptor to be deployed to the following registry setting:
-
-HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa\RestrictRemoteSam
+On computers that run earlier versions of Windows, you need to edit the registry setting directly or use Group Policy Preferences.
+To avoid setting it manually in this case, you can configure the GPO itself on a computer that runs Windows Server 2016 or Windows 10, version 1607 or later and have it apply to all computers within the scope of the GPO because the same registry key exists on every computer after the corresponding KB is installed.
> [!NOTE]
-This policy is implemented similarly to other Network access policies in that there is a single policy element at the registry path listed. There is no notion of a local policy versus an enterprise policy; there is just one policy setting and whichever writes last wins. For example, suppose a local administrator configures this setting as part of a local policy using the Local Security Policy snap-in (Secpol.msc), which edits that same registry path. If an enterprise administrator configures this setting as part of an enterprise GPO, that enterprise GPO will overwrite the same registry path.
+> This policy is implemented similarly to other "Network access" policies in that there is a single policy element at the registry path listed. There is no notion of a local policy versus an enterprise policy; there is just one policy setting and whichever writes last wins.
+
+> For example, suppose a local administrator configures this setting as part of a local policy using the Local Security Policy snap-in (Secpol.msc), which edits that same registry path. If an enterprise administrator configures this setting as part of an enterprise GPO, that enterprise GPO will overwrite the same registry path.
## Default values
-Beginning with Windows 10, version 1607 and Windows Server 2016, computers have hard-coded and more restrictive default values than earlier versions of Windows. The different default values help strike a balance where recent Windows versions are more secure by default and older versions don’t undergo any disruptive behavior changes. Computers that run earlier versions of Windows do not perform any access check by default. That includes domain controllers and non-domain controllers. This allows administrators to test whether applying the same restriction (that is, granting READ_CONTROL access only to members of the local Administrators group) will cause compatibility problems for existing applications before implementing this security policy setting in a production environment.
+Beginning with Windows 10, version 1607 and Windows Server 2016, computers have hard-coded and more restrictive default values than earlier versions of Windows.
+The different default values help strike a balance where recent Windows versions are more secure by default and older versions don’t undergo any disruptive behavior changes.
+Administrators can test whether applying the same restriction earlier versions of Windows will cause compatibility problems for existing applications before implementing this security policy setting in a production environment.
In other words, the hotfix in each KB article provides the necessary code and functionality, but you need to configure the restriction after you install the hotfix—no restrictions are enabled by default after the hotfix is installed on earlier versions of Windows.
-### Default values beginning with Windows 10 version 1607 and Windows Server 2016
-The following default values apply to computers beginning with Windows Server 2016 and Windows 10, version 1607. The default security descriptor for non-domain controllers grants RC access (READ_CONTROL, also known as STANDARD_RIGHTS_READ) only to members of the local (built-in) Administrators group.
-
-
| |Default SDDL |Translated SDDL| Comments
|---|---|---|---|
-|Domain controller (reading Active Directory|“”|-|Everyone has read permissions to preserve compatibility.
-|Non-domain controller|(O:SYG:SYD:(A;;RC;;;BA)| Owner: NTAUTHORITY/SYSTEM (WellKnownGroup) (S-1-5-18)
Primary group: NTAUTHORITY/SYSTEM (WellKnownGroup) (S-1-5-18)
DACL:
• Revision: 0x02
• Size: 0x0020
• Ace Count: 0x001
• Ace[00]------------------------- AceType:0x00
(ACCESS_ALLOWED_ACE_TYPE)
AceSize:0x0018
InheritFlags:0x00
Access Mask:0x00020000
AceSid: BUILTIN\Administrators (Alias) (S-1-5-32-544)
SACL: Not present |Only members of the local (built-in) Administrators group get access.|
-
-### Default values for earlier versions of Windows
-
-The following sections explain how to enable audit only mode to test the restriction while using applications you plan to run.
+|Windows Server 2016 domain controller (reading Active Directory)|“”|-|Everyone has read permissions to preserve compatibility.|
+|Earlier domain controller |-|-|No access check is performed by default.|
+|Windows 10, version 1607 non-domain controller|(O:SYG:SYD:(A;;RC;;;BA)| Owner: NTAUTHORITY/SYSTEM (WellKnownGroup) (S-1-5-18)
Primary group: NTAUTHORITY/SYSTEM (WellKnownGroup) (S-1-5-18)
DACL:
• Revision: 0x02
• Size: 0x0020
• Ace Count: 0x001
• Ace[00]-------------------------
AceType:0x00
(ACCESS\_ALLOWED_ACE_TYPE)
AceSize:0x0018
InheritFlags:0x00
Access Mask:0x00020000
AceSid: BUILTIN\Administrators (Alias) (S-1-5-32-544)
SACL: Not present |Grants RC access (READ_CONTROL, also known as STANDARD_RIGHTS_READ) only to members of the local (built-in) Administrators group. |
+|Earlier non-domain controller |-|-|No access check is performed by default.|
## Policy management
-This section explains how to configure audit-only mode, how to analyze related events that are logged when the Network access: Restrict clients allowed to make remote calls to SAM security policy setting is enabled, and how to configure event throttling to prevent flooding the event log.
+This section explains how to configure audit-only mode, how to analyze related events that are logged when the **Network access: Restrict clients allowed to make remote calls to SAM** security policy setting is enabled, and how to configure event throttling to prevent flooding the event log.
### Audit only mode
-Audit only mode configures the SAM interface to do the access check against the currently configured security descriptor but will not fail the call if the access check fails. Instead, the call will be allowed, but the SAM interface will log an event describing what would have happened if the feature had been enabled. This provides administrators a way to test their applications before enabling the policy in production. Audit only mode is not configured by default. To configure it, add the following registry setting.
+Audit only mode configures the SAMRPC protocol to do the access check against the currently configured security descriptor but will not fail the call if the access check fails. Instead, the call will be allowed, but SAMRPC will log an event describing what would have happened if the feature had been enabled. This provides administrators a way to test their applications before enabling the policy in production. Audit only mode is not configured by default. To configure it, add the following registry setting.
|Registry|Details|
|---|---|
@@ -95,9 +108,7 @@ Audit only mode configures the SAM interface to do the access check against the
There are corresponding events that indicate when remote calls to the SAM are restricted, what accounts attempted to read from the SAM database, and more. The following workflow is recommended to identify applications that may be affected by restricting remote calls to SAM:
1. Dump event logs to a common share.
2. Parse them with the [Events 16962 - 16969 Reader](https://gallery.technet.microsoft.com/Events-16962-16969-Reader-2eae5f1d) script.
-3. Look for the following events:
-• For domain controllers, events are logged in the Directory Services log in Event Viewer with event source Directory-Service-SAM (from Event ID 16962 to 16969, as listed in the following table).
-• For non-domain controllers, the same event IDs are logged in the System log with event source Directory-Service-SAM.
+3. Review Event IDs 16962 to 16969, as listed in the following table, in the System log with event source Directory-Service-SAM.
4. Identify which security contexts are enumerating users or groups in the SAM database.
5. Prioritize the callers, determine if they should be allowed or not, then include the allowed callers in the SDDL string.
diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json
index 863fc12d71..e134b0e320 100644
--- a/windows/hub/docfx.json
+++ b/windows/hub/docfx.json
@@ -34,7 +34,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/threat-protection/docfx.json b/windows/threat-protection/docfx.json
index 5614b0a94c..1078120934 100644
--- a/windows/threat-protection/docfx.json
+++ b/windows/threat-protection/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],
diff --git a/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
index 6e7445cde4..a43f5f374c 100644
--- a/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
@@ -64,7 +64,7 @@ Event ID | Error Type | Resolution steps
:---|:---|:---
5 | Offboarding data was found but couldn't be deleted | Check the permissions on the registry, specifically ```HKLM\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection```.
10 | Onboarding data couldn't be written to registry | Check the permissions on the registry, specifically
```HKLM\SOFTWARE\Policies\Microsoft\Windows Advanced Threat```.
Verify that the script was ran as an administrator.
-15 | Failed to start SENSE service |Check the service health (```sc query sense``` command). Make sure it's not in an intermediate state (*'Pending_Stopped'*, *'Pending_Running'*) and try to run the script again (with administrator rights).
+15 | Failed to start SENSE service |Check the service health (```sc query sense``` command). Make sure it's not in an intermediate state (*'Pending_Stopped'*, *'Pending_Running'*) and try to run the script again (with administrator rights).
If the endpoint is running Windows 10, version 1607 and running the command `sc query sense` returns `START_PENDING`, reboot the machine. If rebooting the machine doesn't address the issue, upgrade to KB4015217 and try onboarding again.
15 | Failed to start SENSE service | If the message of the error is: System error 577 has occurred. You need to enable the Windows Defender ELAM driver, see [Ensure that Windows Defender is not disabled by a policy](#ensure-that-windows-defender-is-not-disabled-by-a-policy) for instructions.
30 | The script failed to wait for the service to start running | The service could have taken more time to start or has encountered errors while trying to start. For more information on events and errors related to SENSE, see [Review events and errors on endpoints with Event viewer](event-error-codes-windows-defender-advanced-threat-protection.md).
35 | The script failed to find needed onboarding status registry value | When the SENSE service starts for the first time, it writes onboarding status to the registry location
```HKLM\SOFTWARE\Microsoft\Windows Advanced Threat Protection\Status```.
The script failed to find it after several seconds. You can manually test it and check if it's there. For more information on events and errors related to SENSE, see [Review events and errors on endpoints with Event viewer](event-error-codes-windows-defender-advanced-threat-protection.md).
diff --git a/windows/whats-new/docfx.json b/windows/whats-new/docfx.json
index f2cd5d5e8b..3c9739ce2e 100644
--- a/windows/whats-new/docfx.json
+++ b/windows/whats-new/docfx.json
@@ -32,7 +32,8 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
- "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
+ "ms.technology": "windows"
},
"fileMetadata": {},
"template": [],