Merge branch 'main' into patch-1

chrisda · web-flow · commit 843b8f1a2594 · 2025-02-21T09:09:52.000-08:00
diff --git a/exchange/exchange-ps/exchange/Export-ContentExplorerData.md b/exchange/exchange-ps/exchange/Export-ContentExplorerData.md
@@ -98,15 +98,19 @@ Accept wildcard characters: False
 ```
 
 ### -Aggregate
+**Note:** This parameter is currently in Private Preview, isn't available in all organizations, and is subject to change.
+
 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:
+When you use this switch with the TagName, TagType, and Workload parameters, the command returns the following information:
+
+- SharePoint and OneDrive: The list of SiteUlrs.
+- Exchange Online and Microsoft Teams: The list of UPNs.
+- The count of items in the folders stamped with relevant tag.
+
 
-- SiteUlrs: OneDrive and SharePoint.
-- UPNs: Exchange Online and Teams.
-- The count of items stamped with that tag.
 
 ```yaml
 Type: SwitchParameter
diff --git a/exchange/exchange-ps/exchange/Set-AutoSensitivityLabelRule.md b/exchange/exchange-ps/exchange/Set-AutoSensitivityLabelRule.md
@@ -375,13 +375,12 @@ Accept wildcard characters: False
 ```
 
 ### -DocumentNameMatchesWords
-The DocumentNameMatchesWords parameter specifies a condition for the auto-labeling policy rule that looks for words or phrases in the name of message attachments. You can specify multiple words or phrases separated by commas.
+The DocumentNameMatchesWords parameter specifies a condition for the auto-labeling policy rule that looks for whole word matches in the name of message attachments. You can specify multiple words separated by commas.
 
 - Single word: `"no_reply"`
 - Multiple words: `no_reply,urgent,...`
-- Multiple words and phrases: `"phrase 1",word1,"phrase with , or spaces",word2,...`
 
-The maximum individual word or phrase length is 128 characters. The maximum number of words or phrases is 50.
+The maximum individual word length is 128 characters. The maximum number of words is 50.
 
 ```yaml
 Type: MultiValuedProperty
diff --git a/exchange/exchange-ps/exchange/Set-ServerComponentState.md b/exchange/exchange-ps/exchange/Set-ServerComponentState.md
@@ -56,7 +56,8 @@ The first command changes the state of all server components to Inactive.
 
 The second command changes the state to Active after the maintenance is over (required).
 
-**Note**: By design, the Microsoft Exchange IMAP4 and Microsoft Exchange POP3 services stop if the related `ImapProxy` and `PopProxy` components are in the Inactive state. The services may need to be manually started after the related `ImapProxy` and `PopProxy` components are changed to the Active state.
+> [!NOTE] 
+> By design, the Microsoft Exchange IMAP4 and Microsoft Exchange POP3 services stop if the related `ImapProxy` and `PopProxy` components are in the Inactive state. The services may need to be manually started after the related `ImapProxy` and `PopProxy` components are changed to the Active state.
 
 ## PARAMETERS
 
diff --git a/teams/teams-ps/teams/Get-CsPhoneNumberAssignment.md b/teams/teams-ps/teams/Get-CsPhoneNumberAssignment.md
@@ -266,7 +266,7 @@ Accept wildcard characters: False
 ```
 
 ### -AssignmentCategory
-This parameter is reserved for internal Microsoft use.
+This parameter is used to differentiate between Primary and Private line assignment for a user. 
 
 ```yaml
 Type: System.String
diff --git a/teams/teams-ps/teams/Set-CsCallQueue.md b/teams/teams-ps/teams/Set-CsCallQueue.md
@@ -46,14 +46,6 @@ Note that this cmdlet is in the Skype for Business Online PowerShell module and
 > - -NoAgentRedirectPersonAudioFilePrompt
 > - -NoAgentRedirectVoicemailTextToSpeechPrompt
 > - -NoAgentRedirectVoicemailAudioFilePrompt
-> - -IsCallbackEnabled
-> - -CallbackRequestDtmf
-> - -WaitTimeBeforeOfferingCallbackInSecond
-> - -NumberOfCallsInQueueBeforeOfferingCallback
-> - -CallToAgentRatioThresholdBeforeOfferingCallback
-> - -CallbackOfferAudioFilePromptResourceId
-> - -CallbackOfferTextToSpeechPrompt
-> - -CallbackEmailNotificationTarget
 >
 > The following configuration parameters will only work for customers that are participating in the Voice Applications private preview for these features. General Availability for this functionality has not been determined at this time.
 >
diff --git a/teams/teams-ps/teams/Set-CsPhoneNumberAssignment.md b/teams/teams-ps/teams/Set-CsPhoneNumberAssignment.md
@@ -144,10 +144,17 @@ Set-CsPhoneNumberAssignment -Identity user3@contoso.com -PhoneNumber +1206555122
 ```
 This example shows how to turn off reverse number lookup (RNL) on a phone number. When RNL is set to 'SkipInternalVoip', an internal call to this phone number will not attempt to pass through internal VoIP via reverse number lookup in Microsoft Teams. Instead the call will be established through external PSTN connectivity directly. This example is only applicable for Direct Routing phone numbers.
 
+### Example 12
+```powershell
+Set-CsPhoneNumberAssignment -Identity user1@contoso.com -PhoneNumber '+14255551234' -PhoneNumberType CallingPlan -AssignmentCategory Private
+```
+This example shows how to assign a private phone number (incoming calls only) to a user. 
+
+
 ## PARAMETERS
 
 ### -AssignmentCategory
-This parameter is reserved for internal Microsoft use.
+This parameter indicates the phone number assignment category if it isn't the primary phone number. For example, a Private line can be assigned to a user using '-AssignmentCategory Private'.
 
 ```yaml
 Type: System.String
