From e27e6be92253534b2eedaae0f817cb35119f231b Mon Sep 17 00:00:00 2001 From: Gary Moore Date: Tue, 5 May 2020 16:02:11 -0700 Subject: [PATCH] More corrections, indentation, note styling --- windows/deployment/windows-10-subscription-activation.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/windows/deployment/windows-10-subscription-activation.md b/windows/deployment/windows-10-subscription-activation.md index 557ef86af5..ff62c02509 100644 --- a/windows/deployment/windows-10-subscription-activation.md +++ b/windows/deployment/windows-10-subscription-activation.md @@ -60,6 +60,7 @@ To support Inherited Activation, both the host computer and the VM must be runni ## The evolution of deployment +> [!NOTE] > The original version of this section can be found at [Changing between Windows SKUs](https://blogs.technet.microsoft.com/mniehaus/2017/10/09/changing-between-windows-skus/). The following figure illustrates how deploying Windows 10 has evolved with each release. With this release, deployment is automatic. @@ -104,9 +105,9 @@ If the device is running Windows 10, version 1809 or later: 1. 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. 2. When the user signs in on a Hybrid Azure AD joined device with MFA enabled, a notification will indicate that there is a problem. Click the notification and then click **Fix now** to step through the subscription activation process. See the example below: - ![Subscription Activation with MFA1](images/sa-mfa1.png)
- ![Subscription Activation with MFA2](images/sa-mfa2.png)
- ![Subscription Activation with MFA2](images/sa-mfa3.png) + ![Subscription Activation with MFA1](images/sa-mfa1.png)
+ ![Subscription Activation with MFA2](images/sa-mfa2.png)
+ ![Subscription Activation with MFA2](images/sa-mfa3.png) ### Windows 10 Education requirements @@ -197,7 +198,7 @@ When you have the required Azure AD subscription, group-based licensing is the p If you are 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 Enterprise using Subscription Activation. This automatically migrates your devices from KMS or MAK activated Enterprise to Subscription activated Enterprise. > [!CAUTION] -> Firmware-embedded Windows 10 activation happens automatically only when we go through OOBE(Out Of Box Experience) +> Firmware-embedded Windows 10 activation happens automatically only when we go through the Out-of-Box Experience (OOBE). If you are 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.