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

This commit is contained in:
jdeckerMS
2016-07-27 09:57:46 -07:00
23 changed files with 65 additions and 42 deletions

View File

@ -0,0 +1,4 @@
// Place your settings in this file to overwrite default and user settings.
{
"update.channel": "none",
}

View File

@ -47,6 +47,8 @@ Everyone can get the **Microsoft Authenticator** app from the Windows Store. If
[Tell people how to sign in using their phone.](prepare-people-to-use-microsoft-passport.md#bmk-remote)
## Related topics
[Manage identity verification using Windows Hello for Business](manage-identity-verification-using-microsoft-passport.md)

View File

@ -97,3 +97,5 @@ If your enterprise enables phone sign-in, users can pair a phone running Windows
[Event ID 300 - Windows Hello successfully created](passport-event-300.md)
[Windows Hello biometrics in the enterprise](windows-hello-in-enterprise.md)

View File

@ -60,7 +60,7 @@ A VPN profile configured with LockDown secures the device to only allow network
## Learn more
- [Learn how to configure VPN connections in Microsoft Intune](https://docs.microsoft.com/en-us/intune/deploy-use/vpn-connections-in-microsoft-intune)
- [Learn how to configure VPN connections in Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/vpn-connections-in-microsoft-intune)
- [VPNv2 configuration service provider (CSP) reference](http://go.microsoft.com/fwlink/p/?LinkId=617588)
- [How to Create VPN Profiles in Configuration Manager](http://go.microsoft.com/fwlink/p/?LinkId=618028)