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

Revert "resolve conflict"

Browse Source 
This reverts commit b41ad23f8c.
This commit is contained in:
Mike Stephens
2017-09-08 13:43:25 -07:00
parent b41ad23f8c
commit bd84268cd6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
windows/access-protection/hello-for-business/hello-planning-guide.md
View File

@ -89,7 +89,7 @@ The goal of Windows Hello for Business is to move organizations away from passwo
Cloud only and hybrid deployments provide many choices for multifactor authentication. On-premises deployments must use a multifactor authentication that provides an AD FS multifactor adapter to be used in conjunction with the on-premises Windows Server 2016 AD FS server role. Organizations can use from the on-premises Azure Multifactor Authentication server, or choose from several third parties (Read [Microsoft and third-party additional authentication methods](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/configure-additional-authentication-methods-for-ad-fs#microsoft-and-third-party-additional-authentication-methods) for more information). Cloud only and hybrid deployments provide many choices for multifactor authentication. On-premises deployments must use a multifactor authentication that provides an AD FS multifactor adapter to be used in conjunction with the on-premises Windows Server 2016 AD FS server role. Organizations can use from the on-premises Azure Multifactor Authentication server, or choose from several third parties (Read [Microsoft and third-party additional authentication methods](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/configure-additional-authentication-methods-for-ad-fs#microsoft-and-third-party-additional-authentication-methods) for more information).
>[!NOTE] >[!NOTE]
> Azure Multi-Factor Authentication is available through: > Azure Multi-Factor Authentication is available through a:
>* Microsoft Enterprise Agreement >* Microsoft Enterprise Agreement
>* Open Volume License Program >* Open Volume License Program
>* Cloud Solution Providers program >* Cloud Solution Providers program