From 7d717f250b6ef1f4cd930169f6231ccd30ce7784 Mon Sep 17 00:00:00 2001 From: MikeBlodge Date: Wed, 2 May 2018 13:42:47 -0700 Subject: [PATCH 1/2] corrected typos --- education/windows/switch-to-pro-education.md | 58 +++++++++---------- .../deployment/windows-10-pro-in-s-mode.md | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/education/windows/switch-to-pro-education.md b/education/windows/switch-to-pro-education.md index de07efe44c..816baa12a2 100644 --- a/education/windows/switch-to-pro-education.md +++ b/education/windows/switch-to-pro-education.md @@ -16,8 +16,8 @@ ms.date: 04/30/2018 Windows 10 Pro Education is a new offering in Windows 10, version 1607. This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings. If you have an education tenant and use devices with Windows 10 Pro, global administrators can opt-in to a free change to Windows 10 Pro Education depending on your scenario. -- [change from Windows 10 Pro in S mode to Windows 10 Pro Education in S mode](https://www.microsoft.com/en-us/education/windows/s-mode-change-to-edu) -- [change from Windows 10 Pro to Windows 10 Pro Education](#change-from-windows-10-pro-to-windows-10-pro-education) +- [Switch from Windows 10 Pro in S mode to Windows 10 Pro Education in S mode](https://www.microsoft.com/en-us/education/windows/s-mode-change-to-edu) +- [Switch from Windows 10 Pro to Windows 10 Pro Education](#switch-from-windows-10-pro-to-windows-10-pro-education) To take advantage of this offering, make sure you meet the [requirements for changing](#requirements-for-changing). For academic customers who are eligible to change to Windows 10 Pro Education, but are unable to use the above methods, contact Microsoft Support for assistance. @@ -37,7 +37,7 @@ You can [compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsFor For more info about Windows 10 default settings and recommendations for education customers, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). -## change from Windows 10 Pro to Windows 10 Pro Education +## Change from Windows 10 Pro to Windows 10 Pro Education For schools that want to standardize all their Windows 10 Pro devices to Windows 10 Pro Education, a global admin for the school can opt-in to a free change through the Microsoft Store for Education. @@ -49,7 +49,7 @@ In this scenario: See [change using Microsoft Store for Education](#change-using-microsoft-store-for-education) for details on how to do this. -### change using Intune for Education +### Change using Intune for Education 1. In Intune for Education, select **Groups** and then choose the group that you want to apply the MAK license key to. @@ -66,7 +66,7 @@ See [change using Microsoft Store for Education](#change-using-microsoft-store-f 3. The change will automatically be applied to the group you selected. -### change using Windows Configuration Designer +### Change using Windows Configuration Designer You can use Windows Configuration Designer to create a provisioning package that you can use to change the Windows edition for your device(s). [Install Windows Configuration Designer from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4tx22) to create a provisioning package. 1. In Windows Configuration Designer, select **Provision desktop devices** to open the simple editor and create a provisioning package for Windows desktop editions. @@ -81,7 +81,7 @@ You can use Windows Configuration Designer to create a provisioning package that For more information about using Windows Configuration Designer, see [Set up student PCs to join domain](https://technet.microsoft.com/en-us/edu/windows/set-up-students-pcs-to-join-domain). -### change using the Activation page +### Change using the Activation page 1. On the Windows device that you want to change, open the **Settings** app. 2. Select **Update & security** > **Activation**, and then click **Change product key**. @@ -103,7 +103,7 @@ When you change to Windows 10 Pro Education, you get the following benefits: See [Roll back Windows 10 Pro Education to Windows 10 Pro](#roll-back-windows-10-pro-education-to-windows-10-pro) for more info. -### change using Microsoft Store for Education +### Change using Microsoft Store for Education Once you enable the setting to change to Windows 10 Pro Education, the change will begin only after a user signs in to their device. The setting applies to the entire organization or tenant, so you cannot select which users will receive the change. The change will only apply to Windows 10 Pro devices. **To turn on the automatic change to Windows 10 Pro Education** @@ -113,24 +113,24 @@ Once you enable the setting to change to Windows 10 Pro Education, the change wi If this is the first time you're signing into the Microsoft Store for Education, you'll be prompted to accept the Microsoft Store for Education Terms of Use. 2. Click **Manage** from the top menu and then select the **Benefits tile**. -3. In the **Benefits** tile, look for the **change to Windows 10 Pro Education for free** link and then click it. +3. In the **Benefits** tile, look for the **Change to Windows 10 Pro Education for free** link and then click it. -4. In the **change all your devices to Windows 10 Pro Education for free** page, check box next to **I understand enabling this setting will change all domain-joined devices running Windows 10 Pro in my organization**. +4. In the **Change all your devices to Windows 10 Pro Education for free** page, check box next to **I understand enabling this setting will change all domain-joined devices running Windows 10 Pro in my organization**. - **Figure 4** - Check the box to confirm + **Figure 3** - Check the box to confirm ![Check the box to confirm](images/msfe_manage_benefits_checktoconfirm.png) -5. Click **change all my devices**. +5. Click **Change all my devices**. A confirmation window pops up to let you know that an email has been sent to you to enable the change. 6. Close the confirmation window and check the email to proceed to the next step. -7. In the email, click the link to **change to Windows 10 Pro Education**. Once you click the link, this will take you back to the Microsoft Store for Education portal. +7. In the email, click the link to **Change to Windows 10 Pro Education**. Once you click the link, this will take you back to the Microsoft Store for Education portal. -8. Click **change now** in the **changing your device to Windows 10 Pro Education for free** page in the Microsoft Store. +8. Click **Change now** in the **changing your device to Windows 10 Pro Education for free** page in the Microsoft Store. - You will see a window that confirms you've successfully changeed all the devices in your organization to Windows 10 Pro Education, and each Azure AD joined device running Windows 10 Pro will automatically change the next time someone in your organization signs in to the device. + You will see a window that confirms you've successfully changed all the devices in your organization to Windows 10 Pro Education, and each Azure AD joined device running Windows 10 Pro will automatically change the next time someone in your organization signs in to the device. 9. Click **Close** in the **Success** window. @@ -142,7 +142,7 @@ Enabling the automatic change also triggers an email message notifying all globa So what will users experience? How will they change their devices? ### For existing Azure AD joined devices -Existing Azure AD domain joined devices will be changeed 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 changed to Windows 10 Pro Education the next time the user logs in. That's it! No additional steps are needed. ### For new devices that are not Azure AD joined Now that you've turned on the setting to automatically change to Windows 10 Pro Education, the users are ready to change their devices running Windows 10 Pro, version 1607 or higher, version 1703 to Windows 10 Pro Education edition. @@ -163,13 +163,13 @@ If the Windows device is running Windows 10, version 1703, follow these steps. 1. During initial device setup, on the **How would you like to set up?** page, select **Set up for an organization**, and then click **Next**. - **Figure 7** - Select how you'd like to set up the device + **Figure 4** - Select how you'd like to set up the device ![Select how you'd like to set up the device](images/1_howtosetup.png) 2. On the **Sign in with Microsoft** page, enter the username and password to use with Office 365 or other services from Microsoft, and then click **Next**. - **Figure 8** - Enter the account details + **Figure 5** - Enter the account details ![Enter the account details you use with Office 365 or other Microsoft services](images/2_signinwithms.png) @@ -182,21 +182,21 @@ If the Windows device is running Windows 10, version 1703, follow these steps. 1. Go to **Settings > Accounts > Access work or school**. - **Figure 9** - Go to **Access work or school** in Settings + **Figure 6** - Go to **Access work or school** in Settings ![Go to Access work or school in Settings](images/settings_workorschool_1.png) 2. In **Access work or school**, click **Connect**. 3. In the **Set up a work or school account** window, click the **Join this device to Azure Active Directory** option at the bottom. - **Figure 10** - Select the option to join the device to Azure Active Directory + **Figure 7** - Select the option to join the device to Azure Active Directory ![Select the option to join the device to Azure Active Directory](images/settings_setupworkorschoolaccount_2.png) 4. On the **Let's get you signed in** window, enter the Azure AD credentials (username and password) and sign in. This will join the device to the school's Azure AD. 5. To verify that the device was successfully joined to Azure AD, go back to **Settings > Accounts > Access work or school**. You should now see a connection under the **Connect to work or school** section that indicates the device is connected to Azure AD. - **Figure 11** - Verify the device connected to Azure AD + **Figure 8** - Verify the device connected to Azure AD ![Verify the device is connected to Azure AD](images/settings_connectedtoazuread_3.png) @@ -210,7 +210,7 @@ Once the device is joined to your Azure AD subscription, the user will sign in b You can verify the Windows 10 Pro Education in **Settings > Update & Security > Activation**. -**Figure 12** - Windows 10 Pro Education in Settings +**Figure 9** - Windows 10 Pro Education in Settings Windows 10 activated and subscription active @@ -225,12 +225,12 @@ In some instances, users may experience problems with the Windows 10 Pro Educat Use the following figures to help you troubleshoot when users experience these common problems: -**Figure 13** - Illustrates a device in a healthy state, where the existing operating system is activated, and the Windows 10 Pro Education change is active. +**Figure 10** - Illustrates a device in a healthy state, where the existing operating system is activated, and the Windows 10 Pro Education change is active. Windows 10 activated and subscription active

-**Figure 14** - Illustrates a device on which the existing operating system is not activated, but the Windows 10 Pro Education change is active. +**Figure 11** - Illustrates a device on which the existing operating system is not activated, but the Windows 10 Pro Education change is active. Windows 10 not activated and subscription active

@@ -260,7 +260,7 @@ Devices must be running Windows 10 Pro, version 1607 or higher, or domain joined A popup window will display the Windows 10 version number and detailed OS build information. > [!NOTE] - > If a device is running a previous version of Windows 10 Pro (for example, version 1511), it will not be changeed 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 changed 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 @@ -269,10 +269,10 @@ If your organization has the Windows 10 Pro to Windows 10 Pro Education change e - Logging into Microsoft Store for Education page and turning off the automatic change. - Selecting the link to turn off the automatic change from the notification email sent to all global administrators. -Once the automatic change to Windows 10 Pro Education is turned off, the change is effective immediately. Devices that were changeed 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 changeed may not immediately see Windows 10 Pro Education rolled back to Windows 10 Pro for up to 30 days. However, users who haven't signed in during the time that a change was enabled and then turned off will never see their device change from Windows 10 Pro. +Once the automatic change to Windows 10 Pro Education is turned off, the change is effective immediately. Devices that were changed 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 changed may not immediately see Windows 10 Pro Education rolled back to Windows 10 Pro for up to 30 days. However, users who haven't signed in during the time that a change was enabled and then turned off will never see their device change from Windows 10 Pro. > [!NOTE] -> Devices that were changeed from mode to Windows 10 Pro Education cannot roll back to Windows 10 Pro Education S mode. +> Devices that were changed from mode to Windows 10 Pro Education cannot roll back to Windows 10 Pro Education S mode. **To roll back Windows 10 Pro Education to Windows 10 Pro** @@ -280,7 +280,7 @@ Once the automatic change to Windows 10 Pro Education is turned off, the change 2. Select **Manage > Benefits** and locate the section **Windows 10 Pro Education** and follow the link. 3. In the **Revert to Windows 10 Pro** page, click **Revert to Windows 10 Pro**. - **Figure 15** - Revert to Windows 10 Pro + **Figure 12** - Revert to Windows 10 Pro ![Revert to Windows 10 Pro](images/msfe_manage_reverttowin10pro.png) @@ -296,9 +296,9 @@ If you have on-premises Active Directory Domain Services (AD DS) domains, users You need to synchronize these identities so that users will have a *single identity* that they can use to access their on-premises apps and cloud services that use Azure AD (such as Windows 10 Pro Education). This means that users can use their existing credentials to sign in to Azure AD and access the cloud services that you provide and manage for them. -Figure 11 illustrates the integration between the on-premises AD DS domain with Azure AD. [Microsoft Azure Active Directory Connect](https://www.microsoft.com/en-us/download/details.aspx?id=47594) (Azure AD Connect) is responsible for synchronization of identities between the on-premises AD DS domain and Azure AD. Azure AD Connect is a service that you can install on-premises or in a virtual machine in Azure. +(Azure AD Connect) is responsible for synchronization of identities between the on-premises AD DS domain and Azure AD. Azure AD Connect is a service that you can install on-premises or in a virtual machine in Azure. -**Figure 16** - On-premises AD DS integrated with Azure AD +**Figure 13** - On-premises AD DS integrated with Azure AD ![Illustration of Azure Active Directory Connect](images/windows-ad-connect.png) diff --git a/windows/deployment/windows-10-pro-in-s-mode.md b/windows/deployment/windows-10-pro-in-s-mode.md index bab515eeed..db34074133 100644 --- a/windows/deployment/windows-10-pro-in-s-mode.md +++ b/windows/deployment/windows-10-pro-in-s-mode.md @@ -63,4 +63,4 @@ You'll be prompted to save your files before the switch starts. Follow the promp [Compare Windows 10 editions](https://www.microsoft.com/WindowsForBusiness/Compare)
[Windows 10 Pro Education](https://docs.microsoft.com/education/windows/test-windows10s-for-edu)
-[Introdiction to Microsoft Intune in the Azure portal](https://docs.microsoft.com/en-us/intune/what-is-intune) +[Introduction to Microsoft Intune in the Azure portal](https://docs.microsoft.com/en-us/intune/what-is-intune) From 96061b10e7fa8d214577809445fcb513934b9a1c Mon Sep 17 00:00:00 2001 From: MikeBlodge Date: Wed, 2 May 2018 13:50:46 -0700 Subject: [PATCH 2/2] edited sequential numbering to be accurate --- education/windows/switch-to-pro-education.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/education/windows/switch-to-pro-education.md b/education/windows/switch-to-pro-education.md index 816baa12a2..190b45e980 100644 --- a/education/windows/switch-to-pro-education.md +++ b/education/windows/switch-to-pro-education.md @@ -308,6 +308,6 @@ For more information about integrating on-premises AD DS domains with Azure AD, ## Related topics -[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) +[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)
[Compare Windows 10 editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)