merge conflict

Author: AshleyYangSZ

api-reference/beta/api/channel-getallretainedmessages.md

@@ -1,6 +1,6 @@
 ---
 title: "channel: getAllRetainedMessages"
-description: "Get retained messages across all channels in a team."
+description: "Get all retained messages across all channels in a team."
 author: "AgnesLiu"
 ms.localizationpriority: medium
 ms.subservice: "teams"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
-Get retained [messages](../resources/chatmessage.md) across all [channels](../resources/channel.md) in a [team](../resources/team.md).
+Get all retained [messages](../resources/chatmessage.md) across all [channels](../resources/channel.md) in a [team](../resources/team.md).
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 

api-reference/beta/api/chat-getallretainedmessages.md

@@ -1,6 +1,6 @@
 ---
 title: "chat: getAllRetainedMessages"
-description: "Get retained messages from all chats that a user is a participant in, including one-on-one chats, group chats, and meeting chats."
+description: "Get all retained messages from all chats that a user is a participant in, including one-on-one chats, group chats, and meeting chats."
 author: "AgnesLiu"
 ms.localizationpriority: medium
 ms.subservice: "teams"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
-Get all retained messages from all [chats](../resources/chatmessage.md) that a user is a participant in, including one-on-one chats, group chats, and meeting chats.
+Get all retained [messages](../resources/chatmessage.md) from all [chats](../resources/chat.md) that a user is a participant in, including one-on-one chats, group chats, and meeting chats.
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 
@@ -67,8 +67,8 @@ The following table lists examples that show how to use the `$filter` parameter.
 
 |Scenario                                  | `$filter` parameter                                                                       |Possible values                                                                                             |
 |:-----------------------------------------|:---------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------|
-|Get messages sent by user identity type   |$filter=from/user/userIdentityType eq '{teamworkUserIdentityType}'                      |aadUser, onPremiseAadUser, anonymousGuest, federatedUser, personalMicrosoftAccountUser, skypeUser, phoneUser|
-|Get messages sent by application type     |$filter=from/application/applicationIdentityType eq '{teamworkApplicationIdentity}'     |aadApplication, bot, tenantBot, office365Connector, outgoingWebhook                                         |
+|Get messages sent by user identity type   |$filter=from/user/userIdentityType eq '{teamworkUserIdentityType}'                      |`aadUser`, `onPremiseAadUser`, `anonymousGuest`, `federatedUser`, `personalMicrosoftAccountUser`, `skypeUser`, `phoneUser`|
+|Get messages sent by application type     |$filter=from/application/applicationIdentityType eq '{teamworkApplicationIdentity}'     |`aadApplication`, `bot`, `tenantBot`, `office365Connector`, `outgoingWebhook`                                         |
 |Get messages sent by user ID              |$filter=from/user/id eq '{oid}'                                                         ||
 |Get control (system event) messages       |$filter=messageType eq 'systemEventMessage'                                             ||
 |Exclude control (system event) messages   |$filter=messageType ne 'systemEventMessage'                                             ||

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

@@ -129,6 +129,7 @@ Content-Type: application/json
     "lastModifiedDateTime": "2023-11-03T07:03:44.97Z",
     "status": "ready",
     "statusDetails": null,
-    "errorCode": null
+    "errorCode": null,
+    "osVersionNumber": "10.0.22631.3593"
 }
 ```

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

@@ -137,6 +137,7 @@ Content-Type: application/json
   "sizeInGB": 64,
   "startDate": "2019-11-12",
   "endDate": "2022-05-10",
-  "expirationDate": "2022-11-10"
+  "expirationDate": "2022-11-10",
+  "osVersionNumber": "10.0.18363.720"
 }
 ```

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

@@ -144,6 +144,11 @@ Content-Type: application/json
     "autopatch": {
         "autopatchGroupId": "91197a0b-3a74-408d-ba88-bce3fdc4e5eb"
     },
+    "autopilotConfiguration": {
+        "devicePreparationProfileId": "59e5d3d2-ec68-4bfe-9693-27975b318990",
+        "applicationTimeoutInMinutes": 60,
+        "onFailureDeviceAccessDenied": false
+    },
     "enableSingleSignOn": true,
     "id": "1d164206-bf41-4fd2-8424-a3192d39ffff",
     "imageDisplayName": "Image Display Name value",
@@ -245,6 +250,11 @@ Content-Type: application/json
     "autopatch": {
         "autopatchGroupId": "91197a0b-3a74-408d-ba88-bce3fdc4e5eb"
     },
+    "autopilotConfiguration": {
+        "devicePreparationProfileId": "59e5d3d2-ec68-4bfe-9693-27975b318990",
+        "applicationTimeoutInMinutes": 60,
+        "onFailureDeviceAccessDenied": false
+    },
     "enableSingleSignOn": true,
     "id": "1d164206-bf41-4fd2-8424-a3192d39ffff",
     "imageDisplayName": "Image Display Name value",

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

@@ -51,6 +51,7 @@ The following table shows the properties that can be updated for the [cloudPcPro
 |Property|Type|Description|
 |:---|:---|:---|
 |autopatch|[cloudPcProvisioningPolicyAutopatch](../resources/cloudpcprovisioningpolicyautopatch.md)|The specific settings for Windows Autopatch that enable its customers to experience it on Cloud PC. The settings take effect when the tenant enrolls in Windows Autopatch and the **managedType** of the **microsoftManagedDesktop** property is set as `starterManaged`.|
+|autopilotConfiguration|[cloudPcAutopilotConfiguration](../resources/cloudpcautopilotconfiguration.md)|The specific settings for Windows Autopilot that enable Windows 365 customers to experience it on Cloud PC.|
 |description|String|The provisioning policy description.|
 |displayName|String|The display name for the provisioning policy. |
 |domainJoinConfigurations|[cloudPcDomainJoinConfiguration](../resources/cloudpcdomainjoinconfiguration.md) collection|Specifies a list ordered by priority on how Cloud PCs join Microsoft Entra ID.|
@@ -74,15 +75,14 @@ If successful, this method returns a `204 No Content` response code.
 
 The following example shows a request.
 
-# [HTTP](#tab/http)
 <!-- {
   "blockType": "request",
   "name": "update_provisioningpolicy"
 }
 -->
 
 ``` http
-PATCH https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/provisioningPolicies/{id}
+PATCH https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/provisioningPolicies/1d164206-bf41-4fd2-8424-a3192d39ffff
 Content-Type: application/json
 
 {
@@ -105,51 +105,22 @@ Content-Type: application/json
   },
   "autopatch": {
     "autopatchGroupId": "91197a0b-3a74-408d-ba88-bce3fdc4e5eb"
+  },
+  "autopilotConfiguration": {
+    "devicePreparationProfileId": "59e5d3d2-ec68-4bfe-9693-27975b318990",
+    "applicationTimeoutInMinutes": 30,
+    "onFailureDeviceAccessDenied": false
   }
 }
 ```
 
-# [C#](#tab/csharp)
-[!INCLUDE [sample-code](../includes/snippets/csharp/update-provisioningpolicy-csharp-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [CLI](#tab/cli)
-[!INCLUDE [sample-code](../includes/snippets/cli/update-provisioningpolicy-cli-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [Go](#tab/go)
-[!INCLUDE [sample-code](../includes/snippets/go/update-provisioningpolicy-go-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [Java](#tab/java)
-[!INCLUDE [sample-code](../includes/snippets/java/update-provisioningpolicy-java-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [JavaScript](#tab/javascript)
-[!INCLUDE [sample-code](../includes/snippets/javascript/update-provisioningpolicy-javascript-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [PHP](#tab/php)
-[!INCLUDE [sample-code](../includes/snippets/php/update-provisioningpolicy-php-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [PowerShell](#tab/powershell)
-[!INCLUDE [sample-code](../includes/snippets/powershell/update-provisioningpolicy-powershell-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [Python](#tab/python)
-[!INCLUDE [sample-code](../includes/snippets/python/update-provisioningpolicy-python-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
----
-
 ### Response
 
 The following example shows the response.
 
 <!-- {
   "blockType": "response",
-  "truncated": true,
+  "truncated": true
 }
 -->
 ``` http