deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-15 06:47:21 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into vs-9329193

Browse Source
This commit is contained in:
LizRoss 2016-11-29 10:00:07 -08:00
commit 12b5f95ac6
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
windows/keep-secure/implement-microsoft-passport-in-your-organization.md
View File

@ -275,7 +275,7 @@ The following table lists the MDM policy settings that you can configure for Win
<td>Device or user</td> <td>Device or user</td>
<td>1</td> <td>1</td>
<td> <td>
<p>1: Uppercase letters are not allowed </p> <p>1: Uppercase letters are not allowed. </p>
<p>2: At least one uppercase letter is required</p> <p>2: At least one uppercase letter is required</p>
</td> </td>
</tr> </tr>
@ -318,27 +318,27 @@ You’ll need this software to set Windows Hello for Business policies in your e
<tbody> <tbody>
<tr class="odd"> <tr class="odd">
<td align="left">Key-based authentication</td> <td align="left">Key-based authentication</td>
<td align="left">Azure AD subscription</td> <td align="left">[Azure AD subscription](https://docs.microsoft.com/azure/active-directory/active-directory-howto-tenant)</td>
<td align="left"><ul> <td align="left"><ul>
<li>Azure AD subscription</li> <li>[Azure AD subscription](https://docs.microsoft.com/azure/active-directory/active-directory-howto-tenant)</li>
<li>[Azure AD Connect](https://go.microsoft.com/fwlink/p/?LinkId=616792)</li> <li>[Azure AD Connect](https://docs.microsoft.com/azure/active-directory/active-directory-aadconnect)</li>
<li>A few Windows Server 2016 domain controllers on-site</li> <li>A few Windows Server 2016 domain controllers on-site</li>
<li>A management solution, such as Configuration Manager, Group Policy, or MDM</li> <li>A management solution, such as [Configuration Manager](https://docs.microsoft.com/sccm/index), Group Policy, or MDM</li>
<li>Active Directory Certificate Services (AD CS) without Network Device Enrollment Service (NDES)</li> <li>[Active Directory Certificate Services](https://technet.microsoft.com/windowsserver/dd448615.aspx) (AD CS) without Network Device Enrollment Service (NDES)</li>
</ul></td> </ul></td>
</tr> </tr>
<tr class="even"> <tr class="even">
<td align="left">Certificate-based authentication</td> <td align="left">Certificate-based authentication</td>
<td align="left"><ul> <td align="left"><ul>
<li>Azure AD subscription</li> <li>[Azure AD subscription](https://docs.microsoft.com/azure/active-directory/active-directory-howto-tenant)</li>
<li>Intune or non-Microsoft mobile device management (MDM) solution</li> <li>Intune or non-Microsoft mobile device management (MDM) solution</li>
<li>PKI infrastructure</li> <li>[PKI infrastructure](https://msdn.microsoft.com/library/windows/desktop/bb427432(v=vs.85).aspx)</li>
</ul></td> </ul></td>
<td align="left"><ul> <td align="left"><ul>
<li>Azure AD subscription</li> <li>[Azure AD subscription](https://docs.microsoft.com/azure/active-directory/active-directory-howto-tenant)</li>
<li>[Azure AD Connect](https://go.microsoft.com/fwlink/p/?LinkId=616792)</li> <li>[Azure AD Connect](https://docs.microsoft.com/azure/active-directory/active-directory-aadconnect)</li>
<li>AD CS with NDES</li> <li>[AD CS](https://technet.microsoft.com/windowsserver/dd448615.aspx) with NDES</li>
<li>Configuration Manager for domain-joined certificate enrollment, or InTune for non-domain-joined devices, or a non-Microsoft MDM service that supports Passport for Work</li> <li>[Configuration Manager](https://docs.microsoft.com/sccm/index) for domain-joined certificate enrollment, or [InTune](https://docs.microsoft.com/intune/deploy-use/control-microsoft-passport-settings-on-devices-with-microsoft-intune) for non-domain-joined devices, or a non-Microsoft MDM service that supports Hello for Business</li>
</ul></td> </ul></td>
</tr> </tr>
</tbody> </tbody>
@ -346,7 +346,9 @@ You’ll need this software to set Windows Hello for Business policies in your e
   
Configuration Manager and MDM provide the ability to manage Windows Hello for Business policy and to deploy and manage certificates protected by Windows Hello for Business. Configuration Manager and MDM provide the ability to manage Windows Hello for Business policy and to deploy and manage certificates protected by Windows Hello for Business.
Azure AD provides the ability to register devices with your enterprise and to provision Windows Hello for Business for organization accounts. [Azure AD](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-passport) provides the ability to register devices with your enterprise and to provision Windows Hello for Business for organization accounts.
[Learn more about enabling Windows Hello for Business in an Azure AD/AD hybrid environment.](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-passport-deployment)
## Windows Hello for BYOD ## Windows Hello for BYOD

11
windows/whats-new/whats-new-windows-10-version-1507-and-1511.md
View File

@ -231,11 +231,12 @@ In Windows 10, User Account Control has added some improvements.
### VPN profile options ### VPN profile options
Windows 10 provides a set of VPN features that both increase enterprise security and provide an improved user experience, including: Windows 10 provides a set of VPN features that both increase enterprise security and provide an improved user experience, including:
• Always-on auto connection behavior
• App=triggered VPN - Always-on auto connection behavior
• VPN traffic filters - App=triggered VPN
• Lock down VPN - VPN traffic filters
• Integration with Microsoft Passport for Work - Lock down VPN
- Integration with Microsoft Passport for Work
[Learn more about the VPN options in Windows 10.](../keep-secure/vpn-profile-options.md) [Learn more about the VPN options in Windows 10.](../keep-secure/vpn-profile-options.md)