Skip to content

Commit 6079a37

Browse files
authored
Merge pull request #114191 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)
2 parents 47d14f9 + af52e57 commit 6079a37

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

articles/active-directory/develop/scenario-spa-production.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Deep dive of the quickstart sample, which explains the code for how to sign in u
3737
Sample that demonstrates how to get tokens for your own back-end web API by using MSAL.js:
3838

3939
> [!div class="nextstepaction"]
40-
> [SPA with an ASP.NET back end](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2)
40+
> [SPA with an ASP.NET back-end](https://github.com/Azure-Samples/ms-identity-javascript-angular-spa-aspnetcore-webapi)
4141
4242
Sample that shows how to use MSAL.js to sign in users in an app that's registered with Azure Active Directory B2C (Azure AD B2C):
4343

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,10 @@ Jump to a resource provider namespace:
12471247
> | workspaces | Yes | Yes |
12481248
12491249
> [!IMPORTANT]
1250-
> Make sure moving to new subscription doesn't exceed [subscription quotas](azure-subscription-service-limits.md#azure-monitor-limits).
1250+
> Make sure that moving to a new subscription doesn't exceed [subscription quotas](azure-subscription-service-limits.md#azure-monitor-limits).
1251+
1252+
> [!IMPORTANT]
1253+
> Workspaces that have a linked automation account can't be moved. Before you begin a move operation, be sure to unlink any automation accounts.
12511254
12521255
## Microsoft.OperationsManagement
12531256

articles/migrate/tutorial-prepare-physical.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,9 @@ Prepare Azure to migrate physical servers, using Server Migration.
100100
### Assign Azure account permissions
101101

102102
Assign the Virtual Machine Contributor role to the Azure account. This provides permissions to:
103-
104-
- Create a VM in the selected resource group.
105-
- Create a VM in the selected virtual network.
106-
- Write to an Azure managed disk.
103+
- Create a VM in the selected resource group.
104+
- Create a VM in the selected virtual network.
105+
- Write to an Azure managed disk.
107106

108107
### Create an Azure network
109108

articles/virtual-machines/windows/disk-encryption-faq.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ Azure Disk Encryption selects the encryption method in BitLocker based on the ve
125125

126126
To determine Windows OS version, run the 'winver' tool in your virtual machine.
127127

128-
## If I use EncryptFormatAll and specify all volume types, will it erase the data on the data drives that we already encrypted?
129-
No, data won't be erased from data drives that are already encrypted using Azure Disk Encryption. Similar to how EncryptFormatAll didn't re-encrypt the OS drive, it won't re-encrypt the already encrypted data drive.
130-
131128
## Can I backup and restore an encrypted VM?
132129

133130
Azure Backup provides a mechanism to backup and restore encrypted VM's within the same subscription and region. For instructions, please see [Back up and restore encrypted virtual machines with Azure Backup](../../backup/backup-azure-vms-encryption.md). Restoring an encrypted VM to a different region is not currently supported.

0 commit comments

Comments
 (0)