Merge pull request #309461 from MicrosoftDocs/main

Auto Publish – main to live - 2025-12-12 18:00 UTC

Author: learn-build-service-prod[bot]

articles/api-management/enable-availability-zone-support.md

@@ -38,9 +38,9 @@ When you create a new API Management instance in the **Premium** tier in a regio
 > [!IMPORTANT]
 > To ensure the reliability of your API Management instance, use the automatic availability zone support. To achieve maximum zone redundancy, deploy a minimum of two units in each region where you deploy API Management to ensure that an availability zone outage doesn't affect your instance. For more information, see [Reliability in API Management](../reliability/reliability-api-management.md).
 
-## Manual availability zone support
+### Manual availability zone support
 
-We recommend automatic availability zone configuration, but you can manually configure or update availability zones for an existing location of your API Management instance. The following sections provide steps for manually configuring zone redundancy on an existing location of your API Management instance, depending on whether the instance is injected in a virtual network.
+We recommend automatic availability zone configuration in the Premium tier, but you can manually configure or update availability zones for an existing location of your API Management instance. The following sections provide steps for manually configuring zone redundancy on an existing location of your API Management instance, depending on whether the instance is injected in a virtual network.
 
 > [!NOTE]
 > You can optionally enable a *zonal* configuration, where the API Management instance or location is deployed in a single availability zone. Because it doesn't provide resiliency to an outage in that zone, this configuration generally isn't recommended except for specific scenarios. For more information, see [Reliability in API Management](../reliability/reliability-api-management.md).

articles/azure-app-configuration/emulator-overview.md

@@ -7,7 +7,7 @@ author: zhiyuanliang-ms
 ms.author: zhiyuanliang
 ms.service: azure-app-configuration
 ms.topic: overview
-ms.date: 08/12/2025
+ms.date: 11/12/2025
 #Customer intent: I want to learn about how to Azure App Configuration emulator for local development.
 ---
 
@@ -26,8 +26,7 @@ The following table lists the features supported by the latest Azure App Configu
 | Web UI                                                           | Available |
 | Anonymous Authentication                                         | Available |
 | [HMAC Authentication](./rest-api-authentication-hmac.md)         | Available |
-| [Entra Id Authentication](./rest-api-authentication-azure-ad.md) | WIP       |
-| .NET Aspire Integration                                          | WIP       |
+| .NET Aspire Integration                                          | Available |
 
 | API                                                              | Status    |
 | ---------------------------------------------------------------- | --------- |
@@ -45,7 +44,7 @@ The following table lists the features supported by the latest Azure App Configu
 Use [Docker](https://hub.docker.com/) to pull the latest [App Configuration emulator image](https://mcr.microsoft.com/artifact/mar/azure-app-configuration/app-configuration-emulator/about) by using the following console command:
 
 ```console
-docker pull mcr.microsoft.com/azure-app-configuration/app-configuration-emulator:1.0.0-preview
+docker pull mcr.microsoft.com/azure-app-configuration/app-configuration-emulator:1.0.2
 ```
 
 ### [GitHub](#tab/github)
@@ -81,7 +80,7 @@ The following command runs the App Configuration emulator Docker image. The `-p
 docker run -d -p 8483:8483 \
     -e Tenant:AnonymousAuthEnabled=true \
     -e Authentication:Anonymous:AnonymousUserRole=Owner \
-    mcr.microsoft.com/azure-app-configuration/app-configuration-emulator:1.0.0-preview
+    mcr.microsoft.com/azure-app-configuration/app-configuration-emulator:1.0.2
 ```
 
 If you want to have persisted data for the emulator, you can use a [bind mount](https://docs.docker.com/engine/storage/bind-mounts).
@@ -91,7 +90,7 @@ docker run -d -p 8483:8483 \
     -v "C:\aace:/app/.aace" \
     -e Tenant:AnonymousAuthEnabled=true \
     -e Authentication:Anonymous:AnonymousUserRole=Owner \
-    mcr.microsoft.com/azure-app-configuration/app-configuration-emulator:1.0.0-preview
+    mcr.microsoft.com/azure-app-configuration/app-configuration-emulator:1.0.2
 ```
 
 ### [GitHub](#tab/github)

articles/azure-netapp-files/TOC.yml

@@ -489,6 +489,8 @@
         href: create-cross-zone-replication.md
     - name: Configure cross-zone-region replication 
       href: cross-zone-region-replication-configure.md
+    - name: Configure ransomware protection 
+      href: ransomware-configure.md
   - name: Relocate
     items:
     - name: Relocate volume to another region

articles/azure-netapp-files/azure-netapp-files-create-volumes-smb.md

@@ -78,11 +78,14 @@ Before creating an SMB volume, you need to create an Active Directory connection
     * **Network features**  
         In supported regions, you can specify whether you want to use **Basic** or **Standard** network features for the volume. See [Configure network features for a volume](configure-network-features.md) and [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details.
 
+    * **Availability Zone**   
+        This option lets you deploy the new volume in the logical availability zone that you specify. Select an availability zone where Azure NetApp Files resources are present. For details, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md).
+
     * **Encryption key source** 
         Select Microsoft Managed Key or Customer Managed Key.  See [Configure customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md) and [Azure NetApp Files double encryption at rest](double-encryption-at-rest.md) to learn more about this field. 
 
-    * **Availability zone**   
-        This option lets you deploy the new volume in the logical availability zone that you specify. Select an availability zone where Azure NetApp Files resources are present. For details, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md).
+    * **Advanced Ransomware Protection**
+        Select **Enabled** to configure ransomware threat detection alerts for your volumes. For more information, see [Configure advanced ransomware protection](ransomware-configure.md). 
 
     * If you want to apply an existing snapshot policy to the volume, select **Show advanced section** to expand it, specify whether you want to hide the snapshot path, and select a snapshot policy in the pull-down menu. 
 

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

@@ -98,11 +98,14 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
     * **Network features**  
         In supported regions, you can specify whether you want to use **Basic** or **Standard** network features for the volume. See [Configure network features for a volume](configure-network-features.md) and [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details.
 
+    * **Availability zone**   
+        This option lets you deploy the new volume in the logical availability zone that you specify. Select an availability zone where Azure NetApp Files resources are present. For details, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md).
+
     * **Encryption key source** 
         You can select Microsoft Managed Key or Customer Managed Key. See [Configure customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md) and [Azure NetApp Files double encryption at rest](double-encryption-at-rest.md) about using this field. 
 
-    * **Availability zone**   
-        This option lets you deploy the new volume in the logical availability zone that you specify. Select an availability zone where Azure NetApp Files resources are present. For details, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md).
+    * **Advanced Ransomware Protection**
+        Select **Enabled** to configure ransomware threat detection alerts for your volumes. For more information, see [Configure advanced ransomware protection](ransomware-configure.md). 
 
     * If you want to apply an existing snapshot policy to the volume, select **Show advanced section** to expand it, specify whether you want to hide the snapshot path, and select a snapshot policy in the pull-down menu. 
 

articles/azure-netapp-files/azure-netapp-files-introduction.md

@@ -89,6 +89,7 @@ Azure NetApp Files provides built-in data management and security capabilities t
 | Azure platform integration and compliance certifications | Compliance with regulatory requirements and Azure platform integration. | Adheres to Azure standards and regulatory compliance and ensures audit and governance completion.
 | Azure Identity & Access Management (IAM) | Azure role-based access control (RBAC) allows you to manage permissions for resources at any level. | Simplifies access management and improves compliance with Azure-native RBAC, empowering you to easily control user access to configuration management.
 | AD/LDAP authentication, export policies, and access control lists (ACLs) | Authenticate and authorize access to data by using existing AD/LDAP credentials and allow for the creation of export policies and ACLs to govern data access and usage. | Prevents data breaches and ensures compliance with data security regulations, with enhanced granular control over access to data volumes, directories, and files. |
+| Built-in ransomware protection | Azure NetApp Files advanced ransomware protection can be enabled at the volume level, using machine learning to observe deviations in your volume behaviors that resemble ransomware attacks. | Ransomware protection enables you to stay vigilant and attuned to aberrations in your workloads, improving the resiliency of your applications with alerts customized to the specific patterns of your volumes. | 
 
 These features work together to provide a comprehensive data management solution that helps to ensure that your data is always available, recoverable, and secure.
 

articles/azure-netapp-files/azure-netapp-files-metrics.md

@@ -5,7 +5,7 @@ services: azure-netapp-files
 author: b-hchen
 ms.service: azure-netapp-files
 ms.topic: concept-article
-ms.date: 11/20/2025
+ms.date: 11/25/2025
 ms.author: anfdocs
 # Customer intent: As a cloud storage administrator, I want to analyze performance and usage metrics for Azure NetApp Files, so that I can optimize storage provisioning and ensure efficient operation of my storage resources.
 ---
@@ -185,6 +185,10 @@ Subscription quota metrics display subscription-level quotas relative to the imp
 
     Total number of short-term clone volumes per subscription
 
+- *Ransomware protection volumes per subscription*
+
+    Total number of volumes protected with advanced ransomware protection per subscription
+
 - *Total TIBs per subscription* 
 
     Total regional capacity per subscription 

articles/azure-netapp-files/create-volumes-dual-protocol.md

@@ -111,11 +111,15 @@ To create NFS volumes, see [Create an NFS volume](azure-netapp-files-create-volu
     * **Network features**  
         In supported regions, you can specify whether you want to use **Basic** or **Standard** network features for the volume. See [Configure network features for a volume](configure-network-features.md) and [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details.
 
+    * **Availability zone**   
+        This option lets you deploy the new volume in the logical availability zone that you specify. Select an availability zone where Azure NetApp Files resources are present. For details, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md).
+
     * **Encryption key source** 
         You can select `Microsoft Managed Key` or `Customer Managed Key`. See [Configure customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md) and [Azure NetApp Files double encryption at rest](double-encryption-at-rest.md) about using this field. 
 
-    * **Availability zone**   
-        This option lets you deploy the new volume in the logical availability zone that you specify. Select an availability zone where Azure NetApp Files resources are present. For details, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md).
+    * **Advanced Ransomware Protection**
+        Select **Enabled** to configure ransomware threat detection alerts for your volumes. For more information, see [Configure advanced ransomware protection](ransomware-configure.md). 
+
 
     * If you want to apply an existing snapshot policy to the volume, select **Show advanced section** to expand it, specify whether you want to hide the snapshot path, and select a snapshot policy in the pull-down menu.