Merge pull request #104805 from xyh1/patch-101

updates for GA

Author: PRMerger20

articles/storage/blobs/storage-blob-immutability-policies-manage.md

@@ -113,10 +113,10 @@ Remove-AzRmStorageContainerLegalHold -ResourceGroupName $resourceGroup `
     -StorageAccountName $storageAccount -Name $container -Tag <tag3>
 ```
 
-Create or update immutability policies:
+Create or update time-based immutability policies:
 
 ```powershell
-# Create an immutablity policy
+# Create a time-based immutablity policy
 Set-AzRmStorageContainerImmutabilityPolicy -ResourceGroupName $resourceGroup `
     -StorageAccountName $storageAccount -ContainerName $container -ImmutabilityPeriod 10
 ```
@@ -165,18 +165,25 @@ Remove-AzRmStorageContainerImmutabilityPolicy -ImmutabilityPolicy $policy
 
 ## Enabling allow protected append blobs writes
 
-At this time, you can only access the `allowProtectedAppendWrites` setting for time-based retention policies through this specific [portal link](https://aka.ms/immutableappendblobs). 
-
-> [!IMPORTANT] 
->  The allow protected append blobs writes setting under time-based retention is currently available and visible only in the following regions:
-> - East US
-> - South Central US
-> - West US 2
->
-> For more information, see [Allow Protected Append Blobs Writes](storage-blob-immutable-storage.md#allow-protected-append-blobs-writes).
+### [Portal](#tab/azure-portal)
 
 ![Allow additional append writes](media/storage-blob-immutability-policies-manage/immutable-allow-additional-append-writes.png)
 
+### [Azure CLI](#tab/azure-cli)
+
+The feature is included in the following command groups:
+`az storage container immutability-policy`  and `az storage container legal-hold`. Run `-h` on them to see the commands.
+
+### [PowerShell](#tab/azure-powershell)
+
+```powershell
+# Create an immutablity policy with appends allowed
+Set-AzRmStorageContainerImmutabilityPolicy -ResourceGroupName $resourceGroup `
+    -StorageAccountName $storageAccount -ContainerName $container -ImmutabilityPeriod 10 -AllowProtectedAppendWrite $true
+```
+
+---
+
 ## Next steps
 
 [Store business-critical blob data with immutable storage](storage-blob-immutable-storage.md)

articles/storage/blobs/storage-blob-immutable-storage.md

@@ -64,7 +64,7 @@ An unlocked time-based retention policy is recommended only for feature testing
 The following limits apply to retention policies:
 
 - For a storage account, the maximum number of containers with locked time-based immutable policies is 10,000.
-- The minimum retention interval is one day. The maximum is 146,000 days (400 years).
+- The minimum retention interval is 1 day. The maximum is 146,000 days (400 years).
 - For a container, the maximum number of edits to extend a retention interval for locked time-based immutable policies is 5.
 - For a container, a maximum of seven time-based retention policy audit logs are retained for a locked policy.
 
@@ -80,15 +80,7 @@ For example, suppose that a user creates a time-based retention policy with `all
 
 Unlocked time-based retention policies allow the `allowProtectedAppendWrites` setting to be enabled and disabled at any time. Once the time-based retention policy is locked, the `allowProtectedAppendWrites` setting cannot be changed.
 
-Legal hold policies cannot enable `allowProtectedAppendWrites` and do not allow for new blocks to be appended to append blobs. If a legal hold is applied to a time-based retention policy with `allowProtectedAppendWrites` enabled, the *AppendBlock* API will fail until the legal hold is lifted.
-
-> [!IMPORTANT] 
-> The allow protected append blobs writes setting under time-based retention is currently available in the following regions:
-> - East US
-> - South Central US
-> - West US 2
->
-> At this time, we strongly advise that you do not enable `allowProtectedAppendWrites` in any other regions besides those specified, as it may cause intermittent failures and affect compliance for append blobs. For more information on how to set and lock time-based retention policies, see [Enabling allow protected append blobs writes](storage-blob-immutability-policies-manage.md#enabling-allow-protected-append-blobs-writes).
+Legal hold policies cannot enable `allowProtectedAppendWrites` and any legal holds will nullify the 'allowProtectedAppendWrites' property. If a legal hold is applied to a time-based retention policy with `allowProtectedAppendWrites` enabled, the *AppendBlock* API will fail until the legal hold is lifted.
 
 ## Legal holds
 
@@ -137,7 +129,7 @@ No, you can use immutable storage with any existing or newly created general-pur
 
 **Can I apply both a legal hold and time-based retention policy?**
 
-Yes, a container can have both a legal hold and a time-based retention policy at the same time. All blobs in that container stay in the immutable state until all legal holds are cleared, even if their effective retention period has expired. Conversely, a blob stays in an immutable state until the effective retention period expires, even though all legal holds have been cleared.
+Yes, a container can have both a legal hold and a time-based retention policy at the same time; however, the 'allowProtectedAppendWrites' setting will not apply until the legal hold is cleared. All blobs in that container stay in the immutable state until all legal holds are cleared, even if their effective retention period has expired. Conversely, a blob stays in an immutable state until the effective retention period expires, even though all legal holds have been cleared. 
 
 **Are legal hold policies only for legal proceedings or are there other use scenarios?**
 
@@ -161,7 +153,7 @@ Yes, you can use the Set Blob Tier command to move data across the blob tiers wh
 
 **What happens if I fail to pay and my retention interval has not expired?**
 
-In the case of non-payment, normal data retention policies will apply as stipulated in the terms and conditions of your contract with Microsoft.
+In the case of non-payment, normal data retention policies will apply as stipulated in the terms and conditions of your contract with Microsoft. For general information, see [Data management at Microsoft](https://www.microsoft.com/en-us/trust-center/privacy/data-management). 
 
 **Do you offer a trial or grace period for just trying out the feature?**