Skip to content

Commit 35fc8f9

Browse files
committed
Merge branch 'main' into FeatureConfig-chrisda
2 parents c3a57d6 + 88ed2a9 commit 35fc8f9

8 files changed

+52
-35
lines changed

exchange/exchange-ps/exchange/Resume-MoveRequest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This example resumes any failed move requests.
5151

5252
### Example 3
5353
```powershell
54-
Get-MoveRequest -MoveStatus Suspended | Get-MoveRequestStatistics |Where {$_.Message -like "*resume after 10 P.M."} | Resume-MoveRequest
54+
Get-MoveRequest -MoveStatus Suspended | Get-MoveRequestStatistics | Where {$_.Message -like "*resume after 10 P.M."} | Resume-MoveRequest
5555
```
5656

5757
This example resumes any move requests that have the suspend comment "Resume after 10 P.M."

exchange/exchange-ps/exchange/Resume-PublicFolderMoveRequest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This example resumes failed public folder move requests.
4949

5050
### Example 3
5151
```powershell
52-
Get-PublicFolderMoveRequest -MoveStatus Suspended | Get-PublicFolderMoveRequestStatistics |Where {$_.Message -like "*resume after 10 P.M."} | Resume-PublicFolderMoveRequest
52+
Get-PublicFolderMoveRequest -MoveStatus Suspended | Get-PublicFolderMoveRequestStatistics | Where {$_.Message -like "*resume after 10 P.M."} | Resume-PublicFolderMoveRequest
5353
```
5454

5555
This example resumes a move request that has the suspend comment "Resume after 10 P.M."

exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ A valid value is a JSON string. Refer to the Examples section for syntax and usa
385385

386386
For information about the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
387387

388-
**CAUTION**: This parameter uses the SMTP address of the deleted mailbox or mail user, which might also be specified for other mailboxes or mail users. If you use this parameter without first taking additional steps, other mailboxes and mail users with the same SMTP address in the retention policy will also be excluded. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace *user@example.com* with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] |Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
388+
**CAUTION**: This parameter uses the SMTP address of the deleted mailbox or mail user, which might also be specified for other mailboxes or mail users. If you use this parameter without first taking additional steps, other mailboxes and mail users with the same SMTP address in the retention policy will also be excluded. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace `user@contoso.com` with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] | Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
389389

390390
To prevent active mailboxes or mail users with the same SMTP address from being excluded, put the mailbox on [Litigation Hold](https://learn.microsoft.com/purview/ediscovery-create-a-litigation-hold) before you run the command with the DeletedResources parameter.
391391

exchange/exchange-ps/exchange/Set-ContentFilterConfig.md

+43-11
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,16 @@ This example makes the following modifications to the Content Filter agent confi
6363

6464
It enables and configures the SCL threshold functionalities that quarantine, reject and delete messages to 5, 6 and 8 respectively.
6565

66-
It specifies [email protected] as the spam quarantine mailbox.
66+
It specifies `[email protected]` as the spam quarantine mailbox.
6767

6868
It defines two users for whom the Content Filter won't process messages.
6969

7070
## PARAMETERS
7171

7272
### -BypassedRecipients
73-
The BypassedRecipients parameter specifies the SMTP address values of recipients in your organization. The Content Filter agent doesn't process any content filtering for messages bound to the addresses listed on this parameter. To enter multiple SMTP addresses, separate the addresses by using a comma, for example: [email protected],[email protected]. The maximum number of recipients you can input is 100.
73+
The BypassedRecipients parameter specifies the SMTP addresses of recipients who skip processing by the Content Filter agent.
74+
75+
You can specify multiple recipients separated by commas (for example, `"[email protected]","[email protected]"`). The maximum number of recipient entries is 100.
7476

7577
```yaml
7678
Type: MultiValuedProperty
@@ -86,7 +88,9 @@ Accept wildcard characters: False
8688
```
8789
8890
### -BypassedSenderDomains
89-
The BypassedSenderDomains parameter specifies domain name values of sending domains. The Content Filter agent doesn't process any content filtering for messages received from the domains listed on this parameter. To enter multiple domains, separate the addresses by using a comma, for example: contoso.com, example.com. A wildcard character (\*) can be used to specify all subdomains, for example: \*.contoso.com. The maximum number of domains you can input is 100.
91+
The BypassedSenderDomains parameter specifies the sender email address domains of senders who skip processing by the Content Filter agent.
92+
93+
You can specify multiple sender domains separated by commas (`"contoso.com","fabrikam.com"`). Use a wildcard character (\*) to specify a domain and all subdomains (for example: `*.contoso.com`). The maximum number of domain entries is 100.
9094

9195
```yaml
9296
Type: MultiValuedProperty
@@ -102,7 +106,9 @@ Accept wildcard characters: False
102106
```
103107

104108
### -BypassedSenders
105-
The BypassedSenders parameter specifies the SMTP address values of senders. The Content Filter agent doesn't process any content filtering for messages received from the addresses listed on this parameter. To enter multiple SMTP addresses, separate the addresses by using a comma, for example: [email protected], [email protected]. The maximum number of SMTP addresses you can input is 100.
109+
The BypassedSenders parameter specifies the SMTP addresses of senders who skip processing by the Content Filter agent.
110+
111+
You can specify multiple senders separated by commas (for example, `"[email protected]","[email protected]"`). The maximum number of recipient entries is 100.
106112

107113
```yaml
108114
Type: MultiValuedProperty
@@ -155,7 +161,10 @@ Accept wildcard characters: False
155161
```
156162

157163
### -Enabled
158-
The Enabled parameter enables or disables the Content Filter agent on the computer on which you're running the command. Valid input for the Enabled parameter is $true or $false. The default setting is $true.
164+
The Enabled parameter enables or disables the Content Filter agent on the computer on which you're running the command. Valid values are:
165+
166+
- $true: The Content Filter agent is enabled. This is the default value.
167+
- $false: The Content Filter agent is disabled.
159168

160169
```yaml
161170
Type: Boolean
@@ -171,7 +180,10 @@ Accept wildcard characters: False
171180
```
172181

173182
### -ExternalMailEnabled
174-
The ExternalMailEnabled parameter specifies whether all messages from unauthenticated connections from sources external to your Exchange organization are passed through the Content Filter agent for processing. Valid input for the ExternalMailEnabled parameter is $true or $false. The default setting is $true. When the ExternalMailEnabled parameter is set to $true, all messages from unauthenticated connections are passed through the Content Filter agent for processing.
183+
The ExternalMailEnabled parameter specifies whether all messages from unauthenticated connections from sources external to your Exchange organization are processed by the Content Filter agent. Valid values are:
184+
185+
- $true: Messages from unauthenticated connections are processed by the Content Filter agent. This is the default value.
186+
- $false: Messages from unauthenticated connections aren't processed by the Content Filter agent.
175187

176188
```yaml
177189
Type: Boolean
@@ -187,7 +199,10 @@ Accept wildcard characters: False
187199
```
188200

189201
### -InternalMailEnabled
190-
The InternalMailEnabled parameter specifies whether all messages from authenticated connections and from authoritative domains in your enterprise are passed through the Content Filter agent for processing. Valid input for the InternalMailEnabled parameter is $true or $false. The default setting is $false. When the InternalMailEnabled parameter is set to $true, all messages from authenticated connections and from authoritative domains in your enterprise are passed through the Content Filter agent for processing.
202+
The InternalMailEnabled parameter specifies whether all messages from authenticated connections and from authoritative domains in your enterprise are processed by the Content Filter agent. Valid values are:
203+
204+
- $true: Messages from authenticated connections are processed by the Content Filter agent.
205+
- $false: Messages from authenticated connections aren't processed by the Content Filter agent. This is the default value.
191206

192207
```yaml
193208
Type: Boolean
@@ -203,7 +218,15 @@ Accept wildcard characters: False
203218
```
204219

205220
### -OutlookEmailPostmarkValidationEnabled
206-
The OutlookEmailPostmarkValidationEnabled parameter specifies whether the Content Filter agent sends a computational puzzle to the sender's system for processing. Valid input for the OutlookEmailPostmarkValidationEnabled parameter is $true or $false. When the OutlookEmailPostmarkValidationEnabled parameter is set to $true, the Content Filter agent sends a computational puzzle to the sender's system for processing. The results of the puzzle validation are factored into the overall spam confidence level (SCL). This functionality is exposed to the Microsoft Outlook user as Outlook E-mail Postmark validation. The default setting is $false.
221+
The OutlookEmailPostmarkValidationEnabled parameter specifies whether Outlook Email Postmark validation is enabled.
222+
223+
- For outbound messages, the Content Filter agent applies a computational postmark header to help destination email systems distinguish legitimate email from spam.
224+
- For inbound messages, the Content Filter agent looks for a computational postmark header in the message. The presence of a valid, solved computational postmark header indicates the client computer that generated the message solved the computational postmark, so the Content Filter agent is likely to lower the message's spam confidence level (SCL) rating.
225+
226+
Valid values are:
227+
228+
- $true: Outlook Email Postmark validation is enabled.
229+
- $false: Outlook Email Postmark validation is disabled. This is the default value.
207230

208231
```yaml
209232
Type: Boolean
@@ -251,7 +274,10 @@ Accept wildcard characters: False
251274
```
252275

253276
### -SCLDeleteEnabled
254-
The SCLDeleteEnabled parameter specifies whether all messages that meet or exceed the value set in the SCLDeleteThreshold parameter are deleted. Valid input for the SCLDeleteEnabled parameter is $true or $false. The default setting is $false. When the SCLDeleteEnabled parameter is set to $true, all messages that meet or exceed the value set in the SCLDeleteThreshold parameter are deleted.
277+
The SCLDeleteEnabled parameter specifies whether all messages that meet or exceed the value set in the SCLDeleteThreshold parameter are deleted. Valid values are:
278+
279+
- $true: Messages that meet or exceed the value set in the SCLDeleteThreshold parameter are deleted.
280+
- $false: Messages aren't deleted. This is the default value.
255281

256282
```yaml
257283
Type: Boolean
@@ -283,7 +309,10 @@ Accept wildcard characters: False
283309
```
284310

285311
### -SCLQuarantineEnabled
286-
The SCLQuarantineEnabled parameter specifies whether all messages that meet or exceed the value set in the SCLQuarantineThreshold parameter are sent to the spam quarantine mailbox specified in the QuarantineMailbox parameter. Valid input for the SCLQuarantineEnabled parameter is $true or $false. The default setting is $false. When the SCLQuarantineEnabled parameter is set to $true, all messages that meet or exceed the value set in the SCLQuarantineThreshold parameter are sent to the spam quarantine mailbox specified in the QuarantineMailbox parameter.
312+
The SCLQuarantineEnabled parameter specifies whether all messages that meet or exceed the value set in the SCLQuarantineThreshold parameter are sent to the spam quarantine mailbox specified in the QuarantineMailbox parameter. Valid values are:
313+
314+
- $true: Messages that meet or exceed the value set in the SCLQuarantineThreshold parameter are sent to the spam quarantine mailbox specified in the QuarantineMailbox parameter.
315+
- $false: Messages aren't quarantined. This is the default value.
287316

288317
```yaml
289318
Type: Boolean
@@ -315,7 +344,10 @@ Accept wildcard characters: False
315344
```
316345

317346
### -SCLRejectEnabled
318-
The SCLRejectEnabled parameter specifies whether all messages that meet or exceed the value set in the SCLRejectThreshold parameter are rejected, and an NDR is sent to the sender. Valid input for the SCLRejectEnabled parameter is $true or $false. The default setting is $false. When SCLRejectEnabled parameter is set to $true, all messages that meet or exceed the value set in the SCLRejectThreshold parameter are rejected, and an NDR is sent to the sender.
347+
The SCLRejectEnabled parameter specifies whether all messages that meet or exceed the value set in the SCLRejectThreshold parameter are rejected in an NDR to the sender. Valid values are:
348+
349+
- $true: Messages that meet or exceed the value set in the SCLRejectThreshold parameter are rejected in an NDR is to the sender.
350+
- $false: Messages aren't rejected. This is the default value.
319351

320352
```yaml
321353
Type: Boolean

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ The DeletedResources parameter specifies the deleted Microsoft 365 Group, mailbo
674674

675675
A valid value is a JSON string. Refer to the Examples section for syntax and usage examples of this parameter.
676676

677-
**CAUTION**: When you use a SMTP address with this parameter, be aware that the same address might also be in use for other mailboxes or mail users. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace *user@example.com* with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] |Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
677+
**CAUTION**: When you use a SMTP address with this parameter, be aware that the same address might also be in use for other mailboxes or mail users. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace `user@contoso.com` with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] | Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
678678

679679
To prevent active mailboxes or mail users with the same SMTP address from being excluded, put the mailbox on [Litigation Hold](https://learn.microsoft.com/purview/ediscovery-create-a-litigation-hold) before you run the command with the DeletedResources parameter.
680680

exchange/exchange-ps/exchange/Test-MigrationServerAvailability.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ Accept wildcard characters: False
258258
```
259259
260260
### -Credentials
261-
The Credentials parameter specifies the username and password for an account that can access mailboxes on the target server. Specify the username in the domain\\username format or the user principal name (UPN) (user@example.com) format.
261+
The Credentials parameter specifies the username and password for an account that can access mailboxes on the target server. Specify the username in the domain\\username format or the user principal name (UPN) format (for example, `user@contoso.com`).
262262

263263
A value for this parameter requires the Get-Credential cmdlet. To pause this command and receive a prompt for credentials, use the value `(Get-Credential)`. Or, before you run this command, store the credentials in a variable (for example, `$cred = Get-Credential`) and then use the variable name (`$cred`) for this parameter. For more information, see [Get-Credential](https://learn.microsoft.com/powershell/module/microsoft.powershell.security/get-credential).
264264

teams/teams-ps/teams/Get-CsPhoneNumberAssignment.md

+4-16
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,17 @@ This example returns information about all phone numbers that contain the digits
126126

127127
### Example 8
128128
```powershell
129-
(Get-CsPhoneNumberAssignment | Where-Object {$_.NumberType.Contains('CallingPlan') -and $_.Capability.Contains('UserAssignment') -and ($_.PstnAssignmentStatus.Contains('UserAssigned') -or $_.PstnAssignmentStatus.Contains('Unassigned'))}).Count
130-
```
131-
This example returns the number of Calling Plan subscriber phone numbers that are either assigned or not assigned to users.
132-
133-
### Example 9
134-
```powershell
135-
Get-CsPhoneNumberAssignment -Top (50::500)
136-
```
137-
This example returns all phone numbers in the record between sequence 50 to 500. This parameter can be used to get upto a maximum 1000 results at a time.
138-
139-
### Example 10
140-
```powershell
141129
Get-CsPhoneNumberAssignment -Skip 1000 -Top 1000
142130
```
143131
This example returns all phone numbers sequenced between 1001 to 2000 in the record of phone numbers.
144132

145-
### Example 11
133+
### Example 9
146134
```powershell
147135
Get-CsPhoneNumberAssignment -AssignedPstnTargetId 'TeamsSharedCallingRoutingPolicy|Tag:SC1'
148136
```
149137
This example returns all phone numbers assigned as emergency numbers in the Teams shared calling routing policy instance SC1.
150138

151-
### Example 12
139+
### Example 10
152140
```powershell
153141
Get-CsPhoneNumberAssignment -TelephoneNumber "+12065551000;ext=524"
154142
```
@@ -176,7 +164,7 @@ ReverseNumberLookup : {SkipInternalVoip}
176164
```
177165
This example displays when SkipInternalVoip option is turned on for a number.
178166

179-
### Example 13
167+
### Example 11
180168
```powershell
181169
Get-CsPhoneNumberAssignment -Filter "TelephoneNumber -eq '+12065551000'"
182170
```
@@ -204,7 +192,7 @@ ReverseNumberLookup : {}
204192
```
205193
This example shows a way to use -Filter parameter to display information of a specific number.
206194

207-
### Example 14
195+
### Example 12
208196
```powershell
209197
Get-CsPhoneNumberAssignment -Filter "TelephoneNumber -like '+12065551000' -and NumberType -eq 'DirectRouting'"
210198
```

teams/teams-ps/teams/Set-CsTeamsMeetingPolicy.md

-3
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,6 @@ Accept wildcard characters: False
226226
227227
Determines whether anonymous users are allowed to dial out to a PSTN number. Set this to TRUE to allow anonymous users to dial out. Set this to FALSE to prohibit anonymous users from dialing out.
228228
229-
> [!NOTE]
230-
> This parameter is temporarily disabled.
231-
232229
```yaml
233230
Type: Boolean
234231
Parameter Sets: (All)

0 commit comments

Comments
 (0)