Skip to content

Commit c74072b

Browse files
LauragraLauragra
authored
Merge pull request #25322 from microsoftgraph/main
Merge to publish.
2 parents 2e0eddd + 533263f commit c74072b

19 files changed

+122
-40
lines changed

‎api-reference/beta/api/educationalactivity-delete.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,35 @@ Delete an [educationalActivity](../resources/educationalactivity.md) object from
2121

2222
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
2323

24-
<!-- { "blockType": "permissions", "name": "educationalactivity_delete" } -->
25-
[!INCLUDE [permissions-table](../includes/permissions/educationalactivity-delete-permissions.md)]
24+
Permissions for the following HTTP syntax:
25+
26+
<!-- { "blockType": "ignored" } -->
27+
28+
```http
29+
DELETE /me/profile/educationalActivities/{id}
30+
```
31+
32+
<!-- { "blockType": "permissions", "name": "educationalactivity_delete", "requestUrls": "DELETE /me/profile/educationalActivities/{id} "} -->
33+
|Permission type|Least privileged permissions|Higher privileged permissions|
34+
|:---|:---|:---|
35+
|Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
36+
|Delegated (personal Microsoft account)|User.ReadWrite|Not available.|
37+
|Application|Not supported.|Not supported.|
38+
39+
Permissions for the following HTTP syntax:
40+
41+
<!-- { "blockType": "ignored" } -->
42+
43+
```http
44+
DELETE /users/{id | userPrincipalName}/profile/educationalActivities/{id}
45+
```
46+
47+
<!-- { "blockType": "permissions", "name": "educationalactivity_delete", "requestUrls": "DELETE /users/{id | userPrincipalName}/profile/educationalActivities/{id}"} -->
48+
|Permission type|Least privileged permissions|Higher privileged permissions|
49+
|:---|:---|:---|
50+
|Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
51+
|Delegated (personal Microsoft account)|User.ReadWrite|Not available.|
52+
|Application|User.ReadWrite.All|Not available.|
2653

2754
## HTTP request
2855

‎api-reference/beta/api/educationalactivity-get.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,35 @@ Retrieve the properties and relationships of an [educationalActivity](../resourc
2121

2222
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
2323

24-
<!-- { "blockType": "permissions", "name": "educationalactivity_get" } -->
25-
[!INCLUDE [permissions-table](../includes/permissions/educationalactivity-get-permissions.md)]
24+
Permissions for the following HTTP syntax:
25+
26+
<!-- { "blockType": "ignored" } -->
27+
28+
```http
29+
GET /me/profile/educationalActivities/{id}
30+
```
31+
32+
<!-- { "blockType": "permissions", "name": "educationalactivity_get", "requestUrls": "GET /me/profile/educationalActivities/{id}"} -->
33+
|Permission type|Least privileged permissions|Higher privileged permissions|
34+
|:---|:---|:---|
35+
|Delegated (work or school account)|User.Read|User.ReadWrite, User.Read.All, User.ReadBasic.All, User.ReadWrite.All|
36+
|Delegated (personal Microsoft account)|User.Read|User.ReadWrite|
37+
|Application|Not supported.|Not supported.|
38+
39+
Permissions for the following HTTP syntax:
40+
41+
<!-- { "blockType": "ignored" } -->
42+
43+
```http
44+
GET /users/{id | userPrincipalName}/profile/educationalActivities/{id}
45+
```
46+
47+
<!-- { "blockType": "permissions", "name": "educationalactivity_get", "requestUrls": "GET /users/{id | userPrincipalName}/profile/educationalActivities/{id}"} -->
48+
|Permission type|Least privileged permissions|Higher privileged permissions|
49+
|:---|:---|:---|
50+
|Delegated (work or school account)|User.Read|User.ReadWrite, User.Read.All, User.ReadBasic.All, User.ReadWrite.All|
51+
|Delegated (personal Microsoft account)|User.Read|User.ReadWrite|
52+
|Application|User.Read.All|User.ReadWrite.All|
2653

2754
## HTTP request
2855

‎api-reference/beta/api/educationalactivity-update.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,35 @@ Update the properties of an [educationalActivity](../resources/educationalactivi
2121

2222
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
2323

24-
<!-- { "blockType": "permissions", "name": "educationalactivity_update" } -->
25-
[!INCLUDE [permissions-table](../includes/permissions/educationalactivity-update-permissions.md)]
24+
Permissions for the following HTTP syntax:
25+
26+
<!-- { "blockType": "ignored" } -->
27+
28+
```http
29+
PATCH /me/profile/educationalActivities/{id}
30+
```
31+
32+
<!-- { "blockType": "permissions", "name": "educationalactivity_update", "requestUrls": "PATCH /me/profile/educationalActivities/{id}"} -->
33+
|Permission type|Least privileged permissions|Higher privileged permissions|
34+
|:---|:---|:---|
35+
|Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
36+
|Delegated (personal Microsoft account)|User.ReadWrite|Not avaialable.|
37+
|Application|Not supported.|Not supported.|
38+
39+
Permissions for the following HTTP syntax:
40+
41+
<!-- { "blockType": "ignored" } -->
42+
43+
```http
44+
PATCH /users/{id | userPrincipalName}/profile/educationalActivities/{id}
45+
```
46+
47+
<!-- { "blockType": "permissions", "name": "educationalactivity_update", "requestUrls": "PATCH /users/{id | userPrincipalName}/profile/educationalActivities/{id}"} -->
48+
|Permission type|Least privileged permissions|Higher privileged permissions|
49+
|:---|:---|:---|
50+
|Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
51+
|Delegated (personal Microsoft account)|User.ReadWrite|Not avaialable.|
52+
|Application|User.ReadWrite.All|Not available.|
2653

2754
## HTTP request
2855

‎api-reference/beta/api/onpremisesdirectorysynchronization-get.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "Get onPremisesDirectorySynchronization"
33
description: "Read the properties and relationships of an onPremisesDirectorySynchronization object."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: apiPageType

‎api-reference/beta/api/onpremisesdirectorysynchronization-update.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "Update onPremisesDirectorySynchronization"
33
description: "Update the properties of an onPremisesDirectorySynchronization object."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: apiPageType

‎api-reference/beta/resources/onpremisesaccidentaldeletionprevention.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "onPremisesAccidentalDeletionPrevention resource type"
33
description: "Contains the accidental deletion prevention configuration for a tenant."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: resourcePageType

‎api-reference/beta/resources/onpremisescurrentexportdata.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "onPremisesCurrentExportData resource type"
33
description: "Data for the current export run."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: resourcePageType

‎api-reference/beta/resources/onpremisesdirectorysynchronization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "onPremisesDirectorySynchronization resource type"
33
description: "A container for on-premises directory synchronization functionalities that are available for the organization."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: resourcePageType

‎api-reference/beta/resources/onpremisesdirectorysynchronizationconfiguration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "onPremisesDirectorySynchronizationConfiguration resource type"
33
description: "Consists of configurations that can be fine-tuned and impact the on-premises directory synchronization process for a tenant."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: resourcePageType

‎api-reference/beta/resources/onpremisesdirectorysynchronizationfeature.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "onPremisesDirectorySynchronizationFeature resource type"
33
description: "Consists of directory synchronization features that can be enabled or disabled."
4-
author: "dkershaw10"
5-
ms.reviewer: adam.lassman, daradwan
4+
author: dhanyahk
5+
ms.reviewer: sgupta, abhishek.badjatya, dhanyahk
66
ms.localizationpriority: medium
77
ms.subservice: "entra-directory-management"
88
doc_type: resourcePageType
@@ -31,7 +31,7 @@ Consists of [directory synchronization](../resources/onpremisesdirectorysynchron
3131
| fopeConflictResolutionEnabled | Boolean | Used to indicate that for a Microsoft Forefront Online Protection for Exchange (FOPE) migrated tenant, the conflicting proxy address should be migrated over. |
3232
| groupWriteBackEnabled | Boolean | Used to enable object-level group writeback feature for additional group types. |
3333
| passwordSyncEnabled | Boolean | Used to indicate on-premise password synchronization is enabled. |
34-
| passwordWritebackEnabled | Boolean | Used to indicate that writeback of password resets from Microsoft Entra ID to on-premises AD is enabled. |
34+
| passwordWritebackEnabled | Boolean | Used to indicate that writeback of password resets from Microsoft Entra ID to on-premises AD is enabled. **This property isn't in use and updating it isn't supported.** |
3535
| quarantineUponProxyAddressesConflictEnabled | Boolean | Used to indicate that we should quarantine objects with conflicting proxy address. |
3636
| quarantineUponUpnConflictEnabled | Boolean | Used to indicate that we should quarantine objects conflicting with duplicate userPrincipalName. |
3737
| softMatchOnUpnEnabled | Boolean | Used to indicate that we should soft match objects based on userPrincipalName. |

0 commit comments

Comments
 (0)