Merge branch 'main' into sthapliyal/addClientAppIdToAppDef

Author: JarbasHorst

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

@@ -33,7 +33,9 @@ Choose the permission or permissions marked as least privileged for this API. Us
 GET /education/classes/{id}/assignments/{id}
 ```
 ## Optional query parameters
-This method supports the `$select` and `$expand` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
+This method supports the `$select`, `$orderby`, and `$expand` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
+
+You can use `$orderby` with the following properties of the [educationAssignment](../resources/educationassignment.md) resource: **assignDateTime**, **assignedDateTime**, **closeDateTime**, **createdDateTime**, **displayName**, **dueDateTime**, **lastModifiedDateTime**, **moduleUrl**, and **status**.
 
 The following `$expand` options are available for this method: `categories`, `resources`, `rubric`, `submissions`, `gradingScheme`, `gradingCategory`, and `*`. `*` specifies all the previous options.
 

api-reference/beta/api/educationassignment-post-categories.md

@@ -36,44 +36,38 @@ POST /education/classes/{id}/assignments/{id}/categories/$ref
 | Content-Type  | application/json  |
 
 ## Request body
-In the request body, supply the odata.id of the existing [educationCategory](../resources/educationcategory.md) object(s) to add to this assignment.
-
+In the request body, supply the **odata.id** of an existing [educationCategory](../resources/educationcategory.md) object to add to this assignment.
 
 ## Response
 If successful, this method returns a `204 No Content` response code.
 
 ## Example
-##### Request
+### Request
 The following example shows a request.
 <!-- {
-  "blockType": "ignored",
-  "name": "add_educationcategory_to_educationassignment",
-  "sampleKeys": ["11021", "19002"]
+  "blockType": "request",
+  "name": "add_educationcategory_to_educationassignment"
 }-->
 ```http
-POST https://graph.microsoft.com/beta/education/classes/11021/assignments/19002/categories/$ref
+POST https://graph.microsoft.com/beta/education/classes/37d99af7-cfc5-4e3b-8566-f7d40e4a2070/assignments/70b7077c-7c1c-4e56-9b3b-2365411900c6/categories/$ref
 Content-type: application/json
 
 {
-  "@odata.id": "https://graph.microsoft.com/v1.0/education/classes/11021/assignmentCategories/ec98f158-341d-4fea-9f8c-14a250d489ac"
+  "@odata.id": "https://graph.microsoft.com/beta/education/classes/37d99af7-cfc5-4e3b-8566-f7d40e4a2070/assignmentCategories/39e3d9dc-7244-42d7-8b4d-1071aae5eb41"
 }
-
 ```
-In the request body, supply the odata.id of the existing [educationCategory](../resources/educationcategory.md) object to add to this assignment.
-##### Response
-The following example shows the response.
-
->**Note:** The response object shown here might be shortened for readability.
 
+### Response
+The following example shows the response.
 
 <!-- {
-  "blockType": "ignored",
-  "truncated": true,
-  "@odata.type": "microsoft.graph.educationAssignmentResource"
+  "blockType": "response",
+  "truncated": true
 } -->
 ```http
 HTTP/1.1 204 No Content
 ```
+
 <!-- uuid: 8fcb5dbc-d5aa-4681-8e31-b001d5168d79
 2015-10-25 14:57:30 UTC -->
 <!--
@@ -86,5 +80,3 @@ HTTP/1.1 204 No Content
   "suppressions": []
 }
 -->
-
-

api-reference/beta/api/educationassignment-remove-category.md

@@ -44,21 +44,19 @@ If successful, this method returns a `204 No Content` response code.
 ### Request
 The following example shows a request.
 <!-- {
-  "blockType": "ignored",
-  "name": "add_educationcategory_to_educationassignment",
-  "sampleKeys": ["11021", "19002", "ec98f158-341d-4fea-9f8c-14a250d489ac"]
+  "blockType": "request",
+  "name": "remove_educationcategory_from_educationassignment"
 }-->
 ```http
-DELETE https://graph.microsoft.com/beta/education/classes/11021/assignments/19002/categories/ec98f158-341d-4fea-9f8c-14a250d489ac/$ref
+DELETE https://graph.microsoft.com/beta/education/classes/37d99af7-cfc5-4e3b-8566-f7d40e4a2070/assignments/e98aaae1-7c98-4e65-bb62-1994fe410552/categories/39e3d9dc-7244-42d7-8b4d-1071aae5eb41/$ref
 ```
 
 ### Response
 The following example shows the response.
 
 <!-- {
-  "blockType": "ignored",
-  "truncated": true,
-  "@odata.type": "microsoft.graph.educationAssignmentResource"
+  "blockType": "response",
+  "truncated": true
 } -->
 ```http
 HTTP/1.1 204 No Content

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

@@ -52,52 +52,15 @@ If successful, this method returns a `204 No Content` response code. It doesn't
 
 The following example shows a request.
 
-
-# [HTTP](#tab/http)
 <!-- {
   "blockType": "request",
-  "name": "delete_educationassignment_2",
-  "sampleKeys": ["11014", "19002"]
+  "name": "delete_educationassignment_2"
 }-->
 
 ```http
-DELETE https://graph.microsoft.com/beta/education/classes/11014/assignmentCategories/19002
+DELETE https://graph.microsoft.com/beta/education/classes/37d99af7-cfc5-4e3b-8566-f7d40e4a2070/assignmentCategories/39e3d9dc-7244-42d7-8b4d-1071aae5eb41
 ```
 
-# [C#](#tab/csharp)
-[!INCLUDE [sample-code](../includes/snippets/csharp/delete-educationassignment-2-csharp-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [CLI](#tab/cli)
-[!INCLUDE [sample-code](../includes/snippets/cli/delete-educationassignment-2-cli-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [Go](#tab/go)
-[!INCLUDE [sample-code](../includes/snippets/go/delete-educationassignment-2-go-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [Java](#tab/java)
-[!INCLUDE [sample-code](../includes/snippets/java/delete-educationassignment-2-java-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [JavaScript](#tab/javascript)
-[!INCLUDE [sample-code](../includes/snippets/javascript/delete-educationassignment-2-javascript-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [PHP](#tab/php)
-[!INCLUDE [sample-code](../includes/snippets/php/delete-educationassignment-2-php-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [PowerShell](#tab/powershell)
-[!INCLUDE [sample-code](../includes/snippets/powershell/delete-educationassignment-2-powershell-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
-# [Python](#tab/python)
-[!INCLUDE [sample-code](../includes/snippets/python/delete-educationassignment-2-python-snippets.md)]
-[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
-
----
-
 ### Response
 
 The following example shows the response. 

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

@@ -33,7 +33,9 @@ GET /education/classes/{id}/assignmentCategories/{id}
 
 ## Optional query parameters
 
-This method supports the `$select` OData query parameter to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
+This method supports the `$select` and `$orderby` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
+
+You can use `$orderby` with the **displayName** property of the [educationCategory](../resources/educationcategory.md) resource.
 
 ## Request headers
 | Header        | Value                     |

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

@@ -39,7 +39,9 @@ GET /education/classes/{class-id}/assignments/{assignment-id}/submissions/{submi
 
 ## Optional query parameters
 
-This method supports the `$select` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
+This method supports the `$select` and `$orderby` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
+
+You can use `$orderby` with the following properties of the [educationSubmission](../resources/educationsubmission.md) resource: **excusedDateTime**, **reassignedDateTime**, **returnedDateTime**, **status**, **submittedDateTime**, and **unsubmittedDateTime**.
 
 ## Request headers
 | Header       | Value |

api-reference/beta/api/educationsubmission-reassign.md

@@ -102,6 +102,7 @@ The following is an example of the response when `Prefer: include-unknown-enum-m
 
 <!-- {
   "blockType": "response",
+  "truncated": true,
   "@odata.type": "microsoft.graph.educationSubmission"
 } -->
 ```http
@@ -213,7 +214,8 @@ Prefer: include-unknown-enum-members
 The following is an example of the response when `Prefer: include-unknown-enum-members` is provided in the request header and the submission hasn't been returned before.
 
 <!-- {
-  "blockType": "response",
+  "blockType": "response",  
+  "truncated": true,
   "@odata.type": "microsoft.graph.educationSubmission"
 } -->
 ```http

api-reference/beta/api/educationuser-list-assignments.md

@@ -45,7 +45,9 @@ This method supports the `$top`, `$filter`, `$orderby`, and `$select` OData quer
 
 The following `$expand` options are available for this method: `categories`, `resources`, `gradingCategory`, `rubric`, `submissions`, and `*`, which includes all the previous options.
 
-All [properties](../resources/educationassignment.md#properties) are supported for the query parameters `$filter` and `$orderby`.
+All [properties](../resources/educationassignment.md#properties) are supported by the `$filter` query parameter.
+
+You can use `$orderby` with the following properties of the [educationAssignment](../resources/educationassignment.md) resource: **assignDateTime**, **assignedDateTime**, **closeDateTime**, **createdDateTime**, **displayName**, **dueDateTime**, **lastModifiedDateTime**, and **status**.
 
 ## Request headers
 

api-reference/beta/api/teamsapp-publish.md

@@ -29,7 +29,9 @@ Choose the permission or permissions marked as least privileged for this API. Us
 [!INCLUDE [permissions-table](../includes/permissions/teamsapp-publish-permissions.md)]
 
 > [!NOTE]
-> The Directory.ReadWrite.All permission is supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission listed in the previous table and avoid using these permissions going forward.
+>
+> * The `Directory.ReadWrite.All` permission is supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission listed in the previous table and avoid using these permissions going forward.
+> * The `AppCatalog.Submit` permission allows you to submit apps for review only, not to publish them to the catalog.
 
 ## HTTP request
 

api-reference/beta/resources/cloudpccrossregiondisasterrecoverysetting.md

@@ -0,0 +1,47 @@
+---
+title: "cloudPcCrossRegionDisasterRecoverySetting resource type"
+description: "Represents the settings for cross-region disaster recovery on a Cloud PC."
+author: "Guoan-Tang"
+ms.localizationpriority: medium
+ms.subservice: "cloud-pc"
+doc_type: resourcePageType
+toc.title: Cloud PC cross-region disaster recovery setting
+---
+
+# cloudPcCrossRegionDisasterRecoverySetting resource type
+
+Namespace: microsoft.graph
+
+[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
+
+Represents the settings for cross-region disaster recovery on a Cloud PC.
+
+## Properties
+
+|Property|Type|Description|
+|:---|:---|:---|
+|crossRegionDisasterRecoveryEnabled|Boolean|`True` if an end user is allowed to set up cross-region disaster recovery for Cloud PC; otherwise, `false`. The default value is `false`.|
+|disasterRecoveryNetworkSetting|[cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md)|Indicates the network settings of the Cloud PC during a cross-region disaster recovery operation.|
+|maintainCrossRegionRestorePointEnabled|Boolean|Indicates whether Windows 365 maintain the cross-region disaster recovery function generated restore points. If `true`, the Windows 365 stored restore points; `false` indicates that Windows 365 doesn't generate or keep the restore point from the original Cloud PC. If a disaster occurs, the new Cloud PC can only be provisioned using the initial image. This limitation can result in the loss of some user data on the original Cloud PC. The default value is `false`.|
+
+## Relationships
+
+None.
+
+## JSON representation
+
+The following JSON representation shows the resource type.
+<!-- {
+  "blockType": "resource",
+  "@odata.type": "microsoft.graph.cloudPcCrossRegionDisasterRecoverySetting"
+}
+-->
+
+``` json
+{
+  "@odata.type": "#microsoft.graph.cloudPcRestorePointSetting",
+  "crossRegionDisasterRecoveryEnabled": "Boolean",
+  "disasterRecoveryNetworkSetting": {"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"},
+  "maintainCrossRegionRestorePointEnabled": "Boolean"
+}
+```