finished wu settings version and toc changes

windows/deployment/TOC.md

@@ -1,63 +1,150 @@
-# [Deploy Windows 10](index.md)
+# [Deploy, Upgrade and Update Windows 10](index.md)
-## [What's new in Windows 10 deployment](deploy-whats-new.md)
+
-## [Plan for Windows 10 deployment](planning/index.md)
+## Deploy Windows 10
-### [Windows 10 Enterprise FAQ for IT Pros](planning/windows-10-enterprise-faq-itpro.md)
+### [What's new in Windows 10 deployment](deploy-whats-new.md)
-### [Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
+
-### [Windows 10 compatibility](planning/windows-10-compatibility.md)
+### [Plan for Windows 10 deployment](planning/index.md)
-### [Windows 10 infrastructure requirements](planning/windows-10-infrastructure-requirements.md)
+#### [Windows 10 Enterprise FAQ for IT Pros](planning/windows-10-enterprise-faq-itpro.md)
-### [Windows To Go: feature overview](planning/windows-to-go-overview.md)
+#### [Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
-#### [Best practice recommendations for Windows To Go](planning/best-practice-recommendations-for-windows-to-go.md)
+#### [Windows 10 compatibility](planning/windows-10-compatibility.md)
-#### [Deployment considerations for Windows To Go](planning/deployment-considerations-for-windows-to-go.md)
+#### [Windows 10 infrastructure requirements](planning/windows-10-infrastructure-requirements.md)
-#### [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md)
+#### [Windows To Go: feature overview](planning/windows-to-go-overview.md)
-#### [Security and data protection considerations for Windows To Go](planning/security-and-data-protection-considerations-for-windows-to-go.md)
+##### [Best practice recommendations for Windows To Go](planning/best-practice-recommendations-for-windows-to-go.md)
-#### [Windows To Go: frequently asked questions](planning/windows-to-go-frequently-asked-questions.md)
+##### [Deployment considerations for Windows To Go](planning/deployment-considerations-for-windows-to-go.md)
-### [Application Compatibility Toolkit (ACT) Technical Reference](planning/act-technical-reference.md)
+##### [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md)
-#### [SUA User's Guide](planning/sua-users-guide.md)
+##### [Security and data protection considerations for Windows To Go](planning/security-and-data-protection-considerations-for-windows-to-go.md)
-##### [Using the SUA Wizard](planning/using-the-sua-wizard.md)
+##### [Windows To Go: frequently asked questions](planning/windows-to-go-frequently-asked-questions.md)
-##### [Using the SUA Tool](planning/using-the-sua-tool.md)
+#### [Application Compatibility Toolkit (ACT) Technical Reference](planning/act-technical-reference.md)
-###### [Tabs on the SUA Tool Interface](planning/tabs-on-the-sua-tool-interface.md)
+##### [SUA User's Guide](planning/sua-users-guide.md)
-###### [Showing Messages Generated by the SUA Tool](planning/showing-messages-generated-by-the-sua-tool.md)
+###### [Using the SUA Wizard](planning/using-the-sua-wizard.md)
-###### [Applying Filters to Data in the SUA Tool](planning/applying-filters-to-data-in-the-sua-tool.md)
+###### [Using the SUA Tool](planning/using-the-sua-tool.md)
-###### [Fixing Applications by Using the SUA Tool](planning/fixing-applications-by-using-the-sua-tool.md)
+####### [Tabs on the SUA Tool Interface](planning/tabs-on-the-sua-tool-interface.md)
-#### [Compatibility Administrator User's Guide](planning/compatibility-administrator-users-guide.md)
+####### [Showing Messages Generated by the SUA Tool](planning/showing-messages-generated-by-the-sua-tool.md)
-##### [Using the Compatibility Administrator Tool](planning/using-the-compatibility-administrator-tool.md)
+####### [Applying Filters to Data in the SUA Tool](planning/applying-filters-to-data-in-the-sua-tool.md)
-###### [Available Data Types and Operators in Compatibility Administrator](planning/available-data-types-and-operators-in-compatibility-administrator.md)
+####### [Fixing Applications by Using the SUA Tool](planning/fixing-applications-by-using-the-sua-tool.md)
-###### [Searching for Fixed Applications in Compatibility Administrator](planning/searching-for-fixed-applications-in-compatibility-administrator.md)
+##### [Compatibility Administrator User's Guide](planning/compatibility-administrator-users-guide.md)
-###### [Searching for Installed Compatibility Fixes with the Query Tool in Compatibility Administrator](planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md)
+###### [Using the Compatibility Administrator Tool](planning/using-the-compatibility-administrator-tool.md)
-###### [Creating a Custom Compatibility Fix in Compatibility Administrator](planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md)
+####### [Available Data Types and Operators in Compatibility Administrator](planning/available-data-types-and-operators-in-compatibility-administrator.md)
-###### [Creating a Custom Compatibility Mode in Compatibility Administrator](planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md)
+####### [Searching for Fixed Applications in Compatibility Administrator](planning/searching-for-fixed-applications-in-compatibility-administrator.md)
-###### [Creating an AppHelp Message in Compatibility Administrator](planning/creating-an-apphelp-message-in-compatibility-administrator.md)
+####### [Searching for Installed Compatibility Fixes with the Query Tool in Compatibility Administrator](planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md)
-###### [Viewing the Events Screen in Compatibility Administrator](planning/viewing-the-events-screen-in-compatibility-administrator.md)
+####### [Creating a Custom Compatibility Fix in Compatibility Administrator](planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md)
-###### [Enabling and Disabling Compatibility Fixes in Compatibility Administrator](planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md)
+####### [Creating a Custom Compatibility Mode in Compatibility Administrator](planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md)
-###### [Installing and Uninstalling Custom Compatibility Databases in Compatibility Administrator](planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md)
+####### [Creating an AppHelp Message in Compatibility Administrator](planning/creating-an-apphelp-message-in-compatibility-administrator.md)
-##### [Managing Application-Compatibility Fixes and Custom Fix Databases](planning/managing-application-compatibility-fixes-and-custom-fix-databases.md)
+####### [Viewing the Events Screen in Compatibility Administrator](planning/viewing-the-events-screen-in-compatibility-administrator.md)
-###### [Understanding and Using Compatibility Fixes](planning/understanding-and-using-compatibility-fixes.md)
+####### [Enabling and Disabling Compatibility Fixes in Compatibility Administrator](planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md)
-###### [Compatibility Fix Database Management Strategies and Deployment](planning/compatibility-fix-database-management-strategies-and-deployment.md)
+####### [Installing and Uninstalling Custom Compatibility Databases in Compatibility Administrator](planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md)
-###### [Testing Your Application Mitigation Packages](planning/testing-your-application-mitigation-packages.md)
+###### [Managing Application-Compatibility Fixes and Custom Fix Databases](planning/managing-application-compatibility-fixes-and-custom-fix-databases.md)
-##### [Using the Sdbinst.exe Command-Line Tool](planning/using-the-sdbinstexe-command-line-tool.md)
+####### [Understanding and Using Compatibility Fixes](planning/understanding-and-using-compatibility-fixes.md)
-#### [Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista](planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md)
+####### [Compatibility Fix Database Management Strategies and Deployment](planning/compatibility-fix-database-management-strategies-and-deployment.md)
-### [Change history for Plan for Windows 10 deployment](planning/change-history-for-plan-for-windows-10-deployment.md)
+####### [Testing Your Application Mitigation Packages](planning/testing-your-application-mitigation-packages.md)
-## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
+###### [Using the Sdbinst.exe Command-Line Tool](planning/using-the-sdbinstexe-command-line-tool.md)
-## Upgrade Windows
+##### [Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista](planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md)
-### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
+#### [Change history for Plan for Windows 10 deployment](planning/change-history-for-plan-for-windows-10-deployment.md)
-### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md)
+
-### [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
+### [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
-### [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md)
+
-### [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md)
+### [Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md)
-#### [Upgrade Readiness architecture](upgrade/upgrade-readiness-architecture.md)
+#### [Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
-#### [Upgrade Readiness requirements](upgrade/upgrade-readiness-requirements.md)
+#### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
-#### [Get started with Upgrade Readiness](upgrade/upgrade-readiness-get-started.md)
+#### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md)
-##### [Upgrade Readiness deployment script](upgrade/upgrade-readiness-deployment-script.md)
+##### [Introduction to VAMT](volume-activation/introduction-vamt.md)
-#### [Use Upgrade Readiness to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades.md)
+##### [Active Directory-Based Activation Overview](volume-activation/active-directory-based-activation-overview.md)
-##### [Upgrade overview](upgrade/upgrade-readiness-upgrade-overview.md)
+##### [Install and Configure VAMT](volume-activation/install-configure-vamt.md)
-##### [Step 1: Identify apps](upgrade/upgrade-readiness-identify-apps.md)
+###### [VAMT Requirements](volume-activation/vamt-requirements.md)
-##### [Step 2: Resolve issues](upgrade/upgrade-readiness-resolve-issues.md)
+###### [Install VAMT](volume-activation/install-vamt.md)
-##### [Step 3: Deploy Windows](upgrade/upgrade-readiness-deploy-windows.md)
+###### [Configure Client Computers](volume-activation/configure-client-computers-vamt.md)
-##### [Additional insights](upgrade/upgrade-readiness-additional-insights.md)
+##### [Add and Manage Products](volume-activation/add-manage-products-vamt.md)
-#### [Troubleshoot Upgrade Readiness](upgrade/troubleshoot-upgrade-readiness.md)
+###### [Add and Remove Computers](volume-activation/add-remove-computers-vamt.md)
-## [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)
+###### [Update Product Status](volume-activation/update-product-status-vamt.md)
-### [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
+###### [Remove Products](volume-activation/remove-products-vamt.md)
-### [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md)
+##### [Manage Product Keys](volume-activation/manage-product-keys-vamt.md)
+###### [Add and Remove a Product Key](volume-activation/add-remove-product-key-vamt.md)
+###### [Install a Product Key](volume-activation/install-product-key-vamt.md)
+###### [Install a KMS Client Key](volume-activation/install-kms-client-key-vamt.md)
+##### [Manage Activations](volume-activation/manage-activations-vamt.md)
+###### [Perform Online Activation](volume-activation/online-activation-vamt.md)
+###### [Perform Proxy Activation](volume-activation/proxy-activation-vamt.md)
+###### [Perform KMS Activation](volume-activation/kms-activation-vamt.md)
+###### [Perform Local Reactivation](volume-activation/local-reactivation-vamt.md)
+###### [Activate an Active Directory Forest Online](volume-activation/activate-forest-vamt.md)
+###### [Activate by Proxy an Active Directory Forest](volume-activation/activate-forest-by-proxy-vamt.md)
+##### [Manage VAMT Data](volume-activation/manage-vamt-data.md)
+###### [Import and Export VAMT Data](volume-activation/import-export-vamt-data.md)
+###### [Use VAMT in Windows PowerShell](volume-activation/use-vamt-in-windows-powershell.md)
+##### [VAMT Step-by-Step Scenarios](volume-activation/vamt-step-by-step.md)
+###### [Scenario 1: Online Activation](volume-activation/scenario-online-activation-vamt.md)
+###### [Scenario 2: Proxy Activation](volume-activation/scenario-proxy-activation-vamt.md)
+###### [Scenario 3: KMS Client Activation](volume-activation/scenario-kms-activation-vamt.md)
+##### [VAMT Known Issues](volume-activation/vamt-known-issues.md)
+#### [User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md)
+##### [User State Migration Tool (USMT) Overview Topics](usmt/usmt-topics.md)
+###### [User State Migration Tool (USMT) Overview](usmt/usmt-overview.md)
+###### [Getting Started with the User State Migration Tool (USMT)](usmt/getting-started-with-the-user-state-migration-tool.md)
+###### [Windows Upgrade and Migration Considerations](upgrade/windows-upgrade-and-migration-considerations.md)
+##### [User State Migration Tool (USMT) How-to topics](usmt/usmt-how-to.md)
+###### [Exclude Files and Settings](usmt/usmt-exclude-files-and-settings.md)
+###### [Extract Files from a Compressed USMT Migration Store](usmt/usmt-extract-files-from-a-compressed-migration-store.md)
+###### [Include Files and Settings](usmt/usmt-include-files-and-settings.md)
+###### [Migrate Application Settings](usmt/migrate-application-settings.md)
+###### [Migrate EFS Files and Certificates](usmt/usmt-migrate-efs-files-and-certificates.md)
+###### [Migrate User Accounts](usmt/usmt-migrate-user-accounts.md)
+###### [Reroute Files and Settings](usmt/usmt-reroute-files-and-settings.md)
+###### [Verify the Condition of a Compressed Migration Store](usmt/verify-the-condition-of-a-compressed-migration-store.md)
+##### [User State Migration Tool (USMT) Troubleshooting](usmt/usmt-troubleshooting.md)
+###### [Common Issues](usmt/usmt-common-issues.md)
+###### [Frequently Asked Questions](usmt/usmt-faq.md)
+###### [Log Files](usmt/usmt-log-files.md)
+###### [Return Codes](usmt/usmt-return-codes.md)
+###### [USMT Resources](usmt/usmt-resources.md)
+##### [User State Migration Toolkit (USMT) Reference](usmt/usmt-reference.md)
+###### [USMT Requirements](usmt/usmt-requirements.md)
+###### [USMT Best Practices](usmt/usmt-best-practices.md)
+###### [How USMT Works](usmt/usmt-how-it-works.md)
+###### [Plan Your Migration](usmt/usmt-plan-your-migration.md)
+####### [Common Migration Scenarios](usmt/usmt-common-migration-scenarios.md)
+####### [What Does USMT Migrate?](usmt/usmt-what-does-usmt-migrate.md)
+####### [Choose a Migration Store Type](usmt/usmt-choose-migration-store-type.md)
+######## [Migration Store Types Overview](usmt/migration-store-types-overview.md)
+######## [Estimate Migration Store Size](usmt/usmt-estimate-migration-store-size.md)
+######## [Hard-Link Migration Store](usmt/usmt-hard-link-migration-store.md)
+######## [Migration Store Encryption](usmt/usmt-migration-store-encryption.md)
+####### [Determine What to Migrate](usmt/usmt-determine-what-to-migrate.md)
+######## [Identify Users](usmt/usmt-identify-users.md)
+######## [Identify Applications Settings](usmt/usmt-identify-application-settings.md)
+######## [Identify Operating System Settings](usmt/usmt-identify-operating-system-settings.md)
+######## [Identify File Types, Files, and Folders](usmt/usmt-identify-file-types-files-and-folders.md)
+####### [Test Your Migration](usmt/usmt-test-your-migration.md)
+###### [User State Migration Tool (USMT) Command-line Syntax](usmt/usmt-command-line-syntax.md)
+####### [ScanState Syntax](usmt/usmt-scanstate-syntax.md)
+####### [LoadState Syntax](usmt/usmt-loadstate-syntax.md)
+####### [UsmtUtils Syntax](usmt/usmt-utilities.md)
+###### [USMT XML Reference](usmt/usmt-xml-reference.md)
+####### [Understanding Migration XML Files](usmt/understanding-migration-xml-files.md)
+####### [Config.xml File](usmt/usmt-configxml-file.md)
+####### [Customize USMT XML Files](usmt/usmt-customize-xml-files.md)
+####### [Custom XML Examples](usmt/usmt-custom-xml-examples.md)
+####### [Conflicts and Precedence](usmt/usmt-conflicts-and-precedence.md)
+####### [General Conventions](usmt/usmt-general-conventions.md)
+####### [XML File Requirements](usmt/xml-file-requirements.md)
+####### [Recognized Environment Variables](usmt/usmt-recognized-environment-variables.md)
+####### [XML Elements Library](usmt/usmt-xml-elements-library.md)
+###### [Offline Migration Reference](usmt/offline-migration-reference.md)
+
+### [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
+#### [Integrate Configuration Manager with MDT](deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
+#### [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
+#### [Create a custom Windows PE boot image with Configuration Manager](deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
+#### [Add a Windows 10 operating system image using Configuration Manager](deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md)
+#### [Create an application to deploy with Windows 10 using Configuration Manager](deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
+#### [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
+#### [Create a task sequence with Configuration Manager and MDT](deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
+#### [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](deploy-windows-sccm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
+#### [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md)
+#### [Monitor the Windows 10 deployment with Configuration Manager](deploy-windows-sccm/monitor-windows-10-deployment-with-configuration-manager.md)
+#### [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+#### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+#### [Perform an in-place upgrade to Windows 10 using Configuration Manager](upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md)
+
 ## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
 ### [Get started with the Microsoft Deployment Toolkit (MDT)](deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md)
 #### [Key features in MDT](deploy-windows-mdt/key-features-in-mdt.md)
@@ -78,24 +165,30 @@
 #### [Assign applications using roles in MDT](deploy-windows-mdt/assign-applications-using-roles-in-mdt.md)
 #### [Use web services in MDT](deploy-windows-mdt/use-web-services-in-mdt.md)
 #### [Use Orchestrator runbooks with MDT](deploy-windows-mdt/use-orchestrator-runbooks-with-mdt.md)
-## [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
+
-### [Integrate Configuration Manager with MDT](deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
+### [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)
-### [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
+
-### [Create a custom Windows PE boot image with Configuration Manager](deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
+## Upgrade Windows
-### [Add a Windows 10 operating system image using Configuration Manager](deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md)
+### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
-### [Create an application to deploy with Windows 10 using Configuration Manager](deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
+### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md)
-### [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
+### [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
-### [Create a task sequence with Configuration Manager and MDT](deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
+### [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md)
-### [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](deploy-windows-sccm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
+### [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md)
-### [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md)
+#### [Upgrade Readiness architecture](upgrade/upgrade-readiness-architecture.md)
-### [Monitor the Windows 10 deployment with Configuration Manager](deploy-windows-sccm/monitor-windows-10-deployment-with-configuration-manager.md)
+#### [Upgrade Readiness requirements](upgrade/upgrade-readiness-requirements.md)
-### [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+#### [Get started with Upgrade Readiness](upgrade/upgrade-readiness-get-started.md)
-### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+##### [Upgrade Readiness deployment script](upgrade/upgrade-readiness-deployment-script.md)
-### [Perform an in-place upgrade to Windows 10 using Configuration Manager](upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md)
+#### [Use Upgrade Readiness to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades.md)
-## [Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md)
+##### [Upgrade overview](upgrade/upgrade-readiness-upgrade-overview.md)
-## [Convert MBR partition to GPT](mbr-to-gpt.md)
+##### [Step 1: Identify apps](upgrade/upgrade-readiness-identify-apps.md)
-## [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md)
+##### [Step 2: Resolve issues](upgrade/upgrade-readiness-resolve-issues.md)
-## [Sideload apps in Windows 10](/windows/application-management/sideload-apps-in-windows-10)
+##### [Step 3: Deploy Windows](upgrade/upgrade-readiness-deploy-windows.md)
+##### [Additional insights](upgrade/upgrade-readiness-additional-insights.md)
+#### [Troubleshoot Upgrade Readiness](upgrade/troubleshoot-upgrade-readiness.md)
+### [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
+### [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md)
+### [Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md)
+
 ## [Update Windows 10](update/index.md)
 ### [Quick guide to Windows as a service](update/waas-quick-start.md)
 ### [Overview of Windows as a service](update/waas-overview.md)
@@ -117,11 +210,17 @@
 ### [Deploy Windows 10 updates using Windows Server Update Services](update/waas-manage-updates-wsus.md)
 ### [Deploy Windows 10 updates using System Center Configuration Manager](update/waas-manage-updates-configuration-manager.md)
 ### [Manage device restarts after updates](update/waas-restart.md)
+### [Manage additional Windows Update settings](waas-wu-settings.md)
 ### [Windows Insider Program for Business](update/waas-windows-insider-for-business.md)
 #### [Windows Insider Program for Business using Azure Active Directory](update/waas-windows-insider-for-business-aad.md)
 #### [Windows Insider Program for Business Frequently Asked Questions](update/waas-windows-insider-for-business-faq.md)
 ### [Change history for Update Windows 10](update/change-history-for-update-windows-10.md)
 
+## [Convert MBR partition to GPT](mbr-to-gpt.md)
+## [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md)
+## [Sideload apps in Windows 10](/windows/application-management/sideload-apps-in-windows-10)
+## [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md)
+
 ## [Volume Activation [client]](volume-activation/volume-activation-windows-10.md)
 ### [Plan for volume activation [client]](volume-activation/plan-for-volume-activation-client.md)
 ### [Activate using Key Management Service [client]](volume-activation/activate-using-key-management-service-vamt.md)
@@ -130,91 +229,5 @@
 ### [Monitor activation [client]](volume-activation/monitor-activation-client.md)
 ### [Use the Volume Activation Management Tool [client]](volume-activation/use-the-volume-activation-management-tool-client.md)
 ### [Appendix: Information sent to Microsoft during activation [client]](volume-activation/appendix-information-sent-to-microsoft-during-activation-client.md)
-## [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md)
+
-## [Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md)
+## [Change history for Deploy, Upgrade and Update Windows 10](change-history-for-deploy-windows-10.md)
-### [Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
-### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
-### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md)
-#### [Introduction to VAMT](volume-activation/introduction-vamt.md)
-#### [Active Directory-Based Activation Overview](volume-activation/active-directory-based-activation-overview.md)
-#### [Install and Configure VAMT](volume-activation/install-configure-vamt.md)
-##### [VAMT Requirements](volume-activation/vamt-requirements.md)
-##### [Install VAMT](volume-activation/install-vamt.md)
-##### [Configure Client Computers](volume-activation/configure-client-computers-vamt.md)
-#### [Add and Manage Products](volume-activation/add-manage-products-vamt.md)
-##### [Add and Remove Computers](volume-activation/add-remove-computers-vamt.md)
-##### [Update Product Status](volume-activation/update-product-status-vamt.md)
-##### [Remove Products](volume-activation/remove-products-vamt.md)
-#### [Manage Product Keys](volume-activation/manage-product-keys-vamt.md)
-##### [Add and Remove a Product Key](volume-activation/add-remove-product-key-vamt.md)
-##### [Install a Product Key](volume-activation/install-product-key-vamt.md)
-##### [Install a KMS Client Key](volume-activation/install-kms-client-key-vamt.md)
-#### [Manage Activations](volume-activation/manage-activations-vamt.md)
-##### [Perform Online Activation](volume-activation/online-activation-vamt.md)
-##### [Perform Proxy Activation](volume-activation/proxy-activation-vamt.md)
-##### [Perform KMS Activation](volume-activation/kms-activation-vamt.md)
-##### [Perform Local Reactivation](volume-activation/local-reactivation-vamt.md)
-##### [Activate an Active Directory Forest Online](volume-activation/activate-forest-vamt.md)
-##### [Activate by Proxy an Active Directory Forest](volume-activation/activate-forest-by-proxy-vamt.md)
-#### [Manage VAMT Data](volume-activation/manage-vamt-data.md)
-##### [Import and Export VAMT Data](volume-activation/import-export-vamt-data.md)
-##### [Use VAMT in Windows PowerShell](volume-activation/use-vamt-in-windows-powershell.md)
-#### [VAMT Step-by-Step Scenarios](volume-activation/vamt-step-by-step.md)
-##### [Scenario 1: Online Activation](volume-activation/scenario-online-activation-vamt.md)
-##### [Scenario 2: Proxy Activation](volume-activation/scenario-proxy-activation-vamt.md)
-##### [Scenario 3: KMS Client Activation](volume-activation/scenario-kms-activation-vamt.md)
-#### [VAMT Known Issues](volume-activation/vamt-known-issues.md)
-### [User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md)
-#### [User State Migration Tool (USMT) Overview Topics](usmt/usmt-topics.md)
-##### [User State Migration Tool (USMT) Overview](usmt/usmt-overview.md)
-##### [Getting Started with the User State Migration Tool (USMT)](usmt/getting-started-with-the-user-state-migration-tool.md)
-##### [Windows Upgrade and Migration Considerations](upgrade/windows-upgrade-and-migration-considerations.md)
-#### [User State Migration Tool (USMT) How-to topics](usmt/usmt-how-to.md)
-##### [Exclude Files and Settings](usmt/usmt-exclude-files-and-settings.md)
-##### [Extract Files from a Compressed USMT Migration Store](usmt/usmt-extract-files-from-a-compressed-migration-store.md)
-##### [Include Files and Settings](usmt/usmt-include-files-and-settings.md)
-##### [Migrate Application Settings](usmt/migrate-application-settings.md)
-##### [Migrate EFS Files and Certificates](usmt/usmt-migrate-efs-files-and-certificates.md)
-##### [Migrate User Accounts](usmt/usmt-migrate-user-accounts.md)
-##### [Reroute Files and Settings](usmt/usmt-reroute-files-and-settings.md)
-##### [Verify the Condition of a Compressed Migration Store](usmt/verify-the-condition-of-a-compressed-migration-store.md)
-#### [User State Migration Tool (USMT) Troubleshooting](usmt/usmt-troubleshooting.md)
-##### [Common Issues](usmt/usmt-common-issues.md)
-##### [Frequently Asked Questions](usmt/usmt-faq.md)
-##### [Log Files](usmt/usmt-log-files.md)
-##### [Return Codes](usmt/usmt-return-codes.md)
-##### [USMT Resources](usmt/usmt-resources.md)
-#### [User State Migration Toolkit (USMT) Reference](usmt/usmt-reference.md)
-##### [USMT Requirements](usmt/usmt-requirements.md)
-##### [USMT Best Practices](usmt/usmt-best-practices.md)
-##### [How USMT Works](usmt/usmt-how-it-works.md)
-##### [Plan Your Migration](usmt/usmt-plan-your-migration.md)
-###### [Common Migration Scenarios](usmt/usmt-common-migration-scenarios.md)
-###### [What Does USMT Migrate?](usmt/usmt-what-does-usmt-migrate.md)
-###### [Choose a Migration Store Type](usmt/usmt-choose-migration-store-type.md)
-####### [Migration Store Types Overview](usmt/migration-store-types-overview.md)
-####### [Estimate Migration Store Size](usmt/usmt-estimate-migration-store-size.md)
-####### [Hard-Link Migration Store](usmt/usmt-hard-link-migration-store.md)
-####### [Migration Store Encryption](usmt/usmt-migration-store-encryption.md)
-###### [Determine What to Migrate](usmt/usmt-determine-what-to-migrate.md)
-####### [Identify Users](usmt/usmt-identify-users.md)
-####### [Identify Applications Settings](usmt/usmt-identify-application-settings.md)
-####### [Identify Operating System Settings](usmt/usmt-identify-operating-system-settings.md)
-####### [Identify File Types, Files, and Folders](usmt/usmt-identify-file-types-files-and-folders.md)
-###### [Test Your Migration](usmt/usmt-test-your-migration.md)
-##### [User State Migration Tool (USMT) Command-line Syntax](usmt/usmt-command-line-syntax.md)
-###### [ScanState Syntax](usmt/usmt-scanstate-syntax.md)
-###### [LoadState Syntax](usmt/usmt-loadstate-syntax.md)
-###### [UsmtUtils Syntax](usmt/usmt-utilities.md)
-##### [USMT XML Reference](usmt/usmt-xml-reference.md)
-###### [Understanding Migration XML Files](usmt/understanding-migration-xml-files.md)
-###### [Config.xml File](usmt/usmt-configxml-file.md)
-###### [Customize USMT XML Files](usmt/usmt-customize-xml-files.md)
-###### [Custom XML Examples](usmt/usmt-custom-xml-examples.md)
-###### [Conflicts and Precedence](usmt/usmt-conflicts-and-precedence.md)
-###### [General Conventions](usmt/usmt-general-conventions.md)
-###### [XML File Requirements](usmt/xml-file-requirements.md)
-###### [Recognized Environment Variables](usmt/usmt-recognized-environment-variables.md)
-###### [XML Elements Library](usmt/usmt-xml-elements-library.md)
-##### [Offline Migration Reference](usmt/offline-migration-reference.md)
-## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)

windows/deployment/index.md

@@ -9,8 +9,8 @@ localizationpriority: high
 author: greg-lindsay
 ---
 
-# Deploy Windows 10
+# Deploy, Upgrade and Update Windows 10
-Learn about deploying Windows 10 for IT professionals.
+Learn about deployment in Windows 10 for IT professionals. This includes deploying the operating system, upgrading to it from previous version and updating Windows 10.
 
 ## In this section
 

windows/deployment/update/index.md

@@ -40,7 +40,8 @@ Windows as a service provides a new way to think about building, deploying, and
 | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md) | Explains how to use Windows Update for Business to manage when devices receive updates directly from Windows Update. Includes walkthroughs for configuring Windows Update for Business using Group Policy and Microsoft Intune.  |
 | [Deploy Windows 10 updates using Windows Server Update Services (WSUS)](waas-manage-updates-wsus.md) | Explains how to use WSUS to manage Windows 10 updates. |
 | [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) | Explains how to use Configuration Manager to manage Windows 10 updates.  |
-| [Manage device restarts after updates](waas-restart.md) | Explains how to use Group Policy to manage device restarts. |
+| [Manage device restarts after updates](waas-restart.md) | Explains how to manage update related device restarts. |
+| [Manage additional Windows Update settings](waas-wu-settings.md) | Provides details about settings available to control and configure Windows Update |
 | [Windows Insider Program for Business](waas-windows-insider-for-business.md) | Explains how the Windows Insider Program for Business works and how to become an insider. |
 
 >[!TIP]

windows/deployment/update/waas-configure-wufb.md

@@ -2,7 +2,7 @@
 title: Configure Windows Update for Business (Windows 10)
 description: You can use Group Policy or your mobile device management (MDM) service to configure Windows Update for Business settings for your devices.
 ms.prod: w10
-ms.mktglfcycl: manage
+ms.mktglfcycl: deploy
 ms.sitesec: library
 author: DaniHalfin
 localizationpriority: high

windows/deployment/update/waas-delivery-optimization.md

@@ -2,7 +2,7 @@
 title: Configure Delivery Optimization for Windows 10 updates (Windows 10)
 description: Delivery Optimization is a new peer-to-peer distribution method in Windows 10
 ms.prod: w10
-ms.mktglfcycl: manage
+ms.mktglfcycl: deploy
 ms.sitesec: library
 author: DaniHalfin
 localizationpriority: high

windows/deployment/update/waas-restart.md

@@ -2,7 +2,7 @@
 title: Manage device restarts after updates (Windows 10)
 description: tbd
 ms.prod: w10
-ms.mktglfcycl: manage
+ms.mktglfcycl: deploy
 ms.sitesec: library
 author: DaniHalfin
 localizationpriority: high

windows/deployment/update/waas-servicing-branches-windows-10-updates.md

@@ -2,7 +2,7 @@
 title: Assign devices to servicing branches for Windows 10 updates (Windows 10)
 description: tbd
 ms.prod: w10
-ms.mktglfcycl: manage
+ms.mktglfcycl: deploy
 ms.sitesec: library
 author: DaniHalfin
 localizationpriority: high

windows/deployment/update/waas-wu-settings.md

@@ -2,7 +2,7 @@
 title: Manage additional Windows Update settings (Windows 10)
 description: Additional settings to control the behavior of Windows Update (WU) in Windows 10
 ms.prod: w10
-ms.mktglfcycl: manage
+ms.mktglfcycl: deploy
 ms.sitesec: library
 author: DaniHalfin
 localizationpriority: high
@@ -36,13 +36,20 @@ You can use Group Policy settings or mobile device management (MDM) to configure
 | [Do not include drivers with Windows Updates](#do-not-include-drivers-with-windows-updates) | [ExcludeWUDriversInQualityUpdate](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#update-excludewudriversinqualityupdate) | 1607 |
 | [Configure Automatic Updates](#configure-automatic-updates) | [AllowAutoUpdate](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#update-allowautoupdate) | All |
 
->[!NOTE]
+>[!IMPORTANT]
 >Additional information about settings to manage device restarts and restart notifications for updates is available on **[Manage device restarts after updates](waas-restart.md)**.
-
+>
+>Additional settings that configure when Feature and Quality updates are received are detailed on **[Configure Windows Update for Business](waas-configure-wufb.md)**.
 
 ## Scanning for updates
 
-TODO: Story
+With Windows 10, admins have a lot of flexibility in configuring how their devices scan and receive updates.
+
+[Specify Intranet Microsoft update service location](#specify-intranet-microsoft-update-service-location) allows admins to point devices to an internal Microsoft update service location, while [Do not connect to any Windows Update Internet locations](#do-not-connect-to-any-windows-update-internet-locations) gives them to option to restrict devices to just that internal update service. [Automatic Updates Detection Frequency](#automatic-updates-detection-frequency) controls how frequently devices scan for updates.
+
+You can make custom device groups that'll work with your internal Microsoft update service by using [Enable client-side targeting](#enable-client-side-targeting). You can also make sure your devices receive updates that were not signed by Microsoft from your internal Microsoft update service, through [Allow signed updates from an intranet Microsoft update service location](#allow-signed-updates-from-an-intranet-microsoft-update-service-location).
+
+Finally, to make sure the updating experience is fully controlled by the admins, you can [Remove access to use all Windows Update features](#remove-access-to-use-all-windows-update-features) for users.
 
 For additional settings that configure when Feature and Quality updates are received, see [Configure Windows Update for Business](waas-configure-wufb.md).
 
@@ -68,7 +75,6 @@ The option to download files with missing Urls allows content to be downloaded f
 
 To configure this policy with MDM, use [UpdateServiceUrl](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#update-updateserviceurl) and [UpdateServiceUrlAlternate](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#update-updateserviceurlalternate).
 
-
 ### Automatic Updates detection frequency
 
 Specifies the hours that Windows will use to determine how long to wait before checking for available updates. The exact wait time is determined by using the hours specified here minus zero to twenty percent of the hours specified. For example, if this policy is used to specify a 20-hour detection frequency, then all clients to which this policy is applied will check for updates anywhere between 16 to 20 hours.
@@ -85,7 +91,6 @@ If the setting is set to **Disabled** or **Not Configured**, Windows will check
 
 To configure this policy with MDM, use [DetectionFrequency](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#update-detectionfrequency).
 
-
 ### Remove access to use all Windows Update features
 
 By enabling the Group Policy setting under **Computer Configuration\Administrative Templates\Windows Components\Windows update\Remove access to use all Windows update features**, administrators can disable the "Check for updates" option for users. Any background update scans, downloads and installations will continue to work as configured.
@@ -101,7 +106,7 @@ Use **Computer Configuration\Administrative Templates\Windows Components\Windows
 
 ### Enable client-side targeting
 
-Specifies the target group name or names that should be used to receive updates from an intranet Microsoft update service.
+Specifies the target group name or names that should be used to receive updates from an intranet Microsoft update service. This allows admins to configure device groups that will receive different updates from sources like WSUS or SCCM.
 
 This Group Policy setting can be found under **Computer Configuration\Administrative Templates\Windows Components\Windows update\Enable client-side targeting**.
 If the setting is set to **Enabled**, the specified target group information is sent to the intranet Microsoft update service which uses it to determine which updates should be deployed to this computer.
@@ -112,8 +117,6 @@ If the intranet Microsoft update service supports multiple target groups, this p
 >[!NOTE]
 >This policy applies only when the intranet Microsoft update service the device is directed to is configured to support client-side targeting. If the “Specify intranet Microsoft update service location” policy is disabled or not configured, this policy has no effect.
 
-**TODO:** *Which services support this feature*
-
 ### Allow signed updates from an intranet Microsoft update service location
 
 This policy setting allows you to manage whether Automatic Updates accepts updates signed by entities other than Microsoft when the update is found on an intranet Microsoft update service location. 
@@ -128,9 +131,12 @@ If you disable or do not configure this policy setting, updates from an intranet
 
 To configure this policy with MDM, use [AllowNonMicrosoftSignedUpdate](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#update-allownonmicrosoftsignedupdate).
 
+
 ## Installing updates
 
-TODO: Story
+To add more flexibility to the update process, settings are available to control update installation.
+
+[Configure Automatic Updates](#configure-automatic-updates) offers 4 different options for automatic update installation, while [Do not include drivers with Windows Updates](#do-not-include-drivers-with-windows-updates) makes sure drivers are not installed with the rest of the received updates.
 
 ### Do not include drivers with Windows Updates
 
@@ -157,3 +163,15 @@ When enabling this setting through Group Policy, under **Computer Configuration\
 If this setting is set to *Disabled*, any updates that are available on Windows Update must be downloaded and installed manually. To do this, users must go to **Settings > Update & security > Windows Update**.
 
 If this setting is set to *Not Configured*, an administrator can still configure Automatic Updates through the settings app, under **Settings > Update & security > Windows Update > Advanced options**.
+
+
+
+## Related topics
+
+- [Update Windows 10 in the enterprise](index.md)
+- [Overview of Windows as a service](waas-overview.md)
+- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) 
+- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
+- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
+- [Configure Windows Update for Business](waas-configure-wufb.md)
+- [Manage device restarts after updates](waas-restart.md)