Merge branch 'main' into patch-40

mkbond007 · web-flow · commit 77f66f4544ab · 2025-05-01T12:52:35.000-04:00
diff --git a/.github/workflows/StaleBranch.yml b/.github/workflows/StaleBranch.yml
@@ -2,6 +2,7 @@ name: (Scheduled) Stale branch removal
 
 permissions:
   contents: write
+  pull-requests: read
 
 # This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
 # On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.
diff --git a/exchange/exchange-ps/exchange/Get-FeatureConfiguration.md b/exchange/exchange-ps/exchange/Get-FeatureConfiguration.md
@@ -25,10 +25,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Get-FeatureConfiguration [[-Identity] <PolicyIdParameter>] [-FeatureScenario] <PolicyScenario>
- [-All]
  [-Confirm]
- [-GeneralDiscovery]
- [-IrmDiscovery]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -92,22 +89,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -All
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -Confirm
 This parameter is reserved for internal Microsoft use.
 
@@ -124,38 +105,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -GeneralDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -IrmDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -WhatIf
 This parameter is reserved for internal Microsoft use.
 
diff --git a/exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md
@@ -50,7 +50,9 @@ New-AppRetentionCompliancePolicy [-Name] <String> -Applications <String[]>
 ```
 
 ## DESCRIPTION
-\*-AppRetentionCompliance\* cmdlets are used for policies with adaptive policy scopes and all static policies that cover Teams private channels, Viva Engage chats, and Viva Engage community messages. Eventually, you'll use these cmdlets for most retention locations and policy types. The \*-RetentionCompliance\* cmdlets will continue to support Exchange and SharePoint locations primarily. For policies created with the \*-AppRetentionCompliance\* cmdlets, you can only set the list of included or excluded scopes for all included workloads, which means you'll likely need to create one policy per workload.
+\*-AppRetentionCompliance\* cmdlets are used for policies with adaptive policy scopes and all static policies in the locations described in [Retention cmdlets for newer locations](https://learn.microsoft.com/purview/retention-cmdlets#retention-cmdlets-for-newer-locations). You can only set the list of included or excluded scopes for all included workloads, which means you likely need to create one policy per workload.
+
+\*-RetentionCompliance\* cmdlets continue to primarily support the locations described in [Retention cmdlets for older locations](https://learn.microsoft.com/purview/retention-cmdlets#retention-cmdlets-for-older-locations).
 
 To use this cmdlet in Security & Compliance PowerShell, you need to be assigned permissions. For more information, see [Permissions in the Microsoft Purview compliance portal](https://learn.microsoft.com/purview/microsoft-365-compliance-center-permissions).
 
@@ -104,13 +106,31 @@ Accept wildcard characters: False
 ```
 
 ### -Applications
-The Applications parameter specifies the applications to include in the policy and is relevant only for the following location parameters:
+The Applications parameter specifies the applications to include in the policy. and is relevant only for the following location parameters:
+
+This parameter uses the following syntax: `"LocationType:App1,LocationType:App2,...LocationType:AppN`:
+
+`LocationType` is User or Group.
+
+`App` is a supported value as shown in the following examples.
+
+- **Microsoft 365 apps**: For example:
+
+  `"User:Exchange,User:OneDriveForBusiness,Group:Exchange,Group:SharePoint"` or `"User:MicrosoftTeams","User:VivaEngage"`
+
+- **Microsoft Copilot experiences**: Currently in Preview. You must use *all* of the following values at the same time:
+
+  `"User:M365Copilot,CopilotForSecurity,CopilotinFabricPowerBI,CopilotStudio,CopilotinBusinessApplicationplatformsSales,SQLCopilot"`
+
+  **Note**: Even though you must use `CopilotinBusinessApplicationplatformsSales` and `SQLCopilot`, those values are currently irrelevant.
+
+- **Enterprise AI apps**: Currently in Preview. You must use *all* of the following values at the same time:
+
+  `"User:Entrabased3PAIApps,ChatGPTEnterprise,AzureAIServices"`
 
-- ExchangeLocation
-- ModernGroupLocation
-- AdaptiveScopeLocation
+- **Other AI apps**: Currently in Preview. You must use *all* of the following values at the same time:
 
-This parameter uses the following syntax: `"LocationtType:App1,LocationType:App2,...LocationType:AppN` where LocationType is User or Group. For example, `"User:Exchange,User:OneDriveForBusiness,Group:Exchange,Group:SharePoint"` or `"User:MicrosoftTeams","User:VivaEngage"`.
+  `"User:CloudAIAppChatGPTConsumer,CloudAIAppGoogleGemini,BingConsumer,DeepSeek"`
 
 ```yaml
 Type: String[]
diff --git a/exchange/exchange-ps/exchange/New-FeatureConfiguration.md b/exchange/exchange-ps/exchange/New-FeatureConfiguration.md
@@ -27,8 +27,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
 New-FeatureConfiguration [-Name] <String> -Mode <PolicyMode> -FeatureScenario <PolicyScenario> -ScenarioConfig <String>
  [-Comment <String>]
  [-Confirm]
- [-GeneralDiscovery]
- [-IrmDiscovery]
  [-Locations <String>]
  [-WhatIf]
  [<CommonParameters>]
@@ -176,38 +174,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -GeneralDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -IrmDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -Locations
 The locations parameter specifies where the feature configuration applies.
 
diff --git a/exchange/exchange-ps/exchange/Remove-FeatureConfiguration.md b/exchange/exchange-ps/exchange/Remove-FeatureConfiguration.md
@@ -26,8 +26,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ```
 Remove-FeatureConfiguration [-Identity] <PolicyIdParameter>
  [-Confirm]
- [-GeneralDiscovery]
- [-IrmDiscovery]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -85,38 +83,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -GeneralDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -IrmDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -WhatIf
 The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
 
diff --git a/exchange/exchange-ps/exchange/Set-FeatureConfiguration.md b/exchange/exchange-ps/exchange/Set-FeatureConfiguration.md
@@ -27,8 +27,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
 Set-FeatureConfiguration [-Identity] <PolicyIdParameter> [-Locations <String>]
  [-Comment <String>]
  [-Confirm]
- [-GeneralDiscovery]
- [-IrmDiscovery]
  [-Mode <PolicyMode>]
  [-ScenarioConfig <String>]
  [-WhatIf]
@@ -118,38 +116,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -GeneralDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -IrmDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -Locations
 The locations parameter specifies where the feature configuration applies.
 
