From 0d89225e15fa4e7b88e32e6ec4977ae22f08f7c9 Mon Sep 17 00:00:00 2001 From: Frank Rojas <45807133+frankroj@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:36:15 -0500 Subject: [PATCH] Fixing TechNet and MSDN links plus refreshing articles 22 --- .../deployment/deploy-enterprise-licenses.md | 84 ++++++++++++------- .../windows-subscription-activation.md | 11 --- 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/windows/deployment/deploy-enterprise-licenses.md b/windows/deployment/deploy-enterprise-licenses.md index 5098e7d2de..ad75bec051 100644 --- a/windows/deployment/deploy-enterprise-licenses.md +++ b/windows/deployment/deploy-enterprise-licenses.md @@ -109,11 +109,11 @@ Now that a subscription is established and licenses are assigned to users, devic The first time the device starts, a Windows Pro device can join Microsoft Entra ID during setup. Existing devices can also join Microsoft Entra ID. -#### Join a device to Microsoft Entra ID the first time the device is started +#### Join a device to Microsoft Entra ID during OOBE when the device is started for the first time ::: zone pivot="windows-11" -1. Power on the device for the first time to initiate Windows Setup. +1. Power on the device for the first time to initiate Windows Setup and the Out of Box experience (OOBE). 1. In the **Is this the right country or region?** screen, select the desired country/region and then select the **Yes** button. @@ -145,7 +145,7 @@ The first time the device starts, a Windows Pro device can join Microsoft Entra ::: zone pivot="windows-10" -1. Power on the device for the first time to initiate Windows Setup. +1. Power on the device for the first time to initiate Windows Setup and the Out of Box experience (OOBE). 1. In the **Let's start with region. Is this right?** screen, select the desired country/region and then select the **Yes** button. @@ -179,14 +179,35 @@ Once Windows Setup finishes, the user is automatically signed in and the device > > Make sure that the user signing in isn't the **BUILTIN/Administrator** account. That user can't use the `+ Connect` action to join a work or school account. +Select the following link to open **Accounts** > **Access work or school** pane in the **Settings** app: + +> [!div class="nextstepaction"] +> [Activation](ms-settings:workplace) + +or + +1. Right click on the **Start** menu and select **Run**. + +1. In the **Run** window, next to **Open**, enter: + + ```console + ms-settings:workplace + ``` + + and then select **OK**. + ::: zone pivot="windows-11" +The **Accounts > Access work or school** pane can also be opened by navigating to it using the following steps: + 1. Right-click on the **Start** menu and select **Settings**. 1. In the **Settings** app, select **Accounts** in the left hand pane. 1. In the **Accounts** pane, select **Access work or school**. +Once the **Accounts > Access work or school** pane is open: + 1. In the **Accounts > Access work or school** pane, next to **Add a work or school account**, select the **Connect** button. 1. In the **Microsoft account** window that opens: @@ -205,12 +226,16 @@ Once Windows Setup finishes, the user is automatically signed in and the device ::: zone pivot="windows-10" +The **Access work or school** pane can also be opened by navigating to it using the following steps: + 1. Right-click on the **Start** menu and select **Settings**. 1. In the **Settings** app, select **Accounts**. 1. In the left hand pane, select **Access work or school**. +Once the **Access work or school** pane is open: + 1. In the **Access work or school** pane, select the **+** button next to **Connect**. 1. In the **Microsoft account** window that opens: @@ -241,21 +266,35 @@ Once the device is joined to Microsoft Entra ID, users sign in with their Micros To verify the Windows Enterprise E3 or E5 subscription: - +Select the following link to open **Activation** in the **Settings** app: > [!div class="nextstepaction"] > [Activation](ms-settings:activation) +or + 1. Right click on the **Start** menu and select **Run**. -1. In the **Run** window, next to **Open**, enter +1. In the **Run** window, next to **Open**, enter: - `ms-settings:activation` + ```console + ms-settings:activation + ``` and then select **OK**. ::: zone pivot="windows-11" +The **System > Activation** pane can also be opened by navigating to it using the following steps: + +1. Right-click on the **Start** menu and select **Settings**. + +1. In the **Settings** app, select **System** in the left hand pane. + +1. In the **System** pane, **Activation**. + +Once the **System > Activation** pane is open: + 1. In the **System > Activation** pane, expand **Activation state** and **Subscription** to see full details of the activation state and status: 1. Under **Activation state**, verify that Windows is activated. It should display the message: @@ -270,18 +309,20 @@ To verify the Windows Enterprise E3 or E5 subscription: > > If the Windows Enterprise subscription hasn't yet been applied, the **Subscription** pane isn't displayed. -The **System > Activation** pane can also be navigated to with the following steps: - -1. Right-click on the **Start** menu and select **Settings**. - -1. In the **Settings** app, select **System** in the left hand pane. - -1. In the **System** pane, **Activation**. - ::: zone-end ::: zone pivot="windows-10" +The **Activation** pane can also be opened by navigating to it using the following steps: + +1. Right-click on the **Start** menu and select **Settings**. + +1. In the **Settings** app, select **Update & Security**. + +1. In the left hand pane, select **Activation**. + +Once the **Activation** pane is open: + 1. In the **Activation** pane: 1. Next to **Subscription**, verify that the Windows 10 Enterprise subscription is active. It should display the message: @@ -296,21 +337,8 @@ The **System > Activation** pane can also be navigated to with the following ste `Windows is activated with a digital license` -The **Activation** pane can also be navigated to with the following steps: - -1. Right-click on the **Start** menu and select **Settings**. - -1. In the **Settings** app, select **Update & Security**. - -1. In the left hand pane, select **Activation**. - ::: zone-end -or by selecting the following link: - -> [!div class="nextstepaction"] -> [Activation](ms-settings:activation) - A device is healthy when both the subscription and activation are active. If there are any problems with the Windows Enterprise E3 or E5 license or the activation of the license, the **Activation** pane displays the appropriate error message or status. This information can be used to help diagnose the licensing and activation process. #### Verify that Enterprise edition is enabled with slmgr @@ -498,4 +526,4 @@ Virtual machines (VMs) must be configured to enable Windows Enterprise subscript ## Related articles -- [MDM enrollment of Windows devices](/windows/client-management/mdm-enrollment-of-windows-devices). \ No newline at end of file +- [MDM enrollment of Windows devices](/windows/client-management/mdm-enrollment-of-windows-devices). diff --git a/windows/deployment/windows-subscription-activation.md b/windows/deployment/windows-subscription-activation.md index 757e6cc721..bca4f9ddf6 100644 --- a/windows/deployment/windows-subscription-activation.md +++ b/windows/deployment/windows-subscription-activation.md @@ -31,17 +31,6 @@ The subscription activation feature eliminates the need to manually deploy Enter - Entering Generic Volume License Keys (GVLKs). - Rebooting client devices. -This article covers the following information: - -- [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 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 subscription activation for VMs in the cloud. - For more information on how to deploy Enterprise licenses, see [Deploy Windows Enterprise licenses](deploy-enterprise-licenses.md). > [!NOTE]