Skip to content

Commit 9395581

Browse files
authored
Merge pull request #208062 from normesta/normesta-reg-updates-10
Fixes as per GitHub issues
2 parents 326a10d + 277ed76 commit 9395581

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ blockBlob.StartCopy(copySource);
115115

116116
#### Restore soft-deleted blobs when versioning is enabled
117117

118-
To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob with a [Copy Blob](/rest/api/storageservices/copy-blob) or [Copy Blob From URL](/rest/api/storageservices/copy-blob-from-url) operation.
118+
To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob by using the [Copy Blob](/rest/api/storageservices/copy-blob) or [Copy Blob From URL](/rest/api/storageservices/copy-blob-from-url) operation.
119119

120120
##### [.NET v12 SDK](#tab/dotnet)
121121

@@ -143,7 +143,7 @@ When blobs or directories are soft-deleted, they are invisible in the Azure port
143143
> ![Screenshot showing how to list soft-deleted blobs in Azure portal (hierarchical namespace enabled accounts).](media/soft-delete-blob-manage/soft-deleted-blobs-list-portal-hns.png)
144144
145145
> [!NOTE]
146-
> If you rename a directory that contains soft deleted items (subdirectories and blobs), those soft deleted items become disconnected from the directory, so they won't appear in the Azure portal when you toggle the **Show deleted blobs** setting. If you want to view them in the Azure portal, you'll have to revert the name of the directory back to it's original name or create a separate directory that uses the original directory name.
146+
> If you rename a directory that contains soft deleted items (subdirectories and blobs), those soft deleted items become disconnected from the directory, so they won't appear in the Azure portal when you toggle the **Show deleted blobs** setting. If you want to view them in the Azure portal, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name.
147147
148148
Next, select the deleted directory or blob from the list display its properties. Under the **Overview** tab, notice that the status is set to **Deleted**. The portal also displays the number of days until the blob is permanently deleted.
149149

@@ -181,7 +181,7 @@ To restore a soft-deleted blob or directory in the Azure portal, first display t
181181
$deletedItems | Restore-AzDataLakeGen2DeletedItem
182182
```
183183

184-
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to it's original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
184+
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
185185

186186
### Restore soft deleted blobs and directories by using Azure CLI
187187

@@ -204,7 +204,7 @@ To restore a soft-deleted blob or directory in the Azure portal, first display t
204204
az storage fs undelete-path -f $filesystemName --deleted-path-name $dirName --deletion-id "<deletionId>" --auth-mode login
205205
```
206206

207-
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to it's original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
207+
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
208208

209209
### Restore soft deleted blobs and directories by using .NET
210210

@@ -272,7 +272,7 @@ To restore a soft-deleted blob or directory in the Azure portal, first display t
272272

273273
```
274274

275-
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to it's original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
275+
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
276276

277277
### Restore soft deleted blobs and directories by using Java
278278

@@ -323,7 +323,7 @@ To restore a soft-deleted blob or directory in the Azure portal, first display t
323323

324324
```
325325

326-
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to it's original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
326+
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
327327

328328
### Restore soft deleted blobs and directories by using Python
329329

@@ -370,7 +370,7 @@ To restore a soft-deleted blob or directory in the Azure portal, first display t
370370

371371
```
372372

373-
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to it's original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
373+
If you rename the directory that contains the soft deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft deleted items.
374374

375375
## Next steps
376376

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static async Task RestoreSnapshots(BlobContainerClient container, BlobCli
7878
{
7979
Snapshot = blobItems
8080
.OrderByDescending(snapshot => snapshot.Snapshot)
81-
.ElementAtOrDefault(1)?.Snapshot
81+
.ElementAtOrDefault(0)?.Snapshot
8282
};
8383

8484
// Restore the most recent snapshot by copying it to the blob.
@@ -106,7 +106,7 @@ public static void RestoreBlobsWithVersioning(BlobContainerClient container, Blo
106106
{
107107
VersionId = blobItems
108108
.OrderByDescending(version => version.VersionId)
109-
.ElementAtOrDefault(1)?.VersionId
109+
.ElementAtOrDefault(0)?.VersionId
110110
};
111111

112112
// Restore the most recently generated version by copying it to the base blob.

0 commit comments

Comments
 (0)