Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1

This commit is contained in:
jdeckerMS
2016-07-18 07:51:20 -07:00
3 changed files with 7 additions and 7 deletions

View File

@ -10,7 +10,7 @@ ms.pagetype: security
author: jdeckerMS author: jdeckerMS
--- ---
# Prepare people to use Microsoft Passport # Prepare people to use Windows Hello
**Applies to** **Applies to**
- Windows 10 - Windows 10

View File

@ -5,7 +5,7 @@ ms.assetid: 05e6e0ab-94ed-4c0c-a195-0abd006f0a86
keywords: best practices, USB, device, boot keywords: best practices, USB, device, boot
ms.prod: w10 ms.prod: w10
ms.mktglfcycl: plan ms.mktglfcycl: plan
pagetype: mobility ms.pagetype: mobility
ms.sitesec: library ms.sitesec: library
author: mtniehaus author: mtniehaus
--- ---

View File

@ -52,12 +52,12 @@ Authentication Options
- One time password (OTP) settings exposed through the UI - One time password (OTP) settings exposed through the UI
Remote Access Integration Remote Access Integration
- Device compliance options - Device compliance options
- Enterprise Data Protection (EDP) Integration - Enterprise Data Protection (EDP) integration
Updated Client and Configuration Options Updated Client and Configuration Options
- Universal Windows Platform (UWP) VPN Plugins - Universal Windows Platform (UWP) VPN plugins
- New VPNv2 CSP Configuration Settings - New VPNv2 CSP configuration settings -- See [What's new in MDM enrollment and management](https://msdn.microsoft.com/en-us/library/windows/hardware/mt299056%28v=vs.85%29.aspx#whatsnew_1607)
- Microsoft Intune VPN Policy Updates - Microsoft Intune VPN policy updates
- VPNv2 CSP Configuration using the SCCM/WMI Bridge - VPNv2 CSP configuration using the SCCM/WMI bridge
   
## Management ## Management