Merge remote-tracking branch 'refs/remotes/origin/master' into live

windows/deploy/TOC.md

@@ -34,6 +34,7 @@
 ### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
 ## [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
 ## [Upgrade to Windows 10 with System Center Configuration Manager](upgrade-to-windows-10-with-system-center-configuraton-manager.md)
+## [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md)
 ## [Windows 10 edition upgrade](windows-10-edition-upgrades.md)
 ## [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
 ## [Update Windows 10 images with provisioning packages](update-windows-10-images-with-provisioning-packages.md)

windows/deploy/change-history-for-deploy-windows-10.md

@@ -11,6 +11,16 @@ author: greg-lindsay
 # Change history for Deploy Windows 10
 This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
 
+## June 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) | New |
+
+## May 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade-windows-phone-8-1-to-10.md) | New |
+
 ## December 2015
 | New or changed topic | Description |
 |----------------------|-------------|

windows/deploy/configure-a-pxe-server-to-load-windows-pe.md

@@ -0,0 +1,168 @@
+---
+title: Configure a PXE server to load Windows PE (Windows 10)
+description: This topic describes how to configure a PXE server to load Windows PE so that it can be used with an image file to install Windows 10 from the network. 
+keywords: upgrade, update, windows, windows 10, pxe, WinPE, image, wim
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: deploy
+author: greg-lindsay
+---
+
+# Configure a PXE server to load Windows PE
+
+**Applies to**
+
+-   Windows 10
+
+## Summary
+
+This walkthrough describes how to configure a PXE server to load Windows PE by booting a client computer from the network. Using the Windows PE tools and a Windows 10 image file, you can install Windows 10 from the network.
+
+## Prerequisites
+
+- A deployment computer: A computer with the [Windows Assessment and Deployment Kit](https://www.microsoft.com/en-us/download/details.aspx?id=39982) (Windows ADK) installed.
+- A DHCP server: A DHCP server or DHCP proxy configured to respond to PXE client requests is required.
+- A PXE server: A server running the TFTP service that can host Windows PE boot files that the client will download.
+- A file server: A server hosting a network file share.
+
+All four of the roles specified above can be hosted on the same computer or each can be on a separate computer.
+
+## Step 1: Copy Windows PE source files
+
+1. On the deployment computer, click **Start**, and type **deployment**.
+
+2. Right-click **Deployment and Imaging Tools Environment** and then click **Run as administrator**. The Deployment and Imaging Tools Environment shortcut opens a Command Prompt window and automatically sets environment variables to point to all the necessary tools.
+
+3. Run the following command to copy the base Windows PE files into a new folder. The script requires two arguments: hardware architecture and destination location. The value of **<architecture>** can be **x86**, **amd64**, or **arm** and **<destination>** is a path to a local directory. If the directory does not already exist, it will be created.
+
+    ```
+    copype.cmd <architecture> <destination>
+    ```
+
+    For example, the following command copies **amd64** architecture files to the **C:\winpe_amd64** directory:
+
+    ```
+    copype.cmd amd64 C:\winpe_amd64
+    ```
+
+    The script creates the destination directory structure and copies all the necessary files for that architecture. In the previous example, the following directories are created:
+    
+    ```
+    C:\\winpe\_amd64
+    C:\\winpe\_amd64\\fwfiles
+    C:\\winpe\_amd64\\media
+    C:\\winpe\_amd64\\mount
+    ```
+4. Mount the base Windows PE image (winpe.wim) to the \mount directory using the DISM tool. Mounting an image file unpacks the file contents into a folder so that you can make changes directly or by using tools such as DISM. See the following example.
+
+    ```
+    Dism /mount-image /imagefile:c:\winpe_amd64\media\sources\boot.wim /index:1 /mountdir:C:\winpe_amd64\mount
+    ```
+5. Map a network share to the root TFTP directory on the PXE/TFTP server and create a \Boot folder. Consult your TFTP server documentation to determine the root TFTP server directory, then enable sharing for this directory, and verify it can be accessed on the network. In the following example, the PXE server name is PXE-1 and the TFTP root directory is shared using a network path of \\PXE-1\TFTPRoot:
+
+    ```
+    net use y: \\PXE-1\TFTPRoot
+    y:
+    md boot
+    ```
+6. Copy the PXE boot files from the mounted directory to the \Boot folder. For example:
+
+    ```
+    copy c:\winpe_amd64\mount\windows\boot\pxe\*.* y:\boot
+    ```
+7.  Copy the boot.sdi file to the PXE/TFTP server.
+
+    ```
+    copy C:\winpe_amd64\media\boot\boot.sdi y:\boot
+    ```
+8.  Copy the bootable Windows PE image (boot.wim) to the \Boot folder.
+
+    ```
+    copy C:\winpe_amd64\media\sources\boot.wim y:\boot
+    ```
+
+## Step 2: Configure boot settings and copy the BCD file
+
+1.  Create a BCD store using bcdedit.exe:
+
+    ```
+    bcdedit /createstore c:\BCD
+    ```
+2.  Configure RAMDISK settings:
+
+    ```
+    bcdedit /store c:\BCD /create {ramdiskoptions} /d "Ramdisk options"
+    bcdedit /store c:\BCD /set {ramdiskoptions} ramdisksdidevice partition=C:
+    bcdedit /store c:\BCD /set {ramdiskoptions} ramdisksdipath \winpe_amd64\media\boot\boot.sdi
+    ```
+3.  Create a new boot application entry for the Windows PE image:
+
+    ```
+    bcdedit /store c:\BCD /set {GUID1} device ramdisk=[c:]\winpe_amd64\media\sources\boot.wim,{ramdiskoptions} 
+    bcdedit /store c:\BCD /set {GUID1} path \windows\system32\winload.exe 
+    bcdedit /store c:\BCD /set {GUID1} osdevice ramdisk=[c:]\winpe_amd64\media\sources\boot.wim,{ramdiskoptions} 
+    bcdedit /store c:\BCD /set {GUID1} systemroot \windows
+    bcdedit /store c:\BCD /set {GUID1} detecthal Yes
+    bcdedit /store c:\BCD /set {GUID1} winpe Yes
+    ```
+4.  Configure BOOTMGR settings:
+
+    ```
+    bcdedit /store c:\BCD /set {bootmgr} timeout 30 
+    bcdedit /store c:\BCD -displayorder {GUID1} -addlast
+    ```
+5.  Copy the BCD file to your TFTP server:
+
+    ```
+    copy c:\BCD \\PXE-1\TFTPRoot\Boot
+    ```
+
+Your PXE/TFTP server is now configured. You can view the BCD settings that have been configured using the command “bcdedit /store &lt;BCD file location&gt; /enum all. The GUID displayed below is an example and your GUID will be different:
+
+```
+C:\>bcdedit /store C:\BCD /enum all
+Windows Boot Manager
+--------------------
+identifier              {bootmgr}
+description             boot manager
+displayorder            {a4f89c62-2142-11e6-80b6-00155da04110}
+timeout                 30
+
+Windows Boot Loader
+-------------------
+identifier              {a4f89c62-2142-11e6-80b6-00155da04110}
+device                  ramdisk=[boot]\boot\boot.wim,{ramdiskoptions}
+description             winpe boot image
+osdevice                ramdisk=[boot]\boot\boot.wim,{ramdiskoptions}
+systemroot              \Windows
+detecthal               Yes
+winpe                   Yes
+
+Setup Ramdisk Options
+---------------------
+identifier              {ramdiskoptions}
+description             ramdisk options
+ramdisksdidevice        boot
+ramdisksdipath          \boot\boot.sdi
+```
+
+## PXE boot summary
+
+The following summarizes the PXE client boot process.
+
+1.  A client is directed by DHCP options 066 and 067 to download boot\\wdsnbp.com from the TFTP server.
+2.  Wdsnbp.com validates the DHCP/PXE response packet and then the client downloads boot\\pxeboot.com.
+3.  Pxeboot.com requires the client to press the F12 key to initiate a PXE boot.
+4.  The client downloads boot\\bootmgr.exe and the boot\\BCD file from the TFTP server. Note: The BCD store must reside in the \\boot directory on the TFTP server and must be named BCD.
+5.  Bootmgr.exe reads the BCD operating system entries and downloads boot\\boot.sdi and the Windows PE image (boot\\boot.wim). Optional files that can also be downloaded include true type fonts (boot\\Fonts\\wgl4\_boot.ttf) and the hibernation state file (\\hiberfil.sys) if these files are present.
+6.  Bootmgr.exe starts Windows PE by calling winload.exe within the Windows PE image.
+7.  Windows PE loads, a command prompt opens and wpeinit.exe is run to initialize Windows PE.
+8.  The Windows PE client provides access to tools like imagex, diskpart, and bcdboot using the Windows PE command prompt. Using these tools together with a Windows 10 image file, the destination computer can be formatted properly to load a full Windows 10 operating system.
+
+See Also 
+---------
+
+#### Concepts
+
+[Windows PE Walkthroughs](https://technet.microsoft.com/en-us/library/cc748899.aspx)

windows/deploy/upgrade-windows-phone-8-1-to-10.md

@@ -6,7 +6,7 @@ ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: mdt
-author: greg-lindsay
+author: Jamiejdt
 ---
 
 # Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management (MDM)
@@ -91,7 +91,7 @@ Note: The availability of Windows 10 Mobile as an update for existing Windows Ph
 
 ### How to blacklist the Upgrade Advisor app <a id="howto-blacklist"></a>
 
-Some enterprises may want to block their users from installing the Windows 10 Mobile Upgrade Advisor app. With Windows Phone 8.1, you can allow or deny individual apps by adding specific app publishers or the app globally unique identifier (GUID) from the Window Phone Store to an allow or deny XML list. The GUID for a particular application can be found in the URL for the app in the phone store. For example, the GUID to the Windows Phone Upgrade Adviser (fbe47e4f-7769-4103-910e-dca8c43e0b07) is displayed in the following URL:
+Some enterprises may want to block their users from installing the Windows 10 Mobile Upgrade Advisor app. With Windows Phone 8.1, you can allow or deny individual apps by adding specific app publishers or the app globally unique identifier (GUID) from the Window Phone Store to an allow or deny XML list. The GUID for a particular application can be found in the URL for the app in the phone store. For example, the GUID to the Windows 10 Mobile Upgrade Adviser (fbe47e4f-7769-4103-910e-dca8c43e0b07) is displayed in the following URL:
 
 http://windowsphone.com/s?appid=fbe47e4f-7769-4103-910e-dca8c43e0b07
 

windows/manage/change-history-for-manage-and-update-windows-10.md

@@ -17,7 +17,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 | New or changed topic | Description |
 | ---|---|
 | [Group Policies that apply only to Windows 10 Enterprise and Education Editions](group-policies-for-enterprise-and-education-editions.md) | New |
-| [Configure Windows 10 devices to stop data flow to Microsoft](configure-windows-10-devices-to-stop-data-flow-to-microsoft.md) | Added section on how to turn off Live Tiles |
+| [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added section on how to turn off Live Tiles |
 | [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md) | New telemetry content |
 | [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) |Removed info about sharing wi-fi network access with contacts, since it's been deprecated. |
 | [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Corrected script for setting a custom shell using Shell Launcher |