Merge branch 'rb-oem-upd' of https://github.com/ronmiab/azure-stack-docs-pr into 250424h2

Author: alkohli

azure-local/license-billing.yml

@@ -1,19 +1,19 @@
 ### YamlMime:FAQ
 metadata:
-  title: Azure Stack HCI OEM license and billing FAQ
-  description: The Azure Local FAQ provides information on the Azure Stack HCI OEM license and billing.
+  title: OEM license and billing FAQ for Azure Local
+  description: The FAQ provides information on the OEM license and billing for Azure Local.
   ms.topic: faq
   author: ronmiab
   ms.author: robess
   ms.service: azure-local
-  ms.date: 01/24/2025
+  ms.date: 04/04/2025
 
-title: Azure Stack HCI OEM license and billing FAQ
+title: OEM license and billing FAQ for Azure Local
 summary: |
-  This FAQ provides information on the Azure Stack HCI OEM license and billing and applies to Azure Local.
+  This FAQ provides information on the OEM license and billing for Azure Local.
 
 sections:
-  - name: Azure Stack HCI OEM license and billing FAQ
+  - name: OEM license and billing FAQ for Azure Local
     questions:
 
       - question: How do I get pricing for this license?
@@ -36,21 +36,21 @@ sections:
       
       - question: Which version of Windows Server is supported for this license?
         answer: |
-          You can use Windows Server Datacenter 2022, or an [earlier version](/windows-server/get-started/automatic-vm-activation?tabs=server2025) that Microsoft supports, as a guest license.  
+          You can use Windows Server Datacenter 2025, or an [earlier version](/windows-server/get-started/automatic-vm-activation?tabs=server2025) that Microsoft supports, as a guest license.  
 
       - question: Are next version rights for Windows Server Datacenter included?
         answer: |
-          No. This license is limited to Windows Server Datacenter 2022 or earlier and doesn't include newer subsequent versions unless permitted by Microsoft. You can use Windows Server Datacenter 2022, or an earlier version that Microsoft supports, as a guest license.
+          No. This license is limited to Windows Server Datacenter 2025 or earlier and doesn't include newer subsequent versions unless permitted by Microsoft. You can use Windows Server Datacenter 2025, or an earlier version that Microsoft supports, as a guest license.
 
       - question: Where can I get support for this license?
         answer: |
-          For support with your Azure Stack HCI OEM license first contact your OEM vendor. For additional help, file an Azure support request through [the Azure portal](https://portal.azure.com/).
+          For support with OEM license for Azure Local first contact your OEM vendor. For additional help, file an Azure support request through [the Azure portal](https://portal.azure.com/).
       
       - question: Are mixed-node scenarios supported?
         answer: |
           No. This license doesn't currently support environments with mixed nodes in the same Azure Local system. For more information, see [Mixed-node scenarios](oem-license.md#mixed-node-scenarios).
 
-      - question: Does Azure Kubernetes Service (AKS) offer unlimited virtualization?
+      - question: Does Azure Kubernetes Service (AKS) on Azure Local offer unlimited virtualization?
         answer: |
           Yes. AKS on Azure Local offers unlimited containers like Windows Server Datacenter offers unlimited virtualization. You can run as many containers and VMs as your infrastructure supports, without incurring extra licensing costs.
 
@@ -68,12 +68,12 @@ sections:
 
       - question: Does this license include an End-User License Agreement (EULA)?
         answer: |
-          Yes. There's an EULA that combines Azure Local (as the host), Azure Kubernetes Services on Azure Local, and Windows Server Datacenter 2022 (as the guest) into a single package.
+          Yes. There's a EULA that combines Azure Local (as the host), Azure Kubernetes Services on Azure Local, and Windows Server Datacenter 2025 (as the guest) into a single package.
 
       - question: Is a product key or Certificate of Authenticity (COA) required?
         answer: |
           No. This pre-installed license doesn't include product keys or COA, the license is automatically authenticated once you register the device in Azure. Should you have any failure that requires a re-install, contact your OEM vendor.
 
       - question: Do I need Device or User Client Access Licenses (CALs) with this License?
         answer: |
-          No. For this specific license, there's no requirement for other Device or User CALs. The absence of CAL requirements with this license is specific to this offering and shouldn't be interpreted as a general exception from CALs for other machine licenses or scenarios.
+          No. For this specific license, there's no requirement for other Device or User CALs. The absence of CAL requirements with this license is specific to this offering and shouldn't be interpreted as a general exception from CALs for other machine licenses or scenarios.

azure-local/oem-license.md

@@ -1,37 +1,35 @@
 ---
-title: Azure Stack HCI OEM license overview
-description: Learn about the Azure Stack HCI OEM license, its benefits, license requirements, activation, and more.
+title: OEM license for Azure Local overview
+description: Learn about the OEM license for Azure Local, its benefits, license requirements, activation, and more.
 author: ronmiab
 ms.topic: overview
-ms.date: 03/03/2025
+ms.date: 04/04/2025
 ms.author: robess
 ms.reviewer: alkohli
-# customer intent: As a content developer, I want to provide customers with the appropriate Azure Stack HCI OEM license information so that they can have a clear understanding of what the license is and how it can be beneficial to them.
 ---
 
-# Azure Stack HCI OEM license overview
+# OEM license for Azure Local overview
 
 [!INCLUDE [applies-to](./includes/hci-applies-to-23h2.md)]
 
-This article covers the Azure Stack HCI OEM license, its benefits, license requirements, activation, and more.
+This article covers the OEM license for Azure Local, its benefits, license requirements, activation, and more.
 
 ## About the OEM license
 
-The Azure Stack HCI OEM license is designed for Azure Local hardware including [Premier Solutions, Integrated Systems, and Validated Nodes](https://azurestackhcisolutions.azure.microsoft.com/#/catalog?systemType=PremierSolution). The license remains valid for the lifetime of the hardware, covers up to 16 cores, and includes three essential services for your cloud infrastructure:
+The OEM license for Azure Local is designed for Azure Local hardware including [Premier Solutions, Integrated Systems, and Validated Nodes](https://azurestackhcisolutions.azure.microsoft.com/#/catalog?systemType=PremierSolution). The license remains valid for the lifetime of the hardware, covers up to 16 cores, and includes three essential services for your cloud infrastructure:
 
 - Azure Local
-- Azure Kubernetes Services (AKS)
-- Windows Server Datacenter 2022, or [earlier version](/windows-server/get-started/automatic-vm-activation?tabs=server2025) supported guest virtual machines (VMs)
+- Windows Server Datacenter 2025, or [earlier version](/windows-server/get-started/automatic-vm-activation?tabs=server2025) supported guest virtual machines (VMs)
 
 For systems with 16 cores or more, there are extra two-core and four-core license add-ons available.
 
- Additionally, this license grants you access to the latest versions of Azure Local and AKS, along with unlimited containers and VMs.
+ Additionally, this license grants you access to the latest versions of Azure Local and Azure Kubernetes Service (AKS) enabled by Azure Arc, along with unlimited containers and VMs.
 
 ## Benefits
 
-The Azure Stack HCI OEM license simplifies the licensing and activation process, reduces costs, and minimizes operational complexity. Other benefits include:
+The OEM license for Azure Local simplifies the licensing and activation process, reduces costs, and minimizes operational complexity. Other benefits include:
 
-- A single license for Azure Local, AKS, and Windows Server 2022 guest VMs.
+- A single license for Azure Local and Windows Server Datacenter 2025 guest VMs.
 
 - No tools or keys to activate the operating system on Azure Local.
 
@@ -41,38 +39,38 @@ The Azure Stack HCI OEM license simplifies the licensing and activation process,
 
 An active Azure account is required for license activation. When you purchase the hardware and activate this license, you should:
 
-- Install the latest versions of Azure Local, AKS, and Windows Server Datacenter 2022 guest VMs.
+- Install the latest versions of Azure Local and Windows Server Datacenter 2025 guest VMs.
 
-- Ensure your Azure Local and AKS remain current to receive the latest updates and security patches.
+- Ensure your Azure Local remains current to receive the latest updates and security patches.
 
 - Upgrade to the next version of Azure Local when the current version lifecycle ends to ensure continuous support and receive updates.
 
 ## Verify the license status
 
-To verify if you have an active Azure Stack HCI OEM license, use these steps:
+To verify if you have an active OEM license for Azure Local, use these steps:
 
 1. Go to [the Azure portal](https://portal.azure.com).
 2. Search for your Azure Local instance.
 3. Under your cluster, select **Overview** to check the **Billing status**.
-    - If you have an active Azure Stack HCI OEM license, your billing status should be **OEM License**, and your OEM license status should be **Activated**.
+    - If you have an active OEM license for Azure Local, your billing status should be **OEM License**, and your OEM license status should be **Activated**.
 
-        :::image type="content" source="media/oem-license/active-oem-license.png" alt-text="Screenshot of a cluster with an active Azure Stack HCI OEM license." lightbox="media/oem-license/active-oem-license.png":::
+        :::image type="content" source="media/oem-license/active-oem-license.png" alt-text="Screenshot of a cluster with an active OEM license for Azure Local." lightbox="media/oem-license/active-oem-license.png":::
 
-    - If you don't have an active Azure Stack HCI OEM license, you should see a billing status of **Billed monthly**, and an OEM license status of **Not activated**.
+    - If you don't have an active OEM license for Azure Local, you should see a billing status of **Billed monthly**, and an OEM license status of **Not activated**.
 
-        :::image type="content" source="media/oem-license/no-active-oem-license.png" alt-text="Screenshot of a billed monthly cluster without an active Azure Stack HCI OEM license." lightbox="media/oem-license/no-active-oem-license.png":::
+        :::image type="content" source="media/oem-license/no-active-oem-license.png" alt-text="Screenshot of a billed monthly cluster without an active OEM license for Azure Local." lightbox="media/oem-license/no-active-oem-license.png":::
 
-For support with your Azure Stack HCI OEM license first contact your OEM vendor. If you're unable to obtain vendor support, file an Azure support request through [the Azure portal](https://portal.azure.com/).
+For support with your OEM license for Azure Local first contact your OEM vendor. If you're unable to obtain vendor support, file an Azure support request through [the Azure portal](https://portal.azure.com/).
 
-For more information on the Azure Stack HCI OEM license, see [Azure Stack HCI OEM license FAQ](./license-billing.yml).
+For more information on the OEM license for Azure Local, see [OEM license for Azure Local FAQ](./license-billing.yml).
 
-## Licensing Windows Server guest VMs on Azure Local
+## Activate Windows Server guest VMs on Azure Local
 
-You can activate Windows Server VMs on an Azure Local instance using generic Automatic Virtual Machine Activation (AVMA) client keys. This can be done through either Windows Admin Center or PowerShell. For more information on using AVMA to activate Windows Server VMs, see [Activate Windows Server VMs using Automatic Virtual Machine Activation](manage/vm-activate.md#activate-azure-hybrid-benefit-through-avma).
+You can activate Windows Server VMs on an Azure Local instance using generic Automatic Virtual Machine Activation (AVMA) client keys. This can be done through either Windows Admin Center or PowerShell. For more information on using AVMA to activate Windows Server VMs, see [Activate Windows Server VMs on Azure Local](manage/vm-activate.md#activate-azure-hybrid-benefit-through-avma).
 
 ## Licensing AKS on Azure Local
 
-For information on activating AKS, see [Azure Kubernetes Service on Azure Local](/azure/aks/hybrid/aks-create-clusters-portal).
+For information on activating AKS, see [AKS on Azure Local](/azure/aks/hybrid/aks-create-clusters-portal).
 
 ## Mixed-node scenarios
 
@@ -81,22 +79,22 @@ When a cluster or system uses different hardware models, operating system versio
 ***We have detected mixed nodes in your cluster. You will be billed monthly for each node in your cluster as one or more servers in your cluster do not have an OEM license. To see which servers do not have the OEM license, go to Overview > Nodes and check the OEM license column. Learn more.***
 
 > [!NOTE]
-> Using the Azure Stack HCI OEM license in a mixed-node scenario may lead to inadvertent billing issues. All nodes in an Azure Local system require uniformity across the hardware, operating system, and billing treatment.
+> Using the OEM license for Azure Local in a mixed-node scenario may lead to inadvertent billing issues. All nodes in an Azure Local system require uniformity across the hardware, operating system, and billing treatment.
 
 Here are some examples of mixed-mode scenarios that aren't supported:
 
 | Scenario                                | Description         |
 |-----------------------------------------|---------------------|
 |Different hardware models or generations. | Using different manufacturers or different generations of hardware within the same cluster isn't supported.|
 |Varying operating systems or versions.    | Running different operating systems or different versions of the same operating system across the nodes in a cluster isn't supported.|
-|Different billing on machines.        | Mixing machine hardware sold with an Azure Stack HCI OEM license and machine hardware purchased with a regular Azure subscription isn't supported.|
+|Different billing on machines.        | Mixing machine hardware sold with an OEM license for Azure Local and machine hardware purchased with a regular Azure subscription isn't supported.|
 
 For support with billing issues related to mixed node scenarios, file an Azure support request through [the Azure portal](https://portal.azure.com).
 
 ## Next step
 
-- Read [License Windows Server VMs on Azure Local](/azure-stack/hci/manage/vm-activate?tabs=azure-portal).
+- Read [Activate Windows Server VMs on Azure Local](/azure-stack/hci/manage/vm-activate?tabs=azure-portal).
 
-- Read [Azure Kubernetes Service on Azure Local](/azure/aks/hybrid/aks-create-clusters-portal).
+- Read [AKS on Azure Local](/azure/aks/hybrid/aks-create-clusters-portal).
 
 - Read more about billing for specific OEM partners, see [Azure Local billing and payments](./concepts/billing.md).