From a4aceba628b885e63b5b1aac792eac556bc098cd Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 4 Apr 2016 13:37:44 -0700 Subject: [PATCH 1/3] fixing links --- windows/deploy/TOC.md | 2 +- ...d-a-distributed-environment-for-windows-10-deployment.md | 2 +- windows/deploy/common-issues-usmt-win8.md | 2 +- windows/deploy/configure-mdt-2013-settings.md | 2 +- windows/deploy/create-a-windows-10-reference-image.md | 2 +- .../frequently-asked-questions-usmt-win7-usmt-win8.md | 2 +- .../get-started-with-the-microsoft-deployment-toolkit.md | 2 +- .../deploy/prepare-for-windows-deployment-with-mdt-2013.md | 2 +- .../deploy/refresh-a-windows-7-computer-with-windows-10.md | 2 +- ...place-a-windows-7-computer-with-a-windows-10-computer.md | 2 +- windows/deploy/return-codes-usmt-win8.md | 2 +- windows/deploy/set-up-mdt-2013-for-bitlocker.md | 2 +- .../user-state-migration-tool--usmt--how-to-topics.md | 2 +- .../user-state-migration-tool--usmt--overview-topics.md | 2 +- .../user-state-migration-tool--usmt--technical-reference.md | 2 +- .../deploy/user-state-migration-toolkit--usmt--reference.md | 2 +- windows/keep-secure/change-the-tpm-owner-password.md | 2 +- .../implement-microsoft-passport-in-your-organization.md | 6 +++--- .../initialize-and-configure-ownership-of-the-tpm.md | 2 +- windows/keep-secure/manage-tpm-commands.md | 2 +- windows/keep-secure/manage-tpm-lockout.md | 4 ++-- windows/plan/index.md | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md index 22d109f738..701f2800c9 100644 --- a/windows/deploy/TOC.md +++ b/windows/deploy/TOC.md @@ -94,7 +94,7 @@ ##### [Migrate User Accounts](migrate-user-accounts-usmt.md) ##### [Reroute Files and Settings](reroute-files-and-settings-usmt.md) ##### [Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md) -#### [User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +#### [User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) ##### [Common Issues](common-issues-usmt-win8.md) ##### [Frequently Asked Questions](frequently-asked-questions-usmt-win7-usmt-win8.md) ##### [Log Files](log-files-usmt-win7-usmt-win8.md) diff --git a/windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md b/windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md index 00aa4d9f6d..8d78744690 100644 --- a/windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md +++ b/windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md @@ -18,7 +18,7 @@ author: CFaw In this topic, you will learn how to replicate your Windows 10 deployment shares to facilitate the deployment of Windows 10 in remote or branch locations. If you work in a distributed environment, replicating the deployment shares is an important part of the deployment solution. With images reaching 5 GB in size or more, you can't deploy machines in a remote office over the wire. You need to replicate the content, so that the clients can do local deployments. -We will use four machines for this topic: DC01, MDT01, MDT02, and PC0006. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 standard server, and PC0006 is a blank machine to which you will deploy Windows 10. You will configure a second deployment server (MDT02) for a remote site (Stockholm) by replicating the deployment share in the original site (New York). MDT01, MDT02, and PC0006 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +We will use four machines for this topic: DC01, MDT01, MDT02, and PC0006. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 standard server, and PC0006 is a blank machine to which you will deploy Windows 10. You will configure a second deployment server (MDT02) for a remote site (Stockholm) by replicating the deployment share in the original site (New York). MDT01, MDT02, and PC0006 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ![figure 1](images/mdt-10-fig01.png) diff --git a/windows/deploy/common-issues-usmt-win8.md b/windows/deploy/common-issues-usmt-win8.md index 363484f23b..9fe3b5eeac 100644 --- a/windows/deploy/common-issues-usmt-win8.md +++ b/windows/deploy/common-issues-usmt-win8.md @@ -289,7 +289,7 @@ You should also reboot the machine. ## Related topics -[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) [Frequently Asked Questions](frequently-asked-questions-usmt-win7-usmt-win8.md) diff --git a/windows/deploy/configure-mdt-2013-settings.md b/windows/deploy/configure-mdt-2013-settings.md index 2c160812ee..40a852f3b9 100644 --- a/windows/deploy/configure-mdt-2013-settings.md +++ b/windows/deploy/configure-mdt-2013-settings.md @@ -14,7 +14,7 @@ author: CFaw One of the most powerful features in Microsoft Deployment Toolkit (MDT) 2013 is its extension capabilities; there is virtually no limitation to what you can do in terms of customization. In this topic, you learn about configuring customizations for your environment. -For the purposes of this topic, we will use four machines: DC01, MDT01, HV01, and PC0001. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 Standard server, and PC0001 is a Windows 10 Enterprise x64 client used for the MDT simulation environment. OR01 has Microsoft System Center 2012 R2 Orchestrator installed. MDT01, OR01, and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For the purposes of this topic, we will use four machines: DC01, MDT01, HV01, and PC0001. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 Standard server, and PC0001 is a Windows 10 Enterprise x64 client used for the MDT simulation environment. OR01 has Microsoft System Center 2012 R2 Orchestrator installed. MDT01, OR01, and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ![figure 1](images/mdt-09-fig01.png) diff --git a/windows/deploy/create-a-windows-10-reference-image.md b/windows/deploy/create-a-windows-10-reference-image.md index 1109065adc..61dd970142 100644 --- a/windows/deploy/create-a-windows-10-reference-image.md +++ b/windows/deploy/create-a-windows-10-reference-image.md @@ -21,7 +21,7 @@ Creating a reference image is important because that image serves as the foundat For the purposes of this topic, we will use four machines: DC01, MDT01, HV01, and PC0001. DC01 is a domain controller, PC0001 is a Windows 10 Enterprise x64 client, and MDT01 is a Windows Server 2012 R2 standard server. HV01 is a Hyper-V host server, but HV01 could be replaced by PC0001 as long as PC0001 has enough memory and is capable of running Hyper-V. MDT01, HV01, and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. **Note**   -For important details about the setup for the steps outlined in this article, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For important details about the setup for the steps outlined in this article, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).   diff --git a/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md b/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md index 454293d158..bccf30d684 100644 --- a/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md +++ b/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md @@ -116,7 +116,7 @@ For more information, see [Conflicts and Precedence](conflicts-and-precedence-us ## Related topics -[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) [Extract Files from a Compressed USMT Migration Store](extract-files-from-a-compressed-usmt-migration-store.md) diff --git a/windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md b/windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md index 3df68fe71c..57a20dea3e 100644 --- a/windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md +++ b/windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md @@ -20,7 +20,7 @@ This topic will help you gain a better understanding of how to use the Microsoft In addition to familiarizing you with the features and options available in MDT 2013 Update 2, this topic will walk you through the process of preparing for deploying Windows 10 using MDT by configuring Active Directory, creating an organizational unit (OU) structure, creating service accounts, configuring log files and folders, and installing the tools needed to view the logs and continue with the deployment process. -For the purposes of this topic, we will use two machines: DC01 and MDT01. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. MDT01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For the purposes of this topic, we will use two machines: DC01 and MDT01. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. MDT01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ![figure 1](images/mdt-05-fig01.png) diff --git a/windows/deploy/prepare-for-windows-deployment-with-mdt-2013.md b/windows/deploy/prepare-for-windows-deployment-with-mdt-2013.md index c1c6bfa60a..4e0d835ea6 100644 --- a/windows/deploy/prepare-for-windows-deployment-with-mdt-2013.md +++ b/windows/deploy/prepare-for-windows-deployment-with-mdt-2013.md @@ -18,7 +18,7 @@ author: CFaw This topic will walk you through the steps necessary to create the server structure required to deploy the Windows 10 operating system using the Microsoft Deployment Toolkit (MDT) 2013 Update 2. It covers the installation of the necessary system prerequisites, the creation of shared folders and service accounts, and the configuration of security permissions in the files system and in Active Directory. -For the purposes of this topic, we will use two machines: DC01 and MDT01. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. MDT01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For the purposes of this topic, we will use two machines: DC01 and MDT01. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. MDT01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ## System requirements diff --git a/windows/deploy/refresh-a-windows-7-computer-with-windows-10.md b/windows/deploy/refresh-a-windows-7-computer-with-windows-10.md index cd82698970..fee360b2f4 100644 --- a/windows/deploy/refresh-a-windows-7-computer-with-windows-10.md +++ b/windows/deploy/refresh-a-windows-7-computer-with-windows-10.md @@ -18,7 +18,7 @@ author: CFaw This topic will show you how to use MDT 2013 Update 2 Lite Touch Installation (LTI) to upgrade a Windows 7 computer to a Windows 10 computer using the computer refresh process. The refresh scenario, or computer refresh, is a reinstallation of an operating system on the same machine. You can refresh the machine to the same operating system as it is currently running, or to a later version. -For the purposes of this topic, we will use three machines: DC01, MDT01, and PC0001. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 Standard server. PC0001 is a machine with Windows 7 Service Pack 1 (SP1) that is going to be refreshed into a Windows 10 machine, with data and settings restored. MDT01 and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For the purposes of this topic, we will use three machines: DC01, MDT01, and PC0001. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 Standard server. PC0001 is a machine with Windows 7 Service Pack 1 (SP1) that is going to be refreshed into a Windows 10 machine, with data and settings restored. MDT01 and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ![figure 1](images/mdt-04-fig01.png) diff --git a/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md b/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md index 0060f01911..5dd918cbc5 100644 --- a/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md +++ b/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md @@ -18,7 +18,7 @@ author: CFaw A computer replace scenario for Windows 10 is quite similar to a computer refresh for Windows 10; however, because you are replacing a machine, you cannot store the backup on the old computer. Instead you need to store the backup to a location where the new computer can read it. -For the purposes of this topic, we will use four machines: DC01, MDT01, PC0002, and PC0007. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. PC0002 is an old machine running Windows 7 SP1. It is going to be replaced by a new Windows 10 machine, PC0007. User State Migration Tool (USMT) will be used to backup and restore data and settings. MDT01, PC0002, and PC0007 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For the purposes of this topic, we will use four machines: DC01, MDT01, PC0002, and PC0007. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. PC0002 is an old machine running Windows 7 SP1. It is going to be replaced by a new Windows 10 machine, PC0007. User State Migration Tool (USMT) will be used to backup and restore data and settings. MDT01, PC0002, and PC0007 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ![figure 1](images/mdt-03-fig01.png) diff --git a/windows/deploy/return-codes-usmt-win8.md b/windows/deploy/return-codes-usmt-win8.md index 90628a5fb6..719c949d28 100644 --- a/windows/deploy/return-codes-usmt-win8.md +++ b/windows/deploy/return-codes-usmt-win8.md @@ -767,7 +767,7 @@ The following table lists each return code by numeric value, along with the asso ## Related topics -[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) [Log Files](log-files-usmt-win7-usmt-win8.md) diff --git a/windows/deploy/set-up-mdt-2013-for-bitlocker.md b/windows/deploy/set-up-mdt-2013-for-bitlocker.md index fff1db9da2..23cf6ecf88 100644 --- a/windows/deploy/set-up-mdt-2013-for-bitlocker.md +++ b/windows/deploy/set-up-mdt-2013-for-bitlocker.md @@ -33,7 +33,7 @@ Even though it is not a BitLocker requirement, we recommend configuring BitLocke   -For the purposes of this topic, we will use DC01, a domain controller that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof). +For the purposes of this topic, we will use DC01, a domain controller that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof). ## Configure Active Directory for BitLocker diff --git a/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md b/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md index 136811526b..33ebbb54d7 100644 --- a/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md +++ b/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md @@ -64,7 +64,7 @@ The following table lists topics that describe how to use User State Migration T [User State Migration Tool (USMT) Overview Topics](user-state-migration-tool--usmt--overview-topics.md) -[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) [User State Migration Toolkit (USMT) Reference](user-state-migration-toolkit--usmt--reference.md) diff --git a/windows/deploy/user-state-migration-tool--usmt--overview-topics.md b/windows/deploy/user-state-migration-tool--usmt--overview-topics.md index 1a0b5ff4eb..75e8b87d98 100644 --- a/windows/deploy/user-state-migration-tool--usmt--overview-topics.md +++ b/windows/deploy/user-state-migration-tool--usmt--overview-topics.md @@ -44,7 +44,7 @@ The User State Migration Tool (USMT) 10.0 provides a highly customizable user-p [User State Migration Tool (USMT) How-to topics](user-state-migration-tool--usmt--how-to-topics.md) -[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) [User State Migration Toolkit (USMT) Reference](user-state-migration-toolkit--usmt--reference.md) diff --git a/windows/deploy/user-state-migration-tool--usmt--technical-reference.md b/windows/deploy/user-state-migration-tool--usmt--technical-reference.md index ef7329181f..c6edf28565 100644 --- a/windows/deploy/user-state-migration-tool--usmt--technical-reference.md +++ b/windows/deploy/user-state-migration-tool--usmt--technical-reference.md @@ -53,7 +53,7 @@ USMT 10.0 tools can be used on several versions of Windows operating systems, fo

Includes step-by-step instructions for using USMT, as well as how-to topics for conducting tasks in USMT.

-

[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md))

+

[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--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.

diff --git a/windows/deploy/user-state-migration-toolkit--usmt--reference.md b/windows/deploy/user-state-migration-toolkit--usmt--reference.md index 3f6426e77e..c841faf447 100644 --- a/windows/deploy/user-state-migration-toolkit--usmt--reference.md +++ b/windows/deploy/user-state-migration-toolkit--usmt--reference.md @@ -60,7 +60,7 @@ author: CFaw [User State Migration Tool (USMT) How-to topics](user-state-migration-tool--usmt--how-to-topics.md) -[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--guidance-and-best-practices-edp.md)) +[User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md))   diff --git a/windows/keep-secure/change-the-tpm-owner-password.md b/windows/keep-secure/change-the-tpm-owner-password.md index 7fbc740264..dbbd1ff048 100644 --- a/windows/keep-secure/change-the-tpm-owner-password.md +++ b/windows/keep-secure/change-the-tpm-owner-password.md @@ -85,7 +85,7 @@ For details about the individual cmdlets, see [TPM Cmdlets in Windows PowerShell ## Additional resources -For more info about TPM, see [Trusted Platform Module technology overview](trusted-platform-module-technology-overview.md#bkmk-additionalresources). +For more info about TPM, see [Trusted Platform Module technology overview](trusted-platform-module-overview.md#bkmk-additionalresources).   diff --git a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md index 07672ba61f..a3f4ac52ce 100644 --- a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md +++ b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md @@ -129,7 +129,7 @@ The following table lists the Group Policy settings that you can configure for P -Remote Passport +Remote Passport

Use Remote Passport

Note  Applies to desktop only. Phone sign-in is currently limited to select Technology Adoption Program (TAP) participants.
@@ -285,8 +285,8 @@ The following table lists the MDM policy settings that you can configure for Pas Device or user False -

True: Remote Passport is enabled.

-

False: Remote Passport is disabled.

+

True: Remote Passport is enabled.

+

False: Remote Passport is disabled.

diff --git a/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md b/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md index 741bc28561..5a4aa84615 100644 --- a/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md +++ b/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md @@ -268,7 +268,7 @@ For details about the individual cmdlets, see [TPM Cmdlets in Windows PowerShell ## Additional resources -For more info about TPM, see [Trusted Platform Module Technology Overview](trusted-platform-module-technology-overview.md#bkmk-additionalresources). +For more info about TPM, see [Trusted Platform Module Technology Overview](trusted-platform-module-overview.md#bkmk-additionalresources).   diff --git a/windows/keep-secure/manage-tpm-commands.md b/windows/keep-secure/manage-tpm-commands.md index d833568317..1d9de633fa 100644 --- a/windows/keep-secure/manage-tpm-commands.md +++ b/windows/keep-secure/manage-tpm-commands.md @@ -94,7 +94,7 @@ For details about the individual cmdlets, see [TPM Cmdlets in Windows PowerShell ## Additional resources -For more info about TPM, see [Trusted Platform Module technology overview](trusted-platform-module-technology-overview.md#bkmk-additionalresources). +For more info about TPM, see [Trusted Platform Module technology overview](trusted-platform-module-overview.md#bkmk-additionalresources).   diff --git a/windows/keep-secure/manage-tpm-lockout.md b/windows/keep-secure/manage-tpm-lockout.md index cd4748f94d..2753d3dffc 100644 --- a/windows/keep-secure/manage-tpm-lockout.md +++ b/windows/keep-secure/manage-tpm-lockout.md @@ -71,7 +71,7 @@ The TPM Group Policy settings in the following list are located at: This policy setting allows you to manage the maximum number of authorization failures for the TPM for all standard users. If the total number of authorization failures for all users equals the duration that is set for the policy, all users are prevented from sending commands to the TPM that require authorization. -For information about mitigating dictionary attacks that use the lockout settings, see [TPM fundamentals](tpm-fundamentals-windows-8.md#bkmk-howtpmmitigates). +For information about mitigating dictionary attacks that use the lockout settings, see [TPM fundamentals](tpm-fundamentals.md#bkmk-howtpmmitigates). ## Use the TPM cmdlets @@ -85,7 +85,7 @@ For details about the individual cmdlets, see [TPM Cmdlets in Windows PowerShell ## Additional resources -For more info about TPM, see [TPM technology overview](trusted-platform-module-technology-overview.md#bkmk-additionalresources). +For more info about TPM, see [TPM technology overview](trusted-platform-module-overview.md#bkmk-additionalresources).   diff --git a/windows/plan/index.md b/windows/plan/index.md index d02e27fed6..103d3738ff 100644 --- a/windows/plan/index.md +++ b/windows/plan/index.md @@ -85,7 +85,7 @@ Windows 10 provides new deployment capabilities, scenarios, and tools by buildi [Windows Imaging and Configuration Designer](http://go.microsoft.com/fwlink/p/?LinkId=733911) -[Windows 10 and Windows 10 Mobile](../p_ent_nodes/windows-10.md) +[Windows 10 and Windows 10 Mobile](../index.md)   From 5f24efdb8952095da5a4d96cd35c98d564738384 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 4 Apr 2016 13:51:07 -0700 Subject: [PATCH 2/3] fixing more links --- windows/keep-secure/create-edp-policy-using-sccm.md | 2 +- ...app-inventory-managemement-windows-store-for-business.md | 6 +++--- windows/manage/distribute-apps-with-management-tool.md | 2 +- windows/plan/windows-to-go-frequently-asked-questions.md | 2 +- windows/whats-new/TOC.md | 4 ++-- windows/whats-new/windows-store-for-business-overview.md | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/windows/keep-secure/create-edp-policy-using-sccm.md b/windows/keep-secure/create-edp-policy-using-sccm.md index f13072bfcf..0590682364 100644 --- a/windows/keep-secure/create-edp-policy-using-sccm.md +++ b/windows/keep-secure/create-edp-policy-using-sccm.md @@ -390,7 +390,7 @@ After you’ve created your EDP policy, you'll need to deploy it to your organiz ## Next steps -Enrollment can be done for business or personal devices, allowing the devices to use your managed apps and to sync with your managed content and information. For more info about enrollment, see [Enroll and unenroll devices from enterprise data protection (EDP)](../keep-secure/remove-your-corporate-data-from-enrolled-devices.md). +Enrollment can be done for business or personal devices, allowing the devices to use your managed apps and to sync with your managed content and information. ## Related topics diff --git a/windows/manage/app-inventory-managemement-windows-store-for-business.md b/windows/manage/app-inventory-managemement-windows-store-for-business.md index 17c74769cf..cce89f05fe 100644 --- a/windows/manage/app-inventory-managemement-windows-store-for-business.md +++ b/windows/manage/app-inventory-managemement-windows-store-for-business.md @@ -44,7 +44,7 @@ There are a couple of ways to find specific apps, or groups of apps in your inve **Refine** - Use **Refine** to scope your list of apps by one or more of these app attributes: -- **License** - Online or offline licenses. For more info, see [Apps in Windows Store for Business](apps-in-the-windows-store-for-business.md#licensing-model). +- **License** - Online or offline licenses. For more info, see [Apps in Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model). - **Platforms** - Lists the devices that apps in your inventory were originally written to support. This list is cumulative for all apps in your inventory. @@ -54,7 +54,7 @@ There are a couple of ways to find specific apps, or groups of apps in your inve ### Manage apps in your inventory -Each app in the Store for Business has an online, or an offline license. For more information on Store for Business licensing model, see [Apps in the Windows Store for Business](apps-in-the-windows-store-for-business.md#licensing-model). There are different actions you can take depending on the app license type. They're summarized in this table. +Each app in the Store for Business has an online, or an offline license. For more information on Store for Business licensing model, see [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model). There are different actions you can take depending on the app license type. They're summarized in this table. @@ -192,7 +192,7 @@ You can download offline-licensed apps from your inventory. You'll need to downl - App framework -For more information about online and offline licenses, see [Apps in the Windows Store for Business](apps-in-the-windows-store-for-business.md#licensing-model). +For more information about online and offline licenses, see [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model). For more information about downloading offline-licensed apps, see [Download offline apps](distribute-offline-apps.md). diff --git a/windows/manage/distribute-apps-with-management-tool.md b/windows/manage/distribute-apps-with-management-tool.md index cac78100cc..ca1b61805f 100644 --- a/windows/manage/distribute-apps-with-management-tool.md +++ b/windows/manage/distribute-apps-with-management-tool.md @@ -43,7 +43,7 @@ MDM tool requirements: ## Distribute offline-licensed apps -If your vendor doesn’t support the ability to synchronize applications from the management tool services or cannot connect to the management tool services, your vendor may support the ability to deploy offline licensed applications by downloading the application and license from the store and then deploying the app through your MDM. For more information on online and offline licensing with Store for Business, see [Apps in the Windows Store for Business.](apps-in-the-windows-store-for-business.md#licensing-model) +If your vendor doesn’t support the ability to synchronize applications from the management tool services or cannot connect to the management tool services, your vendor may support the ability to deploy offline licensed applications by downloading the application and license from the store and then deploying the app through your MDM. For more information on online and offline licensing with Store for Business, see [Apps in the Windows Store for Business.](apps-in-windows-store-for-business.md#licensing-model) This diagram shows how you can use a management tool to distribute offline-licensed app to employees in your organization. Once synchronized from Store for Business, management tools can use the Windows Management framework to distribute applications to devices. diff --git a/windows/plan/windows-to-go-frequently-asked-questions.md b/windows/plan/windows-to-go-frequently-asked-questions.md index 9cc46f790b..3f8e61bb9f 100644 --- a/windows/plan/windows-to-go-frequently-asked-questions.md +++ b/windows/plan/windows-to-go-frequently-asked-questions.md @@ -120,7 +120,7 @@ Windows To Go was designed for enterprise usage and targets scenarios such as co Windows To Go can be deployed using standard Windows deployment tools like Diskpart and DISM. The prerequisites for deploying Windows To Go are: -- A Windows To Go recommended USB drive to provision; See the list of currently available USB drives at [Hardware considerations for Windows To Go](windows-to-go-feature-overview-scenario.md#wtg-hardware) +- A Windows To Go recommended USB drive to provision; See the list of currently available USB drives at [Hardware considerations for Windows To Go](windows-to-go-overview.md#wtg-hardware) - A Windows 10 Enterprise or Windows 10 Education image diff --git a/windows/whats-new/TOC.md b/windows/whats-new/TOC.md index 3e1b376ac8..d884f8a0a1 100644 --- a/windows/whats-new/TOC.md +++ b/windows/whats-new/TOC.md @@ -5,7 +5,7 @@ ## [Browser: Microsoft Edge and Internet Explorer 11](edge-ie11-whats-new-overview.md)) ## [Credential Guard](credential-guard.md) ## [Device Guard](device-guard-overview.md) -## [Enterprise data protection (EDP)](edp-whats-new-overview.md)) +## [Enterprise data protection (EDP)](edp-whats-new-overview.md) ## [Enterprise management for Windows 10 devices](device-management.md) ## [Lockdown features from Windows Embedded Industry 8.1](lockdown-features-windows-10.md) ## [Microsoft Passport](microsoft-passport.md) @@ -15,6 +15,6 @@ ## [Trusted Platform Module](trusted-platform-module.md) ## [User Account Control](user-account-control.md) ## [Windows spotlight on the lock screen](windows-spotlight.md) -## [Windows Store for Business overview](windows-store-for-business-overview.md)) +## [Windows Store for Business overview](windows-store-for-business-overview.md) ## [Windows Update for Business](windows-update-for-business.md) diff --git a/windows/whats-new/windows-store-for-business-overview.md b/windows/whats-new/windows-store-for-business-overview.md index 011e87f281..3290095bd5 100644 --- a/windows/whats-new/windows-store-for-business-overview.md +++ b/windows/whats-new/windows-store-for-business-overview.md @@ -153,7 +153,7 @@ Line-of-business (LOB) apps are also supported via the Business store. You can i The Business store supports two options to license apps: online and offline. **Online** licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require users and devices to connect to the Store for Business service to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. -For more information, see [Apps in the Store for Business](../manage/apps-in-the-windows-store-for-business.md#licensing-model). +For more information, see [Apps in the Store for Business](../manage/apps-in-windows-store-for-business.md#licensing-model). ### Distribute apps and content From 7e6874c87f9c69b016c3a48b956d52aeea5ce14f Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 4 Apr 2016 14:06:36 -0700 Subject: [PATCH 3/3] fixing more links --- windows/deploy/TOC.md | 2 +- windows/keep-secure/TOC.md | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md index 701f2800c9..2c908f1104 100644 --- a/windows/deploy/TOC.md +++ b/windows/deploy/TOC.md @@ -94,7 +94,7 @@ ##### [Migrate User Accounts](migrate-user-accounts-usmt.md) ##### [Reroute Files and Settings](reroute-files-and-settings-usmt.md) ##### [Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md) -#### [User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md)) +#### [User State Migration Tool (USMT) Troubleshooting](user-state-migration-tool--usmt--troubleshooting.md) ##### [Common Issues](common-issues-usmt-win8.md) ##### [Frequently Asked Questions](frequently-asked-questions-usmt-win7-usmt-win8.md) ##### [Log Files](log-files-usmt-win7-usmt-win8.md) diff --git a/windows/keep-secure/TOC.md b/windows/keep-secure/TOC.md index f93a0355ee..05507c1d74 100644 --- a/windows/keep-secure/TOC.md +++ b/windows/keep-secure/TOC.md @@ -1,6 +1,6 @@ # [Keep Windows 10 secure](index.md) ## [Change history for Keep Windows 10 secure](change-history-for-keep-windows-10-secure.md) -## [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md)) +## [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md) ## [Device Guard certification and compliance](device-guard-certification-and-compliance.md) ### [Get apps to run on Device Guard-protected devices](getting-apps-to-run-on-device-guard-protected-devices.md) ### [Create a Device Guard code integrity policy based on a reference device](creating-a-device-guard-policy-for-signed-apps.md) @@ -11,20 +11,20 @@ ### [Microsoft Passport and password changes](microsoft-passport-and-password-changes.md) ### [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md) ### [Event ID 300 - Passport successfully created](passport-event-300.md) -## [Windows Hello biometrics in the enterprise](windows-hello-in-enterprise.md)) +## [Windows Hello biometrics in the enterprise](windows-hello-in-enterprise.md) ## [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md) ## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) ## [Protect derived domain credentials with Credential Guard](credential-guard.md) -## [Protect your enterprise data using enterprise data protection (EDP)](protect-enterprise-data-using-edp.md)) -### [Create an enterprise data protection (EDP) policy](overview-create-edp-policy.md)) -#### [Create an enterprise data protection (EDP) policy using Microsoft Intune](create-edp-policy-using-intune.md)) -##### [Add multiple apps to your enterprise data protection (EDP) Protected Apps list](add-apps-to-protected-list-using-custom-uri.md)) -##### [Deploy your enterprise data protection (EDP) policy](deploy-edp-policy-using-intune.md)) -##### [Create and deploy a VPN policy for enterprise data protection (EDP) using Microsoft Intune](create-vpn-and-edp-policy-using-intune.md)) -#### [Create and deploy an enterprise data protection (EDP) policy using System Center Configuration Manager](create-edp-policy-using-sccm.md)) -### [General guidance and best practices for enterprise data protection (EDP)](guidance-and-best-practices-edp.md)) -#### [Enlightened apps for use with enterprise data protection (EDP)](enlightened-microsoft-apps-and-edp.md)) -#### [Testing scenarios for enterprise data protection (EDP)](testing-scenarios-for-edp.md)) +## [Protect your enterprise data using enterprise data protection (EDP)](protect-enterprise-data-using-edp.md) +### [Create an enterprise data protection (EDP) policy](overview-create-edp-policy.md) +#### [Create an enterprise data protection (EDP) policy using Microsoft Intune](create-edp-policy-using-intune.md) +##### [Add multiple apps to your enterprise data protection (EDP) Protected Apps list](add-apps-to-protected-list-using-custom-uri.md) +##### [Deploy your enterprise data protection (EDP) policy](deploy-edp-policy-using-intune.md) +##### [Create and deploy a VPN policy for enterprise data protection (EDP) using Microsoft Intune](create-vpn-and-edp-policy-using-intune.md) +#### [Create and deploy an enterprise data protection (EDP) policy using System Center Configuration Manager](create-edp-policy-using-sccm.md) +### [General guidance and best practices for enterprise data protection (EDP)](guidance-and-best-practices-edp.md) +#### [Enlightened apps for use with enterprise data protection (EDP)](enlightened-microsoft-apps-and-edp.md) +#### [Testing scenarios for enterprise data protection (EDP)](testing-scenarios-for-edp.md) ## [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md) ## [VPN profile options](vpn-profile-options.md) ## [Security technologies](security-technologies.md)