From 577be96d170bdb3b23625f78523bf58037ba0890 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Tue, 15 Nov 2016 11:20:29 -0800 Subject: [PATCH 1/3] fixed typo --- windows/keep-secure/tpm-recommendations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/tpm-recommendations.md b/windows/keep-secure/tpm-recommendations.md index 277ad8c4ba..0b34d5a9a8 100644 --- a/windows/keep-secure/tpm-recommendations.md +++ b/windows/keep-secure/tpm-recommendations.md @@ -63,7 +63,7 @@ TPM 2.0 products and systems have important security advantages over TPM 1.2, in - TPM 1.2 implementations vary in policy settings. This may result in support issues as lockout policies vary. - TPM 2.0 lockout policy is configured by Windows, ensuring a consistent dictionary attack protection guarantee. -- While TPM 1.2 parts are discrete silicon components which are typically soldered on the motherboard, TPM 2.0 is available as a **discrete (dTPM)** silicon component in a sinple semiconductor package, an **integrated** component incorporated in one or more semiconductor packages - alongside other logic units in the same package(s) - and as a **firmware (fTPM)** based component running in a trusted execution environment (TEE) on a general purpose SoC. +- While TPM 1.2 parts are discrete silicon components which are typically soldered on the motherboard, TPM 2.0 is available as a **discrete (dTPM)** silicon component in a single semiconductor package, an **integrated** component incorporated in one or more semiconductor packages - alongside other logic units in the same package(s) - and as a **firmware (fTPM)** based component running in a trusted execution environment (TEE) on a general purpose SoC. ## Discrete, Integrated or Firmware TPM? From 1ec1f3976daccb934039ddcb682c1c8d25d604b6 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 15 Nov 2016 11:30:16 -0800 Subject: [PATCH 2/3] strengthened intro --- windows/deploy/resolve-windows-10-upgrade-errors.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deploy/resolve-windows-10-upgrade-errors.md index dc86e81da7..4574fae262 100644 --- a/windows/deploy/resolve-windows-10-upgrade-errors.md +++ b/windows/deploy/resolve-windows-10-upgrade-errors.md @@ -16,13 +16,11 @@ localizationpriority: high **Applies to** - Windows 10 -This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. - -If you are not an IT administrator, you can try the [quick fixes](#quick-fixes) listed in this topic. If the quick fixes do not resolve your issue, see [Get help with Windows 10 upgrade and installation errors](https://support.microsoft.com/en-us/help/10587/windows-10-get-help-with-upgrade-installation-errors) for more information. +>**Important**: This topic contains technical instructions for IT administrators. If you are not an IT administrator, see [Get help with Windows 10 upgrade and installation errors](https://support.microsoft.com/en-us/help/10587/windows-10-get-help-with-upgrade-installation-errors) for more information. Do not attempt the procedures in this topic. ## In this topic -The following sections and procedures are provided in this guide: +This topic contains a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. The following sections and procedures are provided in this guide: - [The Windows 10 upgrade process](#the-windows-10-upgrade-process): An explanation of phases used during the upgrade process.
- [Quick fixes](#quick-fixes): Steps you can take to eliminate many Windows upgrade errors.
From d70887ef2359589844ebf4690d4a84a28ee84a6a Mon Sep 17 00:00:00 2001 From: JanKeller1 Date: Tue, 15 Nov 2016 11:58:33 -0800 Subject: [PATCH 3/3] Fixed a link that is basically useless --- windows/keep-secure/event-4713.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/event-4713.md b/windows/keep-secure/event-4713.md index 482ad0768e..c35ede099f 100644 --- a/windows/keep-secure/event-4713.md +++ b/windows/keep-secure/event-4713.md @@ -21,7 +21,7 @@ author: Mir0sh ***Event Description:*** -This event generates when [Kerberos policy](https://technet.microsoft.com/en-us/library/cc782061(v=ws.10).aspx) was changed. +This event generates when [Kerberos](https://msdn.microsoft.com/library/windows/desktop/aa378747.aspx) policy was changed. This event is generated only on domain controllers.