Merge branch 'main' into blackquack-patch-1

Author: Ruchika-mittal01

exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md

@@ -109,35 +109,35 @@ This example adds a policy for the Reflection feature in Viva Insights. The poli
 Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name DisableCategoryForAll -IsCategoryEnabled $false -Everyone
 ```
 
-This example adds a policy for the `<cateogry_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the organization.
+This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the organization.
 
 ### Example 6
 ```powershell
 Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name MultipleGroups -IsCategoryEnabled $false -GroupIds [email protected],[email protected],57680382-61a5-4378-85ad-f72095d4e9c3
 ```
 
-This example adds a policy for the `<cateogry_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the specified groups.
+This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the specified groups.
 
 ### Example 7
 ```powershell
 Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name MultipleUsers -IsCategoryEnabled $false -UserIds [email protected],[email protected]
 ```
 
-This example adds a policy for the `<cateogry_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users.
+This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users.
 
 ### Example 8
 ```powershell
 Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name UsersAndGroups -IsCategoryEnabled $false -GroupIds [email protected],[email protected],57680382-61a5-4378-85ad-f72095d4e9c3 -UserIds [email protected],[email protected]
 ```
 
-This example adds a policy for the `<cateogry_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users and group members.
+This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users and group members.
 
 ### Example 9
 ```powershell
 Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name "Disable Category For All" -IsCategoryEnabled $false -Everyone
 ```
 
-This example adds a policy for the `<cateogry_id>` category in Viva where the policy name is with spaces. The policy disables the category (effectively all features under the category) for all users in the organization.
+This example adds a policy for the `<category_id>` category in Viva where the policy name is with spaces. The policy disables the category (effectively all features under the category) for all users in the organization.
 
 ## PARAMETERS
 

exchange/exchange-ps/exchange/Export-ContentExplorerData.md

@@ -23,13 +23,12 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Export-ContentExplorerData
+Export-ContentExplorerData [-TagName] <String> [-TagType] <String>
+ [-Aggregate]
  [[-PageCookie] <String>]
  [[-PageSize] <Int32>]
  [[-SiteUrl] <String>]
  [[-UserPrincipalName] <String>]
- [-TagName] <String>
- [-TagType] <String>
  [[-Workload] <String>]
  [<CommonParameters>]
 ```
@@ -42,6 +41,14 @@ The output of this cmdlet contains the following information:
 - RecordsReturned: The number of records returned in the query.
 - PageCookie: Used to get the next set of records when MorePagesAvailable is True.
 
+The following list describes best practices for scripts using this cmdlet:
+
+- We recommend not using a single script to export multiple SITs/Labels. Instead, create a script for one SIT/Label, and then re-use the same script for each SIT/Label in each workload as required.  
+- When retrying the script, make sure to reconnect to the session first. The session's token expires after about an hour, which can cause the cmdlet to fail. To fix this issue, reconnect to the session before retrying the script. If the script fails, restart it using the last page cookie returned to continue the export from where it left off. 
+
+  > [!TIP]
+  > To support unattended scripts that run for a long time, you can use [certificate-based authentication (CBA)](https://learn.microsoft.com/powershell/exchange/app-only-auth-powershell-v2).
+
 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).
 
 ## EXAMPLES
@@ -69,6 +76,51 @@ This example exports records for the specified sensitive info type for all workl
 
 ## PARAMETERS
 
+### -TagType
+The TagType parameter specifies the type of label to export file details from. Valid values are:
+
+- Retention
+- SensitiveInformationType
+- Sensitivity
+- TrainableClassifier
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: True
+Position: 5
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Aggregate
+The Aggregate parameter switch returns the folder level aggregated numbers instead of returning details at the item level. You don't need to specify a value with this switch.
+
+Using this switch significantly reduces the export time. To download the items in a folder, run this cmdlet for specific folders.
+
+When you use this switch with the TagName, TagType and Workload parameters, the command returns the following information:
+
+- SiteUlrs: OneDrive and SharePoint.
+- UPNs: Exchange Online and Teams.
+- The count of items stamped with that tag.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -PageCookie
 The PageCookie parameter specifies whether to get more data when the value of the MorePagesAvailable property in the command output is True. If you don't use the PageSize parameter, a maximum of 100 records are returned. If you use the PageSize parameter, a maximum of 10000 records can be returned.
 
@@ -88,6 +140,8 @@ Accept wildcard characters: False
 ### -PageSize
 The PageSize parameter specifies the maximum number of records to return in a single query. Valid input for this parameter is an integer between 1 and 10000. The default value is 100.
 
+**Note**: In empty folders or folders with few files, this parameter can cause the command to run for a long time as it tries to get the PageSize count of the results. To prevent this issue, the command returns data from 5 folders or the number of records specified by the PageSize parameter, whichever completes first. For example, if there are 10 folders with 1 record each, the command returns 5 records of the top 5 folders. In the next execution using page cookie, it returns 5 records from the remaining 5 folders, even if the PageSize value is 10.
+
 ```yaml
 Type: Int32
 Parameter Sets: (All)
@@ -135,27 +189,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -TagType
-The TagType parameter specifies the type of label to export file details from. Valid values are:
-
-- Retention
-- SensitiveInformationType
-- Sensitivity
-- TrainableClassifier
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: True
-Position: 5
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -UserPrincipalName
 The UserPrincipalName parameter specifies the user account in UPN format to export message details from. An example UPN value is [email protected].
 

exchange/exchange-ps/exchange/Get-ComplianceTag.md

@@ -23,6 +23,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ```
 Get-ComplianceTag [[-Identity] <ComplianceRuleIdParameter>]
  [-IncludingLabelState]
+ [-PriorityCleanup]
  [<CommonParameters>]
 ```
 
@@ -83,6 +84,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PriorityCleanup
+{{ Fill PriorityCleanup Description }}
+
+```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
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
 

exchange/exchange-ps/exchange/Get-DlpCompliancePolicy.md

@@ -22,6 +22,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Get-DlpCompliancePolicy [[-Identity] <PolicyIdParameter>]
+ [-DisplayName <String>]
  [-DistributionDetail]
  [-ForceValidate <Boolean>]
  [-IncludeExtendedProperties <Boolean>]
@@ -88,6 +89,22 @@ Accept pipeline input: True
 Accept wildcard characters: False
 ```
 
+### -DisplayName
+{{ Fill DisplayName Description }}
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -DistributionDetail
 The DistributionDetail switch returns detailed policy distribution information in the DistributionResults property. You don't need to specify a value with this switch.
 

exchange/exchange-ps/exchange/Get-DlpComplianceRule.md

@@ -22,6 +22,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Get-DlpComplianceRule [[-Identity] <ComplianceRuleIdParameter>]
+ [-DisplayName <String>]
  [-IncludeExecutionRuleGuids <Boolean>]
  [-Policy <PolicyIdParameter>]
  [<CommonParameters>]
@@ -76,6 +77,22 @@ Accept pipeline input: True
 Accept wildcard characters: False
 ```
 
+### -DisplayName
+{{ Fill DisplayName Description }}
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -IncludeExecutionRuleGuids
 {{ Fill IncludeExecutionRuleGuids Description }}
 

exchange/exchange-ps/exchange/Get-PendingDelicenseUser.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Exchange.RolesAndAccess-Help.xml
 online version: https://learn.microsoft.com/powershell/module/exchange/get-pendingdelicenseuser
-applicable: Exchange Online
+applicable: Exchange Online, Exchange Online Protection
 title: Get-PendingDelicenseUser
 schema: 2.0.0
 author: chrisda
@@ -80,7 +80,7 @@ You can't use this parameter with the ShowDueObjectsOnly switch.
 Type: RecipientIdParameter
 Parameter Sets: Identity
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Online, Exchange Online Protection
 
 Required: False
 Position: 1
@@ -96,7 +96,7 @@ The ResultSize parameter specifies the maximum number of results to return. If y
 Type: Unlimited
 Parameter Sets: TenantLevelParameterSet
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Online, Exchange Online Protection
 
 Required: False
 Position: Named
@@ -114,7 +114,7 @@ You can't use this switch with the Identity parameter.
 Type: SwitchParameter
 Parameter Sets: TenantLevelParameterSet
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Online, Exchange Online Protection
 
 Required: False
 Position: Named

exchange/exchange-ps/exchange/Get-RetentionCompliancePolicy.md

@@ -26,6 +26,7 @@ Get-RetentionCompliancePolicy [[-Identity] <PolicyIdParameter>]
  [-ErrorPolicyOnly]
  [-ExcludeTeamsPolicy]
  [-IncludeTestModeResults]
+ [-PriorityCleanup]
  [-RetentionRuleTypes]
  [-TeamsPolicyOnly]
  [<CommonParameters>]
@@ -147,6 +148,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PriorityCleanup
+{{ Fill PriorityCleanup Description }}
+
+```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
+```
+
 ### -RetentionRuleTypes
 The RetentionRuleTypes switch specifies whether to return the value of the RetentionRuleTypes property in the results. You don't need to specify a value with this switch.
 

exchange/exchange-ps/exchange/Get-RetentionComplianceRule.md

@@ -23,6 +23,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ```
 Get-RetentionComplianceRule [[-Identity] <ComplianceRuleIdParameter>]
  [-Policy <PolicyIdParameter>]
+ [-PriorityCleanup]
  [<CommonParameters>]
 ```
 
@@ -96,6 +97,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PriorityCleanup
+{{ Fill PriorityCleanup Description }}
+
+```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
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).