Skip to content

Commit 60e6827

Browse files
authored
Merge branch 'FeatureConfig-chrisda' into patch-8
2 parents c552964 + c1cbc2c commit 60e6827

12 files changed

+292
-48
lines changed

exchange/exchange-ps/exchange/Get-FeatureConfiguration.md

+54-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ For information about the parameter sets in the Syntax section below, see [Excha
2020
## SYNTAX
2121

2222
```
23-
Get-FeatureConfiguration [-FeatureScenario] <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario>
24-
[[-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>]
23+
Get-FeatureConfiguration [[-Identity] <PolicyIdParameter>] [-FeatureScenario] <PolicyScenario>
24+
[-All]
2525
[-Confirm]
26+
[-GeneralDiscovery]
27+
[-IrmDiscovery]
2628
[-WhatIf]
2729
[<CommonParameters>]
2830
```
@@ -56,7 +58,7 @@ The Identity policy specifies the Discovery policy that you want to view. You ca
5658
- GUID
5759

5860
```yaml
59-
Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter
61+
Type: PolicyIdParameter
6062
Parameter Sets: (All)
6163
Aliases:
6264
Applicable: Security & Compliance
@@ -72,7 +74,7 @@ Accept wildcard characters: False
7274
The FeatureScenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
7375
7476
```yaml
75-
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
77+
Type: PolicyScenario
7678
Parameter Sets: (All)
7779
Aliases:
7880
Applicable: Security & Compliance
@@ -84,6 +86,22 @@ Accept pipeline input: False
8486
Accept wildcard characters: False
8587
```
8688
89+
### -All
90+
{{ Fill All Description }}
91+
92+
```yaml
93+
Type: SwitchParameter
94+
Parameter Sets: (All)
95+
Aliases:
96+
Applicable: Security & Compliance
97+
98+
Required: False
99+
Position: Named
100+
Default value: None
101+
Accept pipeline input: False
102+
Accept wildcard characters: False
103+
```
104+
87105
### -Confirm
88106
This parameter is reserved for internal Microsoft use.
89107
@@ -100,6 +118,38 @@ Accept pipeline input: False
100118
Accept wildcard characters: False
101119
```
102120
121+
### -GeneralDiscovery
122+
{{ Fill GeneralDiscovery Description }}
123+
124+
```yaml
125+
Type: SwitchParameter
126+
Parameter Sets: (All)
127+
Aliases:
128+
Applicable: Security & Compliance
129+
130+
Required: False
131+
Position: Named
132+
Default value: None
133+
Accept pipeline input: False
134+
Accept wildcard characters: False
135+
```
136+
137+
### -IrmDiscovery
138+
{{ Fill IrmDiscovery Description }}
139+
140+
```yaml
141+
Type: SwitchParameter
142+
Parameter Sets: (All)
143+
Aliases:
144+
Applicable: Security & Compliance
145+
146+
Required: False
147+
Position: Named
148+
Default value: None
149+
Accept pipeline input: False
150+
Accept wildcard characters: False
151+
```
152+
103153
### -WhatIf
104154
This parameter is reserved for internal Microsoft use.
105155

exchange/exchange-ps/exchange/New-FeatureConfiguration.md

+37-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ For information about the parameter sets in the Syntax section below, see [Excha
2222
## SYNTAX
2323

2424
```
25-
New-FeatureConfiguration -Name <String> -Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode> -FeatureScenario <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario> -ScenarioConfig <String>
25+
New-FeatureConfiguration [-Name] <String> -Mode <PolicyMode> -FeatureScenario <PolicyScenario> -ScenarioConfig <String>
2626
[-Comment <String>]
2727
[-Confirm]
28+
[-GeneralDiscovery]
29+
[-IrmDiscovery]
2830
[-Locations <String>]
2931
[-WhatIf]
3032
[<CommonParameters>]
@@ -90,7 +92,7 @@ The FeatureScenario parameter specifies the scenario for the feature configurati
9092
- `TrustContainer` for Endpoint DLP trust container
9193

9294
```yaml
93-
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
95+
Type: PolicyScenario
9496
Parameter Sets: (All)
9597
Aliases:
9698
Applicable: Security & Compliance
@@ -109,7 +111,7 @@ The Mode parameter specifies feature configuration mode. Valid values are:
109111
- Disable: The feature configuration is disabled.
110112

111113
```yaml
112-
Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyMode
114+
Type: PolicyMode
113115
Parameter Sets: (All)
114116
Aliases:
115117
Applicable: Security & Compliance
@@ -172,6 +174,38 @@ Accept pipeline input: False
172174
Accept wildcard characters: False
173175
```
174176

177+
### -GeneralDiscovery
178+
{{ Fill GeneralDiscovery Description }}
179+
180+
```yaml
181+
Type: SwitchParameter
182+
Parameter Sets: (All)
183+
Aliases:
184+
Applicable: Security & Compliance
185+
186+
Required: False
187+
Position: Named
188+
Default value: None
189+
Accept pipeline input: False
190+
Accept wildcard characters: False
191+
```
192+
193+
### -IrmDiscovery
194+
{{ Fill IrmDiscovery Description }}
195+
196+
```yaml
197+
Type: SwitchParameter
198+
Parameter Sets: (All)
199+
Aliases:
200+
Applicable: Security & Compliance
201+
202+
Required: False
203+
Position: Named
204+
Default value: None
205+
Accept pipeline input: False
206+
Accept wildcard characters: False
207+
```
208+
175209
### -Locations
176210
The locations parameter specifies where the feature configuration applies.
177211

exchange/exchange-ps/exchange/Remove-FeatureConfiguration.md

+36-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ For information about the parameter sets in the Syntax section below, see [Excha
2020
## SYNTAX
2121

2222
```
23-
Remove-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
23+
Remove-FeatureConfiguration [-Identity] <PolicyIdParameter>
2424
[-Confirm]
25+
[-GeneralDiscovery]
26+
[-IrmDiscovery]
2527
[-WhatIf]
2628
[<CommonParameters>]
2729
```
@@ -48,7 +50,7 @@ The Identity policy specifies the Discovery policy that you want to remove. You
4850
- GUID
4951

5052
```yaml
51-
Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter
53+
Type: PolicyIdParameter
5254
Parameter Sets: (All)
5355
Aliases:
5456
Applicable: Security & Compliance
@@ -79,6 +81,38 @@ Accept pipeline input: False
7981
Accept wildcard characters: False
8082
```
8183

84+
### -GeneralDiscovery
85+
{{ Fill GeneralDiscovery Description }}
86+
87+
```yaml
88+
Type: SwitchParameter
89+
Parameter Sets: (All)
90+
Aliases:
91+
Applicable: Security & Compliance
92+
93+
Required: False
94+
Position: Named
95+
Default value: None
96+
Accept pipeline input: False
97+
Accept wildcard characters: False
98+
```
99+
100+
### -IrmDiscovery
101+
{{ Fill IrmDiscovery Description }}
102+
103+
```yaml
104+
Type: SwitchParameter
105+
Parameter Sets: (All)
106+
Aliases:
107+
Applicable: Security & Compliance
108+
109+
Required: False
110+
Position: Named
111+
Default value: None
112+
Accept pipeline input: False
113+
Accept wildcard characters: False
114+
```
115+
82116
### -WhatIf
83117
The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
84118

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

0 commit comments

Comments
 (0)