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

CONTRIBUTING.md

@@ -30,7 +30,7 @@ We've tried to make editing an existing, public file as simple as possible.
 
        ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png)
 
-4.	Using markdown language, make your changes to the topic. For info about how to edit content using markdown, see:
+4.	Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see:
     - **If you're linked to the Microsoft organization in GitHub:** [Windows Open Publishing Guide Home](http://aka.ms/windows-op-guide)
     
     - **If you're external to Microsoft:** [Mastering Markdown](https://guides.github.com/features/mastering-markdown/) 

education/windows/TOC.md

@@ -1,5 +1,4 @@
 # [Windows 10 for Education](index.md)
-## [Change history for Windows 10 for Education](change-history-edu.md)
 ## [Windows 10 editions for education customers](windows-editions-for-education-customers.md)
 ## [Setup options for Windows 10](set-up-windows-10.md)
 ### [Use the Set up School PCs app ](use-set-up-school-pcs-app.md)
@@ -18,3 +17,4 @@
 ## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
 ## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
 ## [Chromebook migration guide](chromebook-migration-guide.md)
+## [Change history for Windows 10 for Education](change-history-edu.md)

windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md

@@ -25,7 +25,7 @@ For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is
 ## <a href="" id="sec01"></a>Create a task sequence using the MDT Integration Wizard
 
 
-This section will walk you through the process of creating a System Center 2012 R2 Configuration Manager task sequence for production use.
+This section walks you through the process of creating a System Center 2012 R2 Configuration Manager task sequence for production use.
 
 1.  On CM01, using the Configuration Manager Console, in the Software Library workspace, expand **Operating Systems**, right-click **Task Sequences**, and select **Create MDT Task Sequence**.
 
@@ -33,27 +33,27 @@ This section will walk you through the process of creating a System Center 2012
 
 3.  On the **General** page, assign the following settings and then click **Next**:
 
-    1.  Task sequence name: Windows 10 Enterprise x64 RTM
+    * Task sequence name: Windows 10 Enterprise x64 RTM
 
-    2.  Task sequence comments: Production image with Office 2013
+    * Task sequence comments: Production image with Office 2013
 
 4.  On the **Details** page, assign the following settings and then click **Next**:
 
-    1.  Join a Domain
+    * Join a Domain
 
-    2.  Domain: contoso.com
+    * Domain: contoso.com
 
-        1.  Account: CONTOSO\\CM\_JD
+        * Account: CONTOSO\\CM\_JD
 
-        2.  Password: Passw0rd!
+        * Password: Passw0rd!
 
-    3.  Windows Settings
+    * Windows Settings
 
-        1.  User name: Contoso
+        * User name: Contoso
 
-        2.  Organization name: Contoso
+        * Organization name: Contoso
 
-        3.  Product key: &lt;blank&gt;
+        * Product key: &lt;blank&gt;
 
 5.  On the **Capture Settings** page, accept the default settings, and click **Next**.
 
@@ -88,12 +88,10 @@ After you create the task sequence, we recommend that you configure the task seq
 
 2.  In the **Install** group, select the **Set Variable for Drive Letter** action and configure the following:
 
-    -   OSDPreserveDriveLetter: True
+    * OSDPreserveDriveLetter: True
     
-    **Note**  
+    >[!NOTE]  
-    If you don't change this value, your Windows installation will end up in E:\\Windows.
+    >If you don't change this value, your Windows installation will end up in E:\\Windows.
-
-     
 
 3.  In the **Post Install** group, select **Apply Network Settings**, and configure the Domain OU value to use the **Contoso / Workstations** OU (browse for values).
 
@@ -103,57 +101,55 @@ After you create the task sequence, we recommend that you configure the task seq
 
 6.  After the **Post Install / Drivers** group, add an **Apply Driver Package** action with the following settings:
 
-    1.  Name: HP EliteBook 8560w
+    * Name: HP EliteBook 8560w
 
-    2.  Driver Package: Windows 10 x64 - HP EliteBook 8560w
+    * Driver Package: Windows 10 x64 - HP EliteBook 8560w
 
-    3.  Options: Task Sequence Variable: Model equals HP EliteBook 8560w
+    * Options: Task Sequence Variable: Model equals HP EliteBook 8560w
     
-    **Note**  
+    >[!NOTE]  
-    You also can add a Query WMI condition with the following query: SELECT \* FROM Win32\_ComputerSystem WHERE Model LIKE '%HP EliteBook 8560w%'
+    >You also can add a Query WMI condition with the following query: SELECT \* FROM Win32\_ComputerSystem WHERE Model LIKE '%HP EliteBook 8560w%'
     
-     
+    ![Driver package options](images/fig27-driverpackage.png "Driver package options")
     
-    ![figure 24](images/fig27-driverpackage.png)
+    *Figure 24. The driver package options*
-
-    Figure 24. The driver package options.
 
 7.  In the **State Restore / Install Applications** group, select the **Install Application** action.
 
 8.  Select the **Install the following applications** option, and add the OSD / Adobe Reader XI - OSD Install application to the list.
 
-    ![figure 25](images/fig28-addapp.png)
+    ![Add an application to the task sequence](images/fig28-addapp.png "Add an application to the task sequence")
 
-    Figure 25. Add an application to the Configuration Manager task sequence.
+    *Figure 25. Add an application to the Configuration Manager task sequence*
 
 9.  In the **State Restore** group, after the **Set Status 5** action, add a **Request State Store** action with the following settings:
 
-    1.  Restore state from another computer
+    * Restore state from another computer
 
-    2.  If computer account fails to connect to state store, use the Network Access account
+    * If computer account fails to connect to state store, use the Network Access account
 
-    3.  Options: Continue on error
+    * Options: Continue on error
 
-    4.  Options / Condition:
+    * Options / Condition:
     
-        1.  Task Sequence Variable
+      * Task Sequence Variable
       
-        2.  USMTLOCAL not equals True
+      * USMTLOCAL not equals True
 
 10. In the **State Restore** group, after the **Restore User State** action, add a **Release State Store** action with the following settings:
 
-    1.  Options: Continue on error
+    * Options: Continue on error
 
-    2.  Options / Condition:
+    * Options / Condition:
     
-        1.  Task Sequence Variable
+      * Task Sequence Variable
       
-        2.  USMTLOCAL not equals True
+      * USMTLOCAL not equals True
 
 11. Click **OK**.
 
-**Note**  
+>[!NOTE]  
-The Request State Store and Release State Store actions need to be added for common computer replace scenarios.
+>The Request State Store and Release State Store actions need to be added for common computer replace scenarios.
 
  
 

windows/keep-secure/create-and-verify-an-efs-dra-certificate.md

@@ -77,7 +77,7 @@ It's possible that you might revoke data from an unenrolled device only to later
 
 1. Have your employee sign in to the unenrolled device, open a command prompt, and type:
     
-    `Robocopy “%localappdata%\Microsoft\WIP\Recovery” <“new_location”> /EFSRAW`
+    `Robocopy “%localappdata%\Microsoft\EDP\Recovery” <“new_location”> /EFSRAW`
 
     Where *&lt;”new_location”&gt;* is in a different directory. This can be on the employee’s device or on a Windows 8 or Windows Server 2012 or newer server file share that can be accessed while you're logged in as a data recovery agent.
 
@@ -87,7 +87,7 @@ It's possible that you might revoke data from an unenrolled device only to later
 
 3. Have your employee sign in to the unenrolled device, and type:
 
-    `Robocopy <”new_location”> “%localappdata%\Microsoft\WIP\Recovery\Input”`
+    `Robocopy <”new_location”> “%localappdata%\Microsoft\EDP\Recovery\Input”`
 
 4. Ask the employee to lock and unlock the device.
 

windows/manage/set-up-shared-or-guest-pc.md

@@ -100,6 +100,7 @@ Use the Windows ICD tool included in the Windows Assessment and Deployment Kit (
 11. (*Optional*) In the **Provisioning package security** window, you can choose to encrypt the package and enable package signing.
     -   **Enable package encryption** - If you select this option, an auto-generated password will be shown on the screen.
     -   **Enable package signing** - If you select this option, you must select a valid certificate to use for signing the package. You can specify the certificate by clicking **Select...** and choosing the certificate you want to use to sign the package.
+    
        > [!IMPORTANT]  
        > We recommend that you include a trusted provisioning certificate in your provisioning package. When the package is applied to a device, the certificate is added to the system store and any package signed with that certificate thereafter can be applied silently.
         

windows/whats-new/contribute-to-a-topic.md

@@ -31,7 +31,7 @@ You've already completed this step.
 
     ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png)
 
-5.	Using markdown language, make your changes to the topic. For info about how to edit content using markdown, see:
+5.	Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see:
     - **If you're linked to the Microsoft organization in GitHub:** [Windows Open Publishing Guide Home](http://aka.ms/windows-op-guide)
     
     - **If you're external to Microsoft:** [Mastering Markdown](https://guides.github.com/features/mastering-markdown/)