Skip to content

Commit 33a70dc

Browse files
authored
Merge pull request #25973 from microsoftgraph/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/microsoftgraph/microsoft-graph-docs-contrib (branch main)
2 parents b6d82b7 + 298cac0 commit 33a70dc

20 files changed

+36
-26
lines changed

api-reference/beta/api/authorizationpolicy-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ The following example shows the response.
335335
HTTP/1.1 204 No Content
336336
```
337337

338-
### Example 5: Enable default user role to use Self-Serve Password Reset feature
338+
### Example 5: Enable administrators to use the self-serve password reset feature
339339

340340
#### Request
341341

api-reference/beta/api/profilephoto-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The following tables show the least privileged permission or permissions require
4343
|Application | ProfilePhoto.ReadWrite.All | Group.ReadWrite.All |
4444

4545
> [!NOTE]
46-
> - Global and user admins can delete the photo of any user in the organization using delegated permissions. This operation also supports application permissions. Deleting the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permissions. Deleting the photo of the signed-in user only requires *User.ReadWrite* permissions.
46+
> - Global admins, User admins, and People admins can delete the photo of any user in the organization using delegated permissions. This operation also supports application permissions. Deleting the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permissions. Deleting the photo of the signed-in user only requires *User.ReadWrite* permissions.
4747
4848
## HTTP request
4949

api-reference/beta/api/profilephoto-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ You can use either PATCH or PUT for this operation.
6161
> [!NOTE]
6262
>
6363
> - Permissions marked with * are supported only for backward compatibility. Please update your solutions to use an alternative permission and avoid using these permissions going forward.
64-
> - Users with admin roles such as User admins can update the photo of any user in the organization by using delegated permissions. This operation is also supported with application permissions. Updating the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permission. Updating the photo of the signed-in user only requires *User.ReadWrite* permission.
64+
> - Users with admin roles such as User admins, Global admins, or People admins can update the photo of any user in the organization by using delegated permissions. This operation is also supported with application permissions. Updating the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permission. Updating the photo of the signed-in user only requires *User.ReadWrite* permission.
6565
> - Updating a user's photo using the Microsoft Graph API is currently not supported in Azure AD B2C tenants.
6666
6767
## HTTP request

api-reference/beta/resources/device.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ This resource supports:
9797
|registrationDateTime|DateTimeOffset|Date and time of when the device was registered. The timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Read-only.|
9898
|status | String| Device is `online` or `offline`. Only returned if user signs in with a Microsoft account as part of Project Rome. |
9999
|systemLabels|String collection| List of labels applied to the device by the system. Supports `$filter` (`/$count eq 0`, `/$count ne 0`). |
100-
|trustType|String| Type of trust for the joined device. Read-only. Possible values: `Workplace` (indicates *bring your own personal devices*), `AzureAd` (Cloud only joined devices), `ServerAd` (on-premises domain joined devices joined to Microsoft Entra ID). For more information, see [Introduction to device management in Microsoft Entra ID](/azure/active-directory/device-management-introduction). |
100+
|trustType|String| Type of trust for the joined device. Read-only. Possible values: `Workplace` (indicates *bring your own personal devices*), `AzureAd` (Cloud only joined devices), `ServerAd` (on-premises domain joined devices joined to Microsoft Entra ID). For more information, see [Introduction to device management in Microsoft Entra ID](/azure/active-directory/device-management-introduction). Supports `$filter` (`eq`, `ne`, `not`, `in`).|
101101

102102
## Relationships
103103
| Relationship | Type |Description|

api-reference/v1.0/api/authorizationpolicy-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ The following example shows the response.
264264
HTTP/1.1 204 No Content
265265
```
266266

267-
### Example 4: Enable default user role to use Self-Serve Password Reset feature
267+
### Example 4: Enable administrators to use the self-serve password reset feature
268268

269269
#### Request
270270

api-reference/v1.0/api/event-delta.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ If successful, this method returns a `200 OK` response code and [event](../resou
7070

7171
Within a round of **delta** function calls bound by the date range of a **calendarView**, you may find a **delta** call returning two types of events under `@removed` with the reason `deleted`:
7272
- Events that are within the date range and that have been deleted since the previous **delta** call.
73-
- Events that are _outside_ the date range and that have been added, deleted, or updated since the the previous **delta** call.
73+
- Events that are _outside_ the date range and that have been added, deleted, or updated since the previous **delta** call.
7474

7575
Filter the events under `@removed` for the date range that your scenario requires.
7676

api-reference/v1.0/api/profilephoto-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following tables show the least privileged permission or permissions require
4444
|Application | ProfilePhoto.ReadWrite.All | Group.ReadWrite.All |
4545

4646
> [!NOTE]
47-
> - Global and user admins can delete the photo of any user in the organization using delegated permissions. This operation also supports application permissions. Deleting the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permissions. Deleting the photo of the signed-in user only requires *User.ReadWrite* permissions.
47+
> - Global admins, User admins, and People admins can delete the photo of any user in the organization using delegated permissions. This operation also supports application permissions. Deleting the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permissions. Deleting the photo of the signed-in user only requires *User.ReadWrite* permissions.
4848
4949
## HTTP request
5050

api-reference/v1.0/api/profilephoto-get.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ The following tables show the least privileged permission or permissions require
6666
> [!NOTE]
6767
>
6868
> - Retrieving a user's photo using the Microsoft Graph API is currently not supported in Azure AD B2C tenants.
69+
> - Guest users can view profile photos of users, even when the **Guest user access** settings are configured to the **most restrictive** option in Azure Active Directory External Identities settings.
6970
7071
## HTTP request
7172

api-reference/v1.0/api/profilephoto-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following tables show the least privileged permission or permissions require
6060

6161
> [!NOTE]
6262
>
63-
> - Users with admin roles such as User admins can update the photo of any user in the organization by using delegated permissions. This operation is also supported with application permissions. Updating the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permission. Updating the photo of the signed-in user only requires *User.ReadWrite* permission.
63+
> - Users with admin roles such as User admins, Global admins, or People admins can update the photo of any user in the organization by using delegated permissions. This operation is also supported with application permissions. Updating the photo of any user in the organization requires *ProfilePhoto.ReadWrite.All* or *User.ReadWrite.All* permission. Updating the photo of the signed-in user only requires *User.ReadWrite* permission.
6464
> - Updating a user's photo using the Microsoft Graph API is currently not supported in Azure AD B2C tenants.
6565
6666
## HTTP request

api-reference/v1.0/api/unifiedrolemanagementpolicyassignment-get.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ If successful, this method returns a `200 OK` response code and an [unifiedRoleM
6666

6767
## Examples
6868

69-
<a name='example-1-rretrieve-the-details-of-a-policy-assignment-for-pim-for-azure-ad-roles'></a>
69+
<a name='example-1-retrieve-the-details-of-a-policy-assignment-for-pim-for-azure-ad-roles'></a>
7070

71-
### Example 1: RRetrieve the details of a policy assignment for PIM for Microsoft Entra roles
71+
### Example 1: Retrieve the details of a policy assignment for PIM for Microsoft Entra roles
7272

7373
#### Request
7474

0 commit comments

Comments
 (0)