Merge pull request #204756 from MicrosoftDocs/release-db-ship

Release db ship--scheduled release at 3pm of 7/14

Author: huypub

articles/databox/TOC.yml

@@ -36,7 +36,9 @@
             href: data-box-deploy-copy-data-via-copy-service.md
           - name: To managed disks
             href: data-box-deploy-copy-data-from-vhds.md
-        - name: 4 - Return, upload, verify
+        - name: 4 - Prepare to ship
+          href: data-box-deploy-prepare-to-ship.md
+        - name: 5 - Return, upload, verify
           href: data-box-deploy-picked-up.md
       - name: Export data from Azure
         items: 

articles/databox/data-box-deploy-export-picked-up.md

@@ -7,8 +7,9 @@ author: alkohli
 ms.service: databox
 ms.subservice: pod
 ms.topic: tutorial
-ms.date: 04/21/2022
+ms.date: 06/16/2022
 ms.author: alkohli
+zone_pivot_groups: data-box-shipping
 
 # Customer intent: As an IT admin, I need to be able to return Data Box to upload on-premises data from my server onto Azure.
 ---
@@ -39,67 +40,118 @@ Before you begin, make sure:
 
 The next steps are determined by where you are returning the device.
 
-## Ship Data Box back
+## Ship Data Box back 
 
-Ensure that the data copy from the device is complete and **Prepare to ship** run is successful.
+Based on the region where you're shipping the device, the procedure is different. In many countries/regions, you can use Microsoft managed shipping or [self-managed shipping](#self-managed-shipping).
 
-Based on the region where you're shipping the device, the procedure is different. In many countries/regions, you can use Microsoft managed shipping or self-managed shipping.
+::: zone pivot="americas" 
 
-### Microsoft managed shipping
+If using Microsoft managed shipping, follow these steps. 
 
-Follow the guidelines for the region you're shipping from if you're using Microsoft managed shipping.
+## Shipping in Americas 
 
-## [US & Canada](#tab/in-us-canada)
+### US & Canada
 
 [!INCLUDE [data-box-shipping-in-us-canada](../../includes/data-box-shipping-in-us-canada.md)]
 
-## [EU](#tab/in-eu)
+::: zone-end
+
+::: zone pivot="europe" 
+
+If using Microsoft managed shipping, follow these steps. 
+
+## Shipping in Europe 
+
+### [EU](#tab/in-europe)
 
 [!INCLUDE [data-box-shipping-in-eu](../../includes/data-box-shipping-in-eu.md)]
 
 **If you're shipping back to Azure datacenters in Germany or Switzerland,** you can also [use self-managed shipping](#self-managed-shipping).
 
-## [UK](#tab/in-uk)
+### [UK](#tab/in-uk)
 
 [!INCLUDE [data-box-shipping-in-uk](../../includes/data-box-shipping-in-uk.md)]
 
-## [Australia](#tab/in-australia)
+### [Norway](#tab/in-norway)
+[!INCLUDE [data-box-shipping-in-norway](../../includes/data-box-shipping-in-norway.md)]
 
-[!INCLUDE [data-box-shipping-in-australia](../../includes/data-box-shipping-in-australia.md)]
+::: zone-end
+
+::: zone pivot="asia" 
+
+If using Microsoft managed shipping, follow these steps. 
+
+## Shipping in Asia
 
-## [Japan](#tab/in-japan)
+### [Japan](#tab/in-japan)
 
 [!INCLUDE [data-box-shipping-in-japan](../../includes/data-box-shipping-in-japan.md)]
 
-## [Singapore](#tab/in-singapore)
+### [Singapore](#tab/in-singapore)
 
 [!INCLUDE [data-box-shipping-in-singapore](../../includes/data-box-shipping-in-singapore.md)]
 
-## [Hong Kong](#tab/in-hk)
+### [Hong Kong](#tab/in-hk)
 
 [!INCLUDE [data-box-shipping-in-hk](../../includes/data-box-shipping-in-hk.md)]
 
-## [Korea](#tab/in-korea)
+### [Korea](#tab/in-korea)
 
 [!INCLUDE [data-box-shipping-in-korea](../../includes/data-box-shipping-in-korea.md)]
 
-## [S Africa](#tab/in-sa)
+### [UAE](#tab/in-uae)
 
-[!INCLUDE [data-box-shipping-in-sa](../../includes/data-box-shipping-in-sa.md)]
+[!INCLUDE [data-box-shipping-in-uae](../../includes/data-box-shipping-in-uae.md)]
 
-## [UAE](#tab/in-uae)
 
-[!INCLUDE [data-box-shipping-in-uae](../../includes/data-box-shipping-in-uae.md)]
+::: zone-end
 
-## [Norway](#tab/in-norway)
-[!INCLUDE [data-box-shipping-in-norway](../../includes/data-box-shipping-in-norway.md)]
+::: zone pivot="australia"
 
----
+If using Microsoft managed shipping, follow these steps.
+
+## Shipping in Australia
 
-### Self-managed shipping
+### Australia
+
+[!INCLUDE [data-box-shipping-in-australia](../../includes/data-box-shipping-in-australia.md)]
+
+::: zone-end
+
+::: zone pivot="africa" 
+
+If using Microsoft managed shipping, follow these steps. 
+
+## Shipping in Africa
+
+### S Africa
+
+[!INCLUDE [data-box-shipping-in-sa](../../includes/data-box-shipping-in-sa.md)]
+
+::: zone-end
+
+## Self-managed shipping
+
+[!INCLUDE [data-box-shipping-regions](../../includes/data-box-shipping-regions.md)]
 
 [!INCLUDE [data-box-shipping-self-managed](../../includes/data-box-shipping-self-managed.md)]
 
+::: zone pivot="americas"
+
+### Shipping in Brazil
+
+To schedule a device return in Brazil, send an email to [[email protected]](mailto:[email protected]) with the following information:
+
+```
+Subject: Request Azure Data Box Disk drop-off for order: <ordername>
+
+- Order name
+- Contact name of the person who will drop off the Data Box Disk (A government-issued photo ID will be required to validate the contact’s identity upon arrival.) 
+- Inbound Nota Fiscal (A copy of the inbound Nota Fiscal will be required at drop-off.)   
+```
+
+::: zone-end
+
 ## Erasure of data from Data Box
 
 Once the device reaches Azure datacenter, the Data Box erases the data on its disks as per the [NIST SP 800-88 Revision 1 guidelines](https://csrc.nist.gov/News/2014/Released-SP-800-88-Revision-1,-Guidelines-for-Medi).

articles/databox/data-box-deploy-picked-up.md

@@ -1,22 +1,23 @@
 ---
-title: Tutorial to ship Azure Data Box back| Microsoft Docs
-description: In this tutorial, learn how to return Azure Data Box, including preparing to ship, shipping Data Box, verifying data upload, and erasing data from Data Box.
+title: Tutorial to return Azure Data Box
+description: In this tutorial, learn how to return Azure Data Box, including shipping the device, verifying data upload to Azure, and erasing data from Data Box.
 services: databox
 author: alkohli
 
 ms.service: databox
 ms.subservice: pod
 ms.topic: tutorial
 ms.custom: references_regions
-ms.date: 03/31/2022
+ms.date: 06/16/2022
 ms.author: alkohli
+zone_pivot_groups: data-box-shipping
 
 # Customer intent: As an IT admin, I need to be able to return a Data Box to upload on-premises data from my server onto Azure.
 ---
 
 ::: zone target="docs"
 
-# Tutorial: Return Azure Data Box and verify data upload to Azure
+# Tutorial: Return Azure Data Box and verify data has been uploaded to Azure
 
 ::: zone-end
 
@@ -35,7 +36,6 @@ In this tutorial, you will learn about topics such as:
 > [!div class="checklist"]
 >
 > * Prerequisites
-> * Prepare to ship
 > * Ship Data Box to Microsoft
 > * Verify data upload to Azure
 > * Erasure of data from Data Box
@@ -44,102 +44,132 @@ In this tutorial, you will learn about topics such as:
 
 Before you begin, make sure:
 
-* You've have completed the [Tutorial: Copy data to Azure Data Box and verify](data-box-deploy-copy-data.md).
-* Copy jobs are complete and there are no errors on the **Connect and copy** page. **Prepare to ship** can't run if copy jobs are in progress or there are errors in the **Connect and copy** page.
-
-## Prepare to ship
-
-[!INCLUDE [data-box-prepare-to-ship](../../includes/data-box-prepare-to-ship.md)]
+* You've completed the [Tutorial: Prepare to ship Azure Data Box](data-box-deploy-prepare-to-ship.md).
+* The data copy to the device completed and the **Prepare to ship** run was successful.
 
 ::: zone-end
 
-::: zone target="chromeless"
-
-After the data copy is complete, you prepare and ship the device. When the device reaches Azure datacenter, data is automatically uploaded to Azure.
-
-## Prepare to ship
+## Ship Data Box back 
 
-Before you prepare to ship, make sure that copy jobs are complete.
+Based on the region where you're shipping the device, the procedure is different. In many countries/regions, you can use Microsoft managed shipping or [self-managed shipping](#self-managed-shipping).
 
-1. Go to **Prepare to ship** page in the local web UI and start the ship preparation.
-2. Turn off the device from the local web UI. Remove the cables from the device.
+::: zone pivot="americas" 
 
-The next steps are determined by where you're returning the device.
+If using Microsoft managed shipping, follow these steps. 
 
-::: zone-end
+## Shipping in Americas 
 
+### US & Canada
 
-## Ship Data Box back
-
-Make sure the data copy to the device completed and the **Prepare to ship** run was successful. 
-
-Based on the region where you're shipping the device, the procedure is different. In many countries/regions, you can use [Microsoft managed shipping](#microsoft-managed-shipping) or [self-managed shipping](#self-managed-shipping).
+[!INCLUDE [data-box-shipping-in-us-canada](../../includes/data-box-shipping-in-us-canada.md)]
 
-### Microsoft managed shipping
+::: zone-end
 
-Follow the guidelines for the region you're shipping from if you're using Microsoft managed shipping.
+::: zone pivot="europe" 
 
-## [US & Canada](#tab/in-us-canada)
+If using Microsoft managed shipping, follow these steps. 
 
-[!INCLUDE [data-box-shipping-in-us-canada](../../includes/data-box-shipping-in-us-canada.md)]
+## Shipping in Europe 
 
-## [EU](#tab/in-europe)
+### [EU](#tab/in-europe)
 
 [!INCLUDE [data-box-shipping-in-eu](../../includes/data-box-shipping-in-eu.md)]
 
 **If you're shipping back to Azure datacenters in Germany or Switzerland,** you can also [use self-managed shipping](#self-managed-shipping).
 
-## [UK](#tab/in-uk)
+### [UK](#tab/in-uk)
 
 [!INCLUDE [data-box-shipping-in-uk](../../includes/data-box-shipping-in-uk.md)]
 
-## [Australia](#tab/in-australia)
+### [Norway](#tab/in-norway)
+[!INCLUDE [data-box-shipping-in-norway](../../includes/data-box-shipping-in-norway.md)]
 
-[!INCLUDE [data-box-shipping-in-australia](../../includes/data-box-shipping-in-australia.md)]
+::: zone-end
+
+::: zone pivot="asia" 
+
+If using Microsoft managed shipping, follow these steps. 
+
+## Shipping in Asia
 
-## [Japan](#tab/in-japan)
+### [Japan](#tab/in-japan)
 
 [!INCLUDE [data-box-shipping-in-japan](../../includes/data-box-shipping-in-japan.md)]
 
-## [Singapore](#tab/in-singapore)
+### [Singapore](#tab/in-singapore)
 
 [!INCLUDE [data-box-shipping-in-singapore](../../includes/data-box-shipping-in-singapore.md)]
 
-## [Hong Kong](#tab/in-hk)
+### [Hong Kong](#tab/in-hk)
 
 [!INCLUDE [data-box-shipping-in-hk](../../includes/data-box-shipping-in-hk.md)]
 
-## [Korea](#tab/in-korea)
+### [Korea](#tab/in-korea)
 
 [!INCLUDE [data-box-shipping-in-korea](../../includes/data-box-shipping-in-korea.md)]
 
-## [S Africa](#tab/in-sa)
+### [UAE](#tab/in-uae)
 
-[!INCLUDE [data-box-shipping-in-sa](../../includes/data-box-shipping-in-sa.md)]
+[!INCLUDE [data-box-shipping-in-uae](../../includes/data-box-shipping-in-uae.md)]
 
-## [UAE](#tab/in-uae)
 
-[!INCLUDE [data-box-shipping-in-uae](../../includes/data-box-shipping-in-uae.md)]
+::: zone-end
 
-## [Norway](#tab/in-norway)
-[!INCLUDE [data-box-shipping-in-norway](../../includes/data-box-shipping-in-norway.md)]
+::: zone pivot="australia"
 
+If using Microsoft managed shipping, follow these steps.
 
----
+## Shipping in Australia
+
+### Australia
+
+[!INCLUDE [data-box-shipping-in-australia](../../includes/data-box-shipping-in-australia.md)]
+
+::: zone-end
+
+::: zone pivot="africa" 
+
+If using Microsoft managed shipping, follow these steps. 
+
+## Shipping in Africa
+
+### S Africa
+
+[!INCLUDE [data-box-shipping-in-sa](../../includes/data-box-shipping-in-sa.md)]
+
+::: zone-end
 
-### Self-managed shipping
+## Self-managed shipping
+
+Self-managed shipping is available as an option when you [Order Azure Data Box](data-box-disk-deploy-ordered.md). For detailed steps, see [Use self-managed shipping](data-box-portal-customer-managed-shipping.md).
 
 [!INCLUDE [data-box-shipping-regions](../../includes/data-box-shipping-regions.md)]
 
 [!INCLUDE [data-box-shipping-self-managed](../../includes/data-box-shipping-self-managed.md)]
 
+::: zone pivot="americas"
+
+### Shipping in Brazil
+
+To schedule a device return in Brazil, send an email to [[email protected]](mailto:[email protected]) with the following information:
+
+```
+Subject: Request Azure Data Box Disk drop-off for order: <ordername>
+
+- Order name
+- Contact name of the person who will drop off the Data Box Disk (A government-issued photo ID will be required to validate the contact’s identity upon arrival.) 
+- Inbound Nota Fiscal (A copy of the inbound Nota Fiscal will be required at drop-off.)   
+```
+
+::: zone-end
+
 ::: zone target="chromeless"
 
-## Verify data upload to Azure
+## Verify data has been uploaded to Azure 
 
 [!INCLUDE [data-box-verify-upload](../../includes/data-box-verify-upload.md)]
 
-## Erasure of data from Data Box
+## Data erasure from Data Box
 
 Once the upload to Azure is complete, the Data Box erases the data on its disks as per the [NIST SP 800-88 Revision 1 guidelines](https://csrc.nist.gov/News/2014/Released-SP-800-88-Revision-1,-Guidelines-for-Medi).
 
@@ -148,7 +178,7 @@ Once the upload to Azure is complete, the Data Box erases the data on its disks
 
 ::: zone target="docs"
 
-## Verify data upload to Azure
+## Verify data has uploaded to Azure
 
 [!INCLUDE [data-box-verify-upload-return](../../includes/data-box-verify-upload-return.md)]