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

This commit is contained in:
LizRoss 2016-11-01 10:54:07 -07:00
commit bd4a869e6f

View File

@ -72,8 +72,7 @@ Before you install the MBAM Client software on end users' computers, ensure that
 
**Important**  
If BitLocker was used without MBAM, you must decrypt the drive and then clear TPM using tpm.msc. MBAM cannot take ownership of TPM if the client PC is already encrypted and the TPM owner password created.
If BitLocker was used without MBAM, MBAM can be installed and utilize the existing TPM information.
 
## Got a suggestion for MBAM?