resolve conflict

b-ahibbard · b-ahibbard · commit 4d6d5d2ad92a · 2024-10-09T14:56:07.000-04:00
diff --git a/articles/azure-netapp-files/cross-region-replication-introduction.md b/articles/azure-netapp-files/cross-region-replication-introduction.md
@@ -5,7 +5,7 @@ services: azure-netapp-files
 author: b-hchen
 ms.service: azure-netapp-files
 ms.topic: conceptual
-ms.date: 10/01/2024
+ms.date: 10/09/2024
 ms.author: anfdocs
 ms.custom: references_regions
 ---
@@ -48,13 +48,14 @@ Azure NetApp Files volume replication is supported between various [Azure region
 | Geography | Regional Pair A | Regional Pair B  |
 |:--- |:--- |:--- |
 | Australia/Southeast Asia | Australia East | Southeast Asia |
+| Israel/Sweden | Israel Central | Sweden Central | 
+| Qatar/Europe | Qatar Central | West Europe |
 | France/Europe | France Central | West Europe |
 | Germany/UK | Germany West Central | UK South |
 | Germany/Europe | Germany West Central | West Europe | 
 | Germany/France | Germany West Central | France Central |
-| Spain/Sweden | Spain Central | Sweden Central |
 | Sweden/Germany | Sweden Central | Germany West Central |
-| Qatar/Europe | Qatar Central | West Europe |
+| Spain/Sweden | Spain Central | Sweden Central |
 | North America | East US | East US 2 |
 | North America | East US 2| West US 2 |
 | North America | East US 2 | West US 3 |
diff --git a/articles/backup/azure-kubernetes-service-cluster-restore.md b/articles/backup/azure-kubernetes-service-cluster-restore.md
@@ -16,8 +16,8 @@ This article describes how to restore backed-up Azure Kubernetes Service (AKS).
 
 Azure Backup now allows you to back up AKS clusters (cluster resources and persistent volumes attached to the cluster) using a backup extension, which must be installed in the cluster. Backup vault communicates with the cluster via this Backup Extension to perform backup and restore operations. 
 
->[!Note]
->Vaulted backup and Cross Region Restore for AKS using Azure Backup are currently in preview.
+> [!NOTE]
+> Vaulted backup and Cross Region Restore for AKS using Azure Backup are currently in preview.
 
 ## Before you start
 
@@ -33,97 +33,37 @@ For more information on the limitations and supported scenarios, see the [suppor
 
 To restore the backed-up AKS cluster, follow these steps:
 
-1. Go to **Backup center** and select **Restore**.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/start-kubernetes-cluster-restore.png" alt-text="Screenshot shows how to start the restore process.":::
-
-2. On the next page, select **Select backup instance**, and then select the *instance* that you want to restore.
-
-   If the instance is available in both *Primary* and *Secondary Region*, select the *region to restore* too, and then select **Continue**.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-backup-instance-for-restore.png" alt-text="Screenshot shows selection of backup instance for restore.":::
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/choose-instances-for-restore.png" alt-text="Screenshot shows choosing instances for restore.":::
-   
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/starting-kubernetes-restore.png" alt-text="Screenshot shows starting restore.":::
-
-3. Click **Select restore point** to select the *restore point* you want to restore. 
-
-   If the restore point is available in both Vault and Operation datastore, select the one you want to restore from.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-restore-points-for-kubernetes.png" alt-text="Screenshot shows how to view the restore points.":::
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/choose-restore-points-for-kubernetes.png" alt-text="Screenshot shows selection of a restore point.":::
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/open-restore-page.png" alt-text="Screenshot shows how to go to the Restore page.":::
-
-
-4. In the **Restore parameters** section, click **Select Kubernetes Service** and select the *AKS cluster* to which you want to restore the backup to.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/parameter-selection.png" alt-text="Screenshot shows how to initiate parameter selection.":::
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-kubernetes-service-parameter.png" alt-text="Screenshot shows selection of parameter Kubernetes Service.":::
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/set-for-restore-after-parameter-selection.png" alt-text="Screenshot shows the Restore page with the selection of Kubernetes parameter.":::
-
-5. To select the *backed-up cluster resources* for restore, click **Select resources**.
-
-   Learn more about [restore configurations](#restore-configurations).
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-resources-to-restore-page.png" alt-text="Screenshot shows the Select Resources to restore page.":::
-
-6. If you selected a recovery point for restore from *Vault-standard datastore*, then provide a *snapshot resource group* and *storage account* as the staging location.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/restore-parameters.png" alt-text="Screenshot shows the parameters to add for restore from Vault-standard storage.":::
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/restore-parameter-storage.png" alt-text="Screenshot shows the storage parameter to add for restore from Vault-standard storage.":::
-
->[!Note]
->Currently, resources created in the staging location can't belong within a Private Endpoint. Ensure that you enable _public access_ on the storage account provided as a staging location.
-
-7. Select **Validate** to run validation on the cluster selections for restore.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/validate-restore-parameters.png" alt-text="Screenshot shows the validation of restore parameters.":::
-
-
-8. Once the validation is successful, select **Review + restore** and restore the backups to the selected cluster.
-
-   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/review-restore-tab.png" alt-text="Screenshot shows the Review + restore tab for restore.":::
+1. In the Azure portal, navigate to your AKS cluster resource.
+1. From the service menu, under **Settings**, select **Backup** > **Restore**.
+1. On the *Start: Restore* page, select **Select backup instance**, select the *instance* that you want to restore, and then select **Select** > **Continue**.
+1. On the *Basics* tab of the *Restore* page, select the *Restore Region* you want to restore the backup to, and then select **Next: Restore point**.
+1. Select **Select restore point**, select the *restore point* you want to restore from, and then select **Select** > **Next: Restore parameters**.
+1. On the *Restore parameters* tab, ensure that the *AKS cluster* is selected as the *restore target*, and then select **Validate**.
+1. Once the validation completes, select **Next: Review + restore** > **Restore**.
 
 ### Restore configurations
 
-As part of item-level restore capability of AKS backup, you can utilize multiple restore configuration filters   to perform restore.
+As part of item-level restore capability of AKS backup, you can utilize multiple restore configuration filters to perform restore.
 
-- Select the *Namespaces* that you want to restore from the list. The list shows only the backed-up Namespaces. 
+- On the *Restore parameters* tab, next to *Restore configuration*, select **Select resources**, and select the *Namespaces* that you want to restore from the list. The list shows only the backed-up namespaces.
 
   :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-namespace.png" alt-text="Screenshot shows selection of Namespace.":::
 
-  You can also select the checkboxes if you want to restore cluster scoped resources and persistent volumes (of Azure Disk only).
-
-  To restore specific cluster resources, use the labels attached to them in the textbox. Only resources with the entered labels are backed up.
-
 - You can provide *API Groups* and *Kinds* to restore specific resource types. The list of *API Group* and *Kind* is available in the *Appendix*. You can enter *multiple API Groups*.
+- To restore a workload, such as Deployment from a backup via API Group, the entry should be:
 
-  :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/use-api-for-restore.png" alt-text="Screenshot shows the usage of API for restore.":::
-
-- To restore a workload, such as Deployment from a backup via API Group, the entry should be: 
-
-   - **Kind**: Select **Deployment**.
-   - **Group**: Select **Group**.
-   - **Namespace Mapping**: To migrate the backed-up cluster resources to a different *Namespace*, select the *backed-up Namespace*, and then enter the *Namespace* to which you want to migrate the resources.
-
-     If the *Namespace* doesn't exist in the AKS cluster, it gets created. If a conflict occurs during the cluster resources restore, you can skip or patch the conflicting resources.
-   
-     :::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-backed-up-namespace-for-migrate.png" alt-text="Screenshot shows the selection of namespace for migration.":::
+  - **Kind**: Select **Deployment**.
+  - **Group**: Select **Group**.
+  - **Namespace Mapping**: To migrate the backed-up cluster resources to a different *Namespace*, select the *backed-up Namespace*, and then enter the *Namespace* to which you want to migrate the resources.
 
 Azure Backup for AKS currently supports the following two options when doing a restore operation when resource clash happens (backed-up resource has the same name as the resource in the target AKS cluster). You can choose one of these options when defining the restore configuration.
 
 - **Skip**: This option is selected by default. For example, if you backed up a PVC named *pvc-azuredisk* and you're restoring it in a target cluster that has the PVC with the same name, then the backup extension skips restoring the backed-up persistent volume claim (PVC). In such scenarios, we recommend you to delete the resource from the cluster, and then do the restore operation.
 
-- **Patch**: This option allows the patching mutable variable in the backed-up resource on the resource in the target cluster. If you want to update the number of replicas in the target cluster, you can opt for patching as an operation. 
+- **Patch**: This option allows the patching mutable variable in the backed-up resource on the resource in the target cluster. If you want to update the number of replicas in the target cluster, you can opt for patching as an operation.
 
->[!Note]
->AKS backup currently doesn't delete and recreate resources in the target cluster if they already exist. If you attempt to restore Persistent Volumess in the original location, delete the existing Persistent Volumes, and then do the restore operation.
+> [!NOTE]
+> AKS backup currently doesn't delete and recreate resources in the target cluster if they already exist. If you attempt to restore Persistent Volumes in the original location, delete the existing Persistent Volumes, and then do the restore operation.
 
 ## Restore in secondary region (preview)
 
diff --git a/articles/virtual-network/virtual-network-network-interface.md b/articles/virtual-network/virtual-network-network-interface.md
@@ -6,7 +6,7 @@ author: asudbring
 ms.service: azure-virtual-network
 ms.custom: devx-track-azurecli, devx-track-azurepowershell
 ms.topic: how-to
-ms.date: 03/20/2023
+ms.date: 10/09/2024
 ms.author: allensu
 ---
 
@@ -500,6 +500,9 @@ $nic | Set-AzNetworkInterface
 
 ---
 
+> [!WARNING]
+> You can change the subnet of a primary network interface while the virtual machine is started. You can't change the subnet of a secondary network interface in the same manner. To change the subnet of a secondary network interface, you must first stop and de-allocate the virtual machine.
+
 ### Add or remove from application security groups
 
 You can add NICs only to application security groups in the same virtual network and location as the NIC.
