Merge pull request #3649 from MicrosoftDocs/main638829252300437023sync_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]

azure-local/TOC.yml

@@ -184,21 +184,21 @@ items:
   items:
   - name: About Azure Local upgrades
     href: upgrade/about-upgrades-23h2.md
-  - name: 1 - Upgrade to version 23H2 OS
+  - name: 1. Upgrade to version 23H2 OS
     items: 
-    - name: 1A - Via PowerShell
+    - name: Via PowerShell (recommended)
       href: upgrade/upgrade-22h2-to-23h2-powershell.md
-    - name: 1B - Via Windows Admin Center
+    - name: Via Windows Admin Center
       href: upgrade/upgrade-22h2-to-23h2-windows-admin-center.md
-    - name: 1C - Via other methods
+    - name: Via other methods
       href: upgrade/upgrade-22h2-to-23h2-other-methods.md
-  - name: 2 - Perform post-OS upgrade tasks
+  - name: 2. Perform post-OS upgrade tasks
     href: upgrade/post-upgrade-steps.md
-  - name: 3 - Install, enable Network ATC
+  - name: 3. Install, enable Network ATC
     href: upgrade/install-enable-network-atc.md
-  - name: 4 - Validate solution upgrade readiness
+  - name: 4. Validate solution upgrade readiness
     href: upgrade/validate-solution-upgrade-readiness.md
-  - name: 5 - Apply solution upgrade
+  - name: 5. Apply solution upgrade
     href: upgrade/install-solution-upgrade.md
   - name: Troubleshoot upgrades
     href: upgrade/troubleshoot-upgrade-to-23h2.md

azure-local/includes/azure-local-verify-update.md

@@ -0,0 +1,38 @@
+---
+author: alkohli
+ms.author: alkohli
+ms.service: azure-local
+ms.topic: include
+ms.date: 05/13/2024
+---
+
+## Step 3: Check the status of an update
+
+To get the summary information about an update in progress, run the `Get-CauRun` cmdlet:
+
+```PowerShell
+Get-CauRun -ClusterName <SystemName>
+```
+
+Here's a sample output: <!--ASK-->
+
+```output
+RunId                   : <Run ID> 
+RunStartTime            : 10/13/2024 1:35:39 PM 
+CurrentOrchestrator     : NODE1 
+NodeStatusNotifications : { 
+Node      : NODE1 
+Status    : Waiting 
+Timestamp : 10/13/2024 1:35:49 PM 
+} 
+NodeResults             : { 
+Node                     : NODE2 
+Status                   : Succeeded 
+ErrorRecordData          : 
+NumberOfSucceededUpdates : 0 
+NumberOfFailedUpdates    : 0 
+InstallResults           : Microsoft.ClusterAwareUpdating.UpdateInstallResult[] 
+}
+```
+
+You're now ready to perform the post-OS upgrade steps for your system.

azure-local/manage/virtual-machine-manage-extension.md

@@ -5,7 +5,7 @@ author: alkohli
 ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-local
-ms.date: 03/27/2025
+ms.date: 05/15/2025
 ---
 
 # Manage VM extensions on Azure Local virtual machines 
@@ -25,7 +25,7 @@ For a full list of supported VM extensions, see:
 
 ## Prerequisites
 
-- Access to a VM running on Azure Local with guest management enabled. Guest management is supported on Windows and Linux VMs. For information on how to create a VM, see [Create Azure Local VMs(./create-arc-virtual-machines.md).
+- Access to a VM running on Azure Local with guest management enabled. Guest management is supported on Windows and Linux VMs. For information on how to create a VM, see [Create Azure Local VMs](./create-arc-virtual-machines.md).
 
 ## Verify that guest management is enabled
 

azure-local/upgrade/install-enable-network-atc.md

@@ -5,7 +5,7 @@ author: ronmiab
 ms.author: robess
 ms.topic: how-to
 ms.reviewer: alkohli
-ms.date: 02/28/2025
+ms.date: 05/14/2025
 ms.service: azure-local
 #Customer intent: As a Senior Content Developer, I want to provide customers with content and steps to help them successfully install and enable Network ATC on their existing Azure Local, version 22H2 instance.
 ---
@@ -19,6 +19,7 @@ This article provides information on how to install and enable Network ATC on an
 > [!IMPORTANT]
 > - Before you apply the solution upgrade, make sure to install and enable Network ATC on your existing Azure Local instance. If Network ATC is already enabled on your existing system, you can skip this step. 
 > - We recommend that you set up Network ATC after you have upgraded the operating system from version 22H2 to version 23H2. For more information, see [Upgrade Azure Local to the latest version 23H2 via PowerShell](./upgrade-22h2-to-23h2-powershell.md).
+> - If you’re enabling Network ATC for the first time on an existing Azure Local system with SDN workloads or want to avoid downtime during migration to a Network ATC managed system, skip this article and contact support.
 
 ## About Network ATC
 

azure-local/upgrade/install-solution-upgrade.md

@@ -3,7 +3,7 @@ title: Install solution upgrade on Azure Local
 description: Learn how to install the solution upgrade on your Azure Local instance.
 author: alkohli
 ms.topic: how-to
-ms.date: 04/16/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -38,15 +38,19 @@ Before you install the solution upgrade, make sure that you:
 
     :::image type="content" source="media/install-solution-upgrade/verify-subscription-permissions-roles.png" alt-text="Screenshot of subscription with permissions assigned to required roles for upgrade." lightbox="./media/install-solution-upgrade/verify-subscription-permissions-roles.png":::
 
+## Before you begin
+
+There are a few things to consider before you begin the solution upgrade process:
+
+- Microsoft only supports upgrade applied from Azure Local resource page. Use of third party tools to install upgrades isn't supported.
+- We recommend you perform the solution upgrade during a maintenance window. After the upgrade, host machine might reboot and the workloads will be live migrated, causing brief disconnections.
+- If you have Azure Kubernetes Service (AKS) workloads on Azure Local, wait for the solution upgrade banner to appear on the Azure Local resource page. Then, remove AKS and all AKS hybrid settings before you apply the solution upgrade.
+- By installing the solution upgrade, existing Hyper-V VMs won't automatically become Azure Arc VMs.
+
 ## Install the solution upgrade via Azure portal
 
 You install the solution upgrade via the Azure portal.
 
-> [!IMPORTANT]
-> - Microsoft only supports upgrade applied from Azure Local resource page. Use of 3rd party tools to install upgrades is not supported.
-> - If you have Azure Kubernetes Service (AKS) workloads on Azure Local, wait for the solution upgrade banner to appear on the Azure Local resource page. Then, remove AKS and all AKS hybrid settings before you apply the solution upgrade.
-> - By installing the solution upgrade, existing Hyper-V VMs won't automatically become Azure Arc VMs.
-
 Follow these steps to install the solution upgrade:
 
 1. Go to your Azure Local resource in Azure portal.

azure-local/upgrade/upgrade-22h2-to-23h2-other-methods.md

@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via other method
 description: Learn how to upgrade from Azure Stack HCI OS, version 22H2 to version 23H2 using other manual methods on Azure Local.
 author: alkohli
 ms.topic: how-to
-ms.date: 05/12/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -15,7 +15,7 @@ ms.service: azure-local
 
 [!INCLUDE [end-of-service-22H2](../includes/end-of-service-22h2.md)]
 
-This article describes how to upgrade the operating system (OS) for Azure Local from version 22H2 to version 23H2 using manual methods, such as [SConfig](/windows-server/administration/server-core/server-core-sconfig) and performing an offline upgrade.
+This article describes how to upgrade the operating system (OS) for Azure Local from version 22H2 to version 23H2 using manual methods, such as [SConfig](/windows-server/administration/server-core/server-core-sconfig) and performing an offline upgrade. This is the first step in the upgrade process, which upgrades only the OS.
 
 While you can use these other methods, PowerShell is the recommended method to upgrade the OS. For more information, see [Upgrade the Azure Stack HCI OS, version 22H2 to version 23H2 via PowerShell](./upgrade-22h2-to-23h2-powershell.md).
 
@@ -170,7 +170,7 @@ If there's a critical security update <!--ASK-->that you need to apply quickly o
 
 <!--ASK-->
 
-You're now ready to perform the post-upgrade steps for your system.
+[!INCLUDE [verify-update](../includes/azure-local-verify-update.md)]
 
 ## Next steps
 

azure-local/upgrade/upgrade-22h2-to-23h2-powershell.md

@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via PowerShell
 description: Learn how to use PowerShell to upgrade Azure Stack HCI OS, version 22H2 to version 23H2.
 author: alkohli
 ms.topic: how-to
-ms.date: 05/12/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -15,7 +15,7 @@ ms.service: azure-local
 
 [!INCLUDE [end-of-service-22H2](../includes/end-of-service-22h2.md)]
 
-This article describes how to upgrade the operating system (OS) for Azure Local from version 22H2 to version 23H2 via PowerShell. Upgrade using PowerShell is the recommended method to upgrade the OS.
+This article describes how to upgrade the operating system (OS) for Azure Local from version 22H2 to version 23H2 via PowerShell, which is the recommended method to upgrade the OS. This is the first step in the upgrade process, which upgrades only the OS.
 
 There are other methods to upgrade the OS that include using Windows Admin Center and the Server Configuration tool (SConfig). For more information about these methods, see [Upgrade the Azure Stack HCI OS, version 22H2 OS via Windows Admin Center](./upgrade-22h2-to-23h2-windows-admin-center.md) and [Upgrade Azure Local to new OS using other methods](./upgrade-22h2-to-23h2-other-methods.md).
 
@@ -170,36 +170,7 @@ To install the new OS using PowerShell, follow these steps:
 
 Wait for the update to complete and check the status of the update.
 
-## Step 3: Check the status of an update
-
-To get the summary information about an update in progress, run the `Get-CauRun` cmdlet:
-
-```PowerShell
-Get-CauRun -ClusterName <SystemName>
-```
-
-Here's a sample output: <!--ASK-->
-
-```output
-RunId                   : <Run ID> 
-RunStartTime            : 10/13/2024 1:35:39 PM 
-CurrentOrchestrator     : NODE1 
-NodeStatusNotifications : { 
-Node      : NODE1 
-Status    : Waiting 
-Timestamp : 10/13/2024 1:35:49 PM 
-} 
-NodeResults             : { 
-Node                     : NODE2 
-Status                   : Succeeded 
-ErrorRecordData          : 
-NumberOfSucceededUpdates : 0 
-NumberOfFailedUpdates    : 0 
-InstallResults           : Microsoft.ClusterAwareUpdating.UpdateInstallResult[] 
-}
-```
-
-You're now ready to perform the post-OS upgrade steps for your system.
+[!INCLUDE [verify-update](../includes/azure-local-verify-update.md)]
 
 ## Next steps
 

azure-local/upgrade/upgrade-22h2-to-23h2-windows-admin-center.md

@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via Windows Admi
 description: Learn how to upgrade Azure Stack HCI OS, version 22H2 to version 23H2 using Windows Admin Center.
 author: alkohli
 ms.topic: how-to
-ms.date: 05/12/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -15,7 +15,7 @@ ms.service: azure-local
 
 [!INCLUDE [end-of-service-22H2](../includes/end-of-service-22h2.md)]
 
-This article describes how to upgrade the operating system (OS) for Azure Local from version 22H2 to version 23H2 via the Windows Admin Center.
+This article describes how to upgrade the operating system (OS) for Azure Local from version 22H2 to version 23H2 via the Windows Admin Center. This is the first step in the upgrade process, which upgrades only the OS.
 
 While the recommended method is to [Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via PowerShell](./upgrade-22h2-to-23h2-powershell.md), you can also upgrade via Windows Admin Center or other methods.
 

azure-local/upgrade/validate-solution-upgrade-readiness.md

@@ -3,7 +3,7 @@ title: Validate solution upgrade readiness for Azure Local, version 23H2
 description: Learn how to assess upgrade readiness for Azure Local, version 23H2 that already had its operating system upgraded from version 22H2.
 author: alkohli
 ms.topic: how-to
-ms.date: 04/17/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -95,7 +95,7 @@ Follow these steps to set up the Environment Checker on a machine of your Azure
    Invoke-AzStackHciUpgradeValidation
    ```
 
-1. To validate other machines in the system, run the following PowerShell command:
+1. To remotely validate other machines in the system, run the following PowerShell command for each remote machine:
 
    ```powershell
    $PsSession=New-Pssession -ComputerName "MyRemoteMachine"