diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index deb2888417..f4d8be3a0a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -30,10 +30,10 @@ If your changes are extensive: --> \ No newline at end of file +- [Microsoft Docs contributor guide](https://learn.microsoft.com/contribute/) +- [Docs Markdown reference](https://learn.microsoft.com/contribute/markdown-reference) +- [Microsoft Writing Style Guide](https://learn.microsoft.com/style-guide/welcome/) +--> diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 811fd84480..e7397c36cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,6 @@ # Editing Windows IT professional documentation -Thank you for your interest in the Windows IT professional documentation! We appreciate your feedback, edits, and additions to our docs. -This page covers the basic steps for editing our technical documentation. -For a more up-to-date and complete contribution guide, see the main [contributor guide overview](https://learn.microsoft.com/contribute/). +Thank you for your interest in the Windows IT professional documentation! We appreciate your feedback, edits, and additions to our content. This page covers the basic steps for editing our technical documentation. For a more up-to-date and complete contribution guide, see the main [contributor guide overview](https://learn.microsoft.com/contribute/). ## Sign a CLA @@ -19,7 +17,7 @@ We've tried to make editing an existing, public file as simple as possible. ### To edit a topic -1. Browse to the [Microsoft Docs](https://learn.microsoft.com/) article that you want to update. +1. Browse to the [Microsoft Learn](https://learn.microsoft.com/) article that you want to update. > **Note**
> If you're a Microsoft employee or vendor, before you edit the article, append `review.` to the beginning of the URL. This action lets you use the private repository, **windows-docs-pr**. For more information, see the [internal contributor guide](https://review.learn.microsoft.com/help/get-started/edit-article-in-github?branch=main). @@ -65,8 +63,7 @@ We've tried to make editing an existing, public file as simple as possible. ## Making more substantial changes -To make substantial changes to an existing article, add or change images, or contribute a new article, you'll need to create a local clone of the content. -For info about creating a fork or clone, see [Set up a local Git repository](https://learn.microsoft.com/contribute/get-started-setup-local). The GitHub docs topic, [Fork a Repo](https://docs.github.com/articles/fork-a-repo), is also insightful. +To make substantial changes to an existing article, add or change images, or contribute a new article, you'll need to create a local clone of the content. For information about creating a fork or clone, see [Set up a local Git repository](https://learn.microsoft.com/contribute/get-started-setup-local). The [Fork a Repo](https://docs.github.com/articles/fork-a-repo) article is also helpful. Fork the official repo into your personal GitHub account, and then clone the fork down to your local device. Work locally, then push your changes back into your fork. Finally, open a pull request back to the main branch of the official repo. diff --git a/browsers/internet-explorer/docfx.json b/browsers/internet-explorer/docfx.json index 83d51cf7f0..f52e815de7 100644 --- a/browsers/internet-explorer/docfx.json +++ b/browsers/internet-explorer/docfx.json @@ -26,6 +26,7 @@ "recommendations": true, "breadcrumb_path": "/internet-explorer/breadcrumb/toc.json", "ROBOTS": "INDEX, FOLLOW", + "ms.topic": "article", "feedback_system": "None", "hideEdit": true, "_op_documentIdPathDepotMapping": { diff --git a/education/includes/education-content-updates.md b/education/includes/education-content-updates.md index 9fa135eccb..c0a273e836 100644 --- a/education/includes/education-content-updates.md +++ b/education/includes/education-content-updates.md @@ -2,6 +2,14 @@ +## Week of September 19, 2022 + + +| Published On |Topic title | Change | +|------|------------|--------| +| 9/20/2022 | [Education scenarios Microsoft Store for Education](/education/windows/education-scenarios-store-for-business) | modified | + + ## Week of September 12, 2022 @@ -42,11 +50,3 @@ | 8/31/2022 | [Set up Azure Active Directory](/education/windows/tutorial-school-deployment/set-up-azure-ad) | added | | 8/31/2022 | [Set up device management](/education/windows/tutorial-school-deployment/set-up-microsoft-intune) | added | | 8/31/2022 | [Troubleshoot Windows devices](/education/windows/tutorial-school-deployment/troubleshoot-overview) | added | - - -## Week of August 15, 2022 - - -| Published On |Topic title | Change | -|------|------------|--------| -| 8/17/2022 | [For IT administrators get Minecraft Education Edition](/education/windows/school-get-minecraft) | modified | 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..428ea7ffa1 100644 --- a/education/windows/set-up-school-pcs-azure-ad-join.md +++ b/education/windows/set-up-school-pcs-azure-ad-join.md @@ -1,7 +1,7 @@ --- title: Azure AD Join with Set up School PCs app description: Describes how Azure AD Join is configured in the Set up School PCs app. -keywords: shared cart, shared PC, school, set up school pcs +keywords: shared PC, school, set up school pcs ms.prod: windows ms.mktglfcycl: plan ms.sitesec: library @@ -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-school-pcs-provisioning-package.md b/education/windows/set-up-school-pcs-provisioning-package.md index 3aeb7d738c..feb7da1b70 100644 --- a/education/windows/set-up-school-pcs-provisioning-package.md +++ b/education/windows/set-up-school-pcs-provisioning-package.md @@ -1,7 +1,7 @@ --- title: What's in Set up School PCs provisioning package description: Lists the provisioning package settings that are configured in the Set up School PCs app. -keywords: shared cart, shared PC, school, set up school pcs +keywords: shared PC, school, set up school pcs ms.prod: windows ms.mktglfcycl: plan ms.sitesec: library diff --git a/education/windows/set-up-school-pcs-shared-pc-mode.md b/education/windows/set-up-school-pcs-shared-pc-mode.md index e007d4957b..fa010834d5 100644 --- a/education/windows/set-up-school-pcs-shared-pc-mode.md +++ b/education/windows/set-up-school-pcs-shared-pc-mode.md @@ -1,7 +1,7 @@ --- title: Shared PC mode for school devices description: Describes how shared PC mode is set for devices set up with the Set up School PCs app. -keywords: shared cart, shared PC, school, set up school pcs +keywords: shared PC, school, set up school pcs ms.prod: windows ms.mktglfcycl: plan ms.sitesec: library @@ -63,7 +63,7 @@ To create a compatible image, first create your custom Windows image with all so Teachers can then run the Set up School PCs package on the computer. ## Optimize device for use by a single student -Shared PC mode is enabled by default. This mode optimizes device settings for schools where PCs are shared by students. The Set up School PCs app also offers the option to configure settings for devices that aren't shared. +Shared PC mode is enabled by default. This mode optimizes device settings for schools where PCs are shared by students. The Set up School PCs app also offers the option to configure settings for devices that aren't shared. If you select this setting, the app modifies shared PC mode so that it's appropriate for a single device. To see how the settings differ, refer to the Shared PC mode policy table in the article [What's in my provisioning package?](set-up-school-pcs-provisioning-package.md) 1. In the app, go to the **Create package** > **Settings** step. diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 6dbdf70186..21c1721e3a 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -1,7 +1,7 @@ --- title: Set up School PCs app technical reference overview description: Describes the purpose of the Set up School PCs app for Windows 10 devices. -keywords: shared cart, shared PC, school, set up school pcs +keywords: shared PC, school, set up school pcs ms.prod: windows ms.mktglfcycl: plan ms.sitesec: library diff --git a/education/windows/set-up-school-pcs-whats-new.md b/education/windows/set-up-school-pcs-whats-new.md index fce328a1c0..d83fe32329 100644 --- a/education/windows/set-up-school-pcs-whats-new.md +++ b/education/windows/set-up-school-pcs-whats-new.md @@ -1,7 +1,7 @@ --- title: What's new in the Windows Set up School PCs app description: Find out about app updates and new features in Set up School PCs. -keywords: shared cart, shared PC, school, set up school pcs +keywords: shared PC, school, set up school pcs ms.prod: windows ms.mktglfcycl: plan ms.sitesec: library 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..44298d51a2 100644 --- a/education/windows/use-set-up-school-pcs-app.md +++ b/education/windows/use-set-up-school-pcs-app.md @@ -1,7 +1,7 @@ --- title: Use Set up School PCs app description: Learn how to use the Set up School PCs app and apply the provisioning package. -keywords: shared cart, shared PC, school, Set up School PCs, overview, how to use +keywords: shared PC, school, Set up School PCs, overview, how to use ms.prod: windows ms.mktglfcycl: deploy ms.sitesec: library @@ -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] @@ -179,13 +179,13 @@ The following table describes each setting and lists the applicable Windows 10 v |Setting |1703|1709|1803|1809|What happens if I select it? |Note| |---------|---------|---------|---------|---------|---------|---------| |Remove apps pre-installed by the device manufacturer |X|X|X|X| Uninstalls apps that came loaded on the computer by the device's manufacturer. |Adds about 30 minutes to the provisioning process.| -|Allow local storage (not recommended for shared devices) |X|X|X|X| Lets students save files to the Desktop and Documents folder on the Student PC. |Not recommended if the device will be part of a shared cart or lab.| -|Optimize device for a single student, instead of a shared cart or lab |X|X|X|X|Optimizes the device for use by a single student, rather than many students. |Recommended option only if the device is not shared with other students in the school. Single-optimized accounts are set to expire, and require a signin, 180 days after setup. This setting increases the maximum PC storage to 100% of the available disk space. In this case, student accounts aren't deleted unless the account has been inactive for 180 days. | +|Allow local storage (not recommended for shared devices) |X|X|X|X| Lets students save files to the Desktop and Documents folder on the Student PC. |Not recommended if the device will be shared between different students.| +|Optimize device for a single student, instead of a shared cart or lab |X|X|X|X|Optimizes the device for use by a single student, rather than many students. |Recommended if the device will be shared between different students. Single-optimized accounts are set to expire, and require a signin, 180 days after setup. This setting increases the maximum PC storage to 100% of the available disk space. In this case, student accounts aren't deleted unless the account has been inactive for 180 days. | |Let guests sign in to these PCs |X|X|X|X|Allows guests to use student PCs without a school account. |Common to use within a public, shared space, such as a library. Also used when a student loses their password. Adds a **Guest** account to the PC sign-in screen that anyone can sign in to.| |Enable Autopilot Reset |Not available|X|X|X|Lets you remotely reset a student’s PC from the lock screen, apply the device’s original settings, and enroll it in device management (Azure AD and MDM). |Requires Windows 10, version 1709 and WinRE must be enabled on the PC. Setup will fail if both requirements aren't met.| |Lock screen background|X|X|X|X|Change the default screen lock background to a custom image.|Click **Browse** to search for an image file on your computer. Accepted image formats are jpg, jpeg, and png.| -After you've made your selections, click **Next**. +After you've made your selections, click **Next**. ### Time zone @@ -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 793b376823..4d1777d0ad 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,8 +87,10 @@ 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 | +| CA Secure Browser | 14.0.0 | Win32 | Cambium Development | | Cisco Umbrella | 3.0.110.0 | Win32 | Cisco | | CKAuthenticator | 3.6 | Win32 | Content Keeper | | Class Policy | 114.0.0 | Win32 | Class Policy | @@ -99,7 +101,7 @@ The following applications can also run on Windows 11 SE, and can be deployed us | Duo from Cisco | 2.25.0 | Win32 | Cisco | | e-Speaking Voice and Speech recognition | 4.4.0.8 | Win32 | e-speaking | | eTests | 4.0.25 | Win32 | CASAS | -| FortiClient | 7.0.1.0083 | Win32 | Fortinet | +| FortiClient | 7.2.0.4034+ | Win32 | Fortinet | | Free NaturalReader | 16.1.2 | Win32 | Natural Soft | | Ghotit Real Writer & Reader | 10.14.2.3 | Win32 | Ghotit Ltd | | GoGuardian | 1.4.4 | Win32 | GoGuardian | @@ -111,7 +113,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 | @@ -131,7 +134,6 @@ The following applications can also run on Windows 11 SE, and can be deployed us | Remote Help | 3.8.0.12 | Win32 | Microsoft | | Respondus Lockdown Browser | 2.0.9.00 | Win32 | Respondus | | Safe Exam Browser | 3.3.2.413 | Win32 | Safe Exam Browser | -| Secure Browser | 14.0.0 | Win32 | Cambium Development | | Senso.Cloud | 2021.11.15.0 | Win32 | Senso.Cloud | | SuperNova Magnifier & Screen Reader | 21.02 | Win32 | Dolphin Computer Access | | Zoom | 5.9.1 (2581) | Win32 | Zoom | diff --git a/windows/application-management/provisioned-apps-windows-client-os.md b/windows/application-management/provisioned-apps-windows-client-os.md index b61fb4f87e..1c99168f4a 100644 --- a/windows/application-management/provisioned-apps-windows-client-os.md +++ b/windows/application-management/provisioned-apps-windows-client-os.md @@ -44,9 +44,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ✔️ | ✔️ | | | | | | + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809| + | --- | --- | --- | --- | --- | --- | --- |--- | + | ✔️ | ✔️ | ✔️ | | | | | | --- @@ -54,9 +54,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ✔️ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -64,9 +64,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | Use Settings App | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | Use Settings App | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -74,9 +74,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -84,9 +84,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -94,19 +94,31 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- + +- [HEVC Video Extensions](ms-windows-store://pdp/?PFN=Microsoft.HEVCVideoExtension_8wekyb3d8bbwe) | Package name: Microsoft.HEVCVideoExtension +> [!NOTE] +> For devices running Windows 11, version 21H2, and any supported version of Windows 10, you need to acquire the [HEVC Video Extensions](ms-windows-store://pdp/?PFN=Microsoft.HEVCVideoExtension_8wekyb3d8bbwe) from the Microsoft Store. + - Supported versions: + + --- + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️||||||| + + --- - [Microsoft Messaging](ms-windows-store://pdp/?PFN=Microsoft.Messaging_8wekyb3d8bbwe) | Package name:Microsoft.Messaging - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️| | ✔️| ✔️| ✔️| --- @@ -114,9 +126,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -124,9 +136,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ✔️ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ✔️ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -134,9 +146,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ✔️ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ✔️ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -144,9 +156,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -154,9 +166,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -164,9 +176,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -174,9 +186,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ✔️ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + | ✔️ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -184,9 +196,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️| | ✔️| ✔️| ✔️| --- @@ -194,9 +206,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | | ✔️ | ✔️| | ✔️| | | + | Uninstall through UI? | 22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + | --- | --- | --- | --- | --- | --- | --- |--- | + |️ | ✔️ | ✔️ | ✔️|️ | ✔️|️️| --- @@ -204,9 +216,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -214,9 +226,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️| | ✔️| ✔️| ✔️| --- @@ -224,9 +236,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -234,9 +246,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -244,9 +256,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -254,9 +266,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -264,9 +276,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -274,9 +286,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -284,9 +296,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -294,9 +306,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -304,9 +316,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -314,9 +326,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -324,9 +336,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -334,9 +346,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -344,9 +356,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -354,9 +366,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -364,9 +376,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -374,9 +386,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -386,9 +398,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -396,9 +408,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -406,9 +418,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -416,9 +428,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -426,9 +438,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -436,9 +448,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -446,9 +458,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -456,9 +468,9 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- @@ -466,8 +478,8 @@ Provisioned apps are also listed in **Settings** > **Apps and Features**. - Supported versions: --- - | Uninstall through UI? | 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | - | --- | --- | --- | --- | --- | --- |--- | - | ❌ | ✔️ | ✔️| ✔️ | ✔️| ✔️| ✔️| + | Uninstall through UI? |22H2| 21H1 | 20H2 | 2004 | 1909| 1903| 1809 | + |---| --- | --- | --- | --- | --- | --- |--- | + | ❌ | ✔️ | ✔️ | ✔️|✔️ | ✔️| ✔️| ✔️| --- diff --git a/windows/client-management/generate-kernel-or-complete-crash-dump.md b/windows/client-management/generate-kernel-or-complete-crash-dump.md index e631ae9d84..442eedecc8 100644 --- a/windows/client-management/generate-kernel-or-complete-crash-dump.md +++ b/windows/client-management/generate-kernel-or-complete-crash-dump.md @@ -7,12 +7,12 @@ author: Deland-Han ms.localizationpriority: medium ms.author: delhan ms.date: 8/28/2019 -ms.reviewer: +ms.reviewer: manager: willchen ms.collection: highpri --- -# Generate a kernel or complete crash dump +# Generate a kernel or complete crash dump A system crash (also known as a “bug check” or a "Stop error") occurs when Windows can't run correctly. The dump file that is produced from this event is called a system crash dump. @@ -39,7 +39,7 @@ To enable memory dump setting, follow these steps: 5. Restart the computer. >[!Note] ->You can change the dump file path by edit the **Dump file** field. In other words, you can change the path from %SystemRoot%\Memory.dmp to point to a local drive that has enough disk space, such as E:\Memory.dmp. +>You can change the dump file path by edit the **Dump file** field. In other words, you can change the path from %SystemRoot%\Memory.dmp to point to a local drive that has enough disk space, such as E:\Memory.dmp. ### Tips to generate memory dumps @@ -72,13 +72,13 @@ If you can sign in while the problem is occurring, you can use the Microsoft Sys On some computers, you can't use keyboard to generate a crash dump file. For example, Hewlett-Packard (HP) BladeSystem servers from the Hewlett-Packard Development Company are managed through a browser-based graphical user interface (GUI). A keyboard isn't attached to the HP BladeSystem server. -In these cases, you must generate a complete crash dump file or a kernel crash dump file by using the Non-Maskable Interrupt (NMI) switch that causes an NMI on the system processor. +In these cases, you must generate a complete crash dump file or a kernel crash dump file by using the Non-Maskable Interrupt (NMI) switch that causes an NMI on the system processor. To implement this process, follow these steps: -> [!IMPORTANT] +> [!IMPORTANT] > Follow the steps in this section carefully. Serious problems might occur if you modify the registry incorrectly. Before you modify it, [back up the registry for restoration](https://support.microsoft.com/help/322756) in case problems occur. - + > [!NOTE] > This registry key isn't required for clients running Windows 8 and later, or servers running Windows Server 2012 and later. Setting this registry key on later versions of Windows has no effect. @@ -98,14 +98,14 @@ To implement this process, follow these steps: 7. Hardware vendors, such as HP, IBM, and Dell, may provide an Automatic System Recovery (ASR) feature. You should disable this feature during troubleshooting. For example, if the HP and Compaq ASR feature is enabled in the BIOS, disable this feature while you troubleshoot to generate a complete Memory.dmp file. For the exact steps, contact your hardware vendor. -8. Enable the NMI switch in the BIOS or by using the Integrated Lights Out (iLO) Web interface. +8. Enable the NMI switch in the BIOS or by using the Integrated Lights Out (iLO) Web interface. >[!Note] >For the exact steps, see the BIOS reference manual or contact your hardware vendor. 9. Test this method on the server by using the NMI switch to generate a dump file. You'll see a STOP 0x00000080 hardware malfunction. -If you want to run NMI in Microsoft Azure using Serial Console, see [Use Serial Console for SysRq and NMI calls](/azure/virtual-machines/linux/serial-console-nmi-sysrq). +If you want to run NMI in Microsoft Azure using Serial Console, see [Use Serial Console for SysRq and NMI calls](/troubleshoot/azure/virtual-machines/serial-console-nmi-sysrq). ### Use the keyboard diff --git a/windows/client-management/manage-corporate-devices.md b/windows/client-management/manage-corporate-devices.md index 9f828bd150..d3f9eb80c2 100644 --- a/windows/client-management/manage-corporate-devices.md +++ b/windows/client-management/manage-corporate-devices.md @@ -44,3 +44,6 @@ You can use the same management tools to manage all device types running Windows [Microsoft Intune End User Enrollment Guide](/samples/browse/?redirectedfrom=TechNet-Gallery) [Windows 10 (and Windows 11) and Azure Active Directory: Embracing the Cloud](https://go.microsoft.com/fwlink/p/?LinkId=615768) + +Microsoft Virtual Academy course: [Configuration Manager & Windows Intune](/training/) + 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/client-management/mdm/personalization-csp.md b/windows/client-management/mdm/personalization-csp.md index 465ac4ecd9..5524dfcf1a 100644 --- a/windows/client-management/mdm/personalization-csp.md +++ b/windows/client-management/mdm/personalization-csp.md @@ -29,7 +29,7 @@ The Personalization CSP can set the lock screen and desktop background images. S This CSP was added in Windows 10, version 1703. > [!Note] -> Personalization CSP is supported in Windows 10 Enterprise and Education SKUs. It works in Windows 10 Pro and Windows 10 Pro in S mode if SetEduPolicies in [SharedPC CSP](sharedpc-csp.md) is set. +> Personalization CSP is supported in Windows Enterprise and Education SKUs. It works in Windows Professional if SetEduPolicies in [SharedPC CSP](sharedpc-csp.md) is set. The following example shows the Personalization configuration service provider in tree format. ``` diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index 79aba31f6b..7be79948ea 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -1,7 +1,7 @@ --- title: Policy CSP description: Learn how the Policy configuration service provider (CSP) enables the enterprise to configure policies on Windows 10 and Windows 11. -ms.reviewer: +ms.reviewer: manager: aaroncz ms.author: vinpa ms.topic: article @@ -65,22 +65,22 @@ Policy ``` -**./Vendor/MSFT/Policy** +**./Vendor/MSFT/Policy** The root node for the Policy configuration service provider. Supported operation is Get. -**Policy/Config** +**Policy/Config** Node for grouping all policies configured by one source. The configuration source can use this path to set policy values and later query any policy value that it previously set. One policy can be configured by multiple configuration sources. If a configuration source wants to query the result of conflict resolution (for example, if Exchange and MDM both attempt to set a value) the configuration source can use the Policy/Result path to retrieve the resulting value. Supported operation is Get. -**Policy/Config/_AreaName_** +**Policy/Config/_AreaName_** The area group that can be configured by a single technology for a single provider. Once added, you cannot change the value. Supported operations are Add, Get, and Delete. -**Policy/Config/_AreaName/PolicyName_** +**Policy/Config/_AreaName/PolicyName_** Specifies the name/value pair used in the policy. The following list shows some tips to help you when configuring policies: @@ -94,27 +94,27 @@ The following list shows some tips to help you when configuring policies: - Supported operations are Add, Get, Delete, and Replace. - Value type is string. -**Policy/Result** +**Policy/Result** Groups the evaluated policies from all providers that can be configured. Supported operation is Get. -**Policy/Result/_AreaName_** +**Policy/Result/_AreaName_** The area group that can be configured by a single technology independent of the providers. Supported operation is Get. -**Policy/Result/_AreaName/PolicyName_** +**Policy/Result/_AreaName/PolicyName_** Specifies the name/value pair used in the policy. Supported operation is Get. -**Policy/ConfigOperations** +**Policy/ConfigOperations** Added in Windows 10, version 1703. The root node for grouping different configuration operations. Supported operations are Add, Get, and Delete. -**Policy/ConfigOperations/ADMXInstall** +**Policy/ConfigOperations/ADMXInstall** Added in Windows 10, version 1703. Allows settings for ADMX files for Win32 and Desktop Bridge apps to be imported (ingested) by your device and processed into new ADMX-backed policies or preferences. By using ADMXInstall, you can add ADMX-backed policies for those Win32 or Desktop Bridge apps that have been added between OS releases. ADMX-backed policies are ingested to your device by using the Policy CSP URI: ./Vendor/MSFT/Policy/ConfigOperations/ADMXInstall. Each ADMX-backed policy or preference that is added is assigned a unique ID. For more information about using Policy CSP to configure Win32 and Desktop Bridge app policies, see [Win32 and Desktop Bridge app policy configuration](win32-and-centennial-app-policy-configuration.md). > [!NOTE] @@ -124,27 +124,27 @@ ADMX files that have been installed by using **ConfigOperations/ADMXInstall** ca Supported operations are Add, Get, and Delete. -**Policy/ConfigOperations/ADMXInstall/_AppName_** -Added in Windows 10, version 1703. Specifies the name of the Win32 or Desktop Bridge app associated with the ADMX file. +**Policy/ConfigOperations/ADMXInstall/_AppName_** +Added in Windows 10, version 1703. Specifies the name of the Win32 or Desktop Bridge app associated with the ADMX file. Supported operations are Add, Get, and Delete. -**Policy/ConfigOperations/ADMXInstall/_AppName_/Policy** +**Policy/ConfigOperations/ADMXInstall/_AppName_/Policy** Added in Windows 10, version 1703. Specifies that a Win32 or Desktop Bridge app policy is to be imported. Supported operations are Add, Get, and Delete. -**Policy/ConfigOperations/ADMXInstall/_AppName_/Policy/_UniqueID_** +**Policy/ConfigOperations/ADMXInstall/_AppName_/Policy/_UniqueID_** Added in Windows 10, version 1703. Specifies the unique ID of the app ADMX file that contains the policy to import. Supported operations are Add and Get. Does not support Delete. -**Policy/ConfigOperations/ADMXInstall/_AppName_/Preference** +**Policy/ConfigOperations/ADMXInstall/_AppName_/Preference** Added in Windows 10, version 1703. Specifies that a Win32 or Desktop Bridge app preference is to be imported. Supported operations are Add, Get, and Delete. -**Policy/ConfigOperations/ADMXInstall/_AppName_/Preference/_UniqueID_** +**Policy/ConfigOperations/ADMXInstall/_AppName_/Preference/_UniqueID_** Added in Windows 10, version 1703. Specifies the unique ID of the app ADMX file that contains the preference to import. Supported operations are Add and Get. Does not support Delete. @@ -174,7 +174,7 @@ Supported operations are Add and Get. Does not support Delete.
Accounts/AllowMicrosoftAccountSignInAssistant
- + ### ActiveXControls policies @@ -185,7 +185,7 @@ Supported operations are Add and Get. Does not support Delete. -### ADMX_ActiveXInstallService policies +### ADMX_ActiveXInstallService policies
@@ -279,7 +279,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_AppxPackageManager policies +### ADMX_AppxPackageManager policies
@@ -287,7 +287,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_AppXRuntime policies +### ADMX_AppXRuntime policies
@@ -304,7 +304,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_AttachmentManager policies +### ADMX_AttachmentManager policies
@@ -380,7 +380,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_CipherSuiteOrder policies +### ADMX_CipherSuiteOrder policies
@@ -391,7 +391,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_COM policies +### ADMX_COM policies
@@ -402,7 +402,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_ControlPanel policies +### ADMX_ControlPanel policies
@@ -419,7 +419,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_ControlPanelDisplay policies +### ADMX_ControlPanelDisplay policies
@@ -513,7 +513,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_CredentialProviders policies +### ADMX_CredentialProviders policies
@@ -527,7 +527,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_CredSsp policies +### ADMX_CredSsp policies
@@ -563,7 +563,7 @@ Supported operations are Add and Get. Does not support Delete.
ADMX_CredSsp/RestrictedRemoteAdministration -### ADMX_CredUI policies +### ADMX_CredUI policies
@@ -574,14 +574,14 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_CtrlAltDel policies +### ADMX_CtrlAltDel policies
ADMX_Cpls/UseDefaultTile
-### ADMX_DataCollection policies +### ADMX_DataCollection policies
@@ -710,7 +710,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_DeviceInstallation policies +### ADMX_DeviceInstallation policies
@@ -739,7 +739,7 @@ Supported operations are Add and Get. Does not support Delete.
-### ADMX_DeviceSetup policies +### ADMX_DeviceSetup policies
@@ -761,7 +761,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC ### ADMX_DigitalLocker policies -
+
ADMX_DigitalLocker/Digitalx_DiableApplication_TitleText_1
@@ -818,7 +818,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_DistributedLinkTracking policies +### ADMX_DistributedLinkTracking policies
@@ -920,7 +920,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_EAIME policies +### ADMX_EAIME policies
@@ -975,7 +975,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_EnhancedStorage policies +### ADMX_EnhancedStorage policies
@@ -998,7 +998,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_ErrorReporting policies +### ADMX_ErrorReporting policies
@@ -1101,7 +1101,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_EventLog policies +### ADMX_EventLog policies
@@ -1169,7 +1169,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_EventViewer policies +### ADMX_EventViewer policies
@@ -1182,7 +1182,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC ADMX_EventViewer/EventViewer_RedirectionURL
-### ADMX_Explorer policies +### ADMX_Explorer policies
@@ -1202,7 +1202,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_ExternalBoot policies +### ADMX_ExternalBoot policies
@@ -1329,7 +1329,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Globalization policies +### ADMX_Globalization policies
@@ -1406,7 +1406,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_GroupPolicy policies +### ADMX_GroupPolicy policies
@@ -1557,7 +1557,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-## ADMX_ICM policies +## ADMX_ICM policies
@@ -1691,7 +1691,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Kerberos policies +### ADMX_Kerberos policies
@@ -1736,7 +1736,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_LanmanWorkstation policies +### ADMX_LanmanWorkstation policies
@@ -1775,7 +1775,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Logon policies +### ADMX_Logon policies
@@ -1825,7 +1825,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_MicrosoftDefenderAntivirus policies +### ADMX_MicrosoftDefenderAntivirus policies
@@ -2128,7 +2128,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_MMCSnapins policies +### ADMX_MMCSnapins policies
@@ -2472,7 +2472,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_msched policies +### ADMX_msched policies
@@ -2483,7 +2483,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_MSDT policies +### ADMX_MSDT policies
@@ -2497,7 +2497,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_MSI policies +### ADMX_MSI policies
@@ -2744,7 +2744,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_NetworkConnections policies +### ADMX_NetworkConnections policies
@@ -3058,7 +3058,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Power policies +### ADMX_Power policies
@@ -3138,7 +3138,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_PowerShellExecutionPolicy policies +### ADMX_PowerShellExecutionPolicy policies
@@ -3184,7 +3184,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Printing policies +### ADMX_Printing policies
@@ -3268,7 +3268,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Printing2 policies +### ADMX_Printing2 policies
@@ -3300,7 +3300,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Programs policies +### ADMX_Programs policies
@@ -3341,9 +3341,9 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
ADMX_Reliability/ShutdownReason
-
+
-### ADMX_RemoteAssistance policies +### ADMX_RemoteAssistance policies
@@ -3354,7 +3354,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_RemovableStorage policies +### ADMX_RemovableStorage policies
@@ -3455,7 +3455,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_RPC policies +### ADMX_RPC policies
@@ -3543,7 +3543,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Sensors policies +### ADMX_Sensors policies
@@ -3580,7 +3580,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Servicing policies +### ADMX_Servicing policies
@@ -3588,7 +3588,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_SettingSync policies +### ADMX_SettingSync policies
@@ -3620,7 +3620,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_SharedFolders policies +### ADMX_SharedFolders policies
@@ -3709,7 +3709,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Snmp policies +### ADMX_Snmp policies
@@ -3725,7 +3725,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_StartMenu policies +### ADMX_StartMenu policies
@@ -3931,7 +3931,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_SystemRestore policies +### ADMX_SystemRestore policies
@@ -3950,7 +3950,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_Taskbar policies +### ADMX_Taskbar policies
@@ -4021,7 +4021,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_tcpip policies +### ADMX_tcpip policies
@@ -4166,25 +4166,25 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
ADMX_TerminalServer/TS_GATEWAY_POLICY_SERVER -
+
ADMX_TerminalServer/TS_JOIN_SESSION_DIRECTORY -
+
ADMX_TerminalServer/TS_KEEP_ALIVE -
+
ADMX_TerminalServer/TS_LICENSE_SECGROUP -
+
ADMX_TerminalServer/TS_LICENSE_SERVERS -
+
ADMX_TerminalServer/TS_LICENSE_TOOLTIP -
+
ADMX_TerminalServer/TS_LICENSING_MODE -
+
ADMX_TerminalServer/TS_MAX_CON_POLICY
@@ -4282,7 +4282,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC ADMX_TerminalServer/TS_SESSIONS_Disconnected_Timeout_2 ADMX_TerminalServer/TS_SESSIONS_Idle_Limit_1 - +
ADMX_TerminalServer/TS_SESSIONS_Idle_Limit_2
@@ -4330,15 +4330,15 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
ADMX_TerminalServer/TS_USER_PROFILES -
+
-### ADMX_Thumbnails policies +### ADMX_Thumbnails policies
ADMX_Thumbnails/DisableThumbnails -
+
ADMX_Thumbnails/DisableThumbnailsOnNetworkFolders
@@ -4352,7 +4352,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
ADMX_TouchInput/TouchInputOff_1 -
+
ADMX_TouchInput/TouchInputOff_2
@@ -4364,7 +4364,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_TPM policies +### ADMX_TPM policies
@@ -4399,7 +4399,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_UserExperienceVirtualization policies +### ADMX_UserExperienceVirtualization policies
@@ -4782,7 +4782,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_UserProfiles policies +### ADMX_UserProfiles policies
@@ -4811,7 +4811,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_W32Time policies +### ADMX_W32Time policies
@@ -4828,7 +4828,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WCM policies +### ADMX_WCM policies
@@ -4853,7 +4853,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WinCal policies +### ADMX_WinCal policies
@@ -4864,7 +4864,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WindowsConnectNow policies +### ADMX_WindowsConnectNow policies
@@ -4879,7 +4879,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WindowsExplorer policies +### ADMX_WindowsExplorer policies
@@ -5097,7 +5097,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WindowsMediaDRM policies +### ADMX_WindowsMediaDRM policies
@@ -5105,7 +5105,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WindowsMediaPlayer policies +### ADMX_WindowsMediaPlayer policies
@@ -5174,7 +5174,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WindowsRemoteManagement policies +### ADMX_WindowsRemoteManagement policies
@@ -5185,7 +5185,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WindowsStore policies +### ADMX_WindowsStore policies
@@ -5205,7 +5205,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WinInit policies +### ADMX_WinInit policies
@@ -5219,7 +5219,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WinLogon policies +### ADMX_WinLogon policies
@@ -5250,7 +5250,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_wlansvc policies +### ADMX_wlansvc policies
@@ -5286,7 +5286,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### ADMX_WPN policies +### ADMX_WPN policies
@@ -5338,8 +5338,8 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
ApplicationManagement/AllowSharedUserAppData
-
- ApplicationManagement/BlockNonAdminUserInstall +
+ ApplicationManagement/BlockNonAdminUserInstall
ApplicationManagement/DisableStoreOriginatedApps @@ -5478,7 +5478,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### Audit policies +### Audit policies
@@ -6304,40 +6304,40 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### DesktopAppInstaller policies +### DesktopAppInstaller policies
- DesktopAppInstaller/EnableAdditionalSources + DesktopAppInstaller/EnableAdditionalSources
- DesktopAppInstaller/EnableAppInstaller + DesktopAppInstaller/EnableAppInstaller
- DesktopAppInstaller/EnableDefaultSource + DesktopAppInstaller/EnableDefaultSource
- DesktopAppInstaller/EnableLocalManifestFiles + DesktopAppInstaller/EnableLocalManifestFiles
- DesktopAppInstaller/EnableHashOverride + DesktopAppInstaller/EnableHashOverride
- DesktopAppInstaller/EnableMicrosoftStoreSource + DesktopAppInstaller/EnableMicrosoftStoreSource
- DesktopAppInstaller/EnableMSAppInstallerProtocol + DesktopAppInstaller/EnableMSAppInstallerProtocol
- DesktopAppInstaller/EnableSettings + DesktopAppInstaller/EnableSettings
- DesktopAppInstaller/EnableAllowedSources + DesktopAppInstaller/EnableAllowedSources
- DesktopAppInstaller/EnableExperimentalFeatures + DesktopAppInstaller/EnableExperimentalFeatures
- DesktopAppInstaller/SourceAutoUpdateInterval + DesktopAppInstaller/SourceAutoUpdateInterval
@@ -7719,7 +7719,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### MixedReality policies +### MixedReality policies
@@ -7779,7 +7779,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### Multitasking policies +### Multitasking policies
@@ -8030,7 +8030,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
Privacy/LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps -
+
Privacy/LetAppsAccessCalendar
@@ -8597,7 +8597,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
Start/DisableContextMenus -
+
Start/DisableControlCenter
@@ -9143,11 +9143,11 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
Update/SetPolicyDrivenUpdateSourceForQuality
-
- Update/SetProxyBehaviorForUpdateDetection +
+ Update/SetProxyBehaviorForUpdateDetection
-
- Update/TargetReleaseVersion +
+ Update/TargetReleaseVersion
@@ -9442,7 +9442,7 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-### WindowsSandbox policies +### WindowsSandbox policies
@@ -9506,8 +9506,8 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC > Not all Policies in Policy CSP supported by Group Policy are ADMX-backed. For more details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md). ## Policies in Policy CSP supported by HoloLens devices -- [Policies in Policy CSP supported by HoloLens 2](./policies-in-policy-csp-supported-by-hololens2.md) -- [Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite](./policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md) +- [Policies in Policy CSP supported by HoloLens 2](./policies-in-policy-csp-supported-by-hololens2.md) +- [Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite](./policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md) - [Policies in Policy CSP supported by HoloLens (1st gen) Development Edition](./policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md) ## Policies in Policy CSP supported by Windows 10 IoT diff --git a/windows/client-management/mdm/policy-csp-search.md b/windows/client-management/mdm/policy-csp-search.md index 5eb4a605e5..6f50b43ffa 100644 --- a/windows/client-management/mdm/policy-csp-search.md +++ b/windows/client-management/mdm/policy-csp-search.md @@ -8,7 +8,7 @@ ms.technology: windows author: vinaypamnani-msft ms.localizationpriority: medium ms.date: 02/12/2021 -ms.reviewer: +ms.reviewer: manager: aaroncz --- @@ -18,7 +18,7 @@ manager: aaroncz
-## Search policies +## Search policies
@@ -75,7 +75,7 @@ manager: aaroncz
-**Search/AllowCloudSearch** +**Search/AllowCloudSearch** @@ -105,7 +105,7 @@ Allow Search and Cortana to search cloud sources like OneDrive and SharePoint. T -ADMX Info: +ADMX Info: - GP Friendly name: *Allow Cloud Search* - GP name: *AllowCloudSearch* - GP element: *AllowCloudSearch_Dropdown* @@ -125,7 +125,7 @@ The following list shows the supported values:
-**Search/AllowCortanaInAAD** +**Search/AllowCortanaInAAD** @@ -155,7 +155,7 @@ This policy allows the cortana opt-in page during windows setup out of the box e -ADMX Info: +ADMX Info: - GP Friendly name: *Allow Cloud Search* - GP name: *AllowCortanaInAAD* - GP element: *AllowCloudSearch_Dropdown* @@ -174,7 +174,7 @@ This value is a simple boolean value, default false, that can be set by MDM poli
-**Search/AllowFindMyFiles** +**Search/AllowFindMyFiles** @@ -204,7 +204,7 @@ Controls if the user can configure search to Find My Files mode, which searches -ADMX Info: +ADMX Info: - GP Friendly name: *Allow Find My Files* - GP name: *AllowFindMyFiles* - GP path: *Computer Configuration/Administrative Templates/Windows Components/Search* @@ -212,7 +212,7 @@ ADMX Info: -The following list shows the supported values: +The following list shows the supported values: - 1 (Default) - Find My Files feature can be toggled (still off by default), and the settings UI is present. - 0 - Find My Files feature is turned off completely, and the settings UI is disabled. @@ -229,7 +229,7 @@ The following list shows the supported values:
-**Search/AllowIndexingEncryptedStoresOrItems** +**Search/AllowIndexingEncryptedStoresOrItems** @@ -265,7 +265,7 @@ Most restricted value is 0. -ADMX Info: +ADMX Info: - GP Friendly name: *Allow indexing of encrypted files* - GP name: *AllowIndexingEncryptedStoresOrItems* - GP path: *Windows Components/Search* @@ -284,7 +284,7 @@ The following list shows the supported values:
-**Search/AllowSearchToUseLocation** +**Search/AllowSearchToUseLocation** @@ -316,7 +316,7 @@ Most restricted value is 0. -ADMX Info: +ADMX Info: - GP Friendly name: *Allow search and Cortana to use location* - GP name: *AllowSearchToUseLocation* - GP path: *Windows Components/Search* @@ -335,7 +335,7 @@ The following list shows the supported values:
-**Search/AllowSearchHighlights** +**Search/AllowSearchHighlights** @@ -364,11 +364,11 @@ The following list shows the supported values: This policy controls whether search highlights are shown in the search box or in search home. - If you enable this policy setting, then this setting turns on search highlights in the search box or in the search home. -- If you disable this policy setting, then this setting turns off search highlights in the search box or in the search home. +- If you disable this policy setting, then this setting turns off search highlights in the search box or in the search home. -ADMX Info: +ADMX Info: - GP Friendly name: *Allow search and highlights* - GP name: *AllowSearchHighlights* - GP path: *Windows Components/Search* @@ -378,15 +378,13 @@ ADMX Info: The following list shows the supported values in Windows 10: -- Not Configured/ Enabled (default) – Enabling or not configuring this setting turns on search highlights in the taskbar search box and in search home. - -- Disabled – Disabling this setting turns off search highlights in the taskbar search box and in search home. +- 1 (default) - Enabling or not configuring this setting turns on search highlights in the taskbar search box and in search home. +- 0 - Disabling this setting turns off search highlights in the taskbar search box and in search home. The following list shows the supported values in Windows 11: -- Not Configured/ Enabled (default) – Enabling or not configuring this setting turns on search highlights in the start menu search box and in search home. - -- Disabled – Disabling this setting turns off search highlights in the start menu search box and in search home. +- 1 (default) - Enabling or not configuring this setting turns on search highlights in the start menu search box and in search home. +- 0 - Disabling this setting turns off search highlights in the start menu search box and in search home. @@ -394,7 +392,7 @@ The following list shows the supported values in Windows 11:
-**Search/AllowStoringImagesFromVisionSearch** +**Search/AllowStoringImagesFromVisionSearch** This policy has been deprecated. @@ -405,7 +403,7 @@ This policy has been deprecated.
-**Search/AllowUsingDiacritics** +**Search/AllowUsingDiacritics** @@ -437,7 +435,7 @@ Most restricted value is 0. -ADMX Info: +ADMX Info: - GP Friendly name: *Allow use of diacritics* - GP name: *AllowUsingDiacritics* - GP path: *Windows Components/Search* @@ -456,7 +454,7 @@ The following list shows the supported values:
-**Search/AllowWindowsIndexer** +**Search/AllowWindowsIndexer** @@ -490,7 +488,7 @@ Allow Windows indexer. Supported value type is integer.
-**Search/AlwaysUseAutoLangDetection** +**Search/AlwaysUseAutoLangDetection** @@ -522,7 +520,7 @@ Most restricted value is 0. -ADMX Info: +ADMX Info: - GP Friendly name: *Always use automatic language detection when indexing content and properties* - GP name: *AlwaysUseAutoLangDetection* - GP path: *Windows Components/Search* @@ -541,7 +539,7 @@ The following list shows the supported values:
-**Search/DisableBackoff** +**Search/DisableBackoff** @@ -571,7 +569,7 @@ If enabled, the search indexer backoff feature will be disabled. Indexing will c -ADMX Info: +ADMX Info: - GP Friendly name: *Disable indexer backoff* - GP name: *DisableBackoff* - GP path: *Windows Components/Search* @@ -590,7 +588,7 @@ The following list shows the supported values:
-**Search/DisableRemovableDriveIndexing** +**Search/DisableRemovableDriveIndexing** @@ -624,7 +622,7 @@ If you disable or don't configure this policy setting, locations on removable dr -ADMX Info: +ADMX Info: - GP Friendly name: *Do not allow locations on removable drives to be added to libraries* - GP name: *DisableRemovableDriveIndexing* - GP path: *Windows Components/Search* @@ -643,7 +641,7 @@ The following list shows the supported values:
-**Search/DisableSearch** +**Search/DisableSearch** @@ -674,7 +672,7 @@ It removes the Search button from the Taskbar and the corresponding option in th -ADMX Info: +ADMX Info: - GP Friendly name: *Fully disable Search UI* - GP name: *DisableSearch* @@ -694,7 +692,7 @@ The following list shows the supported values:
-**Search/DoNotUseWebResults** +**Search/DoNotUseWebResults** @@ -730,7 +728,7 @@ This policy setting allows you to control whether or not Search can perform quer -ADMX Info: +ADMX Info: - GP Friendly name: *Don't search the web or display web results in Search* - GP name: *DoNotUseWebResults* - GP path: *Windows Components/Search* @@ -749,7 +747,7 @@ The following list shows the supported values:
-**Search/PreventIndexingLowDiskSpaceMB** +**Search/PreventIndexingLowDiskSpaceMB** @@ -783,7 +781,7 @@ When this policy is disabled or not configured, Windows Desktop Search automatic -ADMX Info: +ADMX Info: - GP Friendly name: *Stop indexing in the event of limited hard drive space* - GP name: *StopIndexingOnLimitedHardDriveSpace* - GP path: *Windows Components/Search* @@ -802,7 +800,7 @@ The following list shows the supported values:
-**Search/PreventRemoteQueries** +**Search/PreventRemoteQueries** @@ -832,7 +830,7 @@ If enabled, clients will be unable to query this computer's index remotely. Thus -ADMX Info: +ADMX Info: - GP Friendly name: *Prevent clients from querying the index remotely* - GP name: *PreventRemoteQueries* - GP path: *Windows Components/Search* diff --git a/windows/client-management/mdm/policy-csp-webthreatdefense.md b/windows/client-management/mdm/policy-csp-webthreatdefense.md index bd8d22ec50..5dc80b41a1 100644 --- a/windows/client-management/mdm/policy-csp-webthreatdefense.md +++ b/windows/client-management/mdm/policy-csp-webthreatdefense.md @@ -8,7 +8,7 @@ ms.technology: windows author: alekyaj ms.localizationpriority: medium ms.date: 09/27/2019 -ms.reviewer: +ms.reviewer: manager: aaroncz --- @@ -18,7 +18,7 @@ manager: aaroncz
-## WebThreatDefense policies +## WebThreatDefense policies
@@ -39,7 +39,7 @@ manager: aaroncz >In Microsoft Intune, this CSP is under the “Enhanced Phishing Protection” category. -**WebThreatDefense/EnableService** +**WebThreatDefense/EnableService** @@ -48,7 +48,7 @@ manager: aaroncz |Home|No|No| |Pro|No|No| |Windows SE|No|Yes| -|Business|No|Yes| +|Business|No|No| |Enterprise|No|Yes| |Education|No|Yes| @@ -66,7 +66,7 @@ manager: aaroncz -This policy setting determines whether Enhanced Phishing Protection is in audit mode or off. Users don't see any notifications for any protection scenarios when Enhanced Phishing Protection is in audit mode. When in audit mode, Enhanced Phishing Protection captures unsafe password entry events and sends telemetry through Microsoft Defender. +This policy setting determines whether Enhanced Phishing Protection is in audit mode or off. Users don't see any notifications for any protection scenarios when Enhanced Phishing Protection is in audit mode. When in audit mode, Enhanced Phishing Protection captures unsafe password entry events and sends telemetry through Microsoft Defender. If you enable this policy setting or don’t configure this setting, Enhanced Phishing Protection is enabled in audit mode, and your users are unable to turn it off. @@ -74,7 +74,7 @@ If you disable this policy setting, Enhanced Phishing Protection is off. When of -ADMX Info: +ADMX Info: - GP Friendly name: *Configure Web Threat Defense* - GP name: *EnableWebThreatDefenseService* - GP path: *Windows Security\App & browser control\Reputation-based protection\Phishing protections* @@ -94,7 +94,7 @@ The following list shows the supported values:
-**WebThreatDefense/NotifyMalicious** +**WebThreatDefense/NotifyMalicious** @@ -103,7 +103,7 @@ The following list shows the supported values: |Home|No|No| |Pro|No|No| |Windows SE|No|Yes| -|Business|No|Yes| +|Business|No|No| |Enterprise|No|Yes| |Education|No|Yes| @@ -139,7 +139,7 @@ The following list shows the supported values:
-**WebThreatDefense/NotifyPasswordReuse** +**WebThreatDefense/NotifyPasswordReuse** @@ -148,7 +148,7 @@ The following list shows the supported values: |Home|No|No| |Pro|No|No| |Windows SE|No|Yes| -|Business|No|Yes| +|Business|No|No| |Enterprise|No|Yes| |Education|No|Yes| @@ -185,7 +185,7 @@ The following list shows the supported values:
-**WebThreatDefense/NotifyUnsafeApp** +**WebThreatDefense/NotifyUnsafeApp** @@ -194,7 +194,7 @@ The following list shows the supported values: |Home|No|No| |Pro|No|No| |Windows SE|No|Yes| -|Business|No|Yes| +|Business|No|No| |Enterprise|No|Yes| |Education|No|Yes| @@ -216,13 +216,13 @@ This policy setting determines whether Enhanced Phishing Protection warns your u If you enable this policy setting, Enhanced Phishing Protection warns your users if they store their password in text editor apps. -If you disable or don’t configure this policy setting, Enhanced Phishing Protection won't warn users if they store their password in text editor apps. +If you disable or don’t configure this policy setting, Enhanced Phishing Protection won't warn users if they store their password in text editor apps. The following list shows the supported values: - 0: Turns off Enhanced Phishing Protection notifications when users type their work or school passwords in text editor apps like OneNote, Word, Notepad, etc. -- 1: Turns on Enhanced Phishing Protection notifications when users type their work or school passwords in text editor apps. +- 1: Turns on Enhanced Phishing Protection notifications when users type their work or school passwords in text editor apps. diff --git a/windows/client-management/mdm/secureassessment-csp.md b/windows/client-management/mdm/secureassessment-csp.md index 2f16f647de..0e11d6566e 100644 --- a/windows/client-management/mdm/secureassessment-csp.md +++ b/windows/client-management/mdm/secureassessment-csp.md @@ -32,6 +32,10 @@ The following example shows the SecureAssessment configuration service provider SecureAssessment ----LaunchURI ----TesterAccount +----AllowScreenMonitoring +----RequirePrinting +----AllowTextSuggestions +----Assessments ``` **./Vendor/MSFT/SecureAssessment** The root node for the SecureAssessment configuration service provider. @@ -67,6 +71,60 @@ Added in Windows 10, version 1703. Boolean value that indicates whether keyboard Supported operations are Get and Replace. +**Assessments** +Added in Windows 11, version 22H2. Enables support for multiple assessments. When configured, users can select from a list of assessments. The node accepts an XML string that represents the list of available assessments. + +Supported operations are Add, Delete, Get and Replace. + +XML schema + +```xml + + + + + + + + + + + + + + + + + + + + + + +``` + +Example: +```xml + + + + + English exam + https://contoso.com/english + + + Math exam + https://contoso.com/math + + + Geography exam + https://contoso.com/geography + + + +``` + ## Related topics [Set up Take a Test on multiple PCs](/education/windows/take-a-test-multiple-pcs) diff --git a/windows/client-management/mdm/sharedpc-csp.md b/windows/client-management/mdm/sharedpc-csp.md index 9dc7485482..84c80b01df 100644 --- a/windows/client-management/mdm/sharedpc-csp.md +++ b/windows/client-management/mdm/sharedpc-csp.md @@ -8,7 +8,7 @@ ms.topic: article ms.prod: w10 ms.technology: windows author: vinaypamnani-msft -ms.date: 01/16/2019 +ms.date: 09/23/2022 --- # SharedPC CSP @@ -81,9 +81,6 @@ In Windows 10, version 1607, the value is set to True and the education environm **SetPowerPolicies** Optional. A boolean value that specifies that the power policies should be set when configuring SharedPC mode. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. The default value is Not Configured and the effective power settings are determined by the OS's default power settings. Its value in the SharedPC provisioning package is True. @@ -91,9 +88,6 @@ The default value is Not Configured and the effective power settings are determi **MaintenanceStartTime** Optional. An integer value that specifies the daily start time of maintenance hour. Given in minutes from midnight. The range is 0-1440. -> [!NOTE] ->  If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. The default value is Not Configured and its value in the SharedPC provisioning package is 0 (12 AM). @@ -101,9 +95,6 @@ The default value is Not Configured and its value in the SharedPC provisioning p **SignInOnResume** Optional. A boolean value that, when set to True, requires sign in whenever the device wakes up from sleep mode. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. The default value is Not Configured and its value in the SharedPC provisioning package is True. @@ -111,9 +102,6 @@ The default value is Not Configured and its value in the SharedPC provisioning p **SleepTimeout** The amount of time in seconds before the PC sleeps. 0 means the PC never sleeps. Default is 5 minutes. This node is optional. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. The default value is Not Configured, and effective behavior is determined by the OS's default settings. Its value in the SharedPC provisioning package for Windows 10, version 1703 is 300, and in Windows 10, version 1607 is 3600. @@ -121,9 +109,6 @@ The default value is Not Configured, and effective behavior is determined by the **EnableAccountManager** A boolean that enables the account manager for shared PC mode. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. The default value is Not Configured and its value in the SharedPC provisioning package is True. @@ -131,9 +116,6 @@ The default value is Not Configured and its value in the SharedPC provisioning p **AccountModel** Configures which type of accounts are allowed to use the PC. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. The following list shows the supported values: @@ -147,9 +129,6 @@ Its value in the SharedPC provisioning package is 1 or 2. **DeletionPolicy** Configures when accounts are deleted. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The supported operations are Add, Get, Replace, and Delete. For Windows 10, version 1607, here's the list shows the supported values: @@ -168,9 +147,6 @@ The default value is Not Configured. Its value in the SharedPC provisioning pack **DiskLevelDeletion** Sets the percentage of disk space remaining on a PC before cached accounts will be deleted to free disk space. Accounts that have been inactive the longest will be deleted first. -> [!NOTE] -> If used, this value must be set before the action on the **EnableSharedPCMode** node is taken. - The default value is Not Configured. Its default value in the SharedPC provisioning package is 25. For example, if the **DiskLevelCaching** number is set to 50 and the **DiskLevelDeletion** number is set to 25 (both default values). Accounts will be cached while the free disk space is above 25%. When the free disk space is less than 25% (the deletion number) during a daily maintenance period, accounts will be deleted (oldest last used first) when the system is idle until the free disk space is above 50% (the caching number). Accounts will be deleted immediately on signing out from an account if free space is under half of the deletion threshold and disk space is low, regardless of whether the PC is actively in use or not. @@ -180,9 +156,6 @@ The supported operations are Add, Get, Replace, and Delete. **DiskLevelCaching** Sets the percentage of available disk space a PC should have before it stops deleting cached accounts. -> [!NOTE] -> If used, this value must set before the action on the **EnableSharedPCMode** node is taken. - The default value is Not Configured. The default value in the SharedPC provisioning package is 25. For example, if the **DiskLevelCaching** number is set to 50 and the **DiskLevelDeletion** number is set to 25 (both default values). Accounts will be cached while the free disk space is above 25%. When the free disk space is less than 25% (the deletion number) during a maintenance period, accounts will be deleted (oldest last used first) until the free disk space is above 50% (the caching number). Accounts will be deleted immediately on signing out from an account if free space is under the deletion threshold and disk space is low, regardless whether the PC is actively in use or not. @@ -194,26 +167,17 @@ Added in Windows 10, version 1703. Restricts the user from using local storage. The default value is Not Configured and behavior is no such restriction applied. Value type is bool. Supported operations are Add, Get, Replace, and Delete. Default in SharedPC provisioning package is False. -> [!NOTE] -> If used, this value must set before the action on the **EnableSharedPCMode** node is taken. - **KioskModeAUMID** Added in Windows 10, version 1703. Specifies the AUMID of the app to use with assigned access. This node is optional. - Value type is string. - Supported operations are Add, Get, Replace, and Delete. -> [!NOTE] -> If used, this value must set before the action on the **EnableSharedPCMode** node is taken. - **KioskModeUserTileDisplayText** Added in Windows 10, version 1703. Specifies the display text for the account shown on the sign-in screen that launches the app specified by KioskModeAUMID. This node is optional. Value type is string. Supported operations are Add, Get, Replace, and Delete. -> [!NOTE] -> If used, this value must set before the action on the **EnableSharedPCMode** node is taken. - **InactiveThreshold** Added in Windows 10, version 1703. Accounts will start being deleted when they haven't been logged on during the specified period, given as number of days. @@ -226,9 +190,6 @@ The default in the SharedPC provisioning package is 30. **MaxPageFileSizeMB** Added in Windows 10, version 1703. Maximum size of the paging file in MB. Applies only to systems with less than 32-GB storage and at least 3 GB of RAM. This node is optional. -> [!NOTE] -> If used, this value must set before the action on the **EnableSharedPCMode** node is taken. - - Default value is Not Configured. - Value type is integer. - Supported operations are Add, Get, Replace, and Delete. diff --git a/windows/client-management/mdm/sharedpc-ddf-file.md b/windows/client-management/mdm/sharedpc-ddf-file.md index 071887f881..75667401c6 100644 --- a/windows/client-management/mdm/sharedpc-ddf-file.md +++ b/windows/client-management/mdm/sharedpc-ddf-file.md @@ -80,7 +80,7 @@ The XML below is the DDF for Windows 10, version 1703. false - Setting this node to “1” triggers the action to configure a device to Shared PC mode with OneDrive sync turned on + Setting this node to "1" triggers the action to configure a device to Shared PC mode with OneDrive sync turned on @@ -104,7 +104,7 @@ The XML below is the DDF for Windows 10, version 1703. false - Set a list of EDU policies. This node is independent of EnableSharedPCMode. + Set a list of EDU policies. @@ -128,7 +128,7 @@ The XML below is the DDF for Windows 10, version 1703. true - Specify that the power policies should be set when configuring SharedPC mode. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Specify that the power policies should be set when configuring SharedPC mode. This node is optional. @@ -152,7 +152,7 @@ The XML below is the DDF for Windows 10, version 1703. 0 - Daily start time of maintenance hour. Given in minutes from midnight. Default is 0 (12am). This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Daily start time of maintenance hour. Given in minutes from midnight. Default is 0 (12am). This node is optional. @@ -176,7 +176,7 @@ The XML below is the DDF for Windows 10, version 1703. true - Require signing in on waking up from sleep. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Require signing in on waking up from sleep. This node is optional. @@ -200,7 +200,7 @@ The XML below is the DDF for Windows 10, version 1703. 300 - The amount of time before the PC sleeps, given in seconds. 0 means the PC never sleeps. Default is 5 minutes. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + The amount of time before the PC sleeps, given in seconds. 0 means the PC never sleeps. Default is 5 minutes. This node is optional. @@ -344,7 +344,7 @@ The XML below is the DDF for Windows 10, version 1703. true - Restricts the user from using local storage. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Restricts the user from using local storage. This node is optional. @@ -367,7 +367,7 @@ The XML below is the DDF for Windows 10, version 1703. - Specifies the AUMID of the app to use with assigned access. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Specifies the AUMID of the app to use with assigned access. This node is optional. @@ -390,7 +390,7 @@ The XML below is the DDF for Windows 10, version 1703. - Specifies the display text for the account shown on the sign-in screen which launches the app specified by KioskModeAUMID. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Specifies the display text for the account shown on the sign-in screen which launches the app specified by KioskModeAUMID. This node is optional. @@ -438,7 +438,7 @@ The XML below is the DDF for Windows 10, version 1703. 1024 - Maximum size of the paging file in MB. Applies only to systems with less than 32 GB storage and at least 3 GB of RAM. This node is optional. If used, it needs to be set before the action on "EnableSharedPCMode" node is taken. + Maximum size of the paging file in MB. Applies only to systems with less than 32 GB storage and at least 3 GB of RAM. This node is optional. 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/configuration/windows-accessibility-for-ITPros.md b/windows/configuration/windows-accessibility-for-ITPros.md index 38c0ed6030..cbd0e23756 100644 --- a/windows/configuration/windows-accessibility-for-ITPros.md +++ b/windows/configuration/windows-accessibility-for-ITPros.md @@ -63,6 +63,8 @@ Windows 11, version 22H2, includes improvements for people with disabilities: sy ## Hearing +- [Use live captions to better understand audio](https://support.microsoft.com/windows/use-live-captions-to-better-understand-audio-b52da59c-14b8-4031-aeeb-f6a47e6055df). Use Windows 11, version 22H2 or later to better understand any spoken audio with real time captions. + - [View live transcription in a Teams meeting](https://support.microsoft.com/office/view-live-transcription-in-a-teams-meeting-dc1a8f23-2e20-4684-885e-2152e06a4a8b). During any Teams meeting, view a live transcription so you don't miss what's being said. - [Use Teams for sign language](https://www.microsoft.com/microsoft-teams/group-chat-software). Teams is available on various platforms and devices, so you don't have to worry about whether your co-workers, friends, and family can communicate with you. diff --git a/windows/deployment/images/before.png b/windows/deployment/images/before.png deleted file mode 100644 index 1a50878670..0000000000 Binary files a/windows/deployment/images/before.png and /dev/null differ diff --git a/windows/deployment/images/sa-mfa1.png b/windows/deployment/images/sa-mfa1.png deleted file mode 100644 index 045e5a7794..0000000000 Binary files a/windows/deployment/images/sa-mfa1.png and /dev/null differ diff --git a/windows/deployment/images/sa-mfa2.png b/windows/deployment/images/sa-mfa2.png deleted file mode 100644 index 1964a7b263..0000000000 Binary files a/windows/deployment/images/sa-mfa2.png and /dev/null differ diff --git a/windows/deployment/images/sa-mfa3.png b/windows/deployment/images/sa-mfa3.png deleted file mode 100644 index 8987eac97b..0000000000 Binary files a/windows/deployment/images/sa-mfa3.png and /dev/null differ diff --git a/windows/deployment/index.yml b/windows/deployment/index.yml index 5da61c2f9a..a7dbbcc6f0 100644 --- a/windows/deployment/index.yml +++ b/windows/deployment/index.yml @@ -95,7 +95,7 @@ landingContent: url: /microsoftteams/faq-support-remote-workforce # Card (optional) - - title: Microsoft Learn + - title: Microsoft Learn training linkLists: - linkListType: learn links: diff --git a/windows/deployment/update/check-release-health.md b/windows/deployment/update/check-release-health.md index cbcb7c8acb..a865459e80 100644 --- a/windows/deployment/update/check-release-health.md +++ b/windows/deployment/update/check-release-health.md @@ -106,11 +106,12 @@ A list of all status updates posted in the selected timeframe will be displayed, - **Where do I find Windows release health?** After logging into Microsoft 365 admin center, expand the left-hand menu using **…Show All**, select **Health** and you'll see **Windows release health**. -- **Is the Windows release health content published to Microsoft 365 admin center the same as the content on Windows release health on Docs.microsoft.com?** - No. While the content is similar, you may see more issues and technical details published to Windows release health on Microsoft 365 admin center to better support the IT admin. For example, you'll find details to help you diagnose issues in your environment, steps to mitigate issues, and root cause analysis. + +- **Is the Windows release health content published to Microsoft 365 admin center the same as the content on Windows release health on Microsoft Learn?** + No. While the content is similar, you may see more issues and more technical details published to Windows release health on Microsoft 365 admin center to better support the IT admin. For example, you’ll find details to help you diagnose issues in your environment, steps to mitigate issues, and root cause analysis. - **How often will content be updated?** - To ensure Windows customers have important information as soon as possible, all major known issues will be shared with Windows customers on both Docs.microsoft.com and the Microsoft 365 admin center. We may also update the details available for Windows release health in the Microsoft 365 admin center when we have more details on workarounds, root cause, or other information to help you plan for updates and handle issues in your environment. + In an effort to ensure Windows customers have important information as soon as possible, all major known issues will be shared with Windows customers on both Microsoft Learn and the Microsoft 365 admin center. We may also update the details available for Windows release health in the Microsoft 365 admin center when we have additional details on workarounds, root cause, or other information to help you plan for updates and handle issues in your environment. - **Can I share this content publicly or with other Windows customers?** Windows release health is provided to you as a licensed Windows customer and isn't to be shared publicly. 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/deployment/update/update-compliance-v2-help.md b/windows/deployment/update/update-compliance-v2-help.md index e1fccf14ec..cbdbab10e9 100644 --- a/windows/deployment/update/update-compliance-v2-help.md +++ b/windows/deployment/update/update-compliance-v2-help.md @@ -64,9 +64,9 @@ You can open support requests directly from the Azure portal. If the **Help + S Select the **Feedback** link in the upper right of any article to go to the Feedback section at the bottom. Feedback is integrated with GitHub Issues. For more information about this integration with GitHub Issues, see the [docs platform blog post](/teamblog/a-new-feedback-system-is-coming-to-docs). -:::image type="content" source="media/docs-feedback.png" alt-text="Screenshot of the feedback section on a docs article."::: +:::image type="content" source="media/docs-feedback.png" alt-text="Screenshot of the feedback section of a Microsoft Learn page."::: -To share docs feedback about the current article, select **This page**. A [GitHub account](https://github.com/join) is a prerequisite for providing documentation feedback. Once you sign in, there's a one-time authorization for the MicrosoftDocs organization. It then opens the GitHub new issue form. Add a descriptive title and detailed feedback in the body, but don't modify the document details section. Then select **Submit new issue** to file a new issue for the target article in the [Windows-ITPro-docs GitHub repository](https://github.com/MicrosoftDocs/windows-itpro-docs/issues). +To share feedback about the current article, select **This page**. A [GitHub account](https://github.com/join) is a prerequisite for providing documentation feedback. Once you sign in, there's a one-time authorization for the MicrosoftDocs organization. It then opens the GitHub new issue form. Add a descriptive title and detailed feedback in the body, but don't modify the document details section. Then select **Submit new issue** to file a new issue for the target article in the [Windows-ITPro-docs GitHub repository](https://github.com/MicrosoftDocs/windows-itpro-docs/issues). To see whether there's already feedback for this article, select **View all page feedback**. This action opens a GitHub issue query for this article. By default it displays both open and closed issues. Review any existing feedback before you submit a new issue. If you find a related issue, select the face icon to add a reaction, add a comment to the thread, or **Subscribe** to receive notifications. @@ -86,7 +86,7 @@ If you create an issue for something not related to documentation, Microsoft wil - [Product questions (using Microsoft Q&A)](/answers/products/) - [Support requests](#open-a-microsoft-support-case) for Update Compliance -To share feedback about the Microsoft Docs platform, see [Microsoft Docs feedback](https://aka.ms/sitefeedback). The platform includes all of the wrapper components such as the header, table of contents, and right menu. Also how the articles render in the browser, such as the font, alert boxes, and page anchors. +To share feedback about the Microsoft Learn platform, see [Microsoft Learn feedback](https://aka.ms/sitefeedback). The platform includes all of the wrapper components such as the header, table of contents, and right menu. Also how the articles render in the browser, such as the font, alert boxes, and page anchors. ## Troubleshooting tips diff --git a/windows/deployment/vda-subscription-activation.md b/windows/deployment/vda-subscription-activation.md index 87590d77a7..187ec9c7c0 100644 --- a/windows/deployment/vda-subscription-activation.md +++ b/windows/deployment/vda-subscription-activation.md @@ -1,150 +1,165 @@ --- -title: Configure VDA for Windows 10/11 Subscription Activation +title: Configure VDA for Windows subscription activation +description: Learn how to configure virtual machines (VMs) to enable Windows 10 Subscription Activation in a Windows Virtual Desktop Access (VDA) scenario. ms.reviewer: manager: dougeby ms.author: aaroncz author: aczechowski -description: Learn how to configure virtual machines (VMs) to enable Windows 10 Subscription Activation in a Windows Virtual Desktop Access (VDA) scenario. ms.custom: seo-marvel-apr2020 -ms.prod: w10 +ms.prod: windows-client +ms.technology: itpro-deploy ms.localizationpriority: medium -ms.topic: article +ms.topic: how-to ms.collection: M365-modern-desktop +ms.date: 09/26/2022 --- -# Configure VDA for Windows 10/11 Subscription Activation +# Configure VDA for Windows subscription activation Applies to: + - Windows 10 - Windows 11 -This document describes how to configure virtual machines (VMs) to enable [Windows 10/11 Subscription Activation](windows-10-subscription-activation.md) in a Windows Virtual Desktop Access (VDA) scenario. Windows VDA is a device or user-based licensing mechanism for managing access to virtual desktops. +This document describes how to configure virtual machines (VMs) to enable [Windows subscription activation](windows-10-subscription-activation.md) in a Windows Virtual Desktop Access (VDA) scenario. Windows VDA is a device or user-based licensing mechanism for managing access to virtual desktops. Deployment instructions are provided for the following scenarios: + 1. [Active Directory-joined VMs](#active-directory-joined-vms) 2. [Azure Active Directory-joined VMs](#azure-active-directory-joined-vms) 3. [Azure Gallery VMs](#azure-gallery-vms) ## Requirements -- VMs must be running Windows 10 Pro, version 1703 or later. Windows 11 is "later" in this context. -- VMs must be Active Directory-joined or Azure Active Directory (AAD)-joined. -- VMs must be hosted by a Qualified Multitenant Hoster (QMTH). - - For more information, see [Qualified Multitenant Hoster Program](https://download.microsoft.com/download/3/D/4/3D445779-2870-4E3D-AFCB-D35D2E1BC095/QMTH%20Authorized%20Partner%20List.pdf) (PDF download). +- VMs must be running a supported version of Windows Pro edition. +- VMs must be joined to Active Directory or Azure Active Directory (Azure AD). +- VMs must be hosted by a Qualified Multitenant Hoster (QMTH). For more information, download the PDF that describes the [Qualified Multitenant Hoster Program](https://download.microsoft.com/download/3/D/4/3D445779-2870-4E3D-AFCB-D35D2E1BC095/QMTH%20Authorized%20Partner%20List.pdf). ## Activation ### Scenario 1 -- The VM is running Windows 10, version 1803 or later (ex: Windows 11). +- The VM is running a supported version of Windows. - The VM is hosted in Azure or another Qualified Multitenant Hoster (QMTH). - When a user with VDA rights signs in to the VM using their Azure Active Directory credentials, the VM is automatically stepped-up to Enterprise and activated. There is no need to perform Windows 10/11 Pro activation. This eliminates the need to maintain KMS or MAK in the qualifying cloud infrastructure. + When a user with VDA rights signs in to the VM using their Azure AD credentials, the VM is automatically stepped-up to Enterprise and activated. There's no need to do Windows Pro activation. This functionality eliminates the need to maintain KMS or MAK in the qualifying cloud infrastructure. ### Scenario 2 -- The Hyper-V host and the VM are both running Windows 10, version 1803 or later. +- The Hyper-V host and the VM are both running a supported version of Windows. - [Inherited Activation](./windows-10-subscription-activation.md#inherited-activation) is enabled. All VMs created by a user with a Windows 10/11 E3 or E5 license are automatically activated independent of whether a user signs in with a local account or using an Azure Active Directory account. + [Inherited Activation](./windows-10-subscription-activation.md#inherited-activation) is enabled. All VMs created by a user with a Windows E3 or E5 license are automatically activated independent of whether a user signs in with a local account or using an Azure AD account. ### Scenario 3 -- The VM is running Windows 10, version 1703 or 1709, or the hoster is not an authorized [QMTH](https://download.microsoft.com/download/3/D/4/3D445779-2870-4E3D-AFCB-D35D2E1BC095/QMTH%20Authorized%20Partner%20List.pdf) partner. +- The hoster isn't an authorized QMTH partner. - In this scenario, the underlying Windows 10/11 Pro license must be activated prior to Subscription Activation of Windows 10/11 Enterprise. Activation is accomplished using a Generic Volume License Key (GVLK) and a Volume License KMS activation server provided by the hoster. Alternatively, a KMS activation server can be used. KMS activation is provided for Azure VMs. For more information, see [Troubleshoot Azure Windows virtual machine activation problems](/azure/virtual-machines/troubleshooting/troubleshoot-activation-problems). + In this scenario, the underlying Windows Pro license must be activated prior to using subscription activation Windows Enterprise. Activation is accomplished using a generic volume license key (GVLK) and a volume license KMS activation server provided by the hoster. Alternatively, a KMS activation server can be used. KMS activation is provided for Azure VMs. For more information, see [Troubleshoot Azure Windows virtual machine activation problems](/troubleshoot/azure/virtual-machines/troubleshoot-activation-problems). For examples of activation issues, see [Troubleshoot the user experience](./deploy-enterprise-licenses.md#troubleshoot-the-user-experience). ## Active Directory-joined VMs 1. Use the following instructions to prepare the VM for Azure: [Prepare a Windows VHD or VHDX to upload to Azure](/azure/virtual-machines/windows/prepare-for-upload-vhd-image) -2. (Optional) To disable network level authentication, type the following at an elevated command prompt: +2. (Optional) To disable network level authentication, type the following command at an elevated command prompt: - ``` + ```cmd REG ADD "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f ``` 3. At an elevated command prompt, type **sysdm.cpl** and press ENTER. -4. On the Remote tab, choose **Allow remote connections to this computer** and then click **Select Users**. -5. Click **Add**, type **Authenticated users**, and then click **OK** three times. -6. Follow the instructions to use sysprep at [Steps to generalize a VHD](/azure/virtual-machines/windows/prepare-for-upload-vhd-image#steps-to-generalize-a-vhd) and then start the VM again. -7. If you must activate Windows 10 Pro as described for [scenario 3](#scenario-3), complete the following steps to use Windows Configuration Designer and inject an activation key. Otherwise, skip to step 20. -8. [Install Windows Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd). -9. Open Windows Configuration Designer and click **Provision desktop services**. -10. Under **Name**, type **Desktop AD Enrollment Pro GVLK**, click **Finish**, and then on the **Set up device** page enter a device name. - - Note: You can use a different project name, but this name is also used with dism.exe in a subsequent step. -11. Under **Enter product key** type the Pro GVLK key: **W269N-WFGWX-YVC9B-4J6C9-T83GX**. -12. On the Set up network page, choose **Off**. -13. On the Account Management page, choose **Enroll into Active Directory** and then enter the account details. - - Note: This step is different for [Azure AD-joined VMs](#azure-active-directory-joined-vms). -14. On the Add applications page, add applications if desired. This step is optional. -15. On the Add certificates page, add certificates if desired. This step is optional. -16. On the Finish page, click **Create**. -17. In file explorer, double-click the VHD to mount the disk image. Determine the drive letter of the mounted image. -18. Type the following at an elevated command prompt. Replace the letter **G** with the drive letter of the mounted image, and enter the project name you used if it is different than the one suggested: +4. On the Remote tab, choose **Allow remote connections to this computer** and then select **Select Users**. +5. Select **Add**, type **Authenticated users**, and then select **OK** three times. +6. Follow the instructions to use sysprep at [Steps to generalize a VHD](/azure/virtual-machines/windows/prepare-for-upload-vhd-image#generalize-a-vhd) and then start the VM again. +7. If you must activate Windows Pro as described for [scenario 3](#scenario-3), complete the following steps to use Windows Configuration Designer and inject an activation key. Otherwise, skip to step 8. + 1. [Install Windows Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd). + 1. Open Windows Configuration Designer and select **Provision desktop services**. + 1. Under **Name**, type **Desktop AD Enrollment Pro GVLK**, select **Finish**, and then on the **Set up device** page enter a device name. - ```cmd - Dism.exe /Image=G:\ /Add-ProvisioningPackage /PackagePath: "Desktop AD Enrollment Pro GVLK.ppkg" - ``` -19. Right-click the mounted image in file explorer and click **Eject**. -20. See instructions at [Upload and create VM from generalized VHD](/azure/virtual-machines/windows/upload-generalized-managed#log-in-to-azure) to log in to Azure, get your storage account details, upload the VHD, and create a managed image. + > [!NOTE] + > You can use a different project name, but this name is also used with dism.exe in a later step. + + 1. Under **Enter product key** type the Pro GVLK key: `W269N-WFGWX-YVC9B-4J6C9-T83GX`. + 1. On the Set up network page, choose **Off**. + 1. On the Account Management page, choose **Enroll into Active Directory** and then enter the account details. + + > [!NOTE] + > This step is different for [Azure AD-joined VMs](#azure-active-directory-joined-vms). + + 1. On the Add applications page, add applications if desired. This step is optional. + 1. On the Add certificates page, add certificates if desired. This step is optional. + 1. On the Finish page, select **Create**. + 1. In file explorer, open the VHD to mount the disk image. Determine the drive letter of the mounted image. + 1. Type the following command at an elevated command prompt. Replace the letter `G` with the drive letter of the mounted image, and enter the project name you used if it's different than the one suggested: + + ```cmd + Dism.exe /Image=G:\ /Add-ProvisioningPackage /PackagePath: "Desktop AD Enrollment Pro GVLK.ppkg" + ``` + + 1. Right-click the mounted image in file explorer and select **Eject**. + +8. See the instructions at [Upload and create VM from generalized VHD](/azure/virtual-machines/windows/upload-generalized-managed#upload-the-vhd) to sign in to Azure, get your storage account details, upload the VHD, and create a managed image. ## Azure Active Directory-joined VMs ->[!IMPORTANT] ->Azure Active Directory (Azure AD) provisioning packages have a 180 day limit on bulk token usage. You will need to update the provisioning package and re-inject it into the image after 180 days. Existing virtual machines that are Azure AD-joined and deployed will not need to be recreated. +> [!IMPORTANT] +> Azure AD provisioning packages have a 180 day limit on bulk token usage. After 180 days, you'll need to update the provisioning package and re-inject it into the image. Existing virtual machines that are Azure AD-joined and deployed won't need to be recreated. -For Azure AD-joined VMs, follow the same instructions (above) as for [Active Directory-joined VMs](#active-directory-joined-vms) with the following exceptions: -- In step 9, during setup with Windows Configuration Designer, under **Name**, type a name for the project that indicates it is not for Active Directory-joined VMs, such as **Desktop Bulk Enrollment Token Pro GVLK**. -- In step 11, during setup with Windows Configuration Designer, on the Account Management page, instead of enrolling in Active Directory, choose **Enroll in Azure AD**, click **Get Bulk Token**, sign in and add the bulk token using your organization's credentials. -- In step 15, sub-step 2, when entering the PackagePath, use the project name you entered in step 9 (ex: **Desktop Bulk Enrollment Token Pro GVLK.ppkg**) -- When attempting to access the VM using remote desktop, you will need to create a custom RDP settings file as described below in [Create custom RDP settings for Azure](#create-custom-rdp-settings-for-azure). +For Azure AD-joined VMs, follow the same instructions as for [Active Directory-joined VMs](#active-directory-joined-vms) with the following exceptions: + +- During setup with Windows Configuration Designer, under **Name**, type a name for the project that indicates it isn't for Active Directory-joined VMs, such as **Desktop Bulk Enrollment Token Pro GVLK**. +- During setup with Windows Configuration Designer, on the Account Management page, instead of enrolling in Active Directory, choose **Enroll in Azure AD**, select **Get Bulk Token**, sign in, and add the bulk token using your organization's credentials. +- When entering the PackagePath, use the project name you previously entered. For example, **Desktop Bulk Enrollment Token Pro GVLK.ppkg** +- When attempting to access the VM using remote desktop, you'll need to create a custom RDP settings file as described below in [Create custom RDP settings for Azure](#create-custom-rdp-settings-for-azure). ## Azure Gallery VMs -1. (Optional) To disable network level authentication, type the following at an elevated command prompt: +1. (Optional) To disable network level authentication, type the following command at an elevated command prompt: - ``` + ```cmd REG ADD "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f ``` -2. At an elevated command prompt, type **sysdm.cpl** and press ENTER. -3. On the Remote tab, choose **Allow remote connections to this computer** and then click **Select Users**. -4. Click **Add**, type **Authenticated users**, and then click **OK** three times. +2. At an elevated command prompt, type `sysdm.cpl` and press ENTER. +3. On the Remote tab, choose **Allow remote connections to this computer** and then select **Select Users**. +4. Select **Add**, type **Authenticated users**, and then select **OK** three times. 5. [Install Windows Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd). -6. Open Windows Configuration Designer and click **Provision desktop services**. -7. If you must activate Windows 10 Pro as described for [scenario 3](#scenario-3), complete the following steps. Otherwise, skip to step 8. - 1. Under **Name**, type **Desktop Bulk Enrollment Token Pro GVLK**, click **Finish**, and then on the **Set up device** page enter a device name. - 2. Under **Enter product key** type the Pro GVLK key: **W269N-WFGWX-YVC9B-4J6C9-T83GX**. -8. Under **Name**, type **Desktop Bulk Enrollment**, click **Finish**, and then on the **Set up device** page enter a device name. +6. Open Windows Configuration Designer and select **Provision desktop services**. +7. If you must activate Windows Pro as described for [scenario 3](#scenario-3), complete the following steps. Otherwise, skip to step 8. + 1. Under **Name**, type **Desktop Bulk Enrollment Token Pro GVLK**, select **Finish**, and then on the **Set up device** page enter a device name. + 2. Under **Enter product key** type the Pro GVLK key: `W269N-WFGWX-YVC9B-4J6C9-T83GX`. +8. Under **Name**, type **Desktop Bulk Enrollment**, select **Finish**, and then on the **Set up device** page enter a device name. 9. On the Set up network page, choose **Off**. -10. On the Account Management page, choose **Enroll in Azure AD**, click **Get Bulk Token**, sign in, and add the bulk token using your organizations credentials. +10. On the Account Management page, choose **Enroll in Azure AD**, select **Get Bulk Token**, sign in, and add the bulk token using your organizations credentials. 11. On the Add applications page, add applications if desired. This step is optional. 12. On the Add certificates page, add certificates if desired. This step is optional. -13. On the Finish page, click **Create**. -14. Copy the .ppkg file to the remote Virtual machine. Double click to initiate the provisioning package install. This will reboot the system. +13. On the Finish page, select **Create**. +14. Copy the PPKG file to the remote virtual machine. Open the provisioning package to install it. This process will restart the system. -- When attempting to access the VM using remote desktop, you will need to create a custom RDP settings file as described [below](#create-custom-rdp-settings-for-azure). +> [!NOTE] +> When you try to access the VM using remote desktop, you'll need to [create a custom RDP settings file](#create-custom-rdp-settings-for-azure). ## Create custom RDP settings for Azure -To create custom RDP settings for Azure: - 1. Open Remote Desktop Connection and enter the IP address or DNS name for the remote host. -2. Click **Show Options**, and then under Connection settings click **Save As** and save the RDP file to the location where you will use it. +2. Select **Show Options**, and then under Connection settings select **Save As**. Save the RDP file to the location where you'll use it. 3. Close the Remote Desktop Connection window and open Notepad. -4. Drag the RDP file into the Notepad window to edit it. +4. Open the RDP file in Notepad to edit it. 5. Enter or replace the line that specifies authentication level with the following two lines of text: ```text enablecredsspsupport:i:0 authentication level:i:2 ``` -6. **enablecredsspsupport** and **authentication level** should each appear only once in the file. -7. Save your changes, and then use this custom RDP file with your Azure AD credentials to connect to the Azure VM. -## Related topics + The values `enablecredsspsupport` and `authentication level` should each appear only once in the file. -[Windows 10/11 Subscription Activation](windows-10-subscription-activation.md) -
[Recommended settings for VDI desktops](/windows-server/remote/remote-desktop-services/rds-vdi-recommendations) -
[Licensing the Windows Desktop for VDI Environments](https://download.microsoft.com/download/9/8/d/98d6a56c-4d79-40f4-8462-da3ecba2dc2c/licensing_windows_desktop_os_for_virtual_machines.pdf) +6. Save your changes, and then use this custom RDP file with your Azure AD credentials to connect to the Azure VM. + +## Related articles + +[Windows subscription activation](windows-10-subscription-activation.md) + +[Recommended settings for VDI desktops](/windows-server/remote/remote-desktop-services/rds-vdi-recommendations) + +[Whitepaper on licensing the Windows desktop for VDI environments](https://download.microsoft.com/download/9/8/d/98d6a56c-4d79-40f4-8462-da3ecba2dc2c/licensing_windows_desktop_os_for_virtual_machines.pdf) diff --git a/windows/deployment/windows-10-subscription-activation.md b/windows/deployment/windows-10-subscription-activation.md index 67df3547c9..969e44b244 100644 --- a/windows/deployment/windows-10-subscription-activation.md +++ b/windows/deployment/windows-10-subscription-activation.md @@ -1,8 +1,8 @@ --- -title: Windows 10/11 Subscription Activation +title: Windows subscription activation description: In this article, you'll learn how to dynamically enable Windows 10 and Windows 11 Enterprise or Education subscriptions. -ms.custom: seo-marvel-apr2020 -ms.prod: w10 +ms.prod: windows-client +ms.technology: itpro-deploy ms.localizationpriority: medium author: aczechowski ms.author: aaroncz @@ -12,239 +12,203 @@ ms.collection: - highpri search.appverid: - MET150 -ms.topic: article +ms.topic: conceptual ms.date: 07/12/2022 --- -# Windows 10/11 Subscription Activation +# Windows subscription activation Applies to: + - Windows 10 - Windows 11 -Windows 10 Pro supports the Subscription Activation feature, enabling users to "step-up" from Windows 10 Pro or Windows 11 Pro to **Windows 10 Enterprise** or **Windows 11 Enterprise**, respectively, if they're subscribed to Windows 10/11 Enterprise E3 or E5. +The subscription activation feature enables you to "step-up" from Windows Pro edition to Enterprise or Education editions. You can use this feature if you're subscribed to Windows Enterprise E3 or E5 licenses. Subscription activation also supports step-up from Windows Pro Education edition to Education edition. -With Windows 10, version 1903 and later, the Subscription Activation feature also supports the ability to step-up from Windows 10 Pro Education or Windows 11 Pro Education to the Enterprise grade editions for educational institutions—**Windows 10 Education** or **Windows 11 Education**. +If you have devices that are licensed for earlier versions of Windows Professional, Microsoft 365 Business Premium provides an upgrade to Windows Pro edition, which is the prerequisite for deploying [Windows Business](/microsoft-365/business-premium/microsoft-365-business-faqs#what-is-windows-10-business). -If you have devices that are licensed for Windows 7, 8, and 8.1 Professional, Microsoft 365 Business Premium provides an upgrade to Windows 10 Pro, which is the prerequisite for deploying [Windows 10 Business](/microsoft-365/business-premium/microsoft-365-business-faqs#what-is-windows-10-business). +The subscription activation feature eliminates the need to manually deploy Enterprise or Education edition images on each target device, then later standing up on-premises key management services such as KMS or MAK based activation, entering Generic Volume License Keys (GVLKs), and then rebooting client devices. -The Subscription Activation feature eliminates the need to manually deploy Enterprise or Education edition images on each target device, then later standing up on-premises key management services such as KMS or MAK based activation, entering Generic Volume License Keys (GVLKs), and subsequently rebooting client devices. +This article covers the following information: -For more information, see the following articles: - -- [Subscription Activation](#subscription-activation-for-windows-1011-enterprise): An introduction to Subscription Activation for Windows 10/11 Enterprise. -- [Subscription Activation for Education](#subscription-activation-for-windows-1011-enterprise): Information about Subscription Activation for Windows 10/11 Education. -- [Inherited Activation](#inherited-activation): Description of a new feature available in Windows 10, version 1803 and later. +- [Subscription activation](#subscription-activation-for-enterprise): An introduction to subscription activation for Windows Enterprise. +- [Subscription activation for Education](#subscription-activation-for-education): Information about subscription activation for Windows Education. +- [Inherited activation](#inherited-activation): Allow virtual machines to inherit activation state from their Windows client host. - [The evolution of deployment](#the-evolution-of-deployment): A short history of Windows deployment. -- [Requirements](#requirements): Prerequisites to use the Windows 10/11 Subscription Activation model. +- [Requirements](#requirements): Prerequisites to use the Windows subscription activation model. - [Benefits](#benefits): Advantages of subscription-based licensing. - [How it works](#how-it-works): A summary of the subscription-based licensing option. -- [Virtual Desktop Access (VDA)](#virtual-desktop-access-vda): How to enable Windows 10 Subscription Activation for VMs in the cloud. +- [Virtual Desktop Access (VDA)](#virtual-desktop-access-vda): How to enable Windows subscription activation for VMs in the cloud. -For information on how to deploy Enterprise licenses, see [Deploy Windows 10/11 Enterprise licenses](deploy-enterprise-licenses.md). +For more information on how to deploy Enterprise licenses, see [Deploy Windows Enterprise licenses](deploy-enterprise-licenses.md). -## Subscription Activation for Windows 10/11 Enterprise +## Subscription activation for Enterprise -Windows 10/11 Enterprise E3 and Windows 10/11 Enterprise E5 are available as online services via subscription. Deploying Windows 10 Enterprise or Windows 11 Enterprise in your organization can now be accomplished with no keys and no reboots. +Windows Enterprise E3 and E5 are available as online services via subscription. You can deploy Windows Enterprise in your organization without keys and reboots. - If you're running Windows 10, version 1703 or later: +- Devices with a current Windows Pro edition license can be seamlessly upgraded to Windows Enterprise. +- Product key-based Windows Enterprise software licenses can be transitioned to Windows Enterprise subscriptions. -- Devices with a current Windows 10 Pro license or Windows 11 Pro license can be seamlessly upgraded to Windows 10 Enterprise or Windows 11 Enterprise, respectively. -- Product key-based Windows 10 Enterprise or Windows 11 Enterprise software licenses can be transitioned to Windows 10 Enterprise and Windows 11 Enterprise subscriptions. - -Organizations that have an Enterprise agreement can also benefit from the new service, using traditional Active Directory-joined devices. In this scenario, the Active Directory user that signs in on their device must be synchronized with Azure AD using [Azure AD Connect Sync](/azure/active-directory/connect/active-directory-aadconnectsync-whatis). +Organizations that have an enterprise agreement can also benefit from the service, using traditional Active Directory-joined devices. In this scenario, the Active Directory user that signs in on their device must be synchronized with Azure Active Directory (Azure AD) using [Azure AD Connect Sync](/azure/active-directory/hybrid/how-to-connect-sync-whatis). > [!NOTE] -> The Subscription Activation feature is available for qualifying devices running Windows 10 or Windows 11. You cannot use Subscription Activation to upgrade from Windows 10 to Windows 11. +> Subscription activation is available for qualifying devices running Windows 10 or Windows 11. You can't use subscription activation to upgrade from Windows 10 to Windows 11. -## Subscription Activation for Education +## Subscription activation for Education -Subscription Activation for Education works the same as the Enterprise version, but in order to use Subscription Activation for Education, you must have a device running Windows 10 Pro Education, version 1903 or later (or Windows 11) and an active subscription plan with a Windows 10/11 Enterprise license. For more information, see the [requirements](#windows-1011-education-requirements) section. +Subscription activation for Education works the same as the Enterprise edition, but in order to use subscription activation for Education, you must have a device running Windows Pro Education and an active subscription plan with an Enterprise license. For more information, see the [requirements](#windows-education-requirements) section. -## Inherited Activation +## Inherited activation -Inherited Activation is a new feature available in Windows 10, version 1803 or later (Windows 11 is considered "later" here) that allows Windows 10/11 virtual machines to inherit activation state from their Windows 10/11 host. +Inherited activation allows Windows virtual machines to inherit activation state from their Windows client host. When a user with a Windows E3/E5 or A3/A5 license assigned creates a new Windows 10 or Windows 11 virtual machine (VM) using a Windows 10 or Windows 11 host, the VM inherits the activation state from a host machine. This behavior is independent of whether the user signs on with a local account or uses an Azure AD account on a VM. -When a user with Windows 10/11 E3/E5 or A3/A5 license assigned creates a new Windows 10 or Windows 11 virtual machine (VM) using a Windows 10/11 local host, the VM inherits the activation state from a host machine independent of whether user signs on with a local account or using an Azure Active Directory (Azure AD) account on a VM. - -To support Inherited Activation, both the host computer and the VM must be running Windows 10, version 1803 or later. The hypervisor platform must also be Windows Hyper-V. +To support inherited activation, both the host computer and the VM must be running a supported version of Windows 10 or Windows 11. The hypervisor platform must also be Windows Hyper-V. ## The evolution of deployment +> [!TIP] > The original version of this section can be found at [Changing between Windows SKUs](/archive/blogs/mniehaus/changing-between-windows-skus). The following list illustrates how deploying Windows client has evolved with each release: -- **Windows 7** required you to redeploy the operating system using a full wipe-and-load process if you wanted to change from Windows 7 Professional to Windows 10 Enterprise.
-- **Windows 8.1** added support for a Windows 8.1 Pro to Windows 8.1 Enterprise in-place upgrade (considered a "repair upgrade" because the OS version was the same before and after). This was a lot easier than wipe-and-load, but it was still time-consuming.
-- **Windows 10, version 1507** added the ability to install a new product key using a provisioning package or using MDM to change the SKU. This required a reboot, which would install the new OS components, and took several minutes to complete. However, it was a lot quicker than in-place upgrade.
-- **Windows 10, version 1607** made a large leap forward. Now you can just change the product key and the SKU instantly changes from Windows 10 Pro to Windows 10 Enterprise. In addition to provisioning packages and MDM, you can just inject a key using SLMGR.VBS (which injects the key into WMI), so it became trivial to do this using a command line.
-- **Windows 10, version 1703** made this "step-up" from Windows 10 Pro to Windows 10 Enterprise automatic for those that subscribed to Windows 10 Enterprise E3 or E5 via the CSP program.
-- **Windows 10, version 1709** adds support for Windows 10 Subscription Activation, similar to the CSP support but for large enterprises, enabling the use of Azure AD for assigning licenses to users. When those users sign in on an AD or Azure AD-joined machine, it automatically steps up from Windows 10 Pro to Windows 10 Enterprise.
-- **Windows 10, version 1803** updates Windows 10 Subscription Activation to enable pulling activation keys directly from firmware for devices that support firmware-embedded keys. It's no longer necessary to run a script to perform the activation step on Windows 10 Pro prior to activating Enterprise. For virtual machines and hosts running Windows 10, version 1803 [Inherited Activation](#inherited-activation) is also enabled.
-- **Windows 10, version 1903** updates Windows 10 Subscription Activation to enable step up from Windows 10 Pro Education to Windows 10 Education for those with a qualifying Windows 10 or Microsoft 365 subscription. -- **Windows 11** updates Subscription Activation to work on both Windows 10 and Windows 11 devices. **Important**: Subscription activation doesn't update a device from Windows 10 to Windows 11. Only the edition is updated. +- **Windows 7** required you to redeploy the operating system using a full wipe-and-load process if you wanted to change from Windows 7 Professional to Windows 10 Enterprise. + +- **Windows 8.1** added support for a Windows 8.1 Pro to Windows 8.1 Enterprise in-place upgrade. This process was considered a "repair upgrade", because the OS version was the same before and after. This upgrade was a lot easier than wipe-and-load, but it was still time-consuming. + +- **Windows 10, version 1507** added the ability to install a new product key using a provisioning package or using MDM to change the SKU. This process required a reboot, which would install the new OS components, and took several minutes to complete. However, it was a lot quicker than in-place upgrade. + +- **Windows 10, version 1607** made a large leap forward. You could just change the product key and the edition instantly changed from Windows 10 Pro to Windows 10 Enterprise. In addition to provisioning packages and MDM, you can inject a key using slmgr.vbs, which injects the key into WMI. It became trivial to do this process using a command line. + +- **Windows 10, version 1703** made this "step-up" from Windows 10 Pro to Windows 10 Enterprise automatic for devices that subscribed to Windows 10 Enterprise E3 or E5 via the CSP program. + +- **Windows 10, version 1709** added support for Windows 10 subscription activation, similar to the CSP support but for large enterprises. This feature enabled the use of Azure AD for assigning licenses to users. When users sign in to a device that's joined to Active Directory or Azure AD, it automatically steps up from Windows 10 Pro to Windows 10 Enterprise. + +- **Windows 10, version 1803** updated Windows 10 subscription activation to enable pulling activation keys directly from firmware for devices that support firmware-embedded keys. It was no longer necessary to run a script to activate Windows 10 Pro before activating Enterprise. For virtual machines and hosts running Windows 10, version 1803, [inherited activation](#inherited-activation) was also enabled. + +- **Windows 10, version 1903** updated Windows 10 subscription activation to enable step up from Windows 10 Pro Education to Windows 10 Education for devices with a qualifying Windows 10 or Microsoft 365 subscription. + +- **Windows 11, version 21H2** updated subscription activation to work on both Windows 10 and Windows 11 devices. + + > [!IMPORTANT] + > Subscription activation doesn't update a device from Windows 10 to Windows 11. Only the edition is updated. ## Requirements -### Windows 10/11 Enterprise requirements +### Windows Enterprise requirements > [!NOTE] -> The following requirements do not apply to general Windows client activation on Azure. Azure activation requires a connection to Azure KMS only, and supports workgroup, Hybrid, and Azure AD-joined VMs. In most scenarios, activation of Azure VMs happens automatically. For more information, see [Understanding Azure KMS endpoints for Windows product activation of Azure Virtual Machines](/azure/virtual-machines/troubleshooting/troubleshoot-activation-problems#understanding-azure-kms-endpoints-for-windows-product-activation-of-azure-virtual-machines). +> The following requirements don't apply to general Windows client activation on Azure. Azure activation requires a connection to Azure KMS only. It supports workgroup, hybrid, and Azure AD-joined VMs. In most scenarios, activation of Azure VMs happens automatically. For more information, see [Understanding Azure KMS endpoints for Windows product activation of Azure virtual machines](/troubleshoot/azure/virtual-machines/troubleshoot-activation-problems). > [!IMPORTANT] -> Currently, Subscription Activation is only available on commercial tenants and is currently not available on US GCC, GCC High, or DoD tenants. +> Currently, subscription activation is only available on commercial tenants. It's currently not available on US GCC, GCC High, or DoD tenants. For Microsoft customers with Enterprise Agreements (EA) or Microsoft Products & Services Agreements (MPSA), you must have the following requirements: -- Windows 10 (Pro or Enterprise) version 1703 or later installed on the devices to be upgraded. Windows 11 is considered a "later" version in this context. -- Azure Active Directory (Azure AD) available for identity management. -- Devices must be Azure AD-joined or Hybrid Azure AD joined. Workgroup-joined or Azure AD registered devices aren't supported. +- A supported version of Windows Pro or Enterprise edition installed on the devices to be upgraded. +- Azure AD available for identity management. +- Devices must be Azure AD-joined or hybrid Azure AD joined. Workgroup-joined or Azure AD registered devices aren't supported. -For Microsoft customers that don't have EA or MPSA, you can obtain Windows 10 Enterprise E3/E5 or A3/A5 through a cloud solution provider (CSP). Identity management and device requirements are the same when you use CSP to manage licenses, with the exception that Windows 10/11 Enterprise E3 is also available through CSP to devices running Windows 10, version 1607. For more information about obtaining Windows 10/11 Enterprise E3 through your CSP, see [Windows 10 Enterprise E3 in CSP](windows-10-enterprise-e3-overview.md). +For Microsoft customers that don't have EA or MPSA, you can get Windows Enterprise E3/E5 or A3/A5 licenses through a cloud solution provider (CSP). Identity management and device requirements are the same when you use CSP to manage licenses. For more information about getting Windows Enterprise E3 through your CSP, see [Windows Enterprise E3 in CSP](windows-10-enterprise-e3-overview.md). -If devices are running Windows 7 or Windows 8.1, see [New Windows 10 upgrade benefits for Windows Cloud Subscriptions in CSP](https://www.microsoft.com/microsoft-365/blog/2017/01/19/new-windows-10-upgrade-benefits-windows-cloud-subscriptions-csp/) +### Windows Education requirements -#### Multifactor authentication - -An issue has been identified with Hybrid Azure AD-joined devices that have enabled [multifactor authentication](/azure/active-directory/authentication/howto-mfa-getstarted) (MFA). If a user signs into a device using their Active Directory account and MFA is enabled, the device won't successfully upgrade to their Windows Enterprise subscription. - -To resolve this issue: - -If the device is running Windows 10, version 1809 or later: - -- Windows 10, version 1809 must be updated with [KB4497934](https://support.microsoft.com/help/4497934/windows-10-update-kb4497934). Later versions of Windows 10 automatically include this patch. - -- When the user signs in on a Hybrid Azure AD joined device with MFA enabled, a notification will indicate that there's a problem. Select the notification and then select **Fix now** to step through the subscription activation process. See the example below: - - ![Subscription Activation with MFA example 1.](images/sa-mfa1.png)
- - ![Subscription Activation with MFA example 2.](images/sa-mfa2.png)
- - ![Subscription Activation with MFA example 3.](images/sa-mfa3.png) - -Organizations that use Azure Active Directory Conditional Access may want to exclude the Universal Store Service APIs and Web Application, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f from their all users all cloud apps MFA policy to avoid this issue. - -> [!NOTE] -> The above recommendation also applies to Azure AD joined devices. - -### Windows 10/11 Education requirements - -- Windows 10 Pro Education, version 1903 or later installed on the devices to be upgraded. -- A device with a Windows 10 Pro Education digital license. You can confirm this information in **Settings > Update & Security > Activation**. -- The Education tenant must have an active subscription to Microsoft 365 with a Windows 10 Enterprise license or a Windows 10 Enterprise or Education subscription. -- Devices must be Azure AD-joined or Hybrid Azure AD joined. Workgroup-joined or Azure AD registered devices aren't supported. +- A supported version of Windows Pro Education installed on the devices to be upgraded. +- A device with a Windows Pro Education digital license. You can confirm this information in **Settings > Update & Security > Activation**. +- The Education tenant must have an active subscription to Microsoft 365 with a Windows Enterprise license, or a Windows Enterprise or Education subscription. +- Devices must be Azure AD-joined or hybrid Azure AD joined. Workgroup-joined or Azure AD registered devices aren't supported. > [!IMPORTANT] > If Windows 10 Pro is converted to Windows 10 Pro Education by [using benefits available in Store for Education](/education/windows/change-to-pro-education#change-using-microsoft-store-for-education), then the feature will not work. You will need to re-image the device using a Windows 10 Pro Education edition. - ## Benefits -With Windows 10/11 Enterprise or Windows 10/11 Education, businesses and institutions can benefit from enterprise-level security and control. Previously, only organizations with a Microsoft Volume Licensing Agreement could deploy Windows 10/11 Education or Windows 10/11 Enterprise to their users. Now, with Windows 10/11 Enterprise E3 or A3 and E5 or A5 being available as a true online service, it's available in select channels thus allowing all organizations to take advantage of enterprise-grade Windows 10 features. To compare Windows 10 editions and review pricing, see the following: +With Windows Enterprise or Education editions, your organization can benefit from enterprise-level security and control. Previously, only organizations with a Microsoft Volume Licensing Agreement could deploy Education or Enterprise editions to their users. With Windows Enterprise E3/E5 or A3/A5 being available as an online service, it's available in select channels thus allowing all organizations to take advantage of enterprise-grade Windows features. + +To compare Windows 10 editions and review pricing, see the following sites: - [Compare Windows 10 editions](https://www.microsoft.com/windowsforbusiness/compare) -- [Enterprise Mobility + Security Pricing Options](https://www.microsoft.com/cloud-platform/enterprise-mobility-security-pricing) +- [Enterprise Mobility + Security Pricing Options](https://www.microsoft.com/microsoft-365/enterprise-mobility-security/compare-plans-and-pricing) You can benefit by moving to Windows as an online service in the following ways: -- Licenses for Windows 10 Enterprise and Education are checked based on Azure Active Directory (Azure AD) credentials, so now businesses have a systematic way to assign licenses to end users and groups in their organization. +- Licenses for Windows Enterprise and Education are checked based on Azure AD credentials. You have a systematic way to assign licenses to end users and groups in your organization. - User sign-in triggers a silent edition upgrade, with no reboot required. -- Support for mobile worker/BYOD activation; transition away from on-premises KMS and MAK keys. +- Support for mobile worker and "bring your own device" (BYOD) activation. This support transitions away from on-premises KMS and MAK keys. - Compliance support via seat assignment. -- Licenses can be updated to different users dynamically, enabling you to optimize your licensing investment against changing needs. +- Licenses can be updated to different users dynamically, which allows you to optimize your licensing investment against changing needs. ## How it works > [!NOTE] -> The following Windows 10 examples and scenarios also apply to Windows 11. +> The following examples use Windows 10 Pro to Enterprise edition. The examples also apply to Windows 11, and Education editions. -The device is Azure Active Directory-joined from **Settings > Accounts > Access work or school**. +The device is Azure AD-joined from **Settings > Accounts > Access work or school**. -The IT administrator assigns Windows 10 Enterprise to a user. See the following figure. +You assign Windows 10 Enterprise to a user: -![Windows 10 Enterprise.](images/ent.png) +![A screenshot of assigning a Windows 10 Enterprise license in the Microsoft 365 admin center.](images/ent.png) -When a licensed user signs in to a device that meets requirements using their Azure AD credentials, the operating system steps up from Windows 10 Pro to Windows 10 Enterprise (or Windows 10 Pro Education to Windows 10 Education) and all the appropriate Windows 10 Enterprise/Education features are unlocked. When a user's subscription expires or is transferred to another user, the device reverts seamlessly to Windows 10 Pro / Windows 10 Pro Education edition, once current subscription validity expires. - -Devices running Windows 10 Pro Education, version 1903 or later can get Windows 10 Enterprise or Education General Availability Channel on up to five devices for each user covered by the license. This benefit doesn't include Long Term Servicing Channel. - -The following figures summarize how the Subscription Activation model works: - -Before Windows 10, version 1903:
-![1703.](images/before.png) - -After Windows 10, version 1903:
-![1903.](images/after.png) +When a licensed user signs in to a device that meets requirements using their Azure AD credentials, Windows steps up from Pro edition to Enterprise. Then all of the Enterprise features are unlocked. When a user's subscription expires or is transferred to another user, the device reverts seamlessly to Windows 10 Pro edition, once the current subscription validity expires. > [!NOTE] -> -> - A Windows 10 Pro Education device will only step up to Windows 10 Education edition when "Windows 10 Enterprise" license is assigned from M365 Admin center (as of May 2019). -> -> - A Windows 10 Pro device will only step up to Windows 10 Enterprise edition when "Windows 10 Enterprise" license is assigned from M365 Admin center (as of May 2019). +> Devices running a supported version of Windows 10 Pro Education can get Windows 10 Enterprise or Education general availability channel on up to five devices for each user covered by the license. This benefit doesn't include the long term servicing channel. + +The following figure summarizes how the subscription activation model works: + +![Diagram of subscription activation.](images/after.png) + +> [!NOTE] +> +> - A Windows 10 Pro Education device will only step up to Windows 10 Education edition when you assign a **Windows 10 Enterprise** license from the Microsoft 365 admin center. +> +> - A Windows 10 Pro device will only step up to Windows 10 Enterprise edition when you assign a **Windows 10 Enterprise** license from the Microsoft 365 admin center. ### Scenarios #### Scenario #1 -You're using Windows 10, version 1803 or above, and purchased Windows 10 Enterprise E3 or E5 subscriptions (or have had an E3 or E5 subscription for a while but haven't yet deployed Windows 10 Enterprise). +You're using a supported version of Windows 10. You purchased Windows 10 Enterprise E3 or E5 subscriptions, or you've had an E3 or E5 subscription for a while but haven't yet deployed Windows 10 Enterprise. -All of your Windows 10 Pro devices will step-up to Windows 10 Enterprise, and devices that are already running Windows 10 Enterprise will migrate from KMS or MAK activated Enterprise edition to Subscription activated Enterprise edition when a Subscription Activation-enabled user signs in to the device. +All of your Windows 10 Pro devices will step-up to Windows 10 Enterprise. When a subscription activation-enabled user signs in, devices that are already running Windows 10 Enterprise will migrate from KMS or MAK activated Enterprise edition to subscription activated Enterprise edition. #### Scenario #2 -Using Azure AD-joined devices or Active Directory-joined devices running Windows 10 1709 or later, and with Azure AD synchronization configured, just follow the steps in [Deploy Windows 10 Enterprise licenses](deploy-enterprise-licenses.md) to acquire a $0 SKU and get a new Windows 10 Enterprise E3 or E5 license in Azure AD. Then, assign that license to all of your Azure AD users. These can be AD-synced accounts. The device will automatically change from Windows 10 Pro to Windows 10 Enterprise when that user signs in. +You're using Azure AD-joined devices or Active Directory-joined devices running a supported version of Windows 10. You configured Azure AD synchronization. You follow the steps in [Deploy Windows Enterprise licenses](deploy-enterprise-licenses.md) to get a $0 SKU, and get a new Windows 10 Enterprise E3 or E5 license in Azure AD. You then assign that license to all of your Azure AD users, which can be Active Directory-synced accounts. When that user signs in, the device will automatically change from Windows 10 Pro to Windows 10 Enterprise. -In summary, if you have a Windows 10 Enterprise E3 or E5 subscription, but are still running Windows 10 Pro, it's simple (and quick) to move to Windows 10 Enterprise using one of the scenarios above. +#### Earlier versions of Windows -If you're running Windows 7, it can be more work. A wipe-and-load approach works, but it's likely to be easier to upgrade from Windows 7 Pro directly to Windows 10 Enterprise. This path is supported, and completes the move in one step. This method also works if you're running Windows 8.1 Pro. +If devices are running Windows 7, more steps are required. A wipe-and-load approach still works, but it can be easier to upgrade from Windows 7 Pro directly to Windows 10 Enterprise edition. This path is supported, and completes the move in one step. This method also works for devices with Windows 8.1 Pro. ### Licenses The following policies apply to acquisition and renewal of licenses on devices: -- Devices that have been upgraded will attempt to renew licenses about every 30 days, and must be connected to the Internet to successfully acquire or renew a license. -- If a device is disconnected from the Internet until its current subscription expires, the operating system will revert to Windows 10/11 Pro or Windows 10/11 Pro Education. As soon as the device is connected to the Internet again, the license will automatically renew. -- Up to five devices can be upgraded for each user license. If the user license is used for a sixth device, the operating system on the computer to which a user hasn't logged in the longest will revert to Windows 10/11 Pro or Windows 10/11 Pro Education. + +- Devices that have been upgraded will attempt to renew licenses about every 30 days. They must be connected to the internet to successfully acquire or renew a license. + +- If a device is disconnected from the internet, until its current subscription expires Windows will revert to Pro or Pro Education. As soon as the device is connected to the internet again, the license will automatically renew. + +- Up to five devices can be upgraded for each user license. If the user license is used for a sixth device, on the computer to which a user hasn't logged for the longest time, Windows will revert to Pro or Pro Education. + - If a device meets the requirements and a licensed user signs in on that device, it will be upgraded. Licenses can be reallocated from one user to another user, allowing you to optimize your licensing investment against changing needs. -When you have the required Azure AD subscription, group-based licensing is the preferred method to assign Enterprise E3 and E5 licenses to users. For more information, see [Group-based licensing basics in Azure AD](/azure/active-directory/active-directory-licensing-whatis-azure-portal). +When you have the required Azure AD subscription, group-based licensing is the preferred method to assign Enterprise E3 and E5 licenses to users. For more information, see [Group-based licensing basics in Azure AD](/azure/active-directory/fundamentals/active-directory-licensing-whatis-azure-portal). ### Existing Enterprise deployments -If you're running Windows 10, version 1803 or later, Subscription Activation will automatically pull the firmware-embedded Windows 10 activation key and activate the underlying Pro License. The license will then step-up to Windows 10/11 Enterprise using Subscription Activation. This automatically migrates your devices from KMS or MAK activated Enterprise to Subscription activated Enterprise. +If you're running a supported version of Windows 10 or Windows 11, subscription activation will automatically pull the firmware-embedded Windows activation key and activate the underlying Pro license. The license will then step-up to Enterprise using subscription activation. This behavior automatically migrates your devices from KMS or MAK activated Enterprise to subscription activated Enterprise. -Subscription Activation doesn't remove the need to activate the underlying operating system, this is still a requirement for running a genuine installation of Windows. +Subscription activation doesn't remove the need to activate the underlying OS. This requirement still exists for running a genuine installation of Windows. > [!CAUTION] -> Firmware-embedded Windows 10 activation happens automatically only when we go through OOBE (Out Of Box Experience). +> Firmware-embedded Windows activation happens automatically only during Windows Setup out of box experience (OOBE). -If you're using Windows 10, version 1607, 1703, or 1709 and have already deployed Windows 10 Enterprise, but you want to move away from depending on KMS servers and MAK keys for Windows client machines, you can seamlessly transition as long as the computer has been activated with a firmware-embedded Windows 10 Pro product key. - -If the computer has never been activated with a Pro key, run the following script. Copy the text below into a `.cmd` file, and run the file from an elevated command prompt: - -```console -@echo off -FOR /F "skip=1" %%A IN ('wmic path SoftwareLicensingService get OA3xOriginalProductKey') DO ( -SET "ProductKey=%%A" -goto InstallKey -) - -:InstallKey -IF [%ProductKey%]==[] ( -echo No key present -) ELSE ( -echo Installing %ProductKey% -changepk.exe /ProductKey %ProductKey% -) -``` - -Since [WMIC was deprecated](/windows/win32/wmisdk/wmic) in Windows 10, version 21H1, you can use the following Windows PowerShell script instead: +If the computer has never been activated with a Pro key, use the following script from an elevated PowerShell console: ```powershell $(Get-WmiObject SoftwareLicensingService).OA3xOriginalProductKey | foreach{ if ( $null -ne $_ ) { Write-Host "Installing"$_;changepk.exe /Productkey $_ } else { Write-Host "No key present" } } @@ -252,17 +216,17 @@ $(Get-WmiObject SoftwareLicensingService).OA3xOriginalProductKey | foreach{ if ( ### Obtaining an Azure AD license -Enterprise Agreement/Software Assurance (EA/SA): +If your organization has an Enterprise Agreement (EA) or Software Assurance (SA): -- Organizations with a traditional EA must order a $0 SKU, process e-mails sent to the license administrator for the company, and assign licenses using Azure AD (ideally to groups using the new Azure AD Premium feature for group assignment). For more information, see [Enabling Subscription Activation with an existing EA](./deploy-enterprise-licenses.md#enabling-subscription-activation-with-an-existing-ea). +- Organizations with a traditional EA must order a $0 SKU, process e-mails sent to the license administrator for the company, and assign licenses using Azure AD. Ideally, you assign the licenses to groups using the Azure AD Premium feature for group assignment. For more information, see [Enable subscription activation with an existing EA](./deploy-enterprise-licenses.md#enabling-subscription-activation-with-an-existing-ea). -- The license administrator can assign seats to Azure AD users with the same process that is used for O365. +- The license administrator can assign seats to Azure AD users with the same process that's used for Microsoft 365 Apps. - New EA/SA Windows Enterprise customers can acquire both an SA subscription and an associated $0 cloud subscription. -Microsoft Products & Services Agreements (MPSA): +If your organization has a Microsoft Products & Services Agreement (MPSA): -- Organizations with MPSA are automatically emailed the details of the new service. They must take steps to process the instructions. +- New customers are automatically emailed the details of the service. Take steps to process the instructions. - Existing MPSA customers will receive service activation emails that allow their customer administrator to assign users to the service. @@ -270,16 +234,18 @@ Microsoft Products & Services Agreements (MPSA): ### Deploying licenses -See [Deploy Windows 10 Enterprise licenses](deploy-enterprise-licenses.md). +For more information, see [Deploy Windows Enterprise licenses](deploy-enterprise-licenses.md). ## Virtual Desktop Access (VDA) -Subscriptions to Windows 10/11 Enterprise are also available for virtualized clients. Windows 10/11 Enterprise E3 and E5 are available for Virtual Desktop Access (VDA) in Microsoft Azure or in another [qualified multitenant hoster](https://microsoft.com/en-us/CloudandHosting/licensing_sca.aspx). +Subscriptions to Windows Enterprise are also available for virtualized clients. Enterprise E3 and E5 are available for Virtual Desktop Access (VDA) in Microsoft Azure or in another [qualified multitenant hoster (QMTH)](https://download.microsoft.com/download/3/D/4/3D445779-2870-4E3D-AFCB-D35D2E1BC095/QMTH%20Authorized%20Partner%20List.pdf). Virtual machines (VMs) must be configured to enable Windows 10 Enterprise subscriptions for VDA. Active Directory-joined and Azure Active Directory-joined clients are supported. See [Enable VDA for Subscription Activation](vda-subscription-activation.md). -## Related articles +## Related sites -[Connect domain-joined devices to Azure AD for Windows 10 experiences](/azure/active-directory/devices/hybrid-azuread-join-plan)
-[Compare Windows 10 editions](https://www.microsoft.com/WindowsForBusiness/Compare)
-[Windows for business](https://www.microsoft.com/windowsforbusiness/default.aspx)
+Connect domain-joined devices to Azure AD for Windows experiences. For more information, see [Plan your hybrid Azure Active Directory join implementation](/azure/active-directory/devices/hybrid-azuread-join-plan) + +[Compare Windows editions](https://www.microsoft.com/windows/business/compare-windows-11) + +[Windows for business](https://www.microsoft.com/windows/business) diff --git a/windows/deployment/windows-autopatch/deploy/windows-autopatch-device-registration-overview.md b/windows/deployment/windows-autopatch/deploy/windows-autopatch-device-registration-overview.md index ede51bee83..a8ae09138a 100644 --- a/windows/deployment/windows-autopatch/deploy/windows-autopatch-device-registration-overview.md +++ b/windows/deployment/windows-autopatch/deploy/windows-autopatch-device-registration-overview.md @@ -1,6 +1,6 @@ --- title: Device registration overview -description: This article provides and overview on how to register devices in Autopatch +description: This article provides an overview on how to register devices in Autopatch ms.date: 09/07/2022 ms.prod: w11 ms.technology: windows @@ -44,7 +44,7 @@ See the following detailed workflow diagram. The diagram covers the Windows Auto | **Step 1: Identify devices** | IT admin identifies devices to be managed by the Windows Autopatch service. | | **Step 2: Add devices** | IT admin adds devices through direct membership or nests other Azure AD assigned or dynamic groups into the **Windows Autopatch Device Registration** Azure AD assigned group. | | **Step 3: Discover devices** | The Windows Autopatch Discover Devices function hourly discovers devices previously added by the IT admin into the **Windows Autopatch Device Registration** Azure AD assigned group in **step #2**. The Azure AD device ID is used by Windows Autopatch to query device attributes in both Microsoft Endpoint Manager-Intune and Azure AD when registering devices into its service.
  1. Once devices are discovered from the Azure AD group, the same function gathers additional device attributes and saves it into its memory during the discovery operation. The following device attributes are gathered from Azure AD in this step:
    1. **AzureADDeviceID**
    2. **OperatingSystem**
    3. **DisplayName (Device name)**
    4. **AccountEnabled**
    5. **RegistrationDateTime**
    6. **ApproximateLastSignInDateTime**
  2. In this same step, the Windows Autopatch discover devices function calls another function, the device prerequisite check function. The device prerequisite check function evaluates software-based device-level prerequisites to comply with Windows Autopatch device readiness requirements prior to registration.
| -| **Step 4: Check prerequisites** | The Windows Autopatch prerequisite function makes an Intune Graph API call to sequentially validate device readiness attributes required for the registration process. For detailed information, see the [Detailed prerequisite check workflow diagram](#detailed-prerequisite-check-workflow-diagram) section. The service checks the following device readiness attributes, and/or prerequisites:
  1. **Serial number, model, and manufacturer.**
    1. Checks if the serial number already exists in the Windows Autopatch’s managed device database.
  2. **If the device is Intune-managed or not.**
    1. Windows Autopatch looks to see **if the Azure AD device ID has an Intune device ID associated with it**.
      1. If **yes**, it means this device is enrolled into Intune.
      2. If **not**, it means the device isn't enrolled into Intune, hence it can't be managed by the Windows Autopatch service.
    2. **If the device is not managed by Intune**, the Windows Autopatch service can't gather device attributes such as operating system version, Intune enrollment date, device name and other attributes. When this happens, the Windows Autopatch service uses the Azure AD device attributes gathered and saved to its memory in **step 3a**.
      1. Once it has the device attributes gathered from Azure AD in **step 3a**, the device is flagged with the **Prerequisite failed** status, then added to the **Not registered** tab so the IT admin can review the reason(s) the device wasn't registered into Windows Autopatch. The IT admin will remediate these devices. In this case, the IT admin should check why the device wasn’t enrolled into Intune.
      2. A common reason is when the Azure AD device ID is stale, it doesn’t have an Intune device ID associated with it anymore. To remediate, [clean up any stale Azure AD device records from your tenant](windows-autopatch-register-devices.md#clean-up-dual-state-of-hybrid-azure-ad-joined-and-azure-registered-devices-in-your-azure-ad-tenant).
    3. **If the device is managed by Intune**, the Windows Autopatch prerequisite check function continues to the next prerequisite check, which evaluates whether the device has checked into Intune in the last 28 days.
  3. **If the device is a Windows device or not.**
    1. Windows Autopatch looks to see if the Azure AD device ID has an Intune device ID associated with it.
      1. **If yes**, it means this device is enrolled into Intune.
      2. **If not**, it means the device isn't enrolled into Intune, hence it can't be managed by the Windows Autopatch service.
  4. **Windows Autopatch checks the Windows SKU family**. The SKU must be either:
    1. **Enterprise**
    2. **Pro**
    3. **Pro Workstation**
  5. **If the device meets the operating system requirements**, Windows Autopatch checks whether the device is either:
    1. **Only managed by Intune.**
      1. If the device is only managed by Intune, the device is marked as Passed all prerequisites.
    2. **Co-managed by both Configuration Manager and Intune.**
      1. If the device is co-managed by both Configuration Manager and Intune, an additional prerequisite check is evaluated to determine if the device satisfies the co-management-enabled workloads required by Windows Autopatch to manage devices in a co-managed state. The required co-management workloads evaluated in this step are:
        1. **Windows Updates Policies**
        2. **Device Configuration**
        3. **Office Click to Run**
      2. If Windows Autopatch determines that one of these workloads isn’t enabled on the device, the service marks the device as **Prerequisite failed** and moves the device to the **Not registered** tab.
| +| **Step 4: Check prerequisites** | The Windows Autopatch prerequisite function makes an Intune Graph API call to sequentially validate device readiness attributes required for the registration process. For detailed information, see the [Detailed prerequisite check workflow diagram](#detailed-prerequisite-check-workflow-diagram) section. The service checks the following device readiness attributes, and/or prerequisites:
  1. **Serial number, model, and manufacturer.**
    1. Checks if the serial number already exists in the Windows Autopatch’s managed device database.
  2. **If the device is Intune-managed or not.**
    1. Windows Autopatch looks to see **if the Azure AD device ID has an Intune device ID associated with it**.
      1. If **yes**, it means this device is enrolled into Intune.
      2. If **not**, it means the device isn't enrolled into Intune, hence it can't be managed by the Windows Autopatch service.
    2. **If the device is not managed by Intune**, the Windows Autopatch service can't gather device attributes such as operating system version, Intune enrollment date, device name and other attributes. When this happens, the Windows Autopatch service uses the Azure AD device attributes gathered and saved to its memory in **step 3a**.
      1. Once it has the device attributes gathered from Azure AD in **step 3a**, the device is flagged with the **Prerequisite failed** status, then added to the **Not registered** tab so the IT admin can review the reason(s) the device wasn't registered into Windows Autopatch. The IT admin will remediate these devices. In this case, the IT admin should check why the device wasn’t enrolled into Intune.
      2. A common reason is when the Azure AD device ID is stale, it doesn’t have an Intune device ID associated with it anymore. To remediate, [clean up any stale Azure AD device records from your tenant](windows-autopatch-register-devices.md#clean-up-dual-state-of-hybrid-azure-ad-joined-and-azure-registered-devices-in-your-azure-ad-tenant).
    3. **If the device is managed by Intune**, the Windows Autopatch prerequisite check function continues to the next prerequisite check, which evaluates whether the device has checked into Intune in the last 28 days.
  3. **If the device is a Windows device or not.**
    1. Windows Autopatch looks to see if the device is a Windows and corporate-owned device.
      1. **If yes**, it means this device can be registered with the service because it's a Windows corporate-owned device.
      2. **If not**, it means the device is a non-Windows device, or it's a Windows device but it's a personal device.
  4. **Windows Autopatch checks the Windows SKU family**. The SKU must be either:
    1. **Enterprise**
    2. **Pro**
    3. **Pro Workstation**
  5. **If the device meets the operating system requirements**, Windows Autopatch checks whether the device is either:
    1. **Only managed by Intune.**
      1. If the device is only managed by Intune, the device is marked as Passed all prerequisites.
    2. **Co-managed by both Configuration Manager and Intune.**
      1. If the device is co-managed by both Configuration Manager and Intune, an additional prerequisite check is evaluated to determine if the device satisfies the co-management-enabled workloads required by Windows Autopatch to manage devices in a co-managed state. The required co-management workloads evaluated in this step are:
        1. **Windows Updates Policies**
        2. **Device Configuration**
        3. **Office Click to Run**
      2. If Windows Autopatch determines that one of these workloads isn’t enabled on the device, the service marks the device as **Prerequisite failed** and moves the device to the **Not registered** tab.
| | **Step 5: Calculate deployment ring assignment** | Once the device passes all prerequisites described in **step #4**, Windows Autopatch starts its deployment ring assignment calculation. The following logic is used to calculate the Windows Autopatch deployment ring assignment:
  1. If the Windows Autopatch tenant’s existing managed device size is **≤ 200**, the deployment ring assignment is **First (5%)**, **Fast (15%)**, remaining devices go to the **Broad ring (80%)**.
  2. If the Windows Autopatch tenant’s existing managed device size is **>200**, the deployment ring assignment will be **First (1%)**, **Fast (9%)**, remaining devices go to the **Broad ring (90%)**.
| | **Step 6: Assign devices to a deployment ring group** | Once the deployment ring calculation is done, Windows Autopatch assigns devices to one of the following deployment ring groups:
  1. **Modern Workplace Devices-Windows Autopatch-First**
    1. The Windows Autopatch device registration process doesn’t automatically assign devices to the Test ring represented by the Azure AD group (Modern Workplace Devices-Windows Autopatch-Test). It’s important that you assign devices to the Test ring to validate the update deployments before the updates are deployed to a broader population of devices.
  2. **Modern Workplace Devices-Windows Autopatch-Fast**
  3. **Modern Workplace Devices-Windows Autopatch-Broad**
| | **Step 7: Assign devices to an Azure AD group** | Windows Autopatch also assigns devices to the following Azure AD groups when certain conditions apply:
  1. **Modern Workplace Devices - All**
    1. This group has all devices managed by Windows Autopatch.
  2. When registering **Windows 10 devices**, use **Modern Workplace Devices Dynamic - Windows 10**
    1. This group has all devices managed by Windows Autopatch and that have Windows 10 installed.
  3. When registering **Windows 11 devices**, use **Modern Workplace Devices Dynamic - Windows 11**
    1. This group has all devices managed by Windows Autopatch and that have Windows 11 installed.
  4. When registering **virtual devices**, use **Modern Workplace Devices - Virtual Machine**
    1. This group has all virtual devices managed by Windows Autopatch.
    | diff --git a/windows/deployment/windows-autopatch/overview/windows-autopatch-faq.yml b/windows/deployment/windows-autopatch/overview/windows-autopatch-faq.yml index 0ab881bf82..df7c2b8966 100644 --- a/windows/deployment/windows-autopatch/overview/windows-autopatch-faq.yml +++ b/windows/deployment/windows-autopatch/overview/windows-autopatch-faq.yml @@ -71,6 +71,9 @@ sections: - question: Can I run Autopatch on my Windows 365 Business Workloads? answer: | No. Autopatch is only available on enterprise workloads. For more information, see [Windows Autopatch on Windows 365 Enterprise Workloads](/windows/deployment/windows-autopatch/deploy/windows-autopatch-register-devices#windows-autopatch-on-windows-365-enterprise-workloads). + - question: Can you change the policies and configurations created by Windows Autopatch? + answer: | + No. Don't change, edit, add to, or remove any of the configurations. Doing so might cause unintended configuration conflicts and impact the Windows Autopatch service. For more information about policies and configurations, see [Changes made at tenant enrollment](/windows/deployment/windows-autopatch/references/windows-autopatch-changes-to-tenant). - name: Update Management questions: - question: What systems does Windows Autopatch update? diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 9acf3787ce..63ab9a4a86 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -159,7 +159,7 @@ items: - name: Personal Data Encryption (PDE) overview href: information-protection/personal-data-encryption/overview-pde.md - - name: Personal Data Encryption (PDE) (FAQ) + - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) href: information-protection/personal-data-encryption/faq-pde.yml - name: Configure Personal Data Encryption (PDE) in Intune href: information-protection/personal-data-encryption/configure-pde-in-intune.md diff --git a/windows/security/identity-protection/hello-for-business/hello-biometrics-in-enterprise.md b/windows/security/identity-protection/hello-for-business/hello-biometrics-in-enterprise.md index d057f242cd..c2527f8e0d 100644 --- a/windows/security/identity-protection/hello-for-business/hello-biometrics-in-enterprise.md +++ b/windows/security/identity-protection/hello-for-business/hello-biometrics-in-enterprise.md @@ -15,6 +15,7 @@ manager: aaroncz appliesto: - ✅ Windows 10 - ✅ Windows 11 +- ✅ Windows Holographic for Business --- # Windows Hello biometrics in the enterprise @@ -27,61 +28,71 @@ Windows Hello is the biometric authentication feature that helps strengthen auth Because we realize your employees are going to want to use this new technology in your enterprise, we've been actively working with the device manufacturers to create strict design and performance recommendations that help to ensure that you can more confidently introduce Windows Hello biometrics into your organization. ## How does Windows Hello work? -Windows Hello lets your employees use fingerprint or facial recognition as an alternative method to unlocking a device. With Windows Hello, authentication happens when the employee provides his or her unique biometric identifier while accessing the device-specific Windows Hello credentials. + +Windows Hello lets your employees use fingerprint, facial recognition, or iris recognition as an alternative method to unlocking a device. With Windows Hello, authentication happens when the employee provides his or her unique biometric identifier while accessing the device-specific Windows Hello credentials. The Windows Hello authenticator works to authenticate and allow employees onto your enterprise network. Authentication doesn't roam among devices, isn't shared with a server, and can't easily be extracted from a device. If multiple employees share a device, each employee will use his or her own biometric data on the device. ## Why should I let my employees use Windows Hello? + Windows Hello provides many benefits, including: -- It helps to strengthen your protections against credential theft. Because an attacker must have both the device and the biometric info or PIN, it's much more difficult to gain access without the employee's knowledge. +- It helps to strengthen your protections against credential theft. Because an attacker must have both the device and the biometric info or PIN, it's much more difficult to gain access without the employee's knowledge. -- Employees get a simple authentication method (backed up with a PIN) that's always with them, so there's nothing to lose. No more forgetting passwords! +- Employees get a simple authentication method (backed up with a PIN) that's always with them, so there's nothing to lose. No more forgetting passwords! -- Support for Windows Hello is built into the operating system so you can add additional biometric devices and polices as part of a coordinated rollout or to individual employees or groups using Group Policy or Mobile Device Management (MDM) configurations service provider (CSP) policies.
    For more info about the available Group Policies and MDM CSPs, see the [Implement Windows Hello for Business in your organization](hello-manage-in-organization.md) topic. +- Support for Windows Hello is built into the operating system so you can add additional biometric devices and policies as part of a coordinated rollout or to individual employees or groups using Group Policy or Mobile Device Management (MDM) configurations service provider (CSP) policies.
    For more info about the available Group Policies and MDM CSPs, see the [Implement Windows Hello for Business in your organization](hello-manage-in-organization.md) topic. ## Where is Windows Hello data stored? + The biometric data used to support Windows Hello is stored on the local device only. It doesn't roam and is never sent to external devices or servers. This separation helps to stop potential attackers by providing no single collection point that an attacker could potentially compromise to steal biometric data. Additionally, even if an attacker was actually able to get the biometric data from a device, it cannot be converted back into a raw biometric sample that could be recognized by the biometric sensor. > [!NOTE] >Each sensor on a device will have its own biometric database file where template data is stored. Each database has a unique, randomly generated key that is encrypted to the system. The template data for the sensor will be encrypted with this per-database key using AES with CBC chaining mode. The hash is SHA256. Some fingerprint sensors have the capability to complete matching on the fingerprint sensor module instead of in the OS. These sensors will store biometric data on the fingerprint module instead of in the database file. ## Has Microsoft set any device requirements for Windows Hello? + We've been working with the device manufacturers to help ensure a high-level of performance and protection is met by each sensor and device, based on these requirements: -- **False Accept Rate (FAR).** Represents the instance a biometric identification solution verifies an unauthorized person. This is normally represented as a ratio of number of instances in a given population size, for example 1 in 100 000. This can also be represented as a percentage of occurrence, for example, 0.001%. This measurement is heavily considered the most important with regard to the security of the biometric algorithm. +- **False Accept Rate (FAR).** Represents the instance a biometric identification solution verifies an unauthorized person. This is normally represented as a ratio of number of instances in a given population size, for example 1 in 100 000. This can also be represented as a percentage of occurrence, for example, 0.001%. This measurement is heavily considered the most important with regard to the security of the biometric algorithm. -- **False Reject Rate (FRR).** Represents the instances a biometric identification solution fails to verify an authorized person correctly. Usually represented as a percentage, the sum of the True Accept Rate and False Reject Rate is 1. Can be with or without anti-spoofing or liveness detection. +- **False Reject Rate (FRR).** Represents the instances a biometric identification solution fails to verify an authorized person correctly. Usually represented as a percentage, the sum of the True Accept Rate and False Reject Rate is 1. Can be with or without anti-spoofing or liveness detection. ### Fingerprint sensor requirements -To allow fingerprint matching, you must have devices with fingerprint sensors and software. Fingerprint sensors, or sensors that use an employee's unique fingerprint as an alternative log on option, can be touch sensors (large area or small area) or swipe sensors. Each type of sensor has its own set of detailed requirements that must be implemented by the manufacturer, but all of the sensors must include anti-spoofing measures (required). + +To allow fingerprint matching, you must have devices with fingerprint sensors and software. Fingerprint sensors, or sensors that use an employee's unique fingerprint as an alternative logon option, can be touch sensors (large area or small area) or swipe sensors. Each type of sensor has its own set of detailed requirements that must be implemented by the manufacturer, but all of the sensors must include anti-spoofing measures (required). **Acceptable performance range for small to large size touch sensors** -- False Accept Rate (FAR): <0.001 – 0.002% +- False Accept Rate (FAR): <0.001 – 0.002% -- Effective, real world FRR with Anti-spoofing or liveness detection: <10% +- Effective, real world FRR with Anti-spoofing or liveness detection: <10% **Acceptable performance range for swipe sensors** -- False Accept Rate (FAR): <0.002% +- False Accept Rate (FAR): <0.002% -- Effective, real world FRR with Anti-spoofing or liveness detection: <10% +- Effective, real world FRR with Anti-spoofing or liveness detection: <10% ### Facial recognition sensors + To allow facial recognition, you must have devices with integrated special infrared (IR) sensors and software. Facial recognition sensors use special cameras that see in IR light, letting them tell the difference between a photo and a living person while scanning an employee's facial features. These sensors, like the fingerprint sensors, must also include anti-spoofing measures (required) and a way to configure them (optional). -- False Accept Rate (FAR): <0.001% +- False Accept Rate (FAR): <0.001% -- False Reject Rate (FRR) without Anti-spoofing or liveness detection: <5% +- False Reject Rate (FRR) without Anti-spoofing or liveness detection: <5% -- Effective, real world FRR with Anti-spoofing or liveness detection: <10% +- Effective, real world FRR with Anti-spoofing or liveness detection: <10% > [!NOTE] >Windows Hello face authentication does not currently support wearing a mask during enrollment or authentication. Wearing a mask to enroll is a security concern because other users wearing a similar mask may be able to unlock your device. The product group is aware of this behavior and is investigating this topic further. Please remove a mask if you are wearing one when you enroll or unlock with Windows Hello face authentication. If your working environment doesn’t allow you to remove a mask temporarily, please consider unenrolling from face authentication and only using PIN or fingerprint. +### Iris recognition sensor requirements + +To use Iris authentication, you’ll need a [HoloLens 2 device](/hololens/). All HoloLens 2 editions are equipped with the same sensors. Iris is implemented the same way as other Windows Hello technologies and achieves biometrics security FAR of 1/100K. ## Related topics + - [Windows Hello for Business](hello-identity-verification.md) - [How Windows Hello for Business works](hello-how-it-works.md) - [Manage Windows Hello for Business in your organization](hello-manage-in-organization.md) @@ -90,12 +101,3 @@ To allow facial recognition, you must have devices with integrated special infra - [Windows Hello and password changes](hello-and-password-changes.md) - [Windows Hello errors during PIN creation](hello-errors-during-pin-creation.md) - [Event ID 300 - Windows Hello successfully created](hello-event-300.md) - - - - - - - - - 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/identity-protection/hello-for-business/hello-overview.md b/windows/security/identity-protection/hello-for-business/hello-overview.md index 1981ba37e3..6efd13da5a 100644 --- a/windows/security/identity-protection/hello-for-business/hello-overview.md +++ b/windows/security/identity-protection/hello-for-business/hello-overview.md @@ -14,6 +14,7 @@ localizationpriority: medium appliesto: - ✅ Windows 10 - ✅ Windows 11 +- ✅ Windows Holographic for Business --- # Windows Hello for Business Overview @@ -46,6 +47,7 @@ As an administrator in an enterprise or educational organization, you can create - **Facial recognition**. This type of biometric recognition uses special cameras that see in IR light, which allows them to reliably tell the difference between a photograph or scan and a living person. Several vendors are shipping external cameras that incorporate this technology, and major laptop manufacturers are incorporating it into their devices, as well. - **Fingerprint recognition**. This type of biometric recognition uses a capacitive fingerprint sensor to scan your fingerprint. Fingerprint readers have been available for Windows computers for years, but the current generation of sensors is more reliable and less error-prone. Most existing fingerprint readers work with Windows 10 and Windows 11, whether they're external or integrated into laptops or USB keyboards. +- **Iris Recognition**. This type of biometric recognition uses cameras to perform scan of your iris. HoloLens 2 is the first Microsoft device to introduce an Iris scanner. These iris scanners are the same across all HoloLens 2 devices. Windows stores biometric data that is used to implement Windows Hello securely on the local device only. The biometric data doesn't roam and is never sent to external devices or servers. Because Windows Hello only stores biometric identification data on the device, there's no single collection point an attacker can compromise to steal biometric data. For more information about biometric authentication with Windows Hello for Business, see [Windows Hello biometrics in the enterprise](hello-biometrics-in-enterprise.md). 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..50d55f1b6b 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,16 @@ 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. + +:::image type="content" source="images/bl-narrator.png" alt-text="A screenshot of the BitLocker recovery screen showing Narrator activated."::: ## 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/personal-data-encryption/faq-pde.yml b/windows/security/information-protection/personal-data-encryption/faq-pde.yml index 49b38650ce..744161659e 100644 --- a/windows/security/information-protection/personal-data-encryption/faq-pde.yml +++ b/windows/security/information-protection/personal-data-encryption/faq-pde.yml @@ -30,25 +30,25 @@ sections: - question: Can an IT admin specify which files should be encrypted? answer: | - Yes, but it can only be done using the PDE APIs. + Yes, but it can only be done using the [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager). - question: Do I need to use OneDrive as my backup provider? answer: | - No. PDE doesn't have a requirement for a backup provider including OneDrive. However, backups are strongly recommended in case the encryption keys used by PDE are lost. OneDrive is a recommended backup provider. + No. PDE doesn't have a requirement for a backup provider including OneDrive. However, backups are strongly recommended in case the keys used by PDE to decrypt files are lost. OneDrive is a recommended backup provider. - question: What is the relation between Windows Hello for Business and PDE? answer: | - Windows Hello for Business unlocks PDE encryption keys during user sign on. + During user sign-on, Windows Hello for Business unlocks the keys that PDE uses to decrypt files. - question: Can a file be encrypted with both PDE and EFS at the same time? answer: | No. PDE and EFS are mutually exclusive. - - question: Can a PDE encrypted files be accessed after signing on via a Remote Desktop connection (RDP)? + - question: Can PDE encrypted files be accessed after signing on via a Remote Desktop connection (RDP)? answer: | No. Accessing PDE encrypted files over RDP isn't currently supported. - - question: Can a PDE encrypted files be access via a network share? + - question: Can PDE encrypted files be access via a network share? answer: | No. PDE encrypted files can only be accessed after signing on locally to Windows with Windows Hello for Business credentials. @@ -62,11 +62,11 @@ sections: - question: If a user signs into Windows with a password instead of Windows Hello for Business, will they be able to access their PDE encrypted files? answer: | - No. PDE encryption keys are protected Windows Hello for Business credentials and will only be unlocked when signing on with Windows Hello for Business PIN or biometrics. + No. The keys used by PDE to decrypt files are protected by Windows Hello for Business credentials and will only be unlocked when signing on with Windows Hello for Business PIN or biometrics. - question: What encryption method and strength does PDE use? answer: | - PDE uses AES-256 to encrypt files + PDE uses AES-CBC with a 256-bit key to encrypt files additionalContent: | ## See also diff --git a/windows/security/information-protection/personal-data-encryption/overview-pde.md b/windows/security/information-protection/personal-data-encryption/overview-pde.md index 90896a5bd7..fb78dc475b 100644 --- a/windows/security/information-protection/personal-data-encryption/overview-pde.md +++ b/windows/security/information-protection/personal-data-encryption/overview-pde.md @@ -1,6 +1,6 @@ --- title: Personal Data Encryption (PDE) -description: Personal Data Encryption unlocks user encrypted files at user sign in instead of at boot. +description: Personal Data Encryption unlocks user encrypted files at user sign-in instead of at boot. author: frankroj ms.author: frankroj @@ -40,19 +40,19 @@ ms.date: 09/22/2022 - [BitLocker Drive Encryption](../bitlocker/bitlocker-overview.md) enabled - Although PDE will work without BitLocker, it's recommended to also enable BitLocker. PDE is meant to supplement BitLocker and not replace it. - Backup solution such as [OneDrive](/onedrive/onedrive) - - In certain scenarios such as TPM resets or destructive PIN resets, the PDE encryption keys can be lost. In such scenarios, any file encrypted with PDE will no longer be accessible. The only way to recover such files would be from backup. + - In certain scenarios such as TPM resets or destructive PIN resets, the keys used by PDE to decrypt files can be lost. In such scenarios, any file encrypted with PDE will no longer be accessible. The only way to recover such files would be from backup. - [Windows Hello for Business PIN reset service](../../identity-protection/hello-for-business/hello-feature-pin-reset.md) - - Destructive PIN resets will cause PDE encryption keys to be lost. The destructive PIN reset will make any file encrypted with PDE no longer accessible after a destructive PIN reset. Files encrypted with PDE will need to be recovered from a backup after a destructive PIN reset. For this reason Windows Hello for Business PIN reset service is recommended since it provides non-destructive PIN resets. + - Destructive PIN resets will cause keys used by PDE to decrypt files to be lost. The destructive PIN reset will make any file encrypted with PDE no longer accessible after a destructive PIN reset. Files encrypted with PDE will need to be recovered from a backup after a destructive PIN reset. For this reason Windows Hello for Business PIN reset service is recommended since it provides non-destructive PIN resets. - [Windows Hello Enhanced Sign-in Security](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security) - Provides additional security when authenticating with Windows Hello for Business via biometrics or PIN - [Kernel and user mode crash dumps disabled](/windows/client-management/mdm/policy-csp-memorydump) - - Crash dumps can potentially cause the PDE encryption keys to be exposed. For greatest security, disable kernel and user mode crash dumps. For information on disabling crash dumbs via Intune, see [Disable crash dumps](configure-pde-in-intune.md#disable-crash-dumps). + - Crash dumps can potentially cause the keys used by PDE decrypt files to be exposed. For greatest security, disable kernel and user mode crash dumps. For information on disabling crash dumbs via Intune, see [Disable crash dumps](configure-pde-in-intune.md#disable-crash-dumps). - [Hibernation disabled](/windows/client-management/mdm/policy-csp-power#power-allowhibernate) - - Hibernation files can potentially cause the PDE encryption keys to be exposed. For greatest security, disable hibernation. For information on disabling crash dumbs via Intune, see [Disable hibernation](configure-pde-in-intune.md#disable-hibernation). + - Hibernation files can potentially cause the keys used by PDE to decrypt files to be exposed. For greatest security, disable hibernation. For information on disabling crash dumbs via Intune, see [Disable hibernation](configure-pde-in-intune.md#disable-hibernation). ## PDE protection levels -PDE uses AES-256 to encrypt files and offers two levels of protection. The level of protection is determined based on the organizational needs. These levels can be set via the PDE APIs. +PDE uses AES-CBC with a 256-bit key to encrypt files and offers two levels of protection. The level of protection is determined based on the organizational needs. These levels can be set via the [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager). | Item | Level 1 | Level 2 | |---|---|---| @@ -94,15 +94,15 @@ For information on enabling PDE via Intune, see [Enable Personal Data Encryption | Item | PDE | BitLocker | |--|--|--| -| Release of encryption keys | At user sign in via Windows Hello for Business | At boot | -| Encryption keys discarded | At user sign out | At reboot | +| Release of key | At user sign-in via Windows Hello for Business | At boot | +| Keys discarded | At user sign-out | At reboot | | Files encrypted | Individual specified files | Entire volume/drive | | Authentication to access encrypted file | Windows Hello for Business | When BitLocker with PIN is enabled, BitLocker PIN plus Windows sign in | | Accessibility | Windows Hello for Business is accessibility friendly | BitLocker with PIN doesn't have accessibility features | ## Differences between PDE and EFS -The main difference between encrypting files with PDE instead of EFS is the method they use to encrypt the file. PDE uses Windows Hello for Business to secure the encryption keys that encrypts the files. EFS uses certificates to secure and encrypt the files. +The main difference between encrypting files with PDE instead of EFS is the method they use to encrypt the file. PDE uses Windows Hello for Business to secure the keys to decrypt the files. EFS uses certificates to secure and encrypt the files. To see if a file is encrypted with PDE or EFS: @@ -118,9 +118,7 @@ Encryption information including what encryption method is being used can be obt ## Disable PDE and decrypt files -Currently there's no method to disable PDE via MDM policy. However, PDE can be disabled locally and files can be decrypted using `cipher.exe`. - -In certain scenarios a user may be able to manually decrypt a file using the following steps: +Currently there's no method to disable PDE via MDM policy. However, in certain scenarios PDE encrypted files can be decrypted using `cipher.exe` using the following steps: 1. Open the properties of the file 2. Under the **General** tab, select **Advanced...** @@ -139,4 +137,4 @@ Certain Windows applications support PDE out of the box. If PDE is enabled on a ## See also - [Personal Data Encryption (PDE) FAQ](faq-pde.yml) -- [Configure Personal Data Encryption (PDE) polices in Intune](configure-pde-in-intune.md) \ No newline at end of file +- [Configure Personal Data Encryption (PDE) polices in Intune](configure-pde-in-intune.md) 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/microsoft-defender-application-guard/configure-md-app-guard.md b/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md index d9221e9bca..382528bfa0 100644 --- a/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md +++ b/windows/security/threat-protection/microsoft-defender-application-guard/configure-md-app-guard.md @@ -56,15 +56,15 @@ These settings, located at `Computer Configuration\Administrative Templates\Wind |Name|Supported versions|Description|Options| |-----------|------------------|-----------|-------| -|Configure Microsoft Defender Application Guard clipboard settings|Windows 10 Enterprise, 1709 or higher

    Windows 10 Pro, 1803 or higher

    Windows 11|Determines whether Application Guard can use the clipboard functionality.|**Enabled.** This is effective only in managed mode. Turns On the clipboard functionality and lets you choose whether to additionally:
    - Disable the clipboard functionality completely when Virtualization Security is enabled.
    - Enable copying of certain content from Application Guard into Microsoft Edge.
    - Enable copying of certain content from Microsoft Edge into Application Guard. **Important:** Allowing copied content to go from Microsoft Edge into Application Guard can cause potential security risks and isn't recommended.

    **Disabled or not configured.** Completely turns Off the clipboard functionality for Application Guard.| -|Configure Microsoft Defender Application Guard print settings|Windows 10 Enterprise, 1709 or higher

    Windows 10 Pro, 1803 or higher

    Windows 11|Determines whether Application Guard can use the print functionality.|**Enabled.** This is effective only in managed mode. Turns On the print functionality and lets you choose whether to additionally:
    - Enable Application Guard to print into the XPS format.
    - Enable Application Guard to print into the PDF format.
    - Enable Application Guard to print to locally attached printers.
    - Enable Application Guard to print from previously connected network printers. Employees can't search for other printers.

    **Disabled or not configured.** Completely turns Off the print functionality for Application Guard.| -|Allow Persistence|Windows 10 Enterprise, 1709 or higher

    Windows 10 Pro, 1803 or higher

    Windows 11|Determines whether data persists across different sessions in Microsoft Defender Application Guard.|**Enabled.** This is effective only in managed mode. Application Guard saves user-downloaded files and other items (such as, cookies, Favorites, and so on) for use in future Application Guard sessions.

    **Disabled or not configured.** All user data within Application Guard is reset between sessions.

    **NOTE**: If you later decide to stop supporting data persistence for your employees, you can use our Windows-provided utility to reset the container and to discard any personal data.

    **To reset the container:**
    1. Open a command-line program and navigate to `Windows/System32`.
    2. Type `wdagtool.exe cleanup`. The container environment is reset, retaining only the employee-generated data.
    3. Type `wdagtool.exe cleanup RESET_PERSISTENCE_LAYER`. The container environment is reset, including discarding all employee-generated data.| -|Turn on Microsoft Defender Application Guard in Managed Mode|Windows 10 Enterprise, 1809 or higher

    Windows 11|Determines whether to turn on Application Guard for Microsoft Edge and Microsoft Office.|**Enabled.** Turns on Application Guard for Microsoft Edge and/or Microsoft Office, honoring the network isolation settings, rendering untrusted content in the Application Guard container. Application Guard won't actually be turned on unless the required prerequisites and network isolation settings are already set on the device. Available options:
    - Enable Microsoft Defender Application Guard only for Microsoft Edge
    - Enable Microsoft Defender Application Guard only for Microsoft Office
    - Enable Microsoft Defender Application Guard for both Microsoft Edge and Microsoft Office

    **Disabled.** Turns off Application Guard, allowing all apps to run in Microsoft Edge and Microsoft Office.

    **Note:** For Windows 10, if you have KB5014666 installed, and for Windows 11, if you have KB5014668 installed, you are no longer required to configure network isolation policy to enable Application Guard for Edge.| -|Allow files to download to host operating system|Windows 10 Enterprise, 1803 or higher

    Windows 11|Determines whether to save downloaded files to the host operating system from the Microsoft Defender Application Guard container.|**Enabled.** This is effective only in managed mode. Allows users to save downloaded files from the Microsoft Defender Application Guard container to the host operating system. This action creates a share between the host and container that also allows for uploads from the host to the Application Guard container.

    **Disabled or not configured.** Users aren't able to save downloaded files from Application Guard to the host operating system.| -|Allow hardware-accelerated rendering for Microsoft Defender Application Guard|Windows 10 Enterprise, 1803 or higher

    Windows 10 Pro, 1803 or higher

    Windows 11|Determines whether Microsoft Defender Application Guard renders graphics using hardware or software acceleration.|**Enabled.** This is effective only in managed mode. Microsoft Defender Application Guard uses Hyper-V to access supported, high-security rendering graphics hardware (GPUs). These GPUs improve rendering performance and battery life while using Microsoft Defender Application Guard, particularly for video playback and other graphics-intensive use cases. If this setting is enabled without connecting any high-security rendering graphics hardware, Microsoft Defender Application Guard will automatically revert to software-based (CPU) rendering. **Important:** Enabling this setting with potentially compromised graphics devices or drivers might pose a risk to the host device.

    **Disabled or not configured.** Microsoft Defender Application Guard uses software-based (CPU) rendering and won’t load any third-party graphics drivers or interact with any connected graphics hardware.| -|Allow camera and microphone access in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher

    Windows 10 Pro, 1809 or higher

    Windows 11|Determines whether to allow camera and microphone access inside Microsoft Defender Application Guard.|**Enabled.** This is effective only in managed mode. Applications inside Microsoft Defender Application Guard are able to access the camera and microphone on the user's device. **Important:** Enabling this policy with a potentially compromised container could bypass camera and microphone permissions and access the camera and microphone without the user's knowledge.

    **Disabled or not configured.** Applications inside Microsoft Defender Application Guard are unable to access the camera and microphone on the user's device.| -|Allow Microsoft Defender Application Guard to use Root Certificate Authorities from a user's device|Windows 10 Enterprise, 1809 or higher

    Windows 10 Pro, 1809 or higher

    Windows 11|Determines whether Root Certificates are shared with Microsoft Defender Application Guard.|**Enabled.** Certificates matching the specified thumbprint are transferred into the container. Use a comma to separate multiple certificates.

    **Disabled or not configured.** Certificates aren't shared with Microsoft Defender Application Guard.| -|Allow auditing events in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher

    Windows 10 Pro, 1809 or higher

    Windows 11|This policy setting allows you to decide whether auditing events can be collected from Microsoft Defender Application Guard.|**Enabled.** This is effective only in managed mode. Application Guard inherits auditing policies from your device and logs system events from the Application Guard container to your host.

    **Disabled or not configured.** Event logs aren't collected from your Application Guard container.| +|Configure Microsoft Defender Application Guard clipboard settings|Windows 10 Enterprise, 1709 or higher

    Windows 11 Enterprise|Determines whether Application Guard can use the clipboard functionality.|**Enabled.** This is effective only in managed mode. Turns on the clipboard functionality and lets you choose whether to additionally:
    - Disable the clipboard functionality completely when Virtualization Security is enabled.
    - Enable copying of certain content from Application Guard into Microsoft Edge.
    - Enable copying of certain content from Microsoft Edge into Application Guard. **Important:** Allowing copied content to go from Microsoft Edge into Application Guard can cause potential security risks and isn't recommended.

    **Disabled or not configured.** Completely turns off the clipboard functionality for Application Guard.| +|Configure Microsoft Defender Application Guard print settings|Windows 10 Enterprise, 1709 or higher

    Windows 11 Enterprise|Determines whether Application Guard can use the print functionality.|**Enabled.** This is effective only in managed mode. Turns on the print functionality and lets you choose whether to additionally:
    - Enable Application Guard to print into the XPS format.
    - Enable Application Guard to print into the PDF format.
    - Enable Application Guard to print to locally attached printers.
    - Enable Application Guard to print from previously connected network printers. Employees can't search for other printers.

    **Disabled or not configured.** Completely turns Off the print functionality for Application Guard.| +|Allow Persistence|Windows 10 Enterprise, 1709 or higher

    Windows 11 Enterprise|Determines whether data persists across different sessions in Microsoft Defender Application Guard.|**Enabled.** This is effective only in managed mode. Application Guard saves user-downloaded files and other items (such as, cookies, Favorites, and so on) for use in future Application Guard sessions.

    **Disabled or not configured.** All user data within Application Guard is reset between sessions.

    **NOTE**: If you later decide to stop supporting data persistence for your employees, you can use our Windows-provided utility to reset the container and to discard any personal data.

    **To reset the container:**
    1. Open a command-line program and navigate to `Windows/System32`.
    2. Type `wdagtool.exe cleanup`. The container environment is reset, retaining only the employee-generated data.
    3. Type `wdagtool.exe cleanup RESET_PERSISTENCE_LAYER`. The container environment is reset, including discarding all employee-generated data.| +|Turn on Microsoft Defender Application Guard in Managed Mode|Windows 10 Enterprise, 1809 or higher

    Windows 11 Enterprise|Determines whether to turn on Application Guard for Microsoft Edge and Microsoft Office.|**Enabled.** Turns on Application Guard for Microsoft Edge and/or Microsoft Office, honoring the network isolation settings, rendering untrusted content in the Application Guard container. Application Guard won't actually be turned on unless the required prerequisites and network isolation settings are already set on the device. Available options:
    - Enable Microsoft Defender Application Guard only for Microsoft Edge
    - Enable Microsoft Defender Application Guard only for Microsoft Office
    - Enable Microsoft Defender Application Guard for both Microsoft Edge and Microsoft Office

    **Disabled.** Turns off Application Guard, allowing all apps to run in Microsoft Edge and Microsoft Office.

    **Note:** For Windows 10, if you have KB5014666 installed, and for Windows 11, if you have KB5014668 installed, you are no longer required to configure network isolation policy to enable Application Guard for Edge.| +|Allow files to download to host operating system|Windows 10 Enterprise or Pro, 1803 or higher

    Windows 11 Enterprise or Pro|Determines whether to save downloaded files to the host operating system from the Microsoft Defender Application Guard container.|**Enabled.** This is effective only in managed mode. Allows users to save downloaded files from the Microsoft Defender Application Guard container to the host operating system. This action creates a share between the host and container that also allows for uploads from the host to the Application Guard container.

    **Disabled or not configured.** Users aren't able to save downloaded files from Application Guard to the host operating system.| +|Allow hardware-accelerated rendering for Microsoft Defender Application Guard|Windows 10 Enterprise, 1803 or higher

    Windows 11 Enterprise|Determines whether Microsoft Defender Application Guard renders graphics using hardware or software acceleration.|**Enabled.** This is effective only in managed mode. Microsoft Defender Application Guard uses Hyper-V to access supported, high-security rendering graphics hardware (GPUs). These GPUs improve rendering performance and battery life while using Microsoft Defender Application Guard, particularly for video playback and other graphics-intensive use cases. If this setting is enabled without connecting any high-security rendering graphics hardware, Microsoft Defender Application Guard will automatically revert to software-based (CPU) rendering. **Important:** Enabling this setting with potentially compromised graphics devices or drivers might pose a risk to the host device.

    **Disabled or not configured.** Microsoft Defender Application Guard uses software-based (CPU) rendering and won’t load any third-party graphics drivers or interact with any connected graphics hardware.| +|Allow camera and microphone access in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher

    Windows 11 Enterprise|Determines whether to allow camera and microphone access inside Microsoft Defender Application Guard.|**Enabled.** This is effective only in managed mode. Applications inside Microsoft Defender Application Guard are able to access the camera and microphone on the user's device. **Important:** Enabling this policy with a potentially compromised container could bypass camera and microphone permissions and access the camera and microphone without the user's knowledge.

    **Disabled or not configured.** Applications inside Microsoft Defender Application Guard are unable to access the camera and microphone on the user's device.| +|Allow Microsoft Defender Application Guard to use Root Certificate Authorities from a user's device|Windows 10 Enterprise or Pro, 1809 or higher

    Windows 11 Enterprise or Pro|Determines whether Root Certificates are shared with Microsoft Defender Application Guard.|**Enabled.** Certificates matching the specified thumbprint are transferred into the container. Use a comma to separate multiple certificates.

    **Disabled or not configured.** Certificates aren't shared with Microsoft Defender Application Guard.| +|Allow auditing events in Microsoft Defender Application Guard|Windows 10 Enterprise, 1809 or higher

    Windows 11 Enterprise|This policy setting allows you to decide whether auditing events can be collected from Microsoft Defender Application Guard.|**Enabled.** This is effective only in managed mode. Application Guard inherits auditing policies from your device and logs system events from the Application Guard container to your host.

    **Disabled or not configured.** Event logs aren't collected from your Application Guard container.| ## Application Guard support dialog settings diff --git a/windows/security/threat-protection/microsoft-defender-application-guard/test-scenarios-md-app-guard.md b/windows/security/threat-protection/microsoft-defender-application-guard/test-scenarios-md-app-guard.md index d5400d4de7..d8461e69f2 100644 --- a/windows/security/threat-protection/microsoft-defender-application-guard/test-scenarios-md-app-guard.md +++ b/windows/security/threat-protection/microsoft-defender-application-guard/test-scenarios-md-app-guard.md @@ -1,18 +1,15 @@ --- -title: Testing scenarios with Microsoft Defender Application Guard (Windows 10 or Windows 11) +title: Testing scenarios with Microsoft Defender Application Guard description: Suggested testing scenarios for Microsoft Defender Application Guard, showing how it works in both Standalone and Enterprise-managed mode. -ms.prod: m365-security -ms.mktglfcycl: manage -ms.sitesec: library -ms.pagetype: security +ms.prod: windows-client +ms.technology: itpro-security ms.localizationpriority: medium -author: denisebmsft -ms.author: deniseb -ms.reviewer: -manager: dansimp -ms.date: 03/14/2022 +author: vinaypamnani-msft +ms.author: vinpa +ms.reviewer: sazankha +manager: aaroncz +ms.date: 09/23/2022 ms.custom: asr -ms.technology: windows-sec --- # Application Guard testing scenarios @@ -59,7 +56,7 @@ Before you can use Application Guard in managed mode, you must install Windows 1 3. Set up the Network Isolation settings in Group Policy: - a. Click on the **Windows** icon, type `Group Policy`, and then click **Edit Group Policy**. + a. Select the **Windows** icon, type `Group Policy`, and then select **Edit Group Policy**. b. Go to the **Administrative Templates\Network\Network Isolation\Enterprise resource domains hosted in the cloud** setting. @@ -75,7 +72,7 @@ Before you can use Application Guard in managed mode, you must install Windows 1 4. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Turn on Microsoft Defender Application Guard in Managed Mode** setting. -5. Click **Enabled**, choose Option **1**, and click **OK**. +5. Select **Enabled**, choose Option **1**, and select **OK**. ![Group Policy editor with Turn On/Off setting.](images/appguard-gp-turn-on.png) @@ -110,15 +107,14 @@ You have the option to change each of these settings to work with your enterpris **Applies to:** -- Windows 10 Enterprise edition, version 1709 or higher -- Windows 10 Professional edition, version 1803 -- Windows 11 +- Windows 10 Enterprise or Pro editions, version 1803 or later +- Windows 11 Enterprise or Pro editions #### Copy and paste options 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Configure Microsoft Defender Application Guard clipboard settings**. -2. Click **Enabled** and click **OK**. +2. Select **Enabled** and select **OK**. ![Group Policy editor clipboard options.](images/appguard-gp-clipboard.png) @@ -138,25 +134,25 @@ You have the option to change each of these settings to work with your enterpris - Both text and images can be copied between the host PC and the isolated container. -5. Click **OK**. +5. Select **OK**. #### Print options 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Configure Microsoft Defender Application Guard print** settings. -2. Click **Enabled** and click **OK**. +2. Select **Enabled** and select **OK**. ![Group Policy editor Print options.](images/appguard-gp-print.png) 3. Based on the list provided in the setting, choose the number that best represents what type of printing should be available to your employees. You can allow any combination of local, network, PDF, and XPS printing. -4. Click **OK**. +4. Select **OK**. #### Data persistence options 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Allow data persistence for Microsoft Defender Application Guard** setting. -2. Click **Enabled** and click **OK**. +2. Select **Enabled** and select **OK**. ![Group Policy editor Data Persistence options.](images/appguard-gp-persistence.png) @@ -166,32 +162,33 @@ You have the option to change each of these settings to work with your enterpris 4. Add the site to your **Favorites** list and then close the isolated session. -5. Log out and back on to your device, opening Microsoft Edge in Application Guard again. +5. Sign out and back in to your device, opening Microsoft Edge in Application Guard again. The previously added site should still appear in your **Favorites** list. > [!NOTE] - > If you don't allow or turn off data persistence, restarting a device or logging in and out of the isolated container triggers a recycle event that discards all generated data, including session cookies, Favorites, and so on, removing the data from Application Guard. If you turn on data persistence, all employee-generated artifacts are preserved across container recycle events. However, these artifacts only exist in the isolated container and aren't shared with the host PC. This data persists after restarts and even through build-to-build upgrades of Windows 10 and Windows 11. + > Starting with Windows 11, version 22H2, data persistence is disabled by default. If you don't allow or turn off data persistence, restarting a device or signing in and out of the isolated container triggers a recycle event. This action discards all generated data, such as session cookies and Favorites, and removes the data from Application Guard. If you turn on data persistence, all employee-generated artifacts are preserved across container recycle events. However, these artifacts only exist in the isolated container and aren't shared with the host PC. This data persists after restarts and even through build-to-build upgrades of Windows 10 and Windows 11. > > If you turn on data persistence, but later decide to stop supporting it for your employees, you can use our Windows-provided utility to reset the container and to discard any personal data. > > **To reset the container, follow these steps:**
    1. Open a command-line program and navigate to Windows/System32.
    2. Type `wdagtool.exe cleanup`. The container environment is reset, retaining only the employee-generated data.
    3. Type `wdagtool.exe cleanup RESET_PERSISTENCE_LAYER`. The container environment is reset, including discarding all employee-generated data. + > + > _Microsoft Edge version 90 or later no longer supports `RESET_PERSISTENCE_LAYER`._ **Applies to:** -- Windows 10 Enterprise edition, version 1803 -- Windows 10 Professional edition, version 1803 -- Windows 11 +- Windows 10 Enterprise or Pro editions, version 1803 +- Windows 11 Enterprise or Pro editions, version 21H2. Data persistence is disabled by default in Windows 11, version 22H2 and later. #### Download options 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Allow files to download and save to the host operating system from Microsoft Defender Application Guard** setting. -2. Click **Enabled** and click **OK**. +2. Select **Enabled** and select **OK**. ![Group Policy editor Download options.](images/appguard-gp-download.png) -3. Log out and back on to your device, opening Microsoft Edge in Application Guard again. +3. Sign out and back in to your device, opening Microsoft Edge in Application Guard again. 4. Download a file from Microsoft Defender Application Guard. @@ -201,7 +198,7 @@ You have the option to change each of these settings to work with your enterpris 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Allow hardware-accelerated rendering for Microsoft Defender Application Guard** setting. -2. Click **Enabled** and click **OK**. +2. Select **Enabled** and Select **OK**. ![Group Policy editor hardware acceleration options.](images/appguard-gp-vgpu.png) @@ -209,21 +206,15 @@ You have the option to change each of these settings to work with your enterpris 4. Assess the visual experience and battery performance. -**Applies to:** - -- Windows 10 Enterprise edition, version 1809 -- Windows 10 Professional edition, version 1809 -- Windows 11 - #### Camera and microphone options 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Allow camera and microphone access in Microsoft Defender Application Guard** setting. -2. Click **Enabled** and click **OK**. +2. Select **Enabled** and select **OK**. ![Group Policy editor Camera and microphone options.](images/appguard-gp-allow-camera-and-mic.png) -3. Log out and back on to your device, opening Microsoft Edge in Application Guard again. +3. Sign out and back in to your device, opening Microsoft Edge in Application Guard again. 4. Open an application with video or audio capability in Edge. @@ -233,11 +224,11 @@ You have the option to change each of these settings to work with your enterpris 1. Go to the **Computer Configuration\Administrative Templates\Windows Components\Microsoft Defender Application Guard\Allow Microsoft Defender Application Guard to use Root Certificate Authorities from the user's device** setting. -2. Click **Enabled**, copy the thumbprint of each certificate to share, separated by a comma, and click **OK**. +2. Select **Enabled**, copy the thumbprint of each certificate to share, separated by a comma, and select **OK**. ![Group Policy editor Root certificate options.](images/appguard-gp-allow-root-certificates.png) -3. Log out and back on to your device, opening Microsoft Edge in Application Guard again. +3. Sign out and back in to your device, opening Microsoft Edge in Application Guard again. ## Application Guard Extension for third-party web browsers @@ -245,9 +236,9 @@ The [Application Guard Extension](md-app-guard-browser-extension.md) available f Once a user has the extension and its companion app installed on their enterprise device, you can run through the following scenarios. -1. Open either Firefox or Chrome — whichever browser you have the extension installed on. +1. Open either Firefox or Chrome, whichever browser you have the extension installed on. -2. Navigate to an enterprise website, i.e. an internal website maintained by your organization. You might see this evaluation page for an instant before the site is fully loaded. +2. Navigate to an organizational website. In other words, an internal website maintained by your organization. You might see this evaluation page for an instant before the site is fully loaded. ![The evaluation page displayed while the page is being loaded, explaining that the user must wait.](images/app-guard-chrome-extension-evaluation-page.png) 3. Navigate to a non-enterprise, external website site, such as [www.bing.com](https://www.bing.com). The site should be redirected to Microsoft Defender Application Guard Edge. diff --git a/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md b/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md index f2d56646e4..6fe565bf48 100644 --- a/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md +++ b/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md @@ -1,18 +1,14 @@ --- title: Enhanced Phishing Protection in Microsoft Defender SmartScreen description: Learn how Enhanced Phishing Protection for Microsoft Defender SmartScreen helps protect Microsoft school or work passwords against phishing and unsafe usage on sites and apps. -ms.prod: m365-security -ms.mktglfcycl: explore -ms.sitesec: library -ms.pagetype: security +ms.prod: windows-client +ms.technology: itpro-security author: v-mathavale ms.author: v-mathavale -audience: IT Admin -ms.localizationpriority: medium -ms.date: 06/21/2022 ms.reviewer: paoloma manager: aaroncz -ms.technology: windows-sec +ms.localizationpriority: medium +ms.date: 06/21/2022 adobe-target: true appliesto: - ✅ Windows 11, version 22H2 @@ -20,22 +16,27 @@ appliesto: # Enhanced Phishing Protection in Microsoft Defender SmartScreen -Starting in Windows 11 22H2, Enhanced Phishing Protection in Microsoft Defender SmartScreen helps protect Microsoft school or work passwords against phishing and unsafe usage on sites and apps. +Starting in Windows 11, version 22H2, Enhanced Phishing Protection in Microsoft Defender SmartScreen helps protect Microsoft school or work passwords against phishing and unsafe usage on sites and apps. Enhanced Phishing Protection works alongside Windows security protections, and helps protect typed work or school passwords used to sign into Windows 11 in three ways: -- If users type their work or school password on any Chromium browser, into a site deemed malicious by Microsoft Defender SmartScreen, Enhanced Phishing Protection will alert them. It will also prompt them to change their password so attackers can't gain access to their account -- Reusing work or school passwords makes it easy for attackers who compromise a user's password to gain access to their other accounts. Enhanced Phishing Protection can warn users if they reuse their work or school Microsoft account password on sites and apps and prompt them to change their password -- Since it's unsafe to store plaintext passwords in text editors, Enhanced Phishing Protection can warn users if they store their work or school password in Notepad, Word, or any Microsoft 365 Office app, and recommends they delete their password from the file +- If users type their work or school password on any Chromium browser, into a site deemed malicious by Microsoft Defender SmartScreen, Enhanced Phishing Protection will alert them. It will also prompt them to change their password so attackers can't gain access to their account. + +- Reusing work or school passwords makes it easy for attackers who compromise a user's password to gain access to their other accounts. Enhanced Phishing Protection can warn users if they reuse their work or school Microsoft account password on sites and apps and prompt them to change their password. + +- Since it's unsafe to store plaintext passwords in text editors, Enhanced Phishing Protection can warn users if they store their work or school password in Notepad, Word, or any Microsoft 365 Office app, and recommends they delete their password from the file. ## Benefits of Enhanced Phishing Protection in Microsoft Defender SmartScreen Enhanced Phishing Protection provides robust phishing protections for work or school passwords that are used to sign into Windows 11. The benefits of Enhanced Phishing Protection are: -- **Anti-phishing support:** Phishing attacks trick users through convincing imitations of safe content or through credential harvesting content hosted inside trusted sites and applications. Enhanced Phishing Protection helps protect users from reported phishing sites by evaluating the URLs a site or app is connecting to, along with other characteristics, to determine if they're known to distribute or host unsafe content -- **Secure operating system integration:** Enhanced Phishing Protection is integrated directly into the Windows 11 operating system, so it can understand users' password entry context (including process connections, URLs, certificate information, etc.) in any browser or app. Because Enhanced Phishing Protection has unparalleled insight into what is happening at the OS level, it can identify when users type their work or school password unsafely. If users do use their work or school password unsafely, the feature empowers users to change their password to minimize chances of their compromised credential being weaponized against them -- **Unparalleled telemetry shared throughout Microsoft's security suite:** Enhanced Phishing Protection is constantly learning from phishing attacks seen throughout the entire Microsoft security stack. It works alongside other Microsoft security products, to provide a layered approach to password security, especially for organizations early in their password-less authentication journey. If your organization uses Microsoft Defender for Endpoint, you'll be able to see valuable phishing sensors data in the M365D Portal. This enables you to view Enhanced Phishing Protection alerts and reports for unsafe password usage in your environment -- **Easy management through Group Policy and Microsoft Intune:** Enhanced Phishing Protection works with Group Policy and mobile device management (MDM) settings to help you manage your organization's computer settings. Based on how you set up Enhanced Phishing Protection, you can customize which phishing protection scenarios will show users warning dialogs. For example, the Service Enabled setting determines whether the Enhanced Phishing Protection service is on or off. The feature will be in audit mode if the other settings, which correspond to notification policies, are not enabled. +- **Anti-phishing support:** Phishing attacks trick users through convincing imitations of safe content or through credential harvesting content hosted inside trusted sites and applications. Enhanced Phishing Protection helps protect users from reported phishing sites by evaluating the URLs a site or app is connecting to, along with other characteristics, to determine if they're known to distribute or host unsafe content. + +- **Secure operating system integration:** Enhanced Phishing Protection is integrated directly into the Windows 11 operating system, so it can understand users' password entry context (including process connections, URLs, certificate information) in any browser or app. Because Enhanced Phishing Protection has unparalleled insight into what is happening at the OS level, it can identify when users type their work or school password unsafely. If users do use their work or school password unsafely, the feature empowers users to change their password to minimize chances of their compromised credential being weaponized against them. + +- **Unparalleled telemetry shared throughout Microsoft's security suite:** Enhanced Phishing Protection is constantly learning from phishing attacks seen throughout the entire Microsoft security stack. It works alongside other Microsoft security products, to provide a layered approach to password security, especially for organizations early in their password-less authentication journey. If your organization uses Microsoft Defender for Endpoint, you'll be able to see valuable phishing sensors data in the Microsoft 365 Defender Portal. This portal lets you view Enhanced Phishing Protection alerts and reports for unsafe password usage in your environment. + +- **Easy management through Group Policy and Microsoft Intune:** Enhanced Phishing Protection works with Group Policy and mobile device management (MDM) settings to help you manage your organization's computer settings. Based on how you set up Enhanced Phishing Protection, you can customize which phishing protection scenarios will show users warning dialogs. For example, the Service Enabled setting determines whether the Enhanced Phishing Protection service is on or off. The feature will be in audit mode if the other settings, which correspond to notification policies, aren't enabled. ## Configure Enhanced Phishing Protection for your organization @@ -47,8 +48,8 @@ Enhanced Phishing Protection can be configured using the following Administrativ |Setting|Description| |---------|---------| -|Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Service Enabled |This policy setting determines whether Enhanced Phishing Protection is in audit mode or off. Users don't see any notifications for any protection scenarios when Enhanced Phishing Protection is in audit mode. In audit mode, Enhanced Phishing Protection captures unsafe password entry events and sends telemetry through Microsoft Defender.

    If you enable or don't configure this setting, Enhanced Phishing Protection is enabled in audit mode, preventing users to turn it off.

    If you disable this policy setting, Enhanced Phishing Protection is off. When off, Enhanced Phishing Protection doesn't capture events, send telemetry, or notify users. Additionally, your users are unable to turn it on.| -|Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Malicious|This policy setting determines whether Enhanced Phishing Protection warns your users if they type their work or school password into one of the following malicious scenarios: into a reported phishing site, into a login URL with an invalid certificate, or into an application connecting to either a reported phishing site or a login URL with an invalid certificate.

    If you enable this policy setting, Enhanced Phishing Protection warns your users if they type their work or school password into one of the malicious scenarios described above and encourages them to change their password.

    If you disable or don't configure this policy setting, Enhanced Phishing Protection won't warn your users if they type their work or school password into one of the malicious scenarios described above.| +|Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Service Enabled |This policy setting determines whether Enhanced Phishing Protection is in audit mode or off. Users don't see any notifications for any protection scenarios when Enhanced Phishing Protection is in audit mode. In audit mode, Enhanced Phishing Protection captures unsafe password entry events and sends diagnostic data through Microsoft Defender.

    If you enable or don't configure this setting, Enhanced Phishing Protection is enabled in audit mode, preventing users to turn it off.

    If you disable this policy setting, Enhanced Phishing Protection is off. When off, Enhanced Phishing Protection doesn't capture events, send data, or notify users. Additionally, your users are unable to turn it on.| +|Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Malicious|This policy setting determines whether Enhanced Phishing Protection warns your users if they type their work or school password into one of the following malicious scenarios: into a reported phishing site, into a sign-in URL with an invalid certificate, or into an application connecting to either a reported phishing site or a sign-in URL with an invalid certificate.

    If you enable this policy setting, Enhanced Phishing Protection warns your users if they type their work or school password into one of the malicious scenarios described above and encourages them to change their password.

    If you disable or don't configure this policy setting, Enhanced Phishing Protection won't warn your users if they type their work or school password into one of the malicious scenarios described above.| |Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Password Reuse |This policy setting determines whether Enhanced Phishing Protection warns your users if they reuse their work or school password.

    If you enable this policy setting, Enhanced Phishing Protection warns users if they reuse their work or school password and encourages them to change it.

    If you disable or don't configure this policy setting, Enhanced Phishing Protection won't warn users if they reuse their work or school password.| |Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Unsafe App|This policy setting determines whether Enhanced Phishing Protection warns your users if they type their work or school passwords in Notepad or Microsoft 365 Office Apps.

    If you enable this policy setting, Enhanced Phishing Protection warns your users if they store their password in Notepad or Microsoft 365 Office Apps.

    If you disable or don't configure this policy setting, Enhanced Phishing Protection won't warn users if they store their password in Notepad or Microsoft 365 Office Apps.| @@ -67,7 +68,7 @@ Enhanced Phishing Protection can be configured using the [WebThreatDefense CSP]( ### Recommended settings for your organization -By default, Enhanced Phishing Protection is deployed in audit mode, preventing notifications to the users for any protection scenarios. In audit mode, Enhanced Phishing Protection captures unsafe password entry events and sends telemetry through Microsoft Defender. Users aren't warned if they enter their work or school password into a phishing site, if they reuse their password, or if they unsafely store their password in applications. Because of this possibility, it is recommended that you configure Enhanced Phishing Protection to warn users during all protection scenarios. +By default, Enhanced Phishing Protection is deployed in audit mode, preventing notifications to the users for any protection scenarios. In audit mode, Enhanced Phishing Protection captures unsafe password entry events and sends diagnostic data through Microsoft Defender. Users aren't warned if they enter their work or school password into a phishing site, if they reuse their password, or if they unsafely store their password in applications. Because of this possibility, it's recommended that you configure Enhanced Phishing Protection to warn users during all protection scenarios. To better help you protect your organization, we recommend turning on and using these specific Microsoft Defender SmartScreen Group Policy and MDM settings. @@ -76,7 +77,7 @@ To better help you protect your organization, we recommend turning on and using |Group Policy setting|Recommendation| |---------|---------| |Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Service Enabled| **Enable**: Enhanced Phishing Protection is enabled in audit mode and your users are unable to turn it off.| -|Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Malicious|**Enable**: Enhanced Phishing Protection warns your users if they type their work or school password into one of the following malicious scenarios: into a reported phishing site, into a login URL with an invalid certificate, or into an application connecting to either a reported phishing site or a login URL with an invalid certificate. It encourages users to change their password.| +|Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Malicious|**Enable**: Enhanced Phishing Protection warns your users if they type their work or school password into one of the following malicious scenarios: into a reported phishing site, into a sign-in URL with an invalid certificate, or into an application connecting to either a reported phishing site or a sign-in URL with an invalid certificate. It encourages users to change their password.| |Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Password Reuse|**Enable**: Enhanced Phishing Protection warns users if they reuse their work or school password and encourages them to change it.| |Administrative Templates\Windows Components\Windows Defender SmartScreen\Enhanced Phishing Protection\Notify Unsafe App|**Enable**: Enhanced Phishing Protection warns users if they store their password in Notepad and Microsoft 365 Office Apps.| @@ -84,7 +85,7 @@ To better help you protect your organization, we recommend turning on and using |MDM setting|Recommendation| |---------|---------| -|ServiceEnabled|**1**: Turns on Enhanced Phishing Protection in audit mode, which captures work or school password entry events and sends telemetry but doesn't show any notifications to your users.| +|ServiceEnabled|**1**: Turns on Enhanced Phishing Protection in audit mode, which captures work or school password entry events and sends diagnostic data but doesn't show any notifications to your users.| |NotifyMalicious|**1**: Turns on Enhanced Phishing Protection notifications when users type their work or school password into one of the previously described malicious scenarios and encourages them to change their password.| |NotifyPasswordReuse|**1**: Turns on Enhanced Phishing Protection notifications when users reuse their work or school password and encourages them to change their password.| |NotifyUnsafeApp|**1**: Turns on Enhanced Phishing Protection notifications when users type their work or school passwords in Notepad and Microsoft 365 Office Apps.| @@ -92,8 +93,9 @@ To better help you protect your organization, we recommend turning on and using --- ## Related articles + - [Microsoft Defender SmartScreen](microsoft-defender-smartscreen-overview.md) - [SmartScreen Frequently Asked Questions](https://fb.smartscreen.microsoft.com/smartscreenfaq.aspx) - [Threat protection](../index.md) - [Available Microsoft Defender SmartScreen Group Policy and mobile device management (MDM) settings](microsoft-defender-smartscreen-available-settings.md) -- [Configuration service provider reference](/windows/client-management/mdm/configuration-service-provider-reference.md#configuration-service-provider-reference) +- [Configuration service provider reference](/windows/client-management/mdm/configuration-service-provider-reference) 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