Merge pull request #3590 from MicrosoftDocs/main638794010004024569sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

AKS-Arc/aks-edge-howto-scale-out.md

@@ -1,20 +1,26 @@
 ---
-title: AKS Edge Scale
+title: AKS Edge Essentials scale (preview)
 description: Learn how to scale out your AKS Edge Essentials applications to multiple nodes.
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 07/11/2024
+ms.date: 04/04/2025
 ms.custom: template-how-to, linux-related-content
 ---
 
-# Scaling out on multiple machines
+# Scale out on multiple machines (preview)
 
 Now that AKS Edge Essentials is installed on your primary machine, this article describes how you can scale out your cluster to other secondary machines to create a multi-machine deployment.
 
 > [!CAUTION]
 > Scaling to additional nodes is an experimental feature.
 
+> [!IMPORTANT]
+> AKS Edge Essentials multi-machine deployment is currently in PREVIEW.
+> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
+> Azure Kubernetes Service Edge Essentials previews are partially covered by customer support on a best-effort basis.
+
+
 ## Prerequisites
 
 - Set up your [scalable Kubernetes](aks-edge-howto-multi-node-deployment.md) cluster.

azure-local/deploy/azure-verification.md

@@ -7,7 +7,7 @@ ms.topic: overview
 ms.custom:
   - devx-track-azurepowershell
 ms.reviewer: jlei
-ms.date: 02/03/2025
+ms.date: 03/30/2025
 ms.lastreviewed: 03/05/2024
 ms.service: azure-local
 ---
@@ -31,8 +31,8 @@ Azure verification for VM enables you to use these benefits available only on Az
 | Extended Security Update (ESUs)          | Get security updates at no extra cost for end-of-support SQL and Windows Server VMs on Azure Local. <br/> For more information, see [Free Extended Security Updates (ESU) on Azure Local](../manage/azure-benefits-esu.md). | You must enable [Legacy OS support](#legacy-os-support) for older VMs running version Windows Server 2012 or earlier with [Latest Servicing Stack Updates](https://msrc.microsoft.com/update-guide/advisory/ADV990001).|
 | Azure Virtual Desktop (AVD)                    | AVD session hosts can run only on Azure infrastructure. Activate your Windows multi-session VMs on Azure Local using Azure VM verification. <br/> Licensing requirements for AVD still apply. See [Azure Virtual Desktop pricing](/azure/virtual-desktop/azure-stack-hci-overview#pricing). | Activated automatically for VMs running version Windows 11 multi-session with 4B update released on April 9, 2024 (22H2: [KB5036893](https://support.microsoft.com/topic/april-9-2024-kb5036893-os-builds-22621-3447-and-22631-3447-a674a67b-85f5-4a40-8d74-5f8af8ead5bb), 21H2: [KB5036894](https://support.microsoft.com/topic/april-9-2024-kb5036894-os-build-22000-2899-165dd6e1-74be-45b7-84e3-0f2a25d375f3)) or later. You must enable [legacy OS support](#legacy-os-support) for VMs running version Windows 10 multi-session with 4B update released on April 9, 2024  [KB5036892](https://support.microsoft.com/topic/april-9-2024-kb5036892-os-builds-19044-4291-and-19045-4291-cb5d2d42-6b10-48f7-829a-be7d416a811b) or later. |
 | Windows Server Datacenter: Azure Edition | Azure Edition VMs can run only on Azure infrastructure. Activate your [Windows Server Azure Edition](/windows-server/get-started/azure-edition) VMs and use the latest Windows Server innovations and other exclusive features. <br/> Licensing requirements still apply. See ways to [license Windows Server VMs on Azure Local](../manage/vm-activate.md?tabs=azure-portal).         | Activated automatically for VMs running Windows Server Azure Edition 2022 with 4B update released on April 9, 2024 ([KB5036909](https://support.microsoft.com/topic/april-9-2024-kb5036909-os-build-20348-2402-36062ce9-f426-40c6-9fb9-ee5ab428da8c)) or later. |
-| Azure Update Manager | Get [Azure Update Manager](/azure/update-manager/overview?branch=main&tabs=azure-arc-vms) at no cost. This service provides a SaaS solution to manage and govern software updates to VMs on Azure Local. | Available automatically for Arc VMs created through the Arc Resource Bridge on Azure Local. With Software Assurance, you can attest your machine using Arc's Windows Server Azure benefits and licenses, and get AUM for free. For more information, see [Azure Update Manager frequently asked questions](/azure/update-manager/update-manager-faq#what-is-the-pricing-for-azure-update-manager). |
-| Azure Policy guest configuration         | Get [Azure Policy guest configuration](/azure/governance/policy/concepts/guest-configuration) at no cost. This Arc extension enables the auditing and configuration of OS settings as code for machines and VMs. | Arc agent version 1.39 or later. See [Latest Arc agent release](/azure/azure-arc/servers/agent-release-notes). |
+| Azure Update Manager | Get [Azure Update Manager](/azure/update-manager/overview?branch=main&tabs=azure-arc-vms) at no cost. This service provides a SaaS solution to manage and govern software updates to VMs on Azure Local. | Available automatically for Azure Local VMs created through the Azure Arc resource bridge on Azure Local. With Software Assurance, you can attest your machine using Windows Server Azure benefits and licenses, and get AUM for free. For more information, see [Azure Update Manager frequently asked questions](/azure/update-manager/update-manager-faq#what-is-the-pricing-for-azure-update-manager). |
+| Azure Policy guest configuration         | Get [Azure Policy guest configuration](/azure/governance/policy/concepts/guest-configuration) at no cost. This extension enables the auditing and configuration of OS settings as code for machines and VMs. | Arc agent version 1.39 or later. See [Latest agent release](/azure/azure-arc/servers/agent-release-notes). |
 
 > [!NOTE]
 > To ensure continued functionality, update your VMs on Azure Local to the latest cumulative update by June 17, 2024. This update is essential for VMs to continue using Azure benefits. See the [Azure Local blog post](https://techcommunity.microsoft.com/t5/azure-stack-blog/apply-critical-update-for-azure-stack-hci-vms-to-maintain-azure/ba-p/4115023) for more information.

azure-local/includes/hci-arc-vm-windows-admin-center.md

@@ -1,10 +1,12 @@
 ---
 author: alkohli
 ms.topic: include
-ms.date: 01/08/2025
+ms.date: 03/31/2025
 ms.author: alkohli
 
 ---
 
 > [!NOTE]
-> The recommended way to create and manage VMs on Azure Local is using the [Azure Arc control plane](../manage/azure-arc-vm-management-overview.md). However, since the functionality described in this article is not yet provided by Azure Arc, you can use Windows Admin Center or PowerShell as described below. Note that VMs created this way aren't Arc-enabled VMs. They have limited manageability from the Azure Arc control plane and fewer Azure Hybrid Benefits, such as no free use of Azure Update Manager.
+> - The recommended way to create and manage VMs on Azure Local is using the [Azure Arc control plane](../manage/azure-arc-vm-management-overview.md). However, since the functionality described in this article isn't yet provided by Azure Arc, you can use Windows Admin Center or PowerShell as described in this article. The VMs created this way aren't enabled by Azure Arc, have limited manageability from the Azure Arc control plane, and fewer Azure Hybrid Benefits, including usage of Azure Update Manager at no extra cost.
+>
+> - For more information, see [Compare management capabilities of VMs on Azure Local](../concepts/compare-vm-management-capabilities.md) and [Supported operations for Azure Local VMs](../manage/virtual-machine-operations.md).

azure-local/includes/hci-arc-vm.md

@@ -1,12 +1,14 @@
 ---
 author: alkohli
 ms.topic: include
-ms.date: 01/08/2025
+ms.date: 03/31/2025
 ms.author: alkohli
 
 ---
 
 <!--- Link must remain site-relative to prevent build issues with incoming includes from the windowsserverdocs repo --->
 
 > [!NOTE]
-> The recommended way to create and manage VMs on Azure Local is using the [Azure Arc control plane](/azure-stack/hci/manage/azure-arc-vm-management-overview). Use the mechanism described below to manage your VMs only if you need functionality that is not available in Azure Arc VMs.
+> - The recommended way to create and manage VMs on Azure Local is using the [Azure Arc control plane](../manage/azure-arc-vm-management-overview.md). However, since the functionality described in this article isn't yet provided by Azure Arc, you can use Windows Admin Center or PowerShell as described in this article. The VMs created this way aren't enabled by Azure Arc, have limited manageability from the Azure Arc control plane, and fewer Azure Hybrid Benefits, including usage of Azure Update Manager at no extra cost.
+>
+> - For more information, see [Compare management capabilities of VMs on Azure Local](../concepts/compare-vm-management-capabilities.md) and [Supported operations for Azure Local VMs](../manage/virtual-machine-operations.md).