diff --git a/devices/surface/microsoft-surface-data-eraser.md b/devices/surface/microsoft-surface-data-eraser.md index b04f01e727..c744876e01 100644 --- a/devices/surface/microsoft-surface-data-eraser.md +++ b/devices/surface/microsoft-surface-data-eraser.md @@ -23,6 +23,12 @@ Find out how the Microsoft Surface Data Eraser tool can help you securely wipe d Compatible Surface devices include: +- Surface Studio + +- Surface Pro + +- Surface Laptop + - Surface Book - Surface Pro 4 @@ -35,6 +41,9 @@ Compatible Surface devices include: - Surface Pro 2 +>[!NOTE] +>Surface Pro devices with 1 TB storage are not currently supported by Microsoft Surface Data Eraser. + Some scenarios where Microsoft Surface Data Eraser can be helpful include: - Prepare a Surface device to be sent for repair @@ -137,7 +146,20 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo 8. Click the **Yes** button to continue erasing data on the Surface device. - +## Changes and updates + +Microsoft Surface Data Eraser is periodically updated by Microsoft. For information about the changes provided in each new version, see the following: + +### Version 3.2.36 + +This version of Microsoft Surface Data Eraser adds support for the following: + +- Surface Pro + +- Surface Laptop + +>[!NOTE] +>The Microsoft Surface Data Eraser USB drive creation tool is unable to run on Windows 10 S. To wipe a Surface Laptop running Windows 10 S, you must first create the Microsoft Surface Data Eraser USB drive on another computer with Windows 10 Pro or Windows 10 Enterprise. diff --git a/store-for-business/windows-store-for-business-overview.md b/store-for-business/windows-store-for-business-overview.md index 430cd5c616..5bc9195325 100644 --- a/store-for-business/windows-store-for-business-overview.md +++ b/store-for-business/windows-store-for-business-overview.md @@ -157,7 +157,8 @@ For more information, see [Manage settings in the Store for Business](manage-set Microsoft Store for Business and Education is currently available in these markets. - -### Support for free and paid apps -
Support for free and paid apps | -|||
---|---|---|---|
-
|
-
-
|
-
-
|
-
-
|
-
Specifies the BitLocker Drive Encryption method and cipher strength. +> [!NOTE] +> XTS-AES 128-bit and XTS-AES 256-bit values are only supported on Windows 10 for desktop. +
The following list shows the supported values: -- 3- AES 128-bit -- 4- AES 256 -- 6 -XTS 128 -- 7 - XTS 256 +- 3 - AES-CBC 128-bit +- 4 - AES-CBC 256-bit +- 6 - XTS-AES 128-bit (Desktop only) +- 7 - XTS-AES 256-bit (Desktop only) diff --git a/windows/device-security/tpm/tpm-recommendations.md b/windows/device-security/tpm/tpm-recommendations.md index 1b874b2988..d0283a1020 100644 --- a/windows/device-security/tpm/tpm-recommendations.md +++ b/windows/device-security/tpm/tpm-recommendations.md @@ -84,7 +84,7 @@ For end consumers, TPM is behind the scenes but is still very relevant. TPM is u ### Windows 10 for desktop editions (Home, Pro, Enterprise, and Education) -- Since July 28, 2016, all new device models, lines or series (or if you are updating the hardware configuration of a existing model, line or series with a major update, such as CPU, graphic cards) must implement and enable by default TPM 2.0 (details in section 3.7 of the [Minimum hardware requirements](https://msdn.microsoft.com/library/windows/hardware/dn915086(v=vs.85).aspx) page). +- Since July 28, 2016, all new device models, lines or series (or if you are updating the hardware configuration of a existing model, line or series with a major update, such as CPU, graphic cards) must implement and enable by default TPM 2.0 (details in section 3.7 of the [Minimum hardware requirements](https://msdn.microsoft.com/library/windows/hardware/dn91508.aspx) page). The requirement to enable TPM 2.0 only applies to the manufacturing of new devices. For TPM recommendations for specific Windows features, see [TPM and Windows Features](#tpm-and-windows-features). ### IoT Core