Skip to content

Commit bb80337

Browse files
authored
Merge branch 'main' into lauragra-autopatch
2 parents 12677f4 + 4067c50 commit bb80337

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

api-reference/beta/api/devicetemplate-createdevicefromtemplate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following table lists the parameters that you can use when you call this act
5555
|:---|:---|:---|
5656
| accountEnabled | Boolean | `true` if the account is enabled; otherwise, `false`. The default value is `true`. A disabled device can't authenticate with Microsoft Entra ID. Optional.|
5757
| alternativeNames | String collection | A collection of ARM resource IDs associated with the device, if any. Optional. |
58-
| externalDeviceId | String | UUID of the device by IoT registry. Must be unique within a tenant. Required. |
58+
| externalDeviceId | String | ID of the device in IoT registry. Must be unique within a tenant. Required. |
5959
| externalSourceName | String | Identifies the source name of the device. Optional. |
6060
| keyCredential | [keyCredential](../resources/keycredential.md) | The key credential when you use self-signed certificates. Optional. |
6161
| operatingSystemVersion | String | The operating system version of the device specified. Optional. |

api-reference/beta/api/devicetemplate-post-owners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Namespace: microsoft.graph
1414

1515
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1616

17-
Add a new owner to a [deviceTemplate](../resources/devicetemplate.md) object. Owners are granted permissions to enable or disable devices and update properties, such as **alternativeNames**, for the devices created from the device template. As an owner, no other administrator roles are necessary to create, update, or delete devices from this template, as well as to add or remove template owners. Owners added via this API are returned in a [list device owners](../api/devicetemplate-list-owners.md) request.
17+
Add a new owner to a [deviceTemplate](../resources/devicetemplate.md) object. Owners are granted permissions to enable or disable devices and update properties, such as **alternativeNames**, for the devices created from the device template. As an owner, no other administrator roles are necessary to create, update, or delete devices from this template, as well as to add or remove template owners. Owners added via this API are returned in a [list device owners](../api/devicetemplate-list-owners.md) request. There can be a maximum of 100 owners on a device template.
1818

1919
## Permissions
2020

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,18 @@ This example assumes that the original object stored has the following value. No
155155
"certificateAuthorities": [
156156
{
157157
"isRootAuthority": true,
158-
"certificateRevocationListUrl": "http://acme.com/root.crl",
158+
"certificateRevocationListUrl": "http://LakeshoreRetail.com/root.crl",
159159
"deltaCertificateRevocationListUrl": null,
160160
"certificate": "joGrWL+Yqkik/CABWG0d1w....",
161-
"issuer": "acme Inc",
161+
"issuer": "Lakeshore Retail",
162162
"issuerSubjectkeyIdentifier": "SKI"
163163
},
164164
{
165165
"isRootAuthority": true,
166-
"certificateRevocationListUrl": "http://digicert.com/root.crl",
166+
"certificateRevocationListUrl": "http://LakeshoreRetail.com/root.crl",
167167
"deltaCertificateRevocationListUrl": null,
168168
"certificate": "koGrWL+Yqkik/CABWG0d1w....",
169-
"issuer": "Digicert Inc",
169+
"issuer": "Lakeshore Retail",
170170
"issuerSubjectkeyIdentifier": "SKI"
171171
}
172172
]
@@ -191,10 +191,10 @@ Content-Type: application/json
191191
"certificateAuthorities": [
192192
{
193193
"isRootAuthority": true,
194-
"certificateRevocationListUrl": "http://acme.com/root.crl",
194+
"certificateRevocationListUrl": "http://LakeshoreRetail.com/root.crl",
195195
"deltaCertificateRevocationListUrl": null,
196196
"certificate": "Binary",
197-
"issuer": "acme Inc",
197+
"issuer": "Lakeshore Retail",
198198
"issuerSubjectkeyIdentifier": "SKI"
199199
}
200200
]
@@ -253,10 +253,10 @@ Location: "https://graph.microsoft.com/beta/directory/certificateAuthorities/mut
253253
"certificateAuthorities": [
254254
{
255255
"isRootAuthority": true,
256-
"certificateRevocationListUrl": "http://acme.com/root.crl",
256+
"certificateRevocationListUrl": "http://LakeshoreRetail.com/root.crl",
257257
"deltaCertificateRevocationListUrl": null,
258258
"certificate": "Binary",
259-
"issuer": "acme Inc",
259+
"issuer": "Lakeshore Retail",
260260
"issuerSubjectkeyIdentifier": "SKI"
261261
}
262262
]

api-reference/beta/api/template-list-devicetemplates.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,17 @@ Content-Type: application/json
120120
"id": "16f1d02a-af59-4ca7-b2ea-494a262353b9",
121121
"mutualTlsOauthConfigurationId": "00001111-aaaa-2222-bbbb-3333cccc4444",
122122
"mutualTlsOauthConfigurationTenantId": "00001111-aaaa-2222-bbbb-3333cccc4445",
123-
"deviceAuthority": "IoT Device Authority",
124-
"manufacturer": "IoT Manufacturer",
123+
"deviceAuthority": "Lakeshore Retail",
124+
"manufacturer": "Tailwind Traders",
125125
"model": "IoT Device K1",
126126
"operatingSystem": "WindowsIoT"
127127
},
128128
{
129129
"id": "3a0698d9-fd85-4b9e-9655-e26d19013459",
130130
"mutualTlsOauthConfigurationId": "00001111-aaaa-2222-bbbb-3333cccc4433",
131131
"mutualTlsOauthConfigurationTenantId": "00001111-aaaa-2222-bbbb-3333cccc4435",
132-
"deviceAuthority": "IoT Test for owner",
133-
"manufacturer": "IoT manufacturer",
132+
"deviceAuthority": "Lakeshore Retail",
133+
"manufacturer": "Tailwind Traders",
134134
"model": "IoT Devices",
135135
"operatingSystem": null
136136
}

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. <br/><br/> Supports `$expand`. |
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. There can be a maximum of 100 owners on a device template. <br/><br/> Supports `$expand`. |
5050

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

concepts/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ items:
11061106
href: change-notifications-delivery-webhooks.md
11071107
- name: Notifications through Azure Event Hubs
11081108
href: change-notifications-delivery-event-hubs.md
1109-
- name: Notifications through Azure Event Grid (preview)
1109+
- name: Notifications through Azure Event Grid
11101110
href: /azure/event-grid/subscribe-to-graph-api-events?context=graph%2Fcontext
11111111
- name: Lifecycle notifications for subscriptions
11121112
href: change-notifications-lifecycle-events.md

0 commit comments

Comments
 (0)