Merge pull request #202647 from tamram/tamram22-0623

recover deleted storage account + SFTP & versioning updates

Author: Court72

articles/storage/blobs/secure-file-transfer-protocol-known-issues.md

@@ -5,7 +5,7 @@ author: normesta
 ms.subservice: blobs
 ms.service: storage
 ms.topic: conceptual
-ms.date: 06/03/2022
+ms.date: 06/23/2022
 ms.author: normesta
 ms.reviewer: ylunagaria
 
@@ -73,8 +73,7 @@ The following clients are known to be incompatible with SFTP for Azure Blob Stor
 
 ## Integrations
 
-- Change feed and Event Grid notifications aren't supported.
-
+- Change feed notifications aren't supported.
 - Network File System (NFS) 3.0 and SFTP can't be enabled on the same storage account.
 
 ## Performance

articles/storage/blobs/soft-delete-blob-overview.md

@@ -100,9 +100,9 @@ For more information on how to restore soft-deleted objects, see [Manage and res
 > [!IMPORTANT]
 > Versioning is not supported for accounts that have a hierarchical namespace.
 
-If blob versioning and blob soft delete are both enabled for a storage account, then overwriting a blob automatically creates a new previous version that reflects the blob's state before the write operation. The new version isn't soft-deleted and isn't removed when the soft-delete retention period expires. No soft-deleted snapshots are created. 
+If blob versioning and blob soft delete are both enabled for a storage account, then overwriting a blob automatically creates a new previous version that reflects the blob's state before the write operation. The new version isn't soft-deleted and isn't removed when the soft-delete retention period expires. No soft-deleted snapshots are created.
 
-If blob versioning and blob soft delete are both enabled for a storage account, then when you delete a blob, the current version of the blob becomes a previous version, and there's no longer a current version. No new version is created and no soft-deleted snapshots are created.
+If blob versioning and blob soft delete are both enabled for a storage account, then when you delete a blob, the current version of the blob becomes a previous version, and there's no longer a current version. No new version is created and no soft-deleted snapshots are created. All previous versions are retained until they are explicitly deleted, either with a direct delete operation or via a lifecycle management policy.
 
 Enabling soft delete and versioning together protects previous blob versions as well as current versions from deletion. When soft delete is enabled, explicitly deleting a previous version creates a soft-deleted version that is retained until the soft-delete retention period elapses. After the soft-delete retention period has elapsed, the soft-deleted blob version is permanently deleted.
 

articles/storage/blobs/versioning-overview.md

@@ -302,4 +302,5 @@ This table shows how this feature is supported in your account and the impact on
 
 - [Enable and manage blob versioning](versioning-enable.md)
 - [Creating a snapshot of a blob](/rest/api/storageservices/creating-a-snapshot-of-a-blob)
-- [Soft delete for Azure Storage Blobs](./soft-delete-blob-overview.md)
+- [Soft delete for blobs](./soft-delete-blob-overview.md)
+- [Soft delete for containers](soft-delete-container-overview.md)

articles/storage/common/media/storage-account-recover/recover-account-portal.png

@@ -7,7 +7,7 @@ author: tamram
 
 ms.service: storage
 ms.topic: conceptual
-ms.date: 07/06/2021
+ms.date: 06/23/2022
 ms.author: tamram
 ms.subservice: common
 ---
@@ -32,15 +32,16 @@ If the deleted storage account used customer-managed keys with Azure Key Vault a
 
 ## Recover a deleted account from the Azure portal
 
-To recover a deleted storage account from within another storage account, follow these steps:
+To restore a deleted storage account from within another storage account, follow these steps:
 
-1. Navigate to the overview page for an existing storage account in the Azure portal.
-1. In the **Support + troubleshooting** section, select **Recover deleted account**.
+1. Navigate to the list of your storage accounts in the Azure portal.
+1. Select the **Restore** button to open the **Restore deleted account** pane.
+1. Select the subscription for the account that you want to recover from the **Subscription** drop-down.
 1. From the dropdown, select the account to recover, as shown in the following image. If the storage account that you want to recover is not in the dropdown, then it cannot be recovered.
 
     :::image type="content" source="media/storage-account-recover/recover-account-portal.png" alt-text="Screenshot showing how to recover storage account in Azure portal":::
 
-1. Select the **Recover** button to restore the account. The portal displays a notification that the recovery is in progress.
+1. Select the **Restore** button to recover the account. The portal displays a notification that the recovery is in progress.
 
 ## Recover a deleted account via a support ticket