Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox

.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
 }
+

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.
     
@@ -956,6 +959,8 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         
         - **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/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).

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)
+## [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)
-### [Use the Set up School PCs app ](use-set-up-school-pcs-app.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|
+## RELEASE: Windows 10, version 1607 (Anniversary Update)
-| --- | --- |
-| [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
 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.
+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 **Accounts** section, select **Manage** for the Skype account that you want to change. This will take you to the online Skype portal.
+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, select Edit profile.
+3.	In the online Skype portal, scroll down to the **Account details** section. In **Settings and preferences**, click **Edit profile**.
-The profile page includes these sections:
+
-	 * Profile completeness
+    The profile page includes these sections:
+
         * Personal information
         * Contact details
-4. Review the information in each section and click **Edit** to change the information being shared.
+        * Profile settings
-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.
 
-   ![Skype profile icon](images/skype-manage-profile-pic.png)
+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>
+<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 class="side-by-side-content-right">
 <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>
+</p>
- </div></div>
 
 ### ![Plan for Windows 10 in your school](images/clipboard.png) Plan
 
-<div class="side-by-side"> <div class="side-by-side-content">
+<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>
-<div class="side-by-side-content-left"><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>[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>
 <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>
+<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>
 
- ### ![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">
+<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>
- <div class="side-by-side-content-left">
+<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>[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 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>[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><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">
+<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-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>
 
 ## 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.
+To make this as seamless as possible, in your Azure AD tenant:
-* 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)
+- Allow your teacher and other IT staff to join devices to Azure AD so they can sucessfully request an automated Azure AD join token. 
-* 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).
+    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.
+- 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 and sign in background image are set.
+- 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**).
+- 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.
 - 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.
+  3. Under **Runtime settings**, go to **TakeATest** and configure the following settings:
-    - Home to Education
+    1. In **LaunchURI**, enter the assessment URL.
-    - Pro to Education
+    2. In **TesterAccount**, enter the test account you entered in the previous step.
-    - Pro to Enterprise
-    - Enterprise to Education
 
-6. Click **Set up 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.
 
-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.
+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.
 
-8. Click **Enroll into Active Directory**.
+    > [!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.
 
-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.
-
-    > **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
 

education/windows/set-up-windows-10.md

@@ -1,28 +1,35 @@
 ---
-title: Provisioning options for Windows 10
+title: Set up Windows devices for education
 description: Decide which option for setting up Windows 10 is right for you.
-keywords: shared cart, shared PC, school
+keywords: school, Windows device setup, education device setup
 ms.prod: w10
-ms.mktglfcycl: plan
+ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
-# Provisioning options for Windows 10
+# Set up Windows devices for education
 **Applies to:**
 
 -   Windows 10 
 
-You have two tools to choose from to set up PCs for your classroom: **Set up School PCs** app and the **Provision school devices** option in Windows Imaging and Configuration Designer (ICD). Choose the tool that is appropriate for how your students will sign in (Active Directory, Azure Active Directory, or no account). The following diagram compares the tools.
+You have two tools to choose from to set up PCs for your classroom: 
+  * Set up School PCs 
+  * Windows Configuration Designer
   
-![Which tool to use to set up Windows 10](images/setup-options.png)
+Choose the tool that is appropriate for how your students will sign in (Active Directory, Azure Active Directory, or no account). 
+
+You can use the following diagram to compare the tools.
+
+![Which tool to use to set up Windows 10](images/suspc_wcd_featureslist.png)
 
 
 ## In this section
 
-- [Use the Set up School PCs app (Preview)](use-set-up-school-pcs-app.md)
+- [Use the Set up School PCs app](use-set-up-school-pcs-app.md)
-- [Technical reference for the Set up School PCs app (Preview)](set-up-school-pcs-technical.md)
+- [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.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)
 

education/windows/take-a-test-app-technical.md

@@ -1,11 +1,12 @@
 ---
 title: Take a Test app technical reference
 description: The policies and settings applied by the Take a Test app.
-keywords: shared cart, shared PC, school
+keywords: take a test, test taking, school
 ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -20,7 +21,7 @@ Take a Test is an app that locks down the PC and displays an online assessment w
 
 Whether you are a teacher or IT administrator, you can easily configure Take a Test to meet your testing needs. For high-stakes tests, the app creates a browser-based, locked-down environment for more secure online assessments. This means that students taking the tests that don’t have copy/paste privileges, can’t access to files and applications, and are free from distractions. For simple tests and quizzes, Take a Test can be configured to use the teacher’s preferred assessment website to deliver digital assessments
 
-Assessment vendors can use Take a Test as a platform to lock down the operating system. Take a Test supports the [SBAC browser API standard](http://www.smarterapp.org/documents/SecureBrowserRequirementsSpecifications_0-3.pdf) for high stakes common core testing. (Link to Javascript API when available)
+Assessment vendors can use Take a Test as a platform to lock down the operating system. Take a Test supports the [SBAC browser API standard](http://www.smarterapp.org/documents/SecureBrowserRequirementsSpecifications_0-3.pdf) for high stakes common core testing. For more information, see [Take a Test Javascript API](https://docs.microsoft.com/en-us/windows/uwp/apps-for-education/take-a-test-api).
 
 ## PC lockdown for assessment
 
@@ -28,17 +29,11 @@ Assessment vendors can use Take a Test as a platform to lock down the operating
 
 When running above the lock screen:
 - The app runs full screen with no chrome 
-
 - The hardware print screen button is disabled 
-
+- Depending on the parameter you set through the schema or dedicated account, content within the app will show up as black in screen capturing/sharing software 
-- Content within the app will show up as black in screen capturing/sharing software 
-
 - System clipboard is cleared 
-
 - Web apps can query the processes currently running in the user’s device
-
 - Extended display shows up as black 
-
 - Auto-fill is disabled
 
 ## Mobile device management (MDM) policies
@@ -59,9 +54,7 @@ When Take a Test is running, the following MDM policies are applied to lock down
 When Take a Test is running, the following functionality is available to students:
 
 - Assistive technology that is configured to run above the lock screen should run as expected 
-
 - Narrator is available through Windows key + Enter 
-
 - Magnifier is available through Windows key + "+" key 
 
     - Full screen mode is compatible  
@@ -70,14 +63,15 @@ When Take a Test is running, the following functionality is available to student
 
     - Take a Test 
     - Assistive technology that may be running 
-    - Lock Screen (not available if student is using a dedicated test account)
+    - Lock screen (not available if student is using a dedicated test account)
-    > **Note** The app will exit if the student signs in to an account from the lock screen. Progress made in the test may be lost or invalidated. 
+
+        > [!NOTE] 
+        > The app will exit if the student signs in to an account from the lock screen. Progress made in the test may be lost or invalidated. 
 
 - The student can exit the test by pressing one of the following key combinations: 
 
     - Ctrl+Alt+Del 
-
+    - Alt+F4 (Take a Test will restart if the student is using a dedicated test account)
-    - Alt+F4 (**Take a Test** will restart if the student is using a dedicated test account)
 
 
 ## Learn more

education/windows/take-a-test-multiple-pcs.md

@@ -1,11 +1,12 @@
 ---
 title: Set up Take a Test on multiple PCs
 description: Learn how to set up and use the Take a Test app on multiple PCs.
-keywords: ["shared cart", "shared PC", "school"]
+keywords: ["take a test", "test taking", "school"]
 ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -15,127 +16,158 @@ author: CelesteDG
 -   Windows 10  
 
 
-Many schools use online testing for formative and summative assessments. It's critical that students use a secure browser that prevents them from using other computer or Internet resources during the test. The **Take a Test** app in Windows 10, Version 1607, creates the right environment for taking a test:
+Many schools use online testing for formative and summative assessments. It's critical that students use a secure browser that prevents them from using other computer or Internet resources during the test. 
 
-- Take a Test shows just the test and nothing else.
+Follow the guidance in this topic to set up Take a Test on multiple PCs.
-- Take a Test clears the clipboard.
-- Students aren’t able to go to other websites.
-- Students can’t open or access other apps.
-- Students can't share, print, or record their screens.
-- Students can’t change settings, extend their display, see notifications, get updates, or use autofill features.
-- Cortana is turned off.
-
-## How to use Take a Test
-
-![Set up and user flow for the Take a Test app](images/take_a_test_workflow.png)
-
-- **Use an assessment URL and a [dedicated testing account](#set-up-a-dedicated-test-account)** - A user signs in to the account and the **Take a Test** app automatically launches the pre-configured assessment URL in Microsoft Edge in a single-app, kiosk mode. A student will never have access to the desktop in this configuration. We recommend this configuration for high stakes testing.
-- **[Put an assessment URL with an included prefix](#provide-link-to-test) on a web page or OneNote for students to click** - This allows teachers and test administrators an easier way to deploy assessments. We recommend this method for lower stakes assessments.
 
 ## Set up a dedicated test account
-To configure a dedicated test account on multiple PCs, you can use:
+To configure a dedicated test account on multiple PCs, select any of the following methods:
+- [Provisioning package created through the Set up School PCs app](#set-up-a-test-account-in-the-set-up-school-pcs-app)
+- [Configuration in Intune for Education](#set-up-a-test-account-in-intune-for-education)
 - [Mobile device management (MDM) or Microsoft System Center Configuration Manager](#set-up-a-test-account-in-mdm-or-configuration-manager)
-- [A provisioning package](#set-up-a-test-account-in-a-provisioning-package) created in Windows Imaging and Configuration Designer (ICD)
+- [Provisioning package created through Windows Configuration Designer](#set-up-a-test-account-through-windows-configuration-designer)
-- [Group Policy](#set-up-a-test-account-in-group-policy) to deploy a scheduled task that runs a Powershell script
+- [Group Policy to deploy a scheduled task that runs a Powershell script](#set-up-a-test-account-in-group-policy) 
+
+### Set up a test account in the Set up School PCs app 
+If you want to set up a test account using the Set up School PCs app, configure the settings in the **Set up the Take a Test app** page in the Set up School PCs app. Follow the instructions in [Use the Set up School PCs app](use-set-up-school-pcs-app.md) to configure the test-taking account and create a provisioning package. 
+
+If you set up Take a Test, this adds a **Take a Test** button on the student PC's sign-in screen. Windows will also lock down the student PC so that students can't access anything else while taking the test.
+
+**Figure 1** - Configure Take a Test in the Set up School PCs app
+
+![Configure Take a Test in the Set up School PCs app](images/suspc_choosesettings_setuptakeatest.png)
+
+### Set up a test account in Intune for Education
+You can set up a test-taking account in Intune for Education. To do this, follow these steps:
+
+1. In Intune for Education, select **Take a Test profiles** from the menu.
+2. Click **+ Add Test Profile** to create an account.
+
+    **Figure 2** - Add a test profile in Intune for Education
+
+    ![Add a test profile in Intune for Education](images/i4e_takeatestprofile_addnewprofile.png)
+
+3. In the new profile page:
+  1. Enter a name for the profile.
+  2. Enter the assessment URL.
+  3. Toggle the switch to **Allow screen capture**.
+  4. Select a user account to use as the test-taking account.
+  5. Click **Save**.
+
+    **Figure 3** - Add information about the test profile
+
+    ![Add information about the test profile](images/i4e_takeatestprofile_newtestaccount.png)
+
+    After you save the test profile, you will see a summary of the settings that you configured for Take a Test. Next, you'll need to assign the test profile to a group that will be using the test account.
+    
+4.  In the test account page, click **Groups**.
+
+    **Figure 4** - Assign the test account to a group
+
+    ![Assign the test account to a group](images/i4e_takeatestprofile_accountsummary.png)
+
+5. In the **Groups** page, click **Change group assignments**.
+
+    **Figure 5** - Change group assignments
+
+    ![Change group assignments](images/i4e_takeatestprofile_groups_changegroupassignments.png)
+
+6. In the **Change group assignments** page:
+  1. Select a group from the right column and click **Add Members** to select the group and assign the test-taking account to that group. You can select more than one group. 
+  2. Click **OK** when you're done making your selection.
+
+    **Figure 6** - Select the group(s) that will use the test account
+
+    ![Select the groups that will use the test account](images/i4e_takeatestprofile_groupassignment_selected.png)
+
+And that's it! When the students from the selected group sign in to the student PCs using the Take a Test user name that you selected, the PC will be locked down and Take a Test will open the assessment URL and students can start taking tests.
 
 ### Set up a test account in MDM or Configuration Manager
+You can configure a dedicated testing account through MDM or Configuration Manager by specifying a single account in the directory to be the test-taking account. Devices that have the test-taking policies can sign into the specified account to take the test.
+
+**Best practice**
+- Create a single account in the directory specifically for test taking 
+    - Active Directory example: Contoso\TestAccount
+    - Azure Active Directory example: testaccount@contoso.com
+
+- Deploy the policies to the group of test-taking devices
+
+**To enable this configuration**
+
 1. Launch your management console.
-2. Create a policy to set up single app kiosk mode, using the following values:
+2. Create a policy to set up single app kiosk mode using the following values:
 
     - **Custom OMA-DM URI** = ./Vendor/MSFT/AssignedAccess/KioskModeApp
-    - **String value** = {"Account":"*redmond\\kioskuser*","AUMID":” Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App "}
+    - **String value** = {"*Account*":"*redmond\\kioskuser*","AUMID":” Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App "}
 
-    Account can be in one of the following formats:
+    *Account* can be in one of the following formats:
-      - username
+      - username (not recommended)
       - domain\username
-      - computer name\\username
+      - computer name\\username (not recommended)
       - username@tenant.com
 
-3. Create a policy to configure the assessment URL, using the following values:
+3. Create a policy to configure the assessment URL using the following values:
 
     - **Custom OMA-DM URI** = ./Vendor/MSFT/SecureAssessment/LaunchURI
     - **String value** = *assessment URL*
 
       See [Assessment URLs](#assessment-urls) for more information.
 
-4. Create a policy that associates the assessment URL to the account, using the following values:
+4. Create a policy that associates the assessment URL to the account using the following values:
 
     - **Custom OMA-DM URI** = ./Vendor/MSFT/SecureAssessment/TesterAccount
     - **String value** = Enter the account that you specified in step 2, using the same account format.
 
-5. To take the test, the student signs in to the test account.
+5. Deploy the policies to the test-taking devices.
+6. To take the test, the student signs in to the test account.
 
-### Set up a test account in a provisioning package
+### Set up a test account through Windows Configuration Designer
+To set up a test account through Windows Configuration Designer, follow these steps.
 
-**Prerequisite:** You must first download the Windows ADK for Windows 10, Version 1607, and  install Windows Imaging and Configuration Designer (ICD). For more info, see [Install Windows Imaging and Configuration Designer](https://technet.microsoft.com/en-us/itpro/windows/deploy/provisioning-install-icd).
+1. [Install Windows Configuration Designer](https://technet.microsoft.com/itpro/windows/configure/provisioning-install-icd).
+2. Create a provisioning package by following 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 other settings to customize the test account.
+  1. 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**.
+  2. Under **Runtime settings**, go to **AssignedAccess > AssignedAccessSettings**.
+  3. Enter **{"Account":"*redmond\\kioskuser*","AUMID":” Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App "}**, using the account that you want to set up.
 
-**Create a provisioning package to set up a test account**
+    **Figure 7** - Add the account to use for test-taking
 
-1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
+    ![Add the account to use for test-taking](images/wcd_settings_assignedaccess.png)
-2. Select **Advanced provisioning**.
-3. Name your project, and click **Next**.
-4. Select **All Windows desktop editions**, and click **Next**.
-5. Click **Finish**.
-6. Go to **Runtime settings** > **AssignedAccess** > **AssignedAccessSettings**.
-7. Enter **{"Account":"*redmond\\kioskuser*","AUMID":” Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App "}**, using the account that you want to set up, as shown in the following image.
 
-    ![Enter account and app for Assigned Access Settings](images/test-account-icd.png)
+    The account can be in one of the following formats:
-
-    Account can be in one of the following formats:
     - username
     - domain\username
     - computer name\\username
     - username@tenant.com
 
-8. Go to **Runtime settings** > **TakeATest**.
+  4. Under **Runtime settings**, go to **TakeATest** and configure the following settings:
-9. Enter the assessment URL in **LaunchURI**.
+    1. In **LaunchURI**, enter the assessment URL.
-10. Enter the test account from step 7 in **TesterAccount**.
+    2. In **TesterAccount**, enter the test account you entered in step 3.
-On the **File** menu, select **Save.**
-9.  On the **Export** menu, select **Provisioning package**.
-10. Change **Owner** to **IT Admin**, which will set the precedence of this provisioning package higher than provisioning packages applied to this device from other sources, and then select **Next.**
-11. Optional. In the **Provisioning package security** window, you can choose to encrypt the package and enable package signing.
-    -   **Enable package encryption** - If you select this option, an auto-generated password will be shown on the screen.
-    -   **Enable package signing** - If you select this option, you must select a valid certificate to use for signing the package. You can specify the certificate by clicking **Select** and choosing the certificate you want to use to sign the package.
 
-12. Click **Next** to specify the output location where you want the provisioning package to go when it's built. By default, Windows ICD uses the project folder as the output location.
+3. Follow the steps to [build a package](https://technet.microsoft.com/en-us/itpro/windows/configure/provisioning-create-package#build-package). 
 
-  Optionally, you can click **Browse** to change the default output location.
+    - 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.
 
-13. Click **Next**.
+4. 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.
-14. Click **Build** to start building the package. The provisioning package doesn't take long to build. The project information is displayed in the build page and the progress bar indicates the build status.
-
-  If you need to cancel the build, click **Cancel**. This cancels the current build process, closes the wizard, and takes you back to the **Customizations Page**.
-
-15. If your build fails, an error message will show up that includes a link to the project folder. You can scan the logs to determine what caused the error. Once you fix the issue, try building the package again.
-
-  If your build is successful, the name of the provisioning package, output directory, and project directory will be shown.
-
-  -   If you choose, you can build the provisioning package again and pick a different path for the output package. To do this, click **Back** to change the output package name and path, and then click **Next** to start another build.
-  -   If you are done, click **Finish** to close the wizard and go back to the **Customizations Page**.
-
-**Apply the provisioning package**
-
-1.  Select the provisioning package that you want to apply, double-click the file, and then allow admin privileges.
-2.  Consent to allow the package to be installed.
-
-    After you allow the package to be installed, the settings will be applied to the device. [Learn how to apply a provisioning package in audit mode or OOBE](https://go.microsoft.com/fwlink/p/?LinkID=692012).
 
 ### Set up a test account in Group Policy
 To set up a test account using Group Policy, first create a Powershell script that configures the test account and assessment URL, and then create a scheduled task to run the script.
 
 #### Create a PowerShell script
 This sample PowerShell script configures the test account and the assessment URL. Edit the sample to:
-- Use your test account for **$obj.LaunchURI**  
+
-- Use your assessment URL for **$obj.TesterAccount**
+- Use your assessment URL for **$obj.LaunchURI**  
+- Use your test account for **$obj.TesterAccount**
 - Use your test account for **-UserName**
 
-```
+    ```
-$obj = get-wmiobject -namespace root/cimv2/mdm/dmmap -class MDM_SecureAssessment -filter "InstanceID='SecureAssessment' AND ParentID='./Vendor/MSFT'";
+    $obj = get-wmiobject -namespace root/cimv2/mdm/dmmap -class MDM_SecureAssessment -filter "InstanceID='SecureAssessment' AND ParentID='./Vendor/MSFT'";
-$obj.LaunchURI='http://www.foo.com';
+    $obj.LaunchURI='http://www.foo.com';
-$obj.TesterAccount='TestAccount';
+    $obj.TesterAccount='TestAccount';
-$obj.put()
+    $obj.put()
-Set-AssignedAccess -AppUserModelId Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App -UserName TestAccount
+    Set-AssignedAccess -AppUserModelId Microsoft.Windows.SecureAssessmentBrowser_cw5n1h2txyewy!App -UserName TestAccount
-```
+    ```
 
 #### Create a scheduled task in Group Policy
 1. Open the Group Policy Management Console.
@@ -165,15 +197,53 @@ Set-AssignedAccess -AppUserModelId Microsoft.Windows.SecureAssessmentBrowser_cw5
 ## Provide link to test
 Anything hosted on the web can be presented in a locked down manner, not just assessments. To lock down online content, just embed a URL with a specific prefix and devices will be locked down when users follow the link. We recommend using this method for lower stakes assessments.
 
-1. Create a link to the assessment URL. Use **ms-edu-secureassessment:** before the URL and **!enforceLockdown** after the URL.
+**To provide a link to the test**
+
+1. Create the link to the test using schema activation.
+
+    Manually embed a URL with a specific prefix. You can select parameters depending on what you want to enable. For more info, see [Create a link using schema activation](#create-a-link-using-schema-activation).
+
+2. Distribute the link. 
+
+    Once the links are created, you can distribute them through the web, email, OneNote, or any other method of your choosing. You can also create shortcuts to distribute the link. For more info, see [Create a shortcut for the test link](#create-a-shortcut-for-the-test-link).
+
+3. To take the test, have the students click on the link and provide user consent.
+
+### Create a link using schema activation
+One of the ways you can present content in a locked down manner is by embedding a URL with a specific prefix. Once users click the URL, devices will be locked down.
+
+**To enable schema activation for assessment URLs**
+
+1. Embed a link or create a desktop shortcut with:
+
   ```
   ms-edu-secureassessment:<URL>!enforceLockdown
   ```
- > [!NOTE]  
- > You may want to remove !enforceLockdown for tests that utilizes our lockdown API that checks for running processes before locking down. Removing !enforceLockdown will result in the app not locking down immediately which allows you to close apps that are not allowed to run during lockdown. The test web application may lock down the device once you have closed the apps.
 
-2. Distribute the link. You can use the web, email, OneNote, or any other method of your choosing.
+2. To enable printing, screen capture, or both, use the above link and append one of these parameters:
-3. To take the test, the student clicks on the link and provides user consent.
+
+  - `&enableTextSuggestions` - Enables text suggestions
+  - `&enablePrint` - Enables printing
+  - `&enableScreenCapture` - Enables screen capture
+  - `&enablePrinting&enableScreenCapture` - Enables printing and screen capture; you can use a combination of `&enableTextSuggestions`, `&enablePrint`, and `&enableScreenCapture` if you want to enable more than one capability. 
+
+  If you exclude these parameters, the default behavior is disabled.
+
+  For tests that utilizes the Windows lockdown API, which checks for running processes before locking down, remove `enforceLockdown`. Removing `enforceLockdown` will result in the app not locking down immediately, which allows you to close apps that are not allowed to run during lockdown. The test web application may lock down the device once you have closed the apps.
+
+    > [!NOTE] 
+    > The Windows 10, version 1607 legacy configuration, `ms-edu-secureassessment:<URL>!enforcelockdown` is still supported, but not in combination with the new parameters.
+
+### Create a shortcut for the test link
+You can also distribute the test link by creating a shortcut. To do this, create the link to the test by either using the [web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-l) or using [schema activation](#create-a-link-using-schema-activation). After you have the link, follow these steps:
+
+1. On a device running Windows, right-click on the desktop and then select **New > Shortcut**.
+2. In the **Create Shortcut** window, paste the assessment URL in the field under **Type the location of the item**.
+3. Click **Next**.
+4. Type a name for the shortcut and then click **Finish**.
+
+Once the shortcut is created, you can copy it and distribute it to students.
+
 
 ## Assessment URLs
 This assessment URL uses our lockdown API:
@@ -186,6 +256,4 @@ This assessment URL uses our lockdown API:
 
 [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)

education/windows/take-a-test-single-pc.md

@@ -1,11 +1,12 @@
 ---
 title: Set up Take a Test on a single PC
 description: Learn how to set up and use the Take a Test app on a single PC.
-keywords: shared cart, shared PC, school
+keywords: take a test, test taking, school
 ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -14,54 +15,109 @@ author: CelesteDG
 
 -   Windows 10  
 
-
+To configure [Take a Test](take-tests-in-windows-10.md) on a single PC, follow the guidance in this topic.
-The **Take a Test** app in Windows 10, Version 1607, creates the right environment for taking a test:
-
-- Take a Test shows just the test and nothing else.
-- Take a Test clears the clipboard.
-- Students aren’t able to go to other websites.
-- Students can’t open or access other apps.
-- Students can't share, print, or record their screens.
-- Students can’t change settings, extend their display, see notifications, get updates, or use autofill features.
-- Cortana is turned off.
-
-> [!TIP]  
-> To exit **Take a Test**, press Ctrl+Alt+Delete.
-
-
-## How to use Take a Test
-
-![Set up and user flow for the Take a Test app](images/take_a_test_workflow.png)
-
-- **Use an assessment URL and a [dedicated testing account](#set-up-a-dedicated-test-account)** - A user signs in to the account and the **Take a Test** app automatically launches the pre-configured assessment URL in Microsoft Edge in a single-app, kiosk mode. A student will never have access to the desktop in this configuration. We recommend this configuration for high stakes testing.
-- **[Put an assessment URL with an included prefix](#provide-a-link-to-the-test) on a web page or OneNote for students to click** - This allows teachers and test administrators an easier way to deploy assessments. We recommend this method for lower stakes assessments.
 
 ## Set up a dedicated test account
-1. Sign into the device with an administrator account.
+To configure the assessment URL and a dedicated testing account on a single PC, follow these steps.
-2. Go to **Settings** > **Accounts** > **Work or school access** > **Set up an account for taking tests**.
+
-3. Select an existing account to use as the dedicated testing account.
+1. Sign into the Windows 10 device with an administrator account.
+2. Open the **Settings** app and go to **Accounts > Access work or school**.
+3. Click **Set up an account for taking tests**.
+
+  **Figure 1** - Use the Settings app to set up a test-taking account
+
+  ![Use the Settings app to set up a test-taking account](images/tat_settingsapp_workorschoolaccess_setuptestaccount.png)
+
+4. In the **Set up an account for taking tests** window, choose an existing account to use as the dedicated testing account.
+
+  **Figure 2** - Choose the test-taking account
+
+  ![Choose the test-taking account](images/tat_settingsapp_setuptesttakingaccount_1703.png) 
 
     > [!NOTE]  
-  > If you don't have an account on the device, you can create a new account. To do this, go to **Settings** > **Accounts** > **Other Users** > **Add someone else to this PC** > **I don’t have this person’s sign-in information** > **Add a user without a Microsoft account**.
+    > If you don't have an account on the device, you can create a new account. To do this, go to **Settings > Accounts > Other people > Add someone else to this PC > I don’t have this person’s sign-in information > Add a user without a Microsoft account**.
 
-4. Specify an assessment URL.  
+5. In the **Set up an account for taking tests**, enter the assessment URL in the field under **Enter the test's web address**. 
-5. Click **Save**.
+6. Select the options you want to enable during the test.
-6. To take the test, the student signs in to the selected account.
+  - To enable printing, select **Require printing**. 
+
+      > [!NOTE]  
+      > Make sure a printer is preconfigured on the Take a Test account if you're enabling this option.
+
+  - To enable teachers to monitor screens, select **Allow screen monitoring**.
+  - To allow text suggestions, select **Allow text suggestions**.
+
+6. Click **Save**.
+7. To take the test, the student must sign in using the test-taking account that you created.
 
 ## Provide a link to the test
-
 Anything hosted on the web can be presented in a locked down manner, not just assessments. To lock down online content, just embed a URL with a specific prefix and devices will be locked down when users follow the link. We recommend using this method for lower stakes assessments.
 
-1. Create a link to the assessment URL. Use **ms-edu-secureassessment:** before the URL and **!enforceLockdown** after the URL.
+**To provide a link to the test**
+
+1. Create the link to the test. 
+
+  There are different ways you can do this:
+
+  - Create a link using a web UI
+
+    For this option, you can just copy the assessment URL, select the options you want to allow during the test, and click a button to create the link. We recommend this for option for teachers.
+
+    To get started, go here: [Create a link using a web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-link)
+
+  - Create a link using schema activation
+
+    You can accomplish the same thing as the first option (using a web UI), by manually embedding a URL with a specific prefix. You can select parameters depending on what you want to enable. 
+
+    For more info, see [Create a link using schema activation](#create-a-link-using-schema-activation).
+
+2. Distribute the link.
+
+  Once the links are created, you can distribute them through the web, email, OneNote, or any other method of your choosing. 
+
+  You can also create shortcuts to distribute the link. For more info, see [Create a shortcut for the test link](#create-a-shortcut-for-the-test-link).
+
+3. To take the test, have the students click on the link and provide user consent.
+
+  > [!NOTE] 
+  > If you enabled printing, the printer must be preconfigured for the account before the student takes the test.
+
+
+### Create a link using schema activation
+One of the ways you can present content in a locked down manner is by embedding a URL with a specific prefix. Once users click the URL, devices will be locked down.
+
+**To enable schema activation for assessment URLs**
+
+1. Embed a link or create a desktop shortcut with:
 
   ```
   ms-edu-secureassessment:<URL>!enforceLockdown
   ```
-   > [!NOTE]  
-   > You may want to remove !enforceLockdown for tests that utilizes our lockdown API that checks for running processes before locking down. Removing !enforceLockdown will result in the app not locking down immediately which allows you to close apps that are not allowed to run during lockdown. The test web application may lock down the device once you have closed the apps.
 
-2. Distribute the link. You can use the web, email, OneNote, or any other method of your choosing.
+2. To enable printing, screen capture, or both, use the above link and append one of these parameters:
-3. To take the test, the student clicks on the link and provides user consent.
+
+  - `&enableTextSuggestions` - Enables text suggestions
+  - `&enablePrint` - Enables printing
+  - `&enableScreenCapture` - Enables screen capture
+  - `&enablePrinting&enableScreenCapture` - Enables printing and screen capture; you can use a combination of `&enableTextSuggestions`, `&enablePrint`, and `&enableScreenCapture` if you want to enable more than one capability. 
+
+  If you exclude these parameters, the default behavior is disabled.
+
+  For tests that utilizes the Windows lockdown API, which checks for running processes before locking down, remove `enforceLockdown`. Removing `enforceLockdown` will result in the app not locking down immediately, which allows you to close apps that are not allowed to run during lockdown. The test web application may lock down the device once you have closed the apps.
+
+    > [!NOTE] 
+    > The Windows 10, version 1607 legacy configuration, `ms-edu-secureassessment:<URL>!enforcelockdown` is still supported, but not in combination with the new parameters.
+
+
+### Create a shortcut for the test link
+You can also distribute the test link by creating a shortcut. To do this, create the link to the test by either using the [web UI](https://education.microsoft.com/courses-and-resources/windows-10-create-a-take-a-test-l) or using [schema activation](#create-a-link-using-schema-activation). After you have the link, follow these steps:
+
+1. On a device running Windows, right-click on the desktop and then select **New > Shortcut**.
+2. In the **Create Shortcut** window, paste the assessment URL in the field under **Type the location of the item**.
+3. Click **Next**.
+4. Type a name for the shortcut and then click **Finish**.
+
+Once the shortcut is created, you can copy it and distribute it to students.
 
 
 ## Related topics

education/windows/take-tests-in-windows-10.md

@@ -1,11 +1,12 @@
 ---
 title: Take tests in Windows 10
 description: Learn how to set up and use the Take a Test app.
-keywords: shared cart, shared PC, school
+keywords: take a test, test taking, school
 ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -15,32 +16,55 @@ author: CelesteDG
 -   Windows 10   
 
 
-Many schools use online testing for formative and summative assessments. It's critical that students use a secure browser that prevents them from using other computer or Internet resources during the test. The **Take a Test** app in Windows 10, Version 1607, creates the right environment for taking a test:
+Many schools use online testing for formative and summative assessments. It's critical that students use a secure browser that prevents them from using other computer or Internet resources during the test. The **Take a Test** app in Windows 10 creates the right environment for taking a test:
 
-- **Take a Test** shows just the test and nothing else.
+- Take a Test shows just the test and nothing else.
-- **Take a Test** clears the clipboard.
+- Take a Test clears the clipboard.
 - Students aren’t able to go to other websites.
 - Students can’t open or access other apps.
-- Students can't share, print, or record their screens.
+- Students can't share, print, or record their screens unless enabled by the teacher or IT administrator
 - Students can’t change settings, extend their display, see notifications, get updates, or use autofill features.
 - Cortana is turned off.
 
-
-
 ## How to use Take a Test
 
-![Set up and user flow for the Take a Test app](images/take_a_test_workflow.png)
+![Set up and user flow for the Take a Test app](images/take_a_test_flow_dark.png)
 
-- **Use an assessment URL and a dedicated testing account** - A user signs in to the account and the **Take a Test** app automatically launches the pre-configured assessment URL in a single-app, kiosk mode. A student will never have access to the desktop in this configuration. We recommend this configuration for high stakes testing.
+There are several ways to configure devices for assessments. You can:
-- **Put an assessment URL with an included prefix on a web page or OneNote for students to click** - This allows teachers and test administrators an easier way to deploy assessments. We recommend this method for lower stakes assessments.
+- **Configure an assessment URL and a dedicated testing account**
 
-## How to set up Take a Test on PCs
+    In this configuration, a user signs into in to the account and the **Take a Test** app automatically launches the pre-configured assessment URL in Microsoft Edge in a single-app, kiosk mode. A student will never have access to the desktop in this configuration. We recommend this configuration for high stakes testing.
-You can use Take a Test to set up a test for a single PC or multiple PCs. Follow these links to learn how:
-- [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)
 
-## Related topics
+    There are different methods to configure the assessment URL and a dedicated testing account depending on whether you're setting up Take a Test on a single PC or multiple PCs.
 
-[Create tests using Microsoft Forms](create-tests-using-microsoft-forms.md)
+    - **For a single PC**
         
-[Take a Test app technical reference](take-a-test-app-technical.md)
+        You can use the Windows 10 **Settings** application. For more info, see [Set up Take a Test on a single PC](take-a-test-single-pc.md).
+
+    - **For multiple PCs**
+    
+        You can use any of these methods:
+            - Mobile device management (MDM) or Microsoft System Center Configuration Manager
+            - A provisioning package created in Windows Configuration Designer
+            - Group Policy to deploy a scheduled task that runs a Powershell script
+
+        Beginning with Windows 10 Creators Update (version 1703), you can also configure Take a Test using these options:
+            - Set up School PCs app
+            - Intune for Education
+
+        For more info about these methods, see [Set up Take a Test on multiple PCs](take-a-test-multiple-pcs.md).
+
+- **Distribute the assessment URL through the web, email, OneNote, or any other method of your choosing. You can also create shortcuts to distribute the link**
+
+    This allows teachers and test administrators an easier way to deploy assessments. We recommend this method for lower stakes assessments.
+
+    You can enable this using a schema activation.
+
+
+## How to exit Take a Test
+To exit the Take a Test app at any time, press Ctrl+Alt+Delete.
+
+
+## Get more info
+- Teachers can use Microsoft Forms to create tests. See [Create tests using Microsoft Forms](https://support.microsoft.com/en-us/help/4000711/windows-10-create-tests-using-microsoft-forms) to find out how.
+- To learn more about the policies and settings set by the Take a Test app, see [Take a Test app technical reference](take-a-test-app-technical.md).

education/windows/teacher-get-minecraft.md

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

education/windows/use-set-up-school-pcs-app.md

@@ -1,11 +1,12 @@
 ---
 title: Use Set up School PCs app
 description: Learn how the Set up School PCs app works and how to use it.
-keywords: shared cart, shared PC, school
+keywords: shared cart, shared PC, school, set up school pcs
 ms.prod: w10
-ms.mktglfcycl: plan
+ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -15,130 +16,251 @@ author: CelesteDG
 -   Windows 10   
 
 
+  > [!NOTE]
+  > The latest Set up School PCs app will be available for download in the Store very soon. To get familiar with the settings you can configure in the latest app, read the information in this topic.
 
-Teachers and IT administrators can use the **Set up School PCs** app to quickly set up computers for students. A computer set up using the app is tailored to provide students with the tools they need for learning while removing apps and features that they don't need.
 
-[Download the Set up School PCs app from the Windows Store](https://www.microsoft.com/store/apps/9nblggh4ls40)
+IT administrators and technical teachers can use the **Set up School PCs** app to quickly set up PCs for students. A student PC set up using the app is tailored to provide students with the tools they need for learning while removing apps and features that they don't need.
 
-![Run app, turn on PC, insert USB key](images/app1.jpg)
+![Set up School PCs app](images/suspc_getstarted_resized.png)
 
 ## What does this app do?
 
-The Set up School PCs app helps you set up new computers running Windows 10, version 1607. Some benefits of using this app to set up your students' PCs:
+Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recommended education settings, using a quick USB setup. This app guides you through the creation of a student PC provisioning package and helps you save it to a USB drive. From there, just plug the USB drive into student PCs running Windows 10 Creators Update (version 1703). It automatically:
-* A computer set up this way is tailored to provide students with the tools they need for learning while removing apps and features that they don't need. 
+- Joins each student PC to your organization's Office 365 and Azure Active Directory tenant
-    * Places tiles for OneNote, Office 365 web apps, Sway, and Microsoft Classroom on the Start menu
+- Enrolls each student PC into a mobile device management (MDM) provider, like Intune for Education, if licensed in your tenant. You can manage all the settings Set up School PCs sets later through MDM.
-    * Installs OneDrive for cloud-based documents and places it on the Start menu and taskbar 
+- Removes OEM preinstalled software from each student PC
-    * Sets Microsoft Edge as the default browser
+- Auto-configures and saves a wireless network profile on each student PC
-    * Uninstalls apps not specific to education, such as Solitaire and Sports
+- Gives a friendly and unique name to each student device for future management
-    * Turns off Offers and tips
+- Sets Microsoft-recommended school PC settings, including shared PC mode which provides faster sign-in and automatic account cleanup
-    * Prevents students from adding personal Microsoft accounts to the computer
+- Enables optional guest account for younger students, lost passwords, or visitors
-* Significantly improves how fast students sign-in.
+- Enables optional secure testing account
-* The app connects the PCs to your school’s cloud so IT can manage them (optional).
+- Locks down the student PC to prevent mischievous activity:
-* Windows 10 automatically manages accounts no matter how many students use the PC.
+    * Prevents students from removing the PC from the school's device management system
-* Keeps computers up-to-date without interfering with class time using Windows Update and maintenance hours (by default, 12 AM).
-* Customizes the sign-in screen to support students with IDs and temporary users.
-* Locks down the computer to prevent mischievous activity:
-    * Prevents students from installing apps
-    * Prevents students from removing the computer from the school's device management system
     * Prevents students from removing the Set up School PCs settings
+- Keeps student PCs up-to-date without interfering with class time using Windows Update and maintenance hours
 
+A student PC that's set up using the Set up School PCs provisioning package is tailored to provide students with the tools they need for learning while removing apps and features that they don't need. 
+    * Customizes the Start layout with Office
+    * Installs OneDrive for cloud-based documents and places it on the Start menu and taskbar 
+    * Uninstalls apps not specific to education, such as Solitaire
+    * [Gets the student PC ready for use in an education environment](configure-windows-for-education.md)
+    * Prevents students from adding personal Microsoft accounts to the PC
 
 ## Tips for success
 
-* **Run the app at work**: For the best results, run the **Set up School PCs** app on your work device connected to your school's network. That way the app can gather accurate information about your wireless networks and cloud subscriptions.
+* **Run the app at work**
-    > **Note**: Don't use **Set up Schools PCs** app for PCs that must connect to enterprise networks or to open wi-fi networks that require the user to accept Terms of Use.
-* **Apply to new computers**: The setup file that the **Set up School PCs** app creates should be used on new computers that haven't been set up for accounts yet. If you apply the setup file to a computer that has already been set up, existing accounts and data might be lost.
-> **Warning**: Only use the setup file on computers that you want to configure and lock down for students. After you apply the setup file to a computer, the computer must be reset to remove the settings.
-* **Turn on student PCs and stay on first screen**: The computer must be on this screen when you insert the USB key.
 
-![The first screen to set up a new PC](images/oobe.jpg)
+    For the best results, run the Set up School PCs app on your work device connected to your school's network. That way the app can gather accurate information about your wireless networks and cloud subscriptions.
+
+    > [!NOTE]  
+    > Don't use the **Set up Schools PCs** app for PCs that must connect to enterprise networks or to open Wi-Fi networks that require the user to accept Terms of Use.
+
+* **Apply to new student PCs**
+  * The provisioning package that the Set up School PCs app creates should be used on new PCs that haven't been set up for accounts yet. If you apply the provisioning package to a student PC that has already been set up, existing accounts and data might be lost.
+  
+    > [!WARNING]  
+    > Only use the provisioning package on PCs that you want to configure and lock down for students. After you apply the provisioning package to a student PC, the PC must be reset to remove the settings.
+
+  * If the PC has already been set up and you want to return to the first-run experience to apply a new package, you can reset the PC to get to a clean state and get it back to the first-run experience and ready to provision again.
+
+    To do this:
+    - Go to **Settings > Update & security > Recovery**. In the **Reset this PC** section of the **Recovery** page, click **Get started**.
+    - Or, hit **Shift + L + click Restart in the Power menu** to load the Windows boot user experience. From there, follow these steps:
+      1. Click **Troubleshoot** and then choose **Reset this PC**.
+      2. Select **Remove everything**.
+      3. Select **No - remove provisioning packages**.
+      4. Select **Only the drive where Windows is installed** (this may not always show up).
+      5. Click **Just remove my files**.
+
+* **Use more than one USB key**
+
+    If you are setting up multiple PCs, you can set them up at the same time.  Just save the provisioning package to another USB drive. Create two keys and you can run it on two PCs at once, and so on.
+
+* **Keep it clean**
+
+    We strongly recommend that IT avoid changes to policies unless absolutely necessary, as any changes can impair performance and sign-in time. Get more information at [Set up School PCs app technical reference](set-up-school-pcs-technical.md).
+
+* **Get more info**
+
+    Learn more about what Set up School PCs does, including provisioning details, in [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md).
 
-If you have gone past this screen, you may have to reset your PC to start over.  To reset your PC after you have completed the first run experience, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
-* **Use more than one USB key**: If you are setting up multiple PCs, you can set them up at the same time.  Just run the **Set up School PCs** app again and save the same settings to another key. That way you can run set up on more than one PC at once.  Create three keys and you can run it on three PCs at once, etc. 
-* **Start fresh**: If the PC has already been set up and you want to return to the first-run-experience to apply a new package, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
-* **Keep it clean**:  We strongly recommend that IT avoid changes to policies unless absolutely necessary, as any changes can impair performance and sign-in time. Get more information at [Set up School PCs app technical reference](set-up-school-pcs-technical.md).
 
 ## Set up School PCs app step-by-step
 
 What you need:
 
-- The **Set up School PCs** app, installed on your work computer, connected to your school's network
+- The **Set up School PCs** app, installed on your work PC and connected to your school's network. 
-- A USB drive, 1 GB or larger
 
-### Create the setup file in the app
+<!-- 
+[Download the Set up School PCs app from the Store](https://www.microsoft.com/store/apps/9nblggh4ls40).
+-->
+
+- A USB drive, 1 GB or larger. We recommend an 8 GB or larger USB drive if you're installing Office.
+
+### Create the provisioning package in the app
 
 The **Set up School PCs** app guides you through the configuration choices for the student PCs.
 
-1. Open the **Set up School PCs** app and select **Start**.
+1. Launch the Set up School PCs app.
 
-    ![select start](images/app1.jpg)
+  **Figure 1** - Launch the Set up School PCs app
 
-2. Choose **No** to require students to sign in only with an account, or choose **Yes** to allow students to use the PC without an account too, and then select **Next**.
+  ![Launch the Set up School PCs app](images/suspc_getstarted_resized.png)
 
-    ![account required?](images/setup-app-1-access.png)
+2. Click **Get started**.
+3. To sign in to your school's Office 365 account, in the **First step: Let's get you signed in** page:
 
-3. Choose a Wi-Fi network from the list and then select **Next**, or choose **Manually connect to a wireless network** to enter the network information yourself.
+  To get the best option for setup and enable student PCs to automatically be connected to Office 365, Azure AD, and management services like Intune for Education, click **Sign-in**.
 
-    ![choose network](images/setup-app-1-wifi.png)
+  To complete setup without signing in, click **Skip**. Student PCs won't be connected to your school's cloud services and managing them will be more difficult later.
 
-    - For a manual network connection, enter the network name, security type, and password (if required), and then select **Next**.
+  If you opt to sign in, follow these steps:
 
-        ![enter network information](images/setup-app-1-wifi-manual.png)
+    1. Choose the account from the list. If you don't see the account, select **Work or school account**, click **Continue**, and enter the account details.
+    2. Click **Next** once you've specified the account.
+    3. If you added an account, you may be asked to provide the user account and password. You will get a notification to allow the app to access your account. This will give Set up School PCs permission to access Store for Business, read memberships, sign you in and read your profile, and more.
+    4. Click **Accept**.
 
-4. Insert a USB drive, select it in the app, and then select **Save**.
+      The account will show up as the account that Set up School PCs will use to connect the school PCs to the cloud.
 
-    ![select usb drive](images/setup-app-1-usb.png)
+      **Figure 2** - Verify that the account you selected shows up
+
+      ![Verify that the account you selected shows up](images/suspc_choosesettings_signin_final.png)
+
+    5. Click **Next**.
+  
+4. To allow the student PCs to automatically connect to your school's wireless network, in the **Select the school's wireless network** page:
+  1. Select the school's Wi-Fi network from the list of available wireless networks or manually add a wireless network. 
+  2. Click **Next**.
+
+5. To assign a name to the student PCs, in the **Assign a name to these student PCs** page:
+  1. Add a short name that Set up School PCs will use as a prefix to identify and easily manage the group of devices, apps, and other settings through your device management client. 
+  
+    > [!NOTE]  
+    > The name must be five (5) characters or less. Set up School PCs automatically appends `_%SERIAL%` to the prefix that you specify. `_%SERIAL%` ensures that all device names are unique.
+
+    For example, if you add *Math4* as the prefix, the device names will be *Math4* followed by a random string of letters and numbers. 
+
+  2. Click **Next**.
+
+6. To specify other settings for the student PC, in the **Configure student PC settings** page:
+  - Select **Remove apps pre-installed by the device manufacturer** to install only the base Windows image.
+
+      > [!NOTE]  
+      > If you select this option, the provisioning process will take longer (about 30 minutes).
+
+  - Select **Allow local storage (not recommended for shared devices)** to let students save files to the **Desktop** and **Documents** folder on the student PC. We don't recommend this option if the device will be part of a shared cart or lab.
+  - Select **Optimize device for a single student, instead of a shared cart or lab** to optimize the device for use by a single student (1:1). Check this option if the device will not be part of a shared cart or lab.
+  - Select **Let guests sign-in to these PCs** to allow guests to use student PCs without a school account. For example, if the device will be in a library and you want other users (like visiting students or teachers) to be able to use the device, you can select this option.
+
+    If you select this option, this adds a **Guest** account button in the PC's sign-in screen to allow anyone to use the PC.
+
+  - To change the default lock screen background or to use your school's custom lock screen background, click **Browse** to select a new lock screen background.
+
+    **Figure 3** - Configure student PC settings
+
+    ![Configure student PC settings](images/suspc_choosesettings_settings_updated.png)
+
+ When you're doing configuring the student PC settings, click **Next**.
+
+7. If you want to set up the Take a Test app and use it for taking quizzes and high-stakes assessments by some providers like Smarter Balanced, configure the settings in the **Set up the Take a Test app** page.
+  1. Enter the assessment URL.
+  2. Check the options whether to allow keyboard text suggestions to appear and to allow teachers to monitor online tests. 
+
+    If you set up Take a Test, this adds a **Take a Test** button on the student PC's sign-in screen. Windows will also lock down the student PC so that students can't access anything else while taking the test.
+
+    **Figure 4** - Configure the Take a Test app
+
+    ![Configure the Take a Test app](images/suspc_choosesettings_setuptakeatest.png)
+
+  3. Click **Next** or **Skip** depending on whether you want to set up Take a Test.
+
+<!-- comment out
+7. If you want to add Store for Business apps to the student PCs, you can select from the list of recommended apps in the **Add STEM and Makerspace apps to Student PCs** page.
+  1. Select the apps that you want to add. You'll see a checkmark on apps that you select.
+  2. Click **Next**.
+
+    **Figure 4** - Select Store apps to add to student PCs
+
+    ![Select Store apps to add to student PCs](images/suspc_choosesettings_apps.png)
+
+-->
+
+8. In the **Review package summary** page, make sure that all the settings you configured appear correctly.
+  1. If you need to change any of the settings, you can on the sections to go back to that page and make your changes.
+
+      **Figure 5** - Review your settings and change them as needed
+
+      ![Review your settings and change them as needed](images/suspc_choosesettings_summary.png)
+
+  2. Click **Accept**.
+
+9. In the **Insert a USB drive now** page:
+  1. Insert a USB drive to save your settings and create a provisioning package on the USB drive.
+  2. Set up School PCs will automatically detect the USB drive after it's inserted. Choose the USB drive from the list.
+  3. Click **Save** to save the provisioning package to the USB drive.
+
+      **Figure 6** - Select the USB drive and save the provisioning package
+
+      ![Select the USB drive and save the provisioning package](images/suspc_savepackage_insertusb.png)
+
+10. When the provisioning package is ready, you will see the name of the file and you can remove the USB drive. Click **Next** if you're done, or click **Add a USB** to save the same provisioning package to another USB drive.
+
+  **Figure 7** - Provisioning package is ready
+
+  ![Provisioning package is ready](images/suspc_ppkg_isready.png)
+
+12. Follow the instructions in the **Get the student PCs ready** page to start setting up the student PCs. 
+
+  **Figure 8** - Line up the student PCs and get them ready for setup
+
+  ![Line up the student PCs and get them ready for setup](images/suspc_getpcsready_getpcsready.png)
+
+13. Click **Next**.
+14. In the **Install the package** page, follow the instructions in [Apply the provisioning package to the student PCs](#apply-the-provisioning-package-to-the-student-pcs) to set up the student PCs. 
+
+  Select **Create new package** if you need to create a new provisioning package. Otherwise, you can remove the USB drive if you're completely done creating the package.
+
+  **Figure 9** - Install the provisioning package on the student PCs
+
+  ![Install the provisioning package on the student PCs](images/suspc_getpcsready_installpackage.png)
 
 
+### Apply the provisioning package to the student PCs
 
-### Apply the setup file to PCs
+The provisioning package on your USB drive is named `Set up School PCs.ppkg`. A provisioning package is a method for applying settings to Windows 10 without needing to reimage the device. When Windows 10 refers to *package*, it means your provisioning package, and when it refers to *provisioning*, it means applying the provisioning package to the student PC.
 
-The setup file on your USB drive is named `SetupSchoolPCs.ppkg`, which is a provisioning package. A provisioning package is a method for applying settings to Windows 10. When Windows 10 refers to *package*, it means your setup file, and when it refers to *provisioning*, it means applying the setup file to the computer.
+> [!NOTE]  
+> The student PC must contain a new or reset image and the PC must not already have been through first-run setup (OOBE).
 
-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**.
+**To set up the student PC using the Set up School PCs provisioning package**
 
-    ![The first screen to set up a new PC](images/oobe.jpg)
+1. Start with the student PC turned off or with the PC on the first-run setup screen. In Windows 10 Creators Update (version 1703), this first-run setup screen says **Let's start with region. Is this right?**. 
 
-2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**.
+    If the PC has gone past the account setup screen, reset the PC to start over. To reset the PC, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
 
-    ![Set up device?](images/setupmsg.jpg)
+    **Figure 10** - The first screen during first-run setup in Windows 10 Creators Update (version 1703)
 
-3. The next screen asks you to select a provisioning source. Select **Removable Media** and tap **Next**.
+    ![The first screen to set up a new PC in Windows 10 Creators Update](images/win10_1703_oobe_firstscreen.png)
 
-    ![Provision this device](images/prov.jpg)
+2. Insert the USB drive. Windows will recognize the drive and automatically install the provisioning package. 
 
-4. Select `SetupSchoolPCs.ppkg` and tap **Next**.
+    **Figure 11** - Windows automatically detects the provisioning package and installs it
 
-    ![Choose a package](images/choose-package.png)
+    ![Windows automatically detects the provisioning package and installs it](images/suspc_studentpcsetup_installingsetupfile.png)
 
-5. Select **Yes, add it**.
+3. You can remove the USB drive when you see the message that you can remove the removable media. You can then use the USB drive to start provisioning another student PC.
 
-    ![Do you trust this package?](images/trust-package.png)
+    **Figure 12** - Remove the USB drive when you see the message that the media can be removed
 
-6. Read and accept the Microsoft Software License Terms.  
+    ![You can remove the USB drive when you see the message that the media can be removed](images/suspc_setup_removemediamessage.png)
    
-    ![Sign in](images/license-terms.png)
+4. If you set up the package to do Azure AD Join, that's it! You're done, and the PC is now ready for students to use.
 
-7. Select **Use Express settings**.
+  If you did not set up the package to do Azure AD Join, go through the rest of the Windows device setup experience.
 
-    ![Get going fast](images/express-settings.png)
+## Related topics
 
-8. If the PC doesn't use a volume license, you'll see the **Who owns this PC?** screen. Select **My work or school owns it** and tap **Next**.
+[Set up Windows devices for education](set-up-windows-10.md)
-
-    ![Who owns this PC?](images/who-owns-pc.png)
-
-9. On the **Choose how you'll connect** screen, select **Join Azure AD** and tap **Next**.
-
-    ![Connect to Azure AD](images/connect-aad.png)
-
-10. Your last step is to sign in. Use your Azure AD or Office 365 account and password. When you see the progress ring, you can remove the USB drive.
-
-    ![Sign in](images/sign-in-prov.png)
-
-    
-That's it! Sign out and the computer is now ready for students.
-
-## Learn more
-
-See [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md) for prerequisites and provisioning details. 
 

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

@@ -1,30 +1,32 @@
 ---
-title: Windows 10 Pro to Pro Education upgrade
+title: Switch Windows 10 Pro to Pro Education
-description: Describes how IT Pros can opt into a Windows 10 Pro Education upgrade from the Windows Store for Business.
+description: Describes how IT Pros can opt into switching from Windows 10 Pro to Windows 10 Pro Education from the Windows Store for Business.
+keywords: switch, Pro to Pro Education, education customers
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
-# Upgrade Windows 10 Pro to Pro Education from Windows Store for Business
+# Switch Windows 10 Pro to Pro Education from Windows Store for Business
 
 Windows 10 Pro Education is a new offering in Windows 10 Anniversary Update (Windows 10, version 1607). This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings.
 
-If you have an education tenant and use Windows 10 Pro in your schools now, global administrators can opt-in to a free upgrade to Windows 10 Pro Education through the Windows Store for Business. To take advantage of this offering, make sure you meet the [requirements for upgrade](#requirements-for-upgrade).
+If you have an education tenant and use Windows 10 Pro in your schools now, global administrators can opt-in to a free switch to Windows 10 Pro Education through the Windows Store for Business. To take advantage of this offering, make sure you meet the [requirements for switching](#requirements-for-switching).
 
 Starting with Windows 10, version 1607, academic institutions can easily move from Windows 10 Pro to Windows 10 Pro Education—no keys and no reboots. After one of your users enters the Azure AD credentials associated with a Windows 10 Pro Education license, the operating system turns from Windows 10 Pro to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. When a license expires or is transferred to another user, the Windows 10 Pro Education device seamlessly steps back down to Windows 10 Pro.
 
 Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have a Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
 
-When you upgrade to Windows 10 Pro Education, you get the following benefits:
+When you switch to Windows 10 Pro Education, you get the following benefits:
 
 -   **Windows 10 Pro Education edition**. Devices currently running Windows 10 Pro, version 1607 can get Windows 10 Pro Education Current Branch (CB). This benefit does not include Long Term Service Branch (LTSB).
 -   **Support from one to hundreds of users**. The Windows 10 Pro Education program does not have a limitation on the number of licenses an organization can have.
--   **Roll back to Windows 10 Pro at any time**. When a user leaves the domain or you turn off the setting to automatic upgrade to Windows 10 Pro Education, the device reverts seamlessly to Windows 10 Pro edition (after a grace period of up to 30 days).
+-   **Roll back to Windows 10 Pro at any time**. When a user leaves the domain or you turn off the setting to automatic switch to Windows 10 Pro Education, the device reverts seamlessly to Windows 10 Pro edition (after a grace period of up to 30 days).
 
-In summary, the Windows 10 Pro Education free upgrade through the Windows Store for Business is an upgrade offering that provides organizations easier, more flexible access to the benefits of Windows 10 Pro Education edition.
+In summary, the Windows 10 Pro Education free switch through the Windows Store for Business is an offering that provides organizations easier, more flexible access to the benefits of Windows 10 Pro Education edition.
 
 ## Compare Windows 10 Pro and Pro Education editions
 
@@ -35,9 +37,9 @@ In Windows 10, version 1607, the Windows 10 Pro Education edition contains the
 
 See [Windows 10 editions for education customers](windows-editions-for-education-customers.md) for more info about Windows 10 Pro Education and you can also [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare) to find out more about the features we support in other editions of Windows 10.
 
-## Requirements for upgrade
+## Requirements for switching
 
-Before you upgrade from Windows 10 Pro to Windows 10 Pro Education, make sure you meet these requirements:
+Before you switch from Windows 10 Pro to Windows 10 Pro Education, make sure you meet these requirements:
 - Devices must be:
   - Running Windows 10 Pro, version 1607
   - Must be Azure Active Directory joined, or domain joined with Azure AD Connect. Customers who are federated with Azure Active Directory are also eligible. For more information, see [Review requirements on devices](#review-requirements-on-devices).
@@ -47,59 +49,59 @@ Before you upgrade from Windows 10 Pro to Windows 10 Pro Education, make sure yo
 - The Azure AD tenant must be recognized as an education approved tenant.
 - You must have a Windows Store for Business account.
 
-## Upgrade from Windows 10 Pro to Windows 10 Pro Education
+## Switch from Windows 10 Pro to Windows 10 Pro Education
-Once you enable the setting to upgrade Windows 10 Pro to Windows 10 Pro Education, the upgrade will begin only after a user signs in to their device. The setting applies to the entire organization so you cannot select which users will receive the upgrade.
+Once you enable the setting to switch Windows 10 Pro to Windows 10 Pro Education, the switch will begin only after a user signs in to their device. The setting applies to the entire organization so you cannot select which users will receive the switch.
 
-**To turn on the automatic upgrade from Windows 10 Pro to Windows 10 Pro Education**
+**To turn on the automatic switch from Windows 10 Pro to Windows 10 Pro Education**
 1. Sign in to [Windows Store for Business](https://businessstore.microsoft.com/en-us/Store/Apps) with your work or school account.
 
   If this is the first time you're signing into the Store, you'll be prompted to accept the Windows Store for Business Terms of Use.
 2. Go to **Manage > Account information**.
 3. In the **Account information** page, look for the **Automatic Windows 10 Pro Education upgrade** section and follow the link.
 
-  You will see the following page informing you that your school is eligible for a free automatic upgrade from Windows 10 Pro to Windows 10 Pro Education.
+  You will see the following page informing you that your school is eligible for a free automatic switch from Windows 10 Pro to Windows 10 Pro Education.
 
-  ![Eligible for free Windows 10 Pro to Windows 10 Pro Education upgrade](images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png)
+  ![Eligible for free Windows 10 Pro to Windows 10 Pro Education switch](images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png)
 
-  **Figure 1** - Upgrade Windows 10 Pro to Windows 10 Pro Education
+  **Figure 1** - Switch Windows 10 Pro to Windows 10 Pro Education
 
 4. Select **I understand enabling this setting will impact all devices running Windows 10 Pro in my organization**.
-5. Click **Send me email with a link to enable this upgrade** to receive an email with a link to the upgrade.
+5. Click **Send me email with a link to enable this upgrade** to receive an email with a link to the switch.
 
-  ![Email with Windows 10 Pro to Pro Education upgrade link](images/wsfb_win10_pro_to_proedu_email_upgrade_link.png)
+  ![Email with Windows 10 Pro to Pro Education switch link](images/wsfb_win10_pro_to_proedu_email_upgrade_link.png)
 
-  **Figure 2** - Email notification with a link to enable the upgrade
+  **Figure 2** - Email notification with a link to enable the switch
 
-6. Click **Enable the automatic upgrade now** to turn on automatic upgrades.
+6. Click **Enable the automatic upgrade now** to turn on automatic switches.
 
-    ![Enable the automatic upgrade](images/wsfb_win10_pro_to proedu_upgrade_enable.png).
+    ![Enable the automatic switch](images/wsfb_win10_pro_to proedu_upgrade_enable.png).
 
-    **Figure 3** - Enable the automatic upgrade
+    **Figure 3** - Enable the automatic switch
 
-    Enabling the automatic upgrade also triggers an email message notifying all global administrators in your organization about the upgrade. It also contains a link that enables any global administrators to cancel the upgrade, if they choose. For more info about rolling back or canceling the upgrade, see [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro).
+    Enabling the automatic switch also triggers an email message notifying all global administrators in your organization about the switch. It also contains a link that enables any global administrators to cancel the switch, if they choose. For more info about rolling back or canceling the switch, see [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro).
 
-    ![Email informing other global admins about the upgrade](images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png).
+    ![Email informing other global admins about the switch](images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png).
 
     **Figure 4** - Notification email sent to all global administrators
 
 7. Click **Close** in the **Success** page.
 
-  In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, you will see a message informing you when the upgrade was enabled and the name of the admin who enabled the upgrade.
+  In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, you will see a message informing you when the switch was enabled and the name of the admin who enabled the switch.
 
-  ![Summary page about the upgrade](images/wsfb_win10_pro_to proedu_upgrade_summary.png)
+  ![Summary page about the switch](images/wsfb_win10_pro_to proedu_upgrade_summary.png)
 
-  **Figure 5** - Details about the automatic upgrade
+  **Figure 5** - Details about the automatic switch
 
 
-## Explore the upgrade experience
+## Explore the switch experience
 
-So what will the users experience? How will they upgrade their devices?
+So what will the users experience? How will they switch their devices?
 
 ### For existing Azure AD domain joined devices
-Existing Azure AD domain joined devices will be upgraded from Windows 10 Pro to Windows 10 Pro Education the next time the user logs in. That's it! No additional steps are needed.
+Existing Azure AD domain joined devices will be switched from Windows 10 Pro to Windows 10 Pro Education the next time the user logs in. That's it! No additional steps are needed.
 
 ### For new devices that are not Azure AD domain joined
-Now that you've turned on the setting to automatically upgrade Windows 10 Pro to Windows 10 Pro Education, the users are ready to upgrade their devices running Windows 10 Pro, version 1607 edition to Windows 10 Pro Education edition.
+Now that you've turned on the setting to automatically switch Windows 10 Pro to Windows 10 Pro Education, the users are ready to switch their devices running Windows 10 Pro, version 1607 edition to Windows 10 Pro Education edition.
 
 #### Step 1: Join users’ devices to Azure AD
 
@@ -171,23 +173,23 @@ If there are any problems with the Windows 10 Pro Education license or the acti
 
 ## Troubleshoot the user experience
 
-In some instances, users may experience problems with the Windows 10 Pro Education upgrade. The most common problems that users may experience are as follows:
+In some instances, users may experience problems with the Windows 10 Pro Education switch. The most common problems that users may experience are as follows:
 
 -   The existing Windows 10 Pro, version 1607 operating system is not activated.
 
--   The Windows 10 Pro Education upgrade has lapsed or has been removed.
+-   The Windows 10 Pro Education switch has lapsed or has been removed.
 
 Use the following figures to help you troubleshoot when users experience these common problems:
 
 <span id="win-10-activated-subscription-active"/>
 
-**Figure 13** - Illustrates a device in a healthy state, where Windows 10 Pro, version 1607 is activated and the Windows 10 Pro Education upgrade is active.
+**Figure 13** - Illustrates a device in a healthy state, where Windows 10 Pro, version 1607 is activated and the Windows 10 Pro Education switch is active.
 
 <img src="images/win-10-pro-edu-activated-subscription-active.png" alt="Windows 10 activated and subscription active" />
 
 <span id="win-10-not-activated"/>
 
-**Figure 14** - Illustrates a device on which Windows 10 Pro, version 1607 is not activated, but the Windows 10 Pro Education upgrade is active.
+**Figure 14** - Illustrates a device on which Windows 10 Pro, version 1607 is not activated, but the Windows 10 Pro Education switch is active.
 
 <img src="images/win-10-pro-edu-not-activated-subscription-active.png" alt="Windows 10 not activated and subscription active" /><br><br>
 
@@ -209,30 +211,30 @@ Devices must be running Windows 10 Pro, version 1607, and be Azure Active Direct
 
     A popup window will display the Windows 10 version number and detailed OS build information.
 
-    If a device is running a previous version of Windows 10 Pro (for example, version 1511), it will not be upgraded to Windows 10 Pro Education when a user signs in, even if the user has been assigned a license.
+    If a device is running a previous version of Windows 10 Pro (for example, version 1511), it will not be switched to Windows 10 Pro Education when a user signs in, even if the user has been assigned a license.
 
 ## Roll back Windows 10 Pro Education to Windows 10 Pro
 
-If your organization has the Windows 10 Pro to Windows 10 Pro Education upgrade enabled, and you decide to roll back to Windows 10 Pro or to cancel the upgrade, you can do this by:
+If your organization has the Windows 10 Pro to Windows 10 Pro Education switch enabled, and you decide to roll back to Windows 10 Pro or to cancel the switch, you can do this by:
-- Logging into Windows Store for Business page and turning off the automatic upgrade.
+- Logging into Windows Store for Business page and turning off the automatic switch.
-- Selecting the link to turn off the automatic upgrade from the notification email sent to all global administrators.
+- Selecting the link to turn off the automatic switch from the notification email sent to all global administrators.
 
-Once the automatic upgrade to Windows 10 Pro Education is turned off, the change is effective immediately. Devices that were upgraded will revert to Windows 10 Pro only after the license has been refreshed (every 30 days) and the next time the user signs in. This means that a user whose device was upgraded may not immediately see Windows 10 Pro Education rolled back to Windows 10 Pro for up to 30 days. However, users who haven't signed in during the time that an upgrade was enabled and then turned off will never see their device change from Windows 10 Pro.
+Once the automatic switch to Windows 10 Pro Education is turned off, the change is effective immediately. Devices that were switched will revert to Windows 10 Pro only after the license has been refreshed (every 30 days) and the next time the user signs in. This means that a user whose device was switched may not immediately see Windows 10 Pro Education rolled back to Windows 10 Pro for up to 30 days. However, users who haven't signed in during the time that an switch was enabled and then turned off will never see their device change from Windows 10 Pro.
 
 **To roll back Windows 10 Pro Education to Windows 10 Pro**
-1. Log in to [Windows Store for Business](https://businessstore.microsoft.com/en-us/Store/Apps) with your school or work account, or follow the link from the notification email to turn off the automatic upgrade.
+1. Log in to [Windows Store for Business](https://businessstore.microsoft.com/en-us/Store/Apps) with your school or work account, or follow the link from the notification email to turn off the automatic switch.
 2. Select **Manage > Account information** and locate the section **Automatic Windows 10 Pro Education upgrade** and follow the link.
 3. In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, select **Turn off the automatic upgrade to Windows 10 Pro Education**.
 
-  ![Turn off automatic upgrade to Windows 10 Pro Education](images/wsfb_win10_pro_to proedu_upgrade_disable.png)
+  ![Turn off automatic switch to Windows 10 Pro Education](images/wsfb_win10_pro_to proedu_upgrade_disable.png)
 
-  **Figure 15** - Link to turn off the automatic upgrade
+  **Figure 15** - Link to turn off the automatic switch
 
-4. You will be asked if you're sure that you want to turn off automatic upgrades to Windows 10 Pro Education. Click **Yes**.
+4. You will be asked if you're sure that you want to turn off automatic switches to Windows 10 Pro Education. Click **Yes**.
 5. Click **Close** in the **Success** page.
-6. In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, you will see information on when the upgrade was disabled.
+6. In the **Upgrade Windows 10 Pro to Windows 10 Pro Education** page, you will see information on when the switch was disabled.
 
-  If you decide later that you want to turn on automatic upgrades again, you can do this from the **Upgrade Windows 10 Pro to Windows 10 Pro Education**.
+  If you decide later that you want to turn on automatic switches again, you can do this from the **Upgrade Windows 10 Pro to Windows 10 Pro Education**.
 
 ## Preparing for deployment of Windows 10 Pro Education licenses
 

education/windows/windows-editions-for-education-customers.md

@@ -6,6 +6,7 @@ ms.prod: w10
 ms.mktglfcycl: plan
 ms.sitesec: library
 ms.pagetype: edu
+localizationpriority: high
 author: CelesteDG
 ---
 
@@ -14,9 +15,10 @@ author: CelesteDG
 
 -   Windows 10
 
+
 Windows 10 Anniversary Update (Windows 10, version 1607) continues our commitment to productivity, security, and privacy for all customers. Windows 10 Pro and Windows 10 Enterprise offer the functionality and safety features demanded by business and education customers around the globe. Windows 10 is the most secure Windows we’ve ever built. All of our Windows commercial editions can be configured to support the needs of schools, through group policies, domain join, and more. To learn more about Microsoft’s commitment to security and privacy in Windows 10, see more on both [security](https://go.microsoft.com/fwlink/?LinkId=822619) and [privacy](https://go.microsoft.com/fwlink/?LinkId=822620).
 
-Windows 10, version 1607 offers a variety of new features and functionality, such as simplified provisioning with the [Set up School PCs app](https://go.microsoft.com/fwlink/?LinkID=821951) or [Windows Imaging and Configuration Designer (ICD)](https://go.microsoft.com/fwlink/?LinkId=822623), easier delivery of digital assessments with [Take a Test](https://go.microsoft.com/fwlink/?LinkID=821956), and faster log in performance for shared devices than ever before. These features work with all Windows for desktop editions, excluding Windows 10 Home. You can find more information about Windows 10, version 1607 on [windows.com](http://www.windows.com/).
+Windows 10, version 1607 offers a variety of new features and functionality, such as simplified provisioning with the [Set up School PCs app](https://go.microsoft.com/fwlink/?LinkID=821951) or [Windows Configuration Designer](https://go.microsoft.com/fwlink/?LinkId=822623), easier delivery of digital assessments with [Take a Test](https://go.microsoft.com/fwlink/?LinkID=821956), and faster log in performance for shared devices than ever before. These features work with all Windows for desktop editions, excluding Windows 10 Home. You can find more information about Windows 10, version 1607 on [windows.com](http://www.windows.com/).
 
 Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: [Windows 10 Pro Education](#windows-10-pro-education) and [Windows 10 Education](#windows-10-education). These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.
 
@@ -24,7 +26,11 @@ Windows 10, version 1607 introduces two editions designed for the unique needs o
 
 Windows 10 Pro Education builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools. Windows 10 Pro Education is effectively a variant of Windows 10 Pro that provides education-specific default settings, including the removal of Cortana<sup>1</sup>. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627).
 
-Windows 10 Pro Education is available on new devices pre-installed with Windows 10, version 1607 that are purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future).
+> [!NOTE]  
+> If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 (Anniversary Update) to Windows 10, version 1703 (Creators Update) will enable Cortana. You can use the **AllowCortana** policy to turn it off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md).
+
+
+Windows 10 Pro Education is available on new devices pre-installed with Windows 10, version 1607 or newer versions that are purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future).
 
 Existing devices running Windows 10 Pro, currently activated with the original OEM digital product key and purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future), will upgrade automatically to Windows 10 Pro Education as part of the Windows 10, version 1607 installation.
 
@@ -36,13 +42,18 @@ Customers that deploy Windows 10 Pro are able to configure the product to have s
 
 Windows 10 Education builds on Windows 10 Enterprise and provides the enterprise-grade manageability and security desired by many schools. Windows 10 Education is effectively a variant of Windows 10 Enterprise that provides education-specific default settings, including the removal of Cortana<sup>1</sup>. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627).
 
-Windows 10 Education is available through Microsoft Volume Licensing. Customers who are already running Windows 10 Education can upgrade to Windows 10, version 1607 through Windows Update or from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). We recommend Windows 10 Education to all K-12 customers as it provides the most complete and secure edition for education environments. If you do not have access to Windows 10 Education, contact your Microsoft representative or see more information [here](https://go.microsoft.com/fwlink/?LinkId=822628).
+> [!NOTE]  
+> If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 (Anniversary Update) to Windows 10, version 1703 (Creators Update) will enable Cortana. You can use the **AllowCortana** policy to turn it off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md).
+
+
+Windows 10 Education is available through Microsoft Volume Licensing. Customers who are already running Windows 10 Education can upgrade to Windows 10, version 1607 or newer versions through Windows Update or from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). We recommend Windows 10 Education to all K-12 customers as it provides the most complete and secure edition for education environments. If you do not have access to Windows 10 Education, contact your Microsoft representative or see more information [here](https://go.microsoft.com/fwlink/?LinkId=822628).
 
 Customers that deploy Windows 10 Enterprise are able to configure the product to have similar feature settings to Windows 10 Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Enterprise read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
 
 For any other questions, contact [Microsoft Customer Service and Support](https://support.microsoft.com/en-us).
 
 ## Related topics
+* [Switch Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)
 * [Windows deployment for education](http://aka.ms/edudeploy)
 * [Windows 10 upgrade paths](https://go.microsoft.com/fwlink/?LinkId=822787)
 * [Volume Activation for Windows 10](https://go.microsoft.com/fwlink/?LinkId=822788)