migration build 5/2/16

devices/surface/TOC.md

@@ -4,9 +4,11 @@
 ## [Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)
 ## [Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)
 ## [Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)
+## [Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)
 ## [Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)
 ## [Surface Data Eraser](microsoft-surface-data-eraser.md)
 ## [Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)
 ### [Step by step: Surface Deployment Accelerator](step-by-step-surface-deployment-accelerator.md)
 ## [Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)
+## [Surface Dock Updater](surface-dock-updater.md)
 

devices/surface/index.md

@@ -25,46 +25,54 @@ This library provides guidance to help you deploy Windows on Surface devices, ke
 </colgroup>
 <thead>
 <tr class="header">
-<th align="left">Topic</th>
-<th align="left">Description</th>
+<th>Topic</th>
+<th>Description</th>
 </tr>
 </thead>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Advanced UEFI security features for Surface](advanced-uefi-security-features-for-surface.md)</p></td>
-<td align="left"><p>This article describes how to install and configure the v3.11.760.0 UEFI update to enable additional security options for Surface Pro 3 devices.</p></td>
+<td><p>[Advanced UEFI security features for Surface](advanced-uefi-security-features-for-surface.md)</p></td>
+<td><p>This article describes how to install and configure the v3.11.760.0 UEFI update to enable additional security options for Surface Pro 3 devices.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)</p></td>
-<td align="left"><p>This article will walk you through the process of customizing the Surface out-of-box experience for end users in your organization.</p></td>
+<td><p>[Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)</p></td>
+<td><p>This article will walk you through the process of customizing the Surface out-of-box experience for end users in your organization.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)</p></td>
-<td align="left"><p>This article provides a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.</p></td>
+<td><p>[Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)</p></td>
+<td><p>This article provides a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)</p></td>
-<td align="left"><p>Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device.</p></td>
+<td><p>[Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)</p></td>
+<td><p>Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)</p></td>
-<td align="left"><p>This article provides guidance and answers to help you perform a network deployment to Surface devices.</p></td>
+<td><p>[Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)</p></td>
+<td><p>This article provides guidance and answers to help you perform a network deployment to Surface devices.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)</p></td>
-<td align="left"><p>This article describes the available options to manage firmware and driver updates for Surface devices.</p></td>
+<td><p>[Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)</p></td>
+<td><p>Read about the different methods you can use to manage the process of Surface Dock firmware updates.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Surface Data Eraser](microsoft-surface-data-eraser.md)</p></td>
-<td align="left"><p>Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.</p></td>
+<td><p>[Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)</p></td>
+<td><p>This article describes the available options to manage firmware and driver updates for Surface devices.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)</p></td>
-<td align="left"><p>Microsoft Surface Deployment Accelerator provides a quick and simple deployment mechanism for organizations to reimage Surface devices.</p></td>
+<td><p>[Surface Data Eraser](microsoft-surface-data-eraser.md)</p></td>
+<td><p>Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)</p></td>
-<td align="left"><p>Find out how you can use the Microsoft Surface Diagnostic Toolkit to test the hardware of your Surface device.</p></td>
+<td><p>[Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)</p></td>
+<td><p>Microsoft Surface Deployment Accelerator provides a quick and simple deployment mechanism for organizations to reimage Surface devices.</p></td>
+</tr>
+<tr class="even">
+<td><p>[Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)</p></td>
+<td><p>Find out how you can use the Microsoft Surface Diagnostic Toolkit to test the hardware of your Surface device.</p></td>
+</tr>
+<tr class="odd">
+<td><p>[Surface Dock Updater](surface-dock-updater.md)</p></td>
+<td><p>This article provides a detailed walkthrough of Microsoft Surface Dock Updater.</p></td>
 </tr>
 </tbody>
 </table>
@@ -74,7 +82,7 @@ This library provides guidance to help you deploy Windows on Surface devices, ke
 ## Related topics
 
 
-[Surface TechCenter](https://technet.microsoft.com/windows/dn903161.aspx)
+[Surface TechCenter](https://technet.microsoft.com/windows/surface)
 
 [Surface for IT pros blog](http://blogs.technet.com/b/surface/)
 

devices/surface/manage-surface-dock-firmware-updates.md

@@ -0,0 +1,118 @@
+---
+title: Manage Surface Dock firmware updates (Surface)
+description: Read about the different methods you can use to manage the process of Surface Dock firmware updates.
+ms.assetid: 86DFC0C0-C842-4CD1-A2D7-4425471FFE3F
+ms.prod: W10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: heatherpoulsen
+---
+
+# Manage Surface Dock firmware updates
+
+
+Read about the different methods you can use to manage the process of Surface Dock firmware updates.
+
+The Surface Dock provides external connectivity to Surface devices through a single cable connection that includes Power, Ethernet, Audio, USB 3.0, and DisplayPort. The numerous connections provided by the Surface Dock are enabled by a smart chipset within the Surface Dock device. Like a Surface device’s chipset, the chipset that is built into the Surface Dock is controlled by firmware.
+
+Like the firmware for Surface devices, firmware for Surface Dock is also contained within a downloaded driver that is visible in Device Manager. This driver stages the firmware update files on the Surface device. When a Surface Dock is connected and the driver is loaded, the newer version of the firmware staged by the driver is detected and firmware files are copied to the Surface Dock. The Surface Dock then begins a two-phase process to apply the firmware internally. Each phase requires the Surface Dock to be disconnected from the Surface device before the firmware is applied. The driver copies the firmware into the dock, but only applies it when the user disconnects the Surface device from the Surface Dock. This ensures that there are no disruptions because the firmware is only applied when the user leaves their desk with the device.
+
+**Note**  
+You can learn more about the firmware update process for Surface devices and how firmware is updated through driver installation at the following links:
+
+-   [How to manage and update your drivers and firmware for Surface](http://go.microsoft.com/fwlink/p/?LinkId=785353) from Microsoft Mechanics
+
+-   [Windows Update Makes Surface Better](http://go.microsoft.com/fwlink/p/?LinkId=785354)on the Microsoft Devices Blog
+
+ 
+
+The Surface Dock firmware update process shown in Figure 1 follows these steps:
+
+1.  Drivers for Surface Dock are installed on Surface devices that are connected, or have been previously connected, to a Surface Dock.
+
+2.  The drivers for Surface Dock are loaded when a Surface Dock is connected to the Surface device.
+
+3.  The firmware version installed in the Surface Dock is compared with the firmware version staged by the Surface Dock driver.
+
+4.  If the firmware version on the Surface Dock is older than the firmware version contained in the Surface Dock driver, the main chipset firmware update files are copied from the driver to the Surface Dock.
+
+5.  When the Surface Dock is disconnected, the Surface Dock installs the firmware update to the main chipset.
+
+6.  When the Surface Dock is connected again, the main chipset firmware is verified against the firmware present in the Surface Dock driver.
+
+7.  If the firmware update for the main chipset is installed successfully, the Surface Dock driver copies the firmware update for the DisplayPort.
+
+8.  When the Surface Dock is disconnected for a second time, the Surface dock installs the firmware update to the DisplayPort chipset. This process takes up to 3 minutes to apply.
+
+![figure 1](images/manage-surface-dock-fig1-updateprocess.png)
+
+*1- Driver installation can be performed by Windows Update, manual installation, or automatically downloaded with Microsoft Surface Dock Updater*
+
+*2 - The Surface Dock firmware installation process takes approximately 3 minutes*
+
+Figure 1. The Surface Dock firmware update process
+
+If the firmware installation process is interrupted (for example, if power is disconnected from the Surface Dock during firmware installation), the Surface Dock will automatically revert to the prior firmware without disruption to the user, and the update process will restart the next time the Surface Dock is disconnected. For most users this update process should be entirely transparent.
+
+## Methods for updating Surface Dock firmware
+
+
+There are three methods you can use to update the firmware of the Surface Dock:
+
+-   [Automatic installation of drivers with Windows Update](#automatic-installation)
+
+-   [Deployment of drivers downloaded from the Microsoft Download Center](#deployment-dlc)
+
+-   [Manually update with Microsoft Surface Dock Updater](#manual-updater)
+
+## <a href="" id="automatic-installation"></a>Automatic installation with Windows Update
+
+
+Windows Update is the method that most users will use. The drivers for the Surface Dock are downloaded automatically from Windows Update and the dock update process is initiated without additional user interaction. The two-phase dock update process described earlier occurs in the background as the user connects and disconnects the Surface Dock during normal use.
+
+**Note**  
+The driver version that is displayed in Device Manager may be different from the firmware version that the Surface Dock is using.
+
+ 
+
+## <a href="" id="deployment-dlc"></a>Deployment of drivers downloaded from the Microsoft Download Center
+
+
+This method is used mostly in environments where Surface device drivers and firmware are managed separately from Windows Update. See [Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md) for more information about the different methods to manage Surface device driver and firmware updates. Updating the Surface Dock firmware through this method involves downloading and deploying an MSI package to the Surface device that contains the updated Surface Dock drivers and firmware. This is the same method recommended for updating all other Surface drivers and firmware. The two-phase firmware update process occurs in the background each time the Surface Dock is disconnected, just like it does with the Windows Update method.
+
+For more information about how to deploy MSI packages see [Create and deploy an application with System Center Configuration Manager](http://go.microsoft.com/fwlink/p/?LinkId=785355).
+
+**Note**  
+When drivers are installed through Windows Update or the MSI package, registry keys are added that indicate the version of firmware installed on the Surface Dock and contained within the Surface Dock driver. These registry keys can be found in:
+
+**HLKM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\WUDF\\Services\\SurfaceDockFwUpdate\\Parameters**
+
+Firmware status is displayed for both the main chipset (displayed as **Component10**) and the DisplayPort chipset (displayed as **Component20**). For each chipset there are four keys, where *xx* is **10** or **20** corresponding to each chipset:
+
+-   **Component*xx*CurrentFwVersion** – This key displays the version of firmware that is installed on the currently connected or most recently connected Surface Dock.
+
+-   **Component*xx*OfferFwVersion** – This key displays the version of firmware staged by the Surface Dock driver.
+
+-   **Component*xx*FirmwareUpdateStatus** – This key displays the stage of the Surface Dock firmware update process.
+
+-   **Component*xx*FirmwareUpdateStatusRejectReason** – This key changes as the firmware update is processed. It should result in 0 after the successful installation of Surface Dock firmware.
+
+These registry keys are not present unless you have installed updated Surface Dock drivers through Windows Update or MSI deployment.
+
+ 
+
+## <a href="" id="manual-updater"></a>Manually update with Microsoft Surface Dock Updater
+
+
+The manual method using the Microsoft Surface Dock Updater tool to update the Surface Dock is used mostly in environments where IT prepares Surface Docks prior to delivery to the end user, or for troubleshooting of a Surface Dock. Microsoft Surface Dock Updater is a tool that you can run from any Surface device that is compatible with the Surface Dock, and will walk you through the process of performing the Surface Dock firmware update in the least possible amount of time. You can also use this tool to verify the firmware status of a connected Surface Dock.
+
+For more information about how to use the Microsoft Surface Dock Updater tool, please see [Microsoft Surface Dock Updater](surface-dock-updater.md). You can download the Microsoft Surface Dock Updater tool from the [Surface Tools for IT page](http://go.microsoft.com/fwlink/p/?LinkId=618121) on the Microsoft Download Center.
+
+ 
+
+ 
+
+
+
+
+

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

@@ -14,7 +14,21 @@ author: heatherpoulsen
 
 Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.
 
-[Microsoft Surface Data Eraser](http://go.microsoft.com/fwlink/p/?LinkId=691148) is a tool that boots from a USB stick and allows you to perform a secure wipe of all data from a Surface Book, Surface Pro 4, Surface Pro 3, or Surface Pro 2 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](http://go.microsoft.com/fwlink/p/?LinkId=691222).
+[Microsoft Surface Data Eraser](http://go.microsoft.com/fwlink/p/?LinkId=691148) 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](http://go.microsoft.com/fwlink/p/?LinkId=691222).
+
+Compatible Surface devices include:
+
+-   Surface Book
+
+-   Surface Pro 4
+
+-   Surface Pro3
+
+-   Surface 3
+
+-   Surface 3 LTE
+
+-   Surface Pro 2
 
 Some scenarios where Microsoft Surface Data Eraser can be helpful include:
 
@@ -27,19 +41,7 @@ Some scenarios where Microsoft Surface Data Eraser can be helpful include:
 -   Standard practice when performing reimaging for devices used with sensitive data
 
 **Note**  
-The following devices are incompatible with Microsoft Surface Data Eraser:
-
--   Surface devices running Windows RT
-
-    -   Surface
-
-    -   Surface 2
-
--   Surface 3
-
--   Surface Pro
-
--   Third-party devices
+Third-party devices, Surface devices running Windows RT (including Surface and Surface 2), and Surface Pro are not compatible with Microsoft Surface Data Eraser.
 
  
 
@@ -48,7 +50,7 @@ Because the ability to boot to USB is required to run Microsoft Surface Data Era
 
  
 
-## Create a Microsoft Surface Data Eraser USB stick
+## How to create a Microsoft Surface Data Eraser USB stick
 
 
 To create a Microsoft Surface Data Eraser USB stick, first install the Microsoft Surface Data Eraser setup tool from the Microsoft Download Center using the link provided at the beginning of this article. You do not need a Surface device to *create* the USB stick. After you have downloaded the installation file to your computer, follow these steps to install the Microsoft Surface Data Eraser creation tool:

devices/surface/surface-dock-updater.md

@@ -0,0 +1,119 @@
+---
+title: Microsoft Surface Dock Updater (Surface)
+description: This article provides a detailed walkthrough of Microsoft Surface Dock Updater.
+ms.assetid: 1FEFF277-F7D1-4CB4-8898-FDFE8CBE1D5C
+ms.prod: W10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: heatherpoulsen
+---
+
+# Microsoft Surface Dock Updater
+
+
+This article provides a detailed walkthrough of Microsoft Surface Dock Updater.
+
+The [Microsoft Surface Dock Updater](http://go.microsoft.com/fwlink/p/?LinkId=618121) tool allows you to check the firmware status of a Surface Dock and to manually update the firmware of Surface Dock devices. It is most often used to update Surface Docks prior to deployment of those Surface Docks to end users or as a troubleshooting tool. Microsoft Surface Dock Updater walks you through the process of updating the firmware on one or more Surface Docks, including the required connect and disconnect steps to perform the complete firmware installation.
+
+When you run the Microsoft Surface Dock Updater installer you will be prompted to accept an End User License Agreement (EULA).
+
+**Note**  
+Updating Surface Dock firmware requires connectivity to the Surface Dock, available only on Surface Pro 3, Surface Pro 4, and Surface Book devices. A Surface Pro 3, Surface Pro 4, or Surface Book is required to successfully install Microsoft Surface Dock Updater.
+
+ 
+
+## Update a Surface Dock with Microsoft Surface Dock Updater
+
+
+After you install the [Microsoft Surface Dock Updater](http://go.microsoft.com/fwlink/p/?LinkId=618121) tool, you can find Microsoft Surface Dock Updater under **All Apps** in your Start menu. Click **Microsoft Surface Dock Updater** to start the application.
+
+To update a Surface Dock with Microsoft Surface Dock Updater, follow these steps:
+
+1.  Click Start to begin the firmware update process. If you do not have a Surface Dock connected, you will be prompted to connect a Surface Dock.
+
+2.  Microsoft Surface Dock Updater checks the status of your Surface Dock firmware.
+
+    -   If the tool determines that the firmware of your Surface Dock is up to date, a **You have the latest firmware for this Surface Dock** message is displayed, as shown in Figure 1.
+
+        ![figure 1](images/surfacedockupdater-fig1-uptodate-568pix.png)
+
+        Figure 1. Your Surface Dock firmware is up to date.
+
+    -   If Microsoft Surface Dock Updater determines that the firmware of your Surface Dock is not up to date, a **This Surface Dock is not running the latest firmware** message is displayed, as shown in Figure 2.
+
+        ![figure 2](images/surfacedockupdater-fig2a-needsupdating.png)
+
+        Figure 2. Your Surface Dock firmware needs to be updated
+
+3.  To begin the firmware update process, click **Update** on the **Surface Dock Firmware** page.
+
+4.  Before the firmware update process begins, you will be prompted for confirmation. Click **OK** to proceed or **Cancel** to return to the **Surface Dock Firmware** page displaying the status of your Surface Dock firmware.
+
+5.  As the firmware update is uploaded to the Surface Dock, a **Progress** page is displayed, as shown in Figure 3. Do not disconnect the Surface Dock while firmware is being uploaded.
+
+    ![figure 3](images/surfacedockupdater-fig3-progress.png)
+
+    Figure 3. Progress of firmware update upload to Surface Dock
+
+6.  After the firmware update has successfully uploaded to the Surface Dock, you are prompted to disconnect and then reconnect the Surface Dock from the Surface device, as shown in Figure 4. The main chipset firmware update will be applied while the Surface Dock is disconnected.
+
+    ![figure 4](images/surfacedockupdater-fig4-disconnect.png)
+
+    Figure 4. Disconnect and reconnect Surface Dock when prompted
+
+7.  When the main chipset firmware update is verified, the DisplayPort chipset firmware update will be uploaded to the Surface Dock. Upon completion, a **Success** page is displayed and you will again be prompted to disconnect the Surface Dock, as shown in Figure 5.
+
+    ![figure 5](images/surfacedockupdater-fig5-success.png)
+
+    Figure 5. Successful upload of Surface Dock firmware
+
+8.  After you disconnect the Surface Dock the DisplayPort firmware update will be installed. This process occurs on the Surface Dock hardware while it is disconnected. The Surface Dock must remain powered for up to 3 minutes after it has been disconnected for the firmware update to successfully install. An **Update in Progress** page is displayed (as shown in Figure 6), with a countdown timer to show the estimated time remaining to complete the firmware update installation.
+
+    ![figure 6](images/surfacedockupdater-fig6-countdown.png)
+
+    Figure 6. Countdown timer to complete firmware installation on Surface Dock
+
+9.  If you want to update multiple Surface Docks in one sitting, you can click the **Update another Surface Dock** button to begin the process on the next Surface Dock.
+
+    **Note**  
+    The LED in the Ethernet port of the dock will blink while the update is in progress. Please wait until the LED stops blinking before you unplug your Surface Dock from power.
+
+     
+
+## Troubleshooting Microsoft Surface Dock Updater
+
+
+If the Surface Dock firmware update process encounters an installation error with either firmware update, the **Encountered an unexpected error** page may be displayed, as shown in Figure 7.
+
+![figure 7](images/surfacedockupdater-fig7-error.png)
+
+Figure 7. Firmware update installation has encountered an error
+
+Microsoft Surface Dock Updater logs its progress into the Event Log, as shown in Figure 8. If you need to troubleshoot an update through this tool, you will find Surface Dock events recorded with the following event IDs:
+
+| Event ID | Event type                                               |
+|----------|----------------------------------------------------------|
+| 12100    | Up-to-date confirmation                                  |
+| 12101    | Event in the main chipset firmware update process        |
+| 12102    | Event in the DisplayPort chipset firmware update process |
+| 12105    | Error                                                    |
+
+ 
+
+![figure 8](images/surfacedockupdater-fig8-737test.png)
+
+Figure 8. Surface Dock Updater events in Event Viewer
+
+## Related topics
+
+
+[Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)
+
+ 
+
+ 
+
+
+
+
+