Skip to content

Commit fceffe4

Browse files
authored
Merge pull request MicrosoftDocs#5656 from MicrosoftDocs/chrisda
Updates to SafeLinks/SafeAttachments topics
2 parents 2f39053 + 61c18c8 commit fceffe4

File tree

5 files changed

+135
-58
lines changed

5 files changed

+135
-58
lines changed

exchange/exchange-ps/exchange/New-SafeAttachmentPolicy.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,16 @@ For information about the parameter sets in the Syntax section below, see [Excha
2525
## SYNTAX
2626

2727
```
28-
New-SafeAttachmentPolicy [-Name] <String> [-Action <SafeAttachmentAction>]
29-
[-ActionOnError <Boolean>] [-AdminDisplayName <String>] [-Confirm] [-Enable <Boolean>]
30-
[-Redirect <Boolean>] [-RedirectAddress <SmtpAddress>] [-WhatIf] [<CommonParameters>]
28+
New-SafeAttachmentPolicy [-Name] <String>
29+
[-Action <SafeAttachmentAction>]
30+
[-ActionOnError <Boolean>]
31+
[-AdminDisplayName <String>]
32+
[-Confirm]
33+
[-Enable <Boolean>]
34+
[-Redirect <Boolean>]
35+
[-RedirectAddress <SmtpAddress>]
36+
[-WhatIf]
37+
[<CommonParameters>]
3138
```
3239

3340
## DESCRIPTION

exchange/exchange-ps/exchange/New-SafeLinksPolicy.md

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,22 @@ For information about the parameter sets in the Syntax section below, see [Excha
2525
## SYNTAX
2626

2727
```
28-
New-SafeLinksPolicy [-Name] <String> [-AdminDisplayName <String>] [-AllowClickThrough <Boolean>]
29-
[-Confirm] [-DoNotAllowClickThrough <Boolean>] [-DoNotRewriteUrls <MultiValuedProperty>]
30-
[-DoNotTrackUserClicks <Boolean>] [-Enabled <Boolean>]
31-
[-EnableForInternalSenders <Boolean>] [-ExcludedUrls <String[]>] [-IsEnabled <Boolean>]
32-
[-ScanUrls <Boolean>] [-TrackClicks <Boolean>] [-WhatIf] [-WhiteListedUrls <String>]
28+
New-SafeLinksPolicy [-Name] <String>
29+
[-AdminDisplayName <String>]
30+
[-AllowClickThrough <Boolean>]
31+
[-Confirm]
32+
[-DeliverMessageAfterScan <Boolean>]
33+
[-DoNotAllowClickThrough <Boolean>]
34+
[-DoNotRewriteUrls <MultiValuedProperty>]
35+
[-DoNotTrackUserClicks <Boolean>]
36+
[-EnableForInternalSenders <Boolean>]
37+
[-EnableSafeLinksForTeams <Boolean>]
38+
[-ExcludedUrls <String[]>]
39+
[-IsEnabled <Boolean>]
40+
[-ScanUrls <Boolean>]
41+
[-TrackClicks <Boolean>]
42+
[-WhatIf]
43+
[-WhiteListedUrls <String>]
3344
[<CommonParameters>]
3445
```
3546

@@ -123,12 +134,32 @@ Accept pipeline input: False
123134
Accept wildcard characters: False
124135
```
125136
137+
### -DeliverMessageAfterScan
138+
The DeliverMessageAfterScan parameter specifies whether to deliver email messages only after Safe Links scanning is complete. Valid values are:
139+
140+
- $true: Wait until Safe Links scanning is complete before delivering the message.
141+
142+
- $false: If Safe Links scanning can't complete, deliver the message anyway. This is the default value.
143+
144+
```yaml
145+
Type: Boolean
146+
Parameter Sets: (All)
147+
Aliases:
148+
Applicable: Exchange Online, Exchange Online Protection
149+
150+
Required: False
151+
Position: Named
152+
Default value: None
153+
Accept pipeline input: False
154+
Accept wildcard characters: False
155+
```
156+
126157
### -DoNotAllowClickThrough
127158
The DoNotAllowClickThrough parameter specifies whether to allow users to click through to the original URL. Valid values are:
128159
129-
- $true: The user isn't allowed to click through to the original URL. This is the default value.
160+
- $true: The user isn't allowed to click through to the original URL.
130161
131-
- $false: The user is allowed to click through to the original URL.
162+
- $false: The user is allowed to click through to the original URL. This is the default value.
132163
133164
```yaml
134165
Type: Boolean
@@ -162,9 +193,9 @@ Accept wildcard characters: False
162193
### -DoNotTrackUserClicks
163194
The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages. Valid values are:
164195
165-
- $true: User clicks aren't tracked. This is the default value.
196+
- $true: User clicks aren't tracked.
166197
167-
- $false: User clicks are tracked.
198+
- $false: User clicks are tracked. This is the default value.
168199
169200
```yaml
170201
Type: Boolean
@@ -179,12 +210,12 @@ Accept pipeline input: False
179210
Accept wildcard characters: False
180211
```
181212
182-
### -Enabled
183-
The Enabled parameter specifies whether the policy is enabled. Valid values are:
213+
### -EnableForInternalSenders
214+
The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
184215
185-
- $true: The rule or policy is enabled.
216+
- $true: The policy is applied to internal and external senders.
186217
187-
- $false: The rule or policy is disabled. This is the default value
218+
- $false: The policy is applied only to external senders. This is the default value.
188219
189220
```yaml
190221
Type: Boolean
@@ -199,12 +230,12 @@ Accept pipeline input: False
199230
Accept wildcard characters: False
200231
```
201232
202-
### -EnableForInternalSenders
203-
The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
233+
### -EnableSafeLinksForTeams
234+
The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
204235
205-
- $true: The policy is applied to internal and external senders.
236+
- $true: Safe Links is enabled for Teams.
206237
207-
- $false: The policy is applied only to external senders. This is the default value.
238+
- $false: Safe Links isn't enabled for Teams. This is the default value.
208239
209240
```yaml
210241
Type: Boolean
@@ -236,7 +267,11 @@ Accept wildcard characters: False
236267
```
237268
238269
### -IsEnabled
239-
This parameter is reserved for internal Microsoft use.
270+
The IsEnabled parameter specifies whether to rewrite URLs and check against a list of known malicious links whenever a user clicks on a link in email messages. Valid values are:
271+
272+
- $true: Rewrite URLs and check against a list of known malicious links whenever a user clicks on a link.
273+
274+
- $false: Don't rewrite URLs. This is the default value.
240275
241276
```yaml
242277
Type: Boolean
@@ -252,11 +287,11 @@ Accept wildcard characters: False
252287
```
253288
254289
### -ScanUrls
255-
The ScanUrls parameter specifies whether to enable or disable the scanning of links in email messages. Valid values are:
290+
The ScanUrls parameter specifies whether to enable or disable real-time scanning of links in email messages. Valid values are:
256291
257-
- $true: Scanning links in email messages is enabled.
292+
- $true: Real-time scanning links in email messages is enabled.
258293
259-
- $false: Scanning links in email messages is disabled. This is the default value.
294+
- $false: Real-time scanning links in email messages is disabled. This is the default value.
260295
261296
```yaml
262297
Type: Boolean

exchange/exchange-ps/exchange/Set-AtpPolicyForO365.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Set-AtpPolicyForO365 [[-Identity] <AtpPolicyForO365IdParameter>]
3838
[-Confirm]
3939
[-EnableATPForSPOTeamsODB <Boolean>]
4040
[-EnableSafeDocs <Boolean>]
41-
[-EnableSafeLinksForClients <Boolean>]
41+
[-EnableSafeLinksForO365Clients <Boolean>]
4242
[-TrackClicks <Boolean>]
4343
[-WhatIf] [<CommonParameters>]
4444
```
@@ -155,11 +155,11 @@ Accept wildcard characters: False
155155
```
156156
157157
### -EnableATPForSPOTeamsODB
158-
The EnableATPForSPOTeamsODB parameter specifies whether ATP is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams. Valid values are:
158+
The EnableATPForSPOTeamsODB parameter specifies whether Safe Attachments is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams. Valid values are:
159159
160-
- $true: ATP is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams.
160+
- $true: Safe Attachments is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams.
161161
162-
- $false: ATP is disabled for SharePoint Online, OneDrive for Business and Microsoft Teams. This is the default value.
162+
- $false: Safe Attachments is disabled for SharePoint Online, OneDrive for Business and Microsoft Teams. This is the default value.
163163
164164
```yaml
165165
Type: Boolean
@@ -194,15 +194,13 @@ Accept pipeline input: False
194194
Accept wildcard characters: False
195195
```
196196
197-
### -EnableSafeLinksForClients
198-
The EnableSafeLinksForClients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
197+
### -EnableSafeLinksForO365Clients
198+
The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
199199
200200
- $true: Safe Links are enabled for Office 365 apps. This is the default value.
201201
202202
- $false: Safe Links are disabled for Office 365 apps.
203203
204-
This parameter is being replaced by EnableSafeLinksForO365Clients with the same functionality. Use which ever one is currently available in your tenant.
205-
206204
```yaml
207205
Type: Boolean
208206
Parameter Sets: (All)

exchange/exchange-ps/exchange/Set-SafeAttachmentPolicy.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@ For information about the parameter sets in the Syntax section below, see [Excha
2626

2727
```
2828
Set-SafeAttachmentPolicy [-Identity] <SafeAttachmentPolicyIdParameter>
29-
[-Action <SafeAttachmentAction>] [-ActionOnError <Boolean>]
30-
[-AdminDisplayName <String>] [-Confirm] [-Enable <Boolean>] [-Redirect <Boolean>]
31-
[-RedirectAddress <SmtpAddress>] [-WhatIf] [<CommonParameters>]
29+
[-Action <SafeAttachmentAction>]
30+
[-ActionOnError <Boolean>]
31+
[-AdminDisplayName <String>]
32+
[-Confirm]
33+
[-Enable <Boolean>]
34+
[-Redirect <Boolean>]
35+
[-RedirectAddress <SmtpAddress>]
36+
[-WhatIf]
37+
[<CommonParameters>]
3238
```
3339

3440
## DESCRIPTION

exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md

Lines changed: 54 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,22 @@ For information about the parameter sets in the Syntax section below, see [Excha
2525
## SYNTAX
2626

2727
```
28-
Set-SafeLinksPolicy [-Identity] <SafeLinksPolicyIdParameter> [-AdminDisplayName <String>]
29-
[-AllowClickThrough <Boolean>] [-Confirm] [-DoNotAllowClickThrough <Boolean>]
30-
[-DoNotRewriteUrls <MultiValuedProperty>] [-DoNotTrackUserClicks <Boolean>] [-Enabled <Boolean>]
31-
[-EnableForInternalSenders <Boolean>] [-ExcludedUrls <String[]>] [-IsEnabled <Boolean>]
32-
[-ScanUrls <Boolean>] [-TrackClicks <Boolean>] [-WhatIf] [-WhiteListedUrls <String>]
28+
Set-SafeLinksPolicy [-Identity] <SafeLinksPolicyIdParameter>
29+
[-AdminDisplayName <String>]
30+
[-AllowClickThrough <Boolean>]
31+
[-Confirm]
32+
[-DeliverMessageAfterScan <Boolean>
33+
[-DoNotAllowClickThrough <Boolean>]
34+
[-DoNotRewriteUrls <MultiValuedProperty>]
35+
[-DoNotTrackUserClicks <Boolean>]
36+
[-EnableForInternalSenders <Boolean>]
37+
[-EnableSafeLinksForTeams <Boolean>]
38+
[-ExcludedUrls <String[]>]
39+
[-IsEnabled <Boolean>]
40+
[-ScanUrls <Boolean>]
41+
[-TrackClicks <Boolean>]
42+
[-WhatIf]
43+
[-WhiteListedUrls <String>]
3344
[<CommonParameters>]
3445
```
3546

@@ -125,12 +136,32 @@ Accept pipeline input: False
125136
Accept wildcard characters: False
126137
```
127138
139+
### -DeliverMessageAfterScan
140+
The DeliverMessageAfterScan parameter specifies whether to deliver email messages only after Safe Links scanning is complete. Valid values are:
141+
142+
- $true: Wait until Safe Links scanning is complete before delivering the message.
143+
144+
- $false: If Safe Links scanning can't complete, deliver the message anyway. This is the default value.
145+
146+
```yaml
147+
Type: Boolean
148+
Parameter Sets: (All)
149+
Aliases:
150+
Applicable: Exchange Online, Exchange Online Protection
151+
152+
Required: False
153+
Position: Named
154+
Default value: None
155+
Accept pipeline input: False
156+
Accept wildcard characters: False
157+
```
158+
128159
### -DoNotAllowClickThrough
129160
The DoNotAllowClickThrough parameter specifies whether to allow users to click through to the original URL. Valid values are:
130161
131-
- $true: The user isn't allowed to click through to the original URL. This is the default value.
162+
- $true: The user isn't allowed to click through to the original URL.
132163
133-
- $false: The user is allowed to click through to the original URL.
164+
- $false: The user is allowed to click through to the original URL. This is the default value.
134165
135166
```yaml
136167
Type: Boolean
@@ -164,9 +195,9 @@ Accept wildcard characters: False
164195
### -DoNotTrackUserClicks
165196
The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages. Valid values are:
166197
167-
- $true: User clicks aren't tracked. This is the default value.
198+
- $true: User clicks aren't tracked.
168199
169-
- $false: User clicks are tracked.
200+
- $false: User clicks are tracked. This is the default value.
170201
171202
```yaml
172203
Type: Boolean
@@ -181,12 +212,12 @@ Accept pipeline input: False
181212
Accept wildcard characters: False
182213
```
183214
184-
### -Enabled
185-
The Enabled parameter specifies whether the policy is enabled. Valid values are:
215+
### -EnableForInternalSenders
216+
The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
186217
187-
- $true: The policy is enabled.
218+
- $true: The policy is applied to internal and external senders.
188219
189-
- $false: The policy is disabled.
220+
- $false: The policy is applied only to external senders. This is the default value.
190221
191222
```yaml
192223
Type: Boolean
@@ -201,12 +232,12 @@ Accept pipeline input: False
201232
Accept wildcard characters: False
202233
```
203234
204-
### -EnableForInternalSenders
205-
The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
235+
### -EnableSafeLinksForTeams
236+
The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
206237
207-
- $true: The policy is applied to internal and external senders.
238+
- $true: Safe Links is enabled for Teams.
208239
209-
- $false: The policy is applied only to external senders. This is the default value.
240+
- $false: Safe Links isn't enabled for Teams.
210241
211242
```yaml
212243
Type: Boolean
@@ -238,11 +269,11 @@ Accept wildcard characters: False
238269
```
239270
240271
### -IsEnabled
241-
This parameter specifies whether the rule or policy is enabled. Valid values are:
272+
The IsEnabled parameter specifies whether to rewrite URLs and check against a list of known malicious links whenever a user clicks on a link in email messages. Valid values are:
242273
243-
- $true: The rule or policy is enabled.
274+
- $true: Rewrite URLs and check against a list of known malicious links whenever a user clicks on a link.
244275
245-
- $false: The rule or policy is disabled. This is the default value.
276+
- $false: Don't rewrite URLs. This is the default value.
246277
247278
```yaml
248279
Type: Boolean
@@ -258,11 +289,11 @@ Accept wildcard characters: False
258289
```
259290
260291
### -ScanUrls
261-
The ScanUrls parameter specifies whether to enable or disable the scanning of links in email messages. Valid values are:
292+
The ScanUrls parameter specifies whether to enable or disable real-time scanning of links in email messages. Valid values are:
262293
263-
- $true: Scanning links in email messages is enabled.
294+
- $true: Real-time scanning links in email messages is enabled.
264295
265-
- $false: Scanning links in email messages is disabled. This is the default value.
296+
- $false: Real-time scanning links in email messages is disabled. This is the default value.
266297
267298
```yaml
268299
Type: Boolean

0 commit comments

Comments
 (0)