Merge pull request #26698 from microsoftgraph/main

Merge to publish.

Author: Danielabom

api-reference/beta/api/userdatasecurityandgovernance-processcontent.md

@@ -39,13 +39,15 @@ POST /me/dataSecurityAndGovernance/processContent
 POST /users/{usersId}/dataSecurityAndGovernance/processContent
 ```
 
+/me/dataSecurityAndGovernance/processContent supports delegated permissions only.
+
 ## Request headers
 
 |Name|Description|
 |:---|:---|
 |Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
 |Content-Type|application/json. Required.|
-| If-None-Match | Optional. This value is used by the API to determine if the policy state has changed since the last call to the API. The value is from the Etag header returned from [protectionScopes compute](../api/userprotectionscopecontainer-compute.md)|
+| If-None-Match | Optional. This value is used by the API to determine if the policy state changed since the last call to the API. The value is from the Etag header returned from [protectionScopes compute](../api/userprotectionscopecontainer-compute.md)|
 
 ## Request body
 
@@ -61,7 +63,7 @@ The following table lists the parameters that are required when you call this ac
 
 | Name          | Description   |
 | :------------ | :------------ |
-| ETag          | An indicator whether the configured policy state has changed. If the policy state has changed, the protectionScopeState property returned will be "modified" and the app needs to refresh by calling [protectionScopes compute](../api/userprotectionscopecontainer-compute.md). |
+| ETag          | An indicator whether the configured policy state changed. If the policy state changed, the protectionScopeState property returned will be "modified" and the app needs to refresh by calling [protectionScopes compute](../api/userprotectionscopecontainer-compute.md). |
 
 ## Response
 

api-reference/beta/resources/customclaimattributebase.md

@@ -14,7 +14,10 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
-This is an abstract type for the custom claim attribute base.
+This is an abstract type for configuring the [custom claims attribute property](../resources/customclaimconfiguration.md). The following resources derive from this type:
+
+- [sourcedAttribute](../resources/sourcedattribute.md)
+- [valueBasedAttribute](../resources/valuebasedattribute.md)
 
 ## Properties
 None.

api-reference/beta/resources/tenantdatasecurityandgovernance.md

@@ -21,6 +21,7 @@ Represents the entry point for data security and governance features applicable
 | Method                                          | Return Type                                                                                                 | Description                                                                                 |
 | :---------------------------------------------- | :---------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------ |
 | [Compute protection scopes](../api/tenantprotectionscopecontainer-compute.md) | [policyTenantScope](../resources/policytenantscope.md) collection      | Compute the tenant-wide data protection policies, including user/group scoping.             |
+| [Process content](../api/userdatasecurityandgovernance-processcontent.md) | [processContentResponse](../resources/processcontentresponse.md) | Process content against data security and governance policies in the context of a specific user. |
 | [Process content async](../api/tenantdatasecurityandgovernance-processcontentasync.md) | [processContentResponses](../resources/processcontentresponses.md) collection | Process a batch of content entries asynchronously against data protection policies.           |
 
 ## Properties

api-reference/beta/resources/userdatasecurityandgovernance.md

@@ -20,7 +20,7 @@ Provides access to data security and governance functionalities specifically sco
 
 | Method       | Return Type | Description |
 |:-------------|:------------|:------------|
-| [Compute protection scopes](../api/userdatasecurityandgovernance-processcontent.md) | [policyUserScope](../resources/policyuserscope.md) collection | Compute the protection scopes for this user. |
+| [Compute protection scopes](../api/userprotectionscopecontainer-compute.md) | [policyUserScope](../resources/policyuserscope.md) collection | Compute the protection scopes for this user. |
 | [Process content](../api/userdatasecurityandgovernance-processcontent.md) | [processContentResponse](../resources/processcontentresponse.md) | Process content against data security and governance policies in the context of this user. |
 
 ## Properties

api-reference/beta/toc.yml

@@ -58,8 +58,6 @@ items:
   - name: Customer booking
     href: toc/customer-booking/toc.yml
     displayName: Bookings, Microsoft Bookings
-  - name: Data Security and Governance (preview)
-    href: toc/data-security-and-governance-(preview)/toc.yml
   - name: Device and app management
     href: toc/device-and-app-management/toc.yml
   - name: Education

api-reference/beta/toc/security/toc.yml

@@ -210,6 +210,12 @@ items:
       href: ../../resources/security-defaultauditdata.md
 - name: Data security and compliance (preview)
   items:
+  - name: Security
+    items:
+    - name: Security
+      href: ../../resources/security.md
+    - name: Run hunting query
+      href: ../../api/security-security-runhuntingquery.md
   - name: Activities container
     href: ../../resources/activitiescontainer.md
   - name: Content activity
@@ -218,16 +224,6 @@ items:
       href: ../../resources/contentactivity.md
     - name: Create
       href: ../../api/activitiescontainer-post-contentactivities.md
-  - name: Data security and governance
-    items:
-    - name: Data security and governance
-      href: ../../resources/datasecurityandgovernance.md
-    - name: Compute protection scopes
-      href: ../../api/tenantprotectionscopecontainer-compute.md
-    - name: Process content async
-      href: ../../api/tenantdatasecurityandgovernance-processcontentasync.md
-  - name: Label content right
-    href: ../../resources/labelcontentright.md
   - name: Sensitivity label
     items:
     - name: Sensitivity label
@@ -260,34 +256,18 @@ items:
       href: ../../resources/tenantdatasecurityandgovernance.md
     - name: Compute protection scopes
       href: ../../api/tenantprotectionscopecontainer-compute.md
+    - name: Process content
+      href: ../../api/userdatasecurityandgovernance-processcontent.md
     - name: Process content async
       href: ../../api/tenantdatasecurityandgovernance-processcontentasync.md
-  - name: Tenant protection scope container
-    items:
-    - name: Tenant protection scope container
-      href: ../../resources/tenantprotectionscopecontainer.md
-    - name: Compute protection scopes
-      href: ../../api/tenantprotectionscopecontainer-compute.md
-  - name: Usage rights included
-    items:
-    - name: Usage rights included
-      href: ../../resources/usagerightsincluded.md
-    - name: Get
-      href: ../../api/usagerightsincluded-get.md
   - name: User data security and governance
     items:
     - name: User data security and governance
       href: ../../resources/userdatasecurityandgovernance.md
     - name: Compute protection scopes
-      href: ../../api/userdatasecurityandgovernance-processcontent.md
+      href: ../../api/userprotectionscopecontainer-compute.md
     - name: Process content
       href: ../../api/userdatasecurityandgovernance-processcontent.md
-  - name: User protection scope container
-    items:
-    - name: User protection scope container
-      href: ../../resources/userprotectionscopecontainer.md
-    - name: Compute protection scopes
-      href: ../../api/userprotectionscopecontainer-compute.md
   - name: Complex types
     items:
     - name: Activity metadata
@@ -318,6 +298,8 @@ items:
       href: ../../resources/groupscope.md
     - name: Label action base
       href: ../../resources/labelactionbase.md
+    - name: Label content right
+      href: ../../resources/labelcontentright.md
     - name: Label policy
       href: ../../resources/labelpolicy.md
     - name: Notify user action
@@ -328,6 +310,8 @@ items:
       href: ../../resources/policybinding.md
     - name: Policy location application
       href: ../../resources/policylocationapplication.md
+    - name: Policy location domain
+      href: ../../resources/policylocationdomain.md
     - name: Policy location URL
       href: ../../resources/policylocationurl.md
     - name: Policy scope base
@@ -336,8 +320,6 @@ items:
       href: ../../resources/policytenantscope.md
     - name: Policy user scope
       href: ../../resources/policyuserscope.md
-    - name: policyLocationDomain resource type (preview)
-      href: ../../resources/policylocationdomain.md
     - name: Process content batch request
       href: ../../resources/processcontentbatchrequest.md
     - name: Process content request
@@ -348,8 +330,6 @@ items:
       href: ../../resources/processcontentresponses.md
     - name: Process conversation metadata
       href: ../../resources/processconversationmetadata.md
-    - name: Process conversation metadata
-      href: ../../resources/processconversationmetadata.md
     - name: Process file metadata
       href: ../../resources/processfilemetadata.md
     - name: Processing error

api-reference/beta/toc/toc.mapping.json

@@ -421,12 +421,6 @@
         "timeSlot"
       ]
     },
-    {
-      "name": "Data Security and Governance (preview)",
-      "resources": [
-        "userDataSecurityAndGoverance"
-      ]
-    },
     {
       "name": "Device and app management",
       "childNodes": [
@@ -2603,17 +2597,10 @@
         {
           "name": "Data security and compliance (preview)",
           "resources": [
-            "security",
-            "activitiesContainer",
             "contentActivity",
-            "dataSecurityAndGovernance",
-            "labelContentRight",
             "microsoft.graph.security.sensitivityLabel",
             "tenantDataSecurityAndGovernance",
-            "tenantProtectionScopeContainer",
-            "usageRightsIncluded",
-            "userDataSecurityAndGovernance",
-            "userProtectionScopeContainer"
+            "userDataSecurityAndGovernance"
            ],
             "complexTypes": [
               "activityMetadata",
@@ -2632,6 +2619,7 @@
               "groupScope",
               "integratedApplicationMetadata",
               "labelActionBase",
+              "labelContentRight",
               "labelPolicy",
               "notifyUserAction",
               "operatingSystemSpecifications",
@@ -2644,7 +2632,6 @@
               "policyTenantScope",
               "policyUserScope",
               "processContentBatchRequest",
-              "processConversationMetadata",
               "processContentRequest",
               "processContentResponse",
               "processContentResponses",

concepts/permissions-reference.md

@@ -7,7 +7,7 @@ ms.localizationpriority: high
 ms.topic: reference
 ms.subservice: entra-applications
 ms.custom: graphiamtop20, scenarios:getting-started
-ms.date: 05/12/2025
+ms.date: 05/19/2025
 #Customer intent: As a developer, I want to learn more about the permissions available in Microsoft Graph, so that I understand the impact of granting specific permissions to my app.
 ---