Resolved merge conflict

Author: Manika Dhiman

azure-stack/hci/manage/add-server.md

@@ -98,11 +98,6 @@ On the new server that you plan to add, follow these steps.
 
 1. Install the operating system and required drivers on the new server that you plan to add. Follow the steps in [Install the Azure Stack HCI, version 23H2 Operating System](../deploy/deployment-install-os.md).
 
-    > [!NOTE]
-    > If your cluster is using a dedicated Network ATC intent for storage, and you are using custom storage IPs, you must configure the IPs on the storage network adapters before adding the new server.
-    > If your cluster is using a shared network ATC intent for storage and other traffic type like compute and management, you will need to manually configure the IPs on the storage virtual network adapters after the server is added to the cluster.
-
-
 2. Register the server with Arc. Follow the steps in [Register with Arc and set up permissions](../deploy/deployment-arc-register-server-permissions.md).
 
     > [!NOTE]

azure-stack/hci/manage/manage-arc-virtual-machines.md

@@ -6,7 +6,7 @@ ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-stack
 ms.subservice: azure-stack-hci
-ms.date: 09/09/2024
+ms.date: 09/13/2024
 ---
 
 # Manage Arc VMs on Azure Stack HCI
@@ -15,7 +15,6 @@ ms.date: 09/09/2024
 
 This article describes how to manage Arc virtual machines (VMs) running on Azure Stack HCI, version 23H2. The procedures to enable guest management, start, stop, restart, pause, save, or delete an Arc VM, are detailed.
 
-
 ## Prerequisites
 
 Before you begin, make sure to complete the following prerequisites:
@@ -34,10 +33,11 @@ There are two agents that are important to understand in the context of guest ma
 
 When you enable guest management on an Arc VM, the guest agent installs the [Azure Connected Machine agent](/azure/azure-arc/servers/agent-overview). The Azure Connected Machine agent enables you to manage Azure Arc VM extensions on your Azure Stack HCI VM.
 
-Based on whether a guest agent is running on your Arc VM, the steps to enable guest management are different.
+Here are some key considerations for enabling guest management on a VM after provisioning it:
 
-> [!IMPORTANT] 
-> Make sure that your Azure Stack HCI cluster is running 2311 or later to run this procedure.
+- Make sure that your Azure Stack HCI cluster is running 2311 or later.
+- Enabling guest management after VM provisioning isn't supported for Windows Server 2012 and Windows Server 2012 R2.
+- The steps to enable guest management differ based on whether a guest agent is running on your Arc VM.
 
 ### Verify if guest agent is running
 

azure-stack/hci/manage/monitor-hci-multi-azure-policies.md

@@ -7,7 +7,7 @@ ms.reviewer: saniyaislam
 ms.topic: how-to
 ms.service: azure-stack
 ms.subservice: azure-stack-hci
-ms.date: 07/30/2024
+ms.date: 09/12/2024
 ---
 
 # Enable Insights for Azure Stack HCI at scale using Azure policies
@@ -37,8 +37,7 @@ Before applying this policy, keep in mind the following things:
 - This policy is applicable only to Azure Stack HCI, version 22H2 clusters. Apply it before any other policies to ensure AMA picks up the correct resource ID.
 - Uninstall AMA before applying this policy to set the correct resource ID. If AMA isn't uninstalled first, data might not appear. For more information, see [Uninstall AMA](/azure/azure-monitor/agents/azure-monitor-agent-manage?tabs=azure-portal#uninstall).
 
-<details>
-  <summary><b>Expand this section to see the policy definition in JSON.</b></summary>
+Here's the policy definition in JSON:
 
 ```json
 {
@@ -455,7 +454,6 @@ Before applying this policy, keep in mind the following things:
   }
 }
 ```
-</details>
 
 ### Policy to install AMA
 
@@ -465,8 +463,7 @@ The policy to install AMA performs the following functions:
 
 - Installs AMA on clusters that aren't compliant with the policy through a remediation task.
 
-<details>
-  <summary><b>Expand this section to see the policy definition in JSON.</b></summary>
+Here's the policy definition in JSON:
 
 ```json
 {
@@ -544,7 +541,6 @@ The policy to install AMA performs the following functions:
   }
 }
 ```
-</details>
 
 ### Policy to configure DCR association
 
@@ -555,8 +551,7 @@ This policy is applied to each server in the Azure Stack HCI cluster and perform
   > [!NOTE]
   > This policy doesn’t create Data Collection Endpoint (DCE). If you're using private links, you must create DCE to ensure there's data available in Insights. For more information, see [Enable network isolation for Azure Monitor Agent by using Private Link](/azure/azure-monitor/agents/azure-monitor-agent-private-link).
 
-<details>
-  <summary><b>Expand this section to see the policy definition in JSON.</b></summary>
+Here's the policy definition in JSON:
 
 ```json
 {
@@ -643,7 +638,6 @@ This policy is applied to each server in the Azure Stack HCI cluster and perform
   }
 }
 ```
-</details>
 
 ## Enable Insights at scale using Azure policies