From 34a3881237194b70313b8d2bc5b31a27f8841f22 Mon Sep 17 00:00:00 2001 From: Liza Poggemeyer Date: Sat, 23 Sep 2017 00:52:15 +0000 Subject: [PATCH] Merged PR 3388: Live publish for modern deployment posters --- windows/deployment/TOC.md | 4 ++- .../windows-10-architecture-posters.md | 25 +++++++++++++++++++ .../tpm/tpm-recommendations.md | 12 ++++----- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 windows/deployment/windows-10-architecture-posters.md diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md index 3d057730dc..5055de6869 100644 --- a/windows/deployment/TOC.md +++ b/windows/deployment/TOC.md @@ -244,4 +244,6 @@ #### [Get started with Device Health](update/device-health-get-started.md) #### [Using Device Health](update/device-health-using.md) -## [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md) \ No newline at end of file +## [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md) + +## [Architectural planning posters for Windows 10](windows-10-architecture-posters.md) \ No newline at end of file diff --git a/windows/deployment/windows-10-architecture-posters.md b/windows/deployment/windows-10-architecture-posters.md new file mode 100644 index 0000000000..b8accd1126 --- /dev/null +++ b/windows/deployment/windows-10-architecture-posters.md @@ -0,0 +1,25 @@ +--- +title: Deploy Windows 10 - architectural posters +description: Provides architural planning posters for Windows 10 in the enterprise +ms.prod: w10 +ms.author: elizapo +author: lizap +ms.date: 09/22/2017 +ms.tgt_pltfrm: na +ms.topic: article +ms.localizationpriority: low +--- +# Architectural planning posters for Windows 10 + +You can download the following posters for architectural information about deploying Windows 10 in the enterprise. + +- [Deploy Windows 10 - Clean installation](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/Deploy-CleanInstallation.pdf) + Learn about the options and steps for a new installation of Windows 10. +- [Deploy Windows 10 - In-place upgrade](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/Deploy-InplaceUpgrade.pdf) + Learn about the steps to upgrade from a previous version of Windows. +- [Deploy Windows 10 - Windows AutoPilot](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/Deploy-WindowsAutoPilot.pdf) + Learn how you can set up and pre-configure Windows 10 devices. +- [Deploy Windows 10 - Windows servicing](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/WindowsServicing.pdf) + Learn how to keep Windows up to date. +- [Deploy Windows 10 - Protection solutions](https://github.com/MicrosoftDocs/windows-itpro-docs/raw/master/windows/media/ModernSecureDeployment/WindowsServicing.pdf) + Learn about the two tiers of protection available for Windows 10 devices. diff --git a/windows/device-security/tpm/tpm-recommendations.md b/windows/device-security/tpm/tpm-recommendations.md index 21314c3f0b..f30df74373 100644 --- a/windows/device-security/tpm/tpm-recommendations.md +++ b/windows/device-security/tpm/tpm-recommendations.md @@ -12,8 +12,6 @@ author: brianlic-msft # TPM recommendations -**Applies to** - **Applies to** - Windows 10 - Windows Server 2016 @@ -100,13 +98,13 @@ The following table defines which Windows features require TPM support. | Windows Features | TPM Required | Supports TPM 1.2 | Supports TPM 2.0 | Details | |-------------------------|--------------|--------------------|--------------------|----------| -| Measured Boot | Yes | Yes | Yes | | -| Bitlocker | No | Yes | Yes | A removable USB memory device such as a flash drive can also be used instead of a TPM. | -| Device Encryption | Yes | N/A | Yes | Device Encryption requires InstantGo/Connected Standby certification. All systems certified for InstantGo/Connected Standby shipped with TPM 2.0, so TPM 1.3 support is Not Applicable. | +| Measured Boot | Yes | Yes | Yes | Measured Boot requires TPM 1.2 or 2.0 and UEFI Secure Boot | +| BitLocker | Yes | Yes | Yes | TPM 1.2 or 2.0 is required | +| Device Encryption | Yes | N/A | Yes | Device Encryption requires InstantGo/Connected Standby certification, which requires TPM 2.0. | | Device Guard | No | Yes | Yes | | -| Credential Guard | No | Yes | Yes | Windows 10, version 1507 (End of Life as of May 2017) only supported TPM 2.0 for Credential Guard. Beginning with Windows 10, version 1511, TPM 1.2 and 2.0 is supported. | +| Credential Guard | No | Yes | Yes | Windows 10, version 1507 (End of Life as of May 2017) only supported TPM 2.0 for Credential Guard. Beginning with Windows 10, version 1511, TPM 1.2 and 2.0 are supported. | | Device Health Attestation| Yes | Yes | Yes | | -| Windows Hello/Windows Hello for Business| No | Yes | Yes | | +| Windows Hello/Windows Hello for Business| No | Yes | Yes | Azure AD join supports both versions of TPM, but requires TPM with keyed-hash message authentication code (HMAC) and Endorsement Key (EK) certificate for key attestation support. | | UEFI Secure Boot | No | Yes | Yes | | | TPM Platform Crypto Provider Key Storage Provider| Yes | Yes| Yes | | | Virtual Smart Card | Yes | Yes | Yes | |