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

.openpublishing.publish.config.json

@@ -119,5 +119,7 @@
   "git_repository_branch_open_to_public_contributors": "master",
   "skip_source_output_uploading": false,
   "dependent_repositories": [],
-  "need_generate_pdf_url_template": false
-}
+  "need_generate_pdf_url_template": false,
+  "need_preview_pull_request": true
+}
+

.openpublishing.redirection.json

@@ -621,6 +621,11 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/manage/cortana-at-work-overview.md",
+"redirect_url": "/itpro/windows/configure/cortana-at-work-overview",
+"redirect_document_id": false
+},
+{
 "source_path": "windows/manage/manage-inventory-windows-store-for-business.md",
 "redirect_url": "/itpro/windows/manage/app-inventory-managemement-windows-store-for-business",
 "redirect_document_id": true

CONTRIBUTING.md

@@ -20,7 +20,7 @@ We've tried to make editing an existing, public file as simple as possible.
 
 1.	Go to the page on TechNet that you want to update, and then click **Contribute**.
 
-       ![GitHub Web, showing the Contribute link](images/contribute-link.png)
+    ![GitHub Web, showing the Contribute link](images/contribute-link.png)
 
 2. Log into (or sign up for) a GitHub account.
     
@@ -28,7 +28,7 @@ We've tried to make editing an existing, public file as simple as possible.
 
 3. Click the **Pencil** icon (in the red box) to edit the content.
 
-       ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png)
+    ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png)
 
 4.	Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see:
     - **If you're linked to the Microsoft organization in GitHub:** [Windows Open Publishing Guide Home](http://aka.ms/windows-op-guide)
@@ -37,7 +37,7 @@ We've tried to make editing an existing, public file as simple as possible.
 
 5.	Make your suggested change, and then click **Preview Changes** to make sure it looks correct.
 
-       ![GitHub Web, showing the Preview Changes tab](images/preview-changes.png)
+    ![GitHub Web, showing the Preview Changes tab](images/preview-changes.png)
 
 6. When you’re done editing the topic, scroll to the bottom of the page, and then click **Propose file change** to create a fork in your personal GitHub account.
 
@@ -48,7 +48,7 @@ We've tried to make editing an existing, public file as simple as possible.
 7.	On the **Comparing changes** screen, you’ll see if there are any problems with the file you’re checking in.
 
     If there are no problems, you’ll see the message, **Able to merge**.
-
+    
     ![GitHub Web, showing the Comparing changes screen](images/compare-changes.png)
 
 8.	Click **Create pull request**.

browsers/edge/available-policies.md

@@ -272,7 +272,10 @@ Microsoft Edge works with these Group Policy settings (`Computer Configuration\A
 ### Keep favorites in sync between Internet Explorer and Microsoft Edge
 - **Supported versions:** Windows 10, version 1703
 
-- **Description:** This setting lets you decide whether people can sync their favorites between Internet Explorer and Microsoft Edge.
+- **Description:** This setting lets you decide whether people can sync their favorites between Internet Explorer and Microsoft Edge, including additions, deletions, changes, and position.
+
+    >[!Note]
+    >Enabling this setting stops Edge favorites from syncing between connected Windows 10 devices.
 
     - If you enable this setting, employees can sync their favorites between Internet Explorer and Microsoft Edge.
     
@@ -954,8 +957,10 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
         - **0 (default).** Synchronization is turned off.
         
-        - **1.** Synchronization is turned on.         
+        - **1.** Synchronization is turned on.
 
+        >[!Note]
+        >Enabling this setting stops Edge favorites from syncing between connected Windows 10 devices.
 
 ## Microsoft Edge and Windows 10-specific Group Policy settings
 These are additional Windows 10-specific Group Policy settings that work with Microsoft Edge.

devices/hololens/hololens-install-apps.md

@@ -62,15 +62,14 @@ Using Intune, you can also [monitor your app deployment](https://docs.microsoft.
 
 
 ## Use the Windows Device Portal to install apps on HoloLens.
+1. [Set up the HoloLens to use the Windows Device Portal](https://developer.microsoft.com/windows/mixed-reality/using_the_windows_device_portal#setting_up_hololens_to_use_windows_device_portal). The Device Portal is a web server on your HoloLens that you can connect to from a web browser on your PC. 
 
-1. [Set up the HoloLens to use the Windows Device Portal](https://developer.microsoft.com/windows/holographic/using_the_windows_device_portal#setting_up_hololens_to_use_windows_device_portal). The Device Portal is a web server on your HoloLens that you can connect to from a web browser on your PC. 
+2. On a PC, connect to the HoloLens using [Wi-Fi](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#connecting_over_wi-fi) or [USB](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#connecting_over_usb).
 
-2. On a PC, connect to the HoloLens using [Wi-Fi](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#connecting_over_wi-fi) or [USB](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#connecting_over_usb).
-
-3. [Create a user name and password](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#creating_a_username_and_password) if this is the first time you connect to the Windows Device Portal, or enter the user name and password that you previously set up.
+3. [Create a user name and password](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#creating_a_username_and_password) if this is the first time you connect to the Windows Device Portal, or enter the user name and password that you previously set up.
 
     >[!TIP]
-    >If you see a certificate error in the browser, follow [these troubleshooting steps](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#security_certificate). 
+    >If you see a certificate error in the browser, follow [these troubleshooting steps](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#security_certificate).
 
 4. In the Windows Device Portal, click **Apps**.
 

devices/hololens/hololens-kiosk.md

@@ -15,17 +15,17 @@ localizationpriority: medium
 
 Kiosk mode limits the user's ability to launch new apps or change the running app. When kiosk mode is enabled for HoloLens, the bloom gesture and Cortana are disabled, and placed apps aren't shown in the user's surroundings.
 
-1. [Set up the HoloLens to use the Windows Device Portal](https://developer.microsoft.com/windows/holographic/using_the_windows_device_portal#setting_up_hololens_to_use_windows_device_portal). The Device Portal is a web server on your HoloLens that you can connect to from a web browser on your PC. 
+1. [Set up the HoloLens to use the Windows Device Portal](https://developer.microsoft.com/windows/mixed-reality/using_the_windows_device_portal#setting_up_hololens_to_use_windows_device_portal). The Device Portal is a web server on your HoloLens that you can connect to from a web browser on your PC. 
 
     >[!IMPORTANT]
     >When you set up HoloLens to use the Device Portal, you must enable **Developer Mode** on the device. **Developer Mode** on a device that has been upgraded to Windows Holographic for Business enables side-loading of apps, which risks the installation of apps that have not been certified by the Microsoft Store. Administrators can block the ability to enable **Developer Mode** using the **ApplicationManagement/AllowDeveloper Unlock** setting in the [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx). [Learn more about Developer Mode.](https://msdn.microsoft.com/windows/uwp/get-started/enable-your-device-for-development#developer-mode)
     
-2. On a PC, connect to the HoloLens using [Wi-Fi](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#connecting_over_wi-fi) or [USB](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#connecting_over_usb).
+2. On a PC, connect to the HoloLens using [Wi-Fi](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#connecting_over_wi-fi) or [USB](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#connecting_over_usb).
 
-3. [Create a user name and password](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#creating_a_username_and_password) if this is the first time you connect to the Windows Device Portal, or enter the user name and password that you previously set up.
+3. [Create a user name and password](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#creating_a_username_and_password) if this is the first time you connect to the Windows Device Portal, or enter the user name and password that you previously set up.
 
     >[!TIP]
-    >If you see a certificate error in the browser, follow [these troubleshooting steps](https://developer.microsoft.com/windows/holographic/Using_the_Windows_Device_Portal.html#security_certificate). 
+    >If you see a certificate error in the browser, follow [these troubleshooting steps](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#security_certificate). 
 
 4. In the Windows Device Portal, click **Kiosk Mode**.
 

devices/hololens/hololens-provisioning.md

@@ -47,7 +47,7 @@ When you run ADKsetup.exe for Windows 10, version 1607, select **Configuration D
 7. Expand **Runtime settings** and customize the package with any of the settings [described below](#what-you-can-configure).
 
     >[!IMPORTANT]
-    >If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. If the user account is locked out, you must [perform a full device recovery](https://developer.microsoft.com/windows/holographic/reset_or_recover_your_hololens#perform_a_full_device_recovery).
+    >If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. If the user account is locked out, you must [perform a full device recovery](https://developer.microsoft.com/windows/mixed-reality/reset_or_recover_your_hololens#perform_a_full_device_recovery).
 
 8. On the **File** menu, click **Save**. 
 
@@ -107,7 +107,7 @@ In Windows ICD, when you create a provisioning package for Windows Holographic,
 
 | Setting | Description |
 | --- | --- |
-| **Accounts**  | Create a local account. HoloLens currently supports a single user only. Creating multiple local accounts in a provisioning package is not supported. <br><br>**IMPORTANT**<br>If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. If the user account is locked out, you must [perform a full device recovery](https://developer.microsoft.com/windows/holographic/reset_or_recover_your_hololens#perform_a_full_device_recovery). |
+| **Accounts**  | Create a local account. HoloLens currently supports a single user only. Creating multiple local accounts in a provisioning package is not supported. <br><br>**IMPORTANT**<br>If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. If the user account is locked out, you must [perform a full device recovery](https://developer.microsoft.com/windows/mixed-reality/reset_or_recover_your_hololens#perform_a_full_device_recovery). |
 | **Certificates** | Deploy a certificate to HoloLens.  |
 | **ConnectivityProfiles** | Deploy a Wi-Fi profile to HoloLens.   |
 | **EditionUpgrade** | [Upgrade to Windows Holographic for Business.](hololens-upgrade-enterprise.md)  |

devices/hololens/hololens-requirements.md

@@ -11,7 +11,7 @@ localizationpriority: medium
 
 # Microsoft HoloLens in the enterprise: requirements
 
-When you develop for HoloLens, there are [system requirements and tools](https://developer.microsoft.com/windows/holographic/install_the_tools) that you need. In an enterprise environment, there are also a few requirements to use and manage HoloLens which are listed below.
+When you develop for HoloLens, there are [system requirements and tools](https://developer.microsoft.com/windows/mixed-reality/install_the_tools) that you need. In an enterprise environment, there are also a few requirements to use and manage HoloLens which are listed below.
 
 ## General use
 - Microsoft account or Azure Active Directory (Azure AD) account

devices/hololens/hololens-upgrade-enterprise.md

@@ -11,7 +11,7 @@ localizationpriority: medium
 
 # Unlock Windows Holographic for Business features
 
-Microsoft HoloLens is available in the *Development Edition*, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the [Commercial Suite](https://developer.microsoft.com/windows/holographic/release_notes#introducing_microsoft_hololens_commercial_suite), which provides extra features designed for business. 
+Microsoft HoloLens is available in the *Development Edition*, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the [Commercial Suite](https://developer.microsoft.com/windows/mixed-reality/release_notes#introducing_microsoft_hololens_commercial_suite), which provides extra features designed for business. 
 
 When you purchase the Commercial Suite, you receive a license that upgrades Windows Holographic to Windows Holographic for Business. This license can be applied to the device either through the organization's [mobile device management (MDM) provider](#edition-upgrade-using-mdm) or a [provisioning package](#edition-upgrade-using-a-provisioning-package).
 

devices/hololens/index.md

@@ -33,8 +33,8 @@ localizationpriority: medium
 
 - [Help for using HoloLens](https://support.microsoft.com/products/hololens)
 
-- [Documentation for Holographic app development](https://developer.microsoft.com/windows/holographic/documentation)
+- [Documentation for Holographic app development](https://developer.microsoft.com/windows/mixed-reality/documentation)
 
 - [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial)
 
-- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/holographic/release_notes)
+- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes)

devices/surface/TOC.md

@@ -1,6 +1,7 @@
 # [Surface](index.md)
 ## [Deploy Surface devices](deploy.md)
-### [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md)
+### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.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)
 ### [Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)
 ### [Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)

devices/surface/change-history-for-surface.md

@@ -11,6 +11,14 @@ author: jdeckerMS
 
 This topic lists new and updated topics in the Surface documentation library.
 
+
+## April 2017
+
+|New or changed topic | Description |
+| --- | --- |
+|[Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md) | New (supersedes [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md))|
+
+
 ## January 2017
 
 |New or changed topic | Description |

devices/surface/deploy.md

@@ -16,7 +16,7 @@ Get deployment guidance for your Surface devices including information about MDT
 
 | Topic | Description |
 | --- | --- |
-| [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md) | Explains that LTSB is not supported for general-purpose Surface devices and should be used for specialized devices only. | 
+| [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md) | Find out about compatibility and limitations of Surface devices running Windows 10 Enterprise LTSB 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. |
 | [Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)| Walk through the process of customizing the Surface out-of-box experience for end users in your organization.|

devices/surface/ltsb-for-surface.md

@@ -10,6 +10,8 @@ author: jdeckerMS
 
 # Long-Term Servicing Branch (LTSB) for Surface devices
 
+>[!WARNING]
+>For updated information on this topic, see [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md). For additional information on this update, see the [Documentation Updates for Surface and Windows 10 LTSB Compatibility](https://blogs.technet.microsoft.com/surface/2017/04/11/documentation-updates-for-surface-and-windows-10-ltsb-compatibility) post on the Surface Blog for IT Pros.
 
 General-purpose Surface devices running Long-Term Servicing Branch (LTSB) are not supported. As a general guideline, if a Surface device runs productivity software, such as Microsoft Office, it is a general-purpose device that does not qualify for LTSB and should instead run Current Branch (CB) or Current Branch for Business (CBB). 
 

devices/surface/surface-device-compatibility-with-windows-10-ltsb.md

@@ -0,0 +1,58 @@
+---
+title: Surface device compatibility with Windows 10 Long-Term Servicing Branch (Surface)
+description: Find out about compatibility and limitations of Surface devices running Windows 10 Enterprise LTSB edition.
+keywords: ltsb, update, surface servicing options
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.pagetype: surface, devices
+ms.sitesec: library
+author: jdeckerMS
+---
+
+# Surface device compatibility with Windows 10 Long-Term Servicing Branch (LTSB)
+
+Surface devices are designed to provide best-in-class experiences in productivity and general-purpose scenarios. Regular updates enable Surface devices to bring to life new innovations and to evolve with the new capabilities delivered by Windows 10 Feature Updates. Feature Updates are available only in Windows 10 Pro or Windows 10 Enterprise editions that receive continuous updates through the Current Branch (CB) or Current Branch for Business (CBB) servicing options.
+
+In contrast to the CB and CBB servicing options, you cannot select the Long-Term Servicing Branch (LTSB) option in Windows 10 settings. To use the LTSB servicing option, you must install a separate edition of Windows 10 Enterprise, known as *Windows 10 Enterprise LTSB*. In addition to providing an extended servicing model, the Windows 10 Enterprise LTSB edition also provides an environment with several Windows components removed. The core Surface experiences that are impacted by LTSB include:
+
+* Windows Feature Updates, including enhancements such as:
+
+  *  Improvements to Direct Ink and palm rejection provided in Windows 10, version 1607 (also referred to as the Anniversary Update)
+  *  Improved support for high DPI applications provided in Windows 10, version 1703 (also referred to as the Creators Update)
+
+* Pressure sensitivity settings provided by the Surface app
+
+* The Windows Ink Workspace
+
+* Key touch-optimized in-box applications including Microsoft Edge, OneNote, Calendar, and Camera
+
+The use of the Windows 10 Enterprise LTSB environment on Surface devices results in sub-optimal end-user experiences and you should avoid using it in environments where users want and expect a premium, up-to-date user experience.
+
+The LTSB servicing option is designed for device types and scenarios where the key attribute is for features or functionality to never change. Examples include systems that power manufacturing or medical equipment, or embedded systems in kiosks, such as ATMs or airport ticketing systems.
+
+>[!NOTE]
+>For general information about Windows servicing branches, including LTSB, see [Overview of Windows as a service](https://technet.microsoft.com/itpro/windows/update/waas-overview#long-term-servicing-branch).
+
+>[!NOTE]
+>As a general guideline, devices that fulfill the following criteria are considered general-purpose devices and should be paired with Windows 10 Pro or Windows 10 Enterprise using the CB or CBB servicing option:
+
+* Devices that run productivity software such as Microsoft Office
+
+* Devices that use Windows Store applications
+
+* Devices that are used for general Internet browsing (for example, research or access to social media)
+
+Before you choose to use Windows 10 Enterprise LTSB edition on Surface devices, consider the following limitations:
+
+* Drivers and firmware for Surface devices are tested against the most recent version of Windows 10 CB and the last two versions of CBB. Drivers and firmware are not explicitly tested against releases of Windows 10 Enterprise LTSB. 
+
+* If you encounter problems, Microsoft Support will provide troubleshooting assistance. However, due to the servicing nature of the Windows LTSB, issue resolution may require that devices be upgraded to a more recent version of Windows 10 Enterprise LTSB, or to Windows 10 Pro or Enterprise with the CB or CBB servicing option.
+
+* Surface device replacements (for example, devices replaced under warranty) may contain subtle variations in hardware components that require updated device drivers and firmware. Compatibility with these updates may require the installation of a more recent version of Windows 10 Enterprise LTSB or Windows 10 Pro or Enterprise with the CB or CBB servicing option.
+
+>[!NOTE]
+>Organizations that standardize on a specific version of Windows 10 Enterprise LTSB may be unable to adopt new generations of Surface hardware without also updating to a later version of Windows 10 Enterprise LTSB or Windows 10 Pro or Enterprise. For more information, see the **How will Windows 10 LTSBs be supported?** topic in the **Supporting the latest processor and chipsets on Windows** section of [Lifecycle Policy FAQ—Windows products](https://support.microsoft.com/help/18581/lifecycle-policy-faq-windows-products#b4).
+
+Surface devices running Windows 10 Enterprise LTSB edition will not receive new features. In many cases these features are requested by customers to improve the usability and capabilities of Surface hardware. For example, new improvements for High DPI applications in Windows 10, version 1703. Customers that use Surface devices in the LTSB configuration will not see the improvements until they either update to a new Windows 10 Enterprise LTSB release or upgrade to a version of Windows 10 with support for the CB and CBB servicing options.
+
+Devices can be changed from Windows 10 Enterprise LTSB to a more recent version of Windows 10 Enterprise, with support for the CB and CBB servicing options, without the loss of user data by performing an upgrade installation. You can also perform an upgrade installation on multiple devices by leveraging the Upgrade Task Sequence Templates available in the Microsoft Deployment Toolkit (MDT) and System Center Configuration Manager. For more information, see [Upgrade Surface devices to Windows 10 with Microsoft Deployment Toolkit](https://technet.microsoft.com/itpro/surface/upgrade-surface-devices-to-windows-10-with-mdt).

devices/surface/surface-dock-updater.md

@@ -104,6 +104,33 @@ Microsoft Surface Dock Updater logs its progress into the Event Log, as shown in
 
 *Figure 8. Surface Dock Updater events in Event Viewer*
 
+## Changes and updates
+
+Microsoft periodically updates Surface Dock Updater. To learn more about the application of firmware by Surface Dock Updater, see [Manage Surface Dock firmware updates](https://technet.microsoft.com/en-us/itpro/surface/manage-surface-dock-firmware-updates).
+
+>[!Note]
+>Each update to Surface Dock firmware is included in a new version of Surface Dock Updater. To update a Surface Dock to the latest firmware, you must use the latest version of Surface Dock Updater.
+
+### Version 1.0.8.0
+
+This version of Surface Dock Updater adds support for the following:
+
+* Update for Surface Dock Main Chipset firmware
+* Update for Surface Dock DisplayPort firmware
+
+### Version 2.0.22.0
+
+This version of Surface Dock Updater adds support for the following:
+
+* Update for Surface Dock USB firmware
+* Improved reliability of Ethernet, audio, and USB ports
+
+### Version 2.1.6.0
+
+This version of Surface Dock Updater adds support for the following:
+
+* Updated firmware for Surface Dock DisplayPort
+
 
 ## Related topics
 

education/windows/TOC.md

@@ -1,19 +1,20 @@
 # [Windows 10 for Education](index.md)
 ## [Windows 10 editions for education customers](windows-editions-for-education-customers.md)
-## [Setup options for Windows 10](set-up-windows-10.md)
-### [Use the Set up School PCs app ](use-set-up-school-pcs-app.md)
+## [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)
+## [Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)
+## [Set up Windows devices for education](set-up-windows-10.md)
 ### [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md)
+### [Use the Set up School PCs app ](use-set-up-school-pcs-app.md)
 ### [Set up student PCs to join domain](set-up-students-pcs-to-join-domain.md)
 ### [Provision student PCs with apps](set-up-students-pcs-with-apps.md)
-## [Working with Windows Store for Business – education scenarios](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)
-### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md)
 ## [Take tests in Windows 10 ](take-tests-in-windows-10.md)
 ### [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)
-## [Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)
+## [Working with Windows Store for Business – education scenarios](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)
+### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md)
 ## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
 ## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
 ## [Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)

education/windows/change-history-edu.md

@@ -12,12 +12,25 @@ author: CelesteDG
 
 This topic lists new and updated topics in the [Windows 10 for Education](index.md) documentation.
 
+## RELEASE: Windows 10, version 1703 (Creators Update)
+
+| New or changed topic | Description|
+| --- | --- |
+| [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)  | New. Provides guidance on ways to configure the OS diagnostic data, consumer experiences, Cortana, search, as well as some of the preinstalled apps, so that Windows is ready for your school. |
+| [Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)  | Updated the screenshots and related instructions to reflect the current UI and experience.  |
+| [Set up Windows devices for education](set-up-windows-10.md) | Updated for Windows 10, version 1703. |
+| Set up School PCs app: </br> [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md) </br> [Use the Set up School PCs app ](use-set-up-school-pcs-app.md) | Updated. Describes the school-specific settings and policies that Set up School PC configures. Also provides step-by-step instructions for using the latest version of the app to create a provisioning package that you can use to set up student PCs. |
+| Set up using Windows Configuration Designer: </br> [Set up student PCs to join domain](set-up-students-pcs-to-join-domain.md) </br> [Provision student PCs with apps](set-up-students-pcs-with-apps.md) | Updated the information for Windows 10, version 1703. |
+| [Take tests in Windows 10 ](take-tests-in-windows-10.md) </br> [Set up Take a Test on a single PC](take-a-test-single-pc.md) </br> [Set up Take a Test on multiple PCs](take-a-test-multiple-pcs.md) </br> [Take a Test app technical reference](take-a-test-app-technical.md) | Updated. Includes new information on ways you can set up the test account and assessment URL and methods for creating and distributing the link. Methods available to you vary depending on whether you're setting up Take a Test on a single PC or multiple PCs. |
+
 ## January 2017
+
 | New or changed topic | Description |
 | --- | --- |
 | [For IT administrators - get Minecraft: Education Edition](school-get-minecraft.md) | Updates. Learn how schools can use invoices to pay for Minecraft: Education Edition. |
 
 ## December 2016
+
 | New or changed topic | Description |
 | --- | --- |
 | [Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md) | New. Learn how to opt-in to a free upgrade to Windows 10 Pro Education. |
@@ -30,13 +43,8 @@ This topic lists new and updated topics in the [Windows 10 for Education](index.
 | [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.  |
 
-## September 2016
 
-| New or changed topic | Description|
-| --- | --- |
-| [Create tests using Microsoft Forms](create-tests-using-microsoft-forms.md)  | New. Learn how to use Microsoft Forms with the Take a Test app to prevent access to other computers or online resources while completing a test.  |
-
-## RELEASE: Windows 10, version 1607
+## RELEASE: Windows 10, version 1607 (Anniversary Update)
 The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added:
 
 - [Set up Windows 10](set-up-windows-10.md)

education/windows/chromebook-migration-guide.md

@@ -7,6 +7,7 @@ ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu, devices
+localizationpriority: high
 author: craigash
 ---
 

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

@@ -0,0 +1,172 @@
+---
+title: Windows 10 configuration recommendations for education customers
+description: Provides guidance on ways to configure the OS diagnostic data, consumer experiences, Cortana, search, as well as some of the preinstalled apps, so that Windows is ready for your school.
+keywords: ["Windows 10 deployment", "recommendations", "privacy settings", "school", "education", "configurations"]
+ms.mktglfcycl: plan
+ms.sitesec: library
+localizationpriority: high
+author: CelesteDG
+---
+
+# Windows 10 configuration recommendations for education customers
+**Applies to:**
+
+-   Windows 10
+
+
+Privacy is important to us, we want to provide you with ways to customize the OS diagnostic data, consumer experiences, Cortana, search, as well as some of the preinstalled apps, for usage with [education editions of Windows 10](windows-editions-for-education-customers.md) in education environments. To learn more about Microsoft’s commitment to privacy, see [Windows 10 and privacy](https://go.microsoft.com/fwlink/?LinkId=809305).
+
+In Windows 10, version 1703 (Creators Update), it is straightforward to configure Windows to be education ready.
+
+| Area | How to configure | What this does | Notes | 
+| --- | --- | --- | --- | 
+| **Diagnostic Data** | **SetEduPolicies** | Sets Diagnostic Data to [Basic](https://technet.microsoft.com/itpro/windows/configure/configure-windows-telemetry-in-your-organization) | On Windows 10 Education or Windows 10 Pro Education, this is already set |
+| **Microsoft consumer experiences** | **SetEduPolicies** | Disables suggested content from Windows such as app recommendations | On Windows 10 Education or Windows 10 Pro Education, this is already set |
+| **Cortana** | **AllowCortana** | Disables Cortana | * Cortana is enabled by default on all editions in Windows 10, version 1703</br></br> * If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 to Windows 10, version 1703 will enable Cortana. You can use the **AllowCortana** policy to turn it off. |
+| **Safe search** | **SetEduPolicies** | Locks Bing safe search to Strict in Microsoft Edge | On Windows 10 Education or Windows 10 Pro Education, this is already set |
+| **Bing search advertising** | Ad free search with Bing | Disables ads when searching the internet with Bing in Microsoft Edge | Depending on your specific requirements, there are different ways to configure this as detailed in [Ad-free search with Bing](#ad-free-search-with-bing) |
+| **Apps** | **SetEduPolicies** | Preinstalled apps like Microsoft Edge, Movies & TV, Groove, and Skype become education ready | * Any app can detect Windows is running in an education ready configuration through [IsEducationEnvironment](https://docs.microsoft.com/en-us/uwp/api/windows.system.profile.educationsettings)</br></br> * On Windows 10 Education or Windows 10 Pro Education, this is already set |
+
+
+## Recommended configuration
+It is easy to be education ready when using Microsoft products. We recommend the following configuration:
+
+1. Use an Office 365 Education tenant. 
+
+    With Office 365, you also have Azure Active Directory (Azure AD). To learn more about Office 365 Education features and pricing, see [Office 365 Education plans and pricing](https://products.office.com/en-us/academic/compare-office-365-education-plans).
+
+2. Activate Intune for Education in your tenant.
+
+    You can [sign up to learn more about Intune for Education](https://info.microsoft.com/US-WNDWS-CNTNT-FY17-01Jan-17-IntuneforEducationlandingpageandnurture292531_01Registration-ForminBody.html).
+
+3. On PCs running Windows 10, version 1703  (Windows 10 Pro Education or Windows 10 Education):
+  1. Provision the PC using one of these methods:
+    * [Provision PCs with the Set up School PCs app](use-set-up-school-pcs-app.md) - This will automatically set both **SetEduPolicies** to True and **AllowCortana** to False.
+    * [Provision PCs with a custom package created with Windows Configuration Designer](https://technet.microsoft.com/en-us/itpro/windows/configure/provisioning-create-package) - Make sure to set both **SetEduPolicies** to True and **AllowCortana** to False.
+  2. Join the PC to Azure Active Directory.
+    * Use Set up School PCs or Windows Configuration Designer to bulk enroll to Azure AD.
+    * Manually Azure AD join the PC during the Windows device setup experience.
+  3. Enroll the PCs in MDM.
+    * If you have activated Intune for Education in your Azure AD tenant, enrollment will happen automatically when the PC is joined to Azure AD. Intune for Education will automatically set **SetEduPolicies** to True and **AllowCortana** to False.
+
+4. Distribute the PCs to students.
+
+    Students sign in with their Azure AD/Office 365 identity, which enables single sign-on to Bing in Microsoft Edge, enabling an ad-free search experience with Bing in Microsoft Edge.
+
+5. Ongoing management through Intune for Education.
+
+    You can set many policies through Intune for Education, including **SetEduPolicies** and **AllowCortana**, for ongoing management of the PCs.
+
+## Configuring Windows
+You can configure Windows through provisioning or management tools including industry standard MDM.
+- Provisioning - A one-time setup process.
+- Management - A one-time and/or ongoing management of a PC by setting policies.
+
+You can set all the education compliance areas through both provisioning and management tools. Additionally, these Microsoft education tools will ensure PCs that you set up are education ready:
+- [Set up School PCs](use-set-up-school-pcs-app.md)
+- Intune for Education (coming soon)
+
+## AllowCortana
+**AllowCortana** is a policy that enables or disables Cortana. It is a policy node in the Policy configuration service provider, [AllowCortana](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#experience-allowcortana). 
+
+Use one of these methods to set this policy.
+
+### MDM
+- Intune for Education automatically sets this policy in the **All devices** group policy configuration.
+- 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/Experience/AllowCortana
+        - Data type:  Integer
+        - Value:  0
+
+        ![Create an OMA URI for AllowCortana](images/allowcortana_omauri.png)
+
+### Group Policy
+Set **Computer Configuration > Administrative Templates > Windows Components > Search > AllowCortana** to **Disabled**.
+
+![Set AllowCortana to disabled through Group Policy](images/allowcortana_gp.png)
+
+### Provisioning tools
+- [Set up School PCs](use-set-up-school-pcs-app.md) always sets this policy in provisioning packages it creates.
+- [Windows Configuration Designer](https://technet.microsoft.com/en-us/itpro/windows/configure/provisioning-create-package) 
+    - Under **Runtime settings**, click the **Policies** settings group, set **Experience > Cortana** to **No**.
+
+        ![Set AllowCortana to No in Windows Configuration Designer](images/allowcortana_wcd.png)
+
+## SetEduPolicies
+**SetEduPolicies** is a policy that applies a set of configuration behaviors to Windows. It is a policy node in the [SharedPC configuration service provider](https://msdn.microsoft.com/en-us/windows/hardware/commercialize/customize/mdm/sharedpc-csp).
+
+Use one of these methods to set this policy. 
+
+### MDM
+- Intune for Education automatically sets this policy in the **All devices** group policy configuration.
+- 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/SharedPC/SetEduPolicies
+        - Data type:  Boolean
+        - Value:  true
+
+        ![Create an OMA URI for SetEduPolices](images/setedupolicies_omauri.png)
+
+### Group Policy
+**SetEduPolicies** is not natively supported in Group Policy. Instead, use the [MDM Bridge WMI Provider](https://msdn.microsoft.com/en-us/library/windows/desktop/dn905224(v=vs.85).aspx) to set the policy in [MDM SharedPC](https://msdn.microsoft.com/en-us/library/windows/desktop/mt779129(v=vs.85).aspx).
+
+### Provisioning tools
+- [Set up School PCs](use-set-up-school-pcs-app.md) always sets this policy in provisioning packages it creates.
+- [Windows Configuration Designer](https://technet.microsoft.com/en-us/itpro/windows/configure/provisioning-create-package) 
+    - Under **Runtime settings**, click the **SharedPC** settings group, set **PolicyCustomization > SetEduPolicies** to **True**.
+
+        ![Set SetEduPolicies to True in Windows Configuration Designer](images/setedupolicies_wcd.png)
+
+## Ad-free search with Bing
+Provide an ad-free experience that is a safer, more private search option for K–12 education institutions in the United States. Additional information is available at http://www.bing.com/classroom/about-us.
+
+> [!NOTE]  
+> If you enable the guest account in shared PC mode, students using the guest account will not have an ad-free experience searching with Bing in Microsoft Edge unless the PC is connected to your school network and your school network has been configured as described in [IP registration for entire school network using Microsoft Edge](#ip-registration-for-entire-school-network-using-microsoft-edge).
+
+### Configurations
+
+#### IP registration for entire school network using Microsoft Edge
+Ad-free searching with Bing in Microsoft Edge can be configured at the network level. To configure this, email bicteam@microsoft.com with the subject "New Windows 10, version 1703 (Creators Update) Registration: [School District Name]" and the include the following information in the body of the email.
+
+**District information**
+- **District or School Name:**
+- **Outbound IP Addresses (IP Range + CIDR):**
+- **Address:**
+- **City:**
+- **State Abbreviation:**
+- **Zip Code:**
+
+**Registrant information**
+- **First Name:**
+- **Last Name:**
+- **Job Title:**
+- **Email Address:**
+- **Opt-In for Email Announcements?:**
+- **Phone Number:**
+
+This will suppress ads when searching with Bing on Microsoft Edge when the PC is connected to the school network. 
+
+#### Azure AD and Office 365 Education tenant
+To suppress ads when searching with Bing on Microsoft Edge on any network, follow these steps:
+
+1. Ensure your Office 365 tenant is registered as an education tenant. For more information, see [Verify your Office 365 domain to prove education status](https://support.office.com/article/Verify-your-Office-365-domain-to-prove-ownership-nonprofit-or-education-status-or-to-activate-Yammer-87d1844e-aa47-4dc0-a61b-1b773fd4e590).
+2. Domain join the Windows 10 PCs to your Azure AD tenant (this is the same as your Office 365 tenant).
+3. Configure **SetEduPolicies** according to one of the methods described in the previous sections in this topic.
+4. Have students sign in with their Azure AD identity, which is the same as your Office 365 identity, to use the PC.
+
+#### Office 365 sign-in to Bing
+To suppress ads only when the student signs into Bing with their Office 365 account in Microsoft Edge, follow these steps:
+
+1. Configure **SetEduPolicies** according to one of the methods described in the previous sections in this topic.
+2. Have students sign into Bing with their Office 365 account.
+
+### More information
+For more information on all the possible Bing configuration methods, see https://aka.ms/e4ahor. 
+
+## Related topics
+[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)

education/windows/deploy-windows-10-in-a-school-district.md

@@ -6,6 +6,7 @@ ms.prod: w10
 ms.mktglfcycl: plan
 ms.pagetype: edu
 ms.sitesec: library
+localizationpriority: high
 author: craigash
 ---
 

education/windows/deploy-windows-10-in-a-school.md

@@ -6,6 +6,7 @@ ms.prod: w10
 ms.mktglfcycl: plan
 ms.pagetype: edu
 ms.sitesec: library
+localizationpriority: high
 author: craigash
 ---
 

education/windows/edu-deployment-recommendations.md

@@ -4,6 +4,7 @@ description: Provides guidance on ways to customize the OS privacy settings, as
 keywords: ["Windows 10 deployment", "recommendations", "privacy settings", "school"]
 ms.mktglfcycl: plan
 ms.sitesec: library
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -15,7 +16,7 @@ author: CelesteDG
 
 Your privacy is important to us, so we want to provide you with ways to customize the OS privacy settings, as well as some of the apps, so that you can choose what information is shared with Microsoft. To learn more about Microsoft’s commitment to privacy, see [Windows 10 and privacy](https://go.microsoft.com/fwlink/?LinkId=809305).
 
-Here are some best practices and specific privacy settings we’d like you to be aware of.
+Here are some best practices and specific privacy settings we’d like you to be aware of. Also see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md) for more information about ways to customize the OS diagnostic data, consumer experiences, Cortana, and search.
 
 ## Deployment best practices
 
@@ -41,11 +42,11 @@ To change the setting, you can:
 To turn off access to contacts for all apps on individual Windows devices:
 1. On the computer, go to **Settings** and select **Privacy**.
 
-   ![Privacy settings](images/settings-privacy-marked.png)
+   ![Privacy settings](images/win10_settings_privacy.png)
 
 2. Under the list of **Privacy** areas, select **Contacts**.
 
-   ![Contacts privacy settings](images/privacy-contacts-marked.png)
+   ![Contacts privacy settings](images/win10_settings_privacy_contacts.png)
 
 3. Turn off **Let apps access my contacts**.
 
@@ -56,7 +57,7 @@ For IT-managed Windows devices, you can use a Group Policy to turn off the setti
 ### Choose the apps that you want to allow access to contacts
 If you want to allow only certain apps to have access to contacts, you can use the switch for each app to specify which ones you want on or off.
 
-![Choose apps with access to contacts](images/settings-contacts-app-marked.png)
+![Choose apps with access to contacts](images/win10_settings_privacy_contacts_apps.png)
 
 The list of apps on the Windows-based device may vary from the above example. The list depends on what apps you have installed and which of these apps access contacts.
 
@@ -64,11 +65,11 @@ To allow only certain apps to have access to contacts, you can:
 * Configure each app individually using the **Settings** > **Contacts** option in the Windows UI
 * Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **App Privacy** > **Let Windows apps access contacts** and then specify the default for each app by adding the app's Package Family Name under the default behavior you want to enforce.
 
-   ![App privacy Group Policy](images/app-privacy-group-policy.png)
+   ![App privacy Group Policy](images/gp_letwinappsaccesscontacts.png)
 
 ## Skype and Xbox settings
 
-Skype Preview (a Universal Windows Platform [UWP] preview app) and Xbox are preinstalled as part of Windows 10.
+Skype (a Universal Windows Platform [UWP]) and Xbox are preinstalled as part of Windows 10.
 
 The Skype app replaces the integration of Skype features into Skype video and Messaging apps on Windows PCs and large tablets. The Skype app provides all these features in one place and lets users have a single place to manage both their chat and voice conversations so they can take better advantage of their screen. For information about the new Skype UWP app preview, see this [FAQ](https://go.microsoft.com/fwlink/?LinkId=821441).
 
@@ -85,21 +86,24 @@ If the school allows the use of personal or Microsoft account in addition to org
 Skype uses the user’s contact details to deliver important information about the account and it also lets friends find each other on Skype.
 
 To manage and edit your profile in the Skype UWP app, follow these steps:
-1.	In the Skype UWP app, select the user profile icon  ![Skype profile icon](images/skype-profile-icon.png)  to go to the user’s profile page.
-2.	In the **Accounts** section, select **Manage** for the Skype account that you want to change. This will take you to the online Skype portal.
-3.	In the online Skype portal, scroll down to the Account details section. In Settings and preferences, select Edit profile.
-The profile page includes these sections:
-	 * Profile completeness
-   * Personal information
-   * Contact details
-4. Review the information in each section and click **Edit** to change the information being shared.
-5.	If you do not wish your name to be included, replace the fields with **XXX**.
-6.	To change your profile picture, simply click on the current profile picture or avatar. The **Manage Profile Picture** window pops up.
+1.	In the Skype UWP app, select the user profile icon ![Skype profile icon](images/skype_uwp_userprofile_icon.png)  to go to the user’s profile page.
+2.	In the account page, select **Manage account** for the Skype account that you want to change. This will take you to the online Skype portal.
+3.	In the online Skype portal, scroll down to the **Account details** section. In **Settings and preferences**, click **Edit profile**.
 
-   ![Skype profile icon](images/skype-manage-profile-pic.png)
+    The profile page includes these sections:
+
+        * Personal information
+        * Contact details
+        * Profile settings
+
+4. Review the information in each section and click **Edit profile** in either or both the **Personal information** and **Contact details** sections to change the information being shared. You can also remove the checks in the **Profile settings** section to change settings on discoverability, notifications, and staying in touch.
+5.	If you do not wish the name to be included, edit the fields and replace the fields with **XXX**.
+6.	To change the profile picture, go to the Skype app and click on the current profile picture or avatar. The **Manage Profile Picture** window pops up.
+
+   ![Skype profile icon](images/skype_uwp_manageprofilepic.png)
 
    * To take a new picture, click the camera icon in the pop up window. To upload a new picture, click the three dots (**...**).
-   * You can also change the visibility of your profile picture between public (everyone) or your contacts only. To change the profile picture visibility, select the dropdown under **Profile picture** and choose between **Show to everyone** or **Show to contacts only**.
+   * You can also change the visibility of the profile picture between public (everyone) or for contacts only. To change the profile picture visibility, select the dropdown under **Profile picture** and choose between **Show to everyone** or **Show to contacts only**.
 
 #### Xbox
 A user’s Xbox friends and their friends’ friends can see their real name and profile. By default, the Xbox privacy settings enforce that no personal identifying information of a minor is shared on the Xbox Live network, although adults in the child’s family can change these default settings to allow it to be more permissive.

education/windows/education-scenarios-store-for-business.md

@@ -1,10 +1,11 @@
 ---
 title: Education scenarios Windows Store for Business
 description: Learn how IT admins and teachers can use Windows Store for Business to acquire and manage apps in schools.
-keywords: ["school"]
+keywords: ["school", "store for business"]
 ms.prod: W10
 ms.mktglfcycl: plan
 ms.sitesec: library
+localizationpriority: high
 author: trudyha
 ---
 

education/windows/get-minecraft-for-education.md

@@ -1,10 +1,11 @@
 ---
 title: Get Minecraft Education Edition
 description: Learn how to get and distribute Minecraft Education Edition.
-keywords: school
+keywords: school, minecraft
 ms.prod: W10
 ms.mktglfcycl: plan
 ms.sitesec: library
+localizationpriority: high
 author: trudyha
 ---
 

education/windows/index.md

@@ -19,12 +19,9 @@ author: CelesteDG
 
 ### ![Learn more about Windows](images/education.png) Learn
 
-<div class="side-by-side"> <div class="side-by-side-content">
-<div class="side-by-side-content-left">
 <p><b>[Windows 10 editions for education customers](windows-editions-for-education-customers.md)</b><br />Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.</p>
 <p><b>[Compare each Windows edition](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)</b><br />Find out more about the features and functionality we support in each edition of Windows.</p>
-<p><b>[Get Windows 10 Education or Windows 10 Pro Education](https://www.microsoft.com/en-us/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools)</b><br />When you've made your decision, find out how to buy Windows for your school.</p></div>
-<div class="side-by-side-content-right">
+<p><b>[Get Windows 10 Education or Windows 10 Pro Education](https://www.microsoft.com/en-us/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools)</b><br />When you've made your decision, find out how to buy Windows for your school.</p>
 <p><b>How-to videos</b><br />
 <ul>
   <li><a href="https://technet.microsoft.com/en-us/windows/mt723345" target="_blank">Automate common Windows 10 deployment and configuration tasks</a></li>
@@ -33,57 +30,38 @@ author: CelesteDG
   <li><a href="https://technet.microsoft.com/en-us/windows/mt723344" target="_blank">Reprovision devices at the end of the school year</a></li>  <li><a href="https://technet.microsoft.com/en-us/windows/mt723343" target="_blank">Use MDT to deploy Windows 10</a></li>
   <li><a href="https://technet.microsoft.com/en-us/windows/mt723348" target="_blank">Use Windows Store for Business</a></li>
 </ul>
-</div>
- </div></div>
+</p>
 
 ### ![Plan for Windows 10 in your school](images/clipboard.png) Plan
 
-<div class="side-by-side"> <div class="side-by-side-content">
-<div class="side-by-side-content-left"><p>
-<b>[Provisioning options for Windows 10](set-up-windows-10.md)</b><br />Depending on your school's device management needs, you can use **Set up School PCs** or the *Provision school devices* option in **Windows Imaging and Configuration Designer** to quickly set up student PCs.</p><p>
+<p><b>[Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)</b><br />Provides guidance on ways to customize the OS diagnostic data, consumer experiences, Cortana, search, as well as some of the preinstalled apps, so that Windows is ready for your school.</p>
+<p><b>[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)</b><br />Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft.</p>
 <b>[Get Minecraft Education Edition](get-minecraft-for-education.md)</b><br />Minecraft Education Edition is built for learning. Learn how to get early access and add it to your Microsoft Store for Business for distribution.</p></div>
 <div class="side-by-side-content-right"><p><b>[Take tests in Windows 10](take-tests-in-windows-10.md)</b><br />Take a Test is a new app that lets you create the right environment for taking tests. Learn how to use and get it set up.</p>
-<p><b>[Chromebook migration guide](chromebook-migration-guide.md)</b><br />Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.</p></div>
- </div></div>
+<p><b>[Chromebook migration guide](chromebook-migration-guide.md)</b><br />Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.</p>
 
- ### ![Deploy Windows 10 for education](images/PCicon.png) Deploy
+### ![Deploy Windows 10 for education](images/PCicon.png) Deploy
 
- <div class="side-by-side"> <div class="side-by-side-content">
- <div class="side-by-side-content-left">
- <p><b>[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)</b><br />Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft.</p>
- <p><b>[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)</b><br />Get step-by-step guidance to help you deploy Windows 10 in a school environment.</p>
- <p><b>[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)</b><br />Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.</p>
- </div>
- <div class="side-by-side-content-right">
+<p><b>[Set up Windows devices for education](set-up-windows-10.md)</b><br />Depending on your school's device management needs, you can use the Set up School PCs app or the Windows Configuration Designer tool to quickly set up student PCs.</p><p>
+<p><b>[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)</b><br />Get step-by-step guidance to help you deploy Windows 10 in a school environment.</p>
+<p><b>[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)</b><br />Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.</p>
 <p><b><a href="https://technet.microsoft.com/en-us/windows/mt574244" target="_blank">Try it out: Windows 10 deployment (for education)</a></b><br />Learn how to upgrade devices running the Windows 7 operating system to Windows 10 Anniversary Update, and how to manage devices, apps, and users in Windows 10 Anniversary Update.<br /><br />For the best experience, use this guide in tandem with the <a href="https://vlabs.holsystems.com/vlabs/technet?eng=VLabs&auth=none&src=vlabs&altadd=true&labid=20949&lod=true" target="_blank">TechNet Virtual Lab: IT Pro Try-It-Out</a>.</p>
-</div>
- </div></div>
 
 ### ![Upgrade to Windows 10 for education](images/windows.png) Upgrade
 
- <div class="side-by-side"> <div class="side-by-side-content">
- <div class="side-by-side-content-left"><p><b>[Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)</b><br />If you have an education tenant and use Windows 10 Pro in your schools now, find out how you can opt-in to a free upgrade to Windows 10 Pro Education.</p></div>
-
- <div class="side-by-side-content-right"><p></p>
- </div>
- </div></div>
+<p><b>[Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)</b><br />If you have an education tenant and use Windows 10 Pro in your schools now, find out how you can opt-in to a free upgrade to Windows 10 Pro Education.</p></div>
 
 ## Windows 8.1
 Follow these links to find step-by-step guidance on how to deploy Windows 8.1 in an academic environment.
 
-<div class="side-by-side"> <div class="side-by-side-content">
-<div class="side-by-side-content-left">
 <p><b><a href="https://technet.microsoft.com/library/dn645509.aspx" target="_blank">Windows 8.1 deployment planning</a></b><br />Explore key considerations and questions that should be answered when planning for Windows 8.1 deployment.</p>
 <p><b><a href="https://technet.microsoft.com/library/dn645528.aspx" target="_blank">Windows 8.1 deployment to PCs</a></b><br />Get an overview of Windows 8.1 deployment to PCs in an educational environment.</p>
 <p><b><a href="https://technet.microsoft.com/library/dn645510.aspx" target="_blank">BYOD</a></b><br />Explore Bring Your Own Device (BYOD) considerations, including device types, infrastructure, and deployment models.</p>
 <p><b><a href="https://technet.microsoft.com/library/dn645488.aspx" target="_blank">Deploying Windows RT 8.1</a></b><br />Get step-by-step instructions on how to configure and deploy Windows RT devices (like Surface and other tablets) in educational environments.</p>
-</div>
-<div class="side-by-side-content-right">
 <p><b><a href="https://technet.microsoft.com/library/dn645483.aspx" target="_blank">Virtual Desktop Infrastructure</a></b><br />Learn how to address challenges related to BYOD scenarios using Virtual Desktop Infrastructure (VDI).</p>
 <p><b><a href="https://technet.microsoft.com/library/dn645532.aspx" target="_blank">Windows Store apps</a></b><br />Explore Windows Store app deployment strategies and considerations for educational institutions running Windows 8.1.</p>
 <p><b><a href="https://technet.microsoft.com/library/dn645486.aspx" target="_blank">Windows To Go</a></b><br />Learn about the benefits, limitations, and processes involved in deploying Windows To Go.</p>
-</div>
-</div></div>
+
 
 ## Related topics
 

education/windows/school-get-minecraft.md

@@ -5,6 +5,7 @@ keywords: ["school"]
 ms.prod: W10
 ms.mktglfcycl: plan
 ms.sitesec: library
+localizationpriority: high
 author: trudyha
 ---
 

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

@@ -1,11 +1,12 @@
 ---
 title: Set up School PCs app technical reference
 description: Describes the changes that the Set up School PCs app makes to a PC.
-keywords: shared cart, shared PC, school
+keywords: shared cart, shared PC, school, set up school pcs
 ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -16,51 +17,94 @@ author: CelesteDG
 
 
 
-The **Set up School PCs** app helps you set up new Windows 10 PCs that work great in your school by configuring shared PC mode, available in Windows 10, version 1607.  **Set up School PCs** also configures school-specific settings and policies, described in this topic.
+The **Set up School PCs** app helps you set up new Windows 10 PCs that work great in your school by configuring shared PC mode. The latest Set up School PCs app is available for Windows 10, version 1703 (Creators Update). Set up School PCs also configures school-specific settings and policies, described in this topic.
 
-If your school uses Azure Active Directory (Azure AD) or Office 365, the **Set up School PCs** app will create a setup file that connects the computer to your subscription.  You can also use the app to set up school PCs that anyone can use, with or without Internet connectivity. 
+If your school uses Azure Active Directory (Azure AD) or Office 365, the Set up School PCs app will create a setup file that joins the PC to your Azure Active Directory tenant. You can also use the app to set up school PCs that anyone can use, with or without Internet connectivity. 
 
-The following table tells you what you get using the **Set up School PCs** app in your school. 
+Here's a list of what you get when using the Set up School PCs app in your school. 
 
 | Feature | No Internet | Azure AD | Office 365 | Azure AD Premium |
 | --- | :---: | :---: | :---: | :---: |
 | **Fast sign-in**<br/>Each student can sign in and start using the computer in less than a minute, even on their first sign-in. | X | X | X | X |
 | **Custom Start experience**<br/>The apps students need are pinned to Start, and unnecessary apps are removed. | X | X | X | X |
-| **Temporary access, no sign-in required**<br/>This option sets up computers for common use. Anyone can use the computer without an account. | X | X | X | X |
+| **Guest account, no sign-in required**<br/>This option sets up computers for common use. Anyone can use the computer without an account. | X | X | X | X |
 | **School policies**<br/>Settings specific to education create a useful learning environment and the best computer performance. | X | X | X | X |
 | **Azure AD Join**<br/>The computers are  joined to your Azure AD or Office 365 subscription for centralized management. |   | X | X | X |
-| **Single sign-on to Office 365**<br/>By signing on with student IDs, students have fast access to Office 365 web apps. |   |    | X | X |
+| **Single sign-on to Office 365**<br/>By signing on with student IDs, students have fast access to Office 365 web apps or installed Office apps. |   |    | X | X |
+| **Take a Test**<br/>Configure the Take a Test app and use it for taking quizzes and high-stakes assessments by some providers like Smarter Balanced. |   |    |  | X |
 | **[Settings roaming](https://azure.microsoft.com/en-us/documentation/articles/active-directory-windows-enterprise-state-roaming-overview/) via Azure AD**<br/>Student user and application settings data can be synchronized across devices for a personalized experience. |   |    |    | X |
-|   |    |    |   |   |
 
 
-> **Note**: If your school uses Active Directory, use Windows Imaging and Configuration Designer to configure your PCs to join the domain. You can only use the **Set up School PCs** app to set up PCs that are not connected to your traditional domain.
+> [!NOTE]  
+> If your school uses Active Directory, use [Windows Configuration Designer](set-up-students-pcs-to-join-domain.md) to configure your PCs to join the domain. You can only use the Set up School PCs app to set up PCs that are connected to Azure AD.
 
-## Prerequisites for IT
+## Automated Azure AD join
+One of the most important features in Set up School PCs is the ability to create a provisioning package that performs automated Azure AD join. With this feature, you no longer have to spend minutes going through Windows setup, manually connecting to a network, and manually joining your Azure AD domain. With the automated Azure AD join feature in Set up School School PCs, this process is reduced to zero clicks! You can skip all of the Windows setup experience and the OS automatically joins the PC to your Azure AD domain and enrolls it into MDM if you have a MDM provider activated.
 
-* If your school uses Azure AD, [configure your directory to allow devices to join](https://azure.microsoft.com/en-us/documentation/articles/active-directory-azureadjoin-setup/).  If the teacher is going to set up a lot of devices, give the teacher appropriate privileges for joining devices or make a special account.
-* Office 365, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/en-us/academic/office-365-education-plan)
-* If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](https://msdn.microsoft.com/en-us/library/windows/hardware/mt703369%28v=vs.85%29.aspx)
-* After you set up your Office 365 Education tenant, use [Microsoft School Data Sync Preview](https://sis.microsoft.com/) to sync user profiles and class rosters from your Student Information System (SIS).
+To make this as seamless as possible, in your Azure AD tenant:
+- Allow your teacher and other IT staff to join devices to Azure AD so they can sucessfully request an automated Azure AD join token. 
+
+    In the Azure portal, select **Azure Active Directory**. Go to **Users and groups > Device Settings** and in **Users may join devices to Azure AD**, click **Selected** and choose the members you want to enable to join devices to Azure AD.
+
+    **Figure 1** - Select the users you want to enable to join devices to Azure AD
+
+    ![Select the users you want to enable to join devices to Azure AD](images/azuread_usersandgroups_devicesettings_usersmayjoin.png)
+
+- Consider creating a special account that uses a username and password that you provide, and which has the rights to join devices if you don't want to add all teachers and IT staff.
+    - When teachers or IT staff need to set up PCs, they can use this account in the Set up School PCs app.
+    - If you use a service to set up PCs for you, you can give them this special account so they can deliver PCs to you that are already Azure AD joined and ready to be given to a student.
+
+- Turn off multifactor authentication.
+
+    In the Azure portal, select **Azure Active Directory**. Go to **Users and groups > Device Settings** and set **Require Multi-Factor Auth to join devices** to **No**.
+
+    **Figure 2** - Turn off multi-factor authentication in Azure AD
+
+    ![Turn off multi-factor authentication in Azure AD](images/azuread_usersandgroups_devicesettings_requiremultifactorauth.png)
+
+- Set the maximum number of devices a user can add to unlimited.
+
+    In the Azure portal, select **Azure Active Directory**. Go to **Users and groups > Device Settings** and set **Maximum number of devices per user** to **Unlimited**.
+
+    **Figure 3** - Set maximum number of devices per user to unlimited
+
+    ![Set maximum number of devices per user to unlimited](images/azuread_usersandgroups_devicesettings_maxnumberofdevicesperuser.png)
+
+- Clear your Azure AD tokens from time to time. Your tenant can only have 50 automated Azure AD tokens active at any one time.
+
+    In the Azure portal, select **Azure Active Directory**. Go to **Users and groups > All users** and look at the list of user names. User names that start with **package_** followed by a string of letters and numbers. These are the user accounts that are created automatically for the tokens and you can safely delete these. 
+
+    **Figure 4** - Delete the accounts automatically created for the Azure AD tokens
+
+    ![Delete the accounts automatically created for the Azure AD tokens](images/azuread_usersandgroups_allusers_automaticaccounts.png)
+
+- Note that automated Azure AD tokens have expiration dates. Set up School PCs creates them with an expiration date of one month. You will see the specific expiration date for the package in the **Review package summary** page in Set up School PCs.
+
+    **Figure 5** - Sample summary page showing the expiration date
+
+    ![Sample summary page showing the expiration date](images/suspc_choosesettings_summary.png)
+
+
+<!-- When the MSES Get Started goes live, add a link to it from here -->
 
 
 ## Information about Windows Update
 
-Shared PC mode helps ensure that computers are always up-to-date. If a PC is configured using the **Set up School PCs** app, shared PC mode sets the power states and Windows Update to: 
+Shared PC mode helps ensure that computers are always up-to-date. If a PC is configured using the Set up School PCs app, shared PC mode sets the power states and Windows Update to: 
 * Wake nightly
 * Check and install updates
 * Forcibly reboot if necessary to finish applying updates
 
-The PC is also configured to not interrupt the user during normal daytime hours with updates or reboots.
+The PC is also configured to not interrupt the user during normal daytime hours with updates or reboots. Notfications are also blocked.
 
 ## Guidance for accounts on shared PCs
 
 * We recommend no local admin accounts on the PC to improve the reliability and security of the PC.
-* When a PC is set up in shared PC mode, accounts will be cached automatically until disk space is low. Then, accounts will be deleted to reclaim disk space. This account managment happens automatically. Both Azure AD and Active Directory domain accounts are managed in this way. Any accounts created through **Start without an account** will also be deleted automatically at sign out.
+* When a PC is set up in shared PC mode with the default deletion policy, accounts will be cached automatically until disk space is low. Then, accounts will be deleted to reclaim disk space. This account management happens automatically. Both Azure AD and Active Directory domain accounts are managed in this way. Any accounts created through **Guest** or **Kiosk** will also be deleted automatically at sign out.
 * On a Windows PC joined to Azure Active Directory:
     * By default, the account that joined the PC to Azure AD will have an admin account on that PC. Global administrators for the Azure AD domain will also have admin accounts on the PC.
     * With Azure AD Premium, you can specify which accounts have admin accounts on a PC using the **Additional administrators on Azure AD Joined devices** setting on the Azure portal.
-* Local accounts that already exist on a PC won’t be deleted when turning on shared PC mode. However, any new local accounts created by the **Start without an account** selection on the sign-in screen (if enabled) will automatically be deleted at sign-out.
+* Local accounts that already exist on a PC won’t be deleted when turning on shared PC mode. New local accounts created through **Settings > Accounts > Other people > Add someone else to this PC** after shared PC mode is turned on won't be deleted. However, any new local accounts created by the **Guest** or **Kiosk** selection on the sign-in screen, if enabled, will automatically be deleted at sign-out.
 * If admin accounts are necessary on the PC
     * Ensure the PC is joined to a domain that enables accounts to be signed on as admin, or
     * Create admin accounts before setting up shared PC mode, or 
@@ -68,6 +112,7 @@ The PC is also configured to not interrupt the user during normal daytime hours
 * The account management service supports accounts that are exempt from deletion.
     * An account can be marked exempt from deletion by adding the account SID to the `HKEY_LOCAL_MACHINE\SOFTARE\Microsoft\Windows\CurrentVersion\SharedPC\Exemptions\` registry key.
     * To add the account SID to the registry key using PowerShell:
+
         ```
         $adminName = "LocalAdmin"
         $adminPass = 'Pa$$word123'
@@ -78,24 +123,22 @@ The PC is also configured to not interrupt the user during normal daytime hours
         New-Item -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\SharedPC\Exemptions\$sid" -Force
         ``` 
 
-
 ## Custom images
-Shared PC mode is fully compatible with custom images that may be created by IT departments. Create a custom image and then use sysprep with the `/oobe` flag to create an image that teachers can then apply the **Set up School PCs** provisioning package to. [Learn more about sysprep](https://technet.microsoft.com/en-us/library/cc721940(v=ws.10).aspx).
+Shared PC mode is fully compatible with custom images that may be created by IT departments. Create a custom image and then use sysprep with the `/oobe` flag to create an image that teachers can then apply the Set up School PCs provisioning package to. [Learn more about sysprep](https://technet.microsoft.com/en-us/library/cc721940(v=ws.10).aspx).
 
 ## Provisioning package details
 
-The **Set up School PCs** app produces a specialized provisioning package that makes use of the [SharedPC configuration service provider (CSP)](https://msdn.microsoft.com/en-us/library/windows/hardware/mt723294%28v=vs.85%29.aspx). 
+The Set up School PCs app produces a specialized provisioning package that makes use of the [SharedPC configuration service provider (CSP)](https://msdn.microsoft.com/en-us/library/windows/hardware/mt723294%28v=vs.85%29.aspx). 
 
-### Education customizations
+### Education customizations set by local MDM policy
 
-- Saving content locally to the PC is disabled. This prevents data loss by forcing students to save to the cloud.
-- A custom Start layout and sign in background image are set.
+- By default, saving content locally to the PC is blocked, but you can choose to enable it. This prevents data loss by forcing students to save to the cloud.
+- A custom Start layout, taskbar layout, and lock screen image are set.
 - Prohibits unlocking the PC to developer mode.
 - Prohibits untrusted Windows Store apps from being installed.
 - Prohibits students from removing MDM.
 - Prohibits students from adding new provisioning packages.
-- Prohibits student from removing existing provisioning packages (including the one set by **Set up School PCs**).
-- Sets active hours from 6 AM to 6 PM.
+- Prohibits student from removing existing provisioning packages (including the one set by Set up School PCs).
 - Sets Windows Update to update nightly.
 
 
@@ -103,19 +146,18 @@ The **Set up School PCs** app produces a specialized provisioning package that m
 
 - 3D Builder (Microsoft.3DBuilder_8wekyb3d8bbwe)
 - Weather (Microsoft.BingWeather_8wekyb3d8bbwe)
-- Get Started (Microsoft.Getstarted_8wekyb3d8bbwe)
+- Tips (Microsoft.Getstarted_8wekyb3d8bbwe)
 - Get Office (Microsoft.MicrosoftOfficeHub_8wekyb3d8bbwe)
 - Microsoft Solitaire Collection (Microsoft.MicrosoftSolitaireCollection_8wekyb3d8bbwe)
 - Paid Wi-Fi & Cellular (Microsoft.OneConnect_8wekyb3d8bbwe)
 - Feedback Hub (Microsoft.WindowsFeedbackHub_8wekyb3d8bbwe)
 - Xbox (Microsoft.XboxApp_8wekyb3d8bbwe)
-- Groove Music (Microsoft.ZuneMusic_8wekyb3d8bbwe)
-- Movies & TV (Microsoft.ZuneVideo_8wekyb3d8bbwe)
 - Mail/Calendar (microsoft.windowscommunicationsapps_8wekyb3d8bbwe)
 
 ### Local Group Policies
 
-> **Important**: It is not recommended to set additional policies on PCs configured with the **Set up School PCs** app.	The shared PC mode has been optimized to be fast and reliable over time with minimal to no manual maintenance required.
+> [!IMPORTANT]  
+> We do not recommend setting additional policies on PCs configured with the Set up School PCs app. The shared PC mode is optimized to be fast and reliable over time with minimal to no manual maintenance required.
 
 <table border="1"> 
 <thead><tr><th colspan="2"><p>Policy path</p></th></tr>
@@ -171,6 +213,9 @@ The **Set up School PCs** app produces a specialized provisioning package that m
 </tr>
  <tr> <td> <p> Turn off the display (on battery </p> </td> <td> <p> 1 hour</p> </td>
 </tr> 
+<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>><strong>System</strong>><strong>Power Management</strong>><strong>Energy Saver Settings</strong></p> </td> </tr> 
+<tr> <td> <p> Energy Saver Battery Threshold (on battery) </p> </td> <td> <p> 70</p> </td> 
+</tr>
 <tr> <td colspan="2"> <p> <strong>Admin Templates</strong>><strong>System</strong>><strong>Logon</strong></p> </td> 
 </tr> 
 <tr> <td> <p> Show first sign-in animation </p> </td> <td> <p> Disabled</p> </td>
@@ -212,36 +257,32 @@ The **Set up School PCs** app produces a specialized provisioning package that m
 </tr> 
 <tr> <td> <p> Do not show feedback notifications </p> </td> <td> <p> Enabled</p> </td> 
 </tr> 
+<tr> <td> <p> Allow Telemetry </p> </td> <td> <p> Basic, 0</p> </td> 
+</tr> 
 <tr> <td colspan="2"> <p> <strong>Admin Templates</strong> > <strong>Windows Components</strong> > <strong>File Explorer</strong></p> </td> 
 </tr> 
 <tr> <td> <p> Show lock in the user tile menu </p> </td> <td> <p> Disabled</p> </td>
 </tr> 
 <tr> <td colspan="2"> <p> <strong>Admin Templates</strong> > <strong>Windows Components</strong> > <strong>Maintenance Scheduler</strong></p> </td> 
 </tr> 
-<tr> <td> <p> Automatic Maintenance Activation Boundary </p> </td> <td> <p> 12am</p> </td>
+<tr> <td> <p> Automatic Maintenance Activation Boundary </p> </td> <td> <p> *MaintenanceStartTime*</p> </td>
 </tr> 
 <tr> <td> <p> Automatic Maintenance Random Delay </p> </td> <td> <p> Enabled, 2 hours</p> </td> 
 </tr> 
 <tr> <td> <p> Automatic Maintenance WakeUp Policy </p> </td> <td> <p> Enabled</p> </td> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong> > <strong>Windows Components</strong> > <strong>Microsoft Edge</strong></p> </td> 
-</tr> 
-<tr> <td> <p> Open a new tab with an empty tab </p> </td> <td> <p> Disabled</p> </td> 
-</tr> 
-<tr> <td> <p> Configure corporate home pages </p> </td> <td> <p> Enabled, about:blank</p> </td> 
-</tr> 
 <tr> <td colspan="2"> <p> <strong>Admin Templates</strong> > <strong>Windows Components</strong> > <strong>OneDrive</strong></p> </td> 
 </tr> 
 <tr> <td> <p> Prevent the usage of OneDrive for file storage </p> </td> <td> <p> Enabled</p> </td>
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong> > <strong>Windows Components</strong> > <strong>Search</strong></p> </td> 
-</tr> 
-<tr> <td> <p> Allow Cortana </p> </td> <td> <p> Disabled</p> </td> 
-</tr> 
 <tr> <td colspan="2"> <p> <strong>Admin Templates</strong> > <strong>Windows Components</strong> > <strong>Windows Hello for Business</strong></p> </td> 
 </tr> 
+<tr> <td> <p> Use phone sign-in </p> </td> <td> <p> Disabled</p> </td>
+</tr> 
 <tr> <td> <p> Use Windows Hello for Business </p> </td> <td> <p> Disabled</p> </td>
 </tr> 
+<tr> <td> <p> Use biometrics </p> </td> <td> <p> Disabled</p> </td>
+</tr> 
 <tr> <td colspan="2"> <p> <strong>Windows Settings</strong> > <strong>Security Settings</strong> > <strong>Local Policies</strong> > <strong>Security Options</strong></p> </td> 
 </tr> 
 <tr><td><p>Accounts: Block Microsoft accounts</p><p>**Note** Microsoft accounts can still be used in apps.</p></td><td><p>Enabled</p></td></tr>
@@ -256,9 +297,13 @@ The **Set up School PCs** app produces a specialized provisioning package that m
 </tbody>
 </table> </br>
 
+## Use the app
+When you're ready to use the app, see [Use Set up School PCs app](use-set-up-school-pcs-app.md). 
+
 ## Related topics
 
-[Use Set up School PCs app](use-set-up-school-pcs-app.md)
+[Set up Windows devices for education](set-up-windows-10.md)
+
 
 
 

education/windows/set-up-students-pcs-to-join-domain.md

@@ -1,10 +1,11 @@
 ---
 title: Set up student PCs to join domain
 description: Learn how to use Configuration Designer to easily provision student devices to join Active Directory.
-keywords: ["shared cart", "shared PC", "school"]
+keywords: school
 ms.prod: W10
 ms.mktglfcycl: plan
 ms.sitesec: library
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -13,81 +14,57 @@ author: CelesteDG
 
 -   Windows 10  
 
-If your school uses Active Directory, use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a runtime provisioning package that will configure a PC for student use that is joined to the Active Directory domain. [Install the ADK.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) 
+If your school uses Active Directory, use the Windows Configuration Designer tool to create a provisioning package that will configure a PC for student use that is joined to the Active Directory domain. 
+
+## Install Windows Configuration Designer
+Follow the instructions in [Install Windows Configuration Designer](https://technet.microsoft.com/itpro/windows/configure/provisioning-install-icd).
 
 ## Create the provisioning package
+Follow the steps in [Provision PCs with common settings for initial deployment (desktop wizard)](https://technet.microsoft.com/en-us/itpro/windows/configure/provision-pcs-for-initial-deployment). However, make a note of these steps to further customize the provisioning package for use in a school that will join a student PC to a domain:
 
-1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
+1. In the **Account Management** step:
 
-2. Click **Provision school devices**. 
+    > [!WARNING]  
+    > If you don't create a local administrator account and the device fails to enroll in Active Directory for any reason, you will have to reimage the device and start over. As a best practice, we recommend:
+    >   - Use a least-privileged domain account to join the device to the domain.
+    >   - Create a temporary administrator account to use for debugging or reprovisioning if the device fails to enroll successfully.
+    >   - [Use Group Policy to delete the temporary administrator account](https://blogs.technet.microsoft.com/canitpro/2014/12/10/group-policy-creating-a-standard-local-admin-account/) after the device is enrolled in Active Directory.
 
-  ![Provision school devices](images/icdstart-option.png)
+2. After you're done with the wizard, do not click **Create**. Instead, click the **Switch to advanced editor** to switch the project to the advanced editor to see all the available **Runtine settings**.
+3. Find the **SharedPC** settings group.
+    - Set **EnableSharedPCMode** to **TRUE** to configure the PC for shared use.
+4. (Optional) To configure the PC for secure testing, follow these steps.
+  1. Under **Runtime settings**, go to **AssignedAccess > AssignedAccessSettings**.
+  2. Enter **{"Account":"*redmond\\kioskuser*","AUMID":” Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App "}**, using the account that you want to set up.
 
-3. Name your project and click **Finish**. The screens for school provisioning will walk you through the following steps.
+    **Figure 7** - Add the account to use for test-taking
 
-   ![Wizard for school provisioning](images/icd-school.png)
+    ![Add the account to use for test-taking](images/wcd_settings_assignedaccess.png)
 
-4. In the **Set up device** step, enter a unique 15-character name for the device. For help generating a unique name, you can use %SERIAL%, which includes a hardware-specific serial number, or you can use %RAND:x%, which generates random characters of x length.
+    The account can be in one of the following formats:
+    - username
+    - domain\username
+    - computer name\\username
+    - username@tenant.com
 
-5. (Optional) You can upgrade the following editions of Windows 10 by providing a product key for the edition to upgrade to.
-    - Home to Education
-    - Pro to Education
-    - Pro to Enterprise
-    - Enterprise to Education
- 
-6. Click **Set up network**.
+  3. Under **Runtime settings**, go to **TakeATest** and configure the following settings:
+    1. In **LaunchURI**, enter the assessment URL.
+    2. In **TesterAccount**, enter the test account you entered in the previous step.
 
-7. Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, type, and (if required) password for the wireless network.
+5. To configure other settings to make Windows education ready, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md) and follow the guidance on what settings you can set using Windows Configuration Designer.
 
-8. Click **Enroll into Active Directory**.
+6. Follow the steps to [build a package](https://technet.microsoft.com/en-us/itpro/windows/configure/provisioning-create-package#build-package). 
+    - You will see the file path for your provisioning package. By default, this is set to %windir%\Users\*your_username*\Windows Imaging and Configuration Designer (WICD)\*Project name*). 
+    - Copy the provisioning package to a USB drive.
 
-9. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (Optional) Enter a user name and password to create a local administrator account.
+    > [!IMPORTANT]
+    > When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
 
-    > **Warning**: If you don't create a local administrator account and the device fails to enroll in Active Directory for any reason, you will have to reimage the device and start over. As a best practice, we recommend:
-      - Use a least-privileged domain account to join the device to the domain.
-      - Create a temporary administrator account to use for debugging or reprovisioning if the device fails to enroll successfully.
-      - [Use Group Policy to delete the temporary administrator account](https://blogs.technet.microsoft.com/canitpro/2014/12/10/group-policy-creating-a-standard-local-admin-account/) after the device is enrolled in Active Directory.
-
-10. Click **Set up school settings**.
-
-11. Toggle **Yes** or **No** to configure the PC for shared use. 
-
-12. (Optional) Toggle **Yes** or **No** to configure the PC for secure testing. If you select **Yes**, you must also enter the test account to be used and the URL for the test. If you don't configure the test account and URL in this provisioning package, you can do so after the PC is configured; for more information, see [Take tests in Windows 10](take-tests-in-windows-10.md).
-
-10. Click **Finish**.
-
-11. Review your settings in the summary. You can return to previous pages to change your selections. Then, under **Protect your package**, toggle **Yes** or **No** to encrypt the provisioning package. If you select **Yes**, enter a password. This password must be entered to apply the encrypted provisioning package.
-
-12. Click **Create**.
-
-13. You will see the file path for your provisioning package (by default, %windir%\Users\*your alias*\Windows Imaging and Configuration Designer (WICD)\*Project name*). Copy the provisioning package to a USB drive.
-
-> **Important**  When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
 
 ## Apply package
+Follow the steps in [Apply a provisioning package](https://technet.microsoft.com/en-us/itpro/windows/configure/provisioning-apply-package) to apply the package that you created.
 
 
-1. Start with a computer on the first-run setup screen. If the PC has gone past this screen, reset the PC to start over. To reset the PC, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
-
-    ![The first screen to set up a new PC](images/oobe.jpg)
-
-2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**.
-
-    ![Set up device?](images/setupmsg.jpg)
-
-3. The next screen asks you to select a provisioning source. Select **Removable Media** and tap **Next**.
-
-    ![Provision this device](images/prov.jpg)
-    
-4. Select the provisioning package (\*.ppkg) that you want to apply, and tap **Next**.
-
-    ![Choose a package](images/choose-package-icd.png)
-
-5. Select **Yes, add it**.
-
-    ![Do you trust this package?](images/trust-package.png)
-    
-When you see the progress ring, you can remove the USB drive.
 
     
 

education/windows/set-up-students-pcs-with-apps.md

@@ -5,6 +5,7 @@ keywords: ["shared cart", "shared PC", "school"]
 ms.prod: W10
 ms.mktglfcycl: plan
 ms.sitesec: library
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -14,16 +15,19 @@ author: CelesteDG
 -   Windows 10  
 
 
-This topic explains how to create and apply a provisioning package that contains apps to a device running all desktop editions of Windows 10 except Windows 10 Home. Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more.
+To create and apply a provisioning package that contains apps to a device running all desktop editions of Windows 10 except Windows 10 Home, follow the steps in [Provision PCs with apps](https://technet.microsoft.com/en-us/itpro/windows/configure/provision-pcs-with-apps).
+
+Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more.
 
 You can apply a provisioning package on a USB drive to off-the-shelf devices during setup, making it fast and easy to configure new devices. 
+- If you want to [provision a school PC to join a domain](set-up-students-pcs-to-join-domain.md) and add apps in the same provisioning package, follow the steps in [Provision PCs with apps](https://technet.microsoft.com/en-us/itpro/windows/configure/provision-pcs-with-apps). 
+- If you want to provision a school PC to join Azure AD, set up the PC using the steps in [Use Set up School PCs App](use-set-up-school-pcs-app.md). Set up School PCs now lets you add recommended apps from the Store so you can add these apps while you're creating your package through Set up School PCs. You can also follow the steps in [Provision PCs with apps](https://technet.microsoft.com/en-us/itpro/windows/configure/provision-pcs-with-apps) if you want to add apps to student PCs after initial setup with the Set up School PCs package.
 
-If you want to [provision a school PC to join a domain](set-up-students-pcs-to-join-domain.md) and add apps in the same provisioning package, follow the steps in [Add apps to a provisioning package](#add-apps-to-a-provisioning-package). If you want to provision a school PC to join Azure AD, set up the PC using the steps in [Use Set up School PCs App](use-set-up-school-pcs-app.md), and then follow the steps in [Create a provisioning package to add apps after initial setup](#create-a-provisioning-package-to-add-apps-after-initial-setup).
-
+<!--
 ## Add apps to a provisioning package
 
 1. Follow the steps to [create the provisioning package](set-up-students-pcs-to-join-domain.md#create-the-provisioning-package). 
-
+2. 
 2. On the **Finish** page, select **Switch to advanced editor**.
 
   ![Switch to advanced editor](images/icd-school-adv-edit.png)
@@ -64,7 +68,8 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
 
 3. Go to **Runtime settings** > **ProvisioningCommands** > **DeviceContext** > **CommandLine** and specify the command line that needs to be executed to install the app. This is a single command line (such as a script, executable, or msi) that triggers a silent install of your CommandFiles. Note that the install must execute silently (without displaying any UI). For MSI installers use, the msiexec /quiet option. 
 
-> **Note**: If you are installing more than one app, then use CommandLine to invoke the script or batch file that orchestrates installation of the files. For more information, see [Install a Win32 app using a provisioning package](https://msdn.microsoft.com/en-us/library/windows/hardware/mt703295%28v=vs.85%29.aspx). 
+> [!NOTE] 
+> If you are installing more than one app, then use CommandLine to invoke the script or batch file that orchestrates installation of the files. For more information, see [Install a Win32 app using a provisioning package](https://msdn.microsoft.com/en-us/library/windows/hardware/mt703295%28v=vs.85%29.aspx). 
 
 **Next steps**
 - (optional) [Add a universal app to your package](#add-a-universal-app-to-your-package)
@@ -93,7 +98,8 @@ Universal apps that you can distribute in the provisioning package can be line-o
 
 [Learn more about distributing offline apps from the Windows Store for Business.](https://technet.microsoft.com/itpro/windows/manage/distribute-offline-apps)
 
-> **Note:** Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
+> [!NOTE]  
+> Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
 
 **Next steps**
 - (optional) [Add a desktop app to your package](#add-a-desktop-app-to-your-package)
@@ -202,7 +208,7 @@ On a desktop computer, navigate to **Settings** &gt; **Accounts** &gt; **Work ac
 
 ![add a package option](images/package.png)
 
-
+-->
 
 ## Learn more