Skip to content

Commit cec901c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram-0303
2 parents 56c7633 + f3e1b64 commit cec901c

31 files changed

+299
-632
lines changed

articles/active-directory/conditional-access/app-based-conditional-access.md

Lines changed: 110 additions & 249 deletions
Large diffs are not rendered by default.

articles/active-directory/conditional-access/app-protection-based-conditional-access.md

Lines changed: 95 additions & 324 deletions
Large diffs are not rendered by default.

articles/active-directory/conditional-access/concept-conditional-access-grant.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 02/26/2020
9+
ms.date: 03/04/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -101,6 +101,8 @@ This setting applies to the following client apps:
101101
- Only supports the iOS and Android for device platform condition.
102102
- Conditional Access cannot consider Microsoft Edge in InPrivate mode an approved client app.
103103

104+
See the article, [How to: Require approved client apps for cloud app access with Conditional Access](app-based-conditional-access.md) for configuration examples.
105+
104106
### Require app protection policy
105107

106108
In your Conditional Access policy, you can require an [Intune app protection policy](/intune/app-protection-policy) be present on the client app before access is available to the selected cloud apps.
@@ -118,6 +120,8 @@ This setting applies to the following client apps:
118120
- The **Require app protection policy** requirements:
119121
- Only supports the iOS and Android for device platform condition.
120122

123+
See the article, [How to: Require app protection policy and an approved client app for cloud app access with Conditional Access](app-protection-based-conditional-access.md) for configuration examples.
124+
121125
### Terms of use
122126

123127
If your organization has created terms of use, additional options may be visible under grant controls. These options allow administrators to require acknowledgment of terms of use as a condition of accessing the resources protected by the policy. More information about terms of use can be found in the article, [Azure Active Directory terms of use](terms-of-use.md).
95.2 KB
Loading
73.4 KB
Loading

0 commit comments

Comments
 (0)