Merge pull request #209807 from MicrosoftDocs/repo_sync_working_branch

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

Author: huypub

articles/spring-apps/how-to-use-tls-certificate.md

@@ -44,7 +44,7 @@ You need to grant Azure Spring Apps access to your key vault before you import y
 
    :::image type="content" source="media/use-tls-certificates/grant-key-vault-permission.png" alt-text="Screenshot of Azure portal 'Create an access policy' page with Permission pane showing and Get and List permissions highlighted." lightbox="media/use-tls-certificates/grant-key-vault-permission.png":::
 
-1. Under **Principal**, select your **Azure Spring Apps Resource Provider**.
+1. Under **Principal**, select your **Azure Spring Cloud Resource Provider**.
 
    :::image type="content" source="media/use-tls-certificates/select-service-principal.png" alt-text="Screenshot of Azure portal 'Create an access policy' page with Principal pane showing and Azure Spring Apps Resource Provider highlighted." lightbox="media/use-tls-certificates/select-service-principal.png":::
 

articles/storage/files/storage-files-migration-nas-cloud-databox.md

@@ -65,15 +65,16 @@ Consult your migration plan for the number of storage accounts you have decided
 
 ### DataBox options
 
-For a standard migration, one or a combination of these three DataBox options should be chosen: 
+For a standard migration, one or a combination of these two DataBox options should be chosen: 
 
-* DataBox Disks
-  Microsoft will send you one and up to five SSD disks with a capacity of 8 TiB each, for a maximum total of 40 TiB. The usable capacity is about 20% less, due to encryption and file system overhead. For more information, see [DataBox Disks documentation](../../databox/data-box-disk-overview.md).
 * DataBox
   This is the most common option. A ruggedized DataBox appliance, that works similar to a NAS, will be shipped to you. It has a usable capacity of 80 TiB. For more information, see [DataBox documentation](../../databox/data-box-overview.md).
 * DataBox Heavy
   This option features a ruggedized DataBox appliance on wheels, that works similar to a NAS, with a capacity of 1 PiB. The usable capacity is about 20% less, due to encryption and file system overhead. For more information, see [DataBox Heavy documentation](../../databox/data-box-heavy-overview.md).
 
+> [!WARNING]
+> Data Box Disks is not recommended for migrations into Azure file shares. Data Box Disks does not preserve file metadata, such as access permissions (ACLs) and other attributes.
+
 ## Phase 4: Provision a temporary Windows Server
 
 While you wait for your Azure DataBox(es) to arrive, you can already deploy one or more Windows Servers you will need for running RoboCopy jobs.