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

.openpublishing.redirection.json

@@ -1,6 +1,16 @@
 {
 "redirections": [
 {
+"source_path": "windows/device-security/windows-security-baselines.md",
+"redirect_url": "https://www.microsoft.com/download/details.aspx?id=55319",
+"redirect_document_id": false 
+},
+{
+"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

devices/surface-hub/surfacehub-whats-new-1703.md

@@ -11,6 +11,12 @@ localizationpriority: medium
 
 # What's new in Windows 10, version 1703 for Microsoft Surface Hub?
 
+Watch Surface Hub engineer Jordan Marchese present updates to Microsoft Surface Hub with Windows 10, version 1703 (Creators Update). 
+
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=R8tX10VIgq0
+" target="_blank"><img src="http://img.youtube.com/vi/R8tX10VIgq0/0.jpg" 
+alt="Watch a video about Creators Update on Surface Hub" width="240" height="180" border="10" /></a>
+
 Windows 10, version 1703 (also called the Creators Update), introduces the following changes for Microsoft Surface Hub:
 
 ## New settings

devices/surface-hub/use-room-control-system-with-surface-hub.md

@@ -44,7 +44,7 @@ This diagram shows the correct pinout used for an RJ-11 (6P6C) to DB9 cable.
 
 Room control systems use common meeting-room scenarios for commands. Commands originate from the room control system, and are communicated over a serial connection to a Surface Hub. Commands are ASCII based, and the Surface Hub will acknowledge when state changes occur.
 
-The following command modifiers are available. Commands terminate with a new line character (/n). Responses can come at any time in response to state changes not triggered directly by a management port command.
+The following command modifiers are available. Commands terminate with a new line character (\n). Responses can come at any time in response to state changes not triggered directly by a management port command.
 
 | Modifier | Result |
 | --- | --- |

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
 
 **<a name="usesetupschoolpcs"></a>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 app](images/suspc_getstarted_050817.png)
+
+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 <a href="https://docs.microsoft.com/en-us/education/windows/use-set-up-school-pcs-app" target="_blank">Use the Set up School PCs app</a> 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).
 

education/index.md

@@ -207,6 +207,25 @@ author: CelesteDG
                                     </div>
                                 </a>
                             </li>
+                            <li>
+                                <a href="/education/windows/use-set-up-school-pcs-app">
+                                    <div class="cardSize">
+                                        <div class="cardPadding">
+                                            <div class="card">
+                                                <div class="cardImageOuter">
+                                                    <div class="cardImage bgdAccent1"> 
+                                                        <img src="/media/hubs/education/education-pro-usb.svg" alt="Set up School PCs" />
+                                                    </div>
+                                                </div>
+                                                <div class="cardText">
+                                                    <h3>Set up School PCs</h3>
+                                                    <p>Use the app to create a provisioning package that you can use to quickly set up one or more Windows 10 devices.</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </li>
                         </ul>
                     </li>
                 </ul>
@@ -331,6 +350,25 @@ author: CelesteDG
                                     </div>
                                 </a>
                             </li>
+                            <li>
+                                <a href="/education/windows/use-set-up-school-pcs-app">
+                                    <div class="cardSize">
+                                        <div class="cardPadding">
+                                            <div class="card">
+                                                <div class="cardImageOuter">
+                                                    <div class="cardImage bgdAccent1"> 
+                                                        <img src="/media/hubs/education/education-pro-usb.svg" alt="Set up School PCs" />
+                                                    </div>
+                                                </div>
+                                                <div class="cardText">
+                                                    <h3>Set up School PCs</h3>
+                                                    <p>Use the app to create a provisioning package that you can use to quickly set up one or more Windows 10 devices.</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </li>
                         </ul>
                     </li>
                 </ul>

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)

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
 

education/windows/configure-windows-for-education.md

@@ -64,7 +64,7 @@ You can configure Windows through provisioning or management tools including ind
 
 You can set all the education compliance areas through both provisioning and management tools. Additionally, these Microsoft education tools will ensure PCs that you set up are education ready:
 - [Set up School PCs](use-set-up-school-pcs-app.md)
-- Intune for Education (coming soon)
+- [Intune for Education](https://docs.microsoft.com/en-us/intune-education/available-settings)
 
 ## AllowCortana
 **AllowCortana** is a policy that enables or disables Cortana. It is a policy node in the Policy configuration service provider, [AllowCortana](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#experience-allowcortana). 
@@ -145,7 +145,7 @@ Provide an ad-free experience that is a safer, more private search option for K
 ### Configurations
 
 #### IP registration for entire school network using Microsoft Edge
-Ad-free searching with Bing in Microsoft Edge can be configured at the network level. To configure this, email bicteam@microsoft.com with the subject "New Windows 10, version 1703 (Creators Update) Registration: [School District Name]" and the include the following information in the body of the email.
+Ad-free searching with Bing in Microsoft Edge can be configured at the network level. To configure this, email bingintheclassroom@microsoft.com with the subject "New Windows 10, version 1703 (Creators Update) Registration: [School District Name]" and the include the following information in the body of the email.
 
 **District information**
 - **District or School Name:**

education/windows/index.md

@@ -37,16 +37,17 @@ author: CelesteDG
 <div class="side-by-side-content-right"><p><b>[Take tests in Windows 10](take-tests-in-windows-10.md)</b><br />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.</p>
 <p><b>[Chromebook migration guide](chromebook-migration-guide.md)</b><br />Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.</p>
 
-## ![Deploy Windows 10 for education](images/PCicon.png) Deploy
+## ![Deploy Windows 10 for Education](images/PCicon.png) Deploy
 
 <p><b>[Set up Windows devices for education](set-up-windows-10.md)</b><br />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.</p><p>
 <p><b>[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)</b><br />Get step-by-step guidance to help you deploy Windows 10 in a school environment.</p>
 <p><b>[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)</b><br />Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.</p>
 <p><b><a href="https://technet.microsoft.com/en-us/windows/mt574244" target="_blank">Try it out: Windows 10 deployment (for education)</a></b><br />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.<br /><br />For the best experience, use this guide in tandem with the <a href="https://vlabs.holsystems.com/vlabs/technet?eng=VLabs&auth=none&src=vlabs&altadd=true&labid=20949&lod=true" target="_blank">TechNet Virtual Lab: IT Pro Try-It-Out</a>.</p>
 
-## ![Upgrade to Windows 10 for education](images/windows.png) Upgrade
+## ![Switch to Windows 10 for Education](images/windows.png) Switch
+
+<p><b>[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)</b><br />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.</p>
 
-<p><b>[Switch Windows 10 Pro to Pro Education from Microsoft Store for Education](windows-10-pro-to-pro-edu-upgrade.md)</b><br />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.</p>
 
 ## Windows 8.1
 

education/windows/set-up-school-pcs-technical.md

@@ -70,7 +70,7 @@ To make this as seamless as possible, in your Azure AD tenant:
 
     ![Set maximum number of devices per user to unlimited](images/azuread_usersandgroups_devicesettings_maxnumberofdevicesperuser.png)
 
-- Clear your Azure AD tokens from time to time. Your tenant can only have 50 automated Azure AD tokens active at any one time.
+- Clear your Azure AD tokens from time to time. Your tenant can only have 500 automated Azure AD tokens active at any one time.
 
     In the Azure portal, select **Azure Active Directory**. Go to **Users and groups > All users** and look at the list of user names. User names that start with **package_** followed by a string of letters and numbers. These are the user accounts that are created automatically for the tokens and you can safely delete these. 
 

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
+
+        ![Enter the details for the Windows edition switch](images/i4e_editionupgrade.png)
+
+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 
+
+    ![Enter the license key to switch to Windows 10 Pro Education](images/wcd_productkey.png)
+
+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://educationstore.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
+
+    ![Eligible for free Windows 10 Pro to Windows 10 Pro Education switch](images/msfe_manage_benefits_switchtoproedu.png)
+
+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
+
+    ![Check the box to confirm](images/msfe_manage_benefits_checktoconfirm.png)
+
+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
+
+    ![Click the email link to switch to Windows 10 Pro Education](images/msfe_clickemaillink_switchtoproedu.png)
+
+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
+
+![Email notifying all global admins about the switch](images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png)
+
+
+## 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
+
+    ![Select how you'd like to set up the device](images/1_howtosetup.png)
+
+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
+
+    ![Enter the account details you use with Office 365 or other Microsoft services](images/2_signinwithms.png)
+
+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
+
+    ![Go to Access work or school in Settings](images/settings_workorschool_1.png)
+
+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
+
+    ![Select the option to join the device to Azure Active Directory](images/settings_setupworkorschoolaccount_2.png)
+
+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
+
+    ![Verify the device is connected to Azure AD](images/settings_connectedtoazuread_3.png)
+
+
+#### 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
+
+<img src="images/win-10-pro-edu-activated-subscription-active.png" alt="Windows 10 activated and subscription active" />
+
+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.
+
+<img src="images/win-10-pro-edu-activated-subscription-active.png" alt="Windows 10 activated and subscription active" /></br></br>
+
+
+**Figure 14** - Illustrates a device on which the existing operating system is not activated, but the Windows 10 Pro Education switch is active.
+
+<img src="images/win-10-pro-edu-not-activated-subscription-active.png" alt="Windows 10 not activated and subscription active" /></br></br>
+
+
+### 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 Education](https://educationstore.microsoft.com/) 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
+
+    ![Revert to Windows 10 Pro](images/msfe_manage_reverttowin10pro.png)
+
+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
+
+![Illustration of Azure Active Directory Connect](images/windows-ad-connect.png)
+
+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)

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
-
+- Customizes the Start layout with Office
-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. 
+- Installs OneDrive for storing cloud-based documents and Sway for creating interactive reports, presentations, and more
-    * Customizes the Start layout with Office
+- Uninstalls apps not specific to education, such as Solitaire
-    * Installs OneDrive for cloud-based documents and places it on the Start menu and taskbar 
+- Prevents students from adding personal Microsoft accounts to the PC
-    * 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
 
 ## Tips for success
 

education/windows/windows-10-pro-to-pro-edu-upgrade.md

@@ -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.
-
-  ![Eligible for free Windows 10 Pro to Windows 10 Pro Education switch](images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png)
-
-  **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.
-
-  ![Email with Windows 10 Pro to Pro Education switch link](images/wsfb_win10_pro_to_proedu_email_upgrade_link.png)
-
-  **Figure 2** - Email notification with a link to enable the switch
-
-6. Click **Enable the automatic upgrade now** to turn on automatic switches.
-
-    ![Enable the automatic switch](images/wsfb_win10_pro_to proedu_upgrade_enable.png).
-
-    **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).
-
-    ![Email informing other global admins about the switch](images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png).
-
-    **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.
-
-  ![Summary page about the switch](images/wsfb_win10_pro_to proedu_upgrade_summary.png)
-
-  **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**.
-
-    <img src="images/windows-who-owns.png" alt="Who owns this PC? page in Windows 10 setup" width="624" height="351" />
-
-    **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**.
-
-    <img src="images/windows-choose-how.png" alt="Choose how you'll connect - page in Windows 10 setup" width="624" height="351" />
-
-    **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**.
-
-    <img src="images/windows-lets-get.png" alt="Let's get you signed in - page in Windows 10 setup" width="624" height="351" />
-
-    **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 &gt; Accounts &gt; Access work or school**, as illustrated in **Figure 9**.
-
-    <img src="images/win10-connect-to-work-or-school.png" alt="Connect to work or school configuration" />
-
-    **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**.
-
-    <img src="images/win10-set-up-work-or-school.png" alt="Set up a work or school account" />
-
-    **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**.
-
-    <img src="images/win10-lets-get-2.png" alt="Let's get you signed in - dialog box" />
-
-    **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.
-
-<img src="images/windows-sign-in.png" alt="Sign in, Windows 10" width="624" height="351" />
-
-**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 &gt; Update & Security &gt; Activation**, as illustrated in **Figure 13**.
-
-<span id="win-10-activated-subscription-active"/>
-
-**Figure 13** - Windows 10 Pro Education in Settings
-
-<img src="images/win-10-pro-edu-activated-subscription-active.png" alt="Windows 10 activated and subscription active" />
-
-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:
-
-<span id="win-10-activated-subscription-active"/>
-
-**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.
-
-<img src="images/win-10-pro-edu-activated-subscription-active.png" alt="Windows 10 activated and subscription active" />
-
-<span id="win-10-not-activated"/>
-
-**Figure 14** - Illustrates a device on which Windows 10 Pro, version 1607 is not activated, but the Windows 10 Pro Education switch is active.
-
-<img src="images/win-10-pro-edu-not-activated-subscription-active.png" alt="Windows 10 not activated and subscription active" /><br><br>
-
-
-### 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**.
-
-  ![Turn off automatic switch to Windows 10 Pro Education](images/wsfb_win10_pro_to proedu_upgrade_disable.png)
-
-  **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.
-
-![Illustration of Azure Active Directory Connect](images/windows-ad-connect.png)
-
-**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)

store-for-business/update-windows-store-for-business-account-settings.md

@@ -61,13 +61,13 @@ Taxes for Microsoft Store for Business purchases are determined by your business
 - Switzerland
 - United Kingdom
 
-These countries can provide their VAT number or local equivalent in **Payments & billing**. However, they can only acquire free apps.  
+These countries can provide their VAT number or local equivalent in **Payments & billing**.   
 
 |Market| Tax identifier |
 |------|----------------|
-| Brazil | CPNJ (required), CCMID  (optional) |
+| Brazil | CNPJ (required) |
-| India | CST ID, VAT ID |
+| India | CST ID, VAT ID (both are optional) |
-| Taiwan | Unified business number|
+| Taiwan | VAT ID (optional) |
 
 ### Tax-exempt status 
 

store-for-business/windows-store-for-business-overview.md

@@ -157,6 +157,193 @@ For more information, see [Manage settings in the Store for Business](manage-set
 
 Microsoft Store for Business and Education is currently available in these markets.
 
+<!--- <table>
+   <tr>
+        <th align="center" colspan="4">Support for free and paid apps</th>
+   </tr>
+   <tr align="left">
+     <td>
+        <ul>
+            <li>Algeria</li>
+            <li>Angola</li>
+            <li>Argentina</li>
+            <li>Australia</li>
+            <li>Austria</li>
+            <li>Bahamas</li>
+            <li>Bahrain</li>
+            <li>Bangladesh</li>
+            <li>Barbados</li>
+            <li>Belgium</li>
+            <li>Belize</li>
+            <li>Bermuda</li>
+            <li>Bhutan</li>
+            <li>Bolivia</li>
+            <li>Botswana</li>
+            <li>Brunei Darussalam</li>
+            <li>Bulgaria</li>
+            <li>Cambodia</li>
+            <li>Cameroon</li>
+            <li>Canada</li>
+            <li>Republic of Cabo Verde</li>
+            <li>Cayman Islands</li>
+            <li>Chile</li>
+            <li>Colombia</li>
+            <li>Costa Rica</li>
+            <li>C&ocirc;te D'ivoire</li>
+            <li>Croatia</li>
+            <li>Cur&ccedil;ao</li>
+            <li>Cyprus</li>
+        </ul>
+    </td>
+     <td>
+        <ul>
+            <li>Czech Republic</li>
+            <li>Denmark</li>
+            <li>Dominican Republic</li>
+            <li>Ecuador</li>
+            <li>Egypt</li>
+            <li>El Salvador</li>
+            <li>Estonia</li>
+            <li>Faroe Islands</li>
+            <li>Fiji</li>
+            <li>Finland</li>
+            <li>France</li>
+            <li>Germany</li>
+            <li>Ghana</li>
+            <li>Greece</li>
+            <li>Guadeloupe</li>
+            <li>Guatemala</li>
+            <li>Honduras</li>
+            <li>Hong Kong SAR</li>
+            <li>Hungary</li>
+            <li>Iceland</li>
+            <li>Indonesia</li>
+            <li>Iraq</li>
+            <li>Ireland</li>
+            <li>Israel</li>
+            <li>Italy</li>
+            <li>Jamaica</li>
+            <li>Japan</li>
+            <li>Jordan</li>
+            <li>Kenya</li> 
+        </ul>
+    </td>
+    <td>
+        <ul>
+            <li>Kuwait</li>
+            <li>Latvia</li>
+            <li>Lebanon</li>
+            <li>Libya</li>
+            <li>Liechtenstein</li>
+            <li>Lithuania</li>
+            <li>Luxembourg</li>
+            <li>Malaysia</li>
+            <li>Malta</li>
+            <li>Mauritius</li>
+            <li>Mexico</li>
+            <li>Mongolia</li>
+            <li>Montenegro</li>
+            <li>Morocco</li>
+            <li>Mozambique</li>
+            <li>Namibia</li>
+            <li>Netherlands</li>
+            <li>New Zealand</li>
+            <li>Nicaragua</li>
+            <li>Nigeria</li>
+            <li>Norway</li>
+            <li>Oman</li>
+            <li>Pakistan</li>
+            <li>Palestinian Authority</li>
+            <li>Panama</li>
+            <li>Paraguay</li>
+            <li>Peru</li>
+            <li>Philippines</li>
+            <li>Poland</li>          
+        </ul>
+    </td>
+    <td>
+        <ul>
+            <li>Portugal</li>
+            <li>Puerto Rico</li>
+            <li>Qatar</li>
+            <li>Romania</li>
+            <li>Rwanda</li>
+            <li>Saint Kitts and Nevis</li>
+            <li>Saudi Arabia</li>
+            <li>Senegal</li>
+            <li>Serbia</li>
+            <li>Singapore</li>
+            <li>Slovakia</li>
+            <li>Slovenia</li>
+            <li>South Africa</li>
+            <li>Spain</li>
+            <li>Sweden</li>
+            <li>Switzerland</li>
+            <li>Tanzania</li>
+            <li>Thailand</li>
+            <li>Trinidad and Tobago</li>
+            <li>Tunisia</li>
+            <li>Turkey</li>
+            <li>Uganda</li>
+            <li>United Arab Emirates</li>
+            <li>United Kingdom</li>
+            <li>United States</li>           
+        </ul>
+    </td>
+    <td>
+        <ul>
+            <li>Uruguay</li>
+            <li>Viet Nam</li>
+            <li>Virgin Islands, U.S.</li>
+            <li>Zambia</li>
+            <li>Zimbabwe<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</li>           
+        </ul>
+    </td>
+   </tr>
+</table>
+
+<table>
+   <tr>
+        <th align="center">Support for free apps only</th>
+   </tr>
+   <tr align="left">
+     <td>
+        <ul>
+            <li>Russia</li>
+        </ul>
+    </td>
+   </tr>
+</table>
+
+<table>
+   <tr>
+        <th align="center">Support for free apps and Minecraft: Education Edition</th>
+   </tr>
+   <tr align="left">
+     <td>
+        <ul>
+            <li>Albania</li>
+            <li>Armenia</li>
+            <li>Azerbaijan</li>
+            <li>Belarus</li>
+            <li>Bosnia</li>
+            <li>Brazil</li>
+            <li>Georgia</li>
+            <li>India</li>
+            <li>Kazakhstan</li>
+            <li>Korea</li>
+            <li>Kyrgyzstan</li>
+            <li>Moldova</li>
+            <li>Taiwan</li>
+            <li>Tajikistan</li>
+            <li>Turkmenistan</li>
+            <li>Ukraine</li>
+            <li>Uzbekistan</li>
+        </ul>
+    </td>
+   </tr>
+</table> -->
+### Support for free and paid apps
 <table>
    <tr>
         <th align="center" colspan="4">Support for free and paid apps</th>
@@ -294,22 +481,29 @@ Microsoft Store for Business and Education is currently available in these marke
    </tr>
 </table>
 
-<table>
+### Support for free apps
-   <tr>
+Customers in these markets can use Microsoft Store for Business and Education to acquire free apps:
-        <th align="center">Support for free apps only</th>
+- India
-   </tr>
+- Russia 
-   <tr align="left">
+
-     <td>
+### Support for free apps and Minecraft: Education Edition
-        <ul>
+Customers in these markets can use Microsoft Store for Business and Education to acquire free apps and Minecraft: Education Edition:  
-            <li>Brazil</li>
+- Brazil
-            <li>India</li>
+- Taiwan
-            <li>Russia</li>
+- Ukraine 
-            <li>Taiwan</li>
+
-            <li>Ukraine</li>
+This table summarize what customers can purchase, depending on which Microsoft Store they are using. 
-        </ul>
+
-    </td>
+| Store | Free apps | Minecraft: Education Edition |
-   </tr>
+| ----- | --------- | ---------------------------- |
-</table>
+| Microsoft Store for Business | supported | not supported |
+| Microsoft Store for Education | supported | supported; invoice payment required |
+
+> [!NOTE]
+> **Microsoft Store for Education customers with support for free apps and Minecraft: Education Edition**
+- Admins can acquire free apps from **Microsoft Store for Education**.
+- Admins need to use an invoice to purchase **Minecraft: Education Edition**. For more information, see [Invoice payment option](https://docs.microsoft.com/education/windows/school-get-minecraft#invoices). 
+- Teachers, or people with the Basic Purachaser role, can acquire free apps, but not **Minecraft: Education Edition**. 
 
 ## Privacy notice
 

windows/access-protection/enterprise-certificate-pinning.md

@@ -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**
+| Attribute | Description | Required |
-
+|-----------|-------------|----------|
-    Specifies when the Pin Rules will expire. 
+|  **Duration** or **NextUpdate** | Specifies when the Pin Rules will expire. Either is required. **NextUpdate** takes precedence if both are specified. <br>  **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. |
-    Either is required. 
+| **LogDuration** or **LogEndDate** | Configures auditing only to extend beyond the expiration of enforcing the Pin Rules. <br>  **LogEndDate**, represented as an XML DateTime data type in UTC, takes precedence if both are specified. <br>  You represent **LogDuration** as an XML TimeSpan data type, which does not allow years and months. <br>  If neither attribute is specified, auditing expiration uses **Duration** or **NextUpdate** attributes. | No. | 
-    **NextUpdate** takes precedence if both are specified. 
+| **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. |
-    
-    **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.
 
 #### PinRule Element    
 
-The **PinRule** element can have the following attributes: 
+The **PinRule** element can have the following attributes. 
 
-- **Name**
+| Attribute | Description | Required |
-
+|-----------|-------------|----------|
-    Uniquely identifies the **PinRule**. 
+| **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.|
-    Windows uses this attribute to identify the element for a parsing error or for verbose output. 
+| **Error** | Describes the action Windows performs when it encounters a PIN mismatch. You can choose from the following string values: <br>- **Revoked** - Windows reports the certificate protecting the site as if it was revoked. This typically prevents the user from accessing the site. <br>- **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. <br>- **None** - The default value.  No error is returned. You can use this setting to audit the pin rules without introducing any user friction. | No. |
-    The attribute is not included in the generated certificate trust list (CTL).
+| **Log** | A Boolean value represent as string that equals **true** or **false**. By default, logging is enabled (**true**). | No. |
-
-    **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.
 
 #### Certificate element 
 
-The **Certificate** element can have the following attributes:
+The **Certificate** element can have the following attributes.
 
-- **File**
+| Attribute | Description | Required |
-
+|-----------|-------------|----------|
-    Path to a file containing one or more certificates. 
+| **File**  | Path to a file containing one or more certificates.  Where the certificate(s) can be encoded as: <br>- single certificate <br>- p7b <br>- sst <br> 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). |
-    Where the certificate(s) can be encoded as:
+| **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). | 
-        - single certificate
+| **Base64** | Base64 encoded certificate(s). Where the certificate(s) can be encoded as: <br>- single certificate <br>- p7b <br> - sst <br> This allows the certificates to be included in the XML file without a file directory dependency. <br> Note: <br> 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). |
-        - p7b
+| **EndDate** | Enables you to configure an expiration date for when the certificate is no longer valid in the pin rule. <br>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.<br> 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.<br> For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml).| No.|
-        - 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. 
 
 #### Site element
 
-The **Site** element can have the following attributes:
+The **Site** element can have the following attributes.
 
-- **Domain** 
+| Attribute | Description | Required |
-
+|-----------|-------------|----------|
-    Contains the DNS name to be matched for this pin rule. 
+| **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: <br>- If the DNS name has a leading "*" it is removed. <br>- Non-ASCII DNS name are converted to ASCII Puny Code. <br>- Upper case ASCII characters are converted to lower case. <br>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.|
-    When creating the certificate trust list, the parser normalizes the input name string value as follows:
+| **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.<br>For example, setting this attribute would also match "123.abc.xyz.com" for the ".xyz.com" domain value.| No.|
-        - 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. 
     
 ### Create a Pin Rules Certificate Trust List
 
@@ -289,9 +189,12 @@ Sign-in to the reference computer using domain administrator equivalent credenti
 8.	Right-click the **Registry** node and click **New**.
 9.	In the **New Registry Properties** dialog box, select **Update** from the **Action** list.  Select **HKEY_LOCAL_MACHINE** from the **Hive** list.
 10.	For the **Key Path**, click **…** to launch the **Registry Item Browser**.  Navigate to the following registry key and select the **PinRules** registry value name:
+
     HKLM\SOFTWARE\Microsoft\Cryptography\OID\EncodingType0\CertDllCreateCertificateChainEngine\Config  
+
     Click **Select** to close the **Registry Item Browser**.
-11.	The **Key Path** should contain the selected registry key. The **Value name** configuration should contain the registry value name **_PinRules_**. **Value type** should read **_REGBINARY_** and **Value data** should contain a long series of numbers from 0-9 and letters ranging from A-F (hexadecimal).  Click **OK** to save your settings and close the dialog box.
+    
+11.	The **Key Path** should contain the selected registry key. The **Value name** configuration should contain the registry value name **_PinRules_**. **Value type** should read **_REG\_BINARY_** and **Value data** should contain a long series of numbers from 0-9 and letters ranging from A-F (hexadecimal).  Click **OK** to save your settings and close the dialog box.
 
     ![PinRules Properties](images/enterprise-certificate-pinning-pinrules-properties.png)
     
@@ -302,10 +205,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 |

windows/client-management/TOC.md

@@ -9,5 +9,5 @@
 ## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
 ## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
 ## [Windows libraries](windows-libraries.md)
-## [Mobile Device Management](mdm/index.md)
+## [Mobile device management protocol](mdm/index.md)
 ## [Change history for Client management](change-history-for-client-management.md)

windows/client-management/join-windows-10-mobile-to-azure-active-directory.md

@@ -191,7 +191,7 @@ To see the Notebooks that your Azure AD account has access to, tap **More Notebo
 ## Use Windows Store for Business
 
 
-[Windows Store for Business](/microsoft-store/index) allows you to specify applications to be available to your users in the Windows Store application. These applications show up on a tab titled for your company. Applications approved in the Windows Store for Business portal can be installed by users.
+[Microsoft Store for Business](/microsoft-store/index) allows you to specify applications to be available to your users in the Windows Store application. These applications show up on a tab titled for your company. Applications approved in the Microsoft Store for Business portal can be installed by users.
 
 ![company tab on store](images/aadjwsfb.jpg)
 

windows/client-management/mdm/TOC.md

@@ -141,6 +141,8 @@
 #### [EnterpriseModernAppManagement DDF](enterprisemodernappmanagement-ddf.md)
 #### [EnterpriseModernAppManagement XSD](enterprisemodernappmanagement-xsd.md)
 ### [FileSystem CSP](filesystem-csp.md)
+### [Firewall CSP](firewall-csp.md)
+#### [Firewall DDF file](firewall-ddf-file.md)
 ### [HealthAttestation CSP](healthattestation-csp.md)
 #### [HealthAttestation DDF](healthattestation-ddf.md)
 ### [HotSpot CSP](hotspot-csp.md)
@@ -196,6 +198,8 @@
 #### [SUPL DDF file](supl-ddf-file.md)
 ### [SurfaceHub CSP](surfacehub-csp.md)
 #### [SurfaceHub DDF file](surfacehub-ddf-file.md)
+### [TPMPolicy CSP](tpmpolicy-csp.md)
+#### [TPMPolicy DDF file](tpmpolicy-ddf-file.md)
 ### [UnifiedWriteFilter CSP](unifiedwritefilter-csp.md)
 #### [UnifiedWriteFilter DDF file](unifiedwritefilter-ddf.md)
 ### [Update CSP](update-csp.md)

windows/client-management/mdm/activesync-csp.md

@@ -1,19 +1,14 @@
 ---
 title: ActiveSync CSP
 description: ActiveSync CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: c65093ef-bd36-4f32-9dab-edb7bcfb3188
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # ActiveSync CSP
 
 

windows/client-management/mdm/activesync-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: ActiveSync DDF file
 description: ActiveSync DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: c4cd4816-ad8f-45b2-9b81-8abb18254096
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # ActiveSync DDF file
 
 

windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Add an Azure AD tenant and Azure AD subscription
 
 Here's a step-by-step guide to adding an Azure Active Directory tenant, adding an Azure AD subscription, and registering your subscription.

windows/client-management/mdm/alljoynmanagement-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AllJoynManagement CSP
 
 

windows/client-management/mdm/alljoynmanagement-ddf.md

@@ -1,19 +1,14 @@
 ---
 title: AllJoynManagement DDF
 description: AllJoynManagement DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 540C2E60-A041-4749-A027-BBAF0BB046E4
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AllJoynManagement DDF
 
 

windows/client-management/mdm/application-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # APPLICATION configuration service provider
 
 

windows/client-management/mdm/applicationrestrictions-xsd.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # ApplicationRestrictions XSD
 
 

windows/client-management/mdm/applocker-csp.md

@@ -1,19 +1,14 @@
 ---
 title: AppLocker CSP
 description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AppLocker CSP
 
 
@@ -338,343 +333,7 @@ When you create a list of allowed apps in Windows 10 Mobile, you must also incl
 The product name is first part of the PackageFullName followed by the version number.
 
 | Settings app name                  | PackageFullName or Product name                                         | ProductID                            |
-|---
+|------------------------------------|-------------------------------------------------------------------------|--------------------------------------|
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
-|---
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|---
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: AppLocker CSP
-description: AppLocker CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
---|
 | Work or school account             | Microsoft.AAD.BrokerPlugin                                              | e5f8b2c4-75ae-45ee-9be8-212e34f77747 |
 | Email and accounts                 | Microsoft.AccountsControl                                               | 39cf127b-8c67-c149-539a-c02271d07060 |
 | SettingsPageKeyboard               | 5b04b775-356b-4aa0-aaf8-6491ffea5608\_1.1.0.0\_neutral\_\_cw8ffb7c56vgc | 5b04b775-356b-4aa0-aaf8-6491ffea5608 |

windows/client-management/mdm/applocker-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: AppLocker DDF file
 description: AppLocker DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 79E199E0-5454-413A-A57A-B536BDA22496
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AppLocker DDF file
 
 

windows/client-management/mdm/applocker-xsd.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AppLocker XSD
 
 

windows/client-management/mdm/appv-deploy-and-config.md

@@ -1,18 +1,13 @@
 ---
 title: Deploy and configure App-V apps using MDM
 description: Deploy and configure App-V apps using MDM
-MSHAttr:
+ms.author: maricia
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: exists
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Deploy and configure App-V apps using MDM
 
 ## Executive summary

windows/client-management/mdm/assign-seats.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Assign seat
 
 The **Assign seat** operation assigns seat for a specified user in the Windows Store for Business.

windows/client-management/mdm/assignedaccess-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AssignedAccess CSP
 
 

windows/client-management/mdm/assignedaccess-ddf.md

@@ -1,19 +1,14 @@
 ---
 title: AssignedAccess DDF
 description: AssignedAccess DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 224FADDB-0EFD-4E5A-AE20-1BD4ABE24306
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # AssignedAccess DDF
 
 

windows/client-management/mdm/azure-active-directory-integration-with-mdm.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 <head>
 <style type='text/css'> table.topalign td { vertical-align: top } </style>
 </head>

windows/client-management/mdm/bitlocker-csp.md

@@ -1,18 +1,13 @@
 ---
 title: BitLocker CSP
 description: BitLocker CSP
-MSHAttr:
+ms.author: maricia
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: exists
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # BitLocker CSP
 
 The BitLocker configuration service provider (CSP) is used by the enterprise to manage encryption of PCs and devices. This CSP was added in Windows 10, version 1703.
@@ -676,7 +671,7 @@ The following example is provided to show proper format and should not be taken
 	<CmdID>110</CmdID>
 	<Item>
 		<Target>
-			<LocURI>./Device/Vendor/MSFT/BitLocker/DisableWarningForOtherDiskEncryption</LocURI>
+			<LocURI>./Device/Vendor/MSFT/BitLocker/AllowWarningForOtherDiskEncryption</LocURI>
 		</Target>
 		<Meta>
 			<Format xmlns="syncml:metinf">int</Format>

windows/client-management/mdm/bitlocker-ddf-file.md

@@ -1,18 +1,13 @@
 ---
 title: BitLocker DDF file
 description: BitLocker DDF file
-MSHAttr:
+ms.author: maricia
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: exists
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # BitLocker DDF file
 
 This topic shows the OMA DM device description framework (DDF) for the **BitLocker** configuration service provider. 

windows/client-management/mdm/bootstrap-csp.md

@@ -1,19 +1,14 @@
 ---
 title: BOOTSTRAP CSP
 description: BOOTSTRAP CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: b8acbddc-347f-4543-a45b-ad2ffae3ffd0
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # BOOTSTRAP CSP
 
 

windows/client-management/mdm/browserfavorite-csp.md

@@ -1,19 +1,14 @@
 ---
 title: BrowserFavorite CSP
 description: BrowserFavorite CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 5d2351ff-2d6a-4273-9b09-224623723cbf
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # BrowserFavorite CSP
 
 
@@ -34,35 +29,7 @@ The following diagram shows the BrowserFavorite configuration service provider i
 
 ![browserfavorite csp (cp)](images/provisioning-csp-browserfavorite-cp.png)
 
-<a href="" id="favorite-name---
+<a href="" id="favorite-name-------------"></a>***favorite name***   
-title: BrowserFavorite CSP
-description: BrowserFavorite CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 5d2351ff-2d6a-4273-9b09-224623723cbf
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: BrowserFavorite CSP
-description: BrowserFavorite CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 5d2351ff-2d6a-4273-9b09-224623723cbf
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--"></a>***favorite name***   
 Required. Specifies the user-friendly name of the favorite URL that is displayed in the Favorites list of Internet Explorer.
 
 > **Note**  The *favorite name* should contain only characters that are valid in the Windows file system. The invalid characters are: \\ / : \* ? " &lt; &gt; |

windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Bulk assign and reclaim seats from users
 
 The **Bulk assign and reclaim seats from users** operation returns reclaimed or assigned seats in the Windows Store for Business.

windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md

@@ -4,20 +4,15 @@ 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
 
-
 # Bulk enrollment
 
 Bulk enrollment is an efficient way to set up a large number of devices to be managed by an MDM server without the need to re-image the devices. In Windows 10 desktop and mobile devices, you can use the [Provisioning CSP](provisioning-csp.md) for bulk enrollment, except for the Azure Active Directory Join (Cloud Domain Join) enrollment scenario.

windows/client-management/mdm/cellularsettings-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CellularSettings CSP
 description: CellularSettings CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: ce8b6f16-37ca-4aaf-98b0-306d12e326df
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CellularSettings CSP
 
 The CellularSettings configuration service provider is used to configure cellular settings on a mobile device.

windows/client-management/mdm/certificate-authentication-device-enrollment.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Certificate authentication device enrollment
 
 

windows/client-management/mdm/certificate-renewal-windows-mdm.md

@@ -4,19 +4,14 @@ 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Certificate Renewal
 
 

windows/client-management/mdm/certificatestore-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CertificateStore CSP
 description: CertificateStore CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 0fe28629-3cc3-42a0-91b3-3624c8462fd3
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CertificateStore CSP
 
 

windows/client-management/mdm/certificatestore-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CertificateStore DDF file
 
 

windows/client-management/mdm/cleanpc-csp.md

@@ -1,18 +1,13 @@
 ---
 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:
+ms.author: maricia
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: exists
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CleanPC CSP
 
 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.

windows/client-management/mdm/cleanpc-ddf.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CleanPC DDF
 
 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.

windows/client-management/mdm/clientcertificateinstall-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: ClientCertificateInstall DDF file
 description: ClientCertificateInstall DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 7F65D045-A750-4CDE-A1CE-7D152AA060CA
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # ClientCertificateInstall DDF file
 
 

windows/client-management/mdm/cm-cellularentries-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CM\_CellularEntries CSP
 description: CM\_CellularEntries CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: f8dac9ef-b709-4b76-b6f5-34c2e6a3c847
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CM\_CellularEntries CSP
 
 The CM\_CellularEntries configuration service provider is used to configure the General Packet Radio Service (GPRS) entries on the device. It defines each GSM data access point.

windows/client-management/mdm/cm-proxyentries-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CM\_ProxyEntries CSP
 description: CM\_ProxyEntries CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: f4c3dc71-c85a-4c68-9ce9-19f408ff7a0a
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CM\_ProxyEntries CSP
 
 

windows/client-management/mdm/cmpolicy-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CMPolicy CSP
 description: CMPolicy CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 62623915-9747-4eb1-8027-449827b85e6b
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CMPolicy CSP
 
 

windows/client-management/mdm/cmpolicyenterprise-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CMPolicyEnterprise CSP
 description: CMPolicyEnterprise CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A0BE3458-ABED-4F80-B467-F842157B94BF
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CMPolicyEnterprise CSP
 
 

windows/client-management/mdm/cmpolicyenterprise-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: CMPolicyEnterprise DDF file
 description: CMPolicyEnterprise DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 065EF07A-0CF3-4EE5-B620-3464A75B7EED
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CMPolicyEnterprise DDF file
 
 

windows/client-management/mdm/configuration-service-provider-reference.md

@@ -1,24 +1,28 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Configuration service provider reference
 
+> [!WARNING]
+> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
 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). 
+
+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)
 
 The following tables show the configuration service providers support in Windows 10.  
 
@@ -1147,6 +1151,34 @@ The following tables show the configuration service providers support in Windows
 <!--EndSKU-->
 <!--EndCSP-->
 
+<!--StartCSP-->
+[Firewall CSP](firewall-csp.md)  
+
+<!--StartSKU-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+</tr>
+</table>
+
+<!--EndSKU-->
+<!--EndCSP-->
+
 <!--StartCSP-->
 [HealthAttestation CSP](healthattestation-csp.md)  
 
@@ -2015,6 +2047,34 @@ The following tables show the configuration service providers support in Windows
 <!--EndSKU-->
 <!--EndCSP-->
 
+<!--StartCSP-->
+[TPMPolicy CSP](tpmpolicy-csp.md)  
+
+<!--StartSKU-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+</tr>
+</table>
+
+<!--EndSKU-->
+<!--EndCSP-->
+
 <!--StartCSP-->
 [UnifiedWriteFilter CSP](unifiedwritefilter-csp.md)  
 
@@ -2330,6 +2390,7 @@ The following tables show the configuration service providers support in Windows
  Footnotes: 
 - 1 - Added in Windows 10, version 1607
 - 2 - Added in Windows 10, version 1703  
+- 3 - Added in the next major update to Windows 10  
 
 > [!Note]  
 > You can download the Windows 10 version 1607 DDF files from [here](http://download.microsoft.com/download/2/3/E/23E27D6B-6E23-4833-B143-915EDA3BDD44/Windows10_1607_DDF.zip).
@@ -2341,427 +2402,7 @@ The following tables show the configuration service providers support in Windows
 The following list shows the configuration service providers supported in Windows Holographic editions.
 
 | Configuration service provider                                                                        | Windows Holographic edition      | Windows Holographic for Business edition |
-|---
+|-------------------------------------------------------------------------------------------------------|-------------------------------------|-------------------------------------------|
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|---
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|---
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|
 | [Application CSP](application-csp.md)                                     | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png)       |
 | [AppLocker CSP](applocker-csp.md)                                         | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)       |
 | [CertificateStore CSP](certificatestore-csp.md)                           | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png)       |
@@ -2852,3 +2493,54 @@ Footnotes:
 - [Update CSP](update-csp.md)
 - [VPNv2 CSP](vpnv2-csp.md)
 - [WiFi CSP](wifi-csp.md)
+
+## <a href="" id="windows10s"></a>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)

windows/client-management/mdm/create-a-custom-configuration-service-provider.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Create a custom configuration service provider
 
 Mobile device OEMs can create custom configuration service providers to manage their devices. A configuration service provider includes an interface for creating, editing, and deleting nodes, and the nodes themselves. Each node contains data for one registry value and can optionally support get, set, and delete operations.

windows/client-management/mdm/customdeviceui-csp.md

@@ -1,19 +1,14 @@
 ---
 title: CustomDeviceUI CSP
 description: CustomDeviceUI CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 20ED1867-7B9E-4455-B397-53B8B15C95A3
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CustomDeviceUI CSP
 
 The CustomDeviceUI configuration service provider allows OEMs to implement their custom foreground application, as well as the background tasks to run on an IoT device running IoT Core. Only one foreground application is supported per device. Multiple background tasks are supported.

windows/client-management/mdm/customdeviceui-ddf.md

@@ -1,19 +1,14 @@
 ---
 title: CustomDeviceUI DDF
 description: CustomDeviceUI DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: E6D6B902-C57C-48A6-9654-CCBA3898455E
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # CustomDeviceUI DDF
 
 

windows/client-management/mdm/data-structures-windows-store-for-business.md

@@ -3,20 +3,15 @@ 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Data structures for Windows Store for Business
 
 

windows/client-management/mdm/defender-csp.md

@@ -1,19 +1,14 @@
 ---
 title: Defender CSP
 description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Defender CSP
 
 
@@ -70,77 +65,7 @@ The data type is a integer.
 The following table describes the supported values:
 
 | Value | Description                 |
-|---
+|-------|-----------------------------|
-title: Defender CSP
-description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|---
-title: Defender CSP
-description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: Defender CSP
-description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: Defender CSP
-description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: Defender CSP
-description: Defender CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
------|
 | 0     | Invalid                     |
 | 1     | Adware                      |
 | 2     | Spyware                     |

windows/client-management/mdm/defender-ddf.md

@@ -1,19 +1,14 @@
 ---
 title: Defender DDF file
 description: Defender DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 39B9E6CF-4857-4199-B3C3-EC740A439F65
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Defender DDF file
 
 

windows/client-management/mdm/design-a-custom-windows-csp.md

@@ -4,19 +4,14 @@ 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Design a custom configuration service provider
 
 To design a custom configuration service provider, the OEM must perform the following steps:

windows/client-management/mdm/devdetail-csp.md

@@ -1,19 +1,14 @@
 ---
 title: DevDetail CSP
 description: DevDetail CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 719bbd2d-508d-439b-b175-0874c7e6c360
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DevDetail CSP
 
 The DevDetail configuration service provider handles the management object which provides device-specific parameters to the OMA DM server. These device parameters are not sent from the client to the server automatically, but can be queried by servers using OMA DM commands.

windows/client-management/mdm/devdetail-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: DevDetail DDF file
 description: DevDetail DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 645fc2b5-2d2c-43b1-9058-26bedbe9f00d
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DevDetail DDF file
 
 This topic shows the OMA DM device description framework (DDF) for the **DevDetail** configuration service provider. DDF files are used only with OMA DM provisioning XML.

windows/client-management/mdm/developersetup-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeveloperSetup CSP
 
 The DeveloperSetup configuration service provider (CSP) is used to configure Developer Mode on the device and connect to the Windows Device Portal. For more information about the Windows Device Portal, see [Windows Device Portal overview](https://msdn.microsoft.com/en-us/windows/uwp/debug-test-perf/device-portal). This CSP was added in Windows 10, version 1703.

windows/client-management/mdm/developersetup-ddf.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeveloperSetup DDF file
 
 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.

windows/client-management/mdm/device-update-management.md

@@ -1,20 +1,15 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
 
-
 # Device update management
 
 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. In Windows 10, we are investing heavily in extending the management capabilities available to MDMs. One key feature we are adding is the ability for MDMs to keep devices up-to-date with the latest Microsoft Updates.

windows/client-management/mdm/deviceinstanceservice-csp.md

@@ -1,19 +1,14 @@
 ---
 title: DeviceInstanceService CSP
 description: DeviceInstanceService CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: f113b6bb-6ce1-45ad-b725-1b6610721e2d
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceInstanceService CSP
 
 

windows/client-management/mdm/devicelock-csp.md

@@ -1,19 +1,14 @@
 ---
 title: DeviceLock CSP
 description: DeviceLock CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 9a547efb-738e-4677-95d3-5506d350d8ab
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceLock CSP
 
 
@@ -39,49 +34,88 @@ The following image shows the DeviceLock configuration service provider in tree
 <a href="" id="provider"></a>**Provider**  
 Required. An interior node to group all policy providers. Scope is permanent. Supported operation is Get.
 
-<a href="" id="---
+<a href="" id="---------------providerid"></a> ***ProviderID***  
-title: DeviceLock CSP
+Optional. The node that contains the configured management server's ProviderID. In Windows Phone 8, only one enterprise management server is supported. That is, there should be only one *ProviderID* node. Exchange ActiveSync policies set by Exchange are saved by the Sync client separately. Scope is dynamic. The following operations are supported:
-description: DeviceLock CSP
+
-MSHAttr:
+-   **Add** - Add the management account to the configuration service provider tree.
-- 'PreferredSiteName:MSDN'
+-   **Delete** - Delete all policies set by this account. This command could be used in enterprise unenrollment for removing policy values set by the enterprise management server.
-- 'PreferredLib:/library/windows/hardware'
+-   **Get** - Return all policies set by the management server.
-ms.assetid: 9a547efb-738e-4677-95d3-5506d350d8ab
+
-ms.author: exists
+> **Note**   The value cannot be changed after it is added. The **Replace** command isn't supported.
-ms.date: 05/02/2017
+
-ms.topic: article
+ 
-ms.prod: w10
+
-ms.technology: windows
+<a href="" id="providerid-devicepasswordenabled"></a>***ProviderID*/DevicePasswordEnabled**  
-author: nibr
+Optional. An integer value that specifies whether device lock is enabled. Possible values are one of the following:
----
+
----
+-   0 - Device lock is enabled.
-title: DeviceLock CSP
+-   1 (default) - Device lock not enabled.
-description: DeviceLock CSP
+
-MSHAttr:
+The scope is dynamic.
-- 'PreferredSiteName:MSDN'
+
-- 'PreferredLib:/library/windows/hardware'
+Supported operations are Get, Add, and Replace.
-ms.assetid: 9a547efb-738e-4677-95d3-5506d350d8ab
+
-ms.author: exists
+<a href="" id="providerid-allowsimpledevicepassword"></a>***ProviderID*/AllowSimpleDevicePassword**  
-ms.date: 05/02/2017
+Optional. An integer value that specifies whether simple passwords, such as "1111" or "1234", are allowed. Possible values for this node are one of the following:
-ms.topic: article
+
-ms.prod: w10
+-   0 - Not allowed.
-ms.technology: windows
+-   1 (default) - Allowed.
-author: nibr
+
----
+Invalid values are treated as a configuration failure. The scope is dynamic.
----
+
-title: DeviceLock CSP
+Supported operations are Get, Add, and Replace.
-description: DeviceLock CSP
+
-MSHAttr:
+<a href="" id="providerid-mindevicepasswordlength"></a>***ProviderID*/MinDevicePasswordLength**  
-- 'PreferredSiteName:MSDN'
+Optional. An integer value that specifies the minimum number of characters required in the PIN. Valid values are 4 to 18 inclusive. The default value is 4. Invalid values are treated as a configuration failure. The scope is dynamic.
-- 'PreferredLib:/library/windows/hardware'
+
-ms.assetid: 9a547efb-738e-4677-95d3-5506d350d8ab
+Supported operations are Get, Add, and Replace.
-ms.author: exists
+
-ms.date: 05/02/2017
+<a href="" id="providerid-alphanumericdevicepasswordrequired"></a>***ProviderID*/AlphanumericDevicePasswordRequired**  
-ms.topic: article
+Optional. An integer value that specifies the complexity of the password or PIN allowed.
-ms.prod: w10
+
-ms.technology: windows
+Valid values are one of the following:
-author: nibr
+
----
+-   0 - Alphanumeric password required
---mindevicepasswordcomplexcharacters"></a>**DeviceValue/DevicePasswordEnable, …, MinDevicePasswordComplexCharacters**  
+-   1 - Users can choose a numeric or alphanumeric password
+-   2 - Users can choose no password, numeric password, or alphanumeric password
+
+Invalid values are treated as a configuration failure. The scope is dynamic.
+
+Supported operations are Get, Add, and Replace.
+
+<a href="" id="providerid-devicepasswordexpiration"></a>***ProviderID*/DevicePasswordExpiration**  
+Deprecated in Windows 10.
+
+<a href="" id="providerid-devicepasswordhistory"></a>***ProviderID*/DevicePasswordHistory**  
+Deprecated in Windows 10.
+
+<a href="" id="providerid-maxdevicepasswordfailedattempts"></a>***ProviderID*/MaxDevicePasswordFailedAttempts**  
+Optional. An integer value that specifies the number of authentication failures allowed before the device will be wiped. Valid values are 0 to 999. The default value is 0, which indicates the device will not be wiped regardless of the number of authentication failures.
+
+Invalid values are treated as a configuration failure. The scope is dynamic.
+
+Supported operations are Get, Add, and Replace.
+
+<a href="" id="providerid-maxinactivitytimedevicelock"></a>***ProviderID*/MaxInactivityTimeDeviceLock**  
+Optional. An integer value that specifies the amount of time (in minutes) that the device can remain idle before it is password locked. Valid values are 0 to 999. A value of 0 indicates no time-out is specified. In this case, the maximum screen time-out allowed by the UI applies.
+
+Invalid values are treated as a configuration failure. The scope is dynamic.
+
+Supported operations are Get, Add, and Replace.
+
+<a href="" id="providerid-mindevicepasswordcomplexcharacters"></a>***ProviderID*/MinDevicePasswordComplexCharacters**  
+Optional. An integer value that specifies the number of complex element types (uppercase and lowercase letters, numbers, and punctuation) required for a strong password. Valid values are 1 to 4 for mobile and 1 to 3 for desktop. The default value is 1.
+
+Invalid values are treated as a configuration failure. The scope is dynamic.
+
+Supported operations are Get, Add, and Replace.
+
+<a href="" id="devicevalue"></a>**DeviceValue**  
+Required. A permanent node that groups the policy values applied to the device. The server can query this node to discover what policy values are actually applied to the device. The scope is permanent.
+
+Supported operation is Get.
+
+<a href="" id="devicevalue-devicepasswordenable-----mindevicepasswordcomplexcharacters"></a>**DeviceValue/DevicePasswordEnable, …, MinDevicePasswordComplexCharacters**  
 Required. This node has the same set of policy nodes as the **ProviderID** node. All nodes under **DeviceValue** are read-only permanent nodes. Each node represents the current device lock policy. For detailed descriptions of each policy, see the ***ProviderID*** subnode descriptions.
 
 ## OMA DM examples

windows/client-management/mdm/devicelock-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: DeviceLock DDF file
 description: DeviceLock DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 46a691b9-6350-4987-bfc7-f8b1eece3ad9
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceLock DDF file
 
 

windows/client-management/mdm/devicemanageability-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceManageability CSP
 
 

windows/client-management/mdm/devicemanageability-ddf.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceManageability DDF
 
 

windows/client-management/mdm/devicestatus-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceStatus CSP
 
 

windows/client-management/mdm/devicestatus-ddf.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DeviceStatus DDF
 
 

windows/client-management/mdm/devinfo-csp.md

@@ -1,19 +1,14 @@
 ---
 title: DevInfo CSP
 description: DevInfo CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: d3eb70db-1ce9-4c72-a13d-651137c1713c
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DevInfo CSP
 
 

windows/client-management/mdm/devinfo-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: DevInfo DDF file
 description: DevInfo DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: beb07cc6-4133-4c0f-aa05-64db2b4a004f
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DevInfo DDF file
 
 

windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # Diagnose MDM failures in Windows 10
 
 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.
@@ -135,217 +130,7 @@ Since there is no Event Viewer in Windows 10 Mobile, you can use the [Field Med
 The following table contains a list of common providers and their corresponding GUIDs.
 
 | GUID                                 | Provider Name                                          |
-|---
+|--------------------------------------|--------------------------------------------------------|
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
---|---
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-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: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
---|
 | 099614a5-5dd7-4788-8bc9-e29f43db28fc | Microsoft-Windows-LDAP-Client                          |
 | 0f67e49f-fe51-4e9f-b490-6f2948cc6027 | Microsoft-Windows-Kernel-Processor-Power               |
 | 0ff1c24b-7f05-45c0-abdc-3c8521be4f62 | Microsoft-Windows-Mobile-Broadband-Experience-SmsApi   |

windows/client-management/mdm/diagnosticlog-csp.md

@@ -1,19 +1,14 @@
 ---
 title: DiagnosticLog CSP
 description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DiagnosticLog CSP
 
 
@@ -172,49 +167,7 @@ The supported operation is Get.
 The following table represents the possible values:
 
 | Value | Description |
-|---
+|-------|-------------|
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|---
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|
 | 0     | Stopped     |
 | 1     | Started     |
 
@@ -262,63 +215,7 @@ The data type is a string.
 The following table lists the possible values:
 
 | Value | Description        |
-|---
+|-------|--------------------|
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
--|---
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
----
-title: DiagnosticLog CSP
-description: DiagnosticLog CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: exists
-ms.date: 05/02/2017
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nibr
----
---|
 | START | Start log tracing. |
 | STOP  | Stop log tracing   |
 

windows/client-management/mdm/diagnosticlog-ddf.md

@@ -1,19 +1,14 @@
 ---
 title: DiagnosticLog DDF
 description: DiagnosticLog DDF
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 9DD75EDA-5913-45B4-9BED-20E30CDEBE16
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DiagnosticLog DDF
 
 

windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md

@@ -4,20 +4,15 @@ 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
 
-
 # Disconnecting from the management infrastructure (unenrollment)
 
 Disconnecting may be initiated either locally by the user from the phone or remotely by the IT admin using management server. User-initiated disconnection is performed much like the initial connection, and it is initiated from the same location in the Setting Control Panel as creating the workplace account. Users may choose to disconnect for any number of reasons, including leaving the company or getting a new device and no longer needing access to their LOB apps on the old device. When an administrator initiates a disconnection, the enrollment client performs the disconnection during its next regular maintenance session. Administrators may choose to disconnect a user’s device after they’ve left the company or because the device is regularly failing to comply with the organization’s security settings policy.

windows/client-management/mdm/dmacc-csp.md

@@ -1,19 +1,14 @@
 ---
 title: DMAcc CSP
 description: DMAcc CSP
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 43e73d8a-6617-44e7-8459-5c96f4422e63
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DMAcc CSP
 
 

windows/client-management/mdm/dmacc-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: DMAcc DDF file
 description: DMAcc DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 44dc99aa-2a85-498b-8f52-a81863765606
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DMAcc DDF file
 
 

windows/client-management/mdm/dmclient-csp.md

@@ -1,19 +1,14 @@
 ---
 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: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DMClient CSP
 
 

windows/client-management/mdm/dmclient-ddf-file.md

@@ -1,19 +1,14 @@
 ---
 title: DMClient DDF file
 description: DMClient DDF file
-MSHAttr:
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A21B33AF-DB76-4059-8170-FADF2CB898A0
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DMClient DDF file
 
 

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,15 +12,13 @@ api_location:
 - dmprocessxmlfiltered.dll
 api_type:
 - DllExport
-ms.author: exists
+ms.author: maricia
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DMProcessConfigXMLFiltered function
 
 > **Important**  

windows/client-management/mdm/dmsessionactions-csp.md

@@ -1,18 +1,13 @@
 ---
 title: DMSessionActions CSP
 description: DMSessionActions CSP
-MSHAttr:
+ms.author: maricia
-- 'PreferredSiteName:MSDN'
-- 'PreferredLib:/library/windows/hardware'
-ms.author: exists
-ms.date: 05/02/2017
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
-author: nibr
+author: nickbrower
 ---
 
-
 # DMSessionActions CSP