Skip to content

Commit 921d81c

Browse files
authored
Merge branch 'main' into ningjingbogithub-patch-2
2 parents f78261f + 23cfd00 commit 921d81c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

api-reference/beta/resources/devicetemplate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Inherits from [directoryObject](../resources/directoryobject.md).
4646
|Relationship|Type|Description|
4747
|:---|:---|:---|
4848
|deviceInstances|[device](../resources/device.md) collection|Collection of **device** objects created based on this template.|
49-
|owners|[directoryObject](../resources/directoryobject.md) collection|Collection of directory objects that can manage the device template and the related **deviceInstances**. Owners can be represented as [service principals](..\resources\serviceprincipal.md), [users](..\resources\users.md), or [applications](..\resources\application.md). An owner has full privileges over the device template and doesn't require other administrator roles to create, update, or delete devices from this template, as well as to add or remove template owners. |
49+
|owners|[directoryObject](../resources/directoryobject.md) collection|Collection of directory objects that can manage the device template and the related **deviceInstances**. Owners can be represented as [service principals](..\resources\serviceprincipal.md), [users](..\resources\users.md), or [applications](..\resources\application.md). An owner has full privileges over the device template and doesn't require other administrator roles to create, update, or delete devices from this template, as well as to add or remove template owners. <br/><br/> Supports `$expand`. |
5050

5151
## JSON representation
5252
The following JSON representation shows the resource type.

api-reference/beta/resources/identity-network-access-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ A core functionality of identity and access management is managing your tenant c
5050
| Retrieve BitLocker recovery keys | [bitlockerRecoveryKey resource type](bitlockerrecoverykey.md) and its associated APIs |
5151
| Manage custom security attributes | See [Overview of custom security attributes using the Microsoft Graph API](custom-security-attributes-overview.md) |
5252
| Manage deleted directory objects. The functionality to store deleted objects in a "recycle bin" is supported for the following objects: <li> Administrative units <li> Applications <li> Public key infrastructure<li> External user profiles <li> Groups <li> Pending external user profiles <li> Service principals <li> Users | <li> [Get](../api/directory-deleteditems-get.md) or [List](../api/directory-deleteditems-list.md) deleted objects <li> [Permanently delete](../api/directory-deleteditems-delete.md) a deleted object <li> [Restore a deleted item](../api/directory-deleteditems-restore.md) <li> [List deleted items owned by user](../api/directory-deleteditems-getuserownedobjects.md) |
53-
| Manage devices in the cloud | [device resource type](device.md) and its associated APIs |
53+
| Manage devices in the cloud |<li> [device resource type](device.md) and its associated APIs <li> [deviceTemplate resource type](devicetemplate.md) and its associated APIs|
5454
| View local administrator credential information for all device objects in Microsoft Entra ID that are enabled with Local Admin Password Solution (LAPS). This feature is the cloud-based LAPS solution | [deviceLocalCredentialInfo resource type](devicelocalcredentialinfo.md) and its associated APIs |
5555
| Directory objects are the core objects in Microsoft Entra ID, such as users, groups, and applications. You can use the directoryObject resource type and its associated APIs to check memberships of directory objects, track changes for multiple directory objects, or validate that a Microsoft 365 group's display name or mail nickname complies with naming policies | [directoryObject resource type](directoryobject.md) and its associated APIs |
5656
| Administrator roles, including Microsoft Entra administrator roles, are one of the most sensitive resources in a tenant. You can manage the lifecycle of their assignment in the tenant, including creating custom roles, assigning roles, tracking changes to role assignments, and removing assignees from roles | [directoryRole resource type](directoryrole.md) and [directoryRoleTemplate resource type](directoryroletemplate.md) and their associated APIs <br/><br/> [roleManagement resource type](rolemanagement.md) and its associated APIs (**recommended**)<br/><br/> These APIs allow you to make direct role assignments. Alternatively, you can use Privileged Identity Management APIs for [Microsoft Entra roles](privilegedidentitymanagementv3-overview.md) and [groups](privilegedidentitymanagement-for-groups-api-overview.md) to make just-in-time and time-bound role assignments, instead of direct forever active assignments. |

0 commit comments

Comments
 (0)