Skip to content

Commit 3827f6b

Browse files
authored
Merge pull request #25702 from RavennMSFT/patch-28
Update hybrid-azuread-join-plan.md
2 parents 98bd0f7 + 120729c commit 3827f6b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ If your Windows 10 domain joined devices are already [Azure AD registered](https
112112
- Any existing Azure AD registered state would be automatically removed after the device is Hybrid Azure AD joined.
113113
- You can prevent your domain joined device from being Azure AD registered by adding this registry key - HKLM\SOFTWARE\Policies\Microsoft\Windows\WorkplaceJoin, "BlockAADWorkplaceJoin"=dword:00000001
114114

115-
FIPS-compliant TPMs aren't supported for Hybrid Azure AD join. If your devices have FIPS-compliant TPMs, you must disable them before proceeding with Hybrid Azure AD join.
115+
FIPS-compliant TPMs aren't supported for Hybrid Azure AD join. If your devices have FIPS-compliant TPMs, you must disable them before proceeding with Hybrid Azure AD join. Microsoft does not provide any tools for disabling FIPS mode for TPMs as it is dependent on the TPM manufacturer. Please contact your hardware OEM for support.
116116

117117
## Review how to control the hybrid Azure AD join of your devices
118118

0 commit comments

Comments
 (0)