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

.openpublishing.redirection.azure-local.json

@@ -1934,6 +1934,26 @@
       "source_path": "azure-local/migrate/migrate-cluster-new-hardware.md", 
       "redirect_url": "/azure-local/migrate/migration-azure-migrate-overview", 
       "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-local/deploy/deployment-azure-arc-gateway-configure-manually.md", 
+      "redirect_url": "/azure/azure-local/deploy/deployment-with-azure-arc-gateway", 
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-local/deploy/deployment-azure-arc-gateway-configure-via-script.md", 
+      "redirect_url": "/azure/azure-local/deploy/deployment-with-azure-arc-gateway", 
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-local/deploy/deployment-azure-arc-gateway-use-without-proxy.md", 
+      "redirect_url": "/azure/azure-local/deploy/deployment-with-azure-arc-gateway", 
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-local/deploy/deployment-arc-register-local-ui.md", 
+      "redirect_url": "/azure/azure-local/deploy/deployment-without-azure-arc-gateway", 
+      "redirect_document_id": false
     }
   ]
 }

AKS-Arc/reference/aks-edge-ps/index.md

@@ -4,11 +4,13 @@ description: PowerShell cmdlets for AKS Edge Essentials
 author: rcheeran
 ms.author: rcheeran
 ms.topic: reference
-ms.date: 03/10/2025
+ms.date: 08/11/2025
 ---
 
 # AKS Edge Essentials PowerShell module
 
+To get started, see [Prepare your machines for AKS Edge Essentials.](../../aks-edge-howto-setup-machine.md).
+
 ## PowerShell commands
 
 ### [Add-AksEdgeNode](./add-aksedgenode.md)

azure-local/TOC.yml

@@ -95,6 +95,8 @@ items:
       href: plan/network-patterns-sdn-considerations.md
   - name: Review cloud deployment network considerations
     href: plan/cloud-deployment-network-considerations.md
+  - name: Review Azure Arc gateway
+    href: deploy/deployment-azure-arc-gateway-overview.md
   - name: Review security
     items:
     - name: About security features
@@ -118,31 +120,22 @@ items:
     href: deploy/download-23h2-software.md
   - name: 3. Install the OS
     href: deploy/deployment-install-os.md
-  - name: 4. Register with Arc and set up permissions
+  - name: 4. Set up subscription permissions
+    href: deploy/deployment-arc-register-server-permissions.md
+  - name: 5. Choose a registration method
     items:
-    - name: Via console
-      href: deploy/deployment-arc-register-server-permissions.md
-    - name: Via Configurator app
-      href: deploy/deployment-arc-register-configurator-app.md  
-  - name: 5. Choose a deployment method
+    - name: Without Arc gateway
+      href: deploy/deployment-without-azure-arc-gateway.md
+    - name: With Arc gateway
+      href: deploy/deployment-with-azure-arc-gateway.md  
+  - name: 6. Choose a deployment method
     items:
-    - name: 5A. Deploy via Azure portal 
+    - name: 6A. Deploy via Azure portal
       href: deploy/deploy-via-portal.md
-    - name: 5B. Deploy via ARM template
+    - name: 6B. Deploy via ARM template
       href: deploy/deployment-azure-resource-manager-template.md
 
-  - name: Deploy with Arc gateway
-    items:
-    - name: About Arc gateway
-      href: deploy/deployment-azure-arc-gateway-overview.md
-    - name: Choose a proxy option
-      items:
-      - name: Configure proxy manually
-        href: deploy/deployment-azure-arc-gateway-configure-manually.md
-      - name: Configure proxy via Arc script
-        href: deploy/deployment-azure-arc-gateway-configure-via-script.md
-      - name: Configure without a proxy
-        href: deploy/deployment-azure-arc-gateway-use-without-proxy.md
+
   - name: Deploy using local identity with Key Vault
     href: deploy/deployment-local-identity-with-key-vault.md
   - name: Deploy workloads
@@ -518,6 +511,8 @@ items:
   items:
   - name: Collect logs
     href: manage/collect-logs.md
+  - name: Troubleshoot registration issues for Configurator app
+    href: manage/troubleshoot-deployment-configurator-app.md
   - name: Troubleshoot deployment validation issues
     href: manage/troubleshoot-deployment.md
   - name: Use the Diagnostic Support tool

azure-local/concepts/system-requirements-23h2.md

@@ -28,8 +28,7 @@ Here are the Azure requirements for your Azure Local instance:
    - Subscription obtained through an Enterprise Agreement (EA).
    - Subscription obtained through the Cloud Solution Provider (CSP) program.
 
-- **Azure permissions**: Make sure that you're assigned the required roles and permissions for registration and deployment. For information on how to assign permissions, see [Assign Azure permissions for registration](../deploy/deployment-arc-register-server-permissions.md#assign-required-permissions-for-deployment).
-
+- **Azure permissions**: Make sure that you're assigned the required roles and permissions for registration and deployment. For information on how to assign permissions, see [Assign Azure permissions for registration](../deploy/deployment-arc-register-server-permissions.md).
 - **Azure regions**: Azure Local is supported for the following regions:
 
    # [Azure public](#tab/azure-public)