ms.date

Author: b-ahibbard

articles/azure-netapp-files/configure-application-volume-oracle-api.md

@@ -73,21 +73,12 @@ The examples in this section illustrate the values passed in the volume group cr
 
 In the following examples, selected placeholders are specified. You should replace them with values specific to your configuration. These values include:
 
-<<<<<<< HEAD
-* `<SubscriptionId>` - Example: `aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e`
-* `<ResourceGroup>` - Example: `TestResourceGroup`
-* `<NtapAccount>` - Example: `TestAccount`
-* `<VolumeGroupName>`- Example: `SH9-Test-00001`
-* `<SubnetId>`- Example: `/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/SH9_Subnet`
-* `<CapacityPoolResourceId>`- Example: `/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/SH9_Pool `
-=======
 * `<SubscriptionId>`- Example: `aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e`
 * `<ResourceGroup>` - Example: `TestResourceGroup`
 * `<NtapAccount>` - Example: `TestAccount`
 * `<VolumeGroupName>` - Example: `SH9-Test-00001`
 * `<SubnetId>` - Example: `/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/SH9_Subnet`
 * `<CapacityPoolResourceId>` - Example: `/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/SH9_Pool `
->>>>>>> 038bc261ae1e33b5136cc00399ff3b535bcd3b72
 
 ## Create application volume groups for Oracle using curl
 

articles/azure-netapp-files/configure-customer-managed-keys.md

@@ -6,7 +6,7 @@ author: b-ahibbard
 ms.service: azure-netapp-files
 ms.topic: how-to
 ms.custom: devx-track-azurecli, devx-track-azurepowershell
-ms.date: 06/04/2025
+ms.date: 06/20/2025
 ms.author: anfdocs
 ---
 

articles/azure-netapp-files/whats-new.md

@@ -8,17 +8,19 @@ ms.custom:
   - linux-related-content
   - build-2025
 ms.topic: overview
-ms.date: 06/04/2025
+ms.date: 06/20/2025
 ms.author: anfdocs
 ---
 
 # What's new in Azure NetApp Files
 
 Azure NetApp Files is updated regularly. This article provides a summary about the latest new features and enhancements.
 
+## June 2025
+
 * The ability to [transition an existing volume to customer-managed keys](configure-customer-managed-keys.md#transition) is now generally available (GA)
 
-    You can now transition existing volumes from platform-managed keys to customer-managed keys seamlessly. This provides you flexibility of encryption key lifecycle (renewals, rotations) and additional security for regulated industry requirements. 
+    You can transition existing volumes from platform-managed keys to customer-managed keys seamlessly. This provides you flexibility of encryption key lifecycle (renewals, rotations) and additional security for regulated industry requirements. 
 
 ## May 2025