Skip to content

Commit f681aa9

Browse files
authored
Merge branch 'main' into uuf-cr
2 parents 494f3e5 + 9fd8511 commit f681aa9

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

api-reference/beta/resources/conditionalaccessdevices.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
title: "conditionalAccessDevices resource type"
3-
description: "Represents devices in the policy scope."
3+
description: "Represents devices in the scope of a conditionalAccessTemplate object."
44
ms.localizationpriority: medium
55
author: "SanDeo-MSFT"
66
ms.subservice: "entra-sign-in"
77
doc_type: resourcePageType
8+
ms.date: 11/29/2024
89
---
910

1011
# conditionalAccessDevices resource type
@@ -13,7 +14,7 @@ Namespace: microsoft.graph
1314

1415
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1516

16-
Represents devices in the policy scope.
17+
Represents devices in the scope of a [conditionalAccessTemplate](../resources/conditionalaccesstemplate.md) object. This resource is configured in the **conditionalAccessTemplate** resource > **details** property > **conditions** property > **devices** property.
1718

1819
## Properties
1920

api-reference/beta/resources/conditionalaccesstemplate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ms.reviewer: conditionalaccesspm
66
ms.localizationpriority: medium
77
ms.subservice: "entra-sign-in"
88
doc_type: resourcePageType
9+
ms.date: 11/29/2024
910
---
1011

1112
# conditionalAccessTemplate resource type
@@ -14,7 +15,7 @@ Namespace: microsoft.graph
1415

1516
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1617

17-
Represents a Microsoft recommended template of best practice configurations for Microsoft Entra [conditional access policies](../resources/conditionalaccesspolicy.md).
18+
Represents a Microsoft recommended template of best practice configurations for Microsoft Entra [conditional access policies](../resources/conditionalaccesspolicy.md). For more information, see [Conditional Access policy templates](/entra/identity/conditional-access/concept-conditional-access-policy-common).
1819

1920
Inherits from [entity](../resources/entity.md).
2021

api-reference/v1.0/resources/conditionalaccessdevices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "conditionalAccessDevices resource type"
3-
description: "Represents devices in the policy scope."
3+
description: "Represents devices in the scope of a conditionalAccessTemplate object."
44
ms.localizationpriority: medium
55
author: "SanDeo-MSFT"
66
ms.subservice: "entra-sign-in"
@@ -12,7 +12,7 @@ ms.date: 07/22/2024
1212

1313
Namespace: microsoft.graph
1414

15-
Represents devices in the policy scope.
15+
Represents devices in the scope of a [conditionalAccessTemplate](../resources/conditionalaccesstemplate.md) object. This resource is configured in the **conditionalAccessTemplate** resource > **details** property > **conditions** property > **devices** property.
1616

1717
## Properties
1818

api-reference/v1.0/resources/conditionalaccesstemplate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 07/22/2024
1313

1414
Namespace: microsoft.graph
1515

16-
Represents a Microsoft recommended template of best practice configurations for Microsoft Entra [conditional access policies](../resources/conditionalaccesspolicy.md).
16+
Represents a Microsoft recommended template of best practice configurations for Microsoft Entra [conditional access policies](../resources/conditionalaccesspolicy.md). For more information, see [Conditional Access policy templates](/entra/identity/conditional-access/concept-conditional-access-policy-common).
1717

1818
Inherits from [entity](../resources/entity.md).
1919

concepts/auth-v2-service.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,4 +265,5 @@ Access the [Microsoft identity platform code samples](/entra/identity-platform/s
265265

266266
## Related content
267267

268-
Explore [Microsoft Graph tutorials](/graph/tutorials) to create basic applications that access data in app-only scenarios.
268+
- Explore [Microsoft Graph tutorials](/graph/tutorials) to create basic applications that authenticate using certificate-based credentials to access data in app-only scenarios.
269+
- [Add a certificate to an app using Microsoft Graph](/graph/applications-how-to-add-certificate) shows a step-by-step process to add a certificate to an app for certificate-based authentication and app-only access to data.

concepts/filter-query-parameter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@ The following article demonstrates the syntax for using the `$filter` OData quer
240240

241241
| Operator | Syntax |
242242
|-------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
243-
| `eq` | `~/users?$filter=userType eq 'Member'` |
243+
| `eq` | `~/users?$filter=userType eq 'Member'` <br><br> `~/groups?$filter=isAssignableToRole eq true` |
244244
| `not` | `~/users?$filter=not(userType eq 'Member')`<sup> [ ** ](#**) </sup> |
245-
| `ne` | `~/users?$filter=companyName ne null`<sup> [ ** ](#**) </sup> |
245+
| `ne` | `~/users?$filter=companyName ne null`<sup> [ ** ](#**) </sup> <br><br> `~/groups?$filter=isAssignableToRole ne true`<sup> [ ** ](#**) </sup> |
246246
| `startswith` | `~/users?$filter=startswith(userPrincipalName, 'admin')` |
247247
| `endswith` | `~/users?$filter=endswith(mail,'@outlook.com')`<sup> [ ** ](#**) </sup> |
248248
| `in` | `~/users?$filter=mail in ('mail1@domain.com', 'mail2@domain.com')` <br/><br/> **Note:** For query strings using `in` operator, the request is limited to 15 expressions in the filter clause by default or a URL length of 2,048 characters when using [advanced query capabilities](./aad-advanced-queries.md). |

0 commit comments

Comments
 (0)