Merge branch 'master' of https://cpubwin.visualstudio.com/_git/it-client into replaceplaceholder

2025-05-12 21:37:22 +00:00 · 2018-04-27 15:51:30 -07:00 · 2018-04-27 15:51:30 -07:00 · a02bee2525
commit a02bee2525
parent 4765b54341 93673726b0
60 changed files with 688 additions and 463 deletions
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@ -6,6 +6,11 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/security/threat-protection/windows-defender-application-control.md",
+"redirect_url": "/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/security/threat-protection/applocker/administer-applocker-using-mdm.md",
 "redirect_url": "/windows/security/threat-protection/windows-defender-application-control/applocker/administer-applocker-using-mdm",
 "redirect_document_id": true
--- a/devices/surface/TOC.md
+++ b/devices/surface/TOC.md
@ -1,6 +1,6 @@
 # [Surface](index.md)
 ## [Deploy Surface devices](deploy.md)
-### [Windows AutoPilot and Surface devices](windows-autopilot-and-surface-devices.md)
+### [Windows Autopilot and Surface devices](windows-autopilot-and-surface-devices.md)
 ### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsc.md)
 #### [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md)
 ### [Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)
--- a/devices/surface/change-history-for-surface.md
+++ b/devices/surface/change-history-for-surface.md
@ -23,7 +23,7 @@ This topic lists new and updated topics in the Surface documentation library.

 |New or changed topic | Description |
 | --- | --- |
-|[Windows AutoPilot and Surface devices](windows-autopilot-and-surface-devices.md) | New article  |
+|[Windows Autopilot and Surface devices](windows-autopilot-and-surface-devices.md) | New article  |
 |[Microsoft Surface Data Eraser](microsoft-surface-data-eraser.md) | Added version 3.2.45.0 information  |
 |[Surface device compatibility with Windows 10 Long-Term Servicing Channel (LTSC)](surface-device-compatibility-with-windows-10-ltsc.md) | Updated Current Branch (CB) or Current Branch for Business (CBB) servicing options with Semi-Annual Channel (SAC) information  |
 |[Wake On LAN for Surface devices](wake-on-lan-for-surface-devices.md) | Added Surface Book 2, Surface Laptop, Surface Pro, Surface Pro with LTE Advanced, and Surface Pro information  |
--- a/devices/surface/deploy.md
+++ b/devices/surface/deploy.md
@ -18,7 +18,7 @@ Get deployment guidance for your Surface devices including information about MDT

 | Topic | Description |
 | --- | --- |
-| [Windows AutoPilot and Surface devices](windows-autopilot-and-surface-devices.md) | Find out how to remotely deploy and configure devices with Windows AutoPilot. |
+| [Windows Autopilot and Surface devices](windows-autopilot-and-surface-devices.md) | Find out how to remotely deploy and configure devices with Windows Autopilot. |
 | [Surface device compatibility with Windows 10 Long-Term Servicing Channel](surface-device-compatibility-with-windows-10-ltsc.md) | Find out about compatibility and limitations of Surface devices running Windows 10 Enterprise LTSC edition. |
 | [Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md) | Walk through the recommended process of how to deploy Windows 10 to your Surface devices with the Microsoft Deployment Toolkit.|
 | [Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)| Find out how to perform a Windows 10 upgrade deployment to your Surface devices. |
--- a/devices/surface/windows-autopilot-and-surface-devices.md
+++ b/devices/surface/windows-autopilot-and-surface-devices.md
@ -1,6 +1,6 @@
 ---
-title: Windows AutoPilot and Surface Devices (Surface)
-description: Find out about Windows AutoPilot deployment options for Surface devices.
+title: Windows Autopilot and Surface Devices (Surface)
+description: Find out about Windows Autopilot deployment options for Surface devices.
 keywords: autopilot, windows 10, surface, deployment
 ms.prod: w10
 ms.mktglfcycl: deploy
@ -11,16 +11,16 @@ ms.date: 01/31/2018
 ms.author: jdecker
 ---

-# Windows AutoPilot and Surface devices
+# Windows Autopilot and Surface devices

-Windows AutoPilot is a cloud-based deployment technology available in Windows 10. Using Windows AutoPilot, you can remotely deploy and configure devices in a truly zero-touch process right out of the box. Windows AutoPilot registered devices are identified over the internet at first boot using a unique device signature, known as the hardware hash, and automatically enrolled and configured using modern management solutions such as Azure Active Directory (AAD) and Mobile Device Management (MDM). 
+Windows Autopilot is a cloud-based deployment technology available in Windows 10. Using Windows Autopilot, you can remotely deploy and configure devices in a truly zero-touch process right out of the box. Windows Autopilot registered devices are identified over the internet at first boot using a unique device signature, known as the hardware hash, and automatically enrolled and configured using modern management solutions such as Azure Active Directory (AAD) and Mobile Device Management (MDM). 

-With Surface devices, you can choose to register your devices at the time of purchase when purchasing from a Surface partner enabled for Windows AutoPilot. New devices can be shipped directly to your end-users and will be automatically enrolled and configured when the units are unboxed and turned on for the first time. This process can eliminate need to reimage your devices as part of your deployment process, reducing the work required of your deployment staff and opening up new, agile methods for device management and distribution.
+With Surface devices, you can choose to register your devices at the time of purchase when purchasing from a Surface partner enabled for Windows Autopilot. New devices can be shipped directly to your end-users and will be automatically enrolled and configured when the units are unboxed and turned on for the first time. This process can eliminate need to reimage your devices as part of your deployment process, reducing the work required of your deployment staff and opening up new, agile methods for device management and distribution.

-In this article learn how to enroll your Surface devices in Windows AutoPilot with a Surface partner and the options and considerations you will need to know along the way. This article focuses specifically on Surface devices, for more information about using Windows AutoPilot with other devices, or to read more about Windows AutoPilot and its capabilities, see [Overview of Windows AutoPilot](https://docs.microsoft.com/en-us/windows/deployment/windows-autopilot/windows-10-autopilot) in the Windows Docs Library.
+In this article learn how to enroll your Surface devices in Windows Autopilot with a Surface partner and the options and considerations you will need to know along the way. This article focuses specifically on Surface devices, for more information about using Windows Autopilot with other devices, or to read more about Windows Autopilot and its capabilities, see [Overview of Windows Autopilot](https://docs.microsoft.com/en-us/windows/deployment/windows-autopilot/windows-10-autopilot) in the Windows Docs Library.

 ## Prerequisites
-Enrollment of Surface devices in Windows AutoPilot with a Surface partner enabled for Windows AutoPilot has the following licensing requirements for each enrolled Surface device:
+Enrollment of Surface devices in Windows Autopilot with a Surface partner enabled for Windows Autopilot has the following licensing requirements for each enrolled Surface device:
 * **Azure Active Directory Premium** – Required to enroll your devices in your organization and to automatically enroll devices in your organization’s mobile management solution.
 * **Mobile Device Management (such as Microsoft Intune)** – Required to remotely deploy applications, configure, and manage your enrolled devices.
 * **Office 365 ProPlus** – Required to deploy Microsoft Office to your enrolled devices.
@ -33,19 +33,19 @@ Or
 * Office 365 ProPlus, E3, or E5 (includes Office 365 ProPlus)

 >[!NOTE]
->Deployment of devices using Windows AutoPilot to complete the Out-of-Box Experience (OOBE) is supported without these prerequisites, however will yield deployed devices without applications, configuration, or enrollment in a management solution and is highly discouraged.
+>Deployment of devices using Windows Autopilot to complete the Out-of-Box Experience (OOBE) is supported without these prerequisites, however will yield deployed devices without applications, configuration, or enrollment in a management solution and is highly discouraged.

 ### Windows version considerations
-Support for broad deployments of Surface devices using Windows AutoPilot, including enrollment performed by Surface partners at the time of purchase, requires devices manufactured with or otherwise installed with Windows 10 Version 1709 (Fall Creators Update). Windows 10 Version 1709 uses a secure 4096-bit (4k) hash value to uniquely identify devices for Windows AutoPilot that is necessary for deployments at scale.
+Support for broad deployments of Surface devices using Windows Autopilot, including enrollment performed by Surface partners at the time of purchase, requires devices manufactured with or otherwise installed with Windows 10 Version 1709 (Fall Creators Update). Windows 10 Version 1709 uses a secure 4096-bit (4k) hash value to uniquely identify devices for Windows Autopilot that is necessary for deployments at scale.

 ### Surface device support
-Surface devices with support for out-of-box deployment with Windows AutoPilot, enrolled during the purchase process with a Surface partner, include the following devices, where the devices ship from the factory with Windows 10 Version 1709:
+Surface devices with support for out-of-box deployment with Windows Autopilot, enrolled during the purchase process with a Surface partner, include the following devices, where the devices ship from the factory with Windows 10 Version 1709:
 * Surface Pro (Model 1796)
 * Surface Book 2
 * Surface Laptop
 * Surface Studio

-## Surface partners enabled for Windows AutoPilot
-Enrolling Surface devices in Windows AutoPilot at the time of purchase is a capability provided by select Surface partners that are enabled with the capability to identify individual Surface devices during the purchase process and perform enrollment on an organization’s behalf. Devices enrolled by a Surface partner at time of purchase can be shipped directly to users and configured entirely through the zero-touch process of Windows AutoPilot, Azure Active Directory, and Mobile Device Management.
+## Surface partners enabled for Windows Autopilot
+Enrolling Surface devices in Windows Autopilot at the time of purchase is a capability provided by select Surface partners that are enabled with the capability to identify individual Surface devices during the purchase process and perform enrollment on an organization’s behalf. Devices enrolled by a Surface partner at time of purchase can be shipped directly to users and configured entirely through the zero-touch process of Windows Autopilot, Azure Active Directory, and Mobile Device Management.

-You can find a list of Surface partners enabled for Windows AutoPilot at the [Windows AutoPilot for Surface portal](https://www.microsoft.com/en-us/itpro/surface/windows-autopilot-for-surface).
+You can find a list of Surface partners enabled for Windows Autopilot at the [Windows Autopilot for Surface portal](https://www.microsoft.com/en-us/itpro/surface/windows-autopilot-for-surface).
--- a/education/trial-in-a-box/educator-tib-get-started.md
+++ b/education/trial-in-a-box/educator-tib-get-started.md
@ -43,8 +43,11 @@ ms.date: 03/18/2018
 To try out the educator tasks, start by logging in as a teacher.

 1. Turn on **Device A** and ensure you plug in the PC to an electrical outlet.
-2. Log in to **Device A** using the **Teacher Username** and **Teacher Password** included in the **Credentials Sheet** located in your kit.
-3. Connect to your school's Wi-Fi network or connect with a local Ethernet connection.
+2. Connect to your school's Wi-Fi network or connect with a local Ethernet connection.
+   >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet you should connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration you should consider using Device A from a different network.
+   
+3. Log in to **Device A** using the **Teacher Username** and **Teacher Password** included in the **Credentials Sheet** located in your kit.
+

 </br>
 </br>
@ -82,6 +85,7 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse
 </br>


+
 ![Spark communication, critical thinking, and creativity with Microsoft Teams](images/edu-TIB-setp-3-jump.png) 
 ## <a name="edu-task3"></a>3. Spark communication, critical thinking, and creativity in the classroom

--- a/education/trial-in-a-box/itadmin-tib-get-started.md
+++ b/education/trial-in-a-box/itadmin-tib-get-started.md
@ -45,8 +45,10 @@ If you run into any problems while following the steps in this guide, or you hav
 To try out the IT admin tasks, start by logging in as an IT admin.

 1. Turn on **Device A** and ensure you plug in the PC to an electrical outlet.
-2. Log in to **Device A** using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
-3. Connect to your school's Wi-Fi network or connect with a local Ethernet connection.
+2. Connect to your school's Wi-Fi network or connect with a local Ethernet connection.
+   >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet you should connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration you should consider using Device A from a different network.
+
+3. Log in to **Device A** using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
 4. Note the serial numbers on the Trial in a Box devices and register both devices with the hardware manufacturer to activate the manufacturer's warranty.

 </br>
@ -98,7 +100,7 @@ If you've previously used Set up School PCs to provision student devices, you ca
    - Set up School PCs will change some account management logic so that it sets the expiration time for an account to 180 days (without requiring sign-in). 
    - This setting also increases the maximum storage to 100% of the available disk space. This prevents the student's account from being erased if the student stores a lot of files or data or if the student doesn't use the PC over a prolonged period.
  - **Let guests sign-in to these PCs** allows guests to use student PCs without a school account. If you select this option, a **Guest** account button will be added in the PC's sign-in screen to allow anyone to use the PC.
-  - **Enable Windows 10 Automatic Redeployment** enables IT admins to quickly remove personal files, apps, and settings, and reset Windows 10 devices from the lock screen any time and apply original settings and management enrollment the student PC is returned to a fully configured or known approved state. For more info, see [Windows Automatic Redeployment](https://docs.microsoft.com/en-us/education/windows/windows-automatic-redeployment).
+  - **Enable Windows 10 Autopilot Reset** enables IT admins to quickly remove personal files, apps, and settings, and reset Windows 10 devices from the lock screen any time and apply original settings and management enrollment the student PC is returned to a fully configured or known approved state. For more info, see [Autopilot Reset](https://docs.microsoft.com/en-us/education/windows/autopilot-reset).
  - **Lock screen background** shows the default backgroudn used for student PCs provisioned by Set up School PCs. Select **Browse** to change the default.

 7. **Set up the Take a Test app** configures the device for taking quizzes and high-stakes assessments by some providers like Smarter Balanced. Windows will lock down the student PC so that students can't access anything else while taking the test.
--- a/education/windows/TOC.md
+++ b/education/windows/TOC.md
@ -11,7 +11,7 @@
 ### [Set up Take a Test on a single PC](take-a-test-single-pc.md)
 ### [Set up Take a Test on multiple PCs](take-a-test-multiple-pcs.md)
 ### [Take a Test app technical reference](take-a-test-app-technical.md)
-## [Reset devices with Windows Automatic Redeployment](windows-automatic-redeployment.md)
+## [Reset devices with Autopilot Reset](autopilot-reset.md)
 ## [Working with Microsoft Store for Education](education-scenarios-store-for-business.md)
 ## [Get Minecraft: Education Edition](get-minecraft-for-education.md)
 ### [For teachers: get Minecraft Education Edition](teacher-get-minecraft.md)
@ -20,6 +20,7 @@
 ## [Test Windows 10 S on existing Windows 10 education devices](test-windows10s-for-edu.md)
 ## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
 ## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
-## [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)
+## [Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode](s-mode-switch-to-edu.md)
+## [Switch to Windows 10 Pro Education from Windows 10 Pro](switch-to-pro-education.md)
 ## [Chromebook migration guide](chromebook-migration-guide.md)
 ## [Change history for Windows 10 for Education](change-history-edu.md)
--- a/education/windows/autopilot-reset.md
+++ b/education/windows/autopilot-reset.md
@ -0,0 +1,110 @@
+---
+title: Reset devices with Autopilot Reset
+description: Gives an overview of Autopilot Reset and how you can enable and use it in your schools.
+keywords: Autopilot Reset, Windows 10, education
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: edu
+ms.localizationpriority: high
+author: CelesteDG
+ms.author: celested
+ms.date: 03/08/2018
+---
+
+# Reset devices with Autopilot Reset 
+**Applies to:**
+
+-   Windows 10, version 1709 
+
+IT admins or technical teachers can use Autopilot Reset to quickly remove personal files, apps, and settings, and reset Windows 10 devices from the lock screen any time and apply original settings and management enrollment (Azure Active Directory and device management) so the devices are ready to use. With Autopilot Reset, devices are returned to a fully configured or known IT-approved state.
+
+To enable Autopilot Reset in Windows 10, version 1709 (Fall Creators Update), you must:
+
+1. [Enable the policy for the feature](#enable-autopilot-reset)
+2. [Trigger a reset for each device](#trigger-autopilot-reset)
+
+## Enable Autopilot Reset
+
+To use Autopilot Reset, [Windows Recovery Environment (WinRE) must be enabled on the device](#winre).
+
+**DisableAutomaticReDeploymentCredentials** is a policy that enables or disables the visibility of the credentials for Autopilot Reset. It is a policy node in the [Policy CSP](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-credentialproviders), **CredentialProviders/DisableAutomaticReDeploymentCredentials**. By default, this policy is set to 1 (Disable). This ensures that Autopilot Reset isn't triggered by accident.
+
+You can set the policy using one of these methods:
+
+- MDM provider
+
+    - Autopilot Reset in Intune for Education is coming soon. In a future update of Intune for Education, new tenants will automatically have the Autopilot Reset setting enabled by default on the **All devices** group as part of initial tenant configuration. You will also be able to manage this setting to target different groups in the admin console.
+    - If you're using an MDM provider other than Intune for Education, check your MDM provider documentation on how to set this policy. If your MDM provider doesn't explicitly support this policy, you can manually set this policy if your MDM provider allows specific OMA-URIs to be manually set.
+
+        For example, in Intune, create a new configuration policy and add an OMA-URI. 
+        - OMA-URI:  ./Vendor/MSFT/Policy/Config/CredentialProviders/DisableAutomaticReDeploymentCredentials
+        - Data type:  Integer
+        - Value:  0
+
+- Windows Configuration Designer
+    
+    You can [use Windows Configuration Designer](https://docs.microsoft.com/windows/configuration/provisioning-packages/provisioning-create-package) to set the **Runtime settings > Policies > CredentialProviders > DisableAutomaticReDeploymentCredentials** setting and create a provisioning package.
+
+- Set up School PCs app
+
+    Autopilot Reset in the Set up School PCs app is available in the latest release of the app. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Autopilot Reset through the Set up School PCs app. You can check the version several ways:
+    - Reach out to your device manufacturer.
+    - If you manage your PCs using Intune or Intune for Education, you can check the OS version by checking the **OS version** info for the device. If  you are using another MDM provider, check the documentation for the MDM provider to confirm the OS version.
+    - Log into the PCs, go to the **Settings > System > About** page, look in the **Windows specifications** section and confirm **Version** is set to 1709.
+
+    To use the Autopilot Reset setting in the Set up School PCs app:
+    * When using [Set up School PCs](use-set-up-school-pcs-app.md), in the **Configure student PC settings** screen, select **Enable Windows 10 Autopilot Reset** among the list of settings for the student PC as shown in the following example:
+
+    ![Configure student PC settings in Set up School PCs](images/suspc_configure_pc2.jpg)
+    
+## Trigger Autopilot Reset
+Autopilot Reset is a two-step process: trigger it and then authenticate. Once you've done these two steps, you can let the process execute and once it's done, the device is again ready for use. 
+
+**To trigger Autopilot Reset**
+
+1. From the Windows device lock screen, enter the keystroke: **CTRL + ![Windows key](images/windows_glyph.png) + R**. 
+
+    ![Enter CTRL+Windows key+R on the Windows lockscreen](images/autopilot-reset-lockscreen.png)
+
+    This will open up a custom login screen for Autopilot Reset. The screen serves two purposes:
+    1. Confirm/verify that the end user has the right to trigger Autopilot Reset
+    2. Notify the user in case a provisioning package, created using Windows Configuration Designer or Set up School PCs, will be used as part of the process.
+
+    ![Custom login screen for Autopilot Reset](images/autopilot-reset-customlogin.png)
+
+2. Sign in with the admin account credentials. If you created a provisioning package, plug in the USB drive and trigger Autopilot Reset.
+
+    Once Autopilot Reset is triggered, the reset process starts. 
+    
+    After reset, the device:
+    - Sets the region, language, and keyboard.
+    - Connects to Wi-Fi.
+    - If you provided a provisioning package when Autopilot Reset is triggered, the system will apply this new provisioning package. Otherwise, the system will re-apply the original provisioning package on the device. 
+    - Is returned to a known good managed state, connected to Azure AD and MDM.
+
+     ![Notification that provisioning is complete](images/autopilot-reset-provisioningcomplete.png)
+
+    Once provisioning is complete, the device is again ready for use.
+
+<span id="winre"/>
+## Troubleshoot Autopilot Reset
+
+Autopilot Reset will fail when the [Windows Recovery Environment (WinRE)](https://docs.microsoft.com/windows-hardware/manufacture/desktop/windows-recovery-environment--windows-re--technical-reference) is not enabled on the device. You will see `Error code: ERROR_NOT_SUPPORTED (0x80070032)`.
+
+To make sure WinRE is enabled, use the [REAgentC.exe tool](https://docs.microsoft.com/windows-hardware/manufacture/desktop/reagentc-command-line-options) to run the following command:
+
+```
+reagentc /enable
+```
+
+If Windows Automatic Reployment fails after enabling WinRE, or if you are unable to enable WinRE, please contact [Microsoft Support](https://support.microsoft.com) for assistance.
+
+## Related topics
+
+[Set up Windows devices for education](set-up-windows-10.md)
+
+
+
+
+
--- a/education/windows/change-history-edu.md
+++ b/education/windows/change-history-edu.md
@ -19,7 +19,7 @@ This topic lists new and updated topics in the [Windows 10 for Education](index.

 New or changed topic | Description
 --- | ---
-[Reset devices with Windows Automatic Redeployment](windows-automatic-redeployment.md) | Added section for troubleshooting Windows Automatic Redeployment.
+[Reset devices with Autopilot Reset](autopilot-reset.md) | Added section for troubleshooting Autopilot Reset.

 ## November 2017

@ -34,7 +34,7 @@ New or changed topic | Description

 | New or changed topic | Description |
 | --- | ---- |
-| [Reset devices with Windows Automatic Redeployment](windows-automatic-redeployment.md) | New. Learn how you can use this new feature to quickly reset student PCs from the lock screen and apply original settings and management enrollment (Azure Active Directory and device management) so the devices are ready to use and returned to a fully configured or known IT-approved state. |
+| [Reset devices with Autopilot Reset](autopilot-reset.md) | New. Learn how you can use this new feature to quickly reset student PCs from the lock screen and apply original settings and management enrollment (Azure Active Directory and device management) so the devices are ready to use and returned to a fully configured or known IT-approved state. |
 | [Test Windows 10 S on existing Windows 10 education devices](test-windows10s-for-edu.md) | Updated the *Go back to your previous edition of Windows 10* section with new information on how to work around cases where Win32 apps are blocked after switching from Windows 10 S back to your previous Windows edition. |
 | [Take a Test app technical reference](take-a-test-app-technical.md) | Updated. Starting with Windows 10, version 1709 (Fall Creators Update), assessments can now run in permissive mode. This mode enables students who need access to other apps, like accessibility tools, to use the apps. |

@ -103,7 +103,7 @@ New or changed topic | Description

 | New or changed topic | Description|
 | --- | --- |
-| [Working with Microsoft Store for Business – education scenarios](education-scenarios-store-for-business.md)  | New. Learn about education scenarios for Microsoft Store for Business.  |
+| [Working with Microsoft Store for Business â€“ education scenarios](education-scenarios-store-for-business.md)  | New. Learn about education scenarios for Microsoft Store for Business.  |
 | [For teachers - get Minecraft: Education Edition](teacher-get-minecraft.md)  | Updates. Subscription support for Minecraft: Education Edition.  |
 | [For IT administrators - get Minecraft: Education Edition](school-get-minecraft.md)  | Updates. Subscription support for Minecraft: Education Edition.  |

--- a/education/windows/images/windows-automatic-redeployment-customlogin.png
+++ b/education/windows/images/windows-automatic-redeployment-customlogin.png
--- a/education/windows/images/windows-automatic-redeployment-lockscreen.png
+++ b/education/windows/images/windows-automatic-redeployment-lockscreen.png
--- a/education/windows/images/windows-automatic-redeployment-provisioningcomplete.png
+++ b/education/windows/images/windows-automatic-redeployment-provisioningcomplete.png
--- a/education/windows/s-mode-switch-to-edu.md
+++ b/education/windows/s-mode-switch-to-edu.md
@ -0,0 +1,76 @@
+---
+title: Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode
+description: Overview of Windows 10 Pro Education in S mode, switching options, and system requirements
+keywords: Windows 10 Pro Education S, S mode, system requirements, Overview, Windows 10 Pro in S mode, Education, EDU
+ms.mktglfcycl: deploy
+ms.localizationpriority: high
+ms.prod: w10
+ms.sitesec: library
+ms.pagetype: edu
+ms.date: 04/30/2018
+author: Mikeblodge
+---
+
+# Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode
+
+S mode is an enhanced security mode of Windows 10 – streamlined for security and superior performance. With Windows 10 in S mode, everyone can download and install Microsoft-verified apps from the Microsoft Store for Education – this keep devices running fast and secure day in and day out. 
+
+## Benefits of Windows 10 Pro in S mode for Education
+
+- **Microsoft-verified security** - It reduces risk of malware and exploitations that harm students and educators, because only Microsoft-verified apps can be installed.
+- **Performance that lasts** - Provides all-day battery life to keep students on task and not tripping over cords. Also, verified apps won’t degrade device performance over time.
+- **Streamlined for Speed** - Offers faster log-in times so teachers spend less time waiting and more time teaching. 
+
+
+|  |Home  |S mode  |Pro/Pro Education  |Enterprise/Education |
+|---------|:---:|:---:|:---:|:---:|
+|Start Menu/Hello/Cortana/<BR>Windows Ink/Microsoft Edge | X | X | X | X |
+|Store apps (including Windows <BR>desktop bridge apps) | X | X | X | X |
+|Windows Update | X | X | X | X |
+|Device Encryption | X | X | X | X |
+|BitLocker | | X | X | X |
+|Windows Update for Business |  | X | X | X |
+|Microsoft Store for Education | | X | X | X |
+|Mobile Device Management<BR> and Azure AD join | | X | X | X |
+|Group Policy management and <BR>Active Directory Domain Services | | | X | X |
+|Desktop (Windows 32) Apps | X | | X | X |
+|Change App Defaults<BR>Search/Browser/Photos/etc. | X | | X | X |
+|Credential Guard | | | | X |
+|Device Guard | | | | X |
+
+###  Windows 10 in S mode is safe, secure, and fast.  
+However, in some limited scenarios, you might need to switch to Windows 10 Education. You can switch devices running Windows 10, version 1709 or later. Use the following information to switch to Windows 10 Pro through the Microsoft Store or by using Autopilot.
+
+> [!IMPORTANT]
+> While it’s free to switch to Windows 10 Pro, it’s not reversible. The only way to rollback this kind of switch is through a BMR factory reset. 
+
+## How to switch
+
+### Devices running Windows 10, version 1803
+The way that you switch a Windows 10, version 1803 device from S mode to EDU is different from Windows 10, version 1709. Instead of applying a MAK key (which only switches editions), you need to switch the device using Intune/MDM either at OOBE (Windows Autopilot) or while managing your devices Post OOBE.”
+
+1.	Select which devices to switch out of S mode.
+2.	Select the S mode switch option in Intune/MDM.
+
+> [!NOTE]
+> To rollback to Windows 10 Pro in S mode, a BMR factory reset must be performed.
+
+### Switch using the Microsoft Store for Education
+There are two switch options available using the Microsoft Store for Education:
+
+Tenant-wide Windows 10 Pro in S mode > Pro EDU in S mode <BR>
+Tenant-wide Windows 10 Pro > Pro EDU
+
+### Devices running Windows 10, version 1709
+
+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 Pro in S mode devices on the tenant to Windows 10 Pro Education. (Devices running Windows 10, version 1803 will switch to Windows 10 Pro EDU in S mode.)
+
+2. **Key acquisition options** - For schools with **active Microsoft Volume Licensing** agreements, global admins can obtain free MAK keys for Windows 10 Pro Education. 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.
+
+> [!NOTE]
+> There is currently no "bulk-switch" option for devices running Windows 10, version 1803. 
+
+## Related Topics
+[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)<BR> 
+[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md) <BR>
+[Compare Windows 10 editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)
--- a/education/windows/switch-to-pro-education.md
+++ b/education/windows/switch-to-pro-education.md
@ -1,29 +1,29 @@
 ---
-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
+title: Switch to Windows 10 Pro Education from Windows 10 Pro
+description: Learn how IT Pros can opt into switching to Windows 10 Pro Education from Windows 10 Pro.
+keywords: switch, free switch, Windows 10 Pro to Windows 10 Pro Education, Windows 10 Pro to Windows 10 Pro Education, education customers, Windows 10 Pro Education, Windows 10 Pro
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: edu
 ms.localizationpriority: high
 author: CelesteDG
-ms.author: celested
+ms.author: celested, MikeBlodge
 ms.date: 10/30/2017
 ---

-# Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S
+# Switch to Windows 10 Pro Education from Windows 10 Pro
 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)
+If you have an education tenant and use devices with Windows 10 Pro, global administrators can opt-in to a free switch to Windows 10 Pro Education depending on your scenario.
+- [Switch from Windows 10 Pro in S mode to Windows 10 Pro Education in S mode](https://www.microsoft.com/en-us/education/windows/s-mode-switch-to-edu)
 - [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 running Windows 10 Pro, version 1607 or higher.
 - 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).
@ -37,42 +37,6 @@ You can [compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsFor

 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:**
-  
-  You can find step-by-step info on how to use each of the options described here in [Switch options from Windows 10 S to Windows 10 Pro Education](#switch-options-from-windows-10-s-to-windows-10-pro-education).
-
-    - **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.
@ -85,9 +49,6 @@ In this scenario:

 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. 
@ -119,20 +80,6 @@ You can use Windows Configuration Designer to create a provisioning package that

    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

@ -143,11 +90,11 @@ Replace *MAK_key_or_product_key* with the MAK key that you obtained for the Wind

 ## 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.
+Academic institutions can easily move from 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).
+- **Windows 10 Pro Education edition**. Devices currently running Windows 10 Pro, version 1607 or higher, or Windows 10 S mode, 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). 
@ -155,11 +102,9 @@ When you switch to Windows 10 Pro Education, you get the following benefits:

    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.
+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 Pro devices.

 **To turn on the automatic switch to Windows 10 Pro Education**

@ -170,13 +115,13 @@ Once you enable the setting to switch to Windows 10 Pro Education, the switch wi
 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.
+    You will see the following page informing you that your school is eligible to switch free to Windows 10 Pro Education to 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**.
+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 in my organization**.

    **Figure 4** - Check the box to confirm

@ -195,7 +140,7 @@ Once you enable the setting to switch to Windows 10 Pro Education, the switch wi

 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.
+    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 will automatically switch the next time someone in your organization signs in to the device.

 9. Click **Close** in the **Success** window.

@ -214,11 +159,11 @@ So what will users experience? How will they switch their 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.
+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, 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.
+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, version 1703.

 **To join a device to Azure AD the first time the device is started**

@ -245,7 +190,7 @@ If the Windows device is running Windows 10, version 1703, follow these steps.
 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**
+**To join a device to Azure AD when the device already has Windows 10 Pro, version 1703 installed and set up**

 If the Windows device is running Windows 10, version 1703, follow these steps.

@ -289,7 +234,7 @@ If there are any problems with the Windows 10 Pro Education license or the acti

 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 existing operating system (Windows 10 Pro, version 1607 or higher, or 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:
@ -306,7 +251,7 @@ Use the following figures to help you troubleshoot when users experience these c

 ### Review requirements on devices

-Devices must be running Windows 10 Pro, version 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.
+Devices must be running Windows 10 Pro, version 1607 or higher, 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**

@ -341,7 +286,7 @@ If your organization has the Windows 10 Pro to Windows 10 Pro Education switch e
 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.
+> Devices that were switched from  mode to Windows 10 Pro Education cannot roll back to Windows 10 Pro Education S mode.

 **To roll back Windows 10 Pro Education to Windows 10 Pro**

--- a/education/windows/use-set-up-school-pcs-app.md
+++ b/education/windows/use-set-up-school-pcs-app.md
@ -30,7 +30,7 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
 - 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
- Enables optional Windows Automatic Redeployment feature to return devices to a fully configured or known IT-approved state
+- Enables optional Autopilot Reset feature to return devices to a fully configured or known IT-approved state
 - 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
@ -197,7 +197,7 @@ The **Set up School PCs** app guides you through the configuration choices for t

    If you select this option, this adds a **Guest** account button in the PC's sign-in screen to allow anyone to use the PC.
 
-  - Select **Enable Windows Automatic Redeployment** to reset student PCs from the lock screen any time and apply original settings and device management enrollment (Azure AD and MDM) so they’re ready to use. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Windows Automatic Redeployment through the Set up School PCs app.
+  - Select **Enable Autopilot Reset** to reset student PCs from the lock screen any time and apply original settings and device management enrollment (Azure AD and MDM) so theyâ€™re ready to use. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Autopilot Reset through the Set up School PCs app.
  - To change the default lock screen background or to use your school's custom lock screen background, click **Browse** to select a new lock screen background.

    **Figure 4** - Configure student PC settings
--- a/education/windows/windows-automatic-redeployment.md
+++ b/education/windows/windows-automatic-redeployment.md
@ -1,110 +0,0 @@
---
-title: Reset devices with Windows Automatic Redeployment
-description: Gives an overview of Windows Automatic Redeployment and how you can enable and use it in your schools.
-keywords: Windows Automatic Redeployment, Windows 10, education
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: edu
-ms.localizationpriority: high
-author: CelesteDG
-ms.author: celested
-ms.date: 03/08/2018
---
-
-# Reset devices with Windows Automatic Redeployment 
-**Applies to:**
-
-   Windows 10, version 1709 
-
-IT admins or technical teachers can use Windows Automatic Redeployment to quickly remove personal files, apps, and settings, and reset Windows 10 devices from the lock screen any time and apply original settings and management enrollment (Azure Active Directory and device management) so the devices are ready to use. With Windows Automatic Redeployment, devices are returned to a fully configured or known IT-approved state.
-
-To enable Windows Automatic Redeployment in Windows 10, version 1709 (Fall Creators Update), you must:
-
-1. [Enable the policy for the feature](#enable-windows-automatic-redeployment)
-2. [Trigger a reset for each device](#trigger-windows-automatic-redeployment)
-
-## Enable Windows Automatic Redeployment
-
-To use Windows Automatic Redeployment, [Windows Recovery Environment (WinRE) must be enabled on the device](#winre).
-
-**DisableAutomaticReDeploymentCredentials** is a policy that enables or disables the visibility of the credentials for Windows Automatic Redeployment. It is a policy node in the [Policy CSP](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-credentialproviders), **CredentialProviders/DisableAutomaticReDeploymentCredentials**. By default, this policy is set to 1 (Disable). This ensures that Windows Automatic Redeployment isn't triggered by accident.
-
-You can set the policy using one of these methods:
-
- MDM provider
-
-    - Windows Automatic Redeployment in Intune for Education is coming soon. In a future update of Intune for Education, new tenants will automatically have the Windows Automatic Redeployment setting enabled by default on the **All devices** group as part of initial tenant configuration. You will also be able to manage this setting to target different groups in the admin console.
-    - If you're using an MDM provider other than Intune for Education, check your MDM provider documentation on how to set this policy. If your MDM provider doesn't explicitly support this policy, you can manually set this policy if your MDM provider allows specific OMA-URIs to be manually set.
-
-        For example, in Intune, create a new configuration policy and add an OMA-URI. 
-        - OMA-URI:  ./Vendor/MSFT/Policy/Config/CredentialProviders/DisableAutomaticReDeploymentCredentials
-        - Data type:  Integer
-        - Value:  0
-
- Windows Configuration Designer
-    
-    You can [use Windows Configuration Designer](https://docs.microsoft.com/windows/configuration/provisioning-packages/provisioning-create-package) to set the **Runtime settings > Policies > CredentialProviders > DisableAutomaticReDeploymentCredentials** setting and create a provisioning package.
-
- Set up School PCs app
-
-    Windows Automatic Redeployment in the Set up School PCs app is available in the latest release of the app. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Windows Automatic Redeployment through the Set up School PCs app. You can check the version several ways:
-    - Reach out to your device manufacturer.
-    - If you manage your PCs using Intune or Intune for Education, you can check the OS version by checking the **OS version** info for the device. If  you are using another MDM provider, check the documentation for the MDM provider to confirm the OS version.
-    - Log into the PCs, go to the **Settings > System > About** page, look in the **Windows specifications** section and confirm **Version** is set to 1709.
-
-    To use the Windows Automatic Redeployment setting in the Set up School PCs app:
-    * When using [Set up School PCs](use-set-up-school-pcs-app.md), in the **Configure student PC settings** screen, select **Enable Windows 10 Automatic Redeployment** among the list of settings for the student PC as shown in the following example:
-
-    ![Configure student PC settings in Set up School PCs](images/suspc_configure_pc2.jpg)
-    
-## Trigger Windows Automatic Redeployment
-Windows Automatic Redeployment is a two-step process: trigger it and then authenticate. Once you've done these two steps, you can let the process execute and once it's done, the device is again ready for use. 
-
-**To trigger Windows Automatic Redeployment**
-
-1. From the Windows device lock screen, enter the keystroke: **CTRL + ![Windows key](images/windows_glyph.png) + R**. 
-
-    ![Enter CTRL+Windows key+R on the Windows lockscreen](images/windows-automatic-redeployment-lockscreen.png)
-
-    This will open up a custom login screen for Windows Automatic Redeployment. The screen serves two purposes:
-    1. Confirm/verify that the end user has the right to trigger Windows Automatic Redeployment
-    2. Notify the user in case a provisioning package, created using Windows Configuration Designer or Set up School PCs, will be used as part of the process.
-
-    ![Custom login screen for Windows Automatic Redeployment](images/windows-automatic-redeployment-customlogin.png)
-
-2. Sign in with the admin account credentials. If you created a provisioning package, plug in the USB drive and trigger Windows Automatic Redeployment.
-
-    Once Windows Automatic Redeployment is triggered, the reset process starts. 
-    
-    After reset, the device:
-    - Sets the region, language, and keyboard.
-    - Connects to Wi-Fi.
-    - If you provided a provisioning package when Windows Automatic Redeployment is triggered, the system will apply this new provisioning package. Otherwise, the system will re-apply the original provisioning package on the device. 
-    - Is returned to a known good managed state, connected to Azure AD and MDM.
-
-     ![Notification that provisioning is complete](images/windows-automatic-redeployment-provisioningcomplete.png)
-
-    Once provisioning is complete, the device is again ready for use.
-
-<span id="winre"/>
-## Troubleshoot Windows Automatic Redeployment
-
-Windows Automatic Redeployment will fail when the [Windows Recovery Environment (WinRE)](https://docs.microsoft.com/windows-hardware/manufacture/desktop/windows-recovery-environment--windows-re--technical-reference) is not enabled on the device. You will see `Error code: ERROR_NOT_SUPPORTED (0x80070032)`.
-
-To make sure WinRE is enabled, use the [REAgentC.exe tool](https://docs.microsoft.com/windows-hardware/manufacture/desktop/reagentc-command-line-options) to run the following command:
-
-```
-reagentc /enable
-```
-
-If Windows Automatic Reployment fails after enabling WinRE, or if you are unable to enable WinRE, please contact [Microsoft Support](https://support.microsoft.com) for assistance.
-
-## Related topics
-
-[Set up Windows devices for education](set-up-windows-10.md)
-
-
-
-
-
--- a/store-for-business/TOC.md
+++ b/store-for-business/TOC.md
@ -21,7 +21,7 @@
 ### [Manage access to private store](manage-access-to-private-store.md)
 ### [Manage private store settings](manage-private-store-settings.md)
 ### [Configure MDM provider](configure-mdm-provider-microsoft-store-for-business.md)
-### [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md)
+### [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md)
 ### [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md)
 ### [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md)
 ## [Device Guard signing portal](device-guard-signing-portal.md)
--- a/store-for-business/add-profile-to-devices.md
+++ b/store-for-business/add-profile-to-devices.md
@ -1,6 +1,6 @@
 ---
-title: Manage Windows device deployment with Windows AutoPilot Deployment
-description: Add an AutoPilot profile to devices. AutoPilot profiles control what is included in Windows set up experience for your employees. 
+title: Manage Windows device deployment with Windows Autopilot Deployment
+description: Add an Autopilot profile to devices. Autopilot profiles control what is included in Windows set up experience for your employees. 
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
@ -11,55 +11,55 @@ ms.date: 2/9/2018
 ms.localizationpriority: high
 ---

-# Manage Windows device deployment with Windows AutoPilot Deployment
+# Manage Windows device deployment with Windows Autopilot Deployment

 **Applies to**
 -   Windows 10

-Windows AutoPilot simplifies device set up for IT Admins. For an overview of benefits, scenarios, and prerequisites, see [Overview of Windows AutoPilot](https://docs.microsoft.com/windows/deployment/windows-autopilot/windows-10-autopilot).
+Windows Autopilot simplifies device set up for IT Admins. For an overview of benefits, scenarios, and prerequisites, see [Overview of Windows Autopilot](https://docs.microsoft.com/windows/deployment/windows-autopilot/windows-10-autopilot).

-Watch this video to learn more about Windows AutoPilot in Micrsoft Store for Business. </br>
+Watch this video to learn more about Windows Autopilot in Micrsoft Store for Business. </br>

 > [!video https://www.microsoft.com/en-us/videoplayer/embed/3b30f2c2-a3e2-4778-aa92-f65dbc3ecf54?autoplay=false]

-## What is Windows AutoPilot?
-In Microsoft Store for Business, you can manage devices for your organization and apply an *AutoPilot deployment profile* to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the AutoPilot deployment profile you applied to the device. 
+## What is Windows Autopilot?
+In Microsoft Store for Business, you can manage devices for your organization and apply an *Autopilot deployment profile* to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the Autopilot deployment profile you applied to the device. 

-You can create and apply AutoPilot deployment profiles to these devices. The overall process looks like this. 
+You can create and apply Autopilot deployment profiles to these devices. The overall process looks like this. 

-![Block diagram with main steps for using AutoPilot in Microsoft Store for Business: upload device list; group devices (this step is optional); add profile; and apply profile.](images/autopilot-process.png)
+![Block diagram with main steps for using Autopilot in Microsoft Store for Business: upload device list; group devices (this step is optional); add profile; and apply profile.](images/autopilot-process.png)

-Figure 1 - Windows AutoPilot Deployment Program process
+Figure 1 - Windows Autopilot Deployment Program process

-AutoPilot deployment profiles have two main parts: default settings that can't be changed, and optional settings that you can include. 
+Autopilot deployment profiles have two main parts: default settings that can't be changed, and optional settings that you can include. 

-### AutoPilot deployment profiles - default settings
-These settings are configured with all AutoPilot deployment profiles:
+### Autopilot deployment profiles - default settings
+These settings are configured with all Autopilot deployment profiles:
 - Skip Cortana, OneDrive, and OEM registration setup pages
 - Automatically setup for work or school
 - Sign in experience with company or school brand 

-### AutoPilot deployment profiles - optional settings
-These settings are off by default. You can turn them on for your AutoPilot deployment profiles:
+### Autopilot deployment profiles - optional settings
+These settings are off by default. You can turn them on for your Autopilot deployment profiles:
 - Skip privacy settings

-### Support for AutoPilot profile settings
-AutoPilot profile settings are supported beginning with the version of Windows they were introduced in. This table summarizes the settings and what they are supported on. 
+### Support for Autopilot profile settings
+Autopilot profile settings are supported beginning with the version of Windows they were introduced in. This table summarizes the settings and what they are supported on. 

 | Setting | Supported on  |
 | ------- | ------------- |
 | Deployment default features| Windows 10, version 1703 or later |
 | Skip privacy settings | Windows 10, version 1703 or later |
 | Disable local admin account creation on the device | Windows 10, version 1703 or later | 
-| Skip End User License Agreement (EULA) | Windows 10, version 1709 or later. </br> [Learn about Windows AutoPilot EULA dismissal](https://docs.microsoft.com/windows/deployment/Windows-AutoPilot-EULA-note) |
+| Skip End User License Agreement (EULA) | Windows 10, version 1709 or later. </br> [Learn about Windows Autopilot EULA dismissal](https://docs.microsoft.com/windows/deployment/Windows-Autopilot-EULA-note) |


-## Windows AutoPilot deployment profiles in Microsoft Store for Business and Education
+## Windows Autopilot deployment profiles in Microsoft Store for Business and Education
 You can manage new devices in Microsoft Store for Business or Microsoft Store for Education. Devices need to meet these requirements:
 - Windows 10, version 1703 or later
 - New devices that have not been through Windows out-of-box experience. 

-## Add devices and apply AutoPilot deployment profile
+## Add devices and apply Autopilot deployment profile
 To manage devices through Microsoft Store for Business and Education, you'll need a .csv file that contains specific information about the devices. You should be able to get this from your Microsoft account contact, or the store where you purchased the devices. Upload the .csv file to Microsoft Store to add the devices. 

 ### Device information file format
@ -72,7 +72,7 @@ Here's a sample device information file:

 ![Notepad file showing example entries for Column A (Device Serial Number), Column B (Windows Product ID), and Column C (Hardware Hash).](images/msfb-autopilot-csv.png)

-When you add devices, you need to add them to an *AutoPilot deployment group*. Use these groups to apply AutoPilot deployment profiles to a group of devices. The first time you add devices to a group, you'll need to create an AutoPilot deployment group. 
+When you add devices, you need to add them to an *Autopilot deployment group*. Use these groups to apply Autopilot deployment profiles to a group of devices. The first time you add devices to a group, you'll need to create an Autopilot deployment group. 

 > [!NOTE]
 > You can only add devices to a group when you add devices to **Microsoft Store for Business and Education**. If you decide to reorganize devices into different groups, you'll need to delete them from **Devices** in **Microsoft Store**, and add them again. 
@ -81,50 +81,50 @@ When you add devices, you need to add them to an *AutoPilot deployment group*. U
 1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). 
 2. Click **Manage**, and then click **Devices**.
 3. Click **Add devices**, navigate to the *.csv file and select it. 
-4. Type a name for a new AutoPilot deployment group, or choose one from the list, and then click **Add**. </br>
+4. Type a name for a new Autopilot deployment group, or choose one from the list, and then click **Add**. </br>
 If you don't add devices to a group, you can select the individual devices to apply a profile to. <br>  
 ![Screenshot of Add devices to a group dialog. You can create a new group, or select a current group.](images/add-devices.png)</br>
 
-5. Click the devices or AutoPilot deployment group that you want to manage. You need to select devices before you can apply an AutoPilot deployment profile. You can switch between seeing groups or devices by clicking **View groups** or **View devices**. 
+5. Click the devices or Autopilot deployment group that you want to manage. You need to select devices before you can apply an Autopilot deployment profile. You can switch between seeing groups or devices by clicking **View groups** or **View devices**. 

-**Apply AutoPilot deployment profile**
-1. When you have devices selected, click **AutoPilot deployment**. 
-2. Choose the AutoPilot deployment profile to apply to the selected devices.
+**Apply Autopilot deployment profile**
+1. When you have devices selected, click **Autopilot deployment**. 
+2. Choose the Autopilot deployment profile to apply to the selected devices.
 
    > [!NOTE]
-    > The first time you use AutoPilot deployment profiles, you'll need to create one. See [Create AutoPilot profile](#create-autopilot-profile).
+    > The first time you use Autopilot deployment profiles, you'll need to create one. See [Create Autopilot profile](#create-autopilot-profile).
     
 3. Microsoft Store for Business applies the profile to your selected devices, and shows the profile name on **Devices**.

-## Manage AutoPilot deployment profiles
-You can manage the AutoPilot deployment profiles created in Microsoft Store. You can create a new profile, edit, or delete a profile. 
+## Manage Autopilot deployment profiles
+You can manage the Autopilot deployment profiles created in Microsoft Store. You can create a new profile, edit, or delete a profile. 

-### Create AutoPilot profile
+### Create Autopilot profile

 1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). 
 2. Click **Manage**, and then click **Devices**.
-3. Click **AutoPilot deployment**, and then click **Create new profile**. 
+3. Click **Autopilot deployment**, and then click **Create new profile**. 
 4. Name the profile, choose the settings to include, and then click **Create**.</br>
-The new profile is added to the **AutoPilot deployment** list.  
+The new profile is added to the **Autopilot deployment** list.  

-### Edit or delete AutoPilot profile
+### Edit or delete Autopilot profile

 1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). 
 2. Click **Manage**, and then click **Devices**.
-3. Click **AutoPilot deployment**, click **Edit your profiles**, and then choose the profile to edit.
+3. Click **Autopilot deployment**, click **Edit your profiles**, and then choose the profile to edit.
 TBD: art
 4. Change settings for the profile, and then click **Save**.</br> 
 -or-</br>
 Click **Delete profile** to delete the profile. 

-## Apply a different AutoPilot deployment profile to devices
-After you've applied an AutoPilot deployment profile to a device, if you decide to apply a different profile, you can remove the profile and apply a new profile. 
+## Apply a different Autopilot deployment profile to devices
+After you've applied an Autopilot deployment profile to a device, if you decide to apply a different profile, you can remove the profile and apply a new profile. 

 > [!NOTE]
 > The new profile will only be applied if the device has not been started, and gone through the out-of-box experience. Settings from a different profile can't be applied when another profile has been applied. Windows would need to be reinstalled on the device for the second profile to be applied to the device. 

-## AutoPilot device information file error messages
-Here's info on some of the errors you might see while working with AutoPilot deployment profiles in **Microsoft Store for Business and Education**. 
+## Autopilot device information file error messages
+Here's info on some of the errors you might see while working with Autopilot deployment profiles in **Microsoft Store for Business and Education**. 

 | Message Id | Message explanation | 
 | ---------- | ------------------- |
@ -135,6 +135,6 @@ Here's info on some of the errors you might see while working with AutoPilot dep
 | wadp005    | Check your .csv file with your device provider. One of the devices on your list has been claimed by another organization. |
 | wadp006    | Try that again. Something happened on our end. Waiting a bit might help. |
 | wadp007    | Check the info for this device in your .csv file. The device is already registered in your organization. |
-| wadp008    | The device does not meet AutoPilot Deployment requirements. |
+| wadp008    | The device does not meet Autopilot Deployment requirements. |
 | wadp009    | Check with your device provider for an update .csv file. The current file doesn’t work |
 | wadp010    | Try that again. Something happened on our end. Waiting a bit might help. |
--- a/store-for-business/education/TOC.md
+++ b/store-for-business/education/TOC.md
@ -26,7 +26,7 @@
 ### [Manage access to private store](/microsoft-store/manage-access-to-private-store?toc=/microsoft-store/education/toc.json)
 ### [Manage private store settings](/microsoft-store/manage-private-store-settings?toc=/microsoft-store/education/toc.json)
 ### [Configure MDM provider](/microsoft-store/configure-mdm-provider-microsoft-store-for-business?toc=/microsoft-store/education/toc.json)
-### [Manage Windows device deployment with Windows AutoPilot Deployment](/microsoft-store/add-profile-to-devices?toc=/microsoft-store/education/toc.json)
+### [Manage Windows device deployment with Windows Autopilot Deployment](/microsoft-store/add-profile-to-devices?toc=/microsoft-store/education/toc.json)
 ### [Microsoft Store for Business and Education PowerShell module - preview](/microsoft-store/microsoft-store-for-business-education-powershell-module?toc=/microsoft-store/education/toc.json)
 ### [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](/microsoft-store/manage-mpsa-software-microsoft-store-for-business?toc=/microsoft-store/education/toc.json)
 ## [Device Guard signing portal](/microsoft-store/device-guard-signing-portal?toc=/microsoft-store/education/toc.json)
--- a/store-for-business/manage-apps-microsoft-store-for-business-overview.md
+++ b/store-for-business/manage-apps-microsoft-store-for-business-overview.md
@ -28,6 +28,6 @@ Manage products and services in Microsoft Store for Business and Microsoft Store
 | [App inventory managemement for Microsoft Store for Business and Education](app-inventory-management-microsoft-store-for-business.md) | You can manage all apps that you've acquired on your **Apps & software** page. |
 | [Manage private store settings](manage-private-store-settings.md) | The private store is a feature in Microsoft Store for Business and Education that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store. |
 | [Configure MDM provider](configure-mdm-provider-microsoft-store-for-business.md) | For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Microsoft Store for Business inventory to manage apps with offline licenses. Microsoft Store management tool services work with your third-party management tool to manage content. |
-| [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) | In Microsoft Store for Business, you can manage devices for your organization and apply an AutoPilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the AutoPilot deployment profile you applied to the device. |
+| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | In Microsoft Store for Business, you can manage devices for your organization and apply an Autopilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the Autopilot deployment profile you applied to the device. |
 | [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md) | Use PowerShell cmdlets to automate basic app license assignment.  |
 | [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md) | Software purchased with the Microsoft Products and Services Agreement (MPSA) can be managed in Microsoft Store for Business and Education. This allows customers to manage online software purchases in one location. |
--- a/store-for-business/release-history-microsoft-store-business-education.md
+++ b/store-for-business/release-history-microsoft-store-business-education.md
@ -43,7 +43,7 @@ Looking for info on the latest release? Check out [What's new in Microsoft Store

 ## September 2017

- **Manage Windows device deployment with Windows AutoPilot Deployment** - In Microsoft Store for Business, you can manage devices for your organization and apply an AutoPilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the AutoPilot deployment profile you applied to the device. [Get more info](add-profile-to-devices.md)
+- **Manage Windows device deployment with Windows Autopilot Deployment** - In Microsoft Store for Business, you can manage devices for your organization and apply an Autopilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the Autopilot deployment profile you applied to the device. [Get more info](add-profile-to-devices.md)
 - **Request an app** - People in your organization can reqest additional licenses for apps in your private store, and then Admins or Purchasers can make the purchases. [Get more info](https://docs.microsoft.com/microsoft-store/acquire-apps-microsoft-store-for-business#request-apps)
 - **My organization** - **My organization** shows you all Agreements that apply to your organization. You can also update profile info for you org, such as mailing address and email associated with your account.
 - **Manage prepaid Office 365 subscriptions** - Office 365 prepaid subscriptions can be redeemed using a prepaid token. Tokens are available through 3rd-party businesses, outside of Microsoft Store for Business or the Office 365 Admin portal. After redemming prepaid subscriptions, Admins can add more licenses or extend the subscription's expiration date.
--- a/store-for-business/sfb-change-history.md
+++ b/store-for-business/sfb-change-history.md
@ -49,7 +49,7 @@ ms.localizationpriority: high

 | New or changed topic | Description |
 | --- | --- |
-| [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) | Update. Add profile settings with supported build info.  |
+| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | Update. Add profile settings with supported build info.  |
 | [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |

 ## September 2017
@ -78,7 +78,7 @@ ms.localizationpriority: high
  
 | New or changed topic | Description |
 | -------------------- | ----------- |
-| [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) | New. Information about Windows AutoPilot Deployment Program and how it is used in Microsoft Store for Business and Education.  |
+| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | New. Information about Windows Autopilot Deployment Program and how it is used in Microsoft Store for Business and Education.  |
 | [Microsoft Store for Business and Education overview - supported markets](https://docs.microsoft.com/en-us/microsoft-store/windows-store-for-business-overview#supported-markets) | Updates for added market support. |
  

--- a/store-for-business/whats-new-microsoft-store-business-education.md
+++ b/store-for-business/whats-new-microsoft-store-business-education.md
@ -29,7 +29,7 @@ We’ve been working on bug fixes and performance improvements to provide you a
 |  |  |
 |-----------------------|---------------------------------|
 | ![Private store performance icon](images/perf-improvement-icon.png) |**Performance improvements in private store**<br /><br /> We've made it significantly faster for you to update the private store. Many changes to the private store are available immediately after you make them. <br /><br />[Get more info](https://docs.microsoft.com/microsoft-store/manage-private-store-settings#private-store-performance)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
-| <iframe width="288" height="232" src="https://www.youtube.com/embed/IpLIZU_j7Z0" frameborder="0" allowfullscreen></iframe>| **Manage Windows device deployment with Windows AutoPilot Deployment** <br /><br /> In Microsoft Store for Business, you can manage devices for your organization and apply an AutoPilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the AutoPilot deployment profile you applied to the device.<br /><br />[Get more info](add-profile-to-devices.md)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education  |
+| <iframe width="288" height="232" src="https://www.youtube.com/embed/IpLIZU_j7Z0" frameborder="0" allowfullscreen></iframe>| **Manage Windows device deployment with Windows Autopilot Deployment** <br /><br /> In Microsoft Store for Business, you can manage devices for your organization and apply an Autopilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the Autopilot deployment profile you applied to the device.<br /><br />[Get more info](add-profile-to-devices.md)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education  |
 | ![Microsoft Store for Business Settings page, Distribute tab showing app requests setting.](images/msfb-wn-1709-app-request.png) |**Request an app**<br /><br />People in your organization can reqest additional licenses for apps in your private store, and then Admins or Purchasers can make the purchases. <br /><br />[Get more info](https://docs.microsoft.com/microsoft-store/acquire-apps-microsoft-store-for-business#request-apps)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 ||  ![Image showing Add a Collection.](images/msfb-add-collection.png) |**Private store collections**<br /><br> You can groups of apps in your private store with **Collections**. This can help you organize apps and help people find apps for their job or classroom. <br /><br />[Get more info](https://review.docs.microsoft.com/microsoft-store/manage-private-store-settings?branch=msfb-14856406#add-a-collection)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 -->
@ -60,7 +60,7 @@ We’ve been working on bug fixes and performance improvements to provide you a
 - Bug fixes and permformance improvements 

 [September 2017](release-history-microsoft-store-business-education.md#september-2017)
- Manage Windows device deployment with Windows AutoPilot Deployment
+- Manage Windows device deployment with Windows Autopilot Deployment
 - Request an app
 - My organization
 - Manage prepaid Office 365 subscriptions
--- a/windows/application-management/apps-in-windows-10.md
+++ b/windows/application-management/apps-in-windows-10.md
@ -8,7 +8,7 @@ ms.pagetype: mobile
 ms.author: elizapo
 author: lizap
 ms.localizationpriority: low
-ms.date: 01/24/2018
+ms.date: 04/30/2018
 ---
 # Understand the different apps included in Windows 10

@ -23,7 +23,7 @@ Digging into the Windows apps, there are two categories:
   - Provisioned: Installed the first time you sign into Windows. You'll see a tile or Start menu item for these apps, but they aren't installed until the first sign-in.
   - Installed: Installed as part of the OS.

-The following tables list the system apps, installed Windows apps, and provisioned Windows apps in a standard Windows 10 Enterprise installation. (If you have a custom image, your specific apps might differ.) The tables list the app, the full name, show the app's status in Windows 10 version 1607, 1703, and 1709, and indicate whether an app can be uninstalled through the UI. 
+The following tables list the system apps, installed Windows apps, and provisioned Windows apps in a standard Windows 10 Enterprise installation. (If you have a custom image, your specific apps might differ.) The tables list the app, the full name, show the app's status in Windows 10 version 1607, 1703, and 1709, and indicate whether an app can be uninstalled through the UI.

 Some of the apps show up in multiple tables - that's because their status changed between versions. Make sure to check the version column for the version you are currently running.

@ -32,115 +32,143 @@ Some of the apps show up in multiple tables - that's because their status change
 > ```powershell
 > Get-AppxPackage |Select Name,PackageFamilyName
 > Get-AppxProvisionedPackage -Online | select DisplayName,PackageName
-> ``` 
-
+> ```

 ## System apps
-System apps are integral to the operating system. Here are the typical system apps in Windows 10 versions 1607, 1703, and 1709. 

-| Name             | Full name                                 | 1607 | 1703 | 1709 |Uninstall through UI?                                  |
-|------------------|-------------------------------------------|------|------|------|-------------------------------------------------------|
-| Cortana UI       | CortanaListenUIApp                        |      | x    |       | No                                                     |
-|                  | Desktop Learning                          |      | x    |       | No                                                     |
-|                  | DesktopView                               |      | x    |       | No                                                     |
-|                  | EnvironmentsApp                           |      | x    |       | No                                                     |
-| Mixed Reality +  | HoloCamera                                |      | x    |       | No                                                     |
-| Mixed Reality +  | HoloItemPlayerApp                         |      | x    |       | No                                                     |
-| Mixed Reality +  | HoloShell                                 |      | x    |       | No                                                     |
-|                  | InputApp                                  |      |      |   x   | No                                                     |
-|                  | Microsoft.AAD.Broker.Plugin               | x    | x    |   x   | No                                                     |
-|                  | Microsoft.AccountsControl                 | x    | x    |   x   | No                                                     |
-| Hello setup UI   | Microsoft.BioEnrollment                   | x    | x    |   x   | No                                                     |
-|                  | Microsoft.CredDialogHost                  |      | x    |   x   | No                                                     |
-|                  | Microsoft.ECApp                           |      |      |   x   | No                                                     |
-|                  | Microsoft.LockApp                         | x    | x    |   x   | No                                                     |
-| Microsoft Edge   | Microsoft.Microsoft.Edge                  | x    | x    |   x   | No                                                     |
-|                  | Microsoft.PPIProjection                   | x    | x    |   x   | No                                                     |
-|                  | Microsoft.Windows. Apprep.ChxApp           | x    | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. AssignedAccessLockApp   | x    | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. CloudExperienceHost     | x    | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. ContentDeliveryManager  | x    | x    |  x    | No                                                     |
-| Cortana          | Microsoft.Windows.Cortana                  | x    | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. Holographic.FirstRun    |      | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. ModalSharePickerHost    |      | x    |      | No                                                     |
-|                  | Microsoft.Windows. OOBENetworkCaptivePort  |      | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. OOBENetworkConnectionFlow   |      | x    |  x    | No                                                 |
-|                  | Microsoft.Windows. ParentalControls        | x    | x    |  x    | No                                                     |
-| People Hub       | Microsoft.Windows. PeopleExperienceHost        |     |     |  x    | No                                                   |
-|                  | Microsoft.Windows. PinningConfirmationDialog        |     |     |  x    | No                                              |
-|                  | Microsoft.Windows. SecHealthUI             |      | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. SecondaryTileExperience | x    | x    |  x    | No                                                     |
-|                  | Microsoft.Windows. SecureAssessmentBrowser |      | x    |  x    | No                                                     |
-| Start            | Microsoft.Windows. ShellExperienceHost     | x    | x    |  x   | No                                                     |
-| Windows Feedback | Microsoft.WindowsFeedback                  | *    | *    |  *    | No                                                     |
-|                  | Microsoft.XboxGameCallableUI               | x    | x    |  x    | No                                                     |
-| Contact Support* | Windows.ContactSupport                     | x    | x    |  *    | Through the Optional Features app |
-| Settings         | Windows.ImmersiveControlPanel              | x    | x    |  x    | No                                                     |
-| Connect          | Windows.MiracastView                       | x    | x    |      | No                                                     |
-| Print 3D         | Windows.Print3D                            |      |      |  x    | Yes                                                    |
-| Print UI         | Windows.PrintDialog                        | x    | x    |  x    | No                                                     |
+System apps are integral to the operating system. Here are the typical system apps in Windows 10 versions 1703, 1709, and 1803.

-> [!NOTE] 
-> - The Windows Feedback app changed to the Feedback Hub in version 1607. It's listed in the provisioned apps table below.
+| Name             | Full name                                 |1703  | 1709 | 1803 |Uninstall through UI?                                  |
+|------------------|-------------------------------------------|:------:|:------:|:------:|-------------------------------------------------------|
+| Cortana UI       | CortanaListenUIApp                        | x    |      |      |No                                                     |
+|                  | Desktop Learning                          | x    |      |      |No                                                     |
+|                  | DesktopView                               | x    |      |      |No                                                     |
+|                  | EnvironmentsApp                           | x    |      |      |No                                                     |
+| Mixed Reality +  | HoloCamera                                | x    |      |      |No                                                     |
+| Mixed Reality +  | HoloItemPlayerApp                         | x    |      |      |No                                                     |
+| Mixed Reality +  | HoloShell                                 | x    |      |      |No                                                     |
+|                  | InputApp                                  |      |  x   | x    |No                                                     |
+|                  | Microsoft.AAD.Broker.Plugin               | x    |  x   | x    |No                                                     |
+|                  | Microsoft.AccountsControl                 | x    |  x   | x    |No                                                     |
+| Hello setup UI   | Microsoft.BioEnrollment                   | x    |  x   | x    |No                                                     |
+|                  | Microsoft.CredDialogHost                  | x    |  x   | x    |No                                                     |
+|                  | Microsoft.ECApp                           |      |  x   | x    |No                                                     |
+|                  | Microsoft.LockApp                         | x    |  x   | x    |No                                                     |
+| Microsoft Edge   | Microsoft.Microsoft.Edge                  | x    |  x   | x    |No                                                     |
+|                  | Microsoft.PPIProjection                   | x    |  x   | x    |No                                                     |
+|                  | Microsoft.Windows. Apprep.ChxApp           | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. AssignedAccessLockApp   | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. CloudExperienceHost     | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. ContentDeliveryManager  | x    |  x  | x    |No                                                     |
+| Cortana          | Microsoft.Windows.Cortana                  | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. Holographic.FirstRun    | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. ModalSharePickerHost    | x    |     |      |No                                                     |
+|                  | Microsoft.Windows. OOBENetworkCaptivePort  | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. OOBENetworkConnectionFlow  | x |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. ParentalControls        | x    |  x  | x    |No                                                     |
+| People Hub       | Microsoft.Windows. PeopleExperienceHost    |      |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. PinningConfirmationDialog  |   |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. SecHealthUI             | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows. SecondaryTileExperience | x    |  x  |      |No                                                     |
+|                  | Microsoft.Windows. SecureAssessmentBrowser | x    |  x  | x    |No                                                     |
+| Start            | Microsoft.Windows. ShellExperienceHost     | x    |  x  | x    |No                                                     |
+| Windows Feedback | Microsoft.WindowsFeedback                  | *    |  *  |      |No                                                     |
+|                  | Microsoft.XboxGameCallableUI               | x    |  x  |  x   |No                                                     |
+| Contact Support* | Windows.ContactSupport                     | x    |  *  |      |Through the Optional Features app                      |
+| Settings         | Windows.ImmersiveControlPanel              | x    |  x  |      |No                                                     |
+| Connect          | Windows.MiracastView                       | x    |     |      |No                                                     |
+| Print 3D         | Windows.Print3D                            |      |  x  |      |Yes                                                    |
+| Print UI         | Windows.PrintDialog                        | x    |  x  |  x   |No                                                     |
+| Purchase UI      | Windows.PurchaseDialog                     |      |     | x    |No                                                     |
+|                  | Microsoft.AsyncTextService                 |      |     | x    |No                                                     |
+|                  | Microsoft.MicrosoftEdgeDevToolsClient      |      |     | x    |No                                                     |
+|                  | Microsoft.Win32WebViewHost                 |      |     | x    |No                                                     |
+|                  | Microsoft.Windows.CapturePicker            |      |     | x    |No                                                     |
+|                  | Windows.CBSPreview                         |      |     | x    |No                                                     |
+|File Picker       | 1527c705-839a-4832-9118-54d4Bd6a0c89       |      |     | x    |No                                                     |
+|File Explorer     | c5e2524a-ea46-4f67-841f-6a9465d9d515       |      |     | x    |No                                                     |
+|App Resolver      | E2A4F912-2574-4A75-9BB0-0D023378592B       |      |     | x    |No                                                     |
+|Add Suggested folder Dialog box| F46D4000-FD22-4DB4-AC8E-4E1DDDE828FE||     | x    |No                                                     |
+
+> [!NOTE]
 > - The Contact Support app changed to Get Help in version 1709. Get Help is a provisioned app (instead of system app like Contact Support).
-> - As of Windows 10 version 1607, you can use the Optional Features app to uninstall the Contact Support app.

 ## Installed Windows apps
-Here are the typical installed Windows apps in Windows 10 versions 1607, 1703, and 1709.
-
-| Name               | Full name                               | 1607 | 1703 | 1709 |Uninstall through UI? |
-|--------------------|-----------------------------------------|------|------|------|----------------------|
-| Remote Desktop     | Microsoft.RemoteDesktop                 | x    | x    |   x   | Yes                       |
-| PowerBI            | Microsoft.Microsoft PowerBIforWindows   | x    | x    |       | Yes                        |
-| Code Writer        | ActiproSoftwareLLC.562882FEEB491        | x    | x    |   x   | Yes                       |
-| Eclipse Manager    | 46928bounde.EclipseManager              | x    | x    |   x   | Yes                       |
-| Pandora            | PandoraMediaInc.29680B314EFC2           | x    | x    |   x   | Yes                       |
-| Photoshop Express  | AdobeSystemIncorporated. AdobePhotoshop  | x    | x    |  x    | Yes                       |
-| Duolingo           | D5EA27B7.Duolingo- LearnLanguagesforFree |      | x    |  x    | Yes                       |
-| Network Speed Test | Microsoft.NetworkSpeedTest              | x    | x    |   x   | Yes                       |
-| Paid Wi-FI         |                                         |      | x     |       | Yes                       |
+Here are the typical installed Windows apps in Windows 10 versions 1703, 1709, and 1803.

+| Name               | Full name                                | 1703 | 1709 | 1803 |Uninstall through UI? |
+|--------------------|------------------------------------------|:------:|:------:|:------:|----------------------|
+| Remote Desktop     | Microsoft.RemoteDesktop                  | x    | x    |      | Yes                  |
+| PowerBI            | Microsoft.Microsoft PowerBIforWindows    | x    |      |      | Yes                  |
+| Code Writer        | ActiproSoftwareLLC.562882FEEB491         | x    | x    | x    | Yes                  |
+| Eclipse Manager    | 46928bounde.EclipseManager               | x    | x    | x    | Yes                  |
+| Pandora            | PandoraMediaInc.29680B314EFC2            | x    | x    | x    | Yes                  |
+| Photoshop Express  | AdobeSystemIncorporated. AdobePhotoshop  | x    | x    | x    | Yes                  |
+| Duolingo           | D5EA27B7.Duolingo- LearnLanguagesforFree | x    | x    | x    | Yes                  |
+| Network Speed Test | Microsoft.NetworkSpeedTest               | x    | x    | x    | Yes                  |
+| News                            | Microsoft.BingNews                     | x    |  x   | x    | Yes                       |
+| Flipboard          |                                          |      |      |      | Yes                  |
+|                    | Microsoft.Advertising.Xaml               | x    | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Framework.1.2       | x    | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Framework.1.3       | x    | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Framework.1.6       |      | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Framework.1.7       |      |      | x    | Yes                  |
+|                    | Microsoft.NET.Native.Framework.2.0       |      | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Runtime.1.1         |      | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Runtime.1.3         | x    | x    |      | Yes                  |
+|                    | Microsoft.NET.Native.Runtime.1.4         | x    | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Runtime.1.6         |      | x    | x    | Yes                  |
+|                    | Microsoft.NET.Native.Runtime.1.7         |      |      | x    | Yes                  |
+|                    | Microsoft.NET.Native.Runtime.2.0         |      | x    | x    | Yes                  |
+|                    | Microsoft.Services.Store.Engagement      |      | x    | x    | Yes                  |
+|                    | Microsoft.VCLibs.120.00                  | x    | x    | x    | Yes                  |
+|                    | Microsoft.VCLibs.140.00                  | x    | x    | x    | Yes                  |
+|                    | Microsoft.VCLibs.120.00.Universal        |      | x    |      | Yes                  |
+|                    | Microsoft.VCLibs.140.00.UWPDesktop       |      |      | x    | Yes                  |
+|                    | Microsoft.WinJS.2.0                      | x    |      |      | Yes                  |

 ## Provisioned Windows apps
-Here are the typical provisioned Windows apps in Windows 10 versions 1607, 1703, and 1709.

-| Name                            | Full name                              | 1607 | 1703 | 1709 | Uninstall through UI?     |
-|---------------------------------|----------------------------------------|------|------|------|---------------------|
-| 3D Builder                      | Microsoft.3DBuilder                    |      | x    |      | Yes                       |
-| Alarms & Clock                  | Microsoft.WindowsAlarms                |  x   | x    |  x   | No                       |
-| App Installer                   | Microsoft.DesktopAppInstaller          |  x   | x    |  x   | No                       |
-| Calculator                      | Microsoft.WindowsCalculator            | x    | x    |  x   | No                        |
-| Camera                          | Microsoft.WindowsCamera                | x    | x    |  x   | No                        |
-| Feedback Hub                    | Microsoft.WindowsFeedbackHub           | x    | x    |  x   | Yes                       |
-| Get Help                        | Microsoft.GetHelp                      |      |      |  x   | No                       |
-| Get Office/My Office            | Microsoft.Microsoft OfficeHub          |  x   |  x   |  x   | Yes                       |
-| Get Skype/Skype (preview)/Skype | Microsoft.SkypeApp                     | x    | x    |  x    | Yes                       |
-| Get Started/Tips                | Microsoft.Getstarted                   | x    | x    |  x    | Yes                       |
-| Groove                          | Microsoft.ZuneMusic                    | x    | x    |  x    | No                        |
-| Mail and Calendar               | microsoft.windowscommunicationsapps    | x    | x    |  x   | No                        |
-| Maps                            | Microsoft.WindowsMaps                  | x    | x    |  x    | No                        |
-| Messaging                       | Microsoft.Messaging                    | x    | x    |  x   | No                        |
-| Microsoft 3D Viewer             | Microsoft.Microsoft3DViewer            |      | x    |  x    | No                        |
-| Movies & TV                     | Microsoft.ZuneVideo                    | x    | x    |  x    | No                        |
-| News                            | Microsoft.BingNews                     | x    | x    |  x    | Yes                        |
-| OneNote                         | Microsoft.Office.OneNote               | x    | x    |  x    | Yes                        |
-| Paint 3D                        | Microsoft.MSPaint                      |      | x    |  x    | No                        |
-| People                          | Microsoft.People                       | x    | x    |  x    | No                        |
-| Photos                          | Microsoft.Windows.Photos               | x    | x    |  x    | No                        |
-| Print 3D                        | Microsoft.Print3D                      |      |      |  x    | No                        |
-| Solitaire                       | Microsoft.MicrosoftSolitaireCollection | x    | x    |  x    | Yes                       |
-| Sticky Notes                    | Microsoft.MicrosoftStickyNotes         | x    | x    |  x    | No                        |
-| Store                           | Microsoft.WindowsStore                 | x    | x    |  x    | No                        |
-| Sway                            | Microsoft.Office.Sway                  | *    | *    |  x   | Yes                       |
-| Voice Recorder                  | Microsoft.WindowsSoundRecorder         | x    | x    |  x   | No                        |
-| Wallet                          | Microsoft.Wallet                       |      | x    |  x    | No                        |
-| Weather                         | Microsoft.BingWeather                  | x    | x    |  x    | Yes                        |
-| Xbox                            | Microsoft.XboxApp                      | x    | x    |  x    | No                        |
-|                                 | Microsoft.OneConnect                   | x    | x    |  x    | No                        |
-|                                 | Microsoft.StorePurchaseApp             | x    | x    |  x   | No                        |
-|                                 | Microsoft.Xbox.TCUI                    |      |      |  x   | No                        |
-|                                 | Microsoft.XboxGameOverlay              |      | x    |  x    | No                        |
-|                                 | Microsoft.XboxIdentityProvider         | x    | x    |  *    | No                        |
-|                                 | Microsoft.XboxSpeech ToTextOverlay     |      | x    |  x    | No                        |
+Here are the typical provisioned Windows apps in Windows 10 versions 1703, 1709, and 1803.

-\* moved from "provisioned" to "installed" in this version.
+| Name                            | Full name                              | 1703 | 1709 | 1803 | Uninstall through UI?     |
+|---------------------------------|----------------------------------------|:------:|:------:|:------:|---------------------------|
+| 3D Builder                      | Microsoft.3DBuilder                    | x    |      |      | Yes                       |
+| Alarms & Clock                  | Microsoft.WindowsAlarms                | x    |  x   | x    | No                        |
+| App Installer                   | Microsoft.DesktopAppInstaller          | x    |  x   | x    | Via Settings App          |
+| Calculator                      | Microsoft.WindowsCalculator            | x    |  x   | x    | No                        |
+| Camera                          | Microsoft.WindowsCamera                | x    |  x   | x    | No                        |
+| Feedback Hub                    | Microsoft.WindowsFeedbackHub           | x    |  x   | x    | Yes                       |
+| Get Help                        | Microsoft.GetHelp                      |      |  x   | x    | No                        |
+| Get Office/My Office            | Microsoft.Microsoft OfficeHub          | x    |  x   | x    | Yes                       |
+| Get Skype/Skype (preview)/Skype | Microsoft.SkypeApp                     | x    |  x   | x    | Yes                       |
+| Get Started/Tips                | Microsoft.Getstarted                   | x    |  x   | x    | Yes                       |
+| Groove                          | Microsoft.ZuneMusic                    | x    |  x   | x    | No                        |
+| Mail and Calendar               | Microsoft.windows communicationsapps   | x    |  x   | x    | No                        |
+| Maps                            | Microsoft.WindowsMaps                  | x    |  x   | x    | No                        |
+| Messaging                       | Microsoft.Messaging                    | x    |  x   | x    | No                        |
+| Microsoft 3D Viewer             | Microsoft.Microsoft3DViewer            | x    |  x   | x    | No                        |
+| Movies & TV                     | Microsoft.ZuneVideo                    | x    |  x   | x    | No                        |
+| OneNote                         | Microsoft.Office.OneNote               | x    |  x   | x    | Yes                       |
+| Paid Wi-FI                      | Microsoft.OneConnect                   | x    | x    | x    | Yes                       |
+| Paint 3D                        | Microsoft.MSPaint                      | x    |  x   | x    | No                        |
+| People                          | Microsoft.People                       | x    |  x   | x    | No                        |
+| Photos                          | Microsoft.Windows.Photos               | x    |  x   | x    | No                        |
+| Print 3D                        | Microsoft.Print3D                      |      |  x   | x    | No                        |
+| Solitaire                       | Microsoft.Microsoft SolitaireCollection| x    |  x   | x    | Yes                       |
+| Sticky Notes                    | Microsoft.MicrosoftStickyNotes         | x    |  x   | x    | No                        |
+| Store                           | Microsoft.WindowsStore                 | x    |  x   | x    | No                        |
+| Sway                            | Microsoft.Office.Sway                  | *    |  x   | x    | Yes                       |
+| Voice Recorder                  | Microsoft.SoundRecorder                | x    |  x   | x    | No                        |
+| Wallet                          | Microsoft.Wallet                       | x    |  x   | x    | No                        |
+| Weather                         | Microsoft.BingWeather                  | x    |  x   | x    | Yes                       |
+| Xbox                            | Microsoft.XboxApp                      | x    |  x   | x    | No                        |
+|                                 | Microsoft.OneConnect                   | x    |  x   | x    | No                        |
+|                                 | Microsoft.DesktopAppInstaller          |      |      | x    | No                        |
+|                                 | Microsoft.StorePurchaseApp             | x    |  x   | x    | No                        |
+|                                 | Microsoft.WebMediaExtensions           |      |      | x    | No                        |
+|                                 | Microsoft.Xbox.TCUI                    |      |  x   | x    | No                        |
+|                                 | Microsoft.XboxGameOverlay              | x    |  x   | x    | No                        |
+|                                 | Microsoft.XboxGamingOverlay            |      |      | x    | No                        |
+|                                 | Microsoft.XboxIdentityProvider         | x    |  x   | x    | No                        |
+|                                 | Microsoft.XboxSpeech ToTextOverlay     | x    |  x   | x    | No                        |
--- a/windows/client-management/TOC.md
+++ b/windows/client-management/TOC.md
@ -6,6 +6,7 @@
 ## [New policies for Windows 10](new-policies-for-windows-10.md)
 ## [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md)
 ## [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
+## [What version of Windows am I running](windows-version-search.md)
 ## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
 ## [Transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md)
 ## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
--- a/windows/client-management/images/WinVer.PNG
+++ b/windows/client-management/images/WinVer.PNG
--- a/windows/client-management/images/msinfo32.png
+++ b/windows/client-management/images/msinfo32.png
--- a/windows/client-management/images/msinfosnip.jpg
+++ b/windows/client-management/images/msinfosnip.jpg
--- a/windows/client-management/images/refcmd.png
+++ b/windows/client-management/images/refcmd.png
--- a/windows/client-management/images/slmgr_dlv.png
+++ b/windows/client-management/images/slmgr_dlv.png
--- a/windows/client-management/images/systemcollage.png
+++ b/windows/client-management/images/systemcollage.png
--- a/windows/client-management/images/systeminfo.png
+++ b/windows/client-management/images/systeminfo.png
--- a/windows/client-management/images/systemproperties.png
+++ b/windows/client-management/images/systemproperties.png
--- a/windows/client-management/images/systemprops.jpg
+++ b/windows/client-management/images/systemprops.jpg
--- a/windows/client-management/images/winsearchbar.jpg
+++ b/windows/client-management/images/winsearchbar.jpg
--- a/windows/client-management/images/winversnip.jpg
+++ b/windows/client-management/images/winversnip.jpg
--- a/windows/client-management/manage-windows-10-in-your-organization-modern-management.md
+++ b/windows/client-management/manage-windows-10-in-your-organization-modern-management.md
@ -6,9 +6,9 @@ ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
 ms.pagetype: devices
-author: jdeckerms
+author: MariciaAlforque
 ms.localizationpriority: high
-ms.date: 12/04/2017
+ms.date: 04/26/2018
 ---

 # Manage Windows 10 in your organization - transitioning to modern management
@ -21,10 +21,10 @@ Your organization can support various operating systems across a wide range of d

 This six-minute video demonstrates how users can bring in a new retail device and be up and working with their personalized settings and a managed experience in a few minutes, without being on the corporate network. It also demonstrates how IT can apply policies and configurations to ensure device compliance.

- <iframe width="560" height="315" src="https://www.youtube.com/embed/g1rIcBhhxpA" frameborder="0" allowfullscreen></iframe> 
+> [!VIDEO https://www.youtube.com/embed/g1rIcBhhxpA] 

 >[!NOTE]
- >The video demonstrates the configuration process using the classic Azure portal, which will be retired January 08, 2018. Customers should use the new Azure portal. [Learn how use the new Azure portal to perform tasks that you used to do in the classic Azure portal.](https://docs.microsoft.com/information-protection/deploy-use/migrate-portal)
+ >The video demonstrates the configuration process using the classic Azure portal, which is retired. Customers should use the new Azure portal. [Learn how use the new Azure portal to perform tasks that you used to do in the classic Azure portal.](https://docs.microsoft.com/information-protection/deploy-use/migrate-portal)

 This topic offers guidance on strategies for deploying and managing Windows 10, including deploying Windows 10 in a mixed environment. The topic covers [management options](#reviewing-the-management-options-with-windows-10) plus the four stages of the device lifecycle:

@ -94,17 +94,14 @@ As you review the roles in your organization, you can use the following generali

 Your configuration requirements are defined by multiple factors, including the level of management needed, the devices and data managed, and your industry requirements. Meanwhile, employees are frequently concerned about IT applying strict policies to their personal devices, but they still want access to corporate email and documents. With Windows 10, you can create a consistent set of configurations across PCs, tablets, and phones through the common MDM layer. 

-**MDM**: [MDM](https://www.microsoft.com/en-us/cloud-platform/mobile-device-management) gives you a way to configure settings that achieve your administrative intent without exposing every possible setting. (In contrast, Group Policy exposes fine-grained settings that you control individually.) One benefit of MDM is that it enables you to apply broader privacy, security, and application management settings through lighter and more efficient tools. This makes MDM the best choice for devices that are constantly on the go.
+**MDM**: [MDM](https://www.microsoft.com/en-us/cloud-platform/mobile-device-management) gives you a way to configure settings that achieve your administrative intent without exposing every possible setting. (In contrast, Group Policy exposes fine-grained settings that you control individually.) One benefit of MDM is that it enables you to apply broader privacy, security, and application management settings through lighter and more efficient tools. MDM also allows you to target Internet-connected devices to manage policies without using GP that requires on-premise domain joined devices. This makes MDM the best choice for devices that are constantly on the go.

-**Group Policy** and **System Center Configuration Manager**: Your organization might still need to manage domain joined computers at a granular level such as Internet Explorer’s 1,500 configurable Group Policy settings, or very specific Windows Firewall rules. If so, Group Policy and System Center Configuration Manager continue to be excellent management choices:
+**Group Policy** and **System Center Configuration Manager**: Your organization might still need to manage domain joined computers at a granular level such as Internet Explorer’s 1,500 configurable Group Policy settings. If so, Group Policy and System Center Configuration Manager continue to be excellent management choices:

 -   Group Policy is the best way to granularly configure domain joined Windows PCs and tablets connected to the corporate network using Windows-based tools. Microsoft continues to add Group Policy settings with each new version of Windows.

 -   Configuration Manager remains the recommended solution for granular configuration with robust software deployment, Windows updates, and OS deployment.

-You can use the following generalized decision tree to review the management choices for devices in your organization:
-
-![Decision tree for device configuration options](images/windows-10-management-gp-intune-flow.png)

 ## Updating and Servicing

@ -116,12 +113,24 @@ MDM with Intune provide tools for applying Windows updates to client computers i

 There are a variety of steps you can take to begin the process of modernizing device management in your organization:

-   **Assess current management practices, and look for investments you might make today.** Which of your current practices need to stay the same, and which can you change? Specifically, what elements of traditional management do you need to retain and where can you modernize? Whether you take steps to minimize custom imaging, re-evaluate settings management, or reassesses authentication and compliance, the benefits can be immediate.
+**Assess current management practices, and look for investments you might make today.** Which of your current practices need to stay the same, and which can you change? Specifically, what elements of traditional management do you need to retain and where can you modernize? Whether you take steps to minimize custom imaging, re-evaluate settings management, or reassesses authentication and compliance, the benefits can be immediate. You can use the [MDM Migration Analysis Tool (MMAT)](http://aka.ms/mmat) to help determine which Group Policies are set for a target user/computer and cross-reference them against the list of available MDM policies.

-   **Assess the different use cases and management needs in your environment.** Are there groups of devices that could benefit from lighter, simplified management? BYOD devices, for example, are natural candidates for cloud-based management. Users or devices handling more highly regulated data might require an on-premises Active Directory domain for authentication. Configuration Manager and EMS provide you the flexibility to stage implementation of modern management scenarios while targeting different devices the way that best suits your business needs.
+**Assess the different use cases and management needs in your environment.** Are there groups of devices that could benefit from lighter, simplified management? BYOD devices, for example, are natural candidates for cloud-based management. Users or devices handling more highly regulated data might require an on-premises Active Directory domain for authentication. Configuration Manager and EMS provide you the flexibility to stage implementation of modern management scenarios while targeting different devices the way that best suits your business needs.

-   **Review the decision trees in this article.** With the different options in Windows 10, plus Configuration Manager and Enterprise Mobility + Security, you have the flexibility to handle imaging, authentication, settings, and management tools for any scenario.
+**Review the decision trees in this article.** With the different options in Windows 10, plus Configuration Manager and Enterprise Mobility + Security, you have the flexibility to handle imaging, authentication, settings, and management tools for any scenario.

-   **Take incremental steps.** Moving towards modern device management doesn’t have to be an overnight transformation. New operating systems and devices can be brought in while older ones remain. With this “managed diversity,” users can benefit from productivity enhancements on new Windows 10 devices, while you continue to maintain older devices according to your standards for security and manageability.
+**Take incremental steps.** Moving towards modern device management doesn’t have to be an overnight transformation. New operating systems and devices can be brought in while older ones remain. With this “managed diversity,” users can benefit from productivity enhancements on new Windows 10 devices, while you continue to maintain older devices according to your standards for security and manageability. Starting with Windows 10, version 1803, the new policy [MDMWinsOverGP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-controlpolicyconflict#controlpolicyconflict-mdmwinsovergp) was added to allow MDM policies to take precedence over GP when both GP and its equivalent MDM policies are set on the device. You can start implementing MDM policies while keeping your GP environment. Here is the list of MDM policies with equivalent GP - [Policies supported by GP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-configuration-service-provider#policies-supported-by-gp)

-   **Optimize your existing investments**. On the road from traditional on-premises management to modern cloud-based management, take advantage of the flexible, hybrid architecture of Configuration Manager and Intune. As additional capabilities become available in the cloud-identity/MDM model, Microsoft is committed to providing a clear path from traditional to modern management.
+
+**Optimize your existing investments**. On the road from traditional on-premises management to modern cloud-based management, take advantage of the flexible, hybrid architecture of Configuration Manager and Intune. Starting with Configuration Manager 1710, co-management enables you to concurrently manage Windows 10 devices by using both Configuration Manager and Intune. See these topics for details:
+
+-   [Co-management for Windows 10 devices](https://docs.microsoft.com/en-us/sccm/core/clients/manage/co-management-overview)
+-   [Prepare Windows 10 devices for co-management](https://docs.microsoft.com/en-us/sccm/core/clients/manage/co-management-prepare)
+-   [Switch Configuration Manager workloads to Intune](https://docs.microsoft.com/en-us/sccm/core/clients/manage/co-management-switch-workloads)
+-   [Co-management dashboard in System Center Configuration Manager](https://docs.microsoft.com/en-us/sccm/core/clients/manage/co-management-dashboard)  
+
+ ## Related topics
+
+-   [What is Intune?](https://docs.microsoft.com/en-us/intune/introduction-intune)
+-   [Windows 10 Policy CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-configuration-service-provider)
+-   [Configuration service Providers](https://docs.microsoft.com/en-us/windows/client-management/mdm/configuration-service-provider-reference)
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@ -1359,6 +1359,10 @@ For details about Microsoft mobile device management protocols for Windows 10 s
 <td style="vertical-align:top"><p>Added a new CSP in Windows 10, version 1803.</p>
 </td></tr>
 <tr>
+<td style="vertical-align:top">[MDM Migration Analysis Too (MMAT)](http://aka.ms/mmat)</td>
+<td style="vertical-align:top"><p>Updated version available. MMAT is a tool you can use to determine which Group Policies are set on a target user/computer and cross-reference them against the list of supported MDM policies.</p>
+</td></tr>
+<tr>
 <td style="vertical-align:top">[CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download)</td>
 <td style="vertical-align:top"><p>Added the DDF download of Windows 10, version 1803 configuration service providers.</p>
 </td></tr>
@ -1664,6 +1668,10 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
 <td style="vertical-align:top"><p>Added a new CSP in Windows 10, version 1803.</p>
 </td></tr>
 <tr>
+<td style="vertical-align:top">[MDM Migration Analysis Too (MMAT)](http://aka.ms/mmat)</td>
+<td style="vertical-align:top"><p>Updated version available. MMAT is a tool you can use to determine which Group Policies are set on a target user/computer and cross-reference them against the list of supported MDM policies.</p>
+</td></tr>
+<tr>
 <td style="vertical-align:top">[CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download)</td>
 <td style="vertical-align:top"><p>Added the DDF download of Windows 10, version 1803 configuration service providers.</p>
 </td></tr>
@ -2276,7 +2284,7 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
 <li>Update/DisableDualScan</li>
 <li>Update/AllowAutoWindowsUpdateDownloadOverMeteredNetwork</li>
 </ul>
-<p>Changed the name of new policy to CredentialProviders/DisableAutomaticReDeploymentCredentials from CredentialProviders/EnableWindowsAutoPilotResetCredentials.</p>
+<p>Changed the name of new policy to CredentialProviders/DisableAutomaticReDeploymentCredentials from CredentialProviders/EnableWindowsAutopilotResetCredentials.</p>
 <p>Changed the names of the following policies:</p>
 <ul>
 <li>Defender/GuardedFoldersAllowedApplications to Defender/ControlledFolderAccessAllowedApplications</li>
--- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
+++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
@ -65,15 +65,35 @@ ms.date: 03/12/2018

 <!--/Scope-->
 <!--Description-->
-Added in Windows 10, version 1803. This policy allows the IT admin to control which policy will be used whenever both the MDM policy and its equivalent Group Policy are set on the device.
+Added in Windows 10, version 1803. This policy allows the IT admin to control which policy will be used whenever both the MDM policy and its equivalent Group Policy (GP) are set on the device.
+
+> [!Note]  
+> MDMWinsOverGP only applies to policies in Policy CSP. It does not apply to other MDM settings with equivalent GP settings that are defined on other configuration service providers.

 This policy is used to ensure that MDM policy wins over GP when same setting is set by both GP and MDM channel. This policy doesn’t support Delete command. This policy doesn’t support setting the value to be 0 again after it was previously set 1. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1.

+The following list shows the supported values:
+
+- 0 (default)
+- 1 - The MDM policy is used and the GP policy is blocked.
+
 The policy should be set at every sync to ensure the device removes any settings that conflict with MDM just as it does on the very first set of the policy. This ensures that:

- GP settings that correspond to MDM applied settings are not conflicting 
- The current Policy Manager policies are refreshed from what MDM has set 
- Any values set by scripts/user outside of GP that conflict with MDM are removed
+-  GP settings that correspond to MDM applied settings are not conflicting 
+-  The current Policy Manager policies are refreshed from what MDM has set 
+-  Any values set by scripts/user outside of GP that conflict with MDM are removed
+
+The [Policy DDF](policy-ddf-file.md) contains the following tags to identify the policies with equivalent GP:  
+
+-  \<MSFT:ADMXBacked\>   
+-  \<MSFT:ADMXMapped\>
+-  \<MSFT:GPRegistryMappedName\>    
+-  \<MSFT:GPDBMappedName\>  
+
+For the list MDM-GP mapping list, see [Policies supported by GP
+](policy-configuration-service-provider.md#policies-supported-by-gp).
+
+The MDM Diagnostic report shows the applied configurations states of a device including policies, certificates, configuration sources, and resource information. The report includes a list of blocked GP settings because MDM equivalent is configured, if any. To get the diagnostic report, go to **Settings** > **Accounts** > **Access work or school** > and then click the desired work or school account. Scroll to the bottom of the page to **Advanced Diagnostic Report** and then click **Create Report**.

 <!--/Description-->
 <!--SupportedValues-->
--- a/windows/client-management/windows-version-search.md
+++ b/windows/client-management/windows-version-search.md
@ -0,0 +1,48 @@
+---
+title: What version of Windows am I running?
+description: Discover which version of Windows you are running to determine whether or not your device is enrolled in the Long-Term Servicing Channel or Semi-Annual Channel.
+keywords: Long-Term Servicing Channel, LTSC, LTSB, Semi-Annual Channel, SAC, Windows, version, OS Build
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: MikeBlodge
+ms.author: MikeBlodge, Kaushik Ainapure
+ms.date: 04/30/2018
+---
+
+# What version of Windows am I running?
+
+To determine if your device is enrolled in the [Long-Term Servicing Channel](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#servicing-channels) (LTSC, formerly LTSB) or the [Semi-Annual Channel](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#servicing-channels) (SAC) you'll need to know what version of Windows 10 you're running. There are a few ways to figure this out. Each method provides a different set of details, so it’s useful to learn about all of them. 
+
+## System Properties
+Click **Start** > **Settings** > **Settings** > click **About** from the bottom of the left-hand menu
+
+You'll now see **Edition**, **Version**, and **OS Build** information. Something like this:
+
+![screenshot of the system properties window for a device running Windows 10](images/systemcollage.png)
+
+## Using Keyword Search
+You can simply type the following in the search bar and press **ENTER** to see version details for your device. 
+
+**“winver”**
+
+![screenshot of the About Windows display text](images/winver.png)
+
+**“msinfo”** or **"msinfo32"** to open **System Information**:
+
+![screenshot of the System Information display text](images/msinfo32.png)
+
+## Using Command Prompt or PowerShell
+At the Command Prompt or PowerShell interface, type **"systeminfo | findstr /B /C:"OS Name" /B /C:"OS Version"** and then press **ENTER**
+
+![screenshot of system information display text](images/refcmd.png)
+
+At the Command Prompt or PowerShell, type **"slmgr /dlv"**, and then press ENTER. The /dlv command displays the detailed licensing information. Notice the output displays "EnterpriseS" as seen in the image below:
+
+![screenshot of software licensing manager](images/slmgr_dlv.png)
+
+## What does it all mean?
+
+The Long-term Servicing Channel is available only in the Windows 10 Enterprise LTSB edition. This build of Windows doesn’t contain many in-box applications, such as Microsoft Edge, Microsoft Store, Cortana (you do have some limited search capabilities), Microsoft Mail, Calendar, OneNote, Weather, News, Sports, Money, Photos, Camera, Music, and Clock. It’s important to remember that the LTSC model is primarily for specialized devices.
+
+In the Semi-Annual Channel, you can set feature updates as soon as Microsoft releases them. This servicing modal is ideal for pilot deployments and to test Windows 10 feature updates and for users like developers who need to work with the latest features immediately. Once you've tested the latest release, you can choose when to roll it out broadly in your deployment.
--- a/windows/configuration/TOC.md
+++ b/windows/configuration/TOC.md
@ -5,7 +5,7 @@
 ## [Windows 10, version 1709 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md)
 ## [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1703.md)
 ## [Windows 10, version 1709 enhanced diagnostic data events and fields used by Windows Analytics](enhanced-diagnostic-data-windows-analytics-events-and-fields.md)
-## [Windows 10, version 1709 and later diagnostic data for the Full level](windows-diagnostic-data.md)
+## [Windows 10, version 1709 and newer diagnostic data for the Full level](windows-diagnostic-data.md)
 ## [Windows 10, version 1703 diagnostic data for the Full level](windows-diagnostic-data-1703.md)
 ## [Beginning your General Data Protection Regulation (GDPR) journey for Windows 10](gdpr-win10-whitepaper.md)
 ## [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md)
--- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
+++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
@ -87,6 +87,9 @@ Here's a list of changes that were made to this article for Windows 10, version

 The following sections list the components that make network connections to Microsoft services by default. You can configure these settings to control the data that is sent to Microsoft. To prevent Windows from sending any data to Microsoft, configure diagnostic data at the Security level, turn off Windows Defender diagnostic data and MSRT reporting, and turn off all of these connections.

+>[!NOTE]
+>For some settings, MDM policies only partly cover capabilities available through Group Policy. See each setting’s section for more details.
+
 ### Settings for Windows 10 Enterprise edition 

 The following table lists management options for each setting, beginning with Windows 10 Enterprise version 1703.
--- a/windows/configuration/wcd/wcd-policies.md
+++ b/windows/configuration/wcd/wcd-policies.md
@ -153,7 +153,7 @@ PreventTabPreloading | Prevent Microsoft Edge from starting and loading the Star

 | Setting | Description | Desktop editions | Mobile editions | Surface Hub | HoloLens | IoT Core |
 | --- | --- | :---: | :---: | :---: | :---: | :---: |
-[DisableAutomaticReDeploymentCredentials](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-credentialproviders) | This setting disables the visibility of the credential provider that triggers the PC refresh on a device. This policy does not actually trigger the refresh. The admin user is required to authenticate to trigger the refresh on the target device. The Windows 10 AutoPilot Reset feature allows admin to reset devices to a known good managed state while preserving the management enrollment. After the automatic redeployment is triggered the devices are for ready for use by information workers or students. | X |  |  |  |  |
+[DisableAutomaticReDeploymentCredentials](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-credentialproviders) | This setting disables the visibility of the credential provider that triggers the PC refresh on a device. This policy does not actually trigger the refresh. The admin user is required to authenticate to trigger the refresh on the target device. The Windows 10 Autopilot Reset feature allows admin to reset devices to a known good managed state while preserving the management enrollment. After the automatic redeployment is triggered the devices are for ready for use by information workers or students. | X |  |  |  |  |

 ## Cryptography

--- a/windows/configuration/windows-diagnostic-data.md
+++ b/windows/configuration/windows-diagnostic-data.md
@ -1,5 +1,5 @@
 ---
-title: Windows 10, version 1709 and later diagnostic data for the Full level (Windows 10)
+title: Windows 10, version 1709 and newer diagnostic data for the Full level (Windows 10)
 description: Use this article to learn about the types of diagnostic data that is collected at the Full level.
 keywords: privacy,Windows 10
 ms.prod: w10
@ -11,13 +11,13 @@ ms.author: brianlic
 ms.date: 03/13/2018
 ---

-# Windows 10, version 1709 and later diagnostic data for the Full level
+# Windows 10, version 1709 and newer diagnostic data for the Full level

 Applies to:
- Windows 10, version 1709
 - Windows 10, version 1803
+- Windows 10, version 1709

-Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1709 Basic level diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields).
+Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1803 Basic level diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields).

 In addition, this article provides references to equivalent definitions for the data types and examples from [ISO/IEC 19944:2017 Information technology -- Cloud computing -- Cloud services and devices: Data flow, data categories and data use](https://www.iso.org/standard/66674.html). Each data type also has a Data Use statement, for diagnostics and for Tailored experiences on the device, using the terms as defined by the standard. These Data Use statements define the purposes for which Microsoft processes each type of Windows diagnostic data, using a uniform set of definitions referenced at the end of this document and based on the ISO standard. Reference to the ISO standard provides additional clarity about the information collected, and allows easy comparison with other services or guidance that also references the standard.

--- a/windows/deployment/TOC.md
+++ b/windows/deployment/TOC.md
@ -19,7 +19,7 @@

 ## [Deploy Windows 10](deploy.md)

-### [Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md)
+### [Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md)

 ### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
 #### [Windows 10 downgrade paths](upgrade/windows-10-downgrade-paths.md)
--- a/windows/deployment/Windows-AutoPilot-EULA-note.md
+++ b/windows/deployment/Windows-AutoPilot-EULA-note.md
@ -1,6 +1,6 @@
 ---
 title: Windows Autopilot EULA dismissal – important information
-description: A notice about EULA dismissal through Windows AutoPilot
+description: A notice about EULA dismissal through Windows Autopilot
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
--- a/windows/deployment/change-history-for-deploy-windows-10.md
+++ b/windows/deployment/change-history-for-deploy-windows-10.md
@ -38,7 +38,7 @@ New or changed topic | Description
 ## June 2017
 | New or changed topic | Description |
 |----------------------|-------------|
-| [Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md) | New |
+| [Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md) | New |

 ## April 2017
 | New or changed topic | Description |
--- a/windows/deployment/deploy-m365.md
+++ b/windows/deployment/deploy-m365.md
@ -23,7 +23,7 @@ This topic provides a brief overview of Microsoft 365 and describes how to use a

 For Windows 10 deployment, Microsoft 365 includes a fantasic deployment advisor that can walk you through the entire process of deploying Windows 10. The wizard supports multiple Windows 10 deployment methods, including:

- Windows AutoPilot
+- Windows Autopilot
 - In-place upgrade
 - Deploying Windows 10 upgrade with Intune
 - Deploying Windows 10 upgrade with System Center Configuration Manager
--- a/windows/deployment/deploy-whats-new.md
+++ b/windows/deployment/deploy-whats-new.md
@ -36,11 +36,11 @@ For more information, see [Windows 10 Enterprise E3 in CSP](windows-10-enterpris

 ## Deployment solutions and tools

-### Windows AutoPilot
+### Windows Autopilot

-Windows AutoPilot streamlines and automates the process of setting up and configuring new devices, with minimal interaction required from the end user. You can also use Windows AutoPilot to reset, repurpose and recover devices.
+Windows Autopilot streamlines and automates the process of setting up and configuring new devices, with minimal interaction required from the end user. You can also use Windows Autopilot to reset, repurpose and recover devices.

-Windows AutoPilot joins devices to Azure Active Directory (Azure AD), optionally enrolls into MDM services, configures security policies, and sets a custom out-of-box-experience (OOBE) for the end user. For more information, see [Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md).
+Windows Autopilot joins devices to Azure Active Directory (Azure AD), optionally enrolls into MDM services, configures security policies, and sets a custom out-of-box-experience (OOBE) for the end user. For more information, see [Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md).

 ### Upgrade Readiness

--- a/windows/deployment/deploy.md
+++ b/windows/deployment/deploy.md
@ -17,7 +17,7 @@ Windows 10 upgrade options are discussed and information is provided about plann

 |Topic |Description |
 |------|------------|
-|[Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md) |This topic provides an overview of Windows AutoPilot deployment, a new zero-touch method for deploying Windows 10 in the enterprise. |
+|[Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md) |This topic provides an overview of Windows Autopilot deployment, a new zero-touch method for deploying Windows 10 in the enterprise. |
 |[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) |This topic provides information about support for upgrading directly to Windows 10 from a previous operating system. |
 |[Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) |This topic provides information about support for upgrading from one edition of Windows 10 to another. |
 |[Windows 10 volume license media](windows-10-media.md) |This topic provides information about updates to volume licensing media in the current version of Windows 10. |
--- a/windows/deployment/index.yml
+++ b/windows/deployment/index.yml
@ -59,7 +59,7 @@ sections:
      Windows 10 upgrade options are discussed and information is provided about planning, testing, and managing your production deployment.
      <br>&nbsp;<br>
      <table border='0'><tr><td>Topic</td><td>Description</td></tr>
-      <tr><td>[Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md) </td><td>Windows AutoPilot deployment is a new cloud service from Microsoft that provides a zero touch experience for deploying Windows 10 devices. </td>
+      <tr><td>[Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md) </td><td>Windows Autopilot deployment is a new cloud service from Microsoft that provides a zero touch experience for deploying Windows 10 devices. </td>
      <tr><td>[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) </td><td>This topic provides information about support for upgrading directly to Windows 10 from a previous operating system. </td>
      <tr><td>[Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) </td><td>This topic provides information about support for upgrading from one edition of Windows 10 to another. </td>
      <tr><td>[Windows 10 volume license media](windows-10-media.md) </td><td>This topic provides information about media available in the Microsoft Volume Licensing Service Center. </td>
--- a/windows/deployment/update/waas-delivery-optimization.md
+++ b/windows/deployment/update/waas-delivery-optimization.md
@ -7,7 +7,7 @@ ms.sitesec: library
 author: JaimeO
 ms.localizationpriority: high
 ms.author: jaimeo
-ms.date: 04/26/2018
+ms.date: 04/30/2018
 ---

 # Configure Delivery Optimization for Windows 10 updates
@ -33,8 +33,8 @@ The following table lists the minimum Windows 10 version that supports Delivery
 |------------------|---------------|
 | Computers running Windows 10 | 1511 |
 | Computers running Server Core installations of Windows Server | 1709 |
-| IoT devices | 1804 |
-| HoloLens devices | 1804 |
+| IoT devices | 1803 |
+| HoloLens devices | 1803 |


 By default in Windows 10 Enterprise and Education editions, Delivery Optimization allows peer-to-peer sharing on the organization's own network only, but you can configure it differently in Group Policy and mobile device management (MDM) solutions such as Microsoft Intune.
--- a/windows/deployment/windows-10-architecture-posters.md
+++ b/windows/deployment/windows-10-architecture-posters.md
@ -17,7 +17,7 @@ You can download the following posters for architectural information about deplo
  Learn about the options and steps for a new installation of Windows 10.
 - [Deploy Windows 10 - In-place upgrade](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/Deploy-InplaceUpgrade.pdf)
  Learn about the steps to upgrade from a previous version of Windows.
- [Deploy Windows 10 - Windows AutoPilot](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/Deploy-WindowsAutoPilot.pdf)
+- [Deploy Windows 10 - Windows Autopilot](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/Deploy-WindowsAutopilot.pdf)
  Learn how you can set up and pre-configure Windows 10 devices.
 - [Deploy Windows 10 - Windows servicing](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/WindowsServicing.pdf)
  Learn how to keep Windows up to date.
--- a/windows/deployment/windows-10-deployment-scenarios.md
+++ b/windows/deployment/windows-10-deployment-scenarios.md
@ -31,12 +31,12 @@ The following table summarizes various Windows 10 deployment scenarios. The scen
  <tr><td align='center' valign='middle' style='width:16%; border:1;' rowspan="2">Modern</td>
    <td align="center">

-[Windows AutoPilot](#windows-autopilot)</td>
+[Windows Autopilot](#windows-autopilot)</td>
    <td align="center" style="width:16%; border:1;"> 
      Customize the out-of-box-experience (OOBE) for your organization, and deploy a new system with apps and settings already configured.
    </td>
    <td align="center" style="width:16%; border:1;"> 
-<a href="https://docs.microsoft.com/en-us/windows/deployment/windows-autopilot/windows-10-autopilot">Overview of Windows AutoPilot</a>
+<a href="https://docs.microsoft.com/en-us/windows/deployment/windows-autopilot/windows-10-autopilot">Overview of Windows Autopilot</a>
    </td>
  </tr>
  <tr>
@ -136,18 +136,18 @@ The following table summarizes various Windows 10 deployment scenarios. The scen


 >[!IMPORTANT]
->The Windows AutoPilot and Subscription Activation scenarios require that the beginning OS be Windows 10 version 1703, or later.<br>
->Except for clean install scenarios such as traditional bare metal and Windows AutoPilot, all the methods described can optionally migrate apps and settings to the new OS. 
+>The Windows Autopilot and Subscription Activation scenarios require that the beginning OS be Windows 10 version 1703, or later.<br>
+>Except for clean install scenarios such as traditional bare metal and Windows Autopilot, all the methods described can optionally migrate apps and settings to the new OS. 

 ## Modern deployment methods

 Modern deployment methods embrace both traditional on-prem and cloud services to deliver a simple, streamlined, cost effective deployment experience.

-### Windows AutoPilot
+### Windows Autopilot

-Windows AutoPilot is a new suite of capabilities designed to simplify and modernize the deployment and management of new Windows 10 PCs. Windows AutoPilot enables IT professionals to customize the Out of Box Experience (OOBE) for Windows 10 PCs and provide end users with a fully configured new Windows 10 device after just a few clicks. There are no images to deploy, no drivers to inject, and no infrastructure to manage. Users can go through the deployment process independently, without the need consult their IT administrator.
+Windows Autopilot is a new suite of capabilities designed to simplify and modernize the deployment and management of new Windows 10 PCs. Windows Autopilot enables IT professionals to customize the Out of Box Experience (OOBE) for Windows 10 PCs and provide end users with a fully configured new Windows 10 device after just a few clicks. There are no images to deploy, no drivers to inject, and no infrastructure to manage. Users can go through the deployment process independently, without the need consult their IT administrator.

-For more information about Windows AutoPilot, see [Overview of Windows AutoPilot](https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot) and [Modernizing Windows deployment with Windows AutoPilot](https://blogs.technet.microsoft.com/windowsitpro/2017/06/29/modernizing-windows-deployment-with-windows-autopilot/).
+For more information about Windows Autopilot, see [Overview of Windows Autopilot](https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot) and [Modernizing Windows deployment with Windows Autopilot](https://blogs.technet.microsoft.com/windowsitpro/2017/06/29/modernizing-windows-deployment-with-windows-autopilot/).

 ### In-place upgrade

--- a/windows/deployment/windows-10-pro-in-s-mode.md
+++ b/windows/deployment/windows-10-pro-in-s-mode.md
@ -0,0 +1,75 @@
+---
+title: Windows 10 Pro in S mode
+description: Overview of Windows 10 Pro in S mode, switching options, and system requirements
+keywords: Windows 10 S, S-mode, system requirements, Overview, Windows 10 Pro in S mode
+ms.mktglfcycl: deploy
+ms.localizationpriority: high
+ms.prod: w10
+ms.sitesec: library
+ms.pagetype: deploy
+ms.date: 04/30/2018
+author: Mikeblodge
+---
+
+# Windows 10 Pro/Enterprise in S mode
+
+S mode is an enhanced security mode of Windows 10. Windows 10 Pro and Enterprise in S mode powers affordable, cloud-ready devices that are simple, secure, and efficient. Users can get started quickly, thanks to self-service deployment and a familiar Windows experience. Low-price S mode devices offer tailored solutions for kiosks, digital signs, and task work. If your device is running Windows 10, version 1709, or Windows 10, version 1803, you can switch from Windows 10 in S mode to Windows 10 Pro.
+
+## Benefits of Windows 10 Pro in S mode:
+
+- **Microsoft-verified security** - It reduces risk of malware and exploitations because only Microsoft-verified apps can be installed including Windows Defender Antivirus.
+- **Performance that lasts** - Provides all-day battery life to keep workers on task and not tripping over cords. Also, verified apps won’t degrade device performance over time.
+- **Streamlined for speed** - Offers faster log-in times with Windows Hello. Plus, workers get all the exclusive Windows innovations including Cortana and Windows Ink. 
+
+|  |Home  |S mode  |Pro/Pro Education  |Enterprise/Education |
+|---------|:---:|:---:|:---:|:---:|
+|Start Menu/Hello/Cortana/<BR>Windows Ink/Microsoft Edge | X | X | X | X |
+|Store apps (including Windows <BR>desktop bridge apps) | X | X | X | X |
+|Windows Update | X | X | X | X |
+|Device Encryption | X | X | X | X |
+|BitLocker | | X | X | X |
+|Windows Update for Business |  | X | X | X |
+|Microsoft Store for Education | | X | X | X |
+|Mobile Device Management<BR> and Azure AD join | | X | X | X |
+|Group Policy management and <BR>Active Directory Domain Services | | | X | X |
+|Desktop (Windows 32) Apps | X | | X | X |
+|Change App Defaults<BR>Search/Browser/Photos/etc. | X | | X | X |
+|Credential Guard | | | | X |
+|Device Guard | | | | X |
+
+## Keep Line of Business apps functioning with Desktop Bridge
+Worried about your LOB apps not working in S mode? Using Desktop Bridge will enable you to convert your Line of Business apps to a packaged app with UWP manifest. After testing and validating you can distribute the app through the Windows Store or existing channels. 
+
+[Explore Desktop Bridge](https://docs.microsoft.com/en-us/windows/uwp/porting/desktop-to-uwp-root)
+
+>[!NOTE] 
+>The only way to revert to Windows 10 in S mode is to perform a BMR factory reset. This will allow you to reimage a device.
+
+### Windows 10 in S mode is safe, secure, and fast.
+We recommend staying in S mode. However, in some limited scenarios, you might need to switch to Windows 10 Pro. You can switch devices running Windows 10, version 1709 or later. Use the following information to switch to Windows 10 Pro through the Microsoft Store or by using Autopilot.
+
+## How to switch
+If you’re running Windows 10, version 1709 or version 1803, you can switch to Windows 10 Pro through the Microsoft Store for Business. Devices running version 1803 will only be able to switch through the Store one device at a time.
+
+1. Sign into the Microsoft Store using your Microsoft account. 
+2. Search for "Switch to Windows 10 Pro."
+3. In the offer, click **Buy** or **Get**. 
+You'll be prompted to save your files before the switch starts. Follow the prompts to switch to Windows 10 Pro. Your device will restart during this process. 
+
+You can use Autopilot to switch devices running Windows 10, version 1709. The only requirement is that the devices be enrolled in Intune.
+
+1.	In the Intune admin portal, select the quantity of devices you want to switch.
+2.	Click the Assign Device link.
+3.	In the Assign Switch field, select the device name you would like to switch
+4.	Click the continue button. 
+
+You will now see the devices you switched listed under Switched Devices.
+
+> [!IMPORTANT]
+> While it’s free to switch to Windows 10 Pro, it’s not reversible. The only way to rollback this kind of switch is through a BMR factory reset.
+
+## Related topics
+
+[Compare Windows 10 editions](https://www.microsoft.com/WindowsForBusiness/Compare)<BR>
+[Windows 10 Pro Education](https://docs.microsoft.com/education/windows/test-windows10s-for-edu)<BR>
+[Introdiction to Microsoft Intune in the Azure portal](https://docs.microsoft.com/en-us/intune/what-is-intune)
--- a/windows/deployment/windows-autopilot/TOC.md
+++ b/windows/deployment/windows-autopilot/TOC.md
@ -1,8 +1,8 @@
-# [Overview of Windows AutoPilot](windows-10-autopilot.md)
+# [Overview of Windows Autopilot](windows-10-autopilot.md)

-## [The Windows AutoPilot Deployment Program in Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles)
-## [The Windows AutoPilot Deployment Program in Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot)
-## [The Windows AutoPilot Deployment Program in Microsoft 365 Business & Office 365 Admin portal](https://support.office.com/article/Create-and-edit-AutoPilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa)
-## [The Windows AutoPilot Deployment Program in Partner Center](https://msdn.microsoft.com/partner-center/autopilot)
-## [Demo the Windows AutoPilot Deployment Program on a Virtual Machine](windows-10-autopilot-demo-vm.md)
+## [The Windows Autopilot Deployment Program in Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles)
+## [The Windows Autopilot Deployment Program in Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot)
+## [The Windows Autopilot Deployment Program in Microsoft 365 Business & Office 365 Admin portal](https://support.office.com/article/Create-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa)
+## [The Windows Autopilot Deployment Program in Partner Center](https://msdn.microsoft.com/partner-center/autopilot)
+## [Demo the Windows Autopilot Deployment Program on a Virtual Machine](windows-10-autopilot-demo-vm.md)

--- a/windows/deployment/windows-autopilot/windows-10-autopilot-demo-vm.md
+++ b/windows/deployment/windows-autopilot/windows-10-autopilot-demo-vm.md
@ -1,6 +1,6 @@
 ---
-title: Demo the Windows AutoPilot Deployment Program on a Virtual Machine
-description: Step-by-step instructions on how to set-up a Virtual Machine with a Windows AutoPilot deployment
+title: Demo the Windows Autopilot Deployment Program on a Virtual Machine
+description: Step-by-step instructions on how to set-up a Virtual Machine with a Windows Autopilot deployment
 keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
 ms.prod: w10
 ms.mktglfcycl: deploy
@ -12,13 +12,13 @@ ms.author: daniha
 ms.date: 12/21/2017
 ---

-# Demo the Windows AutoPilot Deployment Program on a Virtual Machine
+# Demo the Windows Autopilot Deployment Program on a Virtual Machine

 **Applies to**

 -   Windows 10

-In this topic you'll learn how to set-up a Windows AutoPilot deployment for a Virtual Machine using Hyper-V.
+In this topic you'll learn how to set-up a Windows Autopilot deployment for a Virtual Machine using Hyper-V.

 ## Prerequisites

@ -27,7 +27,7 @@ These are the thing you'll need on your device to get started:
 * Internet access (see [Network connectivity requirements](windows-10-autopilot.md#network-connectivity-requirements))
 * Hypervisor needs to be unoccupied, or used by Hyper-V, as we will be using Hyper-V to create the Virtual Machine

-See additional prerequisites in the [Windows AutoPilot overview topic](windows-10-autopilot.md#prerequisites).
+See additional prerequisites in the [Windows Autopilot overview topic](windows-10-autopilot.md#prerequisites).

 ## Create your Virtual Machine

@ -49,10 +49,10 @@ Now that Hyper-V is enabled, proceed to create your Virtual Machine.

 Open a PowerShell prompt **as an administrator** and run the following:
 ```powershell
-New-VMSwitch -Name AutoPilotExternal -NetAdapterName <Name of Network Adapter with internet access> -AllowManagementOS $true
-New-VM -Name WindowsAutoPilot -MemoryStartupBytes 2GB -BootDevice VHD -NewVHDPath .\VMs\WindowsAutoPilot.vhdx -Path .\VMData -NewVHDSizeBytes 80GB -Generation 2 -Switch AutoPilotExternal
-Add-VMDvdDrive -Path <Path to Windows 10 ISO> -VMName WindowsAutoPilot
-Start-VM -VMName WindowsAutoPilot
+New-VMSwitch -Name AutopilotExternal -NetAdapterName <Name of Network Adapter with internet access> -AllowManagementOS $true
+New-VM -Name WindowsAutopilot -MemoryStartupBytes 2GB -BootDevice VHD -NewVHDPath .\VMs\WindowsAutopilot.vhdx -Path .\VMData -NewVHDSizeBytes 80GB -Generation 2 -Switch AutopilotExternal
+Add-VMDvdDrive -Path <Path to Windows 10 ISO> -VMName WindowsAutopilot
+Start-VM -VMName WindowsAutopilot
 ```

 >[!IMPORTANT]
@ -61,14 +61,14 @@ Start-VM -VMName WindowsAutoPilot

 ### Install Windows 10

-Now that the Virtual Machine was created and started, open **Hyper-V Manager** and connect to the **WindowsAutoPilot** Virtual Machine.
+Now that the Virtual Machine was created and started, open **Hyper-V Manager** and connect to the **WindowsAutopilot** Virtual Machine.
 Make sure the Virtual Machine booted from the installation media you've provided and complete the Windows installation process.

 Once the installation is complete, create a checkpoint. You will create multiple checkpoints throughout this process, which you can later use to go through the process again.

 To create the checkpoint, open a PowerShell prompt **as an administrator** and run the following:
 ```powershell
-Checkpoint-VM -Name WindowsAutoPilot -SnapshotName "Finished Windows install"
+Checkpoint-VM -Name WindowsAutopilot -SnapshotName "Finished Windows install"
 ```

 ## Capture your Virtual Machine's hardware ID
@ -78,8 +78,8 @@ On the newly created Virtual Machine, open a PowerShell prompt **as an administr
 md c:\HWID
 Set-Location c:\HWID
 Set-ExecutionPolicy Unrestricted
-Install-Script -Name Get-WindowsAutoPilotInfo
-Get-WindowsAutoPilotInfo.ps1 -OutputFile AutoPilotHWID.csv
+Install-Script -Name Get-WindowsAutopilotInfo
+Get-WindowsAutopilotInfo.ps1 -OutputFile AutopilotHWID.csv
 ```

 >[!NOTE]
@ -87,34 +87,34 @@ Get-WindowsAutoPilotInfo.ps1 -OutputFile AutoPilotHWID.csv

 ### Mount the Virtual Hard Drive (VHD)

-To gain access to the AutoPilotHWID.csv that contains the hardware ID, stop the Virtual Machine to unlock the Virtual Hard Drive. 
+To gain access to the AutopilotHWID.csv that contains the hardware ID, stop the Virtual Machine to unlock the Virtual Hard Drive. 

 To do that, on your device (**not** on the Virtual Machine), open a PowerShell prompt **as an administrator** and run the following:
 ```powershell
-Stop-VM -VMName WindowsAutoPilot
+Stop-VM -VMName WindowsAutopilot
 ```

 Once the Virtual Machine has stopped, create a checkpoint:
 ```powershell
-Checkpoint-VM -Name WindowsAutoPilot -SnapshotName "HWID captured"
+Checkpoint-VM -Name WindowsAutopilot -SnapshotName "HWID captured"
 ```

 With the checkpoint created, continue to mount the VHD:
 ```powershell
-Mount-VHD -path (Get-VMHardDiskDrive -VMName WindowsAutoPilot).Path
+Mount-VHD -path (Get-VMHardDiskDrive -VMName WindowsAutopilot).Path
 ```

-Once mounted, navigate to the new drive and copy **AutoPilotHWID.csv** to a location on your device.
+Once mounted, navigate to the new drive and copy **AutopilotHWID.csv** to a location on your device.

 Before you proceed, unmount the VHD to unlock it and start the Virtual Machine:
 ```powershell
-Dismount-VHD -path (Get-VMHardDiskDrive -VMName WindowsAutoPilot).Path
-Start-VM -VMName WindowsAutoPilot
+Dismount-VHD -path (Get-VMHardDiskDrive -VMName WindowsAutopilot).Path
+Start-VM -VMName WindowsAutopilot
 ```

 ## Reset Virtual Machine back to Out-Of-Box-Experience (OOBE)

-With the hardware ID captured, prepare your Virtual Machine for Windows AutoPilot deployment by resetting it back to OOBE.
+With the hardware ID captured, prepare your Virtual Machine for Windows Autopilot deployment by resetting it back to OOBE.

 On the Virtual Machine, go to **Settings > Update & Security > Recovery** and click on **Get started** under **Reset this PC**.
 Select **Remove everything** and **Just remove my files**. Finally, click on **Reset**.
@ -158,11 +158,11 @@ For the purposes of this demo, select **All** under the **MDM user scope** and c

 ## Register your Virtual Machine to your organization

-Navigate to [Microsoft Store for Business device management](https://businessstore.microsoft.com/en-us/manage/devices). Click on **Add devices** and select the **AutoPilotHWID.csv** you've saved earlier. A message will appear indicating your request is being processed. Wait a few moments before refreshing to see your Virtual Machine added.
+Navigate to [Microsoft Store for Business device management](https://businessstore.microsoft.com/en-us/manage/devices). Click on **Add devices** and select the **AutopilotHWID.csv** you've saved earlier. A message will appear indicating your request is being processed. Wait a few moments before refreshing to see your Virtual Machine added.

 ![Add devices through Microsoft Store for Business](images/autopilot-devices-add.jpg)

-## Create and assign a Windows AutoPilot deployment profile
+## Create and assign a Windows Autopilot deployment profile

 Navigate to [Windows enrollment in Microsoft Intune](https://portal.azure.com/#blade/Microsoft_Intune_Enrollment/OverviewBlade/windowsEnrollment).

@ -170,13 +170,13 @@ Make sure to sync the device you've just registered, by clicking on **Devices**

 ![Microsoft Intune sync Windows devices](images/autopilot-intune-sync.jpg)

-### Create a Windows AutoPilot deployment profile
+### Create a Windows Autopilot deployment profile

 Click on **Deployment profiles** under **Windows Autopilot Deployment Program (Preview)** and select **Create profile**.

 ![Microsoft Intune create deployment profile](images/autopilot-intune-profile-add.jpg)

-In the **Create profile** blade, set the name to **AutoPilot Intune Demo**, click on **Out-of-box experience (OOBE)** and configure the following:
+In the **Create profile** blade, set the name to **Autopilot Intune Demo**, click on **Out-of-box experience (OOBE)** and configure the following:
 | Setting name | Value |
 |---|---|
 |Privacy Settings|Hide|
@ -187,15 +187,15 @@ Click on **Save** and **Create**.

 ![Create a new deployment profile in Microsoft Intune](images/autopilot-intune-profile-configure.jpg)

-### Assign a Windows AutoPilot deployment profile
+### Assign a Windows Autopilot deployment profile

-With the deployment profile created, go back to **Devices** under **Windows Autopilot Deployment Program (Preview)** and select your Virtual Machine. Click on **Assign profile** and in the **Assign Profile** blade select **AutoPilot Intune Demo** under the **AutoPilot profile**. Click on **Assign**.
+With the deployment profile created, go back to **Devices** under **Windows Autopilot Deployment Program (Preview)** and select your Virtual Machine. Click on **Assign profile** and in the **Assign Profile** blade select **Autopilot Intune Demo** under the **Autopilot profile**. Click on **Assign**.

-![Assign AutoPilot Profile in Microsoft Intune](images/autopilot-intune-profile-assign.jpg)
+![Assign Autopilot Profile in Microsoft Intune](images/autopilot-intune-profile-assign.jpg)

 Wait a few minutes for all changes to apply.

-## See Windows AutoPilot in action
+## See Windows Autopilot in action

 By now, your Virtual Machine should be back to OOBE. Make sure to wait at least 30 minutes from the time you've [configured company branding](#configure-company-branding)
 , otherwise those changes might not show up.
@ -204,6 +204,6 @@ Once you select a language and a keyboard layout, your company branded sign-in s

 ![OOBE sign-in page](images/autopilot-oobe.jpg)

-Windows AutoPilot will now take over to automatically join your Virtual Machine into Azure Active Directory and enroll it to Microsoft Intune. Use the checkpoints you've created to go through this process again with different settings.
+Windows Autopilot will now take over to automatically join your Virtual Machine into Azure Active Directory and enroll it to Microsoft Intune. Use the checkpoints you've created to go through this process again with different settings.

 Missing something in this topic? Windows 10 users, tell us what you want on [Feedback Hub](feedback-hub://?referrer=techDocsUcPage&tabid=2&contextid=897&newFeedback=true&topic=windows-10-autopilot-demo-vm.md). 
--- a/windows/deployment/windows-autopilot/windows-10-autopilot.md
+++ b/windows/deployment/windows-autopilot/windows-10-autopilot.md
@ -1,6 +1,6 @@
 ---
-title: Overview of Windows AutoPilot
-description: This topic goes over Windows AutoPilot and how it helps setup OOBE Windows 10 devices.
+title: Overview of Windows Autopilot
+description: This topic goes over Windows Autopilot and how it helps setup OOBE Windows 10 devices.
 keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
 ms.prod: w10
 ms.mktglfcycl: deploy
@ -12,32 +12,32 @@ ms.author: daniha
 ms.date: 12/13/2017
 ---

-# Overview of Windows AutoPilot
+# Overview of Windows Autopilot

 **Applies to**

 -   Windows 10

-Windows AutoPilot is a collection of technologies used to set up and pre-configure new devices, getting them ready for productive use. In addition, you can use Windows AutoPilot to reset, repurpose and recover devices.</br>
+Windows Autopilot is a collection of technologies used to set up and pre-configure new devices, getting them ready for productive use. In addition, you can use Windows Autopilot to reset, repurpose and recover devices.</br>
 This solution enables an IT department to achieve the above with little to no infrastructure to manage, with a process that's easy and simple.

-## Benefits of Windows AutoPilot
+## Benefits of Windows Autopilot

-Traditionally, IT pros spend a lot of time on building and customizing images that will later be deployed to devices with a perfectly good OS already installed on them. Windows AutoPilot introduces a new approach.
+Traditionally, IT pros spend a lot of time on building and customizing images that will later be deployed to devices with a perfectly good OS already installed on them. Windows Autopilot introduces a new approach.

 From the users' perspective, it only takes a few simple operations to make their device ready to use. 

 From the IT pros' perspective, the only interaction required from the end user, is to connect to a network and to verify their credentials. Everything past that is automated.

-## Windows AutoPilot Scenarios
+## Windows Autopilot Scenarios

 ### Cloud-Driven

-The Cloud-Driven scenario enables you to pre-register devices through the Windows AutoPilot Deployment Program. Your devices will be fully configured with no additional intervention required on the users' side. 
+The Cloud-Driven scenario enables you to pre-register devices through the Windows Autopilot Deployment Program. Your devices will be fully configured with no additional intervention required on the users' side. 

-#### The Windows AutoPilot Deployment Program experience
+#### The Windows Autopilot Deployment Program experience

-The Windows AutoPilot Deployment Program enables you to:
+The Windows Autopilot Deployment Program enables you to:
 * Automatically join devices to Azure Active Directory (Azure AD)
 * Auto-enroll devices into MDM services, such as Microsoft Intune ([*Requires an Azure AD Premium subscription*](#prerequisites))
 * Restrict the Administrator account creation
@ -48,7 +48,7 @@ The Windows AutoPilot Deployment Program enables you to:

 * [Devices must be registered to the organization](#device-registration-and-oobe-customization)
 * [Company branding needs to be configured](#configure-company-branding-for-oobe)
-* [Network connectivity to cloud services used by Windows AutoPilot](#network-connectivity-requirements)
+* [Network connectivity to cloud services used by Windows Autopilot](#network-connectivity-requirements)
 * Devices have to be pre-installed with Windows 10 Professional, Enterprise or Education, of version 1703 or later
 * Devices must have access to the internet
 * [Azure AD Premium P1 or P2](https://www.microsoft.com/cloud-platform/azure-active-directory-features)
@ -71,7 +71,7 @@ MDM enrollment ensures policies are applied, apps are installed and setting are

 In order to register devices, you will need to acquire their hardware ID and register it. We are actively working with various hardware vendors to enable them to provide the required information to you, or upload it on your behalf. 

-If you would like to capture that information by yourself, you can use the [Get-WindowsAutoPilotInfo PowerShell script](https://www.powershellgallery.com/packages/Get-WindowsAutoPilotInfo), which will generate a .csv file with the device's hardware ID.
+If you would like to capture that information by yourself, you can use the [Get-WindowsAutopilotInfo PowerShell script](https://www.powershellgallery.com/packages/Get-WindowsAutopilotInfo), which will generate a .csv file with the device's hardware ID.

 Once devices are registered, these are the OOBE customization options available for Windows 10, starting with version 1703:
 * Skipping Work or Home usage selection (*Automatic*)
@ -83,7 +83,7 @@ Once devices are registered, these are the OOBE customization options available
 For guidance on how to register devices, configure and apply deployment profiles, follow one of the available administration options:
 * [Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles)
 * [Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot)
-* [Microsoft 365 Business & Office 365 Admin](https://support.office.com/article/Create-and-edit-AutoPilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa)
+* [Microsoft 365 Business & Office 365 Admin](https://support.office.com/article/Create-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa)
 * [Partner Center](https://msdn.microsoft.com/partner-center/autopilot)

 ##### Configure company branding for OOBE
@ -101,7 +101,7 @@ In order for your devices to be auto-enrolled into MDM management, MDM auto-enro

 #### Network connectivity requirements

-The Windows AutoPilot Deployment Program uses a number of cloud services to get your devices to a productive state. This means those services need to be accessible from devices registered as Windows Autopilot devices.
+The Windows Autopilot Deployment Program uses a number of cloud services to get your devices to a productive state. This means those services need to be accessible from devices registered as Windows Autopilot devices.

 To manage devices behind firewalls and proxy servers, the following URLs need to be accessible:

--- a/windows/whats-new/whats-new-windows-10-version-1709.md
+++ b/windows/whats-new/whats-new-windows-10-version-1709.md
@ -26,19 +26,19 @@ A brief description of new or updated features in this version of Windows 10 is

 ## Deployment

-### Windows AutoPilot
+### Windows Autopilot

-Windows AutoPilot is a zero touch experience for deploying Windows 10 devices. Configuration profiles can now be applied at the hardware vendor with devices being shipped directly to employees. For more information, see [Overview of Windows AutoPilot](https://docs.microsoft.com/windows/deployment/windows-10-auto-pilot).
+Windows Autopilot is a zero touch experience for deploying Windows 10 devices. Configuration profiles can now be applied at the hardware vendor with devices being shipped directly to employees. For more information, see [Overview of Windows Autopilot](https://docs.microsoft.com/windows/deployment/windows-10-auto-pilot).

-You can also apply an AutoPilot deployment profile to your devices using Microsoft Store for Business. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the AutoPilot deployment profile you applied to the device. For more information, see [Manage Windows device deployment with Windows AutoPilot Deployment](https://docs.microsoft.com/en-us/microsoft-store/add-profile-to-devices).
+You can also apply an Autopilot deployment profile to your devices using Microsoft Store for Business. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the Autopilot deployment profile you applied to the device. For more information, see [Manage Windows device deployment with Windows Autopilot Deployment](https://docs.microsoft.com/en-us/microsoft-store/add-profile-to-devices).

 ### Windows 10 Subscription Activation

 Windows 10 Subscription Activation lets you deploy Windows 10 Enterprise in your organization with no keys and no reboots using a list of subscribed users. When a subscribed user signs in on their Windows 10 Pro device, features that are Enterprise-only are automatically enabled. For more information, see [Windows 10 Subscription Activation](https://docs.microsoft.com/windows/deployment/windows-10-enterprise-subscription-activation).

-### Windows Automatic Redeployment	
+### Autopilot Reset	

-IT Pros can use Windows Automatic Redeployment to quickly remove personal files, apps, and settings. A custom login screen is available from the lock screen that enables you to apply original settings and management enrollment (Azure Active Directory and device management) so that devices are returned to a fully configured, known, IT-approved state and ready to use. For more information, see [Reset devices with Windows Automatic Redeployment](https://docs.microsoft.com/education/windows/windows-automatic-redeployment).
+IT Pros can use Autopilot Reset to quickly remove personal files, apps, and settings. A custom login screen is available from the lock screen that enables you to apply original settings and management enrollment (Azure Active Directory and device management) so that devices are returned to a fully configured, known, IT-approved state and ready to use. For more information, see [Reset devices with Autopilot Reset](https://docs.microsoft.com/education/windows/autopilot-reset).


 ## Update
@ -115,7 +115,7 @@ The minimum PIN length is being changed from 6 to 4, with a default of 6. For mo
 Microsoft has released new [Windows security baselines](https://docs.microsoft.com/en-us/windows/device-security/windows-security-baselines) for Windows Server and Windows 10. A security baseline is a group of Microsoft-recommended configuration settings with an explanation of their security impact. For more information, and to download the Policy Analyzer tool, see [Microsoft Security Compliance Toolkit 1.0](https://docs.microsoft.com/en-us/windows/device-security/security-compliance-toolkit-10).

 ### SMBLoris vulnerability
-An issue, known as “SMBLoris”, which could result in denial of service, has been addressed.
+An issue, known as â€œSMBLorisâ€?, which could result in denial of service, has been addressed.


 ## Windows Analytics