diff --git a/education/docfx.json b/education/docfx.json
index eea7a3655b..cc2b912248 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -51,19 +51,16 @@
},
"titleSuffix": "Windows Education",
"contributors_to_exclude": [
- "rjagiewich",
- "claydetels19",
- "Kellylorenebaker",
- "jborsecnik",
- "dstrome",
- "garycentric",
- "v-stsavell",
- "beccarobins",
- "Stacyrch140",
+ "dstrome2",
+ "rjagiewich",
"American-Dipper",
+ "claydetels19",
+ "jborsecnik",
+ "v-stchambers",
"shdyas",
- "alekyaj",
- "rmca14"
+ "Stacyrch140",
+ "garycentric",
+ "dstrome"
]
},
"fileMetadata": {
diff --git a/store-for-business/docfx.json b/store-for-business/docfx.json
index 25f77170a7..4d87a128eb 100644
--- a/store-for-business/docfx.json
+++ b/store-for-business/docfx.json
@@ -55,19 +55,17 @@
}
},
"contributors_to_exclude": [
- "rjagiewich",
- "claydetels19",
- "Kellylorenebaker",
- "jborsecnik",
- "dstrome",
- "garycentric",
- "v-stsavell",
- "beccarobins",
- "Stacyrch140",
+ "dstrome2",
+ "rjagiewich",
"American-Dipper",
+ "claydetels19",
+ "jborsecnik",
+ "v-stchambers",
"shdyas",
- "alekyaj",
- "rmca14"
+ "Stacyrch140",
+ "garycentric",
+ "dstrome",
+ "alekyaj"
]
},
"fileMetadata": {},
@@ -75,4 +73,4 @@
"dest": "store-for-business",
"markdownEngineName": "markdig"
}
-}
\ No newline at end of file
+}
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index aaf0200895..7b7f7eed47 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -52,17 +52,17 @@
},
"titleSuffix": "Windows Application Management",
"contributors_to_exclude": [
- "rjagiewich",
- "claydetels19",
- "jborsecnik",
- "garycentric",
- "beccarobins",
- "Stacyrch140",
- "v-stsavell",
+ "dstrome2",
+ "rjagiewich",
"American-Dipper",
+ "claydetels19",
+ "jborsecnik",
+ "v-stchambers",
"shdyas",
- "alekyaj",
- "rmca14"
+ "Stacyrch140",
+ "garycentric",
+ "dstrome",
+ "beccarobins"
],
"searchScope": [
"Windows 10"
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index 7cf011a598..07e6f430e8 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -58,17 +58,17 @@
},
"titleSuffix": "Windows Client Management",
"contributors_to_exclude": [
- "rjagiewich",
- "claydetels19",
+ "dstrome2",
+ "rjagiewich",
+ "American-Dipper",
+ "claydetels19",
"jborsecnik",
- "garycentric",
- "beccarobins",
- "american-dipper",
- "v-stsavell",
- "stacyrch140",
+ "v-stchambers",
"shdyas",
- "alekyaj",
- "rmca14"
+ "Stacyrch140",
+ "garycentric",
+ "dstrome",
+ "beccarobins"
],
"searchScope": [
"Windows 10"
diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json
index fa5dd76296..9cd7b554d8 100644
--- a/windows/configuration/docfx.json
+++ b/windows/configuration/docfx.json
@@ -54,17 +54,18 @@
},
"titleSuffix": "Configure Windows",
"contributors_to_exclude": [
- "rjagiewich",
- "claydetels19",
- "jborsecnik",
- "garycentric",
- "beccarobins",
- "Stacyrch140",
- "v-stsavell",
+ "dstrome2",
+ "rjagiewich",
"American-Dipper",
+ "claydetels19",
+ "jborsecnik",
+ "v-stchambers",
"shdyas",
- "alekyaj",
- "rmca14"
+ "Stacyrch140",
+ "garycentric",
+ "dstrome",
+ "beccarobins",
+ "alekyaj"
],
"searchScope": [
"Windows 10"
diff --git a/windows/deployment/deploy-enterprise-licenses.md b/windows/deployment/deploy-enterprise-licenses.md
index c02e0390cd..89c0bbdd27 100644
--- a/windows/deployment/deploy-enterprise-licenses.md
+++ b/windows/deployment/deploy-enterprise-licenses.md
@@ -11,7 +11,7 @@ ms.topic: how-to
ms.collection:
- highpri
- tier2
-ms.date: 02/13/2024
+ms.date: 02/29/2024
zone_pivot_groups: windows-versions-11-10
appliesto:
- ✅ Windows 11
@@ -65,7 +65,7 @@ To update contact information and resend the activation email, use the following
1. Update the contact information, then select **Update Contact Details**. This action triggers a new email.
-## Preparing for deployment: reviewing requirements
+## Prepare for deployment: reviewing requirements
- Devices must be running a supported version of Windows Pro.
- Microsoft Entra joined, or hybrid domain joined with Microsoft Entra Connect. Customers who are federated with Microsoft Entra ID are also eligible.
@@ -82,7 +82,7 @@ For more information about integrating on-premises AD DS domains with Microsoft
- [What is hybrid identity with Microsoft Entra ID?](/azure/active-directory/hybrid/whatis-hybrid-identity)
- [Microsoft Entra Connect and Microsoft Entra Connect Health installation roadmap](/azure/active-directory/hybrid/how-to-connect-install-roadmap)
-## Assigning licenses to users
+## Assign licenses to users
After the Windows subscription is ordered, an email is sent with guidance on how to use Windows as an online service. The following methods are available to assign licenses:
@@ -368,11 +368,11 @@ In some instances, users might experience problems with activation of the Window
- The Windows Enterprise E3 or E5 subscription has lapsed, was removed, or isn't applied.
- Windows Pro was never activated.
-When there are problems with Windows Enterprise E3 or E5 subscription activation, the following are errors can occur in the [Activation](ms-settings:activation) pane:
+When there are problems with Windows Enterprise E3 or E5 subscription activation, the following are errors can occur in the [**Activation**](ms-settings:activation) pane:
- **Windows Pro isn't activated**
- When Windows Pro isn't activated on a device, the following message is displayed for **Activation** in the [Activation](ms-settings:activation) pane:
+ When Windows Pro isn't activated on a device, the following message is displayed for **Activation** in the [**Activation**](ms-settings:activation) pane:
`Windows is not activated`
@@ -389,7 +389,7 @@ When there are problems with Windows Enterprise E3 or E5 subscription activation
- **Windows Enterprise subscription isn't active**
- When a device with a Windows Enterprise subscription has lapsed or has been removed, the following message is displayed for **Subscription** in the [Activation](ms-settings:activation) pane:
+ When a device with a Windows Enterprise subscription has lapsed or has been removed, the following message is displayed for **Subscription** in the [**Activation**](ms-settings:activation) pane:
`Windows Enterprise subscription isn't valid.`
@@ -482,10 +482,25 @@ Use the following guides to verify each one of these requirements:
- **Make sure the Microsoft Entra user has been assigned a license**.
- For more information, see [Assigning licenses to users](#assigning-licenses-to-users).
+ For more information, see [Assigning licenses to users](#assign-licenses-to-users).
## Known issues
+- When a device has been offline for an extended period of time, the Subscription Activation might not reactivate automatically on the device. To resolve this issue, use Conditional Access policies to control access by excluding one of the following cloud apps from their Conditional Access policies using **Select Excluded Cloud Apps**:
+
+ - [Universal Store Service APIs and Web Application, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f](/troubleshoot/azure/active-directory/verify-first-party-apps-sign-in#application-ids-of-commonly-used-microsoft-applications).
+ - [Windows Store for Business, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f](/troubleshoot/azure/active-directory/verify-first-party-apps-sign-in#application-ids-of-commonly-used-microsoft-applications).
+
+ Although the app ID is the same in both instances, the name of the cloud app depends on the tenant.
+
+ For more information about configuring exclusions in Conditional Access policies, see [Application exclusions](/azure/active-directory/conditional-access/howto-conditional-access-policy-all-users-mfa#application-exclusions).
+
+
+
+ Setting this Conditional Access policy ensures that Subscription Activation continues to work seamlessly.
+
+ Starting with Windows 11, version 23H2 with [KB5034848](https://support.microsoft.com/help/5034848) or later, users are prompted for authentication with a toast notification when Subscription Activation needs to reactivate. The prompt for authentication usually occurs when a device has been offline for an extended period of time. This change eliminates the need for an exclusion in the Conditional Access policy for Windows 11, version 23H2 with [KB5034848](https://support.microsoft.com/help/5034848) or later. A Conditional Access policy can still be used with Windows 11, version 23H2 with [KB5034848](https://support.microsoft.com/help/5034848) or later if the prompt for user authentication via a toast notification isn't desired.
+
- If a device isn't able to connect to Windows Update, it can lose activation status or be blocked from upgrading to Windows Enterprise. Make sure that Windows Update isn't blocked on the device:
- Using `gpedit.msc` or group policy editor in the domain, make sure that the following group policy setting is set to **Disabled** or **Not Configured**:
@@ -528,6 +543,7 @@ Subscriptions to Windows Enterprise are also available for virtualized clients.
Virtual machines (VMs) must be configured to enable Windows Enterprise subscriptions for VDA. Active Directory-joined and Microsoft Entra joined clients are supported. For more information, see [Enable VDA for Enterprise subscription activation](vda-subscription-activation.md).
-## Related articles
+## Related content
+- [Windows subscription activation](windows-subscription-activation.md).
- [MDM enrollment of Windows devices](/windows/client-management/mdm-enrollment-of-windows-devices).
diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json
index bec5d5f304..0ec95143b6 100644
--- a/windows/deployment/docfx.json
+++ b/windows/deployment/docfx.json
@@ -51,17 +51,17 @@
},
"titleSuffix": "Windows Deployment",
"contributors_to_exclude": [
- "rjagiewich",
- "claydetels19",
- "jborsecnik",
- "garycentric",
- "beccarobins",
- "Stacyrch140",
- "v-stsavell",
+ "dstrome2",
+ "rjagiewich",
"American-Dipper",
+ "claydetels19",
+ "jborsecnik",
+ "v-stchambers",
"shdyas",
- "alekyaj",
- "rmca14"
+ "Stacyrch140",
+ "garycentric",
+ "dstrome",
+ "alekyaj"
],
"searchScope": [
"Windows 10"
diff --git a/windows/deployment/windows-subscription-activation.md b/windows/deployment/windows-subscription-activation.md
index 9c15d279f1..6056ddf735 100644
--- a/windows/deployment/windows-subscription-activation.md
+++ b/windows/deployment/windows-subscription-activation.md
@@ -1,6 +1,6 @@
---
title: Windows subscription activation
-description: Learn how to dynamically enable Windows Enterprise or Education subscriptions.
+description: Learn how to step up from Windows Pro to a Windows Enterprise subscription or from Windows Eduction Pro to a Windows Education subscription.
ms.service: windows-client
ms.subservice: itpro-fundamentals
ms.localizationpriority: medium
@@ -10,8 +10,9 @@ manager: aaroncz
ms.collection:
- highpri
- tier2
-ms.topic: conceptual
-ms.date: 02/13/2024
+ms.topic: concept-article
+zone_pivot_groups: windows-versions-11-10
+ms.date: 02/29/2024
appliesto:
- ✅ Windows 11
- ✅ Windows 10
@@ -33,17 +34,6 @@ The subscription activation feature eliminates the need to manually deploy Enter
For more information on how to deploy Enterprise licenses, see [Deploy Windows Enterprise licenses](deploy-enterprise-licenses.md).
-> [!NOTE]
->
-> Organizations that use the Subscription Activation feature to enable users to upgrade from one version of Windows to another and use Conditional Access policies to control access need to exclude one of the following cloud apps from their Conditional Access policies using **Select Excluded Cloud Apps**:
->
-> - [Universal Store Service APIs and Web Application, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f](/troubleshoot/azure/active-directory/verify-first-party-apps-sign-in#application-ids-of-commonly-used-microsoft-applications).
-> - [Windows Store for Business, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f](/troubleshoot/azure/active-directory/verify-first-party-apps-sign-in#application-ids-of-commonly-used-microsoft-applications).
->
-> Although the app ID is the same in both instances, the name of the cloud app depends on the tenant.
->
-> For more information about configuring exclusions in Conditional Access policies, see [Application exclusions](/azure/active-directory/conditional-access/howto-conditional-access-policy-all-users-mfa#application-exclusions).
-
## Subscription activation for Enterprise
Windows Enterprise E3 and E5 are available as online services via subscription. Windows Enterprise can be deployed in an organization without keys and reboots.
@@ -57,6 +47,21 @@ Organizations that have an enterprise agreement can also benefit from the servic
>
> Subscription activation is available for qualifying devices running currently supported versions of Windows. Subscription activation can't be used to upgrade to a newer version of Windows.
+Organizations that use the Subscription Activation feature to enable users to "step-up" from one version of Windows to another and use Conditional Access policies to control access need to exclude one of the following cloud apps from their Conditional Access policies using **Select Excluded Cloud Apps**:
+
+- [Universal Store Service APIs and Web Application, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f](/troubleshoot/azure/active-directory/verify-first-party-apps-sign-in#application-ids-of-commonly-used-microsoft-applications).
+- [Windows Store for Business, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f](/troubleshoot/azure/active-directory/verify-first-party-apps-sign-in#application-ids-of-commonly-used-microsoft-applications).
+
+Although the app ID is the same in both instances, the name of the cloud app depends on the tenant.
+
+For more information about configuring exclusions in Conditional Access policies, see [Application exclusions](/azure/active-directory/conditional-access/howto-conditional-access-policy-all-users-mfa#application-exclusions).
+
+
+
+When a device has been offline for an extended period of time, the device might not reactivate automatically if this Conditional Access exclusion isn't in place. Setting this Conditional Access exclusion ensures that Subscription Activation continues to work seamlessly.
+
+Starting with Windows 11, version 23H2 with [KB5034848](https://support.microsoft.com/help/5034848) or later, users are prompted for authentication with a toast notification when Subscription Activation needs to reactivate. The prompt for authentication usually occurs when a device has been offline for an extended period of time. This change eliminates the need for an exclusion in the Conditional Access policy for Windows 11, version 23H2 with [KB5034848](https://support.microsoft.com/help/5034848) or later. A Conditional Access policy can still be used with Windows 11, version 23H2 with [KB5034848](https://support.microsoft.com/help/5034848) or later if the prompt for user authentication via a toast notification isn't desired.
+
## Subscription activation for Education
Subscription activation for Education works the same as the Enterprise edition. However, in order to use subscription activation for Education, the device must have Windows Pro Education and an active subscription plan with an Enterprise license. For more information, see the [requirements](#windows-education-requirements) section.
@@ -71,14 +76,6 @@ To support inherited activation, both the host computer and the VM must be runni
### Windows Enterprise requirements
-> [!NOTE]
->
-> 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 Microsoft Entra 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#understanding-azure-kms-endpoints-for-windows-product-activation-of-azure-virtual-machines).
-
-> [!IMPORTANT]
->
-> As of October 1, 2022, subscription activation is available for *commercial* and *GCC* tenants. It's currently not available on GCC High or DoD tenants. For more information, see [Enable subscription activation with an existing EA](deploy-enterprise-licenses.md#enable-subscription-activation-with-an-existing-ea).
-
For Microsoft customers with Enterprise Agreements (EA) or Microsoft Products & Services Agreements (MPSA), the following requirements must be met:
- A supported version of Windows Pro or Enterprise edition installed on the devices to be upgraded.
@@ -87,11 +84,32 @@ For Microsoft customers with Enterprise Agreements (EA) or Microsoft Products &
For Microsoft customers that don't have EA or MPSA, Windows Enterprise E3/E5 or A3/A5 licenses can be obtained through a cloud solution provider (CSP). Identity management and device requirements are the same when using CSP to manage licenses. For more information about getting Windows Enterprise E3 through a CSP, see [Windows Enterprise E3 in CSP](windows-enterprise-e3-overview.md).
+> [!NOTE]
+>
+> These requirements don't apply to general Windows client activation on Azure. Azure activation requires a connection to Azure KMS only. Azure KMS supports workgroup, hybrid, and Microsoft Entra 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#understanding-azure-kms-endpoints-for-windows-product-activation-of-azure-virtual-machines).
+
+> [!IMPORTANT]
+>
+> As of October 1, 2022, subscription activation is available for *commercial* and *GCC* tenants. It's currently not available on GCC High or DoD tenants. For more information, see [Enable subscription activation with an existing EA](deploy-enterprise-licenses.md#enable-subscription-activation-with-an-existing-ea).
+
### Windows Education requirements
- A supported version of Windows Pro Education installed on the devices to be upgraded.
-- A device with a Windows Pro Education digital license. This information can be confirmed under **Settings > System > Activation** or under **Settings > Update & Security > Activation**.
+
+::: zone pivot="windows-11"
+
+- A device with a Windows Pro Education digital license. This information can be confirmed in the [**Activation**](ms-settings:activation)pane of the **Settings** app under **Settings > System > Activation**.
+
+::: zone-end
+
+::: zone pivot="windows-10"
+
+- A device with a Windows Pro Education digital license. This information can be confirmed in the [**Activation**](ms-settings:activation)pane of the **Settings** app under **Settings > Update & Security > Activation**.
+
+::: zone-end
+
- 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 Microsoft Entra joined or Microsoft Entra hybrid joined. Workgroup-joined or Microsoft Entra registered devices aren't supported.
> [!IMPORTANT]
@@ -104,8 +122,8 @@ With Windows Enterprise or Education editions, an organization can benefit from
To compare Windows editions and review pricing, see the following sites:
-- [Compare Windows editions](https://www.microsoft.com/en-us/windows/business/windows-10-pro-vs-windows-11-pro)
-- [Enterprise Mobility + Security Pricing Options](https://www.microsoft.com/en-us/microsoft-365/enterprise-mobility-security/compare-plans-and-pricing)
+- [Compare Windows editions](https://www.microsoft.com/en-us/windows/business/windows-10-pro-vs-windows-11-pro)