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..07ed6a6adf 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** @@ -85,7 +82,7 @@ As an admin, you can remove any of these apps from the private store if you'd pr Applies to: IT admins ### Self-service sign up -Self-service sign up makes it easier for teachers and students in your organization to get started with **Minecraft: Education Edition**. If you have self-service sign up enabled in your tenant, teachers can assign **Minecraft: Education Edition** to students before they have a work or school account. Students receive an email that steps them through the process of signing up for a work or school account. For more information on self-service sign up, see [Using self-service sign up in your organization](https://support.office.com/article/Using-self-service-sign-up-in-your-organization-4f8712ff-9346-4c6c-bb63-a21ad7a62cbd?ui=en-US&rs=en-US&ad=US). +Self-service sign-up makes it easier for users in your organization to sign up for online services from Microsoft. We call this sign up process "self-service sign-up" because your users can sign up to use services paid by your subscription, or use free services, without asking you to take action on their behalf. For more information on self-service sign up, see [Using self-service sign up in your organization](https://support.office.com/article/Using-self-service-sign-up-in-your-organization-4f8712ff-9346-4c6c-bb63-a21ad7a62cbd?ui=en-US&rs=en-US&ad=US). ### Domain verification For education organizations, domain verification ensures you are on the academic verification list. As an admin, you might need to verify your domain using the Microsoft 365 admin center. For more information, see [Verify your Office 365 domain to prove ownership, nonprofit or education status](https://support.office.com/article/Verify-your-Office-365-domain-to-prove-ownership-nonprofit-or-education-status-or-to-activate-Yammer-87d1844e-aa47-4dc0-a61b-1b773fd4e590?ui=en-US&rs=en-US&ad=US). @@ -107,12 +104,6 @@ For more information on payment options, see [payment options](/microsoft-store/ For more information on tax rates, see [tax information](/microsoft-store/update-windows-store-for-business-account-settings#organization-tax-information). -### Get started with Minecraft: Education Edition -Teachers and IT administrators can now get trials or subscriptions to Minecraft: Education Edition and add it to Microsoft Store for Business for distribution. -- [Get started with Minecraft: Education Edition](./get-minecraft-for-education.md) -- [For IT admins – Minecraft: Education Edition](./school-get-minecraft.md) -- [For teachers – Minecraft: Education Edition](./teacher-get-minecraft.md) - ## Manage apps and software Applies to: IT admins and teachers @@ -136,8 +127,7 @@ Teachers can: ## Distribute apps **To manage and distribute apps** -- For info on how to distribute **Minecraft: Education Edition**, see [For IT admins – Minecraft: Education Edition](./school-get-minecraft.md#distribute-minecraft) -- For info on how to manage and distribute other apps, see [App inventory management - Microsoft Store for Business](/microsoft-store/app-inventory-management-windows-store-for-business) +- For info on how to manage and distribute apps, see [App inventory management - Microsoft Store for Business](/microsoft-store/app-inventory-management-windows-store-for-business) **To assign an app to a student** @@ -159,16 +149,9 @@ You can manage current app licenses, or purchase more licenses for apps in **App You'll have a summary of current license availability. -**Minecraft: Education Edition subscriptions** - -Similarly, you can purchase more subscriptions of **Minecraft: Education Edition** through Microsoft Store for Business. Find **Minecraft: Education Edition** in your inventory and use the previous steps for purchasing more app licenses. - ## Manage order history Applies to: IT admins and teachers You can manage your orders through Microsoft Store for Business. For info on order history and how to refund an order, see [Manage app orders in Microsoft Store for Business](/microsoft-store/manage-orders-microsoft-store-for-business). It can take up to 24 hours after a purchase, before a receipt is available on your **Order history page**. - -> [!NOTE] -> For **Minecraft: Education Edition**, you can request a refund through Microsoft Store for Business for two months from the purchase date. After two months, refunds require a support call. 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_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_setuptakeatest.PNG b/education/windows/images/takeatest/suspc_choosesettings_setuptakeatest.PNG similarity index 100% rename from education/windows/images/suspc_choosesettings_setuptakeatest.PNG rename to education/windows/images/takeatest/suspc_choosesettings_setuptakeatest.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..ee9ab69a50 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -24,14 +24,11 @@ ms.topic: conceptual When you sign up for a [Minecraft: Education Edition](https://education.minecraft.net) trial, or purchase a [Minecraft: Education Edition](https://education.minecraft.net) subscription, Minecraft: Education Edition will be added to the inventory in your Microsoft Admin Center which is associated with your Azure Active Directory (Azure AD) tenant. Your Microsoft Admin Center is only displayed to members of your organization with administrative roles. >[!Note] ->If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 Education subscription when you request Minecraft: Education Edition. For more information, see [Office 365 Education plans and pricing](https://products.office.com/academic/compare-office-365-education-plans). +>If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 Education subscription when you purchase Minecraft: Education Edition. For more information, see [Office 365 Education plans and pricing](https://products.office.com/academic/compare-office-365-education-plans). ## Settings for Microsoft 365 A3 or Microsoft 365 A5 customers -Schools that purchased these products have an extra option for making Minecraft: Education Edition available to their students: - -- Microsoft 365 A3 or Microsoft 365 A5 -- Minecraft: Education Edition +Schools that purchased Microsoft 365 A3 or Microsoft 365 A5 have an extra option for making Minecraft: Education Edition available to their students: If your school has these products in your tenant, admins can choose to enable Minecraft: Education Edition for students using Microsoft 365 A3 or Microsoft 365 A5. From the left-hand menu in Microsoft Admin Center, select Users. From the Users list, select the users you want to add or remove for Minecraft: Education Edition access. Add the relevant A3 or A5 license if it hasn't been assigned already. @@ -94,7 +91,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 e2858efc79..25de4845e6 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. @@ -135,7 +135,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/education/windows/windows-11-se-overview.md b/education/windows/windows-11-se-overview.md index f4f9890509..2aa19b0474 100644 --- a/education/windows/windows-11-se-overview.md +++ b/education/windows/windows-11-se-overview.md @@ -60,7 +60,7 @@ The following table lists all the applications included in Windows 11 SE and the | File Explorer | Win32 | | ✅ | | FlipGrid | PWA | | | | Get Help | UWP | | | -| Groove Music | UWP | ✅ | | +| Media Player | UWP | ✅ | | | Maps | UWP | | | | Minecraft: Education Edition | UWP | | | | Movies & TV | UWP | | | @@ -87,6 +87,7 @@ The following applications can also run on Windows 11 SE, and can be deployed us | Application | Supported version | App Type | Vendor | |-----------------------------------------|-------------------|----------|------------------------------| | AirSecure | 8.0.0 | Win32 | AIR | +| Alertus Desktop | 5.4.44.0 | Win32 | Alertus technologies | | Brave Browser | 1.34.80 | Win32 | Brave | | Bulb Digital Portfolio | 0.0.7.0 | Store | Bulb | | Cisco Umbrella | 3.0.110.0 | Win32 | Cisco | @@ -111,7 +112,8 @@ The following applications can also run on Windows 11 SE, and can be deployed us | Kite Student Portal | 8.0.3.0 | Win32 | Dynamic Learning Maps | | Kortext | 2.3.433.0 | Store | Kortext | | Kurzweil 3000 Assistive Learning | 20.13.0000 | Win32 | Kurzweil Educational Systems | -| LanSchool | 9.1.0.46 | Win32 | Stoneware | +| LanSchool Classic | 9.1.0.46 | Win32 | Stoneware, Inc. | +| LanSchool Air | 2.0.13312 | Win32 | Stoneware, Inc. | | Lightspeed Smart Agent | 1.9.1 | Win32 | Lightspeed Systems | | MetaMoJi ClassRoom | 3.12.4.0 | Store | MetaMoJi Corporation | | Microsoft Connect | 10.0.22000.1 | Store | Microsoft | diff --git a/windows/client-management/mdm/laps-csp.md b/windows/client-management/mdm/laps-csp.md index f69dfcb4d0..70617f2287 100644 --- a/windows/client-management/mdm/laps-csp.md +++ b/windows/client-management/mdm/laps-csp.md @@ -2,14 +2,14 @@ title: Local Administrator Password Solution CSP description: Learn how the Local Administrator Password Solution configuration service provider (CSP) is used by the enterprise to manage backup of local administrator account passwords. ms.author: jsimmons -ms.topic: article -ms.prod: w11 -ms.technology: windows -author: jsimmons +author: jay98014 +ms.reviewer: vinpa +manager: aaroncz +ms.topic: reference +ms.prod: windows-client +ms.technology: itpro-manage ms.localizationpriority: medium -ms.date: 07/04/2022 -ms.reviewer: jsimmons -manager: jsimmons +ms.date: 09/20/2022 --- # Local Administrator Password Solution CSP @@ -19,6 +19,9 @@ The Local Administrator Password Solution (LAPS) configuration service provider > [!IMPORTANT] > Windows LAPS is currently only available in Windows Insider builds as of 25145 and later. Support for the Windows LAPS Azure AD scenario is currently limited to a small group of Windows Insiders. +> [!TIP] +> This article covers the specific technical details of the LAPS CSP. For more information about the scenarios in which the LAPS CSP would be used, see [Windows Local Administrator Password Solution](/windows-server/identity/laps/laps). + The following example shows the LAPS CSP in tree format. ```xml @@ -231,7 +234,7 @@ Supported operations are Add, Get, Replace, and Delete. ### PasswordExpirationProtectionEnabled -Use this setting to configure additional enforcement of maximum password age for the managed local administrator account. +Use this setting to configure enforcement of maximum password age for the managed local administrator account. @@ -758,3 +761,5 @@ This example is configuring a hybrid device to back up its password to Active Di ## Related articles [Configuration service provider reference](configuration-service-provider-reference.md) + +[Windows LAPS](/windows-server/identity/laps/laps) diff --git a/windows/client-management/mdm/passportforwork-csp.md b/windows/client-management/mdm/passportforwork-csp.md index 67c5ae122a..8379da3699 100644 --- a/windows/client-management/mdm/passportforwork-csp.md +++ b/windows/client-management/mdm/passportforwork-csp.md @@ -83,7 +83,8 @@ PassportForWork -------UseBiometrics -------Biometrics ----------UseBiometrics -----------FacialFeatureUse +----------FacialFeaturesUseEnhancedAntiSpoofing +----------EnableESSwithSupportedPeripherals -------DeviceUnlock ----------GroupA ----------GroupB @@ -286,8 +287,6 @@ Boolean value used to enable or disable the use of biometric gestures, such as f Default value is true, enabling the biometric gestures for use with Windows Hello for Business. If you set this policy to false, biometric gestures are disabled for use with Windows Hello for Business. - - Supported operations are Add, Get, Delete, and Replace. *Not supported on Windows Holographic and Windows Holographic for Business prior to Windows 10 version 1903 (May 2019 Update).* @@ -305,6 +304,26 @@ Supported operations are Add, Get, Delete, and Replace. *Not supported on Windows Holographic and Windows Holographic for Business prior to Windows 10 version 1903 (May 2019 Update).* +**Biometrics/EnableESSwithSupportedPeripherals** (only for ./Device/Vendor/MSFT) + +If this policy is enabled, Windows Hello authentication using peripheral biometric sensors will be blocked. Any non-authentication operational functionalities such as camera usage (for instance, video calls and the camera) will be unaffected. + +If you enable this policy it can have the following possible values: + +**0 - Enhanced Sign-in Security Disabled** (not recommended) + +Enhanced sign-in security will be disabled on all systems, enabling the use of peripheral biometric authentication. If this policy value is set to 0 after users have enrolled in ESS biometrics, users will be prompted to reset their PIN. They will lose all their existing biometric enrollments. To use biometrics they will have to enroll again. + +**1 - Enhanced Sign-in Security Enabled** (default and recommended for highest security) + +Enhanced sign-in security will be enabled on systems with capable software and hardware, following the existing default behavior in Windows. Authentication operations of any biometric device that Enhanced Sign-in Security does not support, including that of peripheral devices, will be blocked and not available for Windows Hello. + +If you disable or do not configure this policy, Enhanced Sign-in Security is preferred on the device. The behavior will be the same as enabling the policy and setting the value to 1. + +Supported operations are Add, Get, Delete, and Replace. + +*Supported from Windows 11 version 22H2* + **DeviceUnlock** (only for ./Device/Vendor/MSFT) Added in Windows 10, version 1803. Interior node. @@ -551,7 +570,7 @@ Here's an example for setting Windows Hello for Business and setting the PIN pol true - + 15 @@ -566,6 +585,21 @@ Here's an example for setting Windows Hello for Business and setting the PIN pol true + + 16 + + + + ./Vendor/MSFT/PassportForWork/Biometrics/EnableESSwithSupportedPeripherals + + + + int + text/plain + + 0 + + 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**. diff --git a/windows/deployment/update/update-compliance-configuration-manual.md b/windows/deployment/update/update-compliance-configuration-manual.md index c301863138..bc6e8a327e 100644 --- a/windows/deployment/update/update-compliance-configuration-manual.md +++ b/windows/deployment/update/update-compliance-configuration-manual.md @@ -1,11 +1,11 @@ --- title: Manually configuring devices for Update Compliance ms.reviewer: -manager: dougeby +manager: aczechowski description: Manually configuring devices for Update Compliance ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.localizationpriority: medium ms.collection: M365-analytics ms.topic: article diff --git a/windows/deployment/update/update-compliance-configuration-mem.md b/windows/deployment/update/update-compliance-configuration-mem.md index 6db9d2bb84..31cc1b5b80 100644 --- a/windows/deployment/update/update-compliance-configuration-mem.md +++ b/windows/deployment/update/update-compliance-configuration-mem.md @@ -1,11 +1,11 @@ --- title: Configuring Microsoft Endpoint Manager devices for Update Compliance ms.reviewer: -manager: dougeby +manager: aczechowski description: Configuring devices that are enrolled in Endpoint Manager for Update Compliance ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.localizationpriority: medium ms.collection: M365-analytics ms.topic: article @@ -21,62 +21,64 @@ ms.topic: article This article is specifically targeted at configuring devices enrolled to [Microsoft Endpoint Manager](/mem/endpoint-manager-overview) for Update Compliance, within Microsoft Endpoint Manager itself. Configuring devices for Update Compliance in Microsoft Endpoint Manager breaks down to the following steps: 1. [Create a configuration profile](#create-a-configuration-profile) for devices you want to enroll, that contains settings for all the MDM policies that must be configured. -2. [Deploy the configuration script](#deploy-the-configuration-script) as a Win32 app to those same devices, so additional checks can be performed to ensure devices are correctly configured. -3. Wait for data to populate. The length of this process depends on the computer being on, connected to the internet, and correctly configured. Some data types take longer to appear than others. You can learn more about this in the broad section on [enrolling devices to Update Compliance](update-compliance-get-started.md#enroll-devices-in-update-compliance). +1. Wait for data to populate. The length of this process depends on the computer being on, connected to the internet, and correctly configured. Some data types take longer to appear than others. You can learn more about this in the broad section on [enrolling devices to Update Compliance](update-compliance-get-started.md#enroll-devices-in-update-compliance). + +> [!TIP] +> If you need to troubleshoot client enrollment, consider deploying the [configuration script](#deploy-the-configuration-script) as a Win32 app to a few devices and reviewing the logs it creates. Additional checks are performed with the script to ensure devices are correctly configured. ## Create a configuration profile Take the following steps to create a configuration profile that will set required policies for Update Compliance: 1. Go to the Admin portal in Endpoint Manager and navigate to **Devices/Windows/Configuration profiles**. -2. On the **Configuration profiles** view, select **Create a profile**. -3. Select **Platform**="Windows 10 and later" and **Profile type**="Templates". -4. For **Template name**, select **Custom**, and then press **Create**. -5. You are now on the Configuration profile creation screen. On the **Basics** tab, give a **Name** and **Description**. -6. On the **Configuration settings** page, you will be adding multiple OMA-URI Settings that correspond to the policies described in [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md). +1. On the **Configuration profiles** view, select **Create a profile**. +1. Select **Platform**="Windows 10 and later" and **Profile type**="Templates". +1. For **Template name**, select **Custom**, and then press **Create**. +1. You are now on the Configuration profile creation screen. On the **Basics** tab, give a **Name** and **Description**. +1. On the **Configuration settings** page, you will be adding multiple OMA-URI Settings that correspond to the policies described in [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md). 1. If you don't already have it, get your Commercial ID. For steps, see [Get your CommmercialID](update-compliance-get-started.md#get-your-commercialid). - 2. Add a setting for **Commercial ID** with the following values: + 1. Add a setting for **Commercial ID** with the following values: - **Name**: Commercial ID - **Description**: Sets the Commercial ID that corresponds to the Update Compliance Log Analytics workspace. - **OMA-URI**: `./Vendor/MSFT/DMClient/Provider/ProviderID/CommercialID` - **Data type**: String - **Value**: *Set this to your Commercial ID* - 2. Add a setting configuring the **Windows Diagnostic Data level** for devices: + 1. Add a setting configuring the **Windows Diagnostic Data level** for devices: - **Name**: Allow Telemetry - **Description**: Sets the maximum allowed diagnostic data to be sent to Microsoft, required for Update Compliance. - **OMA-URI**: `./Vendor/MSFT/Policy/Config/System/AllowTelemetry` - **Data type**: Integer - **Value**: 1 (*all that is required is 1, but it can be safely set to a higher value*). - 3. (*Recommended, but not required*) Add a setting for **disabling devices' Diagnostic Data opt-in settings interface**. If this is not disabled, users of each device can potentially override the diagnostic data level of devices such that data will not be available for those devices in Update Compliance: + 1. (*Recommended, but not required*) Add a setting for **disabling devices' Diagnostic Data opt-in settings interface**. If this is not disabled, users of each device can potentially override the diagnostic data level of devices such that data will not be available for those devices in Update Compliance: - **Name**: Disable Telemetry opt-in interface - **Description**: Disables the ability for end-users of devices can adjust diagnostic data to levels lower than defined by the Allow Telemetry setting. - **OMA-URI**: `./Vendor/MSFT/Policy/Config/System/ConfigureTelemetryOptInSettingsUx` - **Data type**: Integer - **Value**: 1 - 4. Add a setting to **Allow device name in diagnostic data**; otherwise, there will be no device name in Update Compliance: + 1. Add a setting to **Allow device name in diagnostic data**; otherwise, there will be no device name in Update Compliance: - **Name**: Allow device name in Diagnostic Data - **Description**: Allows device name in Diagnostic Data. - **OMA-URI**: `./Vendor/MSFT/Policy/Config/System/AllowDeviceNameInDiagnosticData` - **Data type**: Integer - **Value**: 1 - 5. Add a setting to **Allow Update Compliance processing**; this policy is required for Update Compliance: + 1. Add a setting to **Allow Update Compliance processing**; this policy is required for Update Compliance: - **Name**: Allow Update Compliance Processing - **Description**: Opts device data into Update Compliance processing. Required to see data. - **OMA-URI**: `./Vendor/MSFT/Policy/Config/System/AllowUpdateComplianceProcessing` - **Data type**: Integer - **Value**: 16 - 6. Add a setting to **Allow commercial data pipeline**; this policy is required for Update Compliance: + 1. Add a setting to **Allow commercial data pipeline**; this policy is required for Update Compliance: - **Name**: Allow commercial data pipeline - **Description**: Configures Microsoft to be the processor of the Windows diagnostic data collected from an Azure Active Directory-joined device. - **OMA-URI**: `./Vendor/MSFT/Policy/Config/System/AllowCommercialDataPipeline` - **Data type**: Integer - **Value**: 1 -7. Proceed through the next set of tabs **Scope tags**, **Assignments**, and **Applicability Rules** to assign the configuration profile to devices you wish to enroll. -8. Review and select **Create**. +1. Proceed through the next set of tabs **Scope tags**, **Assignments**, and **Applicability Rules** to assign the configuration profile to devices you wish to enroll. +1. Review and select **Create**. ## Deploy the configuration script -The [Update Compliance Configuration Script](update-compliance-configuration-script.md) is an important component of properly enrolling devices in Update Compliance, though it isn't strictly necessary. It checks to ensure that devices have the required services running and checks connectivity to the endpoints detailed in the section on [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md). You can deploy the script as a Win32 app. For more information, see [Win32 app management in Microsoft Intune](/mem/intune/apps/apps-win32-app-management). +The [Update Compliance Configuration Script](update-compliance-configuration-script.md) is a useful tool for properly enrolling devices in Update Compliance, though it isn't strictly necessary. It checks to ensure that devices have the required services running and checks connectivity to the endpoints detailed in the section on [Manually configuring devices for Update Compliance](update-compliance-configuration-manual.md). You can deploy the script as a Win32 app. For more information, see [Win32 app management in Microsoft Intune](/mem/intune/apps/apps-win32-app-management). When you deploy the configuration script as a Win32 app, you won't be able to retrieve the results of logs on the device without having access to the device, or saving results of the logs to a shared filesystem. We recommend deploying the script in Pilot mode to a set of devices that you do have access to, or have a way to access the resultant log output the script provides, with as similar of a configuration profile as other devices which will be enrolled to Update Compliance, and analyzing the logs for any potential issues. Following this, you can deploy the configuration script in Deployment mode as a Win32 app to all Update Compliance devices. diff --git a/windows/deployment/update/update-compliance-configuration-script.md b/windows/deployment/update/update-compliance-configuration-script.md index 15c207cf56..dfc1c5cae2 100644 --- a/windows/deployment/update/update-compliance-configuration-script.md +++ b/windows/deployment/update/update-compliance-configuration-script.md @@ -1,7 +1,7 @@ --- title: Update Compliance Configuration Script ms.reviewer: -manager: dougeby +manager: aczechowski description: Downloading and using the Update Compliance Configuration Script ms.prod: w10 author: mestew diff --git a/windows/deployment/update/update-compliance-delivery-optimization.md b/windows/deployment/update/update-compliance-delivery-optimization.md index 97771928db..34024f43cb 100644 --- a/windows/deployment/update/update-compliance-delivery-optimization.md +++ b/windows/deployment/update/update-compliance-delivery-optimization.md @@ -1,11 +1,11 @@ --- title: Delivery Optimization in Update Compliance ms.reviewer: -manager: dougeby +manager: aczechowski description: Learn how the Update Compliance solution provides you with information about your Delivery Optimization configuration. ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.localizationpriority: medium ms.collection: M365-analytics ms.topic: article @@ -46,7 +46,7 @@ The table breaks down the number of bytes from each download source into specifi The download sources that could be included are: - LAN Bytes: Bytes downloaded from LAN Peers which are other devices on the same local network - Group Bytes: Bytes downloaded from Group Peers which are other devices that belong to the same Group (available when the "Group" download mode is used) -- HTTP Bytes: Non-peer bytes. The HTTP download source can be Microsoft Servers, Windows Update Servers, a WSUS server or an Configuration Manager Distribution Point for Express Updates. +- HTTP Bytes: Non-peer bytes. The HTTP download source can be Microsoft Servers, Windows Update Servers, a WSUS server or a Configuration Manager Distribution Point for Express Updates. [!INCLUDE [Monitor Delivery Optimization](../do/includes/waas-delivery-optimization-monitor.md)] diff --git a/windows/deployment/update/update-compliance-feature-update-status.md b/windows/deployment/update/update-compliance-feature-update-status.md index aef454e5ea..17b63d9e79 100644 --- a/windows/deployment/update/update-compliance-feature-update-status.md +++ b/windows/deployment/update/update-compliance-feature-update-status.md @@ -1,11 +1,11 @@ --- title: Update Compliance - Feature Update Status report ms.reviewer: -manager: dougeby +manager: aczechowski description: Learn how the Feature Update Status report provides information about the status of feature updates across all devices. ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article ms.custom: seo-marvel-apr2020 diff --git a/windows/deployment/update/update-compliance-get-started.md b/windows/deployment/update/update-compliance-get-started.md index 3449a9e3ff..23d4fb68e8 100644 --- a/windows/deployment/update/update-compliance-get-started.md +++ b/windows/deployment/update/update-compliance-get-started.md @@ -1,10 +1,10 @@ --- title: Get started with Update Compliance -manager: dougeby +manager: aczechowski description: Prerequisites, Azure onboarding, and configuring devices for Update Compliance ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.localizationpriority: medium ms.collection: - M365-analytics diff --git a/windows/deployment/update/update-compliance-monitor.md b/windows/deployment/update/update-compliance-monitor.md index 14be646f48..0ed598274c 100644 --- a/windows/deployment/update/update-compliance-monitor.md +++ b/windows/deployment/update/update-compliance-monitor.md @@ -1,11 +1,11 @@ --- title: Monitor Windows Updates and Microsoft Defender AV with Update Compliance ms.reviewer: -manager: dougeby +manager: aczechowski description: You can use Update Compliance in Azure portal to monitor the progress of updates and key anti-malware protection features on devices in your network. ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.localizationpriority: medium ms.collection: M365-analytics ms.topic: article diff --git a/windows/deployment/update/update-compliance-need-attention.md b/windows/deployment/update/update-compliance-need-attention.md index a72b0bd9e9..680cfffa35 100644 --- a/windows/deployment/update/update-compliance-need-attention.md +++ b/windows/deployment/update/update-compliance-need-attention.md @@ -1,9 +1,9 @@ --- title: Update Compliance - Need Attention! report -manager: dougeby +manager: aczechowski description: Learn how the Need attention! section provides a breakdown of all Windows 10 device and update issues detected by Update Compliance. -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article ms.prod: w10 diff --git a/windows/deployment/update/update-compliance-privacy.md b/windows/deployment/update/update-compliance-privacy.md index 25616519e4..08423ff755 100644 --- a/windows/deployment/update/update-compliance-privacy.md +++ b/windows/deployment/update/update-compliance-privacy.md @@ -1,11 +1,11 @@ --- title: Privacy in Update Compliance ms.reviewer: -manager: dougeby +manager: aczechowski description: an overview of the Feature Update Status report ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- diff --git a/windows/deployment/update/update-compliance-safeguard-holds.md b/windows/deployment/update/update-compliance-safeguard-holds.md index c745e589a3..f45cd6f50d 100644 --- a/windows/deployment/update/update-compliance-safeguard-holds.md +++ b/windows/deployment/update/update-compliance-safeguard-holds.md @@ -1,11 +1,11 @@ --- title: Update Compliance - Safeguard Holds report ms.reviewer: -manager: dougeby +manager: aczechowski description: Learn how the Safeguard Holds report provides information about safeguard holds in your population. ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article ms.custom: seo-marvel-apr2020 diff --git a/windows/deployment/update/update-compliance-schema-waasdeploymentstatus.md b/windows/deployment/update/update-compliance-schema-waasdeploymentstatus.md index 80aca45d8a..2dc69aadd8 100644 --- a/windows/deployment/update/update-compliance-schema-waasdeploymentstatus.md +++ b/windows/deployment/update/update-compliance-schema-waasdeploymentstatus.md @@ -1,11 +1,11 @@ --- title: Update Compliance Schema - WaaSDeploymentStatus ms.reviewer: -manager: dougeby +manager: aczechowski description: WaaSDeploymentStatus schema ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- diff --git a/windows/deployment/update/update-compliance-schema-waasinsiderstatus.md b/windows/deployment/update/update-compliance-schema-waasinsiderstatus.md index a3029d3af7..30667a459e 100644 --- a/windows/deployment/update/update-compliance-schema-waasinsiderstatus.md +++ b/windows/deployment/update/update-compliance-schema-waasinsiderstatus.md @@ -1,11 +1,11 @@ --- title: Update Compliance Schema - WaaSInsiderStatus ms.reviewer: -manager: dougeby +manager: aczechowski description: WaaSInsiderStatus schema ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- diff --git a/windows/deployment/update/update-compliance-schema-waasupdatestatus.md b/windows/deployment/update/update-compliance-schema-waasupdatestatus.md index 7691648ab9..b1cb215ae1 100644 --- a/windows/deployment/update/update-compliance-schema-waasupdatestatus.md +++ b/windows/deployment/update/update-compliance-schema-waasupdatestatus.md @@ -1,11 +1,11 @@ --- title: Update Compliance Schema - WaaSUpdateStatus ms.reviewer: -manager: dougeby +manager: aczechowski description: WaaSUpdateStatus schema ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- diff --git a/windows/deployment/update/update-compliance-schema-wudoaggregatedstatus.md b/windows/deployment/update/update-compliance-schema-wudoaggregatedstatus.md index 585d9bb1a9..c38fe10c37 100644 --- a/windows/deployment/update/update-compliance-schema-wudoaggregatedstatus.md +++ b/windows/deployment/update/update-compliance-schema-wudoaggregatedstatus.md @@ -1,11 +1,11 @@ --- title: Update Compliance Schema - WUDOAggregatedStatus ms.reviewer: -manager: dougeby +manager: aczechowski description: WUDOAggregatedStatus schema ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- diff --git a/windows/deployment/update/update-compliance-schema-wudostatus.md b/windows/deployment/update/update-compliance-schema-wudostatus.md index a954e3329c..7635fd97e7 100644 --- a/windows/deployment/update/update-compliance-schema-wudostatus.md +++ b/windows/deployment/update/update-compliance-schema-wudostatus.md @@ -1,11 +1,11 @@ --- title: Update Compliance Schema - WUDOStatus ms.reviewer: -manager: dougeby +manager: aczechowski description: WUDOStatus schema ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- diff --git a/windows/deployment/update/update-compliance-schema.md b/windows/deployment/update/update-compliance-schema.md index 872530b839..3f5325e847 100644 --- a/windows/deployment/update/update-compliance-schema.md +++ b/windows/deployment/update/update-compliance-schema.md @@ -1,11 +1,11 @@ --- title: Update Compliance Data Schema ms.reviewer: -manager: dougeby +manager: aczechowski description: an overview of Update Compliance data schema ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article --- @@ -21,7 +21,7 @@ The table below summarizes the different tables that are part of the Update Comp |Table |Category |Description | |--|--|--| -|[**WaaSUpdateStatus**](update-compliance-schema-waasupdatestatus.md) |Device record |This table houses device-centric data and acts as the device record for Update Compliance. Each record provided in daily snapshots map to a single device in a single tenant. This table has data such as the current device's installed version of Windows, whether it is on the latest available updates, and whether the device needs attention. | +|[**WaaSUpdateStatus**](update-compliance-schema-waasupdatestatus.md) |Device record |This table houses device-centric data and acts as the device record for Update Compliance. Each record provided in daily snapshots maps to a single device in a single tenant. This table has data such as the current device's installed version of Windows, whether it is on the latest available updates, and whether the device needs attention. | |[**WaaSInsiderStatus**](update-compliance-schema-waasinsiderstatus.md) |Device record |This table houses device-centric data specifically for devices enrolled to the Windows Insider Program. Devices enrolled to the Windows Insider Program do not currently have any WaaSDeploymentStatus records, so do not have Update Session data to report on update deployment progress. | |[**WaaSDeploymentStatus**](update-compliance-schema-waasdeploymentstatus.md) |Update Session record |This table tracks a specific update on a specific device. Multiple WaaSDeploymentStatus records can exist simultaneously for a given device, as each record is specific to a given update and its type. For example, a device can have both a WaaSDeploymentStatus tracking a Windows Feature Update, as well as one tracking a Windows Quality Update, at the same time. | |[**WUDOStatus**](update-compliance-schema-wudostatus.md) |Delivery Optimization record |This table provides information, for a single device, on their bandwidth utilization across content types in the event they use [Delivery Optimization](https://support.microsoft.com/help/4468254/windows-update-delivery-optimization-faq). | diff --git a/windows/deployment/update/update-compliance-security-update-status.md b/windows/deployment/update/update-compliance-security-update-status.md index 9bec83ea8e..3fcd47f35f 100644 --- a/windows/deployment/update/update-compliance-security-update-status.md +++ b/windows/deployment/update/update-compliance-security-update-status.md @@ -1,11 +1,11 @@ --- title: Update Compliance - Security Update Status report ms.reviewer: -manager: dougeby +manager: aczechowski description: Learn how the Security Update Status section provides information about security updates across all devices. ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.collection: M365-analytics ms.topic: article ms.custom: seo-marvel-apr2020 diff --git a/windows/deployment/update/update-compliance-using.md b/windows/deployment/update/update-compliance-using.md index 1181984ab9..717bfa6599 100644 --- a/windows/deployment/update/update-compliance-using.md +++ b/windows/deployment/update/update-compliance-using.md @@ -1,11 +1,11 @@ --- title: Using Update Compliance ms.reviewer: -manager: dougeby +manager: aczechowski description: Learn how to use Update Compliance to monitor your device's Windows updates. ms.prod: w10 -author: aczechowski -ms.author: aaroncz +author: mestew +ms.author: mstewart ms.localizationpriority: medium ms.collection: M365-analytics ms.topic: article diff --git a/windows/deployment/update/update-compliance-v2-configuration-mem.md b/windows/deployment/update/update-compliance-v2-configuration-mem.md index 765128a9dc..2589190da8 100644 --- a/windows/deployment/update/update-compliance-v2-configuration-mem.md +++ b/windows/deployment/update/update-compliance-v2-configuration-mem.md @@ -24,8 +24,10 @@ ms.date: 08/24/2022 This article is specifically targeted at configuring devices enrolled to [Microsoft Endpoint Manager](/mem/endpoint-manager-overview) for Update Compliance, within Microsoft Endpoint Manager itself. Configuring devices for Update Compliance in Microsoft Endpoint Manager breaks down to the following steps: 1. [Create a configuration profile](#create-a-configuration-profile) for devices you want to enroll. The configuration profile contains settings for all the Mobile Device Management (MDM) policies that must be configured. -2. [Deploy the configuration script](#deploy-the-configuration-script) as a Win32 app to those same devices, so additional checks can be performed to ensure devices are correctly configured. -3. Wait for data to populate. The length of this process depends on the computer being on, connected to the internet, and correctly configured. Some data types take longer to appear than others. For more information, see [Use Update Compliance](update-compliance-v2-use.md). +1. Wait for data to populate. The length of this process depends on the computer being on, connected to the internet, and correctly configured. Some data types take longer to appear than others. For more information, see [Use Update Compliance](update-compliance-v2-use.md). + +> [!TIP] +> If you need to troubleshoot client enrollment, consider deploying the [configuration script](#deploy-the-configuration-script) as a Win32 app to a few devices and reviewing the logs it creates. Additional checks are performed with the script to ensure devices are correctly configured. ## Create a configuration profile @@ -105,7 +107,7 @@ Create a configuration profile that will set the required policies for Update Co ## Deploy the configuration script -The [Update Compliance Configuration Script](update-compliance-v2-configuration-script.md) is an important component of properly enrolling devices in Update Compliance, though it isn't strictly necessary. It checks to ensure that devices have the required services running and checks connectivity to the endpoints detailed in the section on [Manually configuring devices for Update Compliance](update-compliance-v2-configuration-manual.md). You can deploy the script as a Win32 app. For more information, see [Win32 app management in Microsoft Intune](/mem/intune/apps/apps-win32-app-management). +The [Update Compliance Configuration Script](update-compliance-v2-configuration-script.md) is a useful tool for properly enrolling devices in Update Compliance, though it isn't strictly necessary. It checks to ensure that devices have the required services running and checks connectivity to the endpoints detailed in the section on [Manually configuring devices for Update Compliance](update-compliance-v2-configuration-manual.md). You can deploy the script as a Win32 app. For more information, see [Win32 app management in Microsoft Intune](/mem/intune/apps/apps-win32-app-management). When you deploy the configuration script as a Win32 app, you won't be able to retrieve the results of logs on the device without having access to the device, or saving results of the logs to a shared filesystem. We recommend deploying the script in pilot mode to a set of devices that you do have access to, or have a way to access the resultant log output the script provides, with as similar of a configuration profile as other devices which will be enrolled to Update Compliance, and analyzing the logs for any potential issues. Following this, you can deploy the configuration script in deployment mode as a Win32 app to all Update Compliance devices. diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust.md index da2c3ed436..7e64879acd 100644 --- a/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust.md +++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust.md @@ -253,8 +253,8 @@ Windows Hello for Business cloud Kerberos trust looks for a writeable DC to exch ### Do I need line of sight to a domain controller to use Windows Hello for Business cloud Kerberos trust? Windows Hello for Business cloud Kerberos trust requires line of sight to a domain controller for some scenarios: -- The first sign-in or unlock with Windows Hello for Business after provisioning on a Hybrid Azure AD joined device -- When attempting to access an on-premises resource from an Azure AD joined device +- The first sign-in or unlock with Windows Hello for Business after provisioning +- When attempting to access an on-premises resource from a Hybrid Azure AD joined device ### Can I use RDP/VDI with Windows Hello for Business cloud Kerberos trust? diff --git a/windows/security/information-protection/bitlocker/bitlocker-recovery-guide-plan.md b/windows/security/information-protection/bitlocker/bitlocker-recovery-guide-plan.md index 7c87a7eecd..6a485b8348 100644 --- a/windows/security/information-protection/bitlocker/bitlocker-recovery-guide-plan.md +++ b/windows/security/information-protection/bitlocker/bitlocker-recovery-guide-plan.md @@ -1,12 +1,13 @@ --- -title: BitLocker recovery guide (Windows 10) -description: This article for IT professionals describes how to recover BitLocker keys from AD DS. -ms.reviewer: -ms.prod: m365-security +title: BitLocker recovery guide +description: This article for IT professionals describes how to recover BitLocker keys from Active Directory Domain Services (AD DS). +ms.prod: windows-client +ms.technology: itpro-security ms.localizationpriority: medium -author: dansimp -ms.author: dansimp -manager: dansimp +author: frankroj +ms.author: frankroj +ms.reviewer: rafals +manager: aaroncz ms.collection: - M365-security-compliance - highpri @@ -21,11 +22,11 @@ ms.custom: bitlocker - Windows 10 - Windows 11 -- Windows Server 2016 and above +- Windows Server 2016 and later -This article for IT professionals describes how to recover BitLocker keys from AD DS. +This article for IT professionals describes how to recover BitLocker keys from Active Directory Domain Services (AD DS). -Organizations can use BitLocker recovery information saved in Active Directory Domain Services (AD DS) to access BitLocker-protected data. Creating a recovery model for BitLocker while you are planning your BitLocker deployment is recommended. +Organizations can use BitLocker recovery information saved in AD DS to access BitLocker-protected data. Creating a recovery model for BitLocker while you are planning your BitLocker deployment is recommended. This article assumes that you understand how to set up AD DS to back up BitLocker recovery information automatically, and what types of recovery information are saved to AD DS. @@ -45,7 +46,7 @@ BitLocker recovery is the process by which you can restore access to a BitLocker The following list provides examples of specific events that will cause BitLocker to enter recovery mode when attempting to start the operating system drive: -- On PCs that use BitLocker Drive Encryption, or on devices such as tablets or phones that use [BitLocker Device Encryption](bitlocker-device-encryption-overview-windows-10.md) only, when an attack is detected, the device will immediately reboot and enter into BitLocker recovery mode. To take advantage of this functionality, administrators can set the **Interactive logon: Machine account lockout threshold** Group Policy setting located in **\\Computer Configuration\\Windows Settings\\Security Settings\\Local Policies\\Security Options** in the Local Group Policy Editor. Or they can use the **MaxFailedPasswordAttempts** policy of [Exchange ActiveSync](/Exchange/clients/exchange-activesync/exchange-activesync) (also configurable through [Microsoft Intune](https://www.microsoft.com/microsoft-365/enterprise-mobility-security/microsoft-intune)), to limit the number of failed password attempts before the device goes into Device Lockout. +- On PCs that use BitLocker Drive Encryption, or on devices such as tablets or phones that use [BitLocker Device Encryption](bitlocker-device-encryption-overview-windows-10.md) only, when an attack is detected, the device will immediately reboot and enter into BitLocker recovery mode. To take advantage of this functionality, administrators can set the **Interactive logon: Machine account lockout threshold** Group Policy setting located in **\\Computer Configuration\\Windows Settings\\Security Settings\\Local Policies\\Security Options** in the Local Group Policy Editor. Or they can use the **MaxFailedPasswordAttempts** policy of [Exchange ActiveSync](/Exchange/clients/exchange-activesync/exchange-activesync) (also configurable through [Microsoft Intune](/mem/intune)), to limit the number of failed password attempts before the device goes into Device Lockout. - On devices with TPM 1.2, changing the BIOS or firmware boot device order causes BitLocker recovery. However, devices with TPM 2.0 do not start BitLocker recovery in this case. TPM 2.0 does not consider a firmware change of boot device order as a security threat because the OS Boot Loader is not compromised. - Having the CD or DVD drive before the hard drive in the BIOS boot order and then inserting or removing a CD or DVD. - Failing to boot from a network drive before booting from the hard drive. @@ -280,8 +281,14 @@ This error might occur if you updated the firmware. As a best practice, you shou ## Windows RE and BitLocker Device Encryption -Windows Recovery Environment (RE) can be used to recover access to a drive protected by [BitLocker Device Encryption](bitlocker-device-encryption-overview-windows-10.md). If a PC is unable to boot after two failures, Startup Repair will automatically start. When Startup Repair is launched automatically due to boot failures, it will only execute operating system and driver file repairs, provided that the boot logs or any available crash dump point to a specific corrupted file. In Windows 8.1 and later, devices that include firmware to support specific TPM measurements for PCR\[7\] the TPM can validate that Windows RE is a trusted operating environment and will unlock any BitLocker-protected drives if Windows RE has not been modified. If the Windows RE environment has been modified, for example the TPM has been disabled, the drives will stay locked until the BitLocker recovery key is provided. If Startup Repair can't run automatically from the PC and instead Windows RE is manually started from a repair disk, then the BitLocker recovery key must be provided to unlock the BitLocker–protected drives. +Windows Recovery Environment (Windows RE) can be used to recover access to a drive protected by [BitLocker Device Encryption](bitlocker-device-encryption-overview-windows-10.md). If a PC is unable to boot after two failures, Startup Repair will automatically start. When Startup Repair is launched automatically due to boot failures, it will only execute operating system and driver file repairs, provided that the boot logs or any available crash dump point to a specific corrupted file. In Windows 8.1 and later, devices that include firmware to support specific TPM measurements for PCR\[7\] the TPM can validate that Windows RE is a trusted operating environment and will unlock any BitLocker-protected drives if Windows RE has not been modified. If the Windows RE environment has been modified, for example the TPM has been disabled, the drives will stay locked until the BitLocker recovery key is provided. If Startup Repair can't run automatically from the PC and instead Windows RE is manually started from a repair disk, then the BitLocker recovery key must be provided to unlock the BitLocker–protected drives. +Windows RE will also ask for your BitLocker recovery key when you start a "Remove everything" reset from Windows RE on a device that uses the "TPM + PIN" or "Password for OS drive" protector. If you start BitLocker recovery on a keyboardless device with TPM-only protection, Windows RE, not the boot manager, will ask for the BitLocker recovery key. After you enter the key, you can access Windows RE troubleshooting tools or start Windows normally. + +The BitLocker recovery screen that's shown by Windows RE has the accessibility tools like narrator and on-screen keyboard to help you enter your BitLocker recovery key. If the BitLocker recovery key is requested by the Windows boot manager, those tools might not be available. + +To activate the narrator during BitLocker recovery in Windows RE, press **Windows** + **CTRL** + **Enter**. +To activate the on-screen keyboard, tap on a text input control. ## BitLocker recovery screen diff --git a/windows/security/information-protection/bitlocker/images/bl-narrator.png b/windows/security/information-protection/bitlocker/images/bl-narrator.png new file mode 100644 index 0000000000..223d0bc3b6 Binary files /dev/null and b/windows/security/information-protection/bitlocker/images/bl-narrator.png differ diff --git a/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md b/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md index dc0cc09dcd..b96b652981 100644 --- a/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md +++ b/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md @@ -19,7 +19,7 @@ appliesto: Microsoft Pluton security processor is a chip-to-cloud security technology built with [Zero Trust](/security/zero-trust/zero-trust-overview) principles at the core. Microsoft Pluton provides hardware-based root of trust, secure identity, secure attestation, and cryptographic services. Pluton technology is a combination of a secure subsystem which is part of the System on Chip (SoC) and Microsoft authored software that runs on this integrated secure subsystem. -Microsoft Pluton is currently available on devices with Ryzen 7000 and Qualcomm Snapdragon® 8cx Gen 3 series processors. Microsoft Pluton can be enabled on devices with Pluton capable processors running Windows 11, version 22H2. +Microsoft Pluton is currently available on devices with Ryzen 6000 and Qualcomm Snapdragon® 8cx Gen 3 series processors. Microsoft Pluton can be enabled on devices with Pluton capable processors running Windows 11, version 22H2. ## What is Microsoft Pluton? diff --git a/windows/security/information-protection/pluton/pluton-as-tpm.md b/windows/security/information-protection/pluton/pluton-as-tpm.md index ac2cad6ed7..121337c071 100644 --- a/windows/security/information-protection/pluton/pluton-as-tpm.md +++ b/windows/security/information-protection/pluton/pluton-as-tpm.md @@ -33,7 +33,7 @@ Pluton is integrated within the SoC subsystem, and provides a flexible, updatabl ## Enable Microsoft Pluton as TPM -Devices with Ryzen 7000 and Qualcomm Snapdragon® 8cx Gen 3 series processors are Pluton Capable, however enabling and providing an option to enable Pluton is at the discretion of the device manufacturer. Pluton is supported on these devices and can be enabled from the Unified Extensible Firmware Interface (UEFI) setup options for the device. +Devices with Ryzen 6000 and Qualcomm Snapdragon® 8cx Gen 3 series processors are Pluton Capable, however enabling and providing an option to enable Pluton is at the discretion of the device manufacturer. Pluton is supported on these devices and can be enabled from the Unified Extensible Firmware Interface (UEFI) setup options for the device. UEFI setup options differ from product to product, visit the product website and check for guidance to enable Pluton as TPM. diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md index 64e6685f37..80be7ef669 100644 --- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md +++ b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md @@ -6,7 +6,7 @@ ms.technology: itpro-security ms.localizationpriority: medium ms.collection: M365-security-compliance author: jsuther1974 -ms.reviewer: isbrahm +ms.reviewer: jgeurten ms.author: vinpa manager: aaroncz ms.date: 09/29/2021 @@ -62,6 +62,7 @@ Unless your use scenarios explicitly require them, Microsoft recommends that you - texttransform.exe - visualuiaverifynative.exe - system.management.automation.dll +- webclnt.dll/davsvc.dll - wfc.exe - windbg.exe - wmic.exe @@ -119,7 +120,7 @@ Select the correct version of each .dll for the Windows release you plan to supp ```xml - 10.0.0.0 + 10.1.0.0 {A244370E-44C9-4C06-B551-F6016E563076} {2E07F7E4-194C-4D20-B7C9-6F44A6C5A234} @@ -143,50 +144,51 @@ Select the correct version of each .dll for the Windows release you plan to supp - - - - - + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + --> diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md index 130ec8b14c..6382926723 100644 --- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md +++ b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md @@ -66,18 +66,17 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- ```xml - 10.0.25090.0 - {D2BDA982-CCF6-4344-AC5B-0B44427B6816} + 10.0.25210.0 {2E07F7E4-194C-4D20-B7C9-6F44A6C5A234} - + - + @@ -86,6 +85,10 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + @@ -126,6 +129,58 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -162,7 +217,7 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + @@ -175,10 +230,58 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -191,6 +294,10 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + @@ -233,6 +340,79 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -245,6 +425,118 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -265,214 +557,298 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - + + + + + - - + + + + + + + + - - - + + + + + + + + + + - - - - - + + + + + + + + + + + - + - + + + - - - - - - - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -480,47 +856,82 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + - - - - - - - + + - - - - + + + - - - - - - - - - - + + + - - - - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -534,194 +945,117 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - - - - - - - - - - - + + + + @@ -743,104 +1077,397 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - + - - - - - + + + + + - - - - - - - - + + + + + - - - - - - - + + + @@ -856,11 +1483,15 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + + + + + @@ -901,14 +1532,62 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -950,10 +1629,58 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -966,6 +1693,10 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + @@ -1008,6 +1739,79 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1020,6 +1824,118 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1049,69 +1965,69 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1121,80 +2037,118 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1213,10 +2167,16 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - 10.0.25090.0 + 10.0.25210.0 + + + + + true + {A244370E-44C9-4C06-B551-F6016E563076} ``` diff --git a/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md b/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md index e8ea61c23d..012e954059 100644 --- a/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md +++ b/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md @@ -61,9 +61,18 @@ Smart App Control is only available on clean installation of Windows 11 version > [!IMPORTANT] > Once you turn Smart App Control off, it can't be turned on without resetting or reinstalling Windows. +### Smart App Control Enforced Blocks + +Smart App Control enforces the [Microsoft Recommended Driver Block rules](microsoft-recommended-driver-block-rules.md) and the [Microsoft Recommended Block Rules](microsoft-recommended-block-rules.md), with a few exceptions for compatibility considerations. The following are not blocked by Smart App Control: + +- Infdefaultinstall.exe +- Microsoft.Build.dll +- Microsoft.Build.Framework.dll +- Wslhost.dll + ## Related articles - [WDAC design guide](windows-defender-application-control-design-guide.md) - [WDAC deployment guide](windows-defender-application-control-deployment-guide.md) - [WDAC operational guide](windows-defender-application-control-operational-guide.md) -- [AppLocker overview](applocker/applocker-overview.md) \ No newline at end of file +- [AppLocker overview](applocker/applocker-overview.md) diff --git a/windows/security/threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md b/windows/security/threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md index 5e0c376121..8963229d82 100644 --- a/windows/security/threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md +++ b/windows/security/threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md @@ -54,7 +54,7 @@ No. SCM supported only SCAP 1.0, which wasn't updated as SCAP evolved. The new t | Name | Build | Baseline Release Date | Security Tools | | ---- | ----- | --------------------- | -------------- | -| Windows 11 | [Windows 11](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/windows-11-security-baseline/ba-p/2810772)
| October 2021
|[SCT 1.0](https://www.microsoft.com/download/details.aspx?id=55319) | +| Windows 11 | [22H2](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/windows-11-version-22h2-security-baseline/ba-p/3632520)
| September 2022
|[SCT 1.0](https://www.microsoft.com/download/details.aspx?id=55319) | | Windows 10 | [21H2](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/security-baseline-for-windows-10-version-21h2/ba-p/3042703)
[21H1](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/security-baseline-final-for-windows-10-version-21h1/ba-p/2362353)
[20H2](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/security-baseline-final-for-windows-10-and-windows-server/ba-p/1999393)
[1809](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/security-baseline-final-for-windows-10-v1809-and-windows-server/ba-p/701082)
[1607](/archive/blogs/secguide/security-baseline-for-windows-10-v1607-anniversary-edition-and-windows-server-2016)
[1507](/archive/blogs/secguide/security-baseline-for-windows-10-v1507-build-10240-th1-ltsb-update)| December 2021
May 2021
December 2020
October 2018
October 2016
January 2016 |[SCT 1.0](https://www.microsoft.com/download/details.aspx?id=55319) | Windows 8.1 |[9600 (April Update)](/archive/blogs/secguide/security-baselines-for-windows-8-1-windows-server-2012-r2-and-internet-explorer-11-final)| October 2013| [SCM 4.0](/previous-versions/tn-archive/cc936627(v=technet.10)) | diff --git a/windows/security/threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md b/windows/security/threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md index 1a2434ffeb..92875c810d 100644 --- a/windows/security/threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md +++ b/windows/security/threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md @@ -25,14 +25,15 @@ The SCT enables administrators to effectively manage their enterprise’s Group The Security Compliance Toolkit consists of: - Windows 11 security baseline - + - Windows 11, version 22H2 + - Windows 11, version 21H2 - Windows 10 security baselines - - Windows 10 Version 21H2 - - Windows 10 Version 21H1 - - Windows 10 Version 20H2 - - Windows 10 Version 1809 - - Windows 10 Version 1607 - - Windows 10 Version 1507 + - Windows 10, version 21H2 + - Windows 10, version 21H1 + - Windows 10, version 20H2 + - Windows 10, version 1809 + - Windows 10, version 1607 + - Windows 10, version 1507 - Windows Server security baselines - Windows Server 2022 diff --git a/windows/whats-new/whats-new-windows-11-version-22H2.md b/windows/whats-new/whats-new-windows-11-version-22H2.md index 7a75c8344c..0af8ec6113 100644 --- a/windows/whats-new/whats-new-windows-11-version-22H2.md +++ b/windows/whats-new/whats-new-windows-11-version-22H2.md @@ -19,7 +19,7 @@ Windows 11, version 22H2 is a feature update for Windows 11. It includes all fea Windows 11, version 22H2 follows the [Windows 11 servicing timeline](/lifecycle/faq/windows#windows-11): -- **Windows 11 Professional**: Serviced for 24 months from the release date. +- **Windows 11 Pro**: Serviced for 24 months from the release date. - **Windows 11 Enterprise**: Serviced for 36 months from the release date. Windows 11, version 22H2 is available through Windows Server Update Services (including Configuration Manager), Windows Update for Business, and the Volume Licensing Service Center (VLSC). For more information, see [How to get the Windows 11, version 22H2 update](https://aka.ms/W11/how-to-get-22H2). Review the [Windows 11, version 22H2 Windows IT Pro blog post](https://aka.ms/new-in-22H2) to discover information about available deployment resources such as the [Windows Deployment Kit (Windows ADK)](/windows-hardware/get-started/adk-install). @@ -43,7 +43,7 @@ For more information, see [Enhanced Phishing Protection in Microsoft Defender Sm **Smart App Control** adds significant protection from malware, including new and emerging threats, by blocking apps that are malicious or untrusted. **Smart App Control** also helps to block potentially unwanted apps, which are apps that may cause your device to run slowly, display unexpected ads, offer extra software you didn't want, or do other things you don't expect. -For more information, see [Smart App Control](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md#wdac-and-smart-app-control). +For more information, see [Smart App Control](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control#wdac-and-smart-app-control). ## Credential Guard