Merged PR 2446: Merge edumaylaunch to master

Updated Take a Test app reference topic (to resolve a bug) and some tweaks to the Get started topics

education/get-started/configure-microsoft-store-for-education.md

@@ -52,8 +52,15 @@ You can watch the descriptive audio version here: [Microsoft Education: Configur
 
 Your Microsoft Store for Education account is now linked to Intune for Education so let's set that up next.
 
+<!--
 > [!div class="nextstepaction"]
 > [Use Intune for Education to manage groups, apps, and settings](use-intune-for-education.md)
+-->
+
+> [!div class="step-by-step"]
+[<< Enable Microsoft Teams for your school](enable-microsoft-teams.md)
+[Use Intune for Education to manage groups, apps, and settings >>](use-intune-for-education.md)
+
 
 ## Related topic
 [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md)

education/get-started/enable-microsoft-teams.md

@@ -46,8 +46,14 @@ To get started, IT administrators need to use the Office 365 Admin Center to ena
 
 You can find more info about how to control which users in your school can use Microsoft Teams, turn off group creation, configure tenant-level settings, and more by reading the *Guide for IT admins* getting started guide in the <a href="https://aka.ms/MeetTeamsEdu" target="_blank">Meet Microsoft Teams</a> page.
 
+<!--
 > [!div class="nextstepaction"]
 > [Configure Microsoft Store for Education](configure-microsoft-store-for-education.md)
+-->
+
+> [!div class="step-by-step"]
+[<< Use School Data Sync to import student data](use-school-data-sync.md)
+[Configure Microsoft Store for Education >>](configure-microsoft-store-for-education.md)
 
 
 ## Related topic

education/get-started/finish-setup-and-other-tasks.md

@@ -142,7 +142,7 @@ After your cloud infrastructure is set up and you have a device management strat
 See <a href="https://support.office.com/en-us/article/Add-users-to-Office-365-for-business-435ccec3-09dd-4587-9ebd-2f3cad6bc2bc" target="_blank">Add users to Office 365</a> to learn more. Once you're done adding new users, go to the <a href="https://intuneeducation.portal.azure.com/" target="_blank">Intune for Education console</a> and verify that the same users were added to the Intune for Education groups as well.
 
 ## Connect other devices to your cloud infrastructure
-Adding a new device to your cloud-based tenant is easy. For new devices, you can follow the steps in [6. Set up Windows 10 devices](#6-set-up-windows-10-devices). For other devices, such as those personally-owned by teachers who need to connect to the school network to access work or school resources (BYOD), you can follow the steps in this section to get these devices connected.
+Adding a new device to your cloud-based tenant is easy. For new devices, you can follow the steps in [Set up Windows 10 education devices](set-up-windows-10-education-devices.md). For other devices, such as those personally-owned by teachers who need to connect to the school network to access work or school resources (BYOD), you can follow the steps in this section to get these devices connected.
 
   > [!NOTE]  
   > These steps enable users to get access to the organization's resources, but it also gives the organization some control over the device.
@@ -169,7 +169,7 @@ Adding a new device to your cloud-based tenant is easy. For new devices, you can
 
   ![Device is connected to organization's MDM](images/win10_connectedtoorgmdm.png)
 
-6. You can confirm that the new device and user are showing up as Intune for Education-managed by going to the Intune for Education management portal and following the steps in [6.3 Verify the device is Azure AD joined](#63-verify-the-device-is-azure-ad-joined). 
+6. You can confirm that the new device and user are showing up as Intune for Education-managed by going to the Intune for Education management portal and following the steps in [Verify the device is Azure AD joined](#verify-the-device-is-azure-ad-joined). 
 
   It may take several minutes before the new device shows up so check again later.
 

education/get-started/set-up-office365-edu-tenant.md

@@ -45,8 +45,9 @@ You can watch the descriptive audio version here: [Microsoft Education: Set up a
 
 As part of setting up a basic cloud infrastructure, you don't need to complete the rest of the Office 365 for Education setup so we will skip the rest of setup for now and start importing school data. You can pick up where you left off with Office 365 for Education setup once you've completed the rest of the steps in the walkthrough. See *Complete Office 365 for Education setup* in [Finish Windows 10 device setup and other tasks](finish-setup-and-other-tasks.md) for info.
 
-> [!div class="nextstepaction"]
+> [!div class="step-by-step"]
-> [Use School Data Sync to import student data](use-school-data-sync.md)
+[<< Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md)
+[Use School Data Sync to import student data >>](use-school-data-sync.md)
 
 
 ## Related topic

education/get-started/set-up-windows-10-education-devices.md

@@ -21,9 +21,16 @@ To set up new Windows 10 devices and enroll them to your education tenant, choos
 - **Option 1: [Use the Set up School PCs app](https://docs.microsoft.com/en-us/education/windows/use-set-up-school-pcs-app)** - You can use the app to create a setup file that you can use to quickly set up one or more Windows 10 devices.
 - **Option 2: [Go through Windows OOBE and join the device to Azure AD](set-up-windows-education-devices.md)** - You can go through a typical Windows 10 device setup or first-run experience to configure your device.
 
-
+<!--
 > [!div class="nextstepaction"]
 > [Finish setup and other tasks](finish-setup-and-other-tasks.md)
+-->
+
+
+> [!div class="step-by-step"]
+[<< Use Intune for Education to manage groups, apps, and settings](use-intune-for-education.md)
+[Finish setup and other tasks >>](finish-setup-and-other-tasks.md)
+
 
 
 ## Related topic

education/get-started/set-up-windows-education-devices.md

@@ -20,9 +20,7 @@ If you are setting up a Windows 10 device invidividually, and network bandwidth
 You can watch the video to see how this is done, or follow the step-by-step guide. </br>
 
 <center><iframe src="https://www.youtube.com/embed/nADWqBYvqXk" width="960" height="540" allowFullScreen frameBorder="0"></iframe></center>
-<!--
+
-<div style="position:relative;height:0;padding-bottom:56.25%"><iframe src="https://www.youtube.com/embed/nADWqBYvqXk?ecver=2" width="640" height="360" frameborder="0" style="position:absolute;width:100%;height:100%;left:0" allowfullscreen></iframe></div>
--->
 You can watch the descriptive audio version here: [Microsoft Education: Set up a new Windows 10 education devices using the Windows setup experience (DA)](https://www.youtube.com/watch?v=_UtS1Cz2Pno)
 
 ## To set up Windows 10 devices using OOBE

education/get-started/use-intune-for-education.md

@@ -206,8 +206,15 @@ Now that you've bought the apps, use Intune for Education to specify the group t
 
 You're now done assigning apps to all users in your tenant. It's time to set up your Windows 10 device(s) and check that your cloud infrastructure is correctly set up and your apps are being pushed to your devices from the cloud.
 
+<!--
 > [!div class="nextstepaction"]
 > [Set up Windows 10 devices](set-up-windows-10-education-devices.md)
+-->
+
+> [!div class="step-by-step"]
+[<< Configure Microsoft Store for Education](configure-microsoft-store-for-education.md)
+[Set up Windows 10 education devices >>](set-up-windows-10-education-devices.md)
+
 
 
 ## Related topic

education/get-started/use-school-data-sync.md

@@ -170,9 +170,14 @@ To learn more about the CSV files that are required and the info you need to inc
 
 That's it for importing sample school data using SDS.
 
+<!--
 > [!div class="nextstepaction"]
 > [Enable Microsoft Teams for your school](enable-microsoft-teams.md)
+-->
 
+> [!div class="step-by-step"]
+[<< Set up an Office 365 education tenant](set-up-office365-edu-tenant.md)
+[Enable Microsoft Teams for your school >>](enable-microsoft-teams.md)
 
 ## Related topic
 [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md)

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

@@ -9,6 +9,7 @@ ms.pagetype: edu
 ms.localizationpriority: high
 author: CelesteDG
 ms.author: celested
+ms.date: 07/28/2017
 ---
 
 # Take a Test app technical reference 
@@ -74,6 +75,26 @@ When Take a Test is running, the following functionality is available to student
     - Ctrl+Alt+Del 
     - Alt+F4 (Take a Test will restart if the student is using a dedicated test account)
 
+## Policies
+
+If the lock screen is disabled, Take aTest will not launch above lock. Be aware that if you set the following Group Policy, this breaks activation of Take a Test above lock.
+
+**Group Policy path:** Computer Configuration\Administrative Templates\Control Panel\Personalization\ <br />
+**Group Policy name:** Do not display the lock screen <br />
+**ADML:** %SDXROOT%\shell\policies\ControlPanelDisplay.adml <br />
+**ADMX:** %SDXROOT%\shell\policies\ControlPanelDisplay.admx <br />
+ 
+```
+<policy name="CPL_Personalization_NoLockScreen" class="Machine"
+        displayName="$(string.CPL_Personalization_NoLockScreen)"
+        explainText="$(string.CPL_Personalization_NoLockScreen_Help)"
+        key="Software\Policies\Microsoft\Windows\Personalization"
+        valueName="NoLockScreen">
+  <parentCategory ref="Personalization" />
+  <supportedOn ref="windows:SUPPORTED_Windows8" />
+</policy>
+```
+
 
 ## Learn more