From fe38865cc4ebfddc8f9aa21f368e1a0aa4cc537f Mon Sep 17 00:00:00 2001
From: Trudy Hakala <trudyha@microsoft.com>
Date: Wed, 10 Jan 2018 16:27:52 +0000
Subject: [PATCH] Merged PR 5227: Merge msfb-14856406 to master

MSfB What's New
---
 ...tory-microsoft-store-business-education.md |   6 +-
 ...-new-microsoft-store-business-education.md |  14 +-
 windows/deployment/windows-autopilot/TOC.md   |  16 +-
 .../windows-10-autopilot-demo-vm.md           | 416 +++++++++---------
 .../windows-autopilot/windows-10-autopilot.md | 266 +++++------
 5 files changed, 362 insertions(+), 356 deletions(-)

diff --git a/store-for-business/release-history-microsoft-store-business-education.md b/store-for-business/release-history-microsoft-store-business-education.md
index 6f1400e394..4d706c69f6 100644
--- a/store-for-business/release-history-microsoft-store-business-education.md
+++ b/store-for-business/release-history-microsoft-store-business-education.md
@@ -6,7 +6,7 @@ ms.mktglfcycl: manage
 ms.sitesec: library
 ms.pagetype: store
 author: TrudyHa
-ms.date: 11/30/2017
+ms.date: 1/8/2018
 ---
 
 # Microsoft Store for Business and Education release history
@@ -15,6 +15,10 @@ Microsoft Store for Business and Education regularly releases new and improved f
 
 Looking for info on the latest release? Check out [What's new in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) 
 
+## November 2017
+
+- **Export list of Minecraft: Education Edition users** - Admins and teachers can now export a list of users who have Minecraft: Education Edition licenses assigned to them. Click **Export users**, and Store for Education creates an Excel spreadsheet for you, and saves it as a .csv file.
+
 ## October 2017
 
 - Bug fixes and permformance improvements.  
diff --git a/store-for-business/whats-new-microsoft-store-business-education.md b/store-for-business/whats-new-microsoft-store-business-education.md
index a5f0578801..38af4a8e01 100644
--- a/store-for-business/whats-new-microsoft-store-business-education.md
+++ b/store-for-business/whats-new-microsoft-store-business-education.md
@@ -6,7 +6,7 @@ ms.mktglfcycl: manage
 ms.sitesec: library
 ms.pagetype: store
 author: TrudyHa
-ms.date: 11/30/2017
+ms.date: 1/8/2018
 ---
 
 # What's new in Microsoft Store for Business and Education
@@ -15,11 +15,9 @@ Microsoft Store for Business and Education regularly releases new and improved f
 
 ## Latest updates for Store for Business and Education
 
-**November 2017**
+**December 2017**
 
-|  |  |
-|-----------------------|---------------------------------|
-| ![Microsoft Store for Business Edcucation, Export users link.](images/msfb-wn-1711-export-user.png) |**Export list of Minecraft: Education Edition users**<br /><br />Admins and teachers can now export a list of users who have Minecraft: Education Edition licenses assigned to them. Click **Export users**, and Store for Education creates an Excel spreadsheet for you, and saves it as a .csv file.<br /><br />**Applies to**:<br /> Microsoft Store for Education |
+We’ve been working on bug fixes and performance improvements to provide you a better experience. Stay tuned for new features!
 
 <!---
 We’ve been working on bug fixes and performance improvements to provide you a better experience. Stay tuned for new features!
@@ -32,8 +30,12 @@ We’ve been working on bug fixes and performance improvements to provide you a
 
 ## Previous releases and updates
 
+[November 2017](release-history-microsoft-store-business-education.md#november-2017)
+- Export list of Minecraft: Education Edition users
+- Bug fixes and performance improvements
+
 [October 2017](release-history-microsoft-store-business-education.md#october-2017)
-- Bug fixes and permformance improvements. 
+- Bug fixes and permformance improvements 
 
 [September 2017](release-history-microsoft-store-business-education.md#september-2017)
 - Manage Windows device deployment with Windows AutoPilot Deployment
diff --git a/windows/deployment/windows-autopilot/TOC.md b/windows/deployment/windows-autopilot/TOC.md
index 247aa5ddc9..865fa18cce 100644
--- 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)
-
-## [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)
-
+# [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)
+
diff --git a/windows/deployment/windows-autopilot/windows-10-autopilot-demo-vm.md b/windows/deployment/windows-autopilot/windows-10-autopilot-demo-vm.md
index 29aa72fe9f..505982b0d1 100644
--- a/windows/deployment/windows-autopilot/windows-10-autopilot-demo-vm.md
+++ b/windows/deployment/windows-autopilot/windows-10-autopilot-demo-vm.md
@@ -1,209 +1,209 @@
----
-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
-ms.localizationpriority: high
-ms.sitesec: library
-ms.pagetype: deploy
-author: DaniHalfin
-ms.author: daniha
-ms.date: 12/21/2017
----
-
-# 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.
-
-## Prerequisites
-
-These are the thing you'll need on your device to get started:
-* Installation media for the latest version of Windows 10 Professional or Enterprise (ISO file)
-* 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).
-
-## Create your Virtual Machine
-
-### Enable Hyper-V
-The first thing to do, is to enable the Hyper-V feature on your device.
->[!IMPORTANT]
->If you already have Hyper-V enabled, skip this step.
-
-Open a PowerShell prompt **as an administrator** and run the following:
-```powershell
-Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
-```
-
-You will be prompted to restart your device, so save all your work and restart it before you continue.
-
-### Create and start your demo Virtual Machine
-
-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
-```
-
->[!IMPORTANT]
->Make sure to replace <*Name of Network Adapter with internet access*> and <*Path to Windows 10 ISO*> with the appropriate values.
->Additionally, note that all Virtual Machine related data will be created under the current path in your PowerShell prompt. Consider navigating into a new folder before running the above.
-
-### Install Windows 10
-
-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"
-```
-
-## Capture your Virtual Machine's hardware ID
-
-On the newly created Virtual Machine, open a PowerShell prompt **as an administrator** and run the following:
-```powershell
-md c:\HWID
-Set-Location c:\HWID
-Set-ExecutionPolicy Unrestricted
-Install-Script -Name Get-WindowsAutoPilotInfo
-Get-WindowsAutoPilotInfo.ps1 -OutputFile AutoPilotHWID.csv
-```
-
->[!NOTE]
->Accept all prompts while running the above cmdlets.
-
-### 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 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
-```
-
-Once the Virtual Machine has stopped, create a checkpoint:
-```powershell
-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
-```
-
-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
-```
-
-## 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.
-
-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**.
-
-![Reset this PC final prompt](images/autopilot-reset-prompt.jpg)
-
-Resetting your Virtual Machine can take a while. Proceed to the next steps while your Virtual Machine is resetting.
-
-![Reset this PC screen capture](images/autopilot-reset-progress.jpg)
-
-## Configure company branding
-
->[!IMPORTANT]
->If you already have company branding configured in Azure Active Directory, you can skip this step.
-
-Navigate to [Company branding in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/LoginTenantBranding).
-
->[!IMPORTANT]
->Make sure to sign-in with a Global Administrator account.
-
-Click on **Configure** and configure any type of company branding you'd like to see during the OOBE.
-
-![Configure button in Company branding](images/autopilot-aad-configure.jpg)
-
-Once finished, click **Save**.
-
->[!NOTE]
->Changes to company branding can take up to 30 minutes to apply.
-
-
-## Configure Microsoft Intune auto-enrollment
-
->[!IMPORTANT]
->If you already have MDM auto-enrollment configured in Azure Active Directory, you can skip this step.
-
-Navigate to [Mobility (MDM and MAM) in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Mobility) and select **Microsoft Intune**.
-
-For the purposes of this demo, select **All** under the **MDM user scope** and click **Save**.
-
-![MDM user scope in the Mobility blade](images/autopilot-aad-mdm.jpg)
-
-## 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.
-
-![Add devices through Microsoft Store for Business](images/autopilot-devices-add.jpg)
-
-## 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).
-
-Make sure to sync the device you've just registered, by clicking on **Devices** under **Windows Autopilot Deployment Program (Preview)** and selecting **Sync**. Wait a few moments before refreshing to see your Virtual Machine added.
-
-![Microsoft Intune sync Windows devices](images/autopilot-intune-sync.jpg)
-
-### 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:
-| Setting name | Value |
-|---|---|
-|Privacy Settings|Hide|
-|End user license agreement (EULA)|Hide|
-|User account type|Standard|
-
-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
-
-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)
-
-Wait a few minutes for all changes to apply.
-
-## 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.
-
-Once you select a language and a keyboard layout, your company branded sign-in screen should appear. Provide your Azure Active Directory credentials and you're all done.
-
-![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.
-
+---
+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
+ms.localizationpriority: high
+ms.sitesec: library
+ms.pagetype: deploy
+author: DaniHalfin
+ms.author: daniha
+ms.date: 12/21/2017
+---
+
+# 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.
+
+## Prerequisites
+
+These are the thing you'll need on your device to get started:
+* Installation media for the latest version of Windows 10 Professional or Enterprise (ISO file)
+* 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).
+
+## Create your Virtual Machine
+
+### Enable Hyper-V
+The first thing to do, is to enable the Hyper-V feature on your device.
+>[!IMPORTANT]
+>If you already have Hyper-V enabled, skip this step.
+
+Open a PowerShell prompt **as an administrator** and run the following:
+```powershell
+Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
+```
+
+You will be prompted to restart your device, so save all your work and restart it before you continue.
+
+### Create and start your demo Virtual Machine
+
+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
+```
+
+>[!IMPORTANT]
+>Make sure to replace <*Name of Network Adapter with internet access*> and <*Path to Windows 10 ISO*> with the appropriate values.
+>Additionally, note that all Virtual Machine related data will be created under the current path in your PowerShell prompt. Consider navigating into a new folder before running the above.
+
+### Install Windows 10
+
+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"
+```
+
+## Capture your Virtual Machine's hardware ID
+
+On the newly created Virtual Machine, open a PowerShell prompt **as an administrator** and run the following:
+```powershell
+md c:\HWID
+Set-Location c:\HWID
+Set-ExecutionPolicy Unrestricted
+Install-Script -Name Get-WindowsAutoPilotInfo
+Get-WindowsAutoPilotInfo.ps1 -OutputFile AutoPilotHWID.csv
+```
+
+>[!NOTE]
+>Accept all prompts while running the above cmdlets.
+
+### 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 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
+```
+
+Once the Virtual Machine has stopped, create a checkpoint:
+```powershell
+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
+```
+
+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
+```
+
+## 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.
+
+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**.
+
+![Reset this PC final prompt](images/autopilot-reset-prompt.jpg)
+
+Resetting your Virtual Machine can take a while. Proceed to the next steps while your Virtual Machine is resetting.
+
+![Reset this PC screen capture](images/autopilot-reset-progress.jpg)
+
+## Configure company branding
+
+>[!IMPORTANT]
+>If you already have company branding configured in Azure Active Directory, you can skip this step.
+
+Navigate to [Company branding in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/LoginTenantBranding).
+
+>[!IMPORTANT]
+>Make sure to sign-in with a Global Administrator account.
+
+Click on **Configure** and configure any type of company branding you'd like to see during the OOBE.
+
+![Configure button in Company branding](images/autopilot-aad-configure.jpg)
+
+Once finished, click **Save**.
+
+>[!NOTE]
+>Changes to company branding can take up to 30 minutes to apply.
+
+
+## Configure Microsoft Intune auto-enrollment
+
+>[!IMPORTANT]
+>If you already have MDM auto-enrollment configured in Azure Active Directory, you can skip this step.
+
+Navigate to [Mobility (MDM and MAM) in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Mobility) and select **Microsoft Intune**.
+
+For the purposes of this demo, select **All** under the **MDM user scope** and click **Save**.
+
+![MDM user scope in the Mobility blade](images/autopilot-aad-mdm.jpg)
+
+## 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.
+
+![Add devices through Microsoft Store for Business](images/autopilot-devices-add.jpg)
+
+## 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).
+
+Make sure to sync the device you've just registered, by clicking on **Devices** under **Windows Autopilot Deployment Program (Preview)** and selecting **Sync**. Wait a few moments before refreshing to see your Virtual Machine added.
+
+![Microsoft Intune sync Windows devices](images/autopilot-intune-sync.jpg)
+
+### 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:
+| Setting name | Value |
+|---|---|
+|Privacy Settings|Hide|
+|End user license agreement (EULA)|Hide|
+|User account type|Standard|
+
+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
+
+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)
+
+Wait a few minutes for all changes to apply.
+
+## 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.
+
+Once you select a language and a keyboard layout, your company branded sign-in screen should appear. Provide your Azure Active Directory credentials and you're all done.
+
+![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.
+
 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). 
\ No newline at end of file
diff --git a/windows/deployment/windows-autopilot/windows-10-autopilot.md b/windows/deployment/windows-autopilot/windows-10-autopilot.md
index 29a673b875..fc800da02b 100644
--- a/windows/deployment/windows-autopilot/windows-10-autopilot.md
+++ b/windows/deployment/windows-autopilot/windows-10-autopilot.md
@@ -1,133 +1,133 @@
----
-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
-ms.localizationpriority: high
-ms.sitesec: library
-ms.pagetype: deploy
-author: DaniHalfin
-ms.author: daniha
-ms.date: 12/13/2017
----
-
-# 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>
-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
-
-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
-
-### 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 Windows AutoPilot Deployment Program experience
-
-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
-* Create and auto-assign devices to configuration groups based on a device's profile
-* Customize OOBE content specific to the organization
-
-##### Prerequisites
-
-* [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)
-* 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)
-* [Users must be allowed to join devices into Azure AD](https://docs.microsoft.com/azure/active-directory/device-management-azure-portal)
-* Microsoft Intune or other MDM services to manage your devices
-
-The end-user unboxes and turns on a new device. What follows are a few simple configuration steps:
-* Select a language and keyboard layout
-* Connect to the network
-* Provide email address (the email address of the user's Azure AD account) and password
-
-Multiple additional settings are skipped here, since the device automatically recognizes that [it belongs to an organization](#registering-devices-to-your-organization). Following this process the device is joined to Azure AD, enrolled in Microsoft Intune (or any other MDM service).
-
-MDM enrollment ensures policies are applied, apps are installed and setting are configured on the device. Windows Update for Business applies the latest updates to ensure the device is up to date.
-
-</br>
-<iframe width="560" height="315" align="center" src="https://www.youtube.com/embed/4K4hC5NchbE" frameborder="0" allowfullscreen></iframe>
-
-#### Device registration and OOBE customization
-
-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.
-
-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*)
-* Skipping OEM registration, OneDrive and Cortana (*Automatic*)
-* Skipping privacy settings
-* Skipping EULA (*staring with Windows 10, version 1709*)
-* Preventing the account used to set-up the device from getting local administrator permissions
-
-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)
-* [Partner Center](https://msdn.microsoft.com/partner-center/autopilot)
-
-##### Configure company branding for OOBE
-
-In order for your company branding to appear during the OOBE, you'll need to configure it in Azure Active Directory first.
-
-See [Add company branding to your directory](https://docs.microsoft.com/azure/active-directory/customize-branding#add-company-branding-to-your-directory), to configure these settings.
-
-##### Configure MDM auto-enrollment in Microsoft Intune
-
-In order for your devices to be auto-enrolled into MDM management, MDM auto-enrollment needs to be configured in Azure AD. To do that with Microsoft Intune, please see [Enroll Windows devices for Microsoft Intune](https://docs.microsoft.com/intune/windows-enroll). For other MDM vendors, please consult your vendor for further details.
-
->[!NOTE]
->MDM auto-enrollment requires an Azure AD Premium P1 or P2 subscription.
-
-#### 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.
-
-To manage devices behind firewalls and proxy servers, the following URLs need to be accessible:
-
-* https://go.microsoft.com
-* https://login.microsoftonline.com
-* https://login.live.com
-* https://account.live.com
-* https://signup.live.com
-* https://licensing.mp.microsoft.com
-* https://licensing.md.mp.microsoft.com 
-* ctldl.windowsupdate.com
-* download.windowsupdate.com
-
->[!NOTE]
->Where not explicitly specified, both HTTPS (443) and HTTP (80) need to be accessible.
-
->[!TIP]
->If you're auto-enrolling your devices into Microsoft Intune, or deploying Microsoft Office, make sure you follow the networking guidlines for [Microsoft Intune](https://docs.microsoft.com/en-us/intune/network-bandwidth-use#network-communication-requirements) and [Office 365](https://support.office.com/en-us/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2).
-
-### IT-Driven
-
-If you are planning to configure devices with traditional on-premises or cloud-based solutions, the [Windows Configuration Designer](https://www.microsoft.com/store/p/windows-configuration-designer/9nblggh4tx22) can be used to help automate the process. This is more suited to scenarios in which you require a higher level of control over the provisioning process. For more information on creating provisioning packages with Windows Configuration Designer, see [Create a provisioning package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package).
-
-### Teacher-Driven
-
-If you're an IT pro or a technical staff member at a school, your scenario might be simpler. The [Set Up School PCs](http://www.microsoft.com/store/p/set-up-school-pcs/9nblggh4ls40) app can be used to quickly set up PCs for students and will get you to a productive state faster and simpler. Please see [Use the Set up School PCs app](https://docs.microsoft.com/education/windows/use-set-up-school-pcs-app) for all the details.
-
-
-Not finding content you need? Windows 10 users, tell us what you want on [Feedback Hub](feedback-hub://?referrer=techDocsUcPage&tabid=2&contextid=897&newFeedback=true&topic=windows-10-auto-pilot.md). 
+---
+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
+ms.localizationpriority: high
+ms.sitesec: library
+ms.pagetype: deploy
+author: DaniHalfin
+ms.author: daniha
+ms.date: 12/13/2017
+---
+
+# 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>
+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
+
+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
+
+### 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 Windows AutoPilot Deployment Program experience
+
+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
+* Create and auto-assign devices to configuration groups based on a device's profile
+* Customize OOBE content specific to the organization
+
+##### Prerequisites
+
+* [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)
+* 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)
+* [Users must be allowed to join devices into Azure AD](https://docs.microsoft.com/azure/active-directory/device-management-azure-portal)
+* Microsoft Intune or other MDM services to manage your devices
+
+The end-user unboxes and turns on a new device. What follows are a few simple configuration steps:
+* Select a language and keyboard layout
+* Connect to the network
+* Provide email address (the email address of the user's Azure AD account) and password
+
+Multiple additional settings are skipped here, since the device automatically recognizes that [it belongs to an organization](#registering-devices-to-your-organization). Following this process the device is joined to Azure AD, enrolled in Microsoft Intune (or any other MDM service).
+
+MDM enrollment ensures policies are applied, apps are installed and setting are configured on the device. Windows Update for Business applies the latest updates to ensure the device is up to date.
+
+</br>
+<iframe width="560" height="315" align="center" src="https://www.youtube.com/embed/4K4hC5NchbE" frameborder="0" allowfullscreen></iframe>
+
+#### Device registration and OOBE customization
+
+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.
+
+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*)
+* Skipping OEM registration, OneDrive and Cortana (*Automatic*)
+* Skipping privacy settings
+* Skipping EULA (*staring with Windows 10, version 1709*)
+* Preventing the account used to set-up the device from getting local administrator permissions
+
+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)
+* [Partner Center](https://msdn.microsoft.com/partner-center/autopilot)
+
+##### Configure company branding for OOBE
+
+In order for your company branding to appear during the OOBE, you'll need to configure it in Azure Active Directory first.
+
+See [Add company branding to your directory](https://docs.microsoft.com/azure/active-directory/customize-branding#add-company-branding-to-your-directory), to configure these settings.
+
+##### Configure MDM auto-enrollment in Microsoft Intune
+
+In order for your devices to be auto-enrolled into MDM management, MDM auto-enrollment needs to be configured in Azure AD. To do that with Microsoft Intune, please see [Enroll Windows devices for Microsoft Intune](https://docs.microsoft.com/intune/windows-enroll). For other MDM vendors, please consult your vendor for further details.
+
+>[!NOTE]
+>MDM auto-enrollment requires an Azure AD Premium P1 or P2 subscription.
+
+#### 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.
+
+To manage devices behind firewalls and proxy servers, the following URLs need to be accessible:
+
+* https://go.microsoft.com
+* https://login.microsoftonline.com
+* https://login.live.com
+* https://account.live.com
+* https://signup.live.com
+* https://licensing.mp.microsoft.com
+* https://licensing.md.mp.microsoft.com 
+* ctldl.windowsupdate.com
+* download.windowsupdate.com
+
+>[!NOTE]
+>Where not explicitly specified, both HTTPS (443) and HTTP (80) need to be accessible.
+
+>[!TIP]
+>If you're auto-enrolling your devices into Microsoft Intune, or deploying Microsoft Office, make sure you follow the networking guidlines for [Microsoft Intune](https://docs.microsoft.com/en-us/intune/network-bandwidth-use#network-communication-requirements) and [Office 365](https://support.office.com/en-us/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2).
+
+### IT-Driven
+
+If you are planning to configure devices with traditional on-premises or cloud-based solutions, the [Windows Configuration Designer](https://www.microsoft.com/store/p/windows-configuration-designer/9nblggh4tx22) can be used to help automate the process. This is more suited to scenarios in which you require a higher level of control over the provisioning process. For more information on creating provisioning packages with Windows Configuration Designer, see [Create a provisioning package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package).
+
+### Teacher-Driven
+
+If you're an IT pro or a technical staff member at a school, your scenario might be simpler. The [Set Up School PCs](http://www.microsoft.com/store/p/set-up-school-pcs/9nblggh4ls40) app can be used to quickly set up PCs for students and will get you to a productive state faster and simpler. Please see [Use the Set up School PCs app](https://docs.microsoft.com/education/windows/use-set-up-school-pcs-app) for all the details.
+
+
+Not finding content you need? Windows 10 users, tell us what you want on [Feedback Hub](feedback-hub://?referrer=techDocsUcPage&tabid=2&contextid=897&newFeedback=true&topic=windows-10-auto-pilot.md).