Merge branch 'main' into patch-33

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

@@ -41,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
@@ -90,7 +98,15 @@ Accept wildcard characters: False
 ```
 
 ### -Aggregate
-{{ Fill Aggregate Description }}
+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
@@ -124,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)
@@ -210,8 +228,6 @@ 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/Remove-MailUser.md

@@ -157,7 +157,7 @@ The PermanentlyDelete switch immediately and permanently deletes (purges) the ma
 
 **Notes**:
 
-- This switch works only on mail users that have already been deleted, but are still recoverable (known as soft-deleted mail-users), that also have a blank value for the ExternalObjectId property.
+- This switch works only on mail users that have already been deleted, but are still recoverable (known as soft-deleted mail-users) that also have a blank value for the ExternalDirectoryObjectId property.
 - Use the Get-MailUser cmdlet to identify the soft-deleted mail user, and then pipe the results to the Remove-MailUser cmdlet with this switch. For example, `Get-MailUser -Identity Laura -SoftDeletedMailUser | Remove-MailUser -PermanentlyDelete`.
 
 ```yaml

teams/teams-ps/teams/Get-CsBatchTeamsDeploymentStatus.md

@@ -13,10 +13,9 @@ This cmdlet is used to get the status of the batch deployment orchestration.
 
 ## SYNTAX
 
-```
+```powershell
 Get-CsBatchTeamsDeploymentStatus -OrchestrationId <String>
- [-Confirm]
- [-WhatIf]
+ -InputObject <IConfigApiBasedCmdletsIdentity>
  [<CommonParameters>]
 ```
 
@@ -51,6 +50,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -InputObject
+The Identity parameter.
+
+```yaml
+Type: IConfigApiBasedCmdletsIdentity
+Parameter Sets: GetViaIdentity
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: True (ByValue)
+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](http://go.microsoft.com/fwlink/?LinkID=113216).
 

teams/teams-ps/teams/Get-CsTeamsEducationConfiguration.md

@@ -16,8 +16,14 @@ This cmdlet is used to retrieve the organization-wide education configuration fo
 
 ## SYNTAX
 
+### Identity (Default)
 ```powershell
-Get-CsTeamsEducationConfiguration [<CommonParameters>]
+Get-CsTeamsEducationConfiguration [-Identity <String>] [<CommonParameters>]
+```
+
+### Filter
+```powershell
+Get-CsTeamsEducationConfiguration [-Filter <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -44,6 +50,36 @@ In this example, the organization has set the defaults as follows:
 
 ## PARAMETERS
 
+### -Filter
+Enables you to use wildcard characters in order to return a collection of team education configuration settings.
+
+```yaml
+Type: String
+Parameter Sets: Filter
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Identity
+The unique identifier of the configuration.
+
+```yaml
+Type: String
+Parameter Sets: Identity
+Aliases:
+
+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/?LinkID=113216).
 

teams/teams-ps/teams/Get-CsTeamsMediaConnectivityPolicy.md

@@ -13,17 +13,25 @@ ms.author: runli
 
 ## SYNOPSIS
 
-This cmdlet retrieves all Teams media connectivity policies for current tenant.
+This cmdlet retrieves all Teams media connectivity policies for the current tenant.
 
 ## SYNTAX
 
+### Identity (Default)
+
+```powershell
+Get-CsTeamsMediaConnectivityPolicy [-Identity <String>] [<CommonParameters>]
 ```
-Get-CsTeamsMediaConnectivityPolicy [<CommonParameters>]
+
+### Filter
+
+```powershell
+Get-CsTeamsMediaConnectivityPolicy [-Filter <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
 
-This cmdlet retrieves all Teams media connectivity policies for current tenant.
+This cmdlet retrieves all Teams media connectivity policies for the current tenant.
 
 ## EXAMPLES
 
@@ -36,10 +44,42 @@ Identity DirectConnection
 Tag:Test Enabled
 ```
 
-retrieves Teams media connectivity policies, show the result as identity tag and "DirectConnection" value.
+This example retrieves the Teams media connectivity policies and shows the result as identity tag and "DirectConnection" value.
 
 ## PARAMETERS
 
+### -Filter
+
+Enables you to use wildcard characters when indicating the policy (or policies) to be returned.
+
+```yaml
+Type: String
+Parameter Sets: Filter
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Identity
+
+The identity of the Teams Media Connectivity Policy.
+
+```yaml
+Type: String
+Parameter Sets: Identity
+Aliases:
+
+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/?LinkID=113216).
 

teams/teams-ps/teams/Get-CsTeamsShiftsConnectionTeamMap.md

@@ -18,7 +18,7 @@ This cmdlet supports retrieving the list of team mappings.
 ## SYNTAX
 
 ```
-Get-CsTeamsShiftsConnectionTeamMap -ConnectorInstanceId <String> [<CommonParameters>]
+Get-CsTeamsShiftsConnectionTeamMap -ConnectorInstanceId <String> -InputObject <IConfigApiBasedCmdletsIdentity> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -64,6 +64,20 @@ Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
+### -InputObject
+The Identity parameter
+
+```yaml
+Type: IConfigApiBasedCmdletsIdentity
+Parameter Sets: GetViaIdentity
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: True (ByValue)
+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/?LinkID=113216).

teams/teams-ps/teams/Get-CsTeamsShiftsConnectionWfmUser.md

@@ -17,8 +17,8 @@ This cmdlet shows the list of Workforce management (WFM) users in a specified WF
 
 ## SYNTAX
 
-```
-Get-CsTeamsShiftsConnectionWfmUser -ConnectorInstanceId <string> -WfmTeamId <string> [<CommonParameters>]
+```powershell
+Get-CsTeamsShiftsConnectionWfmUser -ConnectorInstanceId <string> -WfmTeamId <string> -InputObject <IConfigApiBasedCmdletsIdentity> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -79,6 +79,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -InputObject
+
+The identity parameter.
+
+```yaml
+Type: IConfigApiBasedCmdletsIdentity
+Parameter Sets: GetViaIdentity
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: True (ByValue)
+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/?LinkID=113216).