Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2icd

devices/surface/microsoft-surface-data-eraser.md

@@ -16,7 +16,7 @@ author: miladCA
 
 Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.
 
-[Microsoft Surface Data Eraser](https://www.microsoft.com/download/details.aspx?id=46703) is a tool that boots from a USB stick and allows you to perform a secure wipe of all data from a compatible Surface device. A Microsoft Surface Data Eraser USB stick requires only the ability to boot from USB. The USB tool is easy to create by using the provided wizard, the Microsoft Surface Data Eraser Wrapper, and is easy to use with a simple graphic interface, no command line needed. To learn more about the data wiping capabilities and practices Microsoft uses during the service process for Surface, see [Protecting your data if you send your Surface in for service](https://www.microsoft.com/surface/support/security-sign-in-and-accounts/data-wiping-policy).
+[Microsoft Surface Data Eraser](https://www.microsoft.com/download/details.aspx?id=46703) is a tool that boots from a USB stick and allows you to perform a secure wipe of all data from a compatible Surface device. A Microsoft Surface Data Eraser USB stick requires only the ability to boot from USB. The USB stick is easy to create by using the provided wizard, the Microsoft Surface Data Eraser wrapper, and is easy to use with a simple graphic interface, no command line needed. To learn more about the data wiping capabilities and practices Microsoft uses during the service process for Surface, see [Protecting your data if you send your Surface in for service](https://www.microsoft.com/surface/support/security-sign-in-and-accounts/data-wiping-policy).
 
 Compatible Surface devices include:
 
@@ -100,43 +100,41 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo
 
 1.  Insert the bootable Microsoft Surface Data Eraser USB stick into the supported Surface device.
 
-2.  Ensure your system firmware is set to boot to USB. To enter the firmware settings:
+2.  Boot your Surface device from the Microsoft Surface Data Eraser USB stick. To boot your device from the USB stick follow these steps:
 
-    1.  Turn off your Surface device.
+    a. Turn off your Surface device.
 
-    2.  Press and hold the **Volume Up** button.
+    b. Press and hold the **Volume Down** button.
 
-    3.  Press and release the **Power** button.
+    c. Press and release the **Power** button.
 
-    4.  Release the **Volume Up** button.
+    d. Release the **Volume Down** button.
+    
+    >[!NOTE]
+    >If your device does not boot to USB using these steps, you may need to turn on the **Enable Alternate Boot Sequence** option in Surface UEFI. You can read more about Surface UEFI boot configuration in [Manage Surface UEFI Settings](https://technet.microsoft.com/itpro/surface/manage-surface-uefi-settings).
 
-3.  When the Surface device boots, a **SoftwareLicenseTerms** text file is displayed.
+3.  When the Surface device boots, a **SoftwareLicenseTerms** text file is displayed, as shown in Figure 4.
 
     ![Booting the Microsoft Surface Data Eraser USB stick](images/data-eraser-3.png "Booting the Microsoft Surface Data Eraser USB stick")
 
     *Figure 4. Booting the Microsoft Surface Data Eraser USB stick*
 
-4.  Read the software license terms, and then close the notepad file.
+4.  Read the software license terms, and then close the Notepad file.
 
-5.  Accept or Decline the Software License Terms by typing **Accept** or **Decline**.
+5.  Accept or decline the software license terms by typing **Accept** or **Decline**. You must accept the license terms to continue.
 
-6.  Select one of the following three options:
+6.  The Microsoft Surface Data Eraser script detects the storage devices that are present in your Surface device and displays the details of the native storage device. To continue, press **Y** (this action runs Microsoft Surface Data Eraser and removes all data from the storage device) or press **N** (this action shuts down the device without removing data).
 
-    -   **Enter S to start Data Erase** – Select this option to begin the data erase process. You will have a chance to confirm in the next step.
+  >[!NOTE]
+  >The Microsoft Surface Data Eraser tool will delete all data, including Windows operating system files required to boot the device, in a secure and unrecoverable way. To boot a Surface device that has been wiped with Microsoft Surface Data Eraser, you will first need to reinstall the Windows operating system. To remove data from a Surface device without removing the Windows operating system, you can use the **Reset your PC** function. However, this does not prevent your data from being recovered with forensic or data recovery capabilities. See [Recovery options in Windows 10](https://support.microsoft.com/help/12415/windows-10-recovery-options) for more information.
 
-    -   **Enter D to perform Diskpart** – Select this option to use diskpart.exe to manage partitions on your disk.
+  ![Partition to be erased is displayed](images/sda-fig5-erase.png "Partition to be erased is displayed")
+  
+  *Figure 5. Partition to be erased is displayed in Microsoft Surface Data Eraser*
 
-    -   **Enter X to shut device down** – Select this option to perform no action and shut down the device.
+7.  If you pressed **Y** in step 6, due to the destructive nature of the data erasure process, an additional dialog box is displayed to confirm your choice.
 
-7.  If you typed **S** to begin the data erase process, the partition that will be erased is displayed, as shown in Figure 5. If this is correct, press **Y** to continue, or **N** to shut down the device.
+8.  Click the **Yes** button to continue erasing data on the Surface device.
-
-    ![Partition to be erased is displayed](images/sda-fig5-erase.png "Partition to be erased is displayed")
-
-    *Figure 5. Partition to be erased is displayed in Microsoft Surface Data Eraser*
-
-8.  If you pressed **Y** in step 7, due to the destructive nature of the data erasure process, an additional dialog box is displayed to confirm your choice.
-
-9.  Click the **Yes** button to continue erasing data on the Surface device.
 
  
 

windows/deploy/provisioning-apply-package.md

@@ -94,7 +94,7 @@ On a desktop computer, navigate to **Settings** > **Accounts** > **Access work o
     ![Is this package from a source you trust](images/package-trust.png)
 
 
-#
+
 
 
 ## Learn more

windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md

@@ -24,6 +24,8 @@ localizationpriority: high
 There are some minimum requirements for onboarding your network and endpoints.
 
 ## Minimum requirements
+You must be on Windows 10, version 1607 at a minimum.
+For more information, see [Windows 10 Enterprise edition](https://www.microsoft.com/en-us/WindowsForBusiness/buy).
 
 ### Network and data storage and configuration requirements
 When you run the onboarding wizard for the first time, you must choose where your Windows Defender Advanced Threat Protection-related information is stored: either in a European or United States datacenter.
@@ -33,6 +35,7 @@ When you run the onboarding wizard for the first time, you must choose where you
 -   Review the [Windows Defender ATP data storage and privacy](data-storage-privacy-windows-defender-advanced-threat-protection.md) for more information on where and how Microsoft stores your data.
 
 ### Endpoint hardware and software requirements
+
 The Windows Defender ATP agent only supports the following editions of Windows 10:
 
 - Windows 10 Enterprise