fixing merge conflict in #932 related to metadata in two articles

This commit is contained in:
Liza Poggemeyer
2018-05-18 08:57:51 -07:00
3 changed files with 16 additions and 4 deletions

View File

@ -7,13 +7,20 @@ ms.sitesec: library
author: jdeckerms author: jdeckerms
ms.author: jdecker ms.author: jdecker
ms.topic: article ms.topic: article
ms.date: 02/12/2018 ms.date: 05/15/2018
--- ---
# Change history for Surface documentation # Change history for Surface documentation
This topic lists new and updated topics in the Surface documentation library. This topic lists new and updated topics in the Surface documentation library.
## May 2018
|New or changed topic | Description |
| --- | --- |
|[Microsoft Surface Data Eraser](microsoft-surface-data-eraser.md) | Added version 3.2.58.0 information |
|[Surface device compatibility with Windows 10 Long-Term Servicing Channel (LTSC)](surface-device-compatibility-with-windows-10-ltsc.md) | Removed note box around content |
## February 2018 ## February 2018
|New or changed topic | Description | |New or changed topic | Description |

View File

@ -11,7 +11,7 @@ ms.sitesec: library
author: brecords author: brecords
ms.author: jdecker ms.author: jdecker
ms.topic: article ms.topic: article
ms.date: 02/12/2018 ms.date: 05/15/2018
--- ---
# Microsoft Surface Data Eraser # Microsoft Surface Data Eraser
@ -147,6 +147,12 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo
Microsoft Surface Data Eraser is periodically updated by Microsoft. For information about the changes provided in each new version, see the following: 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.58.0
This version of Microsoft Surface Data Eraser adds support for the following:
- • Additional storage devices (drives) for Surface Pro and Surface Laptop devices
### Version 3.2.46.0 ### Version 3.2.46.0
This version of Microsoft Surface Data Eraser adds support for the following: This version of Microsoft Surface Data Eraser adds support for the following:

View File

@ -36,8 +36,7 @@ The LTSC servicing option is designed for device types and scenarios where the k
>[!NOTE] >[!NOTE]
>For general information about Windows servicing branches, including LTSC, see [Overview of Windows as a service](https://technet.microsoft.com/itpro/windows/update/waas-overview#long-term-servicing-branch). >For general information about Windows servicing branches, including LTSC, see [Overview of Windows as a service](https://technet.microsoft.com/itpro/windows/update/waas-overview#long-term-servicing-branch).
>[!NOTE] As a general guideline, devices that fulfill the following criteria are considered general-purpose devices and should be paired with Windows 10 Pro or Windows 10 Enterprise using the Semi-Annual Channel servicing option:
>As a general guideline, devices that fulfill the following criteria are considered general-purpose devices and should be paired with Windows 10 Pro or Windows 10 Enterprise using the Semi-Annual Channel servicing option:
* Devices that run productivity software such as Microsoft Office * Devices that run productivity software such as Microsoft Office