Merge pull request #46691 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: huypub

articles/active-directory/b2b/licensing-guidance.md

@@ -63,7 +63,7 @@ A B2B guest user is one that is invited from a partner organization to work with
 
 ## Next steps
 
-See the following articles articles on Azure AD B2B collaboration:
+See the following articles on Azure AD B2B collaboration:
 
 * [What is Azure AD B2B collaboration?](what-is-b2b.md)
 * [Azure Active Directory B2B collaboration frequently asked questions (FAQ)](faq.md)

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

@@ -193,6 +193,13 @@ $Blobs.ICloudBlob.Properties
 # Undelete the blobs
 $Blobs.ICloudBlob.Undelete()
 ```
+To find the currrent soft delete retention policy, use the following command:
+
+```azurepowershell-interactive
+   $account = Get-AzureRmStorageAccount -ResourceGroupName myresourcegroup -Name storageaccount
+   Get-AzureStorageServiceProperty -ServiceType Blob -Context $account.Context
+```
+
 ### Azure CLI 
 To enable soft delete, update a blob client's service properties:
 

articles/virtual-machines/windows/convert-disk-storage.md

@@ -127,10 +127,10 @@ $storageType = 'StandardSSD_LRS'
 $disk = Get-AzureRmDisk -DiskName $diskName -ResourceGroupName $rgName
 
 # Get parent VM resource
-$vmResource = Get-AzureRmResource -ResourceId $disk.diskId
+$vmResource = Get-AzureRmResource -ResourceId $disk.ManagedBy
 
 # Stop and deallocate the VM before changing the storage type
-Stop-AzureRmVM -ResourceGroupName $vm.ResourceGroupName -Name $vm.Name -Force
+Stop-AzureRmVM -ResourceGroupName $vmResource.ResourceGroupName -Name $vmResource.Name -Force
 
 $vm = Get-AzureRmVM $vmResource.ResourceGroupName -Name $vmResource.ResourceName