Skip to content

Commit d2e5f0d

Browse files
authored
Merge pull request #116504 from roygara/softUpdates
Soft delete updates
2 parents 851a013 + 5a65b00 commit d2e5f0d

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

articles/storage/files/storage-files-enable-soft-delete.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ description: Learn how to enable soft delete on Azure file shares for data recov
44
author: roygara
55
ms.service: storage
66
ms.topic: conceptual
7-
ms.date: 05/22/2020
7+
ms.date: 05/26/2020
88
ms.author: rogarana
99
ms.subservice: files
1010
services: storage
1111
---
1212

1313
# Enable soft delete on Azure file shares
1414

15-
Azure Storage offers soft delete for file shares so that you can more easily recover your data when it is mistakenly deleted by an application or other storage account user. To learn more about soft delete, see [How to prevent accidental deletion of Azure file shares](storage-files-prevent-file-share-deletion.md).
15+
Azure Storage offers soft delete for file shares so that you can more easily recover your data when it's mistakenly deleted by an application or other storage account user. To learn more about soft delete, see [How to prevent accidental deletion of Azure file shares](storage-files-prevent-file-share-deletion.md).
1616

1717
The following sections show how to enable and use soft delete for Azure file shares on an existing storage account:
1818

@@ -55,7 +55,7 @@ To restore a soft deleted file share:
5555

5656
This will display any shares currently in a **Deleted** state.
5757

58-
:::image type="content" source="media/storage-how-to-recover-deleted-account/undelete-file-share.png" alt-text="If the status column, the column next to the name column, is set to deleted, then your file share is in a soft deleted state. And will be permanently deleted after your specified retention period.":::
58+
:::image type="content" source="media/storage-how-to-recover-deleted-account/undelete-file-share.png" alt-text="If the status column, the column next to the name column, is set to Deleted, then your file share is in a soft deleted state. And will be permanently deleted after your specified retention period.":::
5959

6060
1. Select the share and select **undelete**, this will restore the share.
6161

articles/storage/files/storage-files-prevent-file-share-deletion.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ description: Learn about soft delete for Azure file shares and how you can use i
44
author: roygara
55
ms.service: storage
66
ms.topic: conceptual
7-
ms.date: 05/22/2020
7+
ms.date: 05/26/2020
88
ms.author: rogarana
99
ms.subservice: files
1010
services: storage
1111
---
1212

1313
# Prevent accidental deletion of Azure file shares
1414

15-
Azure Storage now offers soft delete for file shares so that you can more easily recover your data when it is mistakenly deleted by an application or other storage account user.
15+
Azure Storage now offers soft delete for file shares. Soft delete allows you to recover your data when it is mistakenly deleted by an application or other storage account user.
1616

1717
## How soft delete works
1818

19-
When enabled, soft delete enables you to save and recover your file shares when they are deleted. When data is deleted, it transitions to a soft deleted state instead of being permanently erased. You can configure the amount of time soft deleted data is recoverable before it is permanently expired.
19+
When enabled, soft delete enables you to save and recover your file shares when they're deleted. When data is deleted, it transitions to a soft deleted state instead of being permanently erased. You can configure the amount of time soft deleted data is recoverable before it's permanently deleted.
2020

2121
Soft delete can be enabled on new or existing file shares. Soft delete is also backwards compatible, so you don't have to make any changes to your applications to take advantage of the protections of soft delete.
2222

@@ -28,24 +28,24 @@ Soft delete for Azure file shares is available on all storage tiers, all storage
2828

2929
## Configuration settings
3030

31-
Soft delete for file shares is enabled at the storage account level, the soft delete settings apply to all file shares within a storage account. When you create a new storage account, soft delete is off by default. Soft delete is also off by default for existing storage accounts. You can toggle the feature on and off at any time during the life of a storage account.
31+
Soft delete for file shares is enabled at the storage account level, the soft delete settings apply to all file shares within a storage account. When you create a new storage account, soft delete is off by default. Soft delete is also off by default for existing storage accounts. You can toggle soft delete on and off at any time.
3232

33-
If you enable soft delete for file shares, delete some file shares, and then disable soft delete, you will still be able to access and recover those file shares, if those shares were saved when soft delete was enabled. When you turn on soft delete, you also need to configure the retention period.
33+
If you enable soft delete for file shares, delete some file shares, and then disable soft delete, if the shares were saved in that period you can still access and recover those file shares. When you enable soft delete, you also need to configure the retention period.
3434

35-
The retention period indicates the amount of time that soft deleted file shares are stored and available for recovery. For file shares that are explicitly deleted, the retention period clock starts when the data is deleted. Currently you can retain soft deleted shares for between 1 and 365 days.
35+
The retention period indicates the amount of time that soft deleted file shares are stored and available for recovery. For file shares that are explicitly deleted, the retention period clock starts when the data is deleted. Currently you can keep soft deleted shares for between 1 and 365 days.
3636

37-
You can change the soft delete retention period at any time. An updated retention period will only apply to shares deleted after the retention period has been updated. Shares deleted prior to the retention period update will expire based on the retention period that was configured when that data was deleted.
37+
You can change the soft delete retention period at any time. An updated retention period will only apply to shares deleted after the retention period has been updated. Shares deleted before the retention period update will expire based on the retention period that was configured when that data was deleted.
3838

39-
To permanently delete a file share that is in a soft delete state prior to its expiry time, you must undelete the share, disable soft delete, and then delete the share again. Then you should reenable soft delete, since any other file shares in that storage account will be vulnerable to accidental deletion while soft delete is off.
39+
To permanently delete a file share in a soft delete state prior to its expiry time, you must undelete the share, disable soft delete, and then delete the share again. Then you should reenable soft delete, since any other file shares in that storage account will be vulnerable to accidental deletion while soft delete is off.
4040

4141
## Pricing and billing
4242

43-
Both standard and premium file shares are billed on the used capacity when soft deleted, rather than provisioned capacity. Additionally, premium file shares are billed at the snapshot rate while in the soft delete state. Standard file shares are billed at the regular rate while in the soft delete state. You will not be charged for data that is permanently deleted after the configured retention period.
43+
Both standard and premium file shares are billed on the used capacity when soft deleted, rather than provisioned capacity. Additionally, premium file shares are billed at the snapshot rate while in the soft delete state. Standard file shares are billed at the regular rate while in the soft delete state. You won't be charged for data that is permanently deleted after the configured retention period.
4444

45-
For more details on prices for Azure File Storage in general, see the [Azure File Storage Pricing Page](https://azure.microsoft.com/pricing/details/storage/files/).
45+
For more information on prices for Azure File Storage in general, see the [Azure File Storage Pricing Page](https://azure.microsoft.com/pricing/details/storage/files/).
4646

47-
When you initially turn on soft delete, we recommend using a small retention period to better understand how the feature affects your bill.
47+
When you initially enable soft delete, we recommend using a small retention period to better understand how the feature affects your bill.
4848

4949
## Next steps
5050

51-
To learn how to enable and use soft delete, proceed to [Enable soft delete](storage-files-enable-soft-delete.md)
51+
To learn how to enable and use soft delete, continue to [Enable soft delete](storage-files-enable-soft-delete.md)

0 commit comments

Comments
 (0)