fix merge conflict in release info

Author: v-sissondan

azure-local/TOC.yml

@@ -87,6 +87,8 @@ items:
         href: security-update/security-update-dec-2023.md
       - name: November 2023 
         href: security-update/security-update-nov-2023.md
+  - name: Disconnected operations
+    href: manage/disconnected-operations-overview.md
   - name: OEM License
     items: 
     - name: OEM license information
@@ -385,6 +387,8 @@ items:
       href: manage/manage-syslog-forwarding.md
     - name: Manage with Microsoft Defender for Cloud
       href: manage/manage-security-with-defender-for-cloud.md
+    - name: Manage security post upgrade
+      href: manage/manage-security-post-upgrade.md
 
   - name: Systems
     items:
@@ -524,6 +528,8 @@ items:
     href: manage/collect-logs.md
   - name: Troubleshoot deployment validation issues
     href: manage/troubleshoot-deployment.md
+  - name: Use the Diagnostic Support tool
+    href: manage/support-tools.md
   - name: Get support for deployment issues
     href: manage/get-support-for-deployment-issues.md
   - name: Get support for Azure Local
@@ -777,8 +783,6 @@ items:
       href: /windows-server/storage/storage-spaces/storage-spaces-states?context=/azure-local/context/context
     - name: Collect diagnostic data
       href: manage/collect-diagnostic-data.md
-    - name: Use the Diagnostic Support tool
-      href: manage/support-tools.md
   - name: Concepts
     items:
     - name: Storage and systems

azure-local/concepts/network-atc-overview.md

@@ -3,15 +3,15 @@ title: Network ATC overview
 description: This article introduces Network ATC for Azure Local and Windows Server.
 author: parammahajan5
 ms.topic: overview
-ms.date: 11/06/2024
+ms.date: 11/13/2024
 ms.author: jgerend 
 ms.reviewer: JasonGerend
 zone_pivot_groups: windows-os
 ---
 
 # Network ATC overview
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 [!INCLUDE [hci-applies-to-23h2-22h2](../includes/hci-applies-to-23h2-22h2.md)]
 
@@ -40,7 +40,7 @@ Network ATC provides the following features:
 
 - **Windows Admin Center deployment**: Network ATC is integrated with Windows Admin Center to provide an easy-to-use experience for deploying host networking.
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 - **Network symmetry**: Network ATC configures and optimizes all adapters identically based on your configuration. Beginning with Azure Local, version 22H2, Network ATC also verifies the make, model, and speed of your network adapter to ensure network symmetry across all nodes of the cluster.
 
@@ -64,7 +64,7 @@ Network ATC provides the following features:
 
   - Assigns VLANs
 
-  :::zone pivot="azure-stack-hci"
+  :::zone pivot="azure-local"
 
   - Beginning with Azure Local, version 22H2, Network ATC automatically assigns IP Addresses for storage adapters.
 
@@ -127,7 +127,7 @@ The following video provides an overview of Network ATC using the [Copy-NetInten
 
 To get started with Network ATC, review the following articles:
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 - Review Network ATC defaults and example deployment options. See [Deploy host networking with Network ATC](../deploy/network-atc.md?pivots=azure-stack-hci).
 - Configure Network ATC using PowerShell. See [Step 4: Configure host networking](../deploy/create-cluster-powershell.md#step-4-configure-host-networking).

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

@@ -56,6 +56,7 @@ Before you begin, make sure that the physical machine and storage hardware used
 |Data drives|At least two disks with a minimum capacity of 500 GB (SSD or HDD).<br>Single machines must use only a single drive type: Nonvolatile Memory Express (NVMe) or Solid-State (SSD) drives.|
 |Trusted Platform Module (TPM)|TPM version 2.0 hardware must be present and turned on.|
 |Secure boot|Secure Boot must be present and turned on.|
+|GPU | Optional<br>Up to 192 GB memory per machine. |
 
 The machines should also meet this extra requirement:
 

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

@@ -6,14 +6,14 @@ ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-stack-hci
 ms.custom: references_regions
-ms.date: 11/07/2024
+ms.date: 11/14/2024
 ---
 
-# System requirements for Small Form Factor deployment of Azure Local, version 23H2 (preview)
+# System requirements for small form factor deployments of Azure Local, version 23H2 (preview)
 
 [!INCLUDE [applies-to](../includes/hci-applies-to-23h2.md)]
 
-This article describes the requirements for machines, storage, and networking for building solutions of Azure Local that use the Small Form Factor hardware. If you purchase class *small* hardware from the [Azure Local Catalog](https://aka.ms/AzureStackHCICatalog), ensure that these requirements are met before you deploy the Azure Local solutions.
+This article describes the requirements for machines, storage, and networking for building solutions of Azure Local that use the small form factor hardware. If you purchase class *small* hardware from the [Azure Local Catalog](https://aka.ms/AzureStackHCICatalog), ensure that these requirements are met before you deploy the Azure Local solutions.
 
 [!INCLUDE [important](../includes/hci-preview.md)]
 
@@ -32,22 +32,25 @@ The following table lists the requirements for the small hardware:
 | Component | Description |
 |-----------|-------|
 | Number of machines | 1 to 3 machines are supported. Each machine must be the same model, manufacturer, have the same network adapters, and have the same number and type of storage drives. |
-| CPU | An Intel Xeon or AMD EPYC or later compatible processor with second-level address translation (SLAT). <br> Up to 16 physical cores |
-| Memory | A minimum of 32 GB per machine with EEC. |
+| CPU | An Intel Xeon or AMD EPYC or later compatible processor with second-level address translation (SLAT). <br> Up to 14 physical cores |
+| Memory | A minimum of 32 GB per machine and a maximum of 128 GB per machine with EEC. |
 | Host network adapters | Two network adapters listed in the [Windows Server Catalog](https://www.windowsservercatalog.com/).<br> RDMA isn't required for storage intent.<br> Minimum link speed must be 1 Gbit/s. |
 | BIOS | Intel VT or AMD-V must be turned on.|
 | Boot drive | A minimum size of 200 GB.|
 | Data drives | A minimum single disk of capacity 1 TB. <br> The drives must be all flash single drive type, either Nonvolatile Memory Express (NVME) or Solid-State Drive (SSD). <br> All the drives must be of the same type. <br> No caching. |
 | Trusted Platform Module (TPM) | TPM version 2.0 hardware must be present and enabled. |
-| Secure boot | Secure Boot must be present and turned on. |
+| Secure Boot | Secure Boot must be present and turned on. |
 | Storage Controller | Pass-through. <br> RAID controller cards or SAN (Fibre Channel, iSCSI, FCoE) aren't supported. |
-| GPU | Optional |
+| GPU | Optional<br>Up to 192 GB memory per machine. |
+
+>[!IMPORTANT]
+> For 2411 release, Update, `Add-server`, and `Repair-server` operations aren't supported for the small hardware class.
 
 ## Storage requirements
 
 The storage subsystem for an Azure Local running Azure Stack HCI OS is layered on top of Storage Space Direct. When building a solution using class *small* hardware:
 
-- A minimum of one data drive is required to create a storage pool. 
+- A minimum of one data drive is required to create a storage pool.
 - All drives in the pool must be of the same type, either NVMe or SSD.
 - Remember that mixing drive types for caching (NVMe and SSD, or SSD and HDD) isn't supported.
 

azure-local/deploy/network-atc.md

@@ -3,14 +3,16 @@ title: Deploy host networking with Network ATC
 description: This topic covers how to deploy host networking for Azure Stack HCI and Windows Server.
 author: dcuomo
 ms.topic: how-to
-ms.date: 11/06/2024
+ms.date: 11/13/2024
 ms.author: dacuo
 ms.reviewer: jgerend
 zone_pivot_groups: windows-os
 ---
 
 # Deploy host networking with Network ATC
 
+:::zone pivot="azure-local"
+
 [!INCLUDE [applies-to](../includes/hci-applies-to-22h2.md)]
 
 This article guides you through the requirements, best practices, and deployment of Network ATC. Network ATC simplifies the deployment and network configuration management for Azure Stack HCI clusters. Network ATC provides an intent-based approach to host network deployment. By specifying one or more intents (management, compute, or storage) for a network adapter, you can automate the deployment of the intended configuration. For more information on Network ATC, including an overview and definitions, please see [Network ATC overview](../concepts/network-atc-overview.md).
@@ -29,7 +31,7 @@ If you have feedback or encounter any issues, review the Requirements and best p
 
 ## Prerequisites
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -168,7 +170,7 @@ For this intent, compute, storage, and management networks are deployed and mana
 
 :::image type="content" source="media/network-atc/network-atc-2-full-converge.png" alt-text="Fully converged intent" lightbox="media/network-atc/network-atc-2-full-converge.png":::
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -200,7 +202,7 @@ Two intents are managed across cluster nodes. Management uses pNIC01, and pNIC02
 
 :::image type="content" source="media/network-atc/network-atc-3-separate-management-compute-storage.png" alt-text="Storage and compute converged intent"  lightbox="media/network-atc/network-atc-3-separate-management-compute-storage.png":::
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -235,7 +237,7 @@ For this intent, compute, storage, and management networks are all managed on di
 
 :::image type="content" source="media/network-atc/network-atc-4-fully-disaggregated.png" alt-text="Fully disaggregated intent"  lightbox="media/network-atc/network-atc-4-fully-disaggregated.png":::
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -273,7 +275,7 @@ For this intent, only storage is managed. Management and compute adapters aren't
 
 :::image type="content" source="media/network-atc/network-atc-5-fully-disaggregated-storage-only.png" alt-text="Storage only intent"  lightbox="media/network-atc/network-atc-5-fully-disaggregated-storage-only.png":::
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -305,7 +307,7 @@ For this intent, compute and management networks are managed, but not storage.
 
 :::image type="content" source="media/network-atc/network-atc-6-disaggregated-management-compute.png" alt-text="Management and compute intent"  lightbox="media/network-atc/network-atc-6-disaggregated-management-compute.png":::
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -337,7 +339,7 @@ For this intent, multiple compute switches are managed.
 
 :::image type="content" source="media/network-atc/network-atc-7-multiple-compute.png" alt-text="Multiple switches intent"  lightbox="media/network-atc/network-atc-7-multiple-compute.png":::
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -372,7 +374,7 @@ This section lists some of the key default values used by Network ATC.
 
 ### Default values
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 This section covers additional default values that Network ATC will be setting in versions 22H2 and later.
 
@@ -386,7 +388,7 @@ This section covers additional default values that Network ATC will be setting.
 
 #### Default VLANs
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 Applies to: Azure Stack HCI 21H2, 22H2
 
@@ -409,7 +411,7 @@ Network ATC uses the following VLANs by default for adapters with the _storage_
 
 Consider the following command:
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 # [22H2](#tab/22H2)
 
@@ -442,7 +444,7 @@ The physical NIC (or virtual NIC if necessary) is configured to use VLANs 711, 7
 
 #### Automatic storage IP addressing
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 Applies to: Azure Stack HCI 22H2
 
@@ -471,7 +473,7 @@ Add-NetIntent -Name MyIntent -Storage -Compute -AdapterName 'pNIC01', 'pNIC02' -
 
 #### Cluster network settings
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 Applies to: Azure Stack HCI 22H2
 
@@ -572,7 +574,7 @@ This message will occur when RoCE RDMA is in use and you have overridden the def
 
 ## Next steps
 
-:::zone pivot="azure-stack-hci"
+:::zone pivot="azure-local"
 
 - Manage your Network ATC deployment. See [Manage Network ATC](../manage/manage-network-atc.md?pivots=azure-stack-hci).
 - Learn more about [Stretched clusters](../concepts/stretched-clusters.md?pivots=azure-stack-hci).

azure-local/faq.yml

@@ -6,7 +6,7 @@ metadata:
   author: cosmosdarwin
   ms.author: cosdar
   ms.service: azure-stack-hci
-  ms.date: 10/21/2024
+  ms.date: 11/13/2024
 title: Azure Local FAQ
 summary: The Azure Local FAQ provides information about Azure Local connectivity with the cloud, and how Azure Local relates to Windows Server.
 
@@ -53,6 +53,8 @@ sections:
       - question: What happens if my network connection to the cloud temporarily goes down?
         answer: |
           While your connection is down, all host infrastructure and VMs continue to run normally, and you can use edge-local tools for management. However, you wouldn't be able to use features that directly rely on cloud services. Information in the Azure portal may also become out-of-date until Azure Local is able to sync again.
+          
+          Configuration changes made to Arc VMs using edge-local tools won't automatically sync with Azure.
 
       - question: How long can Azure Local run with the connection down?
         answer: |

azure-local/hybrid-capabilities-with-azure-services-23h2.md

@@ -66,7 +66,7 @@ In addition to hybrid functionality provided through Azure Arc, you can enable t
 
 - **Azure Site Recovery.** With Azure Site Recovery support, you can continuously replicate VMs from Azure Local to Azure, as well as fail over and fail back. To learn more about Azure Site Recovery, see [Protect your Hyper-V Virtual Machines with Azure Site Recovery and Windows Admin Center](manage/azure-site-recovery.md).
 
-- **Azure Update Manager.** Azure Update Manager is an Azure service that allows you to apply, view, and manage updates for each of your Azure Local machines. You can view each Azure Local across your entire infrastructure, or in remote or branch offices and update at scale. For more information, see [Use Azure Update Manager to update your Azure Local, version 23H2](update/azure-update-manager-23h2.md).
+- **Azure Update Manager.** Azure Update Manager is an Azure service that allows you to apply, view, and manage updates for each of your Azure Local instances. You can view each Azure Local across your entire infrastructure, or in remote or branch offices and update at scale. For more information, see [Use Azure Update Manager to update your Azure Local, version 23H2](update/azure-update-manager-23h2.md).
 
 ## Next steps
 

azure-local/includes/disconnected-operations-preview.md

@@ -0,0 +1,12 @@
+---
+author: ronmiab
+ms.author: robess
+ms.service: azure-local
+ms.topic: include
+ms.date: 11/15/2024
+ms.reviewer: alkohli
+ms.lastreviewed: 11/15/2024
+---
+
+> [!IMPORTANT]
+> This feature is currently in PREVIEW. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).

azure-local/includes/hci-applies-to-22h2-cluster-updates.md

@@ -3,10 +3,12 @@ author: ronmiab
 ms.author: robess
 ms.service: azure-stack-hci
 ms.topic: include
-ms.date: 01/18/2024
+ms.date: 11/15/2024
 ---
 
 <!-- Applies to all update articles for Azure Stack HCI, version 22H2 -->
 
 > [!WARNING]
-> The update of Azure Stack HCI, version 22H2 to Azure Stack HCI, version 23H2 is currently not supported. For new deployments, we recommend that you use Azure Stack HCI, version 23H2 which is now generally available. For more information on Azure Stack HCI, version 23H2, see [Use Azure Update Manager to update your Azure Stack HCI, version 23H2](../update/azure-update-manager-23h2.md).
+> Use this article only to apply feature updates and cumulative updates for Azure Stack HCI, version 22H2 systems. To upgrade your Azure Stack HCI, version 22H2 to Azure Stack HCI, version 23H2, see [About Azure Stack HCI, version 23H2 Upgrades](../upgrade/about-upgrades-23h2.md).
+>
+> For new deployments, we recommend that you use the generally available Azure Stack HCI, version 23H2. For more information on updating Azure Stack HCI, version 23H2, see [Use Azure Update Manager to update your Azure Stack HCI, version 23H2](../update/azure-update-manager-23h2.md).

azure-local/index.yml

@@ -26,10 +26,10 @@ landingContent:
         links:
           - text: What's new in Azure Local, version 23H2?
             url: whats-new.md
-          - text: Small Form Factor
-            url: index.yml
-          - text: Azure Local disconnected operations
-            url: index.yml  
+          - text: Small Form Factor (preview)
+            url: concepts/system-requirements-small-23h2.md
+          - text: Azure Local disconnected operations (preview)
+            url: manage/disconnected-operations-overview.md  
 
   # Card 
   - title: Deploy
@@ -69,11 +69,11 @@ landingContent:
       - linkListType: deploy
         links:
           - text: Deploy Azure Kubernetes Service clusters
-            url: /azure/aks/hybrid/aks-create-clusters-portal?toc=/azure-stack/hci/toc.json&bc=/azure-stack/breadcrumb/toc.json
+            url: /azure/aks/hybrid/aks-create-clusters-portal?toc=/azure-local/toc.json&bc=/azure-local/breadcrumb/toc.json
           - text: Run Azure Virtual Desktop
             url: /azure/virtual-desktop/azure-stack-hci-overview
           - text: Run Azure Arc Virtual Machines
-            url: /azure-stack/hci/manage/create-arc-virtual-machines
+            url: /manage/create-arc-virtual-machines.md
 
   # Card
   - title: Manage
@@ -89,7 +89,7 @@ landingContent:
           - text: Manage Arc VMs
             url: manage/manage-arc-virtual-machines.md
           - text: Manage SDN Multisite
-            url: manage/manage-sdn-multisite.md?pivots=azure-stack-hci
+            url: manage/manage-sdn-multisite.md?pivots=azure-local
 
   # Card
   - title: Monitor
@@ -103,7 +103,7 @@ landingContent:
           - text: Monitor via Insights
             url: manage/monitor-single-23h2.md
           - text: Enable Insights at-scale
-            url: manage/monitor-hci-multi-azure-policies.md          
+            url: manage/monitor-multi-azure-policies.md          
           - text: Azure Monitor Metrics
             url: manage/monitor-cluster-with-metrics.md
           - text: Health alerts
@@ -116,8 +116,8 @@ landingContent:
         links:
           - text: Deploy Arc gateway (preview)
             url: deploy/deployment-azure-arc-gateway-overview.md
-          - text: Deploy with Local Identity (preview)
-            url: index.yml
+#          - text: Deploy with local identity (preview)
+#            url: index.yml
           - text: Manage GPU via partitioning (preview)
             url: manage/gpu-manage-via-partitioning.md
           - text: Migrate VMware (preview)