resolved merge conflict

Manika Dhiman · Manika Dhiman · commit 4824b5b4c97a · 2025-04-14T15:58:32.000-07:00
diff --git a/AKS-Arc/aks-overview.md b/AKS-Arc/aks-overview.md
@@ -2,7 +2,7 @@
 title: What is AKS enabled by Azure Arc?
 description: Learn about AKS enabled by Azure Arc and available deployment options.
 ms.topic: overview
-ms.date: 04/10/2025
+ms.date: 04/14/2025
 author: sethmanheim
 ms.author: sethm 
 ms.reviewer: abha
@@ -39,16 +39,11 @@ The following list describes some of the common use cases for AKS, but is not an
 
 The available deployment options are as follows:
 
-- **AKS on Azure Local**: AKS on Azure Local uses Azure Arc to create new Kubernetes clusters on Azure Local directly from Azure. It enables you to use familiar tools like the Azure portal and Azure Resource Manager templates to create and manage your Kubernetes clusters running on Azure Local.
-- **AKS Edge Essentials**: AKS Edge Essentials includes a lightweight Kubernetes distribution with a small footprint and simple installation experience, making it easy for you to deploy Kubernetes on PC-class or "light" edge hardware.
-- **AKS on Windows Server**: Azure Kubernetes Service on Windows Server (and on Azure Local) is an on-premises Kubernetes implementation of AKS that automates running containerized applications at scale, using Windows PowerShell and Windows Admin Center. It simplifies deployment and management of AKS on Windows Server 2019/2022 Datacenter and Azure Local.
-- **AKS on VMWare (preview)**: AKS on VMware (preview) enables you to use Azure Arc to create new Kubernetes clusters on VMware vSphere. With AKS on VMware, you can manage your AKS clusters running on VMware vSphere using familiar tools like Azure CLI.
+- [**AKS on Azure Local**](aks-whats-new-local.md): AKS on Azure Local uses Azure Arc to create new Kubernetes clusters on Azure Local directly from Azure. It enables you to use familiar tools like the Azure portal and Azure Resource Manager templates to create and manage your Kubernetes clusters running on Azure Local.
+- [**AKS Edge Essentials**](aks-edge-overview.md): AKS Edge Essentials includes a lightweight Kubernetes distribution with a small footprint and simple installation experience, making it easy for you to deploy Kubernetes on PC-class or "light" edge hardware.
+- [**AKS on VMWare (preview)**](aks-vmware-overview.md): AKS on VMware (preview) enables you to use Azure Arc to create new Kubernetes clusters on VMware vSphere. With AKS on VMware, you can manage your AKS clusters running on VMware vSphere using familiar tools like Azure CLI.
+- [**AKS on Windows Server**](overview.md): AKS on Windows Server is an on-premises Kubernetes implementation of AKS that automates running containerized applications at scale, using Windows PowerShell and Windows Admin Center. It simplifies deployment and management of AKS on Windows Server 2019/2022 Datacenter.
 
 ## Next steps
 
-To get started with AKS enabled by Azure Arc, see the following deployment option overviews:
-
 - [What's new in AKS on Azure Local](aks-whats-new-local.md)
-- [AKS on Windows Server](overview.md)
-- [AKS Edge Essentials](aks-edge-overview.md)
-- [AKS on VMware (preview)](aks-vmware-overview.md)
diff --git a/AKS-Arc/deploy-gpu-node-pool-22h2.md b/AKS-Arc/deploy-gpu-node-pool-22h2.md
@@ -1,5 +1,5 @@
 ---
-title: Use GPUs for compute-intensive workloads
+title: Use GPUs for compute-intensive workloads in AKS on Windows Server
 description: Learn how to deploy GPU-enabled node pools in AKS on Windows Server.
 author: sethmanheim
 ms.topic: how-to
@@ -11,7 +11,7 @@ ms.lastreviewed: 03/21/2023
 # Keyword: Run GPU workloads on Kubernetes
 ---
 
-# Use GPUs for compute-intensive workloads
+# Use GPUs for compute-intensive workloads in AKS on Windows Server
 
 [!INCLUDE [aks-hybrid-applies-to-azure-stack-hci-windows-server-sku](includes/aks-hci-applies-to-skus/aks-hybrid-applies-to-azure-stack-hci-windows-server-sku.md)]
 
diff --git a/AKS-Arc/deploy-gpu-node-pool.md b/AKS-Arc/deploy-gpu-node-pool.md
@@ -3,7 +3,7 @@ title: Use GPUs for compute-intensive workloads in AKS on Azure Local
 description: Learn how to deploy GPU-enabled node pools in AKS enabled by Arc on Azure Local.
 author: sethmanheim
 ms.topic: how-to
-ms.date: 03/25/2025
+ms.date: 04/14/2025
 ms.author: sethm 
 ms.lastreviewed: 03/21/2025
 ms.reviewer: abha
@@ -17,7 +17,7 @@ ms.reviewer: abha
 [!INCLUDE [hci-applies-to-23h2](includes/hci-applies-to-23h2.md)]
 
 > [!NOTE]
-> For information about GPUs in AKS on Azure Local 22H2, see [Use GPUs (Azure Local 22H2)](deploy-gpu-node-pool-22h2.md).
+> For information about GPUs in AKS on Windows Server, see [Use GPUs in AKS on Windows Server](deploy-gpu-node-pool-22h2.md).
 
 Graphical Processing Units (GPU) are used for compute-intensive workloads such as machine learning, deep learning, and more. This article describes how to use GPUs for compute-intensive workloads in AKS enabled by Azure Arc.
 
diff --git a/AKS-Arc/encrypt-etcd-secrets.md b/AKS-Arc/encrypt-etcd-secrets.md
@@ -105,6 +105,6 @@ If you encounter any errors with the KMS plugin, follow the procedure on the [Tr
 
 ## Next steps
 
-- [Encrypt etcd secrets for Kubernetes clusters in AKS on Windows Server](encrypt-secrets.md)
+- [Create Kubernetes clusters](aks-create-clusters-cli.md#deploy-the-application-and-load-balancer)
 - [Deploy a Linux application on a Kubernetes cluster](deploy-linux-application.md)
-- [Deploy a Windows Server application on a Kubernetes cluster](deploy-windows-application.md)
+
diff --git a/AKS-Arc/includes/supported-gpu-models.md b/AKS-Arc/includes/supported-gpu-models.md
@@ -2,15 +2,15 @@
 author: sethmanheim
 ms.author: sethm
 ms.topic: include
-ms.date: 03/25/2025
+ms.date: 04/14/2025
 ms.reviewer: abha
-ms.lastreviewed: 03/25/2025
+ms.lastreviewed: 04/14/2025
 
 ---
 
 ## Supported GPU models
 
-The following GPU models are supported by AKS on Azure Local, version 23H2:
+The following GPU models are supported by AKS on Azure Local.
 
 | Manufacturer | GPU model | Supported version |
 |--------------|-----------|-------------------|
@@ -20,7 +20,7 @@ The following GPU models are supported by AKS on Azure Local, version 23H2:
 
 ## Supported GPU VM sizes
 
-The following VM sizes for each GPU model are supported by AKS on Azure Local, version 23H2.
+The following VM sizes for each GPU model are supported by AKS on Azure Local.
 
 ### Nvidia T4 is supported by NK T4 SKUs
 
diff --git a/adaptive-cloud/docfx.json b/adaptive-cloud/docfx.json
@@ -45,7 +45,8 @@
       "feedback_system": "Standard",
       "permissioned-type": "public",
       "manager":"lizross",
-      "ms.service": "azure-stack",
+      "ms.service": "azure",
+      "ms.subservice": "azure-adaptive-cloud",
       "tittleSuffix": "Azure Adaptive Cloud",
       "feedback_product_url": "https://feedback.azure.com/d365community/forum/5c778dec-0625-ec11-b6e6-000d3a4f0858",
       "feedback_help_link_url": "https://learn.microsoft.com/en-us/answers/tags/146/azure-arc"
diff --git a/adaptive-cloud/index.yml b/adaptive-cloud/index.yml
@@ -6,7 +6,8 @@ brand: azure
 metadata:
   title: Azure adaptive cloud documentation
   description: Leverage cloud-native and AI technologies to work simultaneously across hybrid, multicloud, edge, and IoT.
-  ms.service: azure-stack
+  ms.service: azure
+  ms.subservice: azure-adaptive-cloud
   ms.topic: hub-page
   author: asergaz 
   ms.author: sergaz
diff --git a/azure-local/assurance/azure-stack-hipaa-guidance.md b/azure-local/assurance/azure-stack-hipaa-guidance.md
@@ -1,7 +1,7 @@
 ---
 title: HIPAA guidance for Azure Local
 description: Learn about HIPAA compliance using Azure Local.
-ms.date: 12/27/2024
+ms.date: 04/09/2025
 ms.topic: conceptual
 ms.service: azure-local
 ms.author: nguyenhung
@@ -94,7 +94,7 @@ If you're using Microsoft Entra ID to manage identity and access to the platform
 
 #### SIEM integration
 
-Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled Azure Local machines. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as HIPAA and HITRUST, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
+Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled servers. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as HIPAA and HITRUST, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
 
 #### Azure Local Insights
 
diff --git a/azure-local/assurance/azure-stack-iso27001-guidance.md b/azure-local/assurance/azure-stack-iso27001-guidance.md
@@ -1,7 +1,7 @@
 ---
 title: ISO 27001 guidance for Azure Local
 description: Learn about ISO 27001 compliance using Azure Local.
-ms.date: 12/27/2024
+ms.date: 04/09/2025
 ms.topic: conceptual
 ms.service: azure-local
 ms.author: nguyenhung
@@ -124,7 +124,7 @@ If you're using Microsoft Entra ID to manage identity and access to the platform
 
 #### SIEM integration
 
-Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled Azure Local machines. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, also complies with many well-established security standards such as ISO/IEC 27001, which can help you with your certification process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to the third party SIEM solutions.
+Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled servers. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, also complies with many well-established security standards such as ISO/IEC 27001, which can help you with your certification process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to the third party SIEM solutions.
 
 ### Monitoring
 
diff --git a/azure-local/assurance/azure-stack-pci-dss-guidance.md b/azure-local/assurance/azure-stack-pci-dss-guidance.md
@@ -1,7 +1,7 @@
 ---
 title: PCI DSS guidance for Azure Local
 description: Learn about PCI DSS compliance using Azure Local.
-ms.date: 12/27/2024
+ms.date: 04/09/2025
 ms.topic: conceptual
 ms.service: azure-local
 ms.author: nguyenhung
@@ -149,7 +149,7 @@ If you're using Microsoft Entra ID to manage identity and access to the platform
 
 #### SIEM integration
 
-Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled Azure Local machines. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as PCI DSS, HITRUST, and FedRAMP Authorization, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
+Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled servers. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as PCI DSS, HITRUST, and FedRAMP Authorization, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
 
 #### Azure Local Insights
 
diff --git a/azure-local/deploy/deployment-virtual.md b/azure-local/deploy/deployment-virtual.md
@@ -5,7 +5,7 @@ author: alkohli
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.topic: how-to
-ms.date: 02/20/2025
+ms.date: 04/08/2025
 ---
 
 # Deploy a virtual Azure Local system
@@ -39,7 +39,7 @@ Before you begin, make sure that:
 
     | Component | Minimum |
     | ------------- | -------- |
-    | Processor| Intel VT-x or AMD-V, with support for nested virtualization. For more information, see [Does My Processor Support Intel&reg; virtualization technology?](https://www.intel.com/content/www/us/en/support/articles/000005486/processors.html).
+    | Processor| Intel VT-x or AMD-V, with support for nested virtualization. For more information, see [Does My Processor Support Intel&reg; virtualization technology?](https://www.intel.com/content/www/us/en/support/articles/000005486/processors.html)
     | Memory| The physical host must have a minimum of 32 GB RAM for single virtual node deployments. The virtual host VM should have at least 24 GB RAM.<br><br>The physical host must have a minimum of 64 GB RAM for two virtual node deployments. Each virtual host VM should have at least 24 GB RAM for deployment and 32 GB for applying updates.|
     | Host network adapters| A single network adapter.|
     | Storage| 1 TB Solid state drive (SSD). |
@@ -54,9 +54,9 @@ Before you begin, make sure that each virtual host system can dedicate the follo
 | vCPUs | Four cores. |
 | Memory | A minimum of 24 GB. |
 | Networking | At least two network adapters connected to internal network. MAC spoofing must be enabled. |
-| Boot disk | One disk to install the Azure Stack HCI operating system from ISO. At least 200 GB |
+| Boot disk | One disk to install the Azure Stack HCI operating system from ISO. At least 200 GB. |
 | Hard disks for Storage Spaces Direct | Four dynamic expanding disks. Maximum disk size is 1024 GB. |
-| Data disks | At least 127 GB each. The size must be the same for each disk |
+| Data disks | At least 127 GB each. The size must be the same for each disk. |
 | Time synchronization in integration  | Disabled. |
 
 > [!NOTE]
@@ -359,4 +359,4 @@ Repeat the process above for extra nodes if you plan to test multi-node deployme
 
 ## Next steps
 
-- [Register to Arc and assign permissions for deployment](deployment-arc-register-server-permissions.md)
+- [Register to Arc and assign permissions for deployment](deployment-arc-register-server-permissions.md).
diff --git a/azure-local/manage/collect-logs.md b/azure-local/manage/collect-logs.md
@@ -5,7 +5,7 @@ author: alkohli
 ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-local
-ms.date: 11/11/2024
+ms.date: 04/08/2025
 ---
 
 # Collect diagnostic logs for Azure Local (preview)
@@ -627,4 +627,4 @@ When requested, share the following information with Microsoft Support. Get this
 
 ## Next steps
 
-- [Contact Microsoft Support](get-support.md)
+- [Contact Microsoft Support](get-support.md).
diff --git a/azure-local/manage/get-support.md b/azure-local/manage/get-support.md
@@ -11,7 +11,7 @@ ms.date: 01/21/2025
 
 [!INCLUDE [hci-applies-to-23h2-22h2](../includes/hci-applies-to-23h2-22h2.md)]
 
-This topic provides guidance on how to get support for Azure Local. Azure Local follows the same support process as Azure. Enterprise customers can follow the process described in [Create an Azure support request](/azure/azure-portal/supportability/how-to-create-azure-support-request). If you're a customer of a Cloud Solution Provider (CSP), contact your CSP for support.
+This article provides guidance on how to get support for Azure Local. Azure Local follows the same support process as Azure. Enterprise customers can follow the process described in [Create an Azure support request](/azure/azure-portal/supportability/how-to-create-azure-support-request). If you're a customer of a Cloud Solution Provider (CSP), contact your CSP for support.
 
 Updates for Azure Local are released monthly to enhance customer experience. To keep your Azure Local instance in a supported state, you have up to six months to install updates, but we recommend installing updates as they are released. Microsoft provides monthly quality and security updates for each supported version of Azure Local and quarterly feature releases.
 
diff --git a/azure-local/manage/manage-data-disks.md b/azure-local/manage/manage-data-disks.md
@@ -3,7 +3,7 @@ title: Download Azure managed disk to Azure Local
 description: Learn how to download Azure managed disk to Azure Local.
 author: alkohli
 ms.topic: how-to
-ms.date: 11/18/2024
+ms.date: 04/09/2025
 ms.author: alkohli
 ms.service: azure-local
 ---
@@ -12,7 +12,7 @@ ms.service: azure-local
 
 [!INCLUDE [applies-to](../includes/hci-applies-to-23h2.md)]
 
-This article describes how to download an Azure managed disk from Azure to your Azure Local instance. You can then use the disk to create an image or to attach it to your Arc virtual machines (VMs) as needed.
+This article describes how to download an Azure managed disk from Azure to your Azure Local instance. You can then use the disk to create an image or to attach it to your Azure Local virtual machines (VMs) enabled by Arc, as needed.
 
 ## Prerequisites
 
@@ -104,4 +104,4 @@ Download Uri for VHD is: https://*****
 
 ## Next steps
 
-[Create Azure Local VM image using images in a local share](virtual-machine-image-local-share.md)
+[Create Azure Local VM image using images in a local share](virtual-machine-image-local-share.md)
diff --git a/azure-local/manage/support-tools.md b/azure-local/manage/support-tools.md
@@ -4,7 +4,7 @@ description: This article provides guidance on the Support Diagnostic Tool for A
 author: alkohli
 ms.author: alkohli
 ms.topic: how-to
-ms.date: 02/18/2025
+ms.date: 04/09/2025
 ---
 
 # Use the Support Diagnostic Tool to troubleshoot Azure Local issues
diff --git a/azure-local/manage/troubleshoot-deployment.md b/azure-local/manage/troubleshoot-deployment.md
diff --git a/azure-local/manage/troubleshoot-sdn-deployment.md b/azure-local/manage/troubleshoot-sdn-deployment.md
diff --git a/azure-local/update/about-updates-23h2.md b/azure-local/update/about-updates-23h2.md
