Merge pull request #11781 from MicrosoftDocs/main

Publish main to live, Friday 10:30AM PDT, 04/26

Author: Stacyrch140

exchange/exchange-ps/exchange/Get-DlpDetailReport.md

@@ -12,9 +12,9 @@ ms.reviewer:
 # Get-DlpDetailReport
 
 ## SYNOPSIS
-This cmdlet is available only in the cloud-based service.
+**Note**: This cmdlet has been retired. Use the [Export-ActivityExplorerData](https://learn.microsoft.com/powershell/module/exchange/export-activityexplorerdata) cmdlet to view DLP information. Data from Export-ActivityExplorerData is the same as the retired Get-DlpIncidentDetailReport cmdlet.
 
-**Note**: This cmdlet will be retired. Use the [Export-ActivityExplorerData](https://learn.microsoft.com/powershell/module/exchange/export-activityexplorerdata) cmdlet to view DLP information. Data from Export-ActivityExplorerData is the same as the retired Get-DlpIncidentDetailReport cmdlet.
+This cmdlet is available only in the cloud-based service.
 
 Use the Get-DlpDetailReport cmdlet to list details about data loss prevention (DLP) rule matches for Exchange Online, SharePoint Online, and OneDrive for Business in your cloud-based organization for the last 30 days.
 

exchange/exchange-ps/exchange/Set-OwaMailboxPolicy.md

@@ -561,8 +561,6 @@ Accept wildcard characters: False
 ```
 
 ### -CalendarEnabled
-This parameter is functional only in on-premises Exchange.
-
 The CalendarEnabled parameter specifies whether to enable or disable the calendar in Outlook Web App. Valid values are:
 
 - $true: The Calendar is available in Outlook Web App. This is the default value.

exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md

@@ -22,16 +22,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ## SYNTAX
 
-### RetryDistribution
-```
-Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter> [-RetryDistribution]
- [-Confirm]
- [-EnforceSimulationPolicy <Boolean>]
- [-StartSimulation <Boolean>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
 ### Identity
 ```
 Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter>
@@ -49,6 +39,7 @@ Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter>
  [-Applications <MultiValuedProperty>]
  [-Comment <String>]
  [-Confirm]
+ [-DeletedResources <String>]
  [-Enabled <Boolean>]
  [-EnforceSimulationPolicy <Boolean>]
  [-Force]
@@ -77,6 +68,7 @@ Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter> [-AddAdaptiveScope
  [-Applications <MultiValuedProperty>]
  [-Comment <String>]
  [-Confirm]
+ [-DeletedResources <String>]
  [-Enabled <Boolean>]
  [-EnforceSimulationPolicy <Boolean>]
  [-Force]
@@ -86,6 +78,17 @@ Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter> [-AddAdaptiveScope
  [<CommonParameters>]
 ```
 
+### RetryDistribution
+```
+Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter> [-RetryDistribution]
+ [-Confirm]
+ [-DeletedResources <String>]
+ [-EnforceSimulationPolicy <Boolean>]
+ [-StartSimulation <Boolean>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
 ### TeamLocation
 ```
 Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter>
@@ -95,6 +98,7 @@ Set-RetentionCompliancePolicy [-Identity] <PolicyIdParameter>
  [-AddTeamsChatLocationException <MultiValuedProperty>]
  [-Comment <String>]
  [-Confirm]
+ [-DeletedResources <String>]
  [-Enabled <Boolean>]
  [-EnforceSimulationPolicy <Boolean>]
  [-Force]
@@ -126,6 +130,52 @@ This example makes the following changes to the existing retention policy named
 - Removes public folders.
 - Updates the comment.
 
+### Example 2
+```powershell
+$stringJson = @"
+[{
+     'EmailAddress': '[email protected]',
+     'SiteId': '9b2a8116-b9ec-4e2c-bf31-7eaa83697c4b'
+}]
+"@
+
+Set-RetentionCompliancePolicy -Identity "Sales Policy" -RemoveModernGroupLocation "[email protected]" -DeletedResources $stringJson
+```
+
+The example removes the specified deleted Microsoft 365 Group and site from the specified policy. You identify the deleted resources using the Microsoft 365 Group email address and the related site ID.
+
+### Example 3
+```powershell
+$stringJson = @"
+[{
+     'EmailAddress': '[email protected]',
+     'SiteId': '8b2a8345-b9ec-3b6a-bf31-6eaa83697c4b'
+}]
+"@
+
+Set-RetentionCompliancePolicy -Identity "Tenant Level Policy" -AddModernGroupLocationException "[email protected]" -DeletedResources $stringJson
+```
+
+The example excludes the specified deleted Microsoft 365 Group and site from the specified tenant level policy. You identify the deleted resources using the Microsoft 365 Group email address and the related site ID.
+
+### Example 4
+```powershell
+$stringJson = @"
+[{
+     'EmailAddress': '[email protected]',
+     'SiteId': '9b2a8116-b9ec-4e2c-bf31-7eaa83697c4b'
+ },
+[{
+     'EmailAddress': '[email protected]',
+     'SiteId': '4afb7116-b9ec-4b2c-bf31-4abb83697c4b'
+}]
+"@
+
+Set-RetentionCompliancePolicy -Identity "Sales Policy" -RemoveModernGroupLocation "[email protected]" -DeletedResources $stringJson
+```
+
+This example is similar to Example 2, except multiple deleted resources are specified.
+
 ## PARAMETERS
 
 ### -Identity
@@ -574,6 +624,26 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DeletedResources
+The DeletedResources parameter specifies the Sharepoint sites to be removed from the list of included sites or excluded from a tenant level policy when the associated group has been deleted. You use this parameter with the AddModernGroupLocationException and RemoveModernGroupLocation parameters.
+
+A valid value is a JSON String. See the Examples section for syntax and examples using this parameter.
+
+For more information about this scenario, see [Learn more about modern group deletion under retention hold](https://learn.microsoft.com/purview/retention-settings#what-happens-if-a-microsoft-365-group-is-deleted-after-a-policy-is-applied).
+
+```yaml
+Type: String
+Parameter Sets: Identity
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Enabled
 The Enabled parameter specifies whether the policy is enabled. Valid values are: