Skip to content

Commit 1aa4d13

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 98195bf + 5a9a511 commit 1aa4d13

43 files changed

Lines changed: 491 additions & 74 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

articles/azure-netapp-files/configure-kerberos-encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The following requirements apply to NFSv4.1 client encryption:
5353

5454
2. Under **Kerberos Realm**, enter the **AD Server Name** and the **KDC IP** address.
5555

56-
AD Server and KDC IP can be the same server. This information is used to create the SPN computer account used by Azure NetApp Files. After the computer account is created, Azure NetApp Files uses DNS Server records to locate additional KDC servers as needed.
56+
AD Server and KDC IP can be the same server. This information is used to create the SPN computer account used by Azure NetApp Files. After the computer account is created, Azure NetApp Files uses DNS Server records to locate additional KDC servers as needed. In the AD Server Name, provide the hostname of the machine without appending the domain.
5757

5858
![Kerberos Realm](./media/configure-kerberos-encryption/kerberos-realm.png)
5959

articles/azure-netapp-files/cross-zone-region-replication-configure.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 08/14/2025
8+
ms.date: 11/24/2025
99
ms.author: anfdocs
1010
# Customer intent: As a cloud administrator, I want to configure cross-zone-region replication for Azure NetApp Files, so that I can ensure data accessibility and disaster recovery across multiple regions and availability zones.
1111
---
@@ -16,9 +16,8 @@ Azure NetApp Files supports volume cross-zone and cross-region replication on th
1616
## Requirements
1717

1818
- Cross-zone-region replication supports creating two replication relationships for a source volume: cross-zone replication, cross-region replication, or a combination.
19-
- Cross-zone-region replication volumes must abide by the same requirements and considerations as individual [cross-region and cross-zone replication](replication-requirements.md) volumes.
19+
- Cross-zone-region replication volumes must abide by the same requirements and considerations as individual [cross-region and cross-zone replication](replication-requirements.md#shared-requirements-for-cross-zone-and-cross-region-replication) volumes.
2020
- You must break and delete the secondary relationship before you can perform a reverse resync operation with cross-zone-region replication. For more information, see [Resync volumes after disaster recovery](cross-region-replication-manage-disaster-recovery.md#resync-replication).
21-
- Azure NetApp Files replication is supported within a subscription and between subscriptions under the same tenant.
2221
- Fan-out deployments are supported for two destination volumes: one source (read/write) volume and two destination volumes.
2322

2423
>[!NOTE]
@@ -70,4 +69,4 @@ You can also use [Azure CLI commands](/cli/azure/feature) `az feature register`
7069
* [Volume replication metrics](azure-netapp-files-metrics.md#replication)
7170
* [Manage disaster recovery](cross-region-replication-manage-disaster-recovery.md)
7271
* [Delete volume replications or volumes](cross-region-replication-delete.md)
73-
* [Troubleshoot cross-region-replication](troubleshoot-cross-region-replication.md)
72+
* [Troubleshoot cross-region-replication](troubleshoot-cross-region-replication.md)
8.98 KB
Loading

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restore VMs by using the Azure portal using Azure Backup
33
description: Restore an Azure virtual machine from a recovery point by using the Azure portal, including the Cross Region Restore feature.
44
ms.reviewer: nikhilsarode
55
ms.topic: how-to
6-
ms.date: 10/24/2025
6+
ms.date: 11/24/2025
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
99
ms.author: v-mallicka

articles/backup/backup-support-matrix-mars-agent.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Support matrix for the MARS agent
33
description: This article summarizes Azure Backup support when you back up machines that are running the Microsoft Azure Recovery Services (MARS) agent.
4-
ms.date: 11/21/2025
4+
ms.date: 11/24/2025
55
ms.topic: reference
66
ms.custom: engagement-fy24
77
author: AbhishekMallick-MS
@@ -112,7 +112,7 @@ Windows 7| 1,700 GB
112112
>During Azure VM restore, you might experience performance issues in the following scenarios:
113113
> - The number of files to restore exceeds 8 million
114114
> - The total data size to restore is greater than 1 TB
115-
> - The backup set includes more than 20 chained incremental snapshots. >
115+
> - The backup set includes more than 20 chained incremental snapshots.
116116
>
117117
>The restore process can also interrupt due to operational issues such as high latency between the vault and the source machine, low download speed from Azure to the source machine, or limited bandwidth on your machine.
118118
-595 Bytes
Loading
-3.24 KB
Loading
-615 Bytes
Loading
-988 Bytes
Loading
-626 Bytes
Loading

0 commit comments

Comments
 (0)