Merge pull request #23580 from microsoftgraph/main

Merge to publish.
microsoftgraph · Feb 8, 2024 · a44b0bd · a44b0bd
2 parents 0d01005 + 964b175
commit a44b0bd
Show file tree

Hide file tree

Showing 10 changed files with 157 additions and 11 deletions.
diff --git a/api-reference/beta/api/filestoragecontainer-post-permissions.md b/api-reference/beta/api/filestoragecontainer-post-permissions.md
@@ -42,10 +42,11 @@ POST /storage/fileStorage/containers/{fileStorageContainerId}/permissions
 
 ## Request body
 In the request body, supply a JSON representation of the [permission](../resources/permission.md) object with the following properties.
-|Name|Type|Description|
-|:---|:---|:---|
-|**roles**|String|The type of permissions. Either `reader`, `writer`, `manager`, or `owner`.|
-|**grantedToV2**|[sharePointIdentitySet](../resources/sharepointidentityset.md)|For user type permissions, the details of the user for this permission.|
+
+|     Name    |                              Type                              | Description                                                                |
+|:-----------:|:--------------------------------------------------------------:|----------------------------------------------------------------------------|
+| roles       | Collection(String)                                             | The type of permissions. Either `reader`, `writer`, `manager`, or `owner`. |
+| grantedToV2 | [sharePointIdentitySet](../resources/sharepointidentityset.md) | For user type permissions, the details of the user for this permission.    |
 
 ## Response
 

diff --git a/api-reference/beta/api/user-list-directreports.md b/api-reference/beta/api/user-list-directreports.md
@@ -36,6 +36,8 @@ GET /users/{id | userPrincipalName}/directReports
 
 To retrieve the user and their direct reports, use the `$expand` query parameter:
 
+>**Note**: `$expand` returns a maximum of 20 objects. For details, see [query parameter limitations](https://developer.microsoft.com/en-us/graph/known-issues/?search=13635).
+
 <!-- { "blockType": "ignored" } -->
 ```http
 GET /me?$expand=directReports

diff --git a/api-reference/beta/resources/airprintsettings.md b/api-reference/beta/resources/airprintsettings.md
@@ -0,0 +1,49 @@
+---
+title: airPrintSettings resource type
+description: Represents tenant-wide settings to configure the behavior of printers when print jobs are submitted to Universal Print from macOS, which requires AirPrint compatibility.
+author: JuliusShanMS
+ms.localizationpriority: medium
+ms.prod: cloud-printing
+doc_type: resourcePageType
+---
+
+# airPrintSettings resource type
+
+Namespace: microsoft.graph
+
+[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
+
+Represents tenant-wide settings to configure the behavior of printers when print jobs are submitted to Universal Print from macOS, which requires AirPrint compatibility.
+
+## Properties
+|Property|Type|Description|
+|:---|:---|:---|
+|incompatiblePrinters|[incompatiblePrinterSettings](#incompatibleprintersettings-values)|Describes whether Universal Print hides printers from macOS when they don't support all capabilities required by the operating system as defined by AirPrint.|
+
+### incompatiblePrinterSettings values 
+
+|Member|Value|Description|
+|:---|:---|:---|
+|show|0|Show printers that aren't compatible with AirPrint.|
+|hide|1|Hide printers that aren't compatible with AirPrint.|
+|unknownFutureValue|2|Evolvable enumeration sentinel value. Don't use.|
+
+## Relationships
+None.
+
+## JSON representation
+The following JSON shows a representation of the resource.
+<!-- {
+  "blockType": "resource",
+  "@odata.type": "microsoft.graph.airPrintSettings"
+}
+-->
+``` json
+{
+  "incompatiblePrinters": "string"
+}
+```
+
+### Credit notice
+
+**AirPrint**, **Mac**, and **macOS** are trademarks of Apple, Inc., registered in the US and other countries/regions.
diff --git a/api-reference/beta/resources/printerdiscoverysettings.md b/api-reference/beta/resources/printerdiscoverysettings.md
@@ -0,0 +1,44 @@
+---
+title: printerDiscoverySettings resource type
+description: Represents tenant-wide printer discovery settings for the Universal Print service.
+author: JuliusShanMS
+ms.localizationpriority: medium
+ms.prod: cloud-printing
+doc_type: resourcePageType
+---
+
+# printerDiscoverySettings resource type
+
+Namespace: microsoft.graph
+
+[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
+
+Represents tenant-wide printer discovery settings for the Universal Print service.
+
+## Properties
+|Property|Type|Description|
+|:---|:---|:---|
+|airPrint|[airPrintSettings](../resources/airprintsettings.md)|Represents tenant-wide settings to configure the behavior of printers when print jobs are submitted to Universal Print from macOS, which requires AirPrint compatibility.|
+
+## Relationships
+None.
+
+## JSON representation
+The following JSON shows a representation of the resource.
+<!-- {
+  "blockType": "resource",
+  "@odata.type": "microsoft.graph.printerDiscoverySettings"
+}
+-->
+``` json
+{
+  "@odata.type": "#microsoft.graph.printerDiscoverySettings",
+  "airPrint": {
+    "@odata.type": "microsoft.graph.airPrintSettings"
+  }
+}
+```
+
+### Credit notice
+
+**AirPrint**, **Mac**, and **macOS** are trademarks of Apple, Inc., registered in the US and other countries/regions.
diff --git a/api-reference/beta/resources/printsettings.md b/api-reference/beta/resources/printsettings.md
@@ -18,11 +18,12 @@ Represents tenant-wide settings for the Universal Print service.
 ## Properties
 | Property     | Type        | Description |
 |:-------------|:------------|:------------|
-|documentConversionEnabled|Boolean|Specifies whether document conversion is enabled for the tenant. If document conversion is enabled, Universal Print service will automatically convert documents into a format compatible with the printer (xps to pdf) when needed.|
+|documentConversionEnabled|Boolean|Specifies whether document conversion is enabled for the tenant. If document conversion is enabled, Universal Print service converts documents into a format compatible with the printer (xps to pdf) when needed.|
+|printerDiscoverySettings|[printerDiscoverySettings](../resources/printerdiscoverysettings.md)|Specifies settings that affect printer discovery when using Universal Print.|
 
 ## JSON representation
 
-The following is a JSON representation of printSettings.
+The following JSON shows a representation of the resource.
 <!-- {
   "blockType": "resource",
   "optionalProperties": [
@@ -33,8 +34,13 @@ The following is a JSON representation of printSettings.
 
 ```json
 {
-  "documentConversionEnabled": true
+  "documentConversionEnabled": true,
+  "printerDiscoverySettings": {
+    "@odata.type": "microsoft.graph.printerDiscoverySettings"
+  }
 }
 ```
 
+## Credit notice
 
+**AirPrint**, **Mac**, and **macOS** are trademarks of Apple, Inc., registered in the US and other countries/regions.
diff --git a/api-reference/v1.0/api/user-list-directreports.md b/api-reference/v1.0/api/user-list-directreports.md
@@ -38,6 +38,8 @@ GET /users/{id | userPrincipalName}/directReports
 
 To retrieve the user and their direct reports, use the `$expand` query parameter:
 
+>**Note**: `$expand` returns a maximum of 20 objects. For details, see [query parameter limitations](https://developer.microsoft.com/en-us/graph/known-issues/?search=13635).
+
 <!-- { "blockType": "ignored" } -->
 ```http
 GET /me?$expand=directReports

diff --git a/changelog/Microsoft.PrintService.json b/changelog/Microsoft.PrintService.json
@@ -1,5 +1,47 @@
 {
   "changelog": [
+    {
+      "ChangeList": [
+        {
+          "Id": "30fad8c5-8dfe-462e-908f-3b1dd226db11",
+          "ApiChange": "Enumeration",
+          "ChangedApiName": "incompatiblePrinterSettings",
+          "ChangeType": "Addition",
+          "Description": "Added the **incompatiblePrinterSettings** enumeration type.",
+          "Target": "incompatiblePrinterSettings"
+        },
+        {
+          "Id": "30fad8c5-8dfe-462e-908f-3b1dd226db11",
+          "ApiChange": "Resource",
+          "ChangedApiName": "airPrintSettings",
+          "ChangeType": "Addition",
+          "Description": "Added the [airPrintSettings](https://learn.microsoft.com/en-us/graph/api/resources/airPrintSettings?view=graph-rest-beta) resource type.",
+          "Target": "airPrintSettings"
+        },
+        {
+          "Id": "30fad8c5-8dfe-462e-908f-3b1dd226db11",
+          "ApiChange": "Resource",
+          "ChangedApiName": "printerDiscoverySettings",
+          "ChangeType": "Addition",
+          "Description": "Added the [printerDiscoverySettings](https://learn.microsoft.com/en-us/graph/api/resources/printerDiscoverySettings?view=graph-rest-beta) resource type.",
+          "Target": "printerDiscoverySettings"
+        },
+        {
+          "Id": "30fad8c5-8dfe-462e-908f-3b1dd226db11",
+          "ApiChange": "Property",
+          "ChangedApiName": "printerDiscoverySettings",
+          "ChangeType": "Addition",
+          "Description": "Added the **printerDiscoverySettings** property to the [printSettings](https://learn.microsoft.com/en-us/graph/api/resources/printSettings?view=graph-rest-beta) resource.",
+          "Target": "printSettings"
+        }
+      ],
+      "Id": "30fad8c5-8dfe-462e-908f-3b1dd226db11",
+      "Cloud": "Prod",
+      "Version": "beta",
+      "CreatedDateTime": "2024-02-07T01:02:44.3382557Z",
+      "WorkloadArea": "Device and app management",
+      "SubArea": "Cloud printing"
+    },
     {
       "ChangeList": [
         {

diff --git a/concepts/change-notifications-delivery-event-hubs.md b/concepts/change-notifications-delivery-event-hubs.md
@@ -1,8 +1,8 @@
 ---
 title: "Receive change notifications through Azure Event Hubs"
 description: "Change notifications can be delivered via different channels, including webhooks and Azure Event Hubs. This article walks you through how to get change notifications through Azure Event Hubs."
-author: "keylimesoda"
-ms.prod: "change-notifications"
+author: FaithOmbongi
+ms.prod: change-notifications
 ms.localizationpriority: high
 ms.custom: graphiamtop20, devx-track-azurecli
 ms.date: 03/23/2023

diff --git a/concepts/query-parameters.md b/concepts/query-parameters.md
@@ -421,7 +421,7 @@ GET https://graph.microsoft.com/v1.0/me/drive/root?$expand=children($select=id,n
 > [!NOTE]
 > + Not all relationships and resources support the `$expand` query parameter. For example, you can expand the **directReports**, **manager**, and **memberOf** relationships on a user, but you cannot expand its **events**, **messages**, or **photo** relationships. Not all resources or relationships support using `$select` on expanded items. 
 > 
-> + With Microsoft Entra resources that derive from [directoryObject](/graph/api/resources/directoryobject), like [user](/graph/api/resources/user) and [group](/graph/api/resources/group), `$expand` typically returns a maximum of 100 items for the expanded relationship and has no [@odata.nextLink](./paging.md). See more [known issues](https://developer.microsoft.com/en-us/graph/known-issues/?filterBy=Query%20parameters&search=).
+> + With Microsoft Entra resources that derive from [directoryObject](/graph/api/resources/directoryobject), like [user](/graph/api/resources/user) and [group](/graph/api/resources/group), `$expand` typically returns a maximum of 20 items for the expanded relationship and has no [@odata.nextLink](./paging.md). For details, see [query parameter limitations](https://developer.microsoft.com/en-us/graph/known-issues/?search=13635).
 >
 > + `$expand` is not currently supported with [advanced queries](/graph/aad-advanced-queries).
 

diff --git a/concepts/whats-new-overview.md b/concepts/whats-new-overview.md
@@ -18,7 +18,7 @@ For details about previous updates to Microsoft Graph, see [Microsoft Graph what
 
 ## February 2024: New and generally available
 
-Microsoft Graph Toolkit v4 is now available. For details about changes in the latest release, see [Upgrade to the latest version of Microsoft Graph Toolkit](upgrade.md)
+Microsoft Graph Toolkit v4 is now available. For details about changes in the latest release, see [Upgrade to the latest version of Microsoft Graph Toolkit](/graph/toolkit/upgrade)
 
 ## January 2024: New and generally available