Skip to content

Commit 835a6aa

Browse files
authored
Merge pull request #2334 from pelarsen/patch-14
Update compliance-use-custom-settings.md
2 parents 6dea6df + 0efad4b commit 835a6aa

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

memdocs/intune/protect/compliance-use-custom-settings.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ After you’ve deployed custom compliance settings and devices have reported bac
4848

4949
## Prerequisites
5050

51-
- **Azure Active Directory (Azure AD) joined** – Devices that are not Azure AD joined are evaluated as not applicable.
51+
- **Azure Active Directory (Azure AD) joined** devices, *including* hybrid Azure AD-joined devices.
52+
53+
Hybrid Azure AD-joined devices are devices that are joined to Azure AD and also joined to on-premises Active Directory. For more information, see [Plan your hybrid Azure AD join implementation](/azure/active-directory/devices/hybrid-azuread-join-plan).
54+
55+
Devices that are not Azure AD joined or hybrid Azure AD-joined are evaluated as not applicable.
5256

5357
- **PowerShell discovery script** - This is a script that you create that runs on a device to discover the custom settings defined in your JSON file and returns the configuration value of those settings to Intune. You’ll upload your script to the Microsoft Endpoint Manager admin center before you create a compliance policy and then select the script you want to use when creating a policy.
5458

@@ -133,4 +137,4 @@ Policies support the use of a single PowerShell script. However, each script sup
133137

134138
- [Create a JSON for custom compliance](../protect/compliance-custom-json.md)
135139
- [Create a PowerShell script for discovery of custom compliance settings](../protect/compliance-custom-script.md)
136-
- [Create a compliance policy](../protect/create-compliance-policy.md)
140+
- [Create a compliance policy](../protect/create-compliance-policy.md)

0 commit comments

Comments
 (0)