Skip to content

Commit a71922d

Browse files
authored
Merge branch 'main' into yuyaolian/update-om-expiry
2 parents a2121b2 + 0c723d4 commit a71922d

File tree

3,266 files changed

+5619
-394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,266 files changed

+5619
-394
lines changed

api-reference/beta/api/cloudpcusersetting-get.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,14 @@ Content-Type: application/json
130130
"userRestoreEnabled": true
131131
},
132132
"crossRegionDisasterRecoverySetting": {
133-
"crossRegionDisasterRecoveryEnabled": true,
133+
"crossRegionDisasterRecoveryEnabled": false,
134134
"maintainCrossRegionRestorePointEnabled": true,
135135
"disasterRecoveryNetworkSetting": {
136136
"regionName": "westus",
137137
"regionGroup": "usEast"
138138
},
139-
"disasterRecoveryType": "premium"
139+
"disasterRecoveryType": "premium",
140+
"userInitiatedDisasterRecoveryAllowed": true
140141
},
141142
"lastModifiedDateTime": "2021-02-01T10:29:57Z",
142143
"createdDateTime": "2021-02-01T10:29:57Z"
@@ -220,13 +221,14 @@ Content-Type: application/json
220221
"userRestoreEnabled": true
221222
},
222223
"crossRegionDisasterRecoverySetting": {
223-
"crossRegionDisasterRecoveryEnabled": true,
224+
"crossRegionDisasterRecoveryEnabled": false,
224225
"maintainCrossRegionRestorePointEnabled": true,
225226
"disasterRecoveryNetworkSetting": {
226227
"regionName": "westus",
227228
"regionGroup": "usEast"
228229
},
229-
"disasterRecoveryType": "premium"
230+
"disasterRecoveryType": "premium",
231+
"userInitiatedDisasterRecoveryAllowed": true
230232
},
231233
"lastModifiedDateTime": "2021-02-01T10:29:57Z",
232234
"createdDateTime": "2021-02-01T10:29:57Z",

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The following table shows the properties that are required when you update the [
6161

6262
## Response
6363

64-
If successful, this method returns a `204 No Content` response code and an updated [cloudPcUserSetting](../resources/cloudpcusersetting.md) object in the response body.
64+
If successful, this method returns a `204 No Content` response code.
6565

6666
## Examples
6767

@@ -88,13 +88,14 @@ Content-Type: application/json
8888
"userRestoreEnabled": true
8989
},
9090
"crossRegionDisasterRecoverySetting": {
91-
"crossRegionDisasterRecoveryEnabled": true,
91+
"crossRegionDisasterRecoveryEnabled": false,
9292
"maintainCrossRegionRestorePointEnabled": true,
9393
"disasterRecoveryNetworkSetting": {
9494
"regionName": "westus",
9595
"regionGroup": "usEast"
9696
},
97-
"disasterRecoveryType": "premium"
97+
"disasterRecoveryType": "premium",
98+
"userInitiatedDisasterRecoveryAllowed": true
9899
},
99100
"localAdminEnabled": false,
100101
"resetEnabled": true

api-reference/beta/api/contenttype-associatewithhubsites.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description: "Associate a content type with list of hubsites."
55
ms.localizationpriority: medium
66
doc_type: apiPageType
77
ms.subservice: "sharepoint"
8+
ms.date: 04/05/2024
89
---
910

1011
# contentType: associateWithHubSites

api-reference/beta/api/contenttype-get.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description: "Get a content type in a site or a list."
55
ms.localizationpriority: medium
66
doc_type: apiPageType
77
ms.subservice: "sharepoint"
8+
ms.date: 04/05/2024
89
---
910

1011
# Get contentType

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "vikama-microsoft"
55
ms.localizationpriority: medium
66
ms.subservice: "entra-id-governance"
77
doc_type: apiPageType
8+
ms.date: 11/04/2024
89
---
910

1011
# Delete customAccessPackageWorkflowExtension

api-reference/beta/api/filestoragecontainer-delete-recyclebin-items.md renamed to api-reference/beta/api/filestoragecontainer-delete-recyclebinitem.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Delete recycleBin items"
2+
title: "Delete recycleBinItem"
33
description: "Delete items from fileStorageContainer recycleBin."
44
author: "tonchan-msft"
55
ms.localizationpriority: medium
@@ -8,7 +8,7 @@ doc_type: apiPageType
88
ms.date: 10/01/2024
99
---
1010

11-
# Delete recycle bin items
11+
# Delete recycleBinItem
1212

1313
Namespace: microsoft.graph
1414

@@ -22,10 +22,10 @@ Choose the permission or permissions marked as least privileged for this API. Us
2222

2323
<!-- {
2424
"blockType": "permissions",
25-
"name": "filestoragecontainer-delete-recyclebin-items-permissions"
25+
"name": "filestoragecontainer-delete-recyclebinitem-permissions"
2626
}
2727
-->
28-
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-delete-recyclebin-items-permissions.md)]
28+
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-delete-recyclebinitem-permissions.md)]
2929

3030
[!INCLUDE [app-permissions](../includes/sharepoint-embedded-app-permissions.md)]
3131

@@ -60,10 +60,10 @@ If successful, this method returns a `204 No Content` response code.
6060
### Request
6161

6262
The following example shows a request.
63-
# [HTTP](#tab/http)
63+
6464
<!-- {
6565
"blockType": "request",
66-
"name": "delete_filestoragecontainer_recyclebin_items",
66+
"name": "delete_filestoragecontainer_recyclebinitem",
6767
"@odata.type": "Collection(microsoft.graph.recyclebinitem)"
6868
}
6969
-->
@@ -75,11 +75,6 @@ Content-Type: application/json
7575
"ids": ["5d625d33-338c-4a77-a98a-3e287116440c", "73133853-48f2-4956-bc4a-03f8d1675042"]
7676
}
7777
```
78-
79-
# [JavaScript](#tab/javascript)
80-
[!INCLUDE [sample-code](../includes/snippets/javascript/delete-filestoragecontainer-recyclebin-items-javascript-snippets.md)]
81-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
82-
8378
---
8479

8580
### Response

api-reference/beta/api/filestoragecontainer-list-recyclebin-items.md renamed to api-reference/beta/api/filestoragecontainer-list-recyclebinitem.md

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
title: "List recycleBin items"
3-
description: "Get a list of recycle bin items from a fileStorageContainer recycleBin."
2+
title: "List recycleBinItem"
3+
description: "Get a list of recyclebinitem objects from a fileStorageContainer recycleBin."
44
author: "tonchan-msft"
55
ms.localizationpriority: medium
66
ms.subservice: "onedrive"
77
doc_type: apiPageType
88
ms.date: 10/14/2024
99
---
1010

11-
# List recycleBin items
11+
# List recycleBinItem
1212

1313
Namespace: microsoft.graph
1414

@@ -24,10 +24,10 @@ Choose the permission or permissions marked as least privileged for this API. Us
2424

2525
<!-- {
2626
"blockType": "permissions",
27-
"name": "filestoragecontainer-list-recyclebin-items-permissions"
27+
"name": "filestoragecontainer-list-recyclebinitem-permissions"
2828
}
2929
-->
30-
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-list-recyclebin-items-permissions.md)]
30+
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-list-recyclebinitem-permissions.md)]
3131

3232
[!INCLUDE [app-permissions](../includes/sharepoint-embedded-app-permissions.md)]
3333

@@ -62,45 +62,15 @@ If successful, this method returns a `200 OK` response code and a collection of
6262

6363
The following example shows a request.
6464

65-
# [HTTP](#tab/http)
6665
<!-- {
6766
"blockType": "request",
68-
"name": "list_recyclebin_items"
67+
"name": "list_recyclebinitem"
6968
}
7069
-->
7170

7271
``` http
7372
GET https://graph.microsoft.com/beta/storage/fileStorage/containers/b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z/recycleBin/items
7473
```
75-
76-
# [C#](#tab/csharp)
77-
[!INCLUDE [sample-code](../includes/snippets/csharp/list-recyclebin-items-csharp-snippets.md)]
78-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
79-
80-
# [CLI](#tab/cli)
81-
[!INCLUDE [sample-code](../includes/snippets/cli/list-recyclebin-items-cli-snippets.md)]
82-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
83-
84-
# [Go](#tab/go)
85-
[!INCLUDE [sample-code](../includes/snippets/go/list-recyclebin-items-go-snippets.md)]
86-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
87-
88-
# [Java](#tab/java)
89-
[!INCLUDE [sample-code](../includes/snippets/java/list-recyclebin-items-java-snippets.md)]
90-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
91-
92-
# [JavaScript](#tab/javascript)
93-
[!INCLUDE [sample-code](../includes/snippets/javascript/list-recyclebin-items-javascript-snippets.md)]
94-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
95-
96-
# [PHP](#tab/php)
97-
[!INCLUDE [sample-code](../includes/snippets/php/list-recyclebin-items-php-snippets.md)]
98-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
99-
100-
# [Python](#tab/python)
101-
[!INCLUDE [sample-code](../includes/snippets/python/list-recyclebin-items-python-snippets.md)]
102-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
103-
10474
---
10575

10676
### Response

api-reference/beta/api/filestoragecontainer-restore-recyclebin-items.md renamed to api-reference/beta/api/filestoragecontainer-restore-recyclebinitem.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
title: "Restore recycleBin items"
3-
description: "Restore recycleBin items to a fileStorageContainer."
2+
title: "Restore recycleBinItem"
3+
description: "Restore recycleBinitem objects to a fileStorageContainer."
44
author: "tonchan-msft"
55
ms.localizationpriority: medium
66
ms.subservice: "onedrive"
77
doc_type: apiPageType
88
ms.date: 10/01/2024
99
---
1010

11-
# Restore recycle bin items
11+
# Restore recycleBinItem
1212

1313
Namespace: microsoft.graph
1414

@@ -22,10 +22,10 @@ Choose the permission or permissions marked as least privileged for this API. Us
2222

2323
<!-- {
2424
"blockType": "permissions",
25-
"name": "filestoragecontainer-restore-recyclebin-items-permissions"
25+
"name": "filestoragecontainer-restore-recyclebinitem-permissions"
2626
}
2727
-->
28-
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-restore-recyclebin-items-permissions.md)]
28+
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-restore-recyclebinitem-permissions.md)]
2929

3030
[!INCLUDE [app-permissions](../includes/sharepoint-embedded-app-permissions.md)]
3131

@@ -61,10 +61,9 @@ If successful, this method returns a `207 Multi-Status` response code and the se
6161

6262
The following example shows a request.
6363

64-
# [HTTP](#tab/http)
6564
<!-- {
6665
"blockType": "request",
67-
"name": "restore_filestoragecontainer_recyclebin_items",
66+
"name": "restore_filestoragecontainer_recyclebinitem",
6867
"@odata.type": "Collection(microsoft.graph.recycleBinItem)"
6968
}
7069
-->
@@ -77,11 +76,6 @@ Content-Type: application/json
7776
"ids": ["5d625d33-338c-4a77-a98a-3e287116440c", "73133853-48f2-4956-bc4a-03f8d1675042"]
7877
}
7978
```
80-
81-
# [JavaScript](#tab/javascript)
82-
[!INCLUDE [sample-code](../includes/snippets/javascript/restore-filestoragecontainer-recyclebin-items-javascript-snippets.md)]
83-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84-
8579
---
8680

8781
### Response

api-reference/beta/api/industrydata-inboundapiflow-update.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "dakelle"
55
ms.localizationpriority: medium
66
ms.subservice: "industry-data-etl"
77
doc_type: apiPageType
8+
ms.date: 06/18/2024
89
---
910

1011
# Update inboundApiFlow

api-reference/beta/api/intune-androidforwork-devicemanagement-get.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "jaiprakashmb"
55
ms.localizationpriority: medium
66
ms.subservice: "intune"
77
doc_type: apiPageType
8+
ms.date: 08/01/2024
89
---
910

1011
# Get deviceManagement

0 commit comments

Comments
 (0)