From 356263406feb21cdc58ac74f3f3cb1b3a3e1e055 Mon Sep 17 00:00:00 2001 From: Dean Haas Date: Tue, 11 Mar 2025 09:57:56 -0700 Subject: [PATCH 1/4] Update New-RetentionCompliancePolicy.md --- exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md index 8258bfaf6b..d9efecb9bf 100644 --- a/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md +++ b/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md @@ -410,6 +410,9 @@ Accept wildcard characters: False ``` ### -PolicyRBACScopes + +**Note**: Admin units aren't currently supported, so this parameter isn't functional. The information presented here is for informational purposes when support for admin units is released. + The PolicyRBACScopes parameter specifies the administrative units to assign to the policy. A valid value is the Microsoft Entra ObjectID (GUID value) of the administrative unit. You can specify multiple values separated by commas. Administrative units are available only in Microsoft Entra ID P1 or P2. You create and manage administrative units in Microsoft Graph PowerShell. From 74cfaf2c958f82ff1f3d9be4032c4333da7a9f78 Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Tue, 11 Mar 2025 10:38:25 -0700 Subject: [PATCH 2/4] Remove extra line break in documentation --- exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md | 1 - 1 file changed, 1 deletion(-) diff --git a/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md index d9efecb9bf..c58ac54d72 100644 --- a/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md +++ b/exchange/exchange-ps/exchange/New-RetentionCompliancePolicy.md @@ -410,7 +410,6 @@ Accept wildcard characters: False ``` ### -PolicyRBACScopes - **Note**: Admin units aren't currently supported, so this parameter isn't functional. The information presented here is for informational purposes when support for admin units is released. The PolicyRBACScopes parameter specifies the administrative units to assign to the policy. A valid value is the Microsoft Entra ObjectID (GUID value) of the administrative unit. You can specify multiple values separated by commas. From 19f4a65fc603489ae756aa8cd072f3c4e370c523 Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Tue, 11 Mar 2025 11:09:47 -0700 Subject: [PATCH 3/4] Formatting consistency --- .../exchange-ps/exchange/New-AppRetentionCompliancePolicy.md | 1 - exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md | 1 - 2 files changed, 2 deletions(-) diff --git a/exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md index 927c8d0b73..4068612d9f 100644 --- a/exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md +++ b/exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md @@ -308,7 +308,6 @@ Accept wildcard characters: False ``` ### -PolicyRBACScopes - **Note**: Admin units aren't currently supported, so this parameter isn't functional. The information presented here is for informational purposes when support for admin units is released. The PolicyRBACScopes parameter specifies the administrative units to assign to the policy. A valid value is the Microsoft Entra ObjectID (GUID value) of the administrative unit. You can specify multiple values separated by commas. diff --git a/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md index 936861e7a1..799d5ebf6a 100644 --- a/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md +++ b/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md @@ -756,7 +756,6 @@ Accept wildcard characters: False ``` ### -PolicyRBACScopes - **Note**: Admin units aren't currently supported, so this parameter isn't functional. The information presented here is for informational purposes when support for admin units is released. The PolicyRBACScopes parameter specifies the administrative units to assign to the policy. A valid value is the Microsoft Entra ObjectID (GUID value) of the administrative unit. You can specify multiple values separated by commas. From 7ac724acd9a3364af1b4875b0c5928714da85721 Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Tue, 11 Mar 2025 13:33:05 -0700 Subject: [PATCH 4/4] Remove extra spaces and returns --- exchange/exchange-ps/exchange/Export-ContentExplorerData.md | 2 -- .../exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md | 4 ++-- exchange/exchange-ps/exchange/Set-ArcConfig.md | 2 +- .../exchange-ps/exchange/Set-RetentionCompliancePolicy.md | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/exchange/exchange-ps/exchange/Export-ContentExplorerData.md b/exchange/exchange-ps/exchange/Export-ContentExplorerData.md index cff39ce40e..85f8802e21 100644 --- a/exchange/exchange-ps/exchange/Export-ContentExplorerData.md +++ b/exchange/exchange-ps/exchange/Export-ContentExplorerData.md @@ -110,8 +110,6 @@ When you use this switch with the TagName, TagType, and Workload parameters, the - Exchange Online and Microsoft Teams: The list of UPNs. - The count of items in the folders stamped with relevant tag. - - ```yaml Type: SwitchParameter Parameter Sets: (All) diff --git a/exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md index 6660700954..8d2437fe12 100644 --- a/exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md +++ b/exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md @@ -126,7 +126,7 @@ $stringJson = @" 'EmailAddress': 'SalesUser@contoso.onmicrosoft.com' }] "@ -Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "SalesUser@contoso.onmicrosoft.com" -DeletedResources $stringJson +Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "SalesUser@contoso.onmicrosoft.com" -DeletedResources $stringJson ``` This example excludes the specified soft-deleted mailbox or mail user from the retention policy configured for Teams private channel messages. You can identify the deleted resources using the mailbox or mail user's email address. @@ -144,7 +144,7 @@ $stringJson = @" 'EmailAddress': 'SalesUser2@contoso.onmicrosoft.com' }] "@ -Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson +Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson ``` This example is similar to Example 2, except multiple deleted resources are specified. diff --git a/exchange/exchange-ps/exchange/Set-ArcConfig.md b/exchange/exchange-ps/exchange/Set-ArcConfig.md index 8f991da93a..5bf267a358 100644 --- a/exchange/exchange-ps/exchange/Set-ArcConfig.md +++ b/exchange/exchange-ps/exchange/Set-ArcConfig.md @@ -82,7 +82,7 @@ $y = @($x.Split(",")) $DomainsRemove = [System.Collections.ArrayList]($y) $DomainsRemove.Remove($arcSealer) -if ($DomainsToRemove.Count -eq 0) { +if ($DomainsToRemove.Count -eq 0) { Set-ArcConfig -Identity Default -ArcTrustedSealers " " } else { diff --git a/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md b/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md index 799d5ebf6a..1cc2b6c254 100644 --- a/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md +++ b/exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md @@ -166,7 +166,6 @@ The example excludes the specified deleted Microsoft 365 Group and site from the **IMPORTANT**: Before you run this command, make sure you read the Caution information for the [DeletedResources parameter](#-deletedresources) about duplicate SMTP addresses. - ### Example 4 ```powershell $stringJson = @" @@ -213,7 +212,7 @@ $stringJson = @" }] "@ -Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson +Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson ``` This example is similar to Example 5, except multiple deleted resources are specified. @@ -222,7 +221,6 @@ This example is similar to Example 5, except multiple deleted resources are spec Policy exclusions must remain within the supported limits for retention policies: [Limits for Microsoft 365 retention policies and retention label policies](https://learn.microsoft.com/purview/retention-limits#maximum-number-of-items-per-policy) - ## PARAMETERS ### -Identity