diff --git a/education/windows/autopilot-reset.md b/education/windows/autopilot-reset.md index ad98be350e..0e328b18b4 100644 --- a/education/windows/autopilot-reset.md +++ b/education/windows/autopilot-reset.md @@ -61,7 +61,7 @@ You can set the policy using one of these methods: - When using [Set up School PCs](use-set-up-school-pcs-app.md), in the **Configure student PC settings** screen, select **Enable Windows 10 Autopilot Reset** among the list of settings for the student PC as shown in the following example: - ![Configure student PC settings in Set up School PCs.](images/suspc_configure_pc2.jpg) + ![Configure student PC settings in Set up School PCs.](images/suspcs/suspc_configure_pc2.jpg) ## Trigger Autopilot Reset Autopilot Reset is a two-step process: trigger it and then authenticate. Once you've done these two steps, you can let the process execute and once it's done, the device is again ready for use. diff --git a/education/windows/change-to-pro-education.md b/education/windows/change-to-pro-education.md index 3c0e5424ee..4b5676f845 100644 --- a/education/windows/change-to-pro-education.md +++ b/education/windows/change-to-pro-education.md @@ -81,7 +81,7 @@ You can use Windows Configuration Designer to create a provisioning package that **Figure 2** - Enter the license key - ![Enter the license key to change to Windows 10 Pro Education.](images/wcd_productkey.png) + ![Enter the license key to change to Windows 10 Pro Education.](images/wcd/wcd_productkey.png) 3. Complete the rest of the process for creating a provisioning package and then apply the package to the devices you want to change to Windows 10 Pro Education. @@ -170,16 +170,8 @@ 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 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 5** - Enter the account details - - ![Enter the account details you use with Office 365 or other Microsoft services.](images/2_signinwithms.png) - 3. Go through the rest of Windows device setup. Once you're done, the device will be Azure AD joined to your school's subscription. @@ -305,10 +297,6 @@ You need to synchronize these identities so that users will have a *single ident (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 13** - On-premises AD DS integrated with Azure AD - -![Illustration of Azure Active Directory Connect.](images/windows-ad-connect.png) - For more information about integrating on-premises AD DS domains with Azure AD, see these resources: - [Integrating your on-premises identities with Azure Active Directory](/azure/active-directory/hybrid/whatis-hybrid-identity) - [Azure AD + Domain Join + Windows 10](https://blogs.technet.microsoft.com/enterprisemobility/2016/02/17/azure-ad-domain-join-windows-10/) diff --git a/education/windows/configure-windows-for-education.md b/education/windows/configure-windows-for-education.md index 4b876aa023..a10edc3964 100644 --- a/education/windows/configure-windows-for-education.md +++ b/education/windows/configure-windows-for-education.md @@ -92,20 +92,14 @@ Use one of these methods to set this policy. - 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](/windows/configuration/provisioning-packages/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's a policy node in the [SharedPC configuration service provider](/windows/client-management/mdm/sharedpc-csp). diff --git a/education/windows/deploy-windows-10-overview.md b/education/windows/deploy-windows-10-overview.md index 3977c5f664..7fe730e070 100644 --- a/education/windows/deploy-windows-10-overview.md +++ b/education/windows/deploy-windows-10-overview.md @@ -19,9 +19,7 @@ appliesto: # Windows 10 for Education -![Windows 10 Education and Windows 10 Pro Education.](images/windows-10-for-education-banner.png) - -## ![Learn more about Windows.](images/education.png) Learn +## Learn **[Windows 10 editions for education customers](windows-editions-for-education-customers.md)** @@ -35,7 +33,7 @@ Find out more about the features and functionality we support in each edition of When you've made your decision, find out how to buy Windows for your school. -## ![Plan for Windows 10 in your school.](images/clipboard.png) Plan +## Plan **[Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)** @@ -57,7 +55,7 @@ Take a Test is a new app that lets you create the right environment for taking t Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment. -## ![Deploy Windows 10 for Education.](images/PCicon.png) Deploy +## Deploy **[Set up Windows devices for education](set-up-windows-10.md)** @@ -75,7 +73,7 @@ Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across Test Windows 10 S on various Windows 10 devices (except Windows 10 Home) in your school and share your feedback with us. -## ![Switch to Windows 10 for Education.](images/windows.png) Switch +## Switch **[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](change-to-pro-education.md)** diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md index c29d3d4a47..62d41af22e 100644 --- a/education/windows/edu-deployment-recommendations.md +++ b/education/windows/edu-deployment-recommendations.md @@ -26,21 +26,17 @@ We want all students to have the chance to use the apps they need for success in Keep these best practices in mind when deploying any edition of Windows 10 in schools or districts: -* A Microsoft account is only intended for consumer services. Enterprises and educational institutions should use enterprise versions where possible, such as Skype for Business, OneDrive for Business, and so on. For schools, consider using mobile device management (MDM) or Group Policy to block students from adding a Microsoft account as a secondary account. - -* If schools allow the use of personal accounts by their students to access personal services, schools should be aware that these accounts belong to individuals, not the school. - -* IT administrators, school officials, and teachers should also consider ratings when picking apps from the Microsoft Store. - -* If you've students or school personnel who rely on assistive technology apps that aren't available in the Microsoft Store for Education, and who are using a Windows 10 S device, configure their device to Windows 10 Pro Education to allow the download and use of non-Microsoft Store assistive technology apps. See [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](change-to-pro-education.md) for more info. +* A Microsoft account is only intended for consumer services. Enterprises and educational institutions should use enterprise versions where possible, such as Skype for Business, OneDrive for Business, and so on. For schools, consider using mobile device management (MDM) or Group Policy to block students from adding a Microsoft account as a secondary account +* If schools allow the use of personal accounts by their students to access personal services, schools should be aware that these accounts belong to individuals, not the school +* IT administrators, school officials, and teachers should also consider ratings when picking apps from the Microsoft Store +* If you've students or school personnel who rely on assistive technology apps that aren't available in the Microsoft Store for Education, and who are using a Windows 10 S device, configure their device to Windows 10 Pro Education to allow the download and use of non-Microsoft Store assistive technology apps. See [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](change-to-pro-education.md) for more info ## Windows 10 Contacts privacy settings If you’re an IT administrator who deploys Windows 10 in a school or district, we recommend that you review these deployment resources to make informed decisions about how you can configure telemetry for your school or district: -* [Configure Windows telemetry in your organization](/windows/privacy/configure-windows-diagnostic-data-in-your-organization) - Describes the types of telemetry we gather and the ways you can manage this data. - -* [Manage connections from Windows operating system components to Microsoft services](/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services) - Learn about network connections that Windows components make to Microsoft and also the privacy settings (such as location, camera, messaging, and more) that affect data that is shared with either Microsoft or apps and how you can manage this data. +* [Configure Windows telemetry in your organization](/windows/privacy/configure-windows-diagnostic-data-in-your-organization) - Describes the types of telemetry we gather and the ways you can manage this data +* [Manage connections from Windows operating system components to Microsoft services](/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services) - Learn about network connections that Windows components make to Microsoft and also the privacy settings (such as location, camera, messaging, and more) that affect data that is shared with either Microsoft or apps and how you can manage this data In particular, the **Contacts** area in the **Settings** > **Privacy** section lets you choose which apps can access a student’s contacts list. By default, this setting is turned on. @@ -53,37 +49,24 @@ 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/win10_settings_privacy.png) - -2. Under the list of **Privacy** areas, select **Contacts**. - - ![Contacts privacy settings.](images/win10_settings_privacy_contacts.png) - -3. Turn off **Let apps access my contacts**. +1. Under the list of **Privacy** areas, select **Contacts**. +1. Turn off **Let apps access my contacts**. For IT-managed Windows devices, you can use a Group Policy to turn off the setting. To turn off the setting: 1. Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **App Privacy** > **Let Windows apps access contacts**. - -2. Set the **Select a setting** box to **Force Deny**. +1. Set the **Select a setting** box to **Force Deny**. ### 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/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've installed and which of these apps access contacts. 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/gp_letwinappsaccesscontacts.png) - +- 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 ## Skype and Xbox settings @@ -108,10 +91,8 @@ Skype uses the user’s contact details to deliver important information about t 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_uwp_userprofile_icon.png) to go to the user’s profile page. - +1. In the Skype UWP app, select the user profile icon to go to the user's profile page. 2. In the account page, select **Manage account** for the Skype account that you want to change. This will take you to the online Skype portal. - 3. In the online Skype portal, scroll down to the **Account details** section. In **Settings and preferences**, click **Edit profile**. The profile page includes these sections: @@ -121,16 +102,11 @@ To manage and edit your profile in the Skype UWP app, follow these steps: * Profile settings 4. Review the information in each section and click **Edit profile** in either or both the **Personal information** and **Contact details** sections to change the information being shared. You can also remove the checks in the **Profile settings** section to change settings on discoverability, notifications, and staying in touch. - 5. If you don't 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. - ![The icon for Skype profile.](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 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**. + * 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 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 @@ -150,10 +126,9 @@ To delete a Skype account, you can follow the instructions here: [How do I close If you need help with deleting the account, you can contact Skype customer service by going to the [Skype support request page](https://go.microsoft.com/fwlink/?LinkId=816519). You may need to sign in and specify a Skype account. Once you’ve signed in, you can: 1. Select a help topic (**Account and Password**) -2. Select a related problem (**Deleting an account**) -3. Click **Next**. -4. Select a contact method to get answers to your questions. - +1. Select a related problem (**Deleting an account**) +1. Click **Next**. +1. Select a contact method to get answers to your questions. #### Xbox diff --git a/education/windows/education-scenarios-store-for-business.md b/education/windows/education-scenarios-store-for-business.md index 0a06370a11..121dc4f77b 100644 --- a/education/windows/education-scenarios-store-for-business.md +++ b/education/windows/education-scenarios-store-for-business.md @@ -44,8 +44,6 @@ Admins can control whether or not teachers are automatically assigned the **Basi 2. Click **Manage**, and then click **Settings**. 3. On **Shop**, select or clear **Make everyone a Basic Purchaser**. -![manage settings to control Basic Purchaser role assignment.](images/sfe-make-everyone-bp.png) - > [!NOTE] > **Make everyone a Basic Purchaser** is on by default. @@ -57,7 +55,6 @@ When **Make everyone a Basic Purchaser** is turned off, admins can manually assi 2. Click **Manage**, and then choose **Permissions**. 3. On **Roles**, click **Assign roles**, type and select a name, choose the role you want to assign, and then click **Save**. - ![Permission page for Microsoft Store for Business.](images/sfe-roles.png) **Blocked Basic Purchasers** diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index a29c2d277f..fa858b7bfb 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -36,8 +36,4 @@ Teachers and IT administrators can now get access to **Minecraft: Education Edit - Office 365 Education, which includes online versions of Office apps plus 1 TB online storage. [Sign up your school for Office 365 Education.](https://www.microsoft.com/education/products/office) - If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](/windows/client-management/mdm/register-your-free-azure-active-directory-subscription) - - - - [Learn how IT administrators can get and distribute **Minecraft: Education Edition**](school-get-minecraft.md), and how to manage permissions for Minecraft. diff --git a/education/windows/images/1_howtosetup.png b/education/windows/images/1_howtosetup.png deleted file mode 100644 index 7eb8222ed3..0000000000 Binary files a/education/windows/images/1_howtosetup.png and /dev/null differ diff --git a/education/windows/images/2_signinwithms.png b/education/windows/images/2_signinwithms.png deleted file mode 100644 index e4b5f27f12..0000000000 Binary files a/education/windows/images/2_signinwithms.png and /dev/null differ diff --git a/education/windows/images/ICDstart-option.PNG b/education/windows/images/ICDstart-option.PNG deleted file mode 100644 index 1ba49bb261..0000000000 Binary files a/education/windows/images/ICDstart-option.PNG and /dev/null differ diff --git a/education/windows/images/PCicon.png b/education/windows/images/PCicon.png deleted file mode 100644 index c97c137b83..0000000000 Binary files a/education/windows/images/PCicon.png and /dev/null differ diff --git a/education/windows/images/allowcortana_gp.PNG b/education/windows/images/allowcortana_gp.PNG deleted file mode 100644 index 7adf1b7594..0000000000 Binary files a/education/windows/images/allowcortana_gp.PNG and /dev/null differ diff --git a/education/windows/images/allowcortana_omauri.PNG b/education/windows/images/allowcortana_omauri.PNG deleted file mode 100644 index 303c89ed5f..0000000000 Binary files a/education/windows/images/allowcortana_omauri.PNG and /dev/null differ diff --git a/education/windows/images/allowcortana_wcd.PNG b/education/windows/images/allowcortana_wcd.PNG deleted file mode 100644 index 5e62e0bb01..0000000000 Binary files a/education/windows/images/allowcortana_wcd.PNG and /dev/null differ diff --git a/education/windows/images/app-distribution-options.PNG b/education/windows/images/app-distribution-options.PNG deleted file mode 100644 index 75b3374720..0000000000 Binary files a/education/windows/images/app-distribution-options.PNG and /dev/null differ diff --git a/education/windows/images/app-privacy-group-policy.png b/education/windows/images/app-privacy-group-policy.png deleted file mode 100644 index 96a5f0380a..0000000000 Binary files a/education/windows/images/app-privacy-group-policy.png and /dev/null differ diff --git a/education/windows/images/app1.jpg b/education/windows/images/app1.jpg deleted file mode 100644 index aef6c5c22e..0000000000 Binary files a/education/windows/images/app1.jpg and /dev/null differ diff --git a/education/windows/images/azuread_usersandgroups_allusers_automaticaccounts.png b/education/windows/images/azuread_usersandgroups_allusers_automaticaccounts.png deleted file mode 100644 index f0549797a0..0000000000 Binary files a/education/windows/images/azuread_usersandgroups_allusers_automaticaccounts.png and /dev/null differ diff --git a/education/windows/images/azuread_usersandgroups_devicesettings_maxnumberofdevicesperuser.png b/education/windows/images/azuread_usersandgroups_devicesettings_maxnumberofdevicesperuser.png deleted file mode 100644 index 37ea63cda2..0000000000 Binary files a/education/windows/images/azuread_usersandgroups_devicesettings_maxnumberofdevicesperuser.png and /dev/null differ diff --git a/education/windows/images/azuread_usersandgroups_devicesettings_requiremultifactorauth.png b/education/windows/images/azuread_usersandgroups_devicesettings_requiremultifactorauth.png deleted file mode 100644 index 1b8389b1f5..0000000000 Binary files a/education/windows/images/azuread_usersandgroups_devicesettings_requiremultifactorauth.png and /dev/null differ diff --git a/education/windows/images/azuread_usersandgroups_devicesettings_usersmayjoin.png b/education/windows/images/azuread_usersandgroups_devicesettings_usersmayjoin.png deleted file mode 100644 index 40a603cf64..0000000000 Binary files a/education/windows/images/azuread_usersandgroups_devicesettings_usersmayjoin.png and /dev/null differ diff --git a/education/windows/images/checkmark.png b/education/windows/images/checkmark.png deleted file mode 100644 index f9f04cd6bd..0000000000 Binary files a/education/windows/images/checkmark.png and /dev/null differ diff --git a/education/windows/images/choose-package-icd.png b/education/windows/images/choose-package-icd.png deleted file mode 100644 index 2bf7a18648..0000000000 Binary files a/education/windows/images/choose-package-icd.png and /dev/null differ diff --git a/education/windows/images/clipboard.png b/education/windows/images/clipboard.png deleted file mode 100644 index bbfa2c9e8d..0000000000 Binary files a/education/windows/images/clipboard.png and /dev/null differ diff --git a/education/windows/images/connect-aad.png b/education/windows/images/connect-aad.png deleted file mode 100644 index 8583866165..0000000000 Binary files a/education/windows/images/connect-aad.png and /dev/null differ diff --git a/education/windows/images/connect-ad.png b/education/windows/images/connect-ad.png deleted file mode 100644 index 4da67e8cdd..0000000000 Binary files a/education/windows/images/connect-ad.png and /dev/null differ diff --git a/education/windows/images/crossmark.png b/education/windows/images/crossmark.png deleted file mode 100644 index 69432ff71c..0000000000 Binary files a/education/windows/images/crossmark.png and /dev/null differ diff --git a/education/windows/images/education.png b/education/windows/images/education.png deleted file mode 100644 index cc4f7fabb2..0000000000 Binary files a/education/windows/images/education.png and /dev/null differ diff --git a/education/windows/images/enter-email.PNG b/education/windows/images/enter-email.PNG deleted file mode 100644 index 644d893f06..0000000000 Binary files a/education/windows/images/enter-email.PNG and /dev/null differ diff --git a/education/windows/images/express-settings.png b/education/windows/images/express-settings.png deleted file mode 100644 index 99e9c4825a..0000000000 Binary files a/education/windows/images/express-settings.png and /dev/null differ diff --git a/education/windows/images/get-app-store.png b/education/windows/images/get-app-store.png deleted file mode 100644 index 14ae888425..0000000000 Binary files a/education/windows/images/get-app-store.png and /dev/null differ diff --git a/education/windows/images/get-mcee-promo.png b/education/windows/images/get-mcee-promo.png deleted file mode 100644 index 823631367d..0000000000 Binary files a/education/windows/images/get-mcee-promo.png and /dev/null differ diff --git a/education/windows/images/get-the-app.PNG b/education/windows/images/get-the-app.PNG deleted file mode 100644 index 0692ae6f7f..0000000000 Binary files a/education/windows/images/get-the-app.PNG and /dev/null differ diff --git a/education/windows/images/gp_letwinappsaccesscontacts.PNG b/education/windows/images/gp_letwinappsaccesscontacts.PNG deleted file mode 100644 index 0228c9474b..0000000000 Binary files a/education/windows/images/gp_letwinappsaccesscontacts.PNG and /dev/null differ diff --git a/education/windows/images/i4e_trialsigninpage.PNG b/education/windows/images/i4e_trialsigninpage.PNG deleted file mode 100644 index 5945ce3170..0000000000 Binary files a/education/windows/images/i4e_trialsigninpage.PNG and /dev/null differ diff --git a/education/windows/images/icd-adv-shared-pc.PNG b/education/windows/images/icd-adv-shared-pc.PNG deleted file mode 100644 index a8da5fa78a..0000000000 Binary files a/education/windows/images/icd-adv-shared-pc.PNG and /dev/null differ diff --git a/education/windows/images/icd-school-adv-edit.png b/education/windows/images/icd-school-adv-edit.png deleted file mode 100644 index 16843cc010..0000000000 Binary files a/education/windows/images/icd-school-adv-edit.png and /dev/null differ diff --git a/education/windows/images/icd-school.PNG b/education/windows/images/icd-school.PNG deleted file mode 100644 index e6a944a193..0000000000 Binary files a/education/windows/images/icd-school.PNG and /dev/null differ diff --git a/education/windows/images/icd-simple.PNG b/education/windows/images/icd-simple.PNG deleted file mode 100644 index 7ae8a1728b..0000000000 Binary files a/education/windows/images/icd-simple.PNG and /dev/null differ diff --git a/education/windows/images/icdbrowse.png b/education/windows/images/icdbrowse.png deleted file mode 100644 index 53c91074c7..0000000000 Binary files a/education/windows/images/icdbrowse.png and /dev/null differ diff --git a/education/windows/images/it-get-app.PNG b/education/windows/images/it-get-app.PNG deleted file mode 100644 index 9740081ef4..0000000000 Binary files a/education/windows/images/it-get-app.PNG and /dev/null differ diff --git a/education/windows/images/license-terms.png b/education/windows/images/license-terms.png deleted file mode 100644 index 8dd34b0a18..0000000000 Binary files a/education/windows/images/license-terms.png and /dev/null differ diff --git a/education/windows/images/lightbulb.png b/education/windows/images/lightbulb.png deleted file mode 100644 index 95bea10957..0000000000 Binary files a/education/windows/images/lightbulb.png and /dev/null differ diff --git a/education/windows/images/list.png b/education/windows/images/list.png deleted file mode 100644 index 089827c373..0000000000 Binary files a/education/windows/images/list.png and /dev/null differ diff --git a/education/windows/images/mc-assign-to-others-admin.png b/education/windows/images/mc-assign-to-others-admin.png deleted file mode 100644 index 907f21d514..0000000000 Binary files a/education/windows/images/mc-assign-to-others-admin.png and /dev/null differ diff --git a/education/windows/images/mc-assign-to-others-teacher.png b/education/windows/images/mc-assign-to-others-teacher.png deleted file mode 100644 index 2656e9c784..0000000000 Binary files a/education/windows/images/mc-assign-to-others-teacher.png and /dev/null differ diff --git a/education/windows/images/mc-check-for-updates.png b/education/windows/images/mc-check-for-updates.png deleted file mode 100644 index a9a0fbae5f..0000000000 Binary files a/education/windows/images/mc-check-for-updates.png and /dev/null differ diff --git a/education/windows/images/mc-dnld-others-admin.png b/education/windows/images/mc-dnld-others-admin.png deleted file mode 100644 index 5e253c20d1..0000000000 Binary files a/education/windows/images/mc-dnld-others-admin.png and /dev/null differ diff --git a/education/windows/images/mc-dnld-others-teacher.png b/education/windows/images/mc-dnld-others-teacher.png deleted file mode 100644 index aa5df16595..0000000000 Binary files a/education/windows/images/mc-dnld-others-teacher.png and /dev/null differ diff --git a/education/windows/images/mc-ee-video-icon.png b/education/windows/images/mc-ee-video-icon.png deleted file mode 100644 index 61c8a0f681..0000000000 Binary files a/education/windows/images/mc-ee-video-icon.png and /dev/null differ diff --git a/education/windows/images/mc-install-for-me-admin.png b/education/windows/images/mc-install-for-me-admin.png deleted file mode 100644 index f9194a6188..0000000000 Binary files a/education/windows/images/mc-install-for-me-admin.png and /dev/null differ diff --git a/education/windows/images/mc-install-for-me-teacher.png b/education/windows/images/mc-install-for-me-teacher.png deleted file mode 100644 index e303e63660..0000000000 Binary files a/education/windows/images/mc-install-for-me-teacher.png and /dev/null differ diff --git a/education/windows/images/microsoft-education-workflow.png b/education/windows/images/microsoft-education-workflow.png deleted file mode 100644 index f15aa3f783..0000000000 Binary files a/education/windows/images/microsoft-education-workflow.png and /dev/null differ diff --git a/education/windows/images/minecraft.PNG b/education/windows/images/minecraft.PNG deleted file mode 100644 index c758c28ad5..0000000000 Binary files a/education/windows/images/minecraft.PNG and /dev/null differ diff --git a/education/windows/images/mcee-add-payment-method.png b/education/windows/images/minecraft/mcee-add-payment-method.png similarity index 100% rename from education/windows/images/mcee-add-payment-method.png rename to education/windows/images/minecraft/mcee-add-payment-method.png diff --git a/education/windows/images/mcee-auto-assign-bd.png b/education/windows/images/minecraft/mcee-auto-assign-bd.png similarity index 100% rename from education/windows/images/mcee-auto-assign-bd.png rename to education/windows/images/minecraft/mcee-auto-assign-bd.png diff --git a/education/windows/images/mcee-auto-assign-legacy.png b/education/windows/images/minecraft/mcee-auto-assign-legacy.png similarity index 100% rename from education/windows/images/mcee-auto-assign-legacy.png rename to education/windows/images/minecraft/mcee-auto-assign-legacy.png diff --git a/education/windows/images/mcee-benefits.png b/education/windows/images/minecraft/mcee-benefits.png similarity index 100% rename from education/windows/images/mcee-benefits.png rename to education/windows/images/minecraft/mcee-benefits.png diff --git a/education/windows/images/mcee-icon.png b/education/windows/images/minecraft/mcee-icon.png similarity index 100% rename from education/windows/images/mcee-icon.png rename to education/windows/images/minecraft/mcee-icon.png diff --git a/education/windows/images/mcee-invoice-bills.PNG b/education/windows/images/minecraft/mcee-invoice-bills.PNG similarity index 100% rename from education/windows/images/mcee-invoice-bills.PNG rename to education/windows/images/minecraft/mcee-invoice-bills.PNG diff --git a/education/windows/images/mcee-invoice-info.png b/education/windows/images/minecraft/mcee-invoice-info.png similarity index 100% rename from education/windows/images/mcee-invoice-info.png rename to education/windows/images/minecraft/mcee-invoice-info.png diff --git a/education/windows/images/mcee-view-bills.png b/education/windows/images/minecraft/mcee-view-bills.png similarity index 100% rename from education/windows/images/mcee-view-bills.png rename to education/windows/images/minecraft/mcee-view-bills.png diff --git a/education/windows/images/minecraft-admin-permissions.png b/education/windows/images/minecraft/minecraft-admin-permissions.png similarity index 100% rename from education/windows/images/minecraft-admin-permissions.png rename to education/windows/images/minecraft/minecraft-admin-permissions.png diff --git a/education/windows/images/minecraft-assign-roles-2.png b/education/windows/images/minecraft/minecraft-assign-roles-2.png similarity index 100% rename from education/windows/images/minecraft-assign-roles-2.png rename to education/windows/images/minecraft/minecraft-assign-roles-2.png diff --git a/education/windows/images/minecraft-assign-roles.png b/education/windows/images/minecraft/minecraft-assign-roles.png similarity index 100% rename from education/windows/images/minecraft-assign-roles.png rename to education/windows/images/minecraft/minecraft-assign-roles.png diff --git a/education/windows/images/minecraft-assign-to-others.png b/education/windows/images/minecraft/minecraft-assign-to-others.png similarity index 100% rename from education/windows/images/minecraft-assign-to-others.png rename to education/windows/images/minecraft/minecraft-assign-to-others.png diff --git a/education/windows/images/minecraft-assign-to-people-name.png b/education/windows/images/minecraft/minecraft-assign-to-people-name.png similarity index 100% rename from education/windows/images/minecraft-assign-to-people-name.png rename to education/windows/images/minecraft/minecraft-assign-to-people-name.png diff --git a/education/windows/images/minecraft-assign-to-people.png b/education/windows/images/minecraft/minecraft-assign-to-people.png similarity index 100% rename from education/windows/images/minecraft-assign-to-people.png rename to education/windows/images/minecraft/minecraft-assign-to-people.png diff --git a/education/windows/images/minecraft-get-the-app.png b/education/windows/images/minecraft/minecraft-get-the-app.png similarity index 100% rename from education/windows/images/minecraft-get-the-app.png rename to education/windows/images/minecraft/minecraft-get-the-app.png diff --git a/education/windows/images/minecraft-in-windows-store-app.png b/education/windows/images/minecraft/minecraft-in-windows-store-app.png similarity index 100% rename from education/windows/images/minecraft-in-windows-store-app.png rename to education/windows/images/minecraft/minecraft-in-windows-store-app.png diff --git a/education/windows/images/minecraft-my-library.png b/education/windows/images/minecraft/minecraft-my-library.png similarity index 100% rename from education/windows/images/minecraft-my-library.png rename to education/windows/images/minecraft/minecraft-my-library.png diff --git a/education/windows/images/minecraft-perms.PNG b/education/windows/images/minecraft/minecraft-perms.PNG similarity index 100% rename from education/windows/images/minecraft-perms.PNG rename to education/windows/images/minecraft/minecraft-perms.PNG diff --git a/education/windows/images/minecraft-private-store.png b/education/windows/images/minecraft/minecraft-private-store.png similarity index 100% rename from education/windows/images/minecraft-private-store.png rename to education/windows/images/minecraft/minecraft-private-store.png diff --git a/education/windows/images/minecraft-student-install-email.png b/education/windows/images/minecraft/minecraft-student-install-email.png similarity index 100% rename from education/windows/images/minecraft-student-install-email.png rename to education/windows/images/minecraft/minecraft-student-install-email.png diff --git a/education/windows/images/msfe-device-promo-success.png b/education/windows/images/msfe-device-promo-success.png deleted file mode 100644 index 590a488c11..0000000000 Binary files a/education/windows/images/msfe-device-promo-success.png and /dev/null differ diff --git a/education/windows/images/msfe_clickemaillink_switchtoproedu.png b/education/windows/images/msfe_clickemaillink_switchtoproedu.png deleted file mode 100644 index ca70e35a6a..0000000000 Binary files a/education/windows/images/msfe_clickemaillink_switchtoproedu.png and /dev/null differ diff --git a/education/windows/images/msfe_manage.png b/education/windows/images/msfe_manage.png deleted file mode 100644 index 0fd5802786..0000000000 Binary files a/education/windows/images/msfe_manage.png and /dev/null differ diff --git a/education/windows/images/msfe_manage_benefits_switchtoproedu.png b/education/windows/images/msfe_manage_benefits_switchtoproedu.png deleted file mode 100644 index 12ba470cc9..0000000000 Binary files a/education/windows/images/msfe_manage_benefits_switchtoproedu.png and /dev/null differ diff --git a/education/windows/images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png b/education/windows/images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png deleted file mode 100644 index 581a1c1e8c..0000000000 Binary files a/education/windows/images/msfe_switchtoproedu_globaladminsemail_cancelswitch.png and /dev/null differ diff --git a/education/windows/images/oobe.jpg b/education/windows/images/oobe.jpg deleted file mode 100644 index 53a5dab6bf..0000000000 Binary files a/education/windows/images/oobe.jpg and /dev/null differ diff --git a/education/windows/images/package.png b/education/windows/images/package.png deleted file mode 100644 index f5e975e3e9..0000000000 Binary files a/education/windows/images/package.png and /dev/null differ diff --git a/education/windows/images/privacy-contacts-marked.png b/education/windows/images/privacy-contacts-marked.png deleted file mode 100644 index 54a3116408..0000000000 Binary files a/education/windows/images/privacy-contacts-marked.png and /dev/null differ diff --git a/education/windows/images/proof-of-purchase.png b/education/windows/images/proof-of-purchase.png deleted file mode 100644 index dd78d6329d..0000000000 Binary files a/education/windows/images/proof-of-purchase.png and /dev/null differ diff --git a/education/windows/images/prov.jpg b/education/windows/images/prov.jpg deleted file mode 100644 index 1593ccb36b..0000000000 Binary files a/education/windows/images/prov.jpg and /dev/null differ diff --git a/education/windows/images/school.PNG b/education/windows/images/school.PNG deleted file mode 100644 index f8be255a05..0000000000 Binary files a/education/windows/images/school.PNG and /dev/null differ diff --git a/education/windows/images/settings-contacts-app-marked.png b/education/windows/images/settings-contacts-app-marked.png deleted file mode 100644 index 94523f1b36..0000000000 Binary files a/education/windows/images/settings-contacts-app-marked.png and /dev/null differ diff --git a/education/windows/images/settings-privacy-marked.png b/education/windows/images/settings-privacy-marked.png deleted file mode 100644 index 513e9b1afc..0000000000 Binary files a/education/windows/images/settings-privacy-marked.png and /dev/null differ diff --git a/education/windows/images/setup-app-1-access.png b/education/windows/images/setup-app-1-access.png deleted file mode 100644 index 1de1081d1d..0000000000 Binary files a/education/windows/images/setup-app-1-access.png and /dev/null differ diff --git a/education/windows/images/setup-app-1-usb.png b/education/windows/images/setup-app-1-usb.png deleted file mode 100644 index b2d170244f..0000000000 Binary files a/education/windows/images/setup-app-1-usb.png and /dev/null differ diff --git a/education/windows/images/setup-app-1-wifi-manual.png b/education/windows/images/setup-app-1-wifi-manual.png deleted file mode 100644 index 92de4f784c..0000000000 Binary files a/education/windows/images/setup-app-1-wifi-manual.png and /dev/null differ diff --git a/education/windows/images/setup-app-1-wifi.png b/education/windows/images/setup-app-1-wifi.png deleted file mode 100644 index 9f305e081c..0000000000 Binary files a/education/windows/images/setup-app-1-wifi.png and /dev/null differ diff --git a/education/windows/images/setup-app-1.PNG b/education/windows/images/setup-app-1.PNG deleted file mode 100644 index 1b88c5ac31..0000000000 Binary files a/education/windows/images/setup-app-1.PNG and /dev/null differ diff --git a/education/windows/images/setup-app-2-directions.png b/education/windows/images/setup-app-2-directions.png deleted file mode 100644 index f245aafb2b..0000000000 Binary files a/education/windows/images/setup-app-2-directions.png and /dev/null differ diff --git a/education/windows/images/setup-app-3-directions.png b/education/windows/images/setup-app-3-directions.png deleted file mode 100644 index f593ea7371..0000000000 Binary files a/education/windows/images/setup-app-3-directions.png and /dev/null differ diff --git a/education/windows/images/setup-app-all-done.png b/education/windows/images/setup-app-all-done.png deleted file mode 100644 index af7343f0e5..0000000000 Binary files a/education/windows/images/setup-app-all-done.png and /dev/null differ diff --git a/education/windows/images/setup-options.png b/education/windows/images/setup-options.png deleted file mode 100644 index 07d29576a0..0000000000 Binary files a/education/windows/images/setup-options.png and /dev/null differ diff --git a/education/windows/images/setupmsg.jpg b/education/windows/images/setupmsg.jpg deleted file mode 100644 index 12935483c5..0000000000 Binary files a/education/windows/images/setupmsg.jpg and /dev/null differ diff --git a/education/windows/images/sfe-allow-shop-setting.png b/education/windows/images/sfe-allow-shop-setting.png deleted file mode 100644 index 52320751ac..0000000000 Binary files a/education/windows/images/sfe-allow-shop-setting.png and /dev/null differ diff --git a/education/windows/images/sfe-make-everyone-bp.png b/education/windows/images/sfe-make-everyone-bp.png deleted file mode 100644 index fd2e263417..0000000000 Binary files a/education/windows/images/sfe-make-everyone-bp.png and /dev/null differ diff --git a/education/windows/images/sfe-roles.png b/education/windows/images/sfe-roles.png deleted file mode 100644 index 63a9290371..0000000000 Binary files a/education/windows/images/sfe-roles.png and /dev/null differ diff --git a/education/windows/images/sign-in-prov.png b/education/windows/images/sign-in-prov.png deleted file mode 100644 index 55c9276203..0000000000 Binary files a/education/windows/images/sign-in-prov.png and /dev/null differ diff --git a/education/windows/images/signin.jpg b/education/windows/images/signin.jpg deleted file mode 100644 index ad31bb31c4..0000000000 Binary files a/education/windows/images/signin.jpg and /dev/null differ diff --git a/education/windows/images/skype-manage-profile-pic.png b/education/windows/images/skype-manage-profile-pic.png deleted file mode 100644 index 4133ac9c60..0000000000 Binary files a/education/windows/images/skype-manage-profile-pic.png and /dev/null differ diff --git a/education/windows/images/skype-profile-icon.png b/education/windows/images/skype-profile-icon.png deleted file mode 100644 index 7ccaaea693..0000000000 Binary files a/education/windows/images/skype-profile-icon.png and /dev/null differ diff --git a/education/windows/images/skype_uwp_manageprofilepic.PNG b/education/windows/images/skype_uwp_manageprofilepic.PNG deleted file mode 100644 index bdcf23dbc2..0000000000 Binary files a/education/windows/images/skype_uwp_manageprofilepic.PNG and /dev/null differ diff --git a/education/windows/images/skype_uwp_userprofile_icon.PNG b/education/windows/images/skype_uwp_userprofile_icon.PNG deleted file mode 100644 index ad36c7f886..0000000000 Binary files a/education/windows/images/skype_uwp_userprofile_icon.PNG and /dev/null differ diff --git a/education/windows/images/1810_Name_Your_Package_SUSPC.png b/education/windows/images/suspcs/1810_Name_Your_Package_SUSPC.png similarity index 100% rename from education/windows/images/1810_Name_Your_Package_SUSPC.png rename to education/windows/images/suspcs/1810_Name_Your_Package_SUSPC.png diff --git a/education/windows/images/1810_SUSPC_Insert_USB.png b/education/windows/images/suspcs/1810_SUSPC_Insert_USB.png similarity index 100% rename from education/windows/images/1810_SUSPC_Insert_USB.png rename to education/windows/images/suspcs/1810_SUSPC_Insert_USB.png diff --git a/education/windows/images/1810_SUSPC_Package_ready.png b/education/windows/images/suspcs/1810_SUSPC_Package_ready.png similarity index 100% rename from education/windows/images/1810_SUSPC_Package_ready.png rename to education/windows/images/suspcs/1810_SUSPC_Package_ready.png diff --git a/education/windows/images/1810_SUSPC_Product_key.png b/education/windows/images/suspcs/1810_SUSPC_Product_key.png similarity index 100% rename from education/windows/images/1810_SUSPC_Product_key.png rename to education/windows/images/suspcs/1810_SUSPC_Product_key.png diff --git a/education/windows/images/1810_SUSPC_Take_Test.png b/education/windows/images/suspcs/1810_SUSPC_Take_Test.png similarity index 100% rename from education/windows/images/1810_SUSPC_Take_Test.png rename to education/windows/images/suspcs/1810_SUSPC_Take_Test.png diff --git a/education/windows/images/1810_SUSPC_USB.png b/education/windows/images/suspcs/1810_SUSPC_USB.png similarity index 100% rename from education/windows/images/1810_SUSPC_USB.png rename to education/windows/images/suspcs/1810_SUSPC_USB.png diff --git a/education/windows/images/1810_SUSPC_add_apps.png b/education/windows/images/suspcs/1810_SUSPC_add_apps.png similarity index 100% rename from education/windows/images/1810_SUSPC_add_apps.png rename to education/windows/images/suspcs/1810_SUSPC_add_apps.png diff --git a/education/windows/images/1810_SUSPC_app_error.png b/education/windows/images/suspcs/1810_SUSPC_app_error.png similarity index 100% rename from education/windows/images/1810_SUSPC_app_error.png rename to education/windows/images/suspcs/1810_SUSPC_app_error.png diff --git a/education/windows/images/1810_SUSPC_available_settings.png b/education/windows/images/suspcs/1810_SUSPC_available_settings.png similarity index 100% rename from education/windows/images/1810_SUSPC_available_settings.png rename to education/windows/images/suspcs/1810_SUSPC_available_settings.png diff --git a/education/windows/images/1810_SUSPC_personalization.png b/education/windows/images/suspcs/1810_SUSPC_personalization.png similarity index 100% rename from education/windows/images/1810_SUSPC_personalization.png rename to education/windows/images/suspcs/1810_SUSPC_personalization.png diff --git a/education/windows/images/1810_SUSPC_select_Wifi.png b/education/windows/images/suspcs/1810_SUSPC_select_Wifi.png similarity index 100% rename from education/windows/images/1810_SUSPC_select_Wifi.png rename to education/windows/images/suspcs/1810_SUSPC_select_Wifi.png diff --git a/education/windows/images/1810_SUSPC_summary.png b/education/windows/images/suspcs/1810_SUSPC_summary.png similarity index 100% rename from education/windows/images/1810_SUSPC_summary.png rename to education/windows/images/suspcs/1810_SUSPC_summary.png diff --git a/education/windows/images/1810_Sign_In_SUSPC.png b/education/windows/images/suspcs/1810_Sign_In_SUSPC.png similarity index 100% rename from education/windows/images/1810_Sign_In_SUSPC.png rename to education/windows/images/suspcs/1810_Sign_In_SUSPC.png diff --git a/education/windows/images/1810_choose_account_SUSPC.png b/education/windows/images/suspcs/1810_choose_account_SUSPC.png similarity index 100% rename from education/windows/images/1810_choose_account_SUSPC.png rename to education/windows/images/suspcs/1810_choose_account_SUSPC.png diff --git a/education/windows/images/1810_name-devices_SUSPC.png b/education/windows/images/suspcs/1810_name-devices_SUSPC.png similarity index 100% rename from education/windows/images/1810_name-devices_SUSPC.png rename to education/windows/images/suspcs/1810_name-devices_SUSPC.png diff --git a/education/windows/images/1810_suspc_settings.png b/education/windows/images/suspcs/1810_suspc_settings.png similarity index 100% rename from education/windows/images/1810_suspc_settings.png rename to education/windows/images/suspcs/1810_suspc_settings.png diff --git a/education/windows/images/1810_suspc_timezone.png b/education/windows/images/suspcs/1810_suspc_timezone.png similarity index 100% rename from education/windows/images/1810_suspc_timezone.png rename to education/windows/images/suspcs/1810_suspc_timezone.png diff --git a/education/windows/images/1812_Add_Apps_SUSPC.png b/education/windows/images/suspcs/1812_Add_Apps_SUSPC.png similarity index 100% rename from education/windows/images/1812_Add_Apps_SUSPC.png rename to education/windows/images/suspcs/1812_Add_Apps_SUSPC.png diff --git a/education/windows/images/suspc-add-recommended-apps-1807.png b/education/windows/images/suspcs/suspc-add-recommended-apps-1807.png similarity index 100% rename from education/windows/images/suspc-add-recommended-apps-1807.png rename to education/windows/images/suspcs/suspc-add-recommended-apps-1807.png diff --git a/education/windows/images/suspc-admin-token-delete-1807.png b/education/windows/images/suspcs/suspc-admin-token-delete-1807.png similarity index 100% rename from education/windows/images/suspc-admin-token-delete-1807.png rename to education/windows/images/suspcs/suspc-admin-token-delete-1807.png diff --git a/education/windows/images/suspc-assessment-url-1807.png b/education/windows/images/suspcs/suspc-assessment-url-1807.png similarity index 100% rename from education/windows/images/suspc-assessment-url-1807.png rename to education/windows/images/suspcs/suspc-assessment-url-1807.png diff --git a/education/windows/images/suspc-available-student-settings-1807.png b/education/windows/images/suspcs/suspc-available-student-settings-1807.png similarity index 100% rename from education/windows/images/suspc-available-student-settings-1807.png rename to education/windows/images/suspcs/suspc-available-student-settings-1807.png diff --git a/education/windows/images/suspc-configure-student-settings-1807.png b/education/windows/images/suspcs/suspc-configure-student-settings-1807.png similarity index 100% rename from education/windows/images/suspc-configure-student-settings-1807.png rename to education/windows/images/suspcs/suspc-configure-student-settings-1807.png diff --git a/education/windows/images/suspc-createpackage-signin-1807.png b/education/windows/images/suspcs/suspc-createpackage-signin-1807.png similarity index 100% rename from education/windows/images/suspc-createpackage-signin-1807.png rename to education/windows/images/suspcs/suspc-createpackage-signin-1807.png diff --git a/education/windows/images/suspc-createpackage-summary-1807.png b/education/windows/images/suspcs/suspc-createpackage-summary-1807.png similarity index 100% rename from education/windows/images/suspc-createpackage-summary-1807.png rename to education/windows/images/suspcs/suspc-createpackage-summary-1807.png diff --git a/education/windows/images/suspc-current-os-version-1807.png b/education/windows/images/suspcs/suspc-current-os-version-1807.png similarity index 100% rename from education/windows/images/suspc-current-os-version-1807.png rename to education/windows/images/suspcs/suspc-current-os-version-1807.png diff --git a/education/windows/images/suspc-current-os-version-next-1807.png b/education/windows/images/suspcs/suspc-current-os-version-next-1807.png similarity index 100% rename from education/windows/images/suspc-current-os-version-next-1807.png rename to education/windows/images/suspcs/suspc-current-os-version-next-1807.png diff --git a/education/windows/images/suspc-device-names-1807.png b/education/windows/images/suspcs/suspc-device-names-1807.png similarity index 100% rename from education/windows/images/suspc-device-names-1807.png rename to education/windows/images/suspcs/suspc-device-names-1807.png diff --git a/education/windows/images/suspc-enable-shared-pc-1807.png b/education/windows/images/suspcs/suspc-enable-shared-pc-1807.png similarity index 100% rename from education/windows/images/suspc-enable-shared-pc-1807.png rename to education/windows/images/suspcs/suspc-enable-shared-pc-1807.png diff --git a/education/windows/images/suspc-savepackage-insertusb-1807.png b/education/windows/images/suspcs/suspc-savepackage-insertusb-1807.png similarity index 100% rename from education/windows/images/suspc-savepackage-insertusb-1807.png rename to education/windows/images/suspcs/suspc-savepackage-insertusb-1807.png diff --git a/education/windows/images/suspc-savepackage-ppkgisready-1807.png b/education/windows/images/suspcs/suspc-savepackage-ppkgisready-1807.png similarity index 100% rename from education/windows/images/suspc-savepackage-ppkgisready-1807.png rename to education/windows/images/suspcs/suspc-savepackage-ppkgisready-1807.png diff --git a/education/windows/images/suspc-select-wifi-1807.png b/education/windows/images/suspcs/suspc-select-wifi-1807.png similarity index 100% rename from education/windows/images/suspc-select-wifi-1807.png rename to education/windows/images/suspcs/suspc-select-wifi-1807.png diff --git a/education/windows/images/suspc-select-wifi-network-1807.png b/education/windows/images/suspcs/suspc-select-wifi-network-1807.png similarity index 100% rename from education/windows/images/suspc-select-wifi-network-1807.png rename to education/windows/images/suspcs/suspc-select-wifi-network-1807.png diff --git a/education/windows/images/suspc-sign-in-select-1807.png b/education/windows/images/suspcs/suspc-sign-in-select-1807.png similarity index 100% rename from education/windows/images/suspc-sign-in-select-1807.png rename to education/windows/images/suspcs/suspc-sign-in-select-1807.png diff --git a/education/windows/images/suspc-take-a-test-1807.png b/education/windows/images/suspcs/suspc-take-a-test-1807.png similarity index 100% rename from education/windows/images/suspc-take-a-test-1807.png rename to education/windows/images/suspcs/suspc-take-a-test-1807.png diff --git a/education/windows/images/suspc-take-a-test-app-1807.png b/education/windows/images/suspcs/suspc-take-a-test-app-1807.png similarity index 100% rename from education/windows/images/suspc-take-a-test-app-1807.png rename to education/windows/images/suspcs/suspc-take-a-test-app-1807.png diff --git a/education/windows/images/suspc-time-zone-1807.png b/education/windows/images/suspcs/suspc-time-zone-1807.png similarity index 100% rename from education/windows/images/suspc-time-zone-1807.png rename to education/windows/images/suspcs/suspc-time-zone-1807.png diff --git a/education/windows/images/suspc-wifi-network-1807.png b/education/windows/images/suspcs/suspc-wifi-network-1807.png similarity index 100% rename from education/windows/images/suspc-wifi-network-1807.png rename to education/windows/images/suspcs/suspc-wifi-network-1807.png diff --git a/education/windows/images/suspc_account_signin.PNG b/education/windows/images/suspcs/suspc_account_signin.PNG similarity index 100% rename from education/windows/images/suspc_account_signin.PNG rename to education/windows/images/suspcs/suspc_account_signin.PNG diff --git a/education/windows/images/suspc_and_wcd_comparison.png b/education/windows/images/suspcs/suspc_and_wcd_comparison.png similarity index 100% rename from education/windows/images/suspc_and_wcd_comparison.png rename to education/windows/images/suspcs/suspc_and_wcd_comparison.png diff --git a/education/windows/images/suspc_choosesettings_apps.PNG b/education/windows/images/suspcs/suspc_choosesettings_apps.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_apps.PNG rename to education/windows/images/suspcs/suspc_choosesettings_apps.PNG diff --git a/education/windows/images/suspc_choosesettings_settings.PNG b/education/windows/images/suspcs/suspc_choosesettings_settings.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_settings.PNG rename to education/windows/images/suspcs/suspc_choosesettings_settings.PNG diff --git a/education/windows/images/suspc_choosesettings_settings_updated.PNG b/education/windows/images/suspcs/suspc_choosesettings_settings_updated.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_settings_updated.PNG rename to education/windows/images/suspcs/suspc_choosesettings_settings_updated.PNG diff --git a/education/windows/images/suspc_choosesettings_setuptakeatest.PNG b/education/windows/images/suspcs/suspc_choosesettings_setuptakeatest.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_setuptakeatest.PNG rename to education/windows/images/suspcs/suspc_choosesettings_setuptakeatest.PNG diff --git a/education/windows/images/suspc_choosesettings_signin.PNG b/education/windows/images/suspcs/suspc_choosesettings_signin.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_signin.PNG rename to education/windows/images/suspcs/suspc_choosesettings_signin.PNG diff --git a/education/windows/images/suspc_choosesettings_signin_final.PNG b/education/windows/images/suspcs/suspc_choosesettings_signin_final.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_signin_final.PNG rename to education/windows/images/suspcs/suspc_choosesettings_signin_final.PNG diff --git a/education/windows/images/suspc_choosesettings_summary.PNG b/education/windows/images/suspcs/suspc_choosesettings_summary.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_summary.PNG rename to education/windows/images/suspcs/suspc_choosesettings_summary.PNG diff --git a/education/windows/images/suspc_configure_pc2.jpg b/education/windows/images/suspcs/suspc_configure_pc2.jpg similarity index 100% rename from education/windows/images/suspc_configure_pc2.jpg rename to education/windows/images/suspcs/suspc_configure_pc2.jpg diff --git a/education/windows/images/suspc_createpackage_configurestudentpcsettings.png b/education/windows/images/suspcs/suspc_createpackage_configurestudentpcsettings.png similarity index 100% rename from education/windows/images/suspc_createpackage_configurestudentpcsettings.png rename to education/windows/images/suspcs/suspc_createpackage_configurestudentpcsettings.png diff --git a/education/windows/images/suspc_createpackage_configurestudentpcsettings_121117.PNG b/education/windows/images/suspcs/suspc_createpackage_configurestudentpcsettings_121117.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_configurestudentpcsettings_121117.PNG rename to education/windows/images/suspcs/suspc_createpackage_configurestudentpcsettings_121117.PNG diff --git a/education/windows/images/suspc_createpackage_recommendedapps.png b/education/windows/images/suspcs/suspc_createpackage_recommendedapps.png similarity index 100% rename from education/windows/images/suspc_createpackage_recommendedapps.png rename to education/windows/images/suspcs/suspc_createpackage_recommendedapps.png diff --git a/education/windows/images/suspc_createpackage_recommendedapps_073117.PNG b/education/windows/images/suspcs/suspc_createpackage_recommendedapps_073117.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_recommendedapps_073117.PNG rename to education/windows/images/suspcs/suspc_createpackage_recommendedapps_073117.PNG diff --git a/education/windows/images/suspc_createpackage_recommendedapps_office061217.png b/education/windows/images/suspcs/suspc_createpackage_recommendedapps_office061217.png similarity index 100% rename from education/windows/images/suspc_createpackage_recommendedapps_office061217.png rename to education/windows/images/suspcs/suspc_createpackage_recommendedapps_office061217.png diff --git a/education/windows/images/suspc_createpackage_settingspage.PNG b/education/windows/images/suspcs/suspc_createpackage_settingspage.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_settingspage.PNG rename to education/windows/images/suspcs/suspc_createpackage_settingspage.PNG diff --git a/education/windows/images/suspc_createpackage_signin.png b/education/windows/images/suspcs/suspc_createpackage_signin.png similarity index 100% rename from education/windows/images/suspc_createpackage_signin.png rename to education/windows/images/suspcs/suspc_createpackage_signin.png diff --git a/education/windows/images/suspc_createpackage_skipwifi_modaldialog.png b/education/windows/images/suspcs/suspc_createpackage_skipwifi_modaldialog.png similarity index 100% rename from education/windows/images/suspc_createpackage_skipwifi_modaldialog.png rename to education/windows/images/suspcs/suspc_createpackage_skipwifi_modaldialog.png diff --git a/education/windows/images/suspc_createpackage_summary.PNG b/education/windows/images/suspcs/suspc_createpackage_summary.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_summary.PNG rename to education/windows/images/suspcs/suspc_createpackage_summary.PNG diff --git a/education/windows/images/suspc_createpackage_summary_073117.PNG b/education/windows/images/suspcs/suspc_createpackage_summary_073117.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_summary_073117.PNG rename to education/windows/images/suspcs/suspc_createpackage_summary_073117.PNG diff --git a/education/windows/images/suspc_getpcsready.PNG b/education/windows/images/suspcs/suspc_getpcsready.PNG similarity index 100% rename from education/windows/images/suspc_getpcsready.PNG rename to education/windows/images/suspcs/suspc_getpcsready.PNG diff --git a/education/windows/images/suspc_getpcsready_getpcsready.PNG b/education/windows/images/suspcs/suspc_getpcsready_getpcsready.PNG similarity index 100% rename from education/windows/images/suspc_getpcsready_getpcsready.PNG rename to education/windows/images/suspcs/suspc_getpcsready_getpcsready.PNG diff --git a/education/windows/images/suspc_getpcsready_installpackage.PNG b/education/windows/images/suspcs/suspc_getpcsready_installpackage.PNG similarity index 100% rename from education/windows/images/suspc_getpcsready_installpackage.PNG rename to education/windows/images/suspcs/suspc_getpcsready_installpackage.PNG diff --git a/education/windows/images/suspc_getstarted.PNG b/education/windows/images/suspcs/suspc_getstarted.PNG similarity index 100% rename from education/windows/images/suspc_getstarted.PNG rename to education/windows/images/suspcs/suspc_getstarted.PNG diff --git a/education/windows/images/suspc_getstarted_050817.PNG b/education/windows/images/suspcs/suspc_getstarted_050817.PNG similarity index 100% rename from education/windows/images/suspc_getstarted_050817.PNG rename to education/windows/images/suspcs/suspc_getstarted_050817.PNG diff --git a/education/windows/images/suspc_getstarted_final.PNG b/education/windows/images/suspcs/suspc_getstarted_final.PNG similarity index 100% rename from education/windows/images/suspc_getstarted_final.PNG rename to education/windows/images/suspcs/suspc_getstarted_final.PNG diff --git a/education/windows/images/suspc_getstarted_resized.png b/education/windows/images/suspcs/suspc_getstarted_resized.png similarity index 100% rename from education/windows/images/suspc_getstarted_resized.png rename to education/windows/images/suspcs/suspc_getstarted_resized.png diff --git a/education/windows/images/suspc_installsetupfile.PNG b/education/windows/images/suspcs/suspc_installsetupfile.PNG similarity index 100% rename from education/windows/images/suspc_installsetupfile.PNG rename to education/windows/images/suspcs/suspc_installsetupfile.PNG diff --git a/education/windows/images/suspc_ppkg_isready.PNG b/education/windows/images/suspcs/suspc_ppkg_isready.PNG similarity index 100% rename from education/windows/images/suspc_ppkg_isready.PNG rename to education/windows/images/suspcs/suspc_ppkg_isready.PNG diff --git a/education/windows/images/suspc_ppkgisready_050817.PNG b/education/windows/images/suspcs/suspc_ppkgisready_050817.PNG similarity index 100% rename from education/windows/images/suspc_ppkgisready_050817.PNG rename to education/windows/images/suspcs/suspc_ppkgisready_050817.PNG diff --git a/education/windows/images/suspc_ppkgready.PNG b/education/windows/images/suspcs/suspc_ppkgready.PNG similarity index 100% rename from education/windows/images/suspc_ppkgready.PNG rename to education/windows/images/suspcs/suspc_ppkgready.PNG diff --git a/education/windows/images/suspc_reviewsettings.PNG b/education/windows/images/suspcs/suspc_reviewsettings.PNG similarity index 100% rename from education/windows/images/suspc_reviewsettings.PNG rename to education/windows/images/suspcs/suspc_reviewsettings.PNG diff --git a/education/windows/images/suspc_reviewsettings_bluelinks.png b/education/windows/images/suspcs/suspc_reviewsettings_bluelinks.png similarity index 100% rename from education/windows/images/suspc_reviewsettings_bluelinks.png rename to education/windows/images/suspcs/suspc_reviewsettings_bluelinks.png diff --git a/education/windows/images/suspc_runpackage_getpcsready.PNG b/education/windows/images/suspcs/suspc_runpackage_getpcsready.PNG similarity index 100% rename from education/windows/images/suspc_runpackage_getpcsready.PNG rename to education/windows/images/suspcs/suspc_runpackage_getpcsready.PNG diff --git a/education/windows/images/suspc_runpackage_installpackage.PNG b/education/windows/images/suspcs/suspc_runpackage_installpackage.PNG similarity index 100% rename from education/windows/images/suspc_runpackage_installpackage.PNG rename to education/windows/images/suspcs/suspc_runpackage_installpackage.PNG diff --git a/education/windows/images/suspc_savepackage_insertusb.PNG b/education/windows/images/suspcs/suspc_savepackage_insertusb.PNG similarity index 100% rename from education/windows/images/suspc_savepackage_insertusb.PNG rename to education/windows/images/suspcs/suspc_savepackage_insertusb.PNG diff --git a/education/windows/images/suspc_savepackage_insertusb_050817.PNG b/education/windows/images/suspcs/suspc_savepackage_insertusb_050817.PNG similarity index 100% rename from education/windows/images/suspc_savepackage_insertusb_050817.PNG rename to education/windows/images/suspcs/suspc_savepackage_insertusb_050817.PNG diff --git a/education/windows/images/suspc_savepackage_ppkgisready.png b/education/windows/images/suspcs/suspc_savepackage_ppkgisready.png similarity index 100% rename from education/windows/images/suspc_savepackage_ppkgisready.png rename to education/windows/images/suspcs/suspc_savepackage_ppkgisready.png diff --git a/education/windows/images/suspc_savesettings.PNG b/education/windows/images/suspcs/suspc_savesettings.PNG similarity index 100% rename from education/windows/images/suspc_savesettings.PNG rename to education/windows/images/suspcs/suspc_savesettings.PNG diff --git a/education/windows/images/suspc_setup_removemediamessage.png b/education/windows/images/suspcs/suspc_setup_removemediamessage.png similarity index 100% rename from education/windows/images/suspc_setup_removemediamessage.png rename to education/windows/images/suspcs/suspc_setup_removemediamessage.png diff --git a/education/windows/images/suspc_setupfile_reviewsettings.PNG b/education/windows/images/suspcs/suspc_setupfile_reviewsettings.PNG similarity index 100% rename from education/windows/images/suspc_setupfile_reviewsettings.PNG rename to education/windows/images/suspcs/suspc_setupfile_reviewsettings.PNG diff --git a/education/windows/images/suspc_setupfile_savesettings.PNG b/education/windows/images/suspcs/suspc_setupfile_savesettings.PNG similarity index 100% rename from education/windows/images/suspc_setupfile_savesettings.PNG rename to education/windows/images/suspcs/suspc_setupfile_savesettings.PNG diff --git a/education/windows/images/suspc_setupfileready.PNG b/education/windows/images/suspcs/suspc_setupfileready.PNG similarity index 100% rename from education/windows/images/suspc_setupfileready.PNG rename to education/windows/images/suspcs/suspc_setupfileready.PNG diff --git a/education/windows/images/suspc_signin_account.PNG b/education/windows/images/suspcs/suspc_signin_account.PNG similarity index 100% rename from education/windows/images/suspc_signin_account.PNG rename to education/windows/images/suspcs/suspc_signin_account.PNG diff --git a/education/windows/images/suspc_signin_addapps.PNG b/education/windows/images/suspcs/suspc_signin_addapps.PNG similarity index 100% rename from education/windows/images/suspc_signin_addapps.PNG rename to education/windows/images/suspcs/suspc_signin_addapps.PNG diff --git a/education/windows/images/suspc_signin_allowguests.PNG b/education/windows/images/suspcs/suspc_signin_allowguests.PNG similarity index 100% rename from education/windows/images/suspc_signin_allowguests.PNG rename to education/windows/images/suspcs/suspc_signin_allowguests.PNG diff --git a/education/windows/images/suspc_signin_setuptakeatest.PNG b/education/windows/images/suspcs/suspc_signin_setuptakeatest.PNG similarity index 100% rename from education/windows/images/suspc_signin_setuptakeatest.PNG rename to education/windows/images/suspcs/suspc_signin_setuptakeatest.PNG diff --git a/education/windows/images/suspc_start.PNG b/education/windows/images/suspcs/suspc_start.PNG similarity index 100% rename from education/windows/images/suspc_start.PNG rename to education/windows/images/suspcs/suspc_start.PNG diff --git a/education/windows/images/suspc_studentpcsetup_installingsetupfile.png b/education/windows/images/suspcs/suspc_studentpcsetup_installingsetupfile.png similarity index 100% rename from education/windows/images/suspc_studentpcsetup_installingsetupfile.png rename to education/windows/images/suspcs/suspc_studentpcsetup_installingsetupfile.png diff --git a/education/windows/images/suspc_wcd_featureslist.png b/education/windows/images/suspcs/suspc_wcd_featureslist.png similarity index 100% rename from education/windows/images/suspc_wcd_featureslist.png rename to education/windows/images/suspcs/suspc_wcd_featureslist.png diff --git a/education/windows/images/suspc_wcd_sidebyside.png b/education/windows/images/suspcs/suspc_wcd_sidebyside.png similarity index 100% rename from education/windows/images/suspc_wcd_sidebyside.png rename to education/windows/images/suspcs/suspc_wcd_sidebyside.png diff --git a/education/windows/images/suspc_win10v1703_getstarted.PNG b/education/windows/images/suspcs/suspc_win10v1703_getstarted.PNG similarity index 100% rename from education/windows/images/suspc_win10v1703_getstarted.PNG rename to education/windows/images/suspcs/suspc_win10v1703_getstarted.PNG diff --git a/education/windows/images/win10_1703_oobe_firstscreen.png b/education/windows/images/suspcs/win10_1703_oobe_firstscreen.png similarity index 100% rename from education/windows/images/win10_1703_oobe_firstscreen.png rename to education/windows/images/suspcs/win10_1703_oobe_firstscreen.png diff --git a/education/windows/images/take-a-test-flow.png b/education/windows/images/take-a-test-flow.png deleted file mode 100644 index a5135c1822..0000000000 Binary files a/education/windows/images/take-a-test-flow.png and /dev/null differ diff --git a/education/windows/images/take_a_test_flow.png b/education/windows/images/take_a_test_flow.png deleted file mode 100644 index 261813c7f8..0000000000 Binary files a/education/windows/images/take_a_test_flow.png and /dev/null differ diff --git a/education/windows/images/take_a_test_workflow.png b/education/windows/images/take_a_test_workflow.png deleted file mode 100644 index a4c7a84686..0000000000 Binary files a/education/windows/images/take_a_test_workflow.png and /dev/null differ diff --git a/education/windows/images/TakeATestURL.png b/education/windows/images/takeatest/TakeATestURL.png similarity index 100% rename from education/windows/images/TakeATestURL.png rename to education/windows/images/takeatest/TakeATestURL.png diff --git a/education/windows/images/i4e_takeatestprofile_accountsummary.PNG b/education/windows/images/takeatest/i4e_takeatestprofile_accountsummary.PNG similarity index 100% rename from education/windows/images/i4e_takeatestprofile_accountsummary.PNG rename to education/windows/images/takeatest/i4e_takeatestprofile_accountsummary.PNG diff --git a/education/windows/images/i4e_takeatestprofile_addnewprofile.PNG b/education/windows/images/takeatest/i4e_takeatestprofile_addnewprofile.PNG similarity index 100% rename from education/windows/images/i4e_takeatestprofile_addnewprofile.PNG rename to education/windows/images/takeatest/i4e_takeatestprofile_addnewprofile.PNG diff --git a/education/windows/images/i4e_takeatestprofile_changegroup_selectgroup.PNG b/education/windows/images/takeatest/i4e_takeatestprofile_changegroup_selectgroup.PNG similarity index 100% rename from education/windows/images/i4e_takeatestprofile_changegroup_selectgroup.PNG rename to education/windows/images/takeatest/i4e_takeatestprofile_changegroup_selectgroup.PNG diff --git a/education/windows/images/i4e_takeatestprofile_groupassignment_selected.PNG b/education/windows/images/takeatest/i4e_takeatestprofile_groupassignment_selected.PNG similarity index 100% rename from education/windows/images/i4e_takeatestprofile_groupassignment_selected.PNG rename to education/windows/images/takeatest/i4e_takeatestprofile_groupassignment_selected.PNG diff --git a/education/windows/images/i4e_takeatestprofile_groups_changegroupassignments.PNG b/education/windows/images/takeatest/i4e_takeatestprofile_groups_changegroupassignments.PNG similarity index 100% rename from education/windows/images/i4e_takeatestprofile_groups_changegroupassignments.PNG rename to education/windows/images/takeatest/i4e_takeatestprofile_groups_changegroupassignments.PNG diff --git a/education/windows/images/i4e_takeatestprofile_newtestaccount.PNG b/education/windows/images/takeatest/i4e_takeatestprofile_newtestaccount.PNG similarity index 100% rename from education/windows/images/i4e_takeatestprofile_newtestaccount.PNG rename to education/windows/images/takeatest/i4e_takeatestprofile_newtestaccount.PNG diff --git a/education/windows/images/suspc_choosesettings_takeatest.PNG b/education/windows/images/takeatest/suspc_choosesettings_takeatest.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_takeatest.PNG rename to education/windows/images/takeatest/suspc_choosesettings_takeatest.PNG diff --git a/education/windows/images/suspc_choosesettings_takeatest_updated.png b/education/windows/images/takeatest/suspc_choosesettings_takeatest_updated.png similarity index 100% rename from education/windows/images/suspc_choosesettings_takeatest_updated.png rename to education/windows/images/takeatest/suspc_choosesettings_takeatest_updated.png diff --git a/education/windows/images/suspc_createpackage_takeatest.png b/education/windows/images/takeatest/suspc_createpackage_takeatest.png similarity index 100% rename from education/windows/images/suspc_createpackage_takeatest.png rename to education/windows/images/takeatest/suspc_createpackage_takeatest.png diff --git a/education/windows/images/suspc_createpackage_takeatestpage.PNG b/education/windows/images/takeatest/suspc_createpackage_takeatestpage.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_takeatestpage.PNG rename to education/windows/images/takeatest/suspc_createpackage_takeatestpage.PNG diff --git a/education/windows/images/suspc_createpackage_takeatestpage_073117.PNG b/education/windows/images/takeatest/suspc_createpackage_takeatestpage_073117.PNG similarity index 100% rename from education/windows/images/suspc_createpackage_takeatestpage_073117.PNG rename to education/windows/images/takeatest/suspc_createpackage_takeatestpage_073117.PNG diff --git a/education/windows/images/take_a_test_flow_dark.png b/education/windows/images/takeatest/take_a_test_flow_dark.png similarity index 100% rename from education/windows/images/take_a_test_flow_dark.png rename to education/windows/images/takeatest/take_a_test_flow_dark.png diff --git a/education/windows/images/tat_settingsapp_setupaccount_addtestaccount.PNG b/education/windows/images/takeatest/tat_settingsapp_setupaccount_addtestaccount.PNG similarity index 100% rename from education/windows/images/tat_settingsapp_setupaccount_addtestaccount.PNG rename to education/windows/images/takeatest/tat_settingsapp_setupaccount_addtestaccount.PNG diff --git a/education/windows/images/tat_settingsapp_setuptesttakingaccount.PNG b/education/windows/images/takeatest/tat_settingsapp_setuptesttakingaccount.PNG similarity index 100% rename from education/windows/images/tat_settingsapp_setuptesttakingaccount.PNG rename to education/windows/images/takeatest/tat_settingsapp_setuptesttakingaccount.PNG diff --git a/education/windows/images/tat_settingsapp_setuptesttakingaccount_1703.PNG b/education/windows/images/takeatest/tat_settingsapp_setuptesttakingaccount_1703.PNG similarity index 100% rename from education/windows/images/tat_settingsapp_setuptesttakingaccount_1703.PNG rename to education/windows/images/takeatest/tat_settingsapp_setuptesttakingaccount_1703.PNG diff --git a/education/windows/images/tat_settingsapp_workorschoolaccess_setuptestaccount.PNG b/education/windows/images/takeatest/tat_settingsapp_workorschoolaccess_setuptestaccount.PNG similarity index 100% rename from education/windows/images/tat_settingsapp_workorschoolaccess_setuptestaccount.PNG rename to education/windows/images/takeatest/tat_settingsapp_workorschoolaccess_setuptestaccount.PNG diff --git a/education/windows/images/teacher-get-app.PNG b/education/windows/images/teacher-get-app.PNG deleted file mode 100644 index 329607edb9..0000000000 Binary files a/education/windows/images/teacher-get-app.PNG and /dev/null differ diff --git a/education/windows/images/teacher.PNG b/education/windows/images/teacher.PNG deleted file mode 100644 index 286d515624..0000000000 Binary files a/education/windows/images/teacher.PNG and /dev/null differ diff --git a/education/windows/images/test-account-icd.PNG b/education/windows/images/test-account-icd.PNG deleted file mode 100644 index 4fd9bf3f28..0000000000 Binary files a/education/windows/images/test-account-icd.PNG and /dev/null differ diff --git a/education/windows/images/trust-package.png b/education/windows/images/trust-package.png deleted file mode 100644 index 8a293ea4da..0000000000 Binary files a/education/windows/images/trust-package.png and /dev/null differ diff --git a/education/windows/images/uwp-dependencies.PNG b/education/windows/images/uwp-dependencies.PNG deleted file mode 100644 index 4e2563169f..0000000000 Binary files a/education/windows/images/uwp-dependencies.PNG and /dev/null differ diff --git a/education/windows/images/uwp-family.PNG b/education/windows/images/uwp-family.PNG deleted file mode 100644 index bec731eec4..0000000000 Binary files a/education/windows/images/uwp-family.PNG and /dev/null differ diff --git a/education/windows/images/uwp-license.PNG b/education/windows/images/uwp-license.PNG deleted file mode 100644 index ccb5cf7cf4..0000000000 Binary files a/education/windows/images/uwp-license.PNG and /dev/null differ diff --git a/education/windows/images/wcd_accountmanagement.PNG b/education/windows/images/wcd/wcd_accountmanagement.PNG similarity index 100% rename from education/windows/images/wcd_accountmanagement.PNG rename to education/windows/images/wcd/wcd_accountmanagement.PNG diff --git a/education/windows/images/wcd_exportpackage.PNG b/education/windows/images/wcd/wcd_exportpackage.PNG similarity index 100% rename from education/windows/images/wcd_exportpackage.PNG rename to education/windows/images/wcd/wcd_exportpackage.PNG diff --git a/education/windows/images/wcd_productkey.png b/education/windows/images/wcd/wcd_productkey.png similarity index 100% rename from education/windows/images/wcd_productkey.png rename to education/windows/images/wcd/wcd_productkey.png diff --git a/education/windows/images/wcd_settings_assignedaccess.PNG b/education/windows/images/wcd/wcd_settings_assignedaccess.PNG similarity index 100% rename from education/windows/images/wcd_settings_assignedaccess.PNG rename to education/windows/images/wcd/wcd_settings_assignedaccess.PNG diff --git a/education/windows/images/wcd_setupdevice.PNG b/education/windows/images/wcd/wcd_setupdevice.PNG similarity index 100% rename from education/windows/images/wcd_setupdevice.PNG rename to education/windows/images/wcd/wcd_setupdevice.PNG diff --git a/education/windows/images/wcd_setupnetwork.PNG b/education/windows/images/wcd/wcd_setupnetwork.PNG similarity index 100% rename from education/windows/images/wcd_setupnetwork.PNG rename to education/windows/images/wcd/wcd_setupnetwork.PNG diff --git a/education/windows/images/wcd_win10v1703_start_newdesktopproject.PNG b/education/windows/images/wcd/wcd_win10v1703_start_newdesktopproject.PNG similarity index 100% rename from education/windows/images/wcd_win10v1703_start_newdesktopproject.PNG rename to education/windows/images/wcd/wcd_win10v1703_start_newdesktopproject.PNG diff --git a/education/windows/images/who-owns-pc.png b/education/windows/images/who-owns-pc.png deleted file mode 100644 index d3ce1def8d..0000000000 Binary files a/education/windows/images/who-owns-pc.png and /dev/null differ diff --git a/education/windows/images/win10-connect-to-work-or-school.png b/education/windows/images/win10-connect-to-work-or-school.png deleted file mode 100644 index 08afb5b092..0000000000 Binary files a/education/windows/images/win10-connect-to-work-or-school.png and /dev/null differ diff --git a/education/windows/images/win10-lets-get-2.png b/education/windows/images/win10-lets-get-2.png deleted file mode 100644 index c2d3c3ba61..0000000000 Binary files a/education/windows/images/win10-lets-get-2.png and /dev/null differ diff --git a/education/windows/images/win10-set-up-work-or-school.png b/education/windows/images/win10-set-up-work-or-school.png deleted file mode 100644 index 0ca83fb0e1..0000000000 Binary files a/education/windows/images/win10-set-up-work-or-school.png and /dev/null differ diff --git a/education/windows/images/win10_settings_privacy.PNG b/education/windows/images/win10_settings_privacy.PNG deleted file mode 100644 index 5285ce94f2..0000000000 Binary files a/education/windows/images/win10_settings_privacy.PNG and /dev/null differ diff --git a/education/windows/images/win10_settings_privacy_contacts.PNG b/education/windows/images/win10_settings_privacy_contacts.PNG deleted file mode 100644 index f17ef60de0..0000000000 Binary files a/education/windows/images/win10_settings_privacy_contacts.PNG and /dev/null differ diff --git a/education/windows/images/win10_settings_privacy_contacts_apps.png b/education/windows/images/win10_settings_privacy_contacts_apps.png deleted file mode 100644 index 774f18fad9..0000000000 Binary files a/education/windows/images/win10_settings_privacy_contacts_apps.png and /dev/null differ diff --git a/education/windows/images/windows-10-for-education-banner.png b/education/windows/images/windows-10-for-education-banner.png deleted file mode 100644 index cf33adc9b6..0000000000 Binary files a/education/windows/images/windows-10-for-education-banner.png and /dev/null differ diff --git a/education/windows/images/windows-ad-connect.png b/education/windows/images/windows-ad-connect.png deleted file mode 100644 index 97a69d1a6c..0000000000 Binary files a/education/windows/images/windows-ad-connect.png and /dev/null differ diff --git a/education/windows/images/windows-choose-how.png b/education/windows/images/windows-choose-how.png deleted file mode 100644 index 8e84535bfd..0000000000 Binary files a/education/windows/images/windows-choose-how.png and /dev/null differ diff --git a/education/windows/images/windows-connect-to-work-or-school.png b/education/windows/images/windows-connect-to-work-or-school.png deleted file mode 100644 index 90e1b1131f..0000000000 Binary files a/education/windows/images/windows-connect-to-work-or-school.png and /dev/null differ diff --git a/education/windows/images/windows-lets-get-2.png b/education/windows/images/windows-lets-get-2.png deleted file mode 100644 index ef523d4af8..0000000000 Binary files a/education/windows/images/windows-lets-get-2.png and /dev/null differ diff --git a/education/windows/images/windows-lets-get.png b/education/windows/images/windows-lets-get.png deleted file mode 100644 index 582da1ab2d..0000000000 Binary files a/education/windows/images/windows-lets-get.png and /dev/null differ diff --git a/education/windows/images/windows-set-up-work-or-school.png b/education/windows/images/windows-set-up-work-or-school.png deleted file mode 100644 index cebd87cff8..0000000000 Binary files a/education/windows/images/windows-set-up-work-or-school.png and /dev/null differ diff --git a/education/windows/images/windows-sign-in.png b/education/windows/images/windows-sign-in.png deleted file mode 100644 index 3029d3ef2b..0000000000 Binary files a/education/windows/images/windows-sign-in.png and /dev/null differ diff --git a/education/windows/images/windows-who-owns.png b/education/windows/images/windows-who-owns.png deleted file mode 100644 index c3008869d2..0000000000 Binary files a/education/windows/images/windows-who-owns.png and /dev/null differ diff --git a/education/windows/images/windows.png b/education/windows/images/windows.png deleted file mode 100644 index 9b312d7844..0000000000 Binary files a/education/windows/images/windows.png and /dev/null differ diff --git a/education/windows/images/windows_glyph.png b/education/windows/images/windows_glyph.png deleted file mode 100644 index 3a41d4dfb1..0000000000 Binary files a/education/windows/images/windows_glyph.png and /dev/null differ diff --git a/education/windows/images/wsfb-minecraft-vl.png b/education/windows/images/wsfb-minecraft-vl.png deleted file mode 100644 index e3fe6de6d7..0000000000 Binary files a/education/windows/images/wsfb-minecraft-vl.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png b/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png deleted file mode 100644 index ea3d582d79..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_education_launch.png b/education/windows/images/wsfb_win10_pro_education_launch.png deleted file mode 100644 index 4e7b741227..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_education_launch.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_education_order_confirmation.png b/education/windows/images/wsfb_win10_pro_education_order_confirmation.png deleted file mode 100644 index e35bbf64d5..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_education_order_confirmation.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_education_order_options.png b/education/windows/images/wsfb_win10_pro_education_order_options.png deleted file mode 100644 index eaf93ece33..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_education_order_options.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png b/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png deleted file mode 100644 index 4749dafc44..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_education_refund_order.png b/education/windows/images/wsfb_win10_pro_education_refund_order.png deleted file mode 100644 index 813cfce309..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_education_refund_order.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_disable.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_disable.png deleted file mode 100644 index 92aeb8ed19..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_disable.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png deleted file mode 100644 index 177c6e36df..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png deleted file mode 100644 index 8044a4cc91..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_enable.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_enable.png deleted file mode 100644 index 420b44513f..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_enable.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_summary.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_summary.png deleted file mode 100644 index a507f56694..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_summary.png and /dev/null differ diff --git a/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png b/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png deleted file mode 100644 index a30869b8ea..0000000000 Binary files a/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png and /dev/null differ diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index 8ed1fbf9e7..3626388e33 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -94,7 +94,7 @@ Invoices are now a supported payment method for Minecraft: Education Edition. Th 2. Select the Invoice option, and provide the info needed for an invoice. The **PO number** item allows you to add a tracking number or info that is meaningful to your organization. - ![Invoice Details page showing items that need to be completed for an invoice. PO number is highlighted.](images/mcee-invoice-info.png) + ![Invoice Details page showing items that need to be completed for an invoice. PO number is highlighted.](images/minecraft/mcee-invoice-info.png) For more info on invoices and how to pay by invoice, see [How to pay for your subscription](/microsoft-365/commerce/billing-and-payments/pay-for-your-subscription?). diff --git a/education/windows/set-up-school-pcs-azure-ad-join.md b/education/windows/set-up-school-pcs-azure-ad-join.md index b7a35b9784..c399d41e3f 100644 --- a/education/windows/set-up-school-pcs-azure-ad-join.md +++ b/education/windows/set-up-school-pcs-azure-ad-join.md @@ -27,8 +27,7 @@ appliesto: Set up School PCs lets you create a provisioning package that automates Azure AD Join on your devices. This feature eliminates the need to manually: -- Connect to your school’s network. - +- Connect to your school's network. - Join your organization's domain. ## Automated connection to school domain @@ -37,8 +36,8 @@ During initial device setup, Azure AD Join automatically connects your PCs to yo Students who sign in to their PCs with their Azure AD credentials get access to on-premises apps and the following cloud apps: * Office 365 -* OneDrive -* OneNote. +* OneDrive +* OneNote ## Enable Azure AD Join @@ -51,7 +50,7 @@ Active Directory** \> **Devices** \> **Device settings**. for Azure AD by selecting **All** or **Selected**. If you choose the latter option, select the teachers and IT staff to allow them to connect to Azure AD. -![Select the users you want to let join devices to Azure AD.](images/suspc-enable-shared-pc-1807.png) +![Select the users you want to let join devices to Azure AD.](images/suspcs/suspc-enable-shared-pc-1807.png) You can also create an account that holds the exclusive rights to join devices. When a student PC has to be set up, provide the account credentials to the appropriate teachers or staff. @@ -73,7 +72,7 @@ The following table describes each setting within **Device Settings**. Your Intune tenant can only have 500 active Azure AD tokens, or packages, at a time. You'll receive a notification in the Intune portal when you reach 500 active tokens. To reduce your inventory, clear out all unnecessary and inactive tokens. -1. Go to **Azure Active Directory** \> **Users** \> **All users** +1. Go to **Azure Active Directory** > **Users** > **All users** 2. In the **User Name** column, select and delete all accounts with a **package\ _** prefix. These accounts are created at a 1:1 ratio for every token and are safe to delete. @@ -82,7 +81,7 @@ to delete. ### How do I know if my package expired? Automated Azure AD tokens expire after 180 days. The expiration date for each token is appended to the end of the saved provisioning package, on the USB drive. After this date, you must create a new package. Be careful that you don't delete active accounts. -![Screenshot of the Azure portal, Azure Active Directory, All Users page. Highlights all accounts that start with the prefix package_ and can be deleted.](images/suspc-admin-token-delete-1807.png) +![Screenshot of the Azure portal, Azure Active Directory, All Users page. Highlights all accounts that start with the prefix package_ and can be deleted.](images/suspcs/suspc-admin-token-delete-1807.png) ## Next steps Learn more about setting up devices with the Set up School PCs app. diff --git a/education/windows/set-up-students-pcs-to-join-domain.md b/education/windows/set-up-students-pcs-to-join-domain.md index 32f97bf4b3..1c1d1ba1e1 100644 --- a/education/windows/set-up-students-pcs-to-join-domain.md +++ b/education/windows/set-up-students-pcs-to-join-domain.md @@ -43,7 +43,7 @@ Follow the steps in [Provision PCs with common settings for initial deployment ( **Figure 7** - Add the account to use for test-taking - ![Add the account to use for test-taking.](images/wcd_settings_assignedaccess.png) + ![Add the account to use for test-taking.](images/wcd/wcd_settings_assignedaccess.png) The account can be in one of the following formats: - username diff --git a/education/windows/set-up-students-pcs-with-apps.md b/education/windows/set-up-students-pcs-with-apps.md index 840dd7836b..0e02a8d5c5 100644 --- a/education/windows/set-up-students-pcs-with-apps.md +++ b/education/windows/set-up-students-pcs-with-apps.md @@ -24,193 +24,6 @@ You can apply a provisioning package on a USB drive to off-the-shelf devices dur - 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](/windows/configuration/provisioning-packages/provision-pcs-with-apps) if you want to add apps to student PCs after initial setup with the Set up School PCs package. - - ## Learn more -[Develop Universal Windows Education apps](/windows/uwp/apps-for-education/) diff --git a/education/windows/set-up-windows-10.md b/education/windows/set-up-windows-10.md index a9e53b4beb..92e12acb44 100644 --- a/education/windows/set-up-windows-10.md +++ b/education/windows/set-up-windows-10.md @@ -27,7 +27,7 @@ Choose the tool that is appropriate for how your students will sign in (Active D You can use the following diagram to compare the tools. -![Which tool to use to set up Windows 10.](images/suspc_wcd_featureslist.png) +![Which tool to use to set up Windows 10.](images/suspcs/suspc_wcd_featureslist.png) ## In this section diff --git a/education/windows/take-a-test-multiple-pcs.md b/education/windows/take-a-test-multiple-pcs.md index c997343c49..640aa2693f 100644 --- a/education/windows/take-a-test-multiple-pcs.md +++ b/education/windows/take-a-test-multiple-pcs.md @@ -40,7 +40,7 @@ If you set up Take a Test, the **Take a Test** button is added on the student PC **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) +![Configure Take a Test in the Set up School PCs app.](images/takeatest/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: @@ -50,7 +50,7 @@ You can set up a test-taking account in Intune for Education. To do this, follow **Figure 2** - Add a test profile in Intune for Education - ![Add a test profile in Intune for Education.](images/i4e_takeatestprofile_addnewprofile.png) + ![Add a test profile in Intune for Education.](images/takeatest/i4e_takeatestprofile_addnewprofile.png) 3. In the new profile page: 1. Enter a name for the profile. @@ -61,7 +61,7 @@ You can set up a test-taking account in Intune for Education. To do this, follow **Figure 3** - Add information about the test profile - ![Add information about the test profile.](images/i4e_takeatestprofile_newtestaccount.png) + ![Add information about the test profile.](images/takeatest/i4e_takeatestprofile_newtestaccount.png) After you save the test profile, you'll 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. @@ -69,13 +69,13 @@ You can set up a test-taking account in Intune for Education. To do this, follow **Figure 4** - Assign the test account to a group - ![Assign the test account to a group.](images/i4e_takeatestprofile_accountsummary.png) + ![Assign the test account to a group.](images/takeatest/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) + ![Change group assignments.](images/takeatest/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. @@ -83,7 +83,7 @@ You can set up a test-taking account in Intune for Education. To do this, follow **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) + ![Select the groups that will use the test account.](images/takeatest/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. @@ -137,7 +137,7 @@ To set up a test account through Windows Configuration Designer, follow these st **Figure 7** - Add the account to use for test-taking - ![Add the account to use for test-taking.](images/wcd_settings_assignedaccess.png) + ![Add the account to use for test-taking.](images/wcd/wcd_settings_assignedaccess.png) The account can be in one of the following formats: - username diff --git a/education/windows/take-a-test-single-pc.md b/education/windows/take-a-test-single-pc.md index 2cf14b3079..bf7fd7c439 100644 --- a/education/windows/take-a-test-single-pc.md +++ b/education/windows/take-a-test-single-pc.md @@ -31,13 +31,13 @@ To configure the assessment URL and a dedicated testing account on a single PC, **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) + ![Use the Settings app to set up a test-taking account.](images/takeatest/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) + ![Choose the test-taking account.](images/takeatest/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 people > Add someone else to this PC > I don’t have this person’s sign-in information > Add a user without a Microsoft account**. diff --git a/education/windows/take-tests-in-windows-10.md b/education/windows/take-tests-in-windows-10.md index 64dc362a33..3bff38fdc6 100644 --- a/education/windows/take-tests-in-windows-10.md +++ b/education/windows/take-tests-in-windows-10.md @@ -33,7 +33,7 @@ Many schools use online testing for formative and summative assessments. It's cr ## How to use Take a Test -![Set up and user flow for the Take a Test app.](images/take_a_test_flow_dark.png) +![Set up and user flow for the Take a Test app.](images/takeatest/take_a_test_flow_dark.png) There are several ways to configure devices for assessments, depending on your use case: diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md index 958e32ad29..4d83ffcc2b 100644 --- a/education/windows/use-set-up-school-pcs-app.md +++ b/education/windows/use-set-up-school-pcs-app.md @@ -105,7 +105,7 @@ We strongly recommend that you avoid changing preset policies. Changes can slow The **Set up School PCs** app guides you through the configuration choices for the student PCs. To begin, open the app on your PC and click **Get started**. - ![Launch the Set up School PCs app.](images/suspc_getstarted_050817.png) + ![Launch the Set up School PCs app.](images/suspcs/suspc_getstarted_050817.png) ### Package name Type a unique name to help distinguish your school's provisioning packages. The name appears: @@ -115,7 +115,7 @@ Type a unique name to help distinguish your school's provisioning packages. The A package expiration date is also attached to the end of each package. For example, *Set_Up_School_PCs (Expires 4-16-2019)*. The expiration date is 180 days after you create your package. - ![Example screenshot of the Set up School PCs app, Name your package screen.](images/1810_Name_Your_Package_SUSPC.png) + ![Example screenshot of the Set up School PCs app, Name your package screen.](images/suspcs/1810_Name_Your_Package_SUSPC.png) After you click **Next**, you can no longer change the name in the app. To create a package with a different name, reopen the Set up School PCs app. @@ -129,7 +129,7 @@ To change an existing package's name, right-click the package folder on your dev b. To complete setup without signing in, click **Continue without account**. Student PCs won't be connected to your school's cloud services and managing them will be more difficult later. Continue to [Wireless network](#wireless-network). 2. In the new window, select the account you want to use throughout setup. - ![Sign-in screen showing the option to "Use this account" or use a different "Work or school account."](images/1810_choose_account_suspc.png) + ![Sign-in screen showing the option to "Use this account" or use a different "Work or school account."](images/suspcs/1810_choose_account_suspc.png) To add an account not listed: a. Click **Work or school account** > **Continue**. @@ -140,14 +140,14 @@ To change an existing package's name, right-click the package folder on your dev 3. Click **Accept** to allow Set up School PCs to access your account throughout setup. 2. When your account name appears on the page, as shown in the image below, click **Next.** - ![Example screenshot of the Set up School PC app, Sign in screen, showing that the user's account name appears at the bottom of the page.](images/1810_Sign_In_SUSPC.png) + ![Example screenshot of the Set up School PC app, Sign in screen, showing that the user's account name appears at the bottom of the page.](images/suspcs/1810_Sign_In_SUSPC.png) ### Wireless network Add and save the wireless network profile that you want student PCs to connect to. Only skip Wi-Fi setup if you have an Ethernet connection. Select your school's Wi-Fi network from the list of available wireless networks, or click **Add a wireless network** to manually configure it. Then click **Next.** - ![Example screenshot of the Set up School PC app, Wireless network page with two Wi-Fi networks listed, one of which is selected.](images/1810_SUSPC_select_Wifi.png) + ![Example screenshot of the Set up School PC app, Wireless network page with two Wi-Fi networks listed, one of which is selected.](images/suspcs/1810_SUSPC_select_Wifi.png) ### Device names Create a short name to add as a prefix to each PC. This name will help you recognize and manage this specific group of devices in your mobile device manager. The name must be five (5) characters or less. @@ -156,19 +156,19 @@ To make sure all device names are unique, Set up School PCs automatically append To keep the default name for your devices, click **Continue with existing names**. - !["Name these devices" screen with the device field filled in with example device name, "Grd8."](images/1810_name-devices_SUSPC.png) + !["Name these devices" screen with the device field filled in with example device name, "Grd8."](images/suspcs/1810_name-devices_SUSPC.png) ### Settings Select additional settings to include in the provisioning package. To begin, select the operating system on your student PCs. -![Screenshot of the Current OS version page with the Select OS version menu selected, showing 7 Windows 10 options. All other settings on page are unavailable to select.](images/1810_suspc_settings.png) +![Screenshot of the Current OS version page with the Select OS version menu selected, showing 7 Windows 10 options. All other settings on page are unavailable to select.](images/suspcs/1810_suspc_settings.png) Setting selections vary based on the OS version you select. The example screenshot below shows the settings that become available when you select **Windows 10 version 1703**. The option to **Enable Autopilot Reset** is not available for this version of Windows 10. -![Example screenshot of the Current OS version page, with Windows 10 version 1803 selected. 4 available settings and 1 unavailable setting are shown, and none are selected.](images/1810_SUSPC_available_settings.png) +![Example screenshot of the Current OS version page, with Windows 10 version 1803 selected. 4 available settings and 1 unavailable setting are shown, and none are selected.](images/suspcs/1810_SUSPC_available_settings.png) > [!NOTE] @@ -194,21 +194,21 @@ After you've made your selections, click **Next**. Choose the time zone where your school's PCs are used. This setting ensures that all PCs are provisioned in the same time zone. When you're done, click **Next**. -![Choose PC time zone page with the time zone menu expanded to show all time zone selections.](images/1810_suspc_timezone.png) +![Choose PC time zone page with the time zone menu expanded to show all time zone selections.](images/suspcs/1810_suspc_timezone.png) ### Product key Optionally, type in a 25-digit product key to: * Upgrade your current edition of Windows. For example, if you want to upgrade from Windows 10 Education to Windows 10 Education Pro, enter the product key for the Pro edition. * Change the product key. If you want to associate student devices with a new or different Windows 10 product key, enter it now. -![Example screenshot of the Set up School PC app, Product key screen, showing a value field, Next button, and Continue without change option.](images/1810_suspc_product_key.png) +![Example screenshot of the Set up School PC app, Product key screen, showing a value field, Next button, and Continue without change option.](images/suspcs/1810_suspc_product_key.png) ### Take a Test Set up the Take a Test app to give online quizzes and high-stakes assessments. During assessments, Windows locks down the student PC so that students can't access anything else on the device. 1. Select **Yes** to create a Take a Test button on the sign-in screens of your students' PCs. - ![Set up Take a Test app page with "Yes" selected to create an app button. Page also has two checkboxes for additional settings and one text field for the assessment URL.](images/1810_SUSPC_Take_Test.png) + ![Set up Take a Test app page with "Yes" selected to create an app button. Page also has two checkboxes for additional settings and one text field for the assessment URL.](images/suspcs/1810_SUSPC_Take_Test.png) 2. Select from the advanced settings. Available settings include: * Allow keyboard auto-suggestions: Allows app to suggest words as the student types on the PC's keyboard. @@ -224,7 +224,7 @@ If there aren't any apps in your Microsoft Store inventory, or you don't have th After you've made your selections, click **Next**. - ![Example screenshots of the Add apps screen with selection of recommended apps and school inventory apps.](images/1812_Add_Apps_SUSPC.png) + ![Example screenshots of the Add apps screen with selection of recommended apps and school inventory apps.](images/suspcs/1812_Add_Apps_SUSPC.png) The following table lists the recommended apps you'll see. @@ -241,7 +241,7 @@ Upload custom images to replace the student devices' default desktop and lock sc If you don't want to upload custom images or use the images that appear in the app, click **Continue without personalization**. This option does not apply any customizations, and instead uses the devices' default or preset images. - ![Example image of the Set up School PCs app, Personalization screen, showing the default desktop and lock screen background photos, a Browse button under each photo, a blue Next button, and a Continue without personalization button.](images/1810_SUSPC_personalization.png) + ![Example image of the Set up School PCs app, Personalization screen, showing the default desktop and lock screen background photos, a Browse button under each photo, a blue Next button, and a Continue without personalization button.](images/suspcs/1810_SUSPC_personalization.png) ### Summary @@ -249,22 +249,22 @@ Review all of the settings for accuracy and completeness. Check carefully. To ma 1. To make changes now, click any page along the left side of the window. 2. When finished, click **Accept**. - ![Example image of the Summary screen, showing the user's configurations for Sign-in, Wireless network, Device names, Settings, Time zone, Take a Test. Accept button is available and the page contains three links on the right-hand side to help and support.](images/1810_SUSPC_summary.png) + ![Example image of the Summary screen, showing the user's configurations for Sign-in, Wireless network, Device names, Settings, Time zone, Take a Test. Accept button is available and the page contains three links on the right-hand side to help and support.](images/suspcs/1810_SUSPC_summary.png) ### Insert USB 1. Insert a USB drive. The **Save** button will light up when your computer detects the USB. 2. Choose your USB drive from the list and click **Save**. - ![Insert a USB drive now screen with USB drive selection highlighted. Save button is blue and active.](images/1810_SUSPC_USB.png) + ![Insert a USB drive now screen with USB drive selection highlighted. Save button is blue and active.](images/suspcs/1810_SUSPC_USB.png) 3. When the package is ready, you'll see the filename and package expiration date. You can also click **Add a USB** to save the same provisioning package to another USB drive. When you're done, remove the USB drive and click **Next**. - ![Your provisioning package is ready screen with package filename and expiration date. Shows an active blue, Next button, and a gray Add a USB button.](images/1810_SUSPC_Package_ready.png) + ![Your provisioning package is ready screen with package filename and expiration date. Shows an active blue, Next button, and a gray Add a USB button.](images/suspcs/1810_SUSPC_Package_ready.png) ## Run package - Get PCs ready Complete each step on the **Get PCs ready** page to prepare student PCs for set-up. Then click **Next**. - ![Your provisioning package is ready! screen with 3 steps to get student PCs ready for setup. Save button is active.](images/suspc_runpackage_getpcsready.png) + ![Your provisioning package is ready! screen with 3 steps to get student PCs ready for setup. Save button is active.](images/suspcs/suspc_runpackage_getpcsready.png) ## Run package - Install package on PC @@ -279,14 +279,14 @@ When used in context of the Set up School PCs app, the word *package* refers to 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**. - ![Example screenshot of the first screen the Windows 10 PC setup for OOBE. United States is selected as the region and the Yes button is active.](images/win10_1703_oobe_firstscreen.png) + ![Example screenshot of the first screen the Windows 10 PC setup for OOBE. United States is selected as the region and the Yes button is active.](images/suspcs/win10_1703_oobe_firstscreen.png) 2. Insert the USB drive. Windows automatically recognizes and installs the package. - ![Screen showing that the installation is automatically beginning, with a loading bar showing the status on the installation.](images/suspc_studentpcsetup_installingsetupfile.png) + ![Screen showing that the installation is automatically beginning, with a loading bar showing the status on the installation.](images/suspcs/suspc_studentpcsetup_installingsetupfile.png) 3. When you receive the message that it's okay to remove the USB drive, remove it from the PC. If there are more PCs to set up, insert the USB drive into the next PC. - ![Screen with message telling user to remove the USB drive.](images/suspc_setup_removemediamessage.png) + ![Screen with message telling user to remove the USB drive.](images/suspcs/suspc_setup_removemediamessage.png) 4. If you didn't set up the package with Azure AD Join, continue the Windows device setup experience. If you did configure the package with Azure AD Join, the computer is ready for use and no further configurations are required. diff --git a/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md index 2e3e08cf89..cfa21daedd 100644 --- a/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md +++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md @@ -70,19 +70,13 @@ Universal apps that you can distribute in the provisioning package can be line-o 2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Microsoft Store for Business, the package family name is listed in the **Package details** section of the download page. - ![details for offline app package.](../images/uwp-family.png) - 3. For **ApplicationFile**, click **Browse** to find and select the target app (either an \*.appx or \*.appxbundle). 4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Microsoft Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page. - ![required frameworks for offline app package.](../images/uwp-dependencies.png) - 5. For **DeviceContextAppLicense**, enter the **LicenseProductID**. - In Microsoft Store for Business, generate the unencoded license for the app on the app's download page, and change the extension of the license file from **.xml** to **.ms-windows-store-license**. - - ![generate license for offline app.](../images/uwp-license.png) - Open the license file and search for **LicenseID=** to get the GUID, enter the GUID in the **LicenseProductID** field and click **Add**. diff --git a/windows/configuration/provisioning-packages/provision-pcs-with-apps.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md index c96322afd3..7e5632400f 100644 --- a/windows/configuration/provisioning-packages/provision-pcs-with-apps.md +++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md @@ -85,19 +85,14 @@ Universal apps that you can distribute in the provisioning package can be line-o 2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Microsoft Store for Business, the package family name is listed in the **Package details** section of the download page. - ![details for offline app package.](../images/uwp-family.png) - 3. For **ApplicationFile**, select **Browse** to find and select the target app (either an \*.appx or \*.appxbundle). 4. For **DependencyAppxFiles**, select **Browse** to find and add any dependencies for the app. In Microsoft Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page. - ![required frameworks for offline app package.](../images/uwp-dependencies.png) 5. For **DeviceContextAppLicense**, enter the **LicenseProductID**. - In Microsoft Store for Business, generate the unencoded license for the app on the app's download page. - - ![generate license for offline app.](../images/uwp-license.png) - Open the license file and search for **LicenseID=** to get the GUID, enter the GUID in the **LicenseProductID** field and select **Add**.