From 39f30c5ce26a48b02118296ce1b22394035c70bc Mon Sep 17 00:00:00 2001 From: Ross McAllister Date: Thu, 2 Jan 2020 16:17:35 -0800 Subject: [PATCH] Update whats-new-windows-10-version-1507-and-1511.md --- .../whats-new-windows-10-version-1507-and-1511.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md b/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md index 25b0e6cf11..a4b74c55cf 100644 --- a/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md +++ b/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md @@ -218,10 +218,6 @@ Some things that you can check on the device are: - Is BitLocker Drive Encryption supported and enabled? - Is SecureBoot supported and enabled? - -
- - >[!NOTE] >The device must be running Windows 10 and it must support at least TPM 2.0. @@ -286,7 +282,9 @@ Enterprises have the following identity and management choices. | Grouping | Domain join; Workgroup; Azure AD join | | Device management | Group Policy; System Center Configuration Manager; Microsoft Intune; other MDM solutions; Exchange ActiveSync; Windows PowerShell; Windows Management Instrumentation (WMI) | - + +
+ >[!NOTE]   >With the release of Windows Server 2012 R2, Network Access Protection (NAP) was deprecated and the NAP client has now been removed in Windows 10. For more information about support lifecycles, see [Microsoft Support Lifecycle](https://go.microsoft.com/fwlink/p/?LinkID=613512).