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

windows/deploy/getting-started-with-the-user-state-migration-tool.md

@@ -9,22 +9,16 @@ author: CFaw
 ---
 
 # Getting Started with the User State Migration Tool (USMT)
-
-
 This topic outlines the general process that you should follow to migrate files and settings.
 
 ## In this Topic
+-   [Step 1: Plan Your Migration](#step-1-plan-your-migration)
 
+-   [Step 2: Collect files and settings from the source computer](#step-2-collect-files-and-settings-from-the-source-computer)
 
--   [Step One: Plan Your Migration](#bkmk-planmig)
+-   [Step 3: Prepare the destination computer and restore files and settings](#step-3-prepare-the-destination-computer-and-restore-files-and-settings)
-
--   [Step Two: Collect Files and Settings from the Source Computer](#bkmk-collectfiles)
-
--   [Step Three: Prepare the Destination Computer and Restore Files and Settings](#bkmk-preparedestination)
-
-## <a href="" id="bkmk-planmig"></a>Step One: Plan Your Migration
-
 
+## Step 1: Plan your migration
 1.  [Plan Your Migration](usmt-plan-your-migration.md). Depending on whether your migration scenario is refreshing or replacing computers, you can choose an online migration or an offline migration using Windows Preinstallation Environment (WinPE) or the files in the Windows.old directory. For more information, see [Common Migration Scenarios](usmt-common-migration-scenarios.md).
 
 2.  [Determine What to Migrate](usmt-determine-what-to-migrate.md). Data you might consider migrating includes end-user information, applications settings, operating-system settings, files, folders, and registry keys.
@@ -37,9 +31,7 @@ This topic outlines the general process that you should follow to migrate files
 
     **Important**  
     We recommend that you always make and modify copies of the .xml files included in User State Migration Tool (USMT) 10.0. Never modify the original .xml files.
-
+    
-     
-
     You can use the MigXML.xsd file to help you write and validate the .xml files. For more information about how to modify these files, see [USMT XML Reference](usmt-xml-reference.md).
 
 6.  Create a [Config.xml File](usmt-configxml-file.md) if you want to exclude any components from the migration. To create this file, use the [ScanState Syntax](usmt-scanstate-syntax.md) option together with the other .xml files when you use the **ScanState** command. For example, the following command creates a Config.xml file by using the MigDocs and MigApp.xml files:
@@ -48,9 +40,7 @@ This topic outlines the general process that you should follow to migrate files
 
 7.  Review the migration state of the components listed in the Config.xml file, and specify `migrate=no` for any components that you do not want to migrate.
 
-## <a href="" id="bkmk-collectfiles"></a>Step Two: Collect Files and Settings from the Source Computer
+## Step 2: Collect files and settings from the source computer
-
-
 1.  Back up the source computer.
 
 2.  Close all applications. If some applications are running when you run the **ScanState** command, USMT might not migrate all of the specified data. For example, if Microsoft® Office Outlook® is open, USMT might not migrate PST files.
@@ -58,8 +48,6 @@ This topic outlines the general process that you should follow to migrate files
     **Note**  
     USMT will fail if it cannot migrate a file or setting unless you specify the **/C** option. When you specify the **/C** option, USMT will ignore the errors, and log an error every time that it encounters a file that is being used that USMT did not migrate. You can use the **&lt;ErrorControl&gt;** section in the Config.xml file to specify which errors should be ignored, and which should cause the migration to fail.
 
-     
-
 3.  Run the **ScanState** command on the source computer to collect files and settings. You should specify all of the .xml files that you want the **ScanState** command to use. For example,
 
     `scanstate \\server\migration\mystore /config:config.xml /i:migdocs.xml /i:migapp.xml /v:13 /l:scan.log`
@@ -67,13 +55,9 @@ This topic outlines the general process that you should follow to migrate files
     **Note**  
     If the source computer is running Windows 7, or Windows 8, you must run the **ScanState** command in **Administrator** mode. To run in **Administrator** mode, right-click **Command Prompt**, and then click **Run As Administrator**. If the source computer is running Windows XP, you must run the **ScanState** command from an account that has administrative credentials. For more information about the how the **ScanState** command processes and stores the data, see [How USMT Works](usmt-how-it-works.md).
 
-     
-
 4.  Run the **USMTUtils** command with the **/Verify** option to ensure that the store you created is not corrupted.
 
-## <a href="" id="bkmk-preparedestination"></a>Step Three: Prepare the Destination Computer and Restore Files and Settings
+## Step 3: Prepare the destination computer and restore files and settings
-
-
 1.  Install the operating system on the destination computer.
 
 2.  Install all applications that were on the source computer. Although it is not always required, we recommend installing all applications on the destination computer before you restore the user state. This makes sure that migrated settings are preserved.
@@ -81,15 +65,11 @@ This topic outlines the general process that you should follow to migrate files
     **Note**  
     The application version that is installed on the destination computer should be the same version as the one on the source computer. USMT does not support migrating the settings for an older version of an application to a newer version. The exception to this is Microsoft® Office, which USMT can migrate from an older version to a newer version.
 
-     
-
 3.  Close all applications. If some applications are running when you run the **LoadState** command, USMT might not migrate all of the specified data. For example, if Microsoft Office Outlook is open, USMT might not migrate PST files.
 
     **Note**  
     Use **/C** to continue your migration if errors are encountered, and use the **&lt;ErrorControl&gt;** section in the Config.xml file to specify which errors should be ignored, and which errors should cause the migration to fail.
 
-     
-
 4.  Run the **LoadState** command on the destination computer. Specify the same set of .xml files that you specified when you used the **ScanState** command. However, you do not have to specify the Config.xml file, unless you want to exclude some of the files and settings that you migrated to the store. For example, you might want to migrate the My Documents folder to the store, but not to the destination computer. To do this, modify the Config.xml file and specify the updated file by using the **LoadState** command. Then, the **LoadState** command will migrate only the files and settings that you want to migrate. For more information about the how the **LoadState** command processes and migrates data, see [How USMT Works](usmt-how-it-works.md).
 
     For example, the following command migrates the files and settings:
@@ -99,15 +79,4 @@ This topic outlines the general process that you should follow to migrate files
     **Note**  
     Run the **LoadState** command in administrator mode. To do this, right-click **Command Prompt**, and then click **Run As Administrator**.
 
-     
+5.  Log off after you run the **LoadState** command. Some settings (for example, fonts, wallpaper, and screen saver settings) will not take effect until the next time that the user logs on.
-
-5.  Log off after you run the **LoadState** command. Some settings (for example, fonts, wallpaper, and screen saver settings) will not take effect until the next time that the user logs on.
-
- 
-
- 
-
-
-
-
-

windows/deploy/scenario-kms-activation-vamt.md

@@ -9,8 +9,6 @@ author: jdeckerMS
 ---
 
 # Scenario 3: KMS Client Activation
-
-
 In this scenario, you use the Volume Activation Management Tool (VAMT) to activate Key Management Service (KMS) client keys or Generic Volume License Keys (GVLKs). This can be performed on either Core Network or Isolated Lab computers. By default, volume license editions of Windows Vista, Windows® 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, Windows Server® 2012, and Microsoft® Office 2010 use KMS for activation. GVLKs are already installed in volume license editions of these products. You do not have to enter a key to activate a product as a GVLK, unless you are converting a MAK-activated product to a KMS activation. For more information, see [Install a KMS Client Key](install-kms-client-key-vamt.md).
 
 The procedure that is described below assumes the following:
@@ -20,8 +18,6 @@ The procedure that is described below assumes the following:
 -   VAMT has been installed and computers have been added to the VAMT database. See Parts 1 through 4 in either [Scenario 1: Online Activation](scenario-online-activation-vamt.md) or [Scenario 2: Proxy Activation](scenario-proxy-activation-vamt.md) for more information.
 
 ## Activate KMS Clients
-
-
 1.  Open VAMT.
 
 2.  To set the KMS activation options, on the menu bar click **View**. Then click **Preferences** to open the **Volume Activation Management Tool Preferences** dialog box.
@@ -55,9 +51,7 @@ The procedure that is described below assumes the following:
 The same status is shown under the **Status of Last Action** column in the products list view in the center pane.
 
 ## Related topics
-
+- [VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
-
-[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
 
  
 

windows/deploy/scenario-proxy-activation-vamt.md

@@ -9,41 +9,29 @@ author: jdeckerMS
 ---
 
 # Scenario 2: Proxy Activation
-
-
 In this scenario, the Volume Activation Management Tool (VAMT) is used to activate products that are installed on workgroup computers in an isolated lab environment. For workgroups which are isolated from the larger network, you can perform proxy activation of Multiple Activation Keys (MAKs), KMS Host keys (CSVLKs), Generic Volume License Keys (GVLKs) (or KMS client keys), or retail keys. Proxy activation is performed by installing a second instance of VAMT on a computer in the isolated workgroup. You can then use removable media to transfer VAMT Computer Information Lists (CILXs) between the instance of VAMT in the isolated workgroup and another VAMT host that has Internet access. The following diagram shows a Multiple Activation Key (MAK) proxy activation scenario:
 
-![vamt mak proxy activation scenario](images/dep-win8-l-vamt-makproxyactivationscenario.jpg)
+![VAMT MAK proxy activation scenario](images/dep-win8-l-vamt-makproxyactivationscenario.jpg)
-
-## Part 1: Install VAMT on a Workgroup Computer in the Isolated Lab
-
 
+## Step 1: Install VAMT on a Workgroup Computer in the Isolated Lab
 1.  Install VAMT on a host computer in the isolated lab workgroup. This computer can be running Windows 7, Windows 8, Windows 10, Windows Server 2008 R2, or Windows Server® 2012.
 
 2.  Click the VAMT icon in the **Start** menu to open VAMT.
 
-## Part 2: Configure the Windows Management Instrumentation Firewall Exception on Target Computers
+## Step 2: Configure the Windows Management Instrumentation Firewall Exception on Target Computers
-
-
 -   Ensure that the Windows Management Instrumentation (WMI) firewall exception has been enabled for all target computers. For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
-**Note**  
+    **Note**  
-To retrieve the license status on the selected computers, VAMT must have administrative permissions on the remote computers and WMI must be accessible through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
+    To retrieve the license status on the selected computers, VAMT must have administrative permissions on the remote computers and WMI must be accessible through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
-
- 
-
-## Part 3: Connect to a VAMT Database
-
 
+## Step 3: Connect to a VAMT Database
 1.  If the host computer in the isolated lab workgroup is not already connected to the database, the **Database Connection Settings** dialog box appears when you open VAMT. Select the server and database that contains the computers in the workgroup.
 
 2.  Click **Connect**.
 
 3.  If you are already connected to a database, in the center pane VAMT displays an inventory of the products and product keys, and a license overview of the computers in the database. If you need to connect to a different database, click **Successfully connected to the Server** to open the **Database Connection Settings** dialog box. For more information about how to create VAMT databases and adding VAMT data, see [Manage VAMT Data.](manage-vamt-data.md)
 
-## <a href="" id="part-4--discover-products-"></a>Part 4: Discover Products
+## Step 4: Discover Products
-
-
 1.  In the left-side pane, in the **Products** node, click the product that you want to activate.
 
 2.  To open the **Discover Products** dialog box, click **Discover products** in the right-side pane.
@@ -60,13 +48,11 @@ To retrieve the license status on the selected computers, VAMT must have adminis
 
 4.  Click **Search**.
 
-The **Finding Computers** window appears and displays the search progress as the computers are located.
+    The **Finding Computers** window appears and displays the search progress as the computers are located.
 
 When the search is complete, the products that VAMT discovers appear in the list view in the center pane.
 
-## <a href="" id="bkmk-step5"></a>Part 5: Sort and Filter the List of Computers
+## Step 5: Sort and Filter the List of Computers
-
-
 You can sort the list of products so that it is easier to find the computers that require product keys to be activated:
 
 1.  On the menu bar at the top of the center pane, click **Group by**, and then click **Product**, **Product Key Type**, or **License Status**.
@@ -83,29 +69,23 @@ You can sort the list of products so that it is easier to find the computers tha
 
 5.  Click **Filter**. VAMT displays the filtered list in the product list view in the center pane.
 
-## Part 6: Collect Status Information from the Computers in the Isolated Lab
+## Step 6: Collect Status Information from the Computers in the Isolated Lab
-
-
 To collect the status from select computers in the database, you can select computers in the product list view by using one of the following methods:
 
 -   To select a block of consecutively listed computers, click the first computer that you want to select, and then click the last computer while pressing the **Shift** key.
 
 -   To select computers which are not listed consecutively, hold down the **Ctrl** ley and select each computer for which you want to collect the status information.
 
-To collect status information from the selected computers:
+**To collect status information from the selected computers**
 
 1.  In the right-side **Actions** pane, click **Update license status** in the **Selected Items** menu and then click a credential option. Choose **Alternate Credentials** only if you are updating products that require administrator credentials that are different from the ones that you used to log on to the computer. Otherwise, click **Current Credentials** and continue to step 2.If you are supplying alternate credentials, in the **Windows Security** dialog box type the appropriate user name and password and then click **OK**.
 
 2.  VAMT displays the **Collecting product information** dialog box while it collects the license status of all supported products on the selected computers. When the process is finished, the updated license status of each product will appear in the product list view in the center pane.
 
-**Note**  
+    **Note**  
-If a computer has more than one supported product installed, VAMT adds an entry for each product. The entry appears under the appropriate product heading.
+    If a computer has more than one supported product installed, VAMT adds an entry for each product. The entry appears under the appropriate product heading.
-
- 
-
-## Part 7: Add Product Keys
-
 
+## Step 7: Add Product Keys
 1.  Click the **Product Keys** node in the left-side pane, and then click **Add Product Keys** in the right-side pane to open the **Add Product Keys** dialog box.
 
 2.  In the **Add Product Keys** dialog box, you can select from one of the following methods to add product keys:
@@ -116,12 +96,10 @@ If a computer has more than one supported product installed, VAMT adds an entry
 
     The keys that you have added appear in the **Product Keys** list view in the center pane.
 
-## Part 8: Install the Product Keys on the Isolated Lab Computers
+## Step 8: Install the Product Keys on the Isolated Lab Computers
-
-
 1.  In the left-side pane, in the **Products** node click the product that you want to install keys onto.
 
-2.  If necessary, sort and filter the list of products so that it is easier to find the computers that must have a product key installed. See [Step 5: Sort the list of computers](#bkmk-step5).
+2.  If necessary, sort and filter the list of products so that it is easier to find the computers that must have a product key installed. See [Step 5: Sort and Filter the List of Computers](#step-5-sort-and-filter-the-list-of-computers).
 
 3.  In the **Products** list view pane, select the individual products which must have keys installed. You can use the **CTRL** key or the **SHIFT** key to select more than one product.
 
@@ -133,22 +111,16 @@ If a computer has more than one supported product installed, VAMT adds an entry
 
     The same status appears under the **Status of Last Action** column in the product list view in the center pane.
 
-**Note**  
+    **Note**  
-Product key installation will fail if VAMT finds mismatched key types or editions. VAMT displays the failure status and continues the installation for the next product in the list. For more information on choosing the correct product key, see [How to Choose the Right Volume License Key for Windows.](http://go.microsoft.com/fwlink/p/?linkid=238382)
+    Product key installation will fail if VAMT finds mismatched key types or editions. VAMT displays the failure status and continues the installation for the next product in the list. For more information on choosing the correct product key, see [How to Choose the Right Volume License Key for Windows.](http://go.microsoft.com/fwlink/p/?linkid=238382)
-
- 
-
-**Note**  
-Installing a MAK and overwriting the GVLK on client products must be done with care. If the RTM version of Windows Vista has been installed on the computer for more than 30 days, then its initial grace period has expired. As a result, it will enter Reduced Functionality Mode (RFM) if online activation is not completed successfully before the next logon attempt. However, you can use online activation to recover properly configured computers from RFM, as long as the computers are available on the network. RFM only applies to the RTM version of Windows Vista or the retail editions of Microsoft Office 2010. Windows Vista with SP1 or later, Windows 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, and Windows Server 2012, and volume editions of Office 2010 will not enter RFM.
-
- 
-
-## Part 9: Export VAMT Data to a .cilx File
 
+    **Note**  
+    Installing a MAK and overwriting the GVLK on client products must be done with care. If the RTM version of Windows Vista has been installed on the computer for more than 30 days, then its initial grace period has expired. As a result, it will enter Reduced Functionality Mode (RFM) if online activation is not completed successfully before the next logon attempt. However, you can use online activation to recover properly configured computers from RFM, as long as the computers are available on the network. RFM only applies to the RTM version of Windows Vista or the retail editions of Microsoft Office 2010. Windows Vista with SP1 or later, Windows 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, and Windows Server 2012, and volume editions of Office 2010 will not enter RFM.
 
+## Step 9: Export VAMT Data to a .cilx File
 In this step, you export VAMT from the workgroup’s host computer and save it in a .cilx file. Then you copy the .cilx file to removable media so that you can take it to a VAMT host computer that is connected to the Internet. In MAK proxy activation, it is critical to retain this file, because VAMT uses it to apply the Confirmation IDs (CIDs) to the proper products.
 
-1.  Select the individual products that successfully received a product key in Part 8. If needed, sort and filter the list to find the products.
+1.  Select the individual products that successfully received a product key in Step 8. If needed, sort and filter the list to find the products.
 
 2.  In the right-side **Actions** pane, click **Export list** to open the **Export List** dialog box.
 
@@ -168,14 +140,10 @@ In this step, you export VAMT from the workgroup’s host computer and save it i
 
 7.  If you exported the list to a file on the host computer’s hard drive, copy the file to removable media, such as a disk drive, CD/DVD, or USB storage device.
 
-**Important**  
+    **Important**  
-Choosing the **Export proxy activation data only** option excludes Personally Identifiable Information (PII) from being saved in the .cilx file. Therefore, the .cilx file must be re-imported into the SQL Server database on the isolated lab workgroup’s VAMT host computer, so that the CIDs that are requested from Microsoft (discussed in Part 10) can be correctly assigned to the computers in the isolated lab group.
+    Choosing the **Export proxy activation data only** option excludes Personally Identifiable Information (PII) from being saved in the .cilx file. Therefore, the .cilx file must be re-imported into the SQL Server database on the isolated lab workgroup’s VAMT host computer, so that the CIDs that are requested from Microsoft (discussed in Step 10) can be correctly assigned to the computers in the isolated lab group.
-
- 
-
-## Part 10: Acquire Confirmation IDs from Microsoft on the Internet-Connected Host Computer
-
 
+## Step 10: Acquire Confirmation IDs from Microsoft on the Internet-Connected Host Computer
 1.  Insert the removable media into the VAMT host that has Internet access.
 
 2.  Open VAMT. Make sure you are on the root node, and that the **Volume Activation Management Tool** view is displayed in the center pane.
@@ -186,9 +154,7 @@ Choosing the **Export proxy activation data only** option excludes Personally Id
 
 5.  When the CID collection process is complete, VAMT displays a **Volume Activation Management Tool** message that shows the number of confirmation IDs that were successfully acquired, and the name of the file where the IDs were saved. Click **OK** to close the message.
 
-## Part 11: Import the .cilx File onto the VAMT Host within the Isolated Lab Workgroup
+## Step 11: Import the .cilx File onto the VAMT Host within the Isolated Lab Workgroup
-
-
 1.  Remove the storage device that contains the .cilx file from the Internet-connected VAMT host computer and insert it into the VAMT host computer in the isolated lab.
 
 2.  Open VAMT and verify that you are connected to the database that contains the computer with the product keys that you are activating.
@@ -201,20 +167,16 @@ Choosing the **Export proxy activation data only** option excludes Personally Id
 
 6.  VAMT displays a progress message while the data is being imported. Click **OK** when a message appears and confirms that the data has been successfully imported.
 
-## Part 12: Apply the CIDs and Activate the Isolated Lab Computers
+## Step 12: Apply the CIDs and Activate the Isolated Lab Computers
-
-
 1.  Select the products to which you want to apply CIDs. If needed, sort and filter the list to find the products.
 
 2.  In the right-side **Selected Items** menu, click **Activate**, click **Apply Confirmation ID**, and then select the appropriate credential option. If you click the **Alternate Credentials** option, you will be prompted to enter an alternate user name and password.
 
-VAMT displays the **Applying Confirmation Id** dialog box while it installs the CIDs on the selected products. When VAMT finishes installing the CIDs, the status appears in the **Action Sataus** column of the dialog box. Click **Close** to close the dialog box. You can also click the **Automatically close when done** check box when the dialog box appears.
+    VAMT displays the **Applying Confirmation Id** dialog box while it installs the CIDs on the selected products. When VAMT finishes installing the CIDs, the status appears in the **Action Sataus** column of the dialog box. Click **Close** to close the dialog box. You can also click the **Automatically close when done** check box when the dialog box appears.
-
-The same status appears under the **Status of Last Action** column in the product list view in the center pane.
-
-## <a href="" id="part-13---optional--reactivating-reimaged-computers-in-the-isolated-lab-"></a>Part 13: (Optional) Reactivating Reimaged Computers in the Isolated Lab
 
+    The same status appears under the **Status of Last Action** column in the product list view in the center pane.
 
+## Step 13: (Optional) Reactivating Reimaged Computers in the Isolated Lab
 If you have captured new images of the computers in the isolated lab, but the underlying hardware of those computers has not changed, VAMT can reactivate those computers using the CIDs that are stored in the database.
 
 1.  Redeploy products to each computer, using the same computer names as before.
@@ -223,24 +185,20 @@ If you have captured new images of the computers in the isolated lab, but the un
 
 3.  In the right-side **Selected Items** menu, click **Activate**, click **Apply Confirmation ID**, and then select the appropriate credential option. If you click the **Alternate Credentials** option, you will be prompted to enter an alternate user name and password.
 
-VAMT displays the **Applying Confirmation Id** dialog box while it installs the CIDs on the selected products. When VAMT finishes installing the CIDs, the status appears in the **Action Status** column of the dialog box. Click **Close** to close the dialog box. You can also click the **Automatically close when done** check box when the dialog box appears.
+    VAMT displays the **Applying Confirmation Id** dialog box while it installs the CIDs on the selected products. When VAMT finishes installing the CIDs, the status appears in the **Action Status** column of the dialog box. Click **Close** to close the dialog box. You can also click the **Automatically close when done** check box when the dialog box appears.
 
-The same status appears under the **Status of Last Action** column in the product list view in the center pane.
+    The same status appears under the **Status of Last Action** column in the product list view in the center pane.
 
-**Note**  
+    **Note**  
-Installing a MAK and overwriting the GVLK on the client products must be done with care. If the Windows activation initial grace period has expired, Windows will enter Reduced Functionality Mode (RFM) if online activation is not completed successfully before the next logon attempt. However, you can use online activation to recover properly configured computers from RFM, as long as the computers are accessible on the network. RFM only applies to the RTM version of Windows Vista or the retail editions of Microsoft Office 2010. Windows Vista with SP1 or later, Windows 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, and Windows Server 2012, and volume editions of Office 2010 will not enter RFM.
+    Installing a MAK and overwriting the GVLK on the client products must be done with care. If the Windows activation initial grace period has expired, Windows will enter Reduced Functionality Mode (RFM) if online activation is not completed successfully before the next logon attempt. However, you can use online activation to recover properly configured computers from RFM, as long as the computers are accessible on the network. 
+    
+    RFM only applies to the RTM version of Windows Vista or the retail editions of Microsoft Office 2010. Windows Vista with SP1 or later, Windows 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, and Windows Server 2012, and volume editions of Office 2010 will not enter RFM.
 
- 
+    **Note**  
-
+    Reapplying the same CID conserves the remaining activations on the MAK.
-**Note**  
-Reapplying the same CID conserves the remaining activations on the MAK.
-
- 
 
 ## Related topics
-
+- [VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
-
-[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
 
  
 

windows/deploy/usmt-how-to.md

@@ -9,70 +9,22 @@ author: CFaw
 ---
 
 # User State Migration Tool (USMT) How-to topics
-
-
 The following table lists topics that describe how to use User State Migration Tool (USMT) 10.0 to perform specific tasks.
 
 ## In This Section
 
-
+|Topic |Description|
-<table>
+|------|-----------|
-<colgroup>
+|[Exclude Files and Settings](usmt-exclude-files-and-settings.md)|Create a custom .xml file to exclude files, file types, folders, or registry settings from your migration.|
-<col width="50%" />
+|[Extract Files from a Compressed USMT Migration Store](usmt-extract-files-from-a-compressed-migration-store.md)|Recover files from a compressed migration store after installing the operating system.|
-<col width="50%" />
+|[Include Files and Settings](usmt-include-files-and-settings.md)|Create a custom .xml file to include files, file types, folders, or registry settings in your migration.|
-</colgroup>
+|[Migrate Application Settings](migrate-application-settings.md)|Migrate the settings of an application that the MigApp.xml file does not include by default.|
-<tbody>
+|[Migrate EFS Files and Certificates](usmt-migrate-efs-files-and-certificates.md)|Migrate Encrypting File System (EFS) certificates by using USMT.|
-<tr class="odd">
+|[Migrate User Accounts](usmt-migrate-user-accounts.md)|Specify the users to include and exclude in your migration.|
-<td align="left"><p>[Exclude Files and Settings](usmt-exclude-files-and-settings.md)</p></td>
+|[Reroute Files and Settings](usmt-reroute-files-and-settings.md)|Create a custom .xml file to reroute files and settings during a migration.|
-<td align="left"><p>Create a custom .xml file to exclude files, file types, folders, or registry settings from your migration.</p></td>
+|[Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md)|Determine whether a compressed migration store is intact, or whether it contains corrupt files or a corrupt catalog.|
-</tr>
-<tr class="even">
-<td align="left"><p>[Extract Files from a Compressed USMT Migration Store](usmt-extract-files-from-a-compressed-migration-store.md)</p></td>
-<td align="left"><p>Recover files from a compressed migration store after installing the operating system.</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>[Include Files and Settings](usmt-include-files-and-settings.md)</p></td>
-<td align="left"><p>Create a custom .xml file to include files, file types, folders, or registry settings in your migration.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[Migrate Application Settings](migrate-application-settings.md)</p></td>
-<td align="left"><p>Migrate the settings of an application that the MigApp.xml file does not include by default.</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>[Migrate EFS Files and Certificates](usmt-migrate-efs-files-and-certificates.md)</p></td>
-<td align="left"><p>Migrate Encrypting File System (EFS) certificates by using USMT.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[Migrate User Accounts](usmt-migrate-user-accounts.md)</p></td>
-<td align="left"><p>Specify the users to include and exclude in your migration.</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>[Reroute Files and Settings](usmt-reroute-files-and-settings.md)</p></td>
-<td align="left"><p>Create a custom .xml file to reroute files and settings during a migration.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md)</p></td>
-<td align="left"><p>Determine whether a compressed migration store is intact, or whether it contains corrupt files or a corrupt catalog.</p></td>
-</tr>
-</tbody>
-</table>
-
- 
 
 ## Related topics
-
+- [User State Migration Tool (USMT) Overview Topics](usmt-topics.md)
-
+- [User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-[User State Migration Tool (USMT) Overview Topics](usmt-topics.md)
+- [User State Migration Toolkit (USMT) Reference](usmt-reference.md)
-
-[User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-
-[User State Migration Toolkit (USMT) Reference](usmt-reference.md)
-
- 
-
- 
-
-
-
-
-

windows/deploy/usmt-overview.md

@@ -9,8 +9,6 @@ author: CFaw
 ---
 
 # User State Migration Tool (USMT) Overview
-
-
 You can use User State Migration Tool (USMT) 10.0 to streamline and simplify user state migration during large deployments of Windows operating systems. USMT captures user accounts, user files, operating system settings, and application settings, and then migrates them to a new Windows installation. You can use USMT for both PC replacement and PC refresh migrations. For more information, see [Common Migration Scenarios](usmt-common-migration-scenarios.md).
 
 USMT enables you to do the following:
@@ -22,8 +20,6 @@ USMT enables you to do the following:
 -   Perform offline migrations. You can run migrations offline by using the ScanState command in Windows Preinstallation Environment (WinPE) or you can perform migrations from previous installations of Windows contained in Windows.old directories. For more information about migration types, see [Choose a Migration Store Type](usmt-choose-migration-store-type.md) and [Offline Migration Reference](offline-migration-reference.md).
 
 ## Benefits
-
-
 USMT provides the following benefits to businesses that are deploying Windows operating systems:
 
 -   Safely migrates user accounts, operating system and application settings.
@@ -39,8 +35,6 @@ USMT provides the following benefits to businesses that are deploying Windows op
 -   Increases employee satisfaction with the migration experience.
 
 ## Limitations
-
-
 USMT is intended for administrators who are performing large-scale automated deployments. If you are only migrating the user states of a few computers, you can use [Windows Easy Transfer](http://go.microsoft.com/fwlink/p/?LinkId=140248).
 
 There are some scenarios in which the use of USMT is not recommended. These include:
@@ -50,9 +44,7 @@ There are some scenarios in which the use of USMT is not recommended. These incl
 -   Migrations that require customization on a machine-by-machine basis.
 
 ## Related topics
-
+- [User State Migration Tool (USMT) Technical Reference](usmt-technical-reference.md)
-
-[User State Migration Tool (USMT) Technical Reference](usmt-technical-reference.md)
 
  
 

windows/deploy/usmt-technical-reference.md

@@ -9,8 +9,6 @@ author: CFaw
 ---
 
 # User State Migration Tool (USMT) Technical Reference
-
-
 The User State Migration Tool (USMT) 10.0 is included with the Windows Assessment and Deployment Kit (Windows ADK) for Windows 10. USMT provides a highly customizable user-profile migration experience for IT professionals.
 
 Download the Windows ADK [from this website](http://go.microsoft.com/fwlink/p/?LinkID=526803).
@@ -36,39 +34,15 @@ Additionally, you can create custom .xml files to support your migration needs.
 USMT 10.0 tools can be used on several versions of Windows operating systems, for more information, see [USMT Requirements](usmt-requirements.md). For more information about previous releases of the USMT tools, see [User State Migration Tool (USMT) 4.0 User’s Guide](http://go.microsoft.com/fwlink/p/?LinkId=246564).
 
 ## In This Section
-
+|Topic |Description|
-
+|------|-----------|
-<table>
+|[User State Migration Tool (USMT) Overview Topics](usmt-topics.md)|Describes what’s new in USMT, how to get started with USMT, and the benefits and limitations of using USMT.|
-<colgroup>
+|[User State Migration Tool (USMT) How-to topics](usmt-how-to.md)|Includes step-by-step instructions for using USMT, as well as how-to topics for conducting tasks in USMT.|
-<col width="50%" />
+|[User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)|Provides answers to frequently asked questions and common issues in USMT, as well as a reference for return codes used in USMT.|
-<col width="50%" />
+|[User State Migration Toolkit (USMT) Reference](usmt-reference.md)|Includes reference information for migration planning, migration best practices, command-line syntax, using XML, and requirements for using USMT.|
-</colgroup>
-<tbody>
-<tr class="odd">
-<td align="left"><p>[User State Migration Tool (USMT) Overview Topics](usmt-topics.md)</p></td>
-<td align="left"><p>Describes what’s new in USMT, how to get started with USMT, and the benefits and limitations of using USMT.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[User State Migration Tool (USMT) How-to topics](usmt-how-to.md)</p></td>
-<td align="left"><p>Includes step-by-step instructions for using USMT, as well as how-to topics for conducting tasks in USMT.</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>[User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)</p></td>
-<td align="left"><p>Provides answers to frequently asked questions and common issues in USMT, as well as a reference for return codes used in USMT.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[User State Migration Toolkit (USMT) Reference](usmt-reference.md)</p></td>
-<td align="left"><p>Includes reference information for migration planning, migration best practices, command-line syntax, using XML, and requirements for using USMT.</p></td>
-</tr>
-</tbody>
-</table>
-
- 
 
 ## Related topics
-
+- [Windows Assessment and Deployment Kit](https://msdn.microsoft.com/library/windows/hardware/dn247001.aspx)
-
-[Windows Assessment and Deployment Kit](https://msdn.microsoft.com/library/windows/hardware/dn247001.aspx)
 
  
 

windows/deploy/usmt-topics.md

@@ -9,50 +9,17 @@ author: CFaw
 ---
 
 # User State Migration Tool (USMT) Overview Topics
-
-
 The User State Migration Tool (USMT) 10.0 provides a highly customizable user-profile migration experience for IT professionals. USMT includes three command-line tools: ScanState.exe, LoadState.exe, and UsmtUtils.exe. USMT also includes a set of three modifiable .xml files: MigApp.xml, MigDocs.xml, and MigUser.xml. Additionally, you can create custom .xml files to support your migration needs. You can also create a Config.xml file to specify files or settings to exclude from the migration.
 
 ## In This Section
 
-
+|Topic |Description|
-<table>
+|------|-----------|
-<colgroup>
+|[User State Migration Tool (USMT) Overview](usmt-overview.md)|Describes the benefits and limitations of using USMT.|
-<col width="50%" />
+|[Getting Started with the User State Migration Tool (USMT)](getting-started-with-the-user-state-migration-tool.md)|Describes the general process to follow to migrate files and settings, and provides links to more information.|
-<col width="50%" />
+|[Windows Upgrade and Migration Considerations](windows-upgrade-and-migration-considerations.md)|Discusses the Microsoft® tools you can use to move files and settings between installations, as well as special considerations for performing an upgrade or migration.|
-</colgroup>
-<tbody>
-<tr class="odd">
-<td align="left"><p>[User State Migration Tool (USMT) Overview](usmt-overview.md)</p></td>
-<td align="left"><p>Describes the benefits and limitations of using USMT.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[Getting Started with the User State Migration Tool (USMT)](getting-started-with-the-user-state-migration-tool.md)</p></td>
-<td align="left"><p>Describes the general process to follow to migrate files and settings, and provides links to more information.</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>[Windows Upgrade and Migration Considerations](windows-upgrade-and-migration-considerations.md)</p></td>
-<td align="left"><p>Discusses the Microsoft® tools you can use to move files and settings between installations, as well as special considerations for performing an upgrade or migration.</p></td>
-</tr>
-</tbody>
-</table>
-
- 
 
 ## Related topics
-
+- [User State Migration Tool (USMT) How-to topics](usmt-how-to.md)
-
+- [User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-[User State Migration Tool (USMT) How-to topics](usmt-how-to.md)
+- [User State Migration Toolkit (USMT) Reference](usmt-reference.md)
-
-[User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-
-[User State Migration Toolkit (USMT) Reference](usmt-reference.md)
-
- 
-
- 
-
-
-
-
-

windows/deploy/vamt-known-issues.md

@@ -9,8 +9,6 @@ author: jdeckerMS
 ---
 
 # VAMT Known Issues
-
-
 The following list contains the current known issues with the Volume Activation Management Tool (VAMT) 3.0.
 
 -   The VAMT Windows Management Infrastructure (WMI) remote operations may take longer to execute if the target computer is in a sleep or standby state.

windows/deploy/windows-upgrade-and-migration-considerations.md

@@ -9,18 +9,12 @@ author: CFaw
 ---
 
 # Windows Upgrade and Migration Considerations
-
-
 Files and application settings can be migrated to new hardware running the Windows® operating system, or they can be maintained during an operating system upgrade on the same computer. This topic summarizes the Microsoft® tools you can use to move files and settings between installations in addition to special considerations for performing an upgrade or migration.
 
 ## Upgrade from a Previous Version of Windows
-
-
 You can upgrade from an earlier version of Windows, which means you can install the new version of Windows and retain your applications, files, and settings as they were in your previous version of Windows. If you decide to perform a custom installation of Windows instead of an upgrade, your applications and settings will not be maintained. Your personal files, and all Windows files and directories, will be moved to a Windows.old folder. You can access your data in the Windows.old folder after Windows Setup is complete.
 
 ## Migrate Files and Settings
-
-
 Migration tools are available to transfer settings from one computer that is running Windows to another. These tools transfer only the program settings, not the programs themselves.
 
 For more information about application compatibility, see the [Application Compatibility Toolkit (ACT)](http://go.microsoft.com/fwlink/p/?LinkId=131349).
@@ -28,36 +22,28 @@ For more information about application compatibility, see the [Application Compa
 The User State Migration Tool (USMT) 10.0 is an application intended for administrators who are performing large-scale automated deployments. For deployment to a small number of computers or for individually customized deployments, you can use Windows Easy Transfer.
 
 ### Migrate with Windows Easy Transfer
-
 Windows Easy Transfer is a software wizard for transferring files and settings from one computer that is running Windows to another. It helps you select what to move to your new computer, enables you to set which migration method to use, and then performs the transfer. When the transfer has completed, Windows Easy Transfer Reports shows you what was transferred and provides a list of programs you might want to install on your new computer, in addition to links to other programs you might want to download.
 
 With Windows Easy Transfer, files and settings can be transferred using a network share, a USB flash drive (UFD), or the Easy Transfer cable. However, you cannot use a regular universal serial bus (USB) cable to transfer files and settings with Windows Easy Transfer. An Easy Transfer cable can be purchased on the Web, from your computer manufacturer, or at an electronics store.
 
 ### Migrate with the User State Migration Tool
-
 You can use USMT to automate migration during large deployments of the Windows operating system. USMT uses configurable migration rule (.xml) files to control exactly which user accounts, user files, operating system settings, and application settings are migrated and how they are migrated. You can use USMT for both *side-by-side* migrations, where one piece of hardware is being replaced, or *wipe-and-load* (or *refresh*) migrations, when only the operating system is being upgraded.
 
 ## Upgrade and Migration Considerations
-
-
 Whether you are upgrading or migrating to a new version of Windows, you must be aware of the following issues and considerations:
 
 ### Application Compatibility
-
 For more information about application compatibility in Windows, see the [Application Compatibility Toolkit (ACT)](http://go.microsoft.com/fwlink/p/?LinkId=131349).
 
 ### Multilingual Windows Image Upgrades
-
 When performing multilingual Windows upgrades, cross-language upgrades are not supported by USMT. If you are upgrading or migrating an operating system with multiple language packs installed, you can upgrade or migrate only to the system default user interface (UI) language. For example, if English is the default but you have a Spanish language pack installed, you can upgrade or migrate only to English.
 
 If you are using a single-language Windows image that matches the system default UI language of your multilingual operating system, the migration will work. However, all of the language packs will be removed, and you will have to reinstall them after the upgrade is completed.
 
 ### Errorhandler.cmd
-
 When upgrading from an earlier version of Windows, if you intend to use Errorhandler.cmd, you must copy this file into the %WINDIR%\\Setup\\Scripts directory on the old installation. This makes sure that if there are errors during the down-level phase of Windows Setup, the commands in Errorhandler.cmd will run.
 
 ### Data Drive ACL Migration
-
 During the configuration pass of Windows Setup, the root access control list (ACL) on drives formatted for NTFS that do not appear to have an operating system will be changed to the default Windows XP ACL format. The ACLs on these drives are changed to enable authenticated users to modify access on folders and files.
 
 Changing the ACLs may affect the performance of Windows Setup if the default Windows XP ACLs are applied to a partition with a large amount of data. Because of these performance concerns, you can change the following registry value to disable this feature:
@@ -68,12 +54,10 @@ Type: REG_DWORD
 Value: "DDACLSys_Disabled" = 1
 ```
 
-This feature is disabled if this registry key value exists and is configured to 1.
+This feature is disabled if this registry key value exists and is configured to `1`.
 
 ## Related topics
-
+- [User State Migration Tool (USMT) Overview Topics](usmt-topics.md)
-
-[User State Migration Tool (USMT) Overview Topics](usmt-topics.md)
 
  
 

windows/keep-secure/configure-windows-defender-in-windows-10.md

@@ -5,7 +5,7 @@ ms.assetid: 22649663-AC7A-40D8-B1F7-5CAD9E49653D
 ms.prod: W10
 ms.mktglfcycl: manage
 ms.sitesec: library
-author: brianlic-msft
+author: jasesso
 ---
 
 # Configure Windows Defender in Windows 10
@@ -153,7 +153,9 @@ The Microsoft Active Protection Service can be configured with the following *Gr
 Use the Windowsdefender.adm *Group Policy* template file to control the policy settings for Windows Defender in Windows 10:
 
 Policy setting: **Configure Microsoft SpyNet Reporting**
+
 Registry key name: **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows Defender\\SpyNet\\SpyNetReporting**
+
 Policy description: **Adjusts membership in Microsoft Active Protection Service**
 
 You can also configure preferences using the following PowerShell parameters:

windows/manage/administrative-tools-in-windows-10.md

@@ -15,7 +15,13 @@ author: jdeckerMS
 
 -   Windows 10
 
-Administrative Tools is a folder in Control Panel that contains tools for system administrators and advanced users. The tools in the folder might vary depending on which edition of Windows you are using.
+Administrative Tools is a folder in Control Panel that contains tools for system administrators and advanced users. 
+
+![Screenshot of Control Panel](images/admin-tools.png)
+
+The tools in the folder might vary depending on which edition of Windows you are using. 
+
+![Screenshot of folder of admin tools](images/admin-tools-folder.png)
 
 These tools were included in previous versions of Windows and the associated documentation for each tool should help you use these tools in Windows 10. The following list links to documentation for each tool.
 

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

@@ -24,7 +24,10 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 <th align="left">Description</th>
 </tr>
 </thead>
-<tbody>
+<tbody><tr class="odd">
+<td align="left">[Administrative tools in Windows 10](administrative-tools-in-windows-10.md)</td>
+<td align="left"><p>Added screenshots of Control Panel and the administrative tools folder.</p></td>
+</tr>
 <tr class="odd">
 <td align="left">[Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md)</td>
 <td align="left"><p>Added the font streaming section.</p></td>