Merge branch 'master' into patch-151

chrisda · web-flow · commit 22478d1a111b · 2020-05-22T11:03:49.000-07:00
diff --git a/exchange/exchange-ps/exchange/New-SafeAttachmentPolicy.md b/exchange/exchange-ps/exchange/New-SafeAttachmentPolicy.md
@@ -25,9 +25,16 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-SafeAttachmentPolicy [-Name] <String> [-Action <SafeAttachmentAction>]
- [-ActionOnError <Boolean>] [-AdminDisplayName <String>] [-Confirm] [-Enable <Boolean>]
- [-Redirect <Boolean>] [-RedirectAddress <SmtpAddress>] [-WhatIf] [<CommonParameters>]
+New-SafeAttachmentPolicy [-Name] <String>
+ [-Action <SafeAttachmentAction>]
+ [-ActionOnError <Boolean>]
+ [-AdminDisplayName <String>]
+ [-Confirm]
+ [-Enable <Boolean>]
+ [-Redirect <Boolean>]
+ [-RedirectAddress <SmtpAddress>]
+ [-WhatIf]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/exchange/exchange-ps/exchange/New-SafeLinksPolicy.md b/exchange/exchange-ps/exchange/New-SafeLinksPolicy.md
@@ -25,11 +25,22 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-SafeLinksPolicy [-Name] <String> [-AdminDisplayName <String>] [-AllowClickThrough <Boolean>]
- [-Confirm] [-DoNotAllowClickThrough <Boolean>] [-DoNotRewriteUrls <MultiValuedProperty>]
- [-DoNotTrackUserClicks <Boolean>] [-Enabled <Boolean>]
- [-EnableForInternalSenders <Boolean>] [-ExcludedUrls <String[]>] [-IsEnabled <Boolean>]
- [-ScanUrls <Boolean>] [-TrackClicks <Boolean>] [-WhatIf] [-WhiteListedUrls <String>]
+New-SafeLinksPolicy [-Name] <String>
+ [-AdminDisplayName <String>]
+ [-AllowClickThrough <Boolean>]
+ [-Confirm]
+ [-DeliverMessageAfterScan <Boolean>]
+ [-DoNotAllowClickThrough <Boolean>]
+ [-DoNotRewriteUrls <MultiValuedProperty>]
+ [-DoNotTrackUserClicks <Boolean>]
+ [-EnableForInternalSenders <Boolean>]
+ [-EnableSafeLinksForTeams <Boolean>]
+ [-ExcludedUrls <String[]>]
+ [-IsEnabled <Boolean>]
+ [-ScanUrls <Boolean>]
+ [-TrackClicks <Boolean>]
+ [-WhatIf]
+ [-WhiteListedUrls <String>]
  [<CommonParameters>]
 ```
 
@@ -123,12 +134,32 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DeliverMessageAfterScan
+The DeliverMessageAfterScan parameter specifies whether to deliver email messages only after Safe Links scanning is complete. Valid values are:
+
+- $true: Wait until Safe Links scanning is complete before delivering the message.
+
+- $false: If Safe Links scanning can't complete, deliver the message anyway. This is the default value.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -DoNotAllowClickThrough
 The DoNotAllowClickThrough parameter specifies whether to allow users to click through to the original URL. Valid values are:
 
-- $true: The user isn't allowed to click through to the original URL. This is the default value.
+- $true: The user isn't allowed to click through to the original URL.
 
-- $false: The user is allowed to click through to the original URL.
+- $false: The user is allowed to click through to the original URL. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -162,9 +193,9 @@ Accept wildcard characters: False
 ### -DoNotTrackUserClicks
 The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages. Valid values are:
 
-- $true: User clicks aren't tracked. This is the default value.
+- $true: User clicks aren't tracked.
 
-- $false: User clicks are tracked.
+- $false: User clicks are tracked. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -179,12 +210,12 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Enabled
-The Enabled parameter specifies whether the policy is enabled. Valid values are:
+### -EnableForInternalSenders
+The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
 
-- $true: The rule or policy is enabled.
+- $true: The policy is applied to internal and external senders.
 
-- $false: The rule or policy is disabled. This is the default value
+- $false: The policy is applied only to external senders. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -199,12 +230,12 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -EnableForInternalSenders
-The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
+### -EnableSafeLinksForTeams
+The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
-- $true: The policy is applied to internal and external senders.
+- $true: Safe Links is enabled for Teams.
 
-- $false: The policy is applied only to external senders. This is the default value.
+- $false: Safe Links isn't enabled for Teams. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -236,7 +267,11 @@ Accept wildcard characters: False
 ```
 
 ### -IsEnabled
-This parameter is reserved for internal Microsoft use.
+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:
+
+- $true: Rewrite URLs and check against a list of known malicious links whenever a user clicks on a link.
+
+- $false: Don't rewrite URLs. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -252,11 +287,11 @@ Accept wildcard characters: False
 ```
 
 ### -ScanUrls
-The ScanUrls parameter specifies whether to enable or disable the scanning of links in email messages. Valid values are:
+The ScanUrls parameter specifies whether to enable or disable real-time scanning of links in email messages. Valid values are:
 
-- $true: Scanning links in email messages is enabled.
+- $true: Real-time scanning links in email messages is enabled.
 
-- $false: Scanning links in email messages is disabled. This is the default value.
+- $false: Real-time scanning links in email messages is disabled. This is the default value.
 
 ```yaml
 Type: Boolean
diff --git a/exchange/exchange-ps/exchange/Set-AtpPolicyForO365.md b/exchange/exchange-ps/exchange/Set-AtpPolicyForO365.md
@@ -38,7 +38,7 @@ Set-AtpPolicyForO365 [[-Identity] <AtpPolicyForO365IdParameter>]
  [-Confirm]
  [-EnableATPForSPOTeamsODB <Boolean>]
  [-EnableSafeDocs <Boolean>]
- [-EnableSafeLinksForClients <Boolean>]
+ [-EnableSafeLinksForO365Clients <Boolean>]
  [-TrackClicks <Boolean>]
  [-WhatIf] [<CommonParameters>]
 ```
@@ -155,11 +155,11 @@ Accept wildcard characters: False
 ```
 
 ### -EnableATPForSPOTeamsODB
-The EnableATPForSPOTeamsODB parameter specifies whether ATP is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams. Valid values are:
+The EnableATPForSPOTeamsODB parameter specifies whether Safe Attachments is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams. Valid values are:
 
-- $true: ATP is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams.
+- $true: Safe Attachments is enabled for SharePoint Online, OneDrive for Business and Microsoft Teams.
 
-- $false: ATP is disabled for SharePoint Online, OneDrive for Business and Microsoft Teams. This is the default value.
+- $false: Safe Attachments is disabled for SharePoint Online, OneDrive for Business and Microsoft Teams. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -194,15 +194,13 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -EnableSafeLinksForClients
-The EnableSafeLinksForClients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
+### -EnableSafeLinksForO365Clients
+The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
 
 - $true: Safe Links are enabled for Office 365 apps. This is the default value.
 
 - $false: Safe Links are disabled for Office 365 apps.
 
-This parameter is being replaced by EnableSafeLinksForO365Clients with the same functionality. Use which ever one is currently available in your tenant.
-
 ```yaml
 Type: Boolean
 Parameter Sets: (All)
diff --git a/exchange/exchange-ps/exchange/Set-Label.md b/exchange/exchange-ps/exchange/Set-Label.md
@@ -44,10 +44,24 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
 
 ### Example 1
 ```powershell
-Set-Label -Identity General -LocaleSettings '{"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de","Value":"Deutscher Anzeigename"},{"Key":"es-es","Value":"Nombre para mostrar en Español"}]}'
+$Languages = @("fr-fr","it-it","de-de")
+$DisplayNames=@("Publique","Publico","Oeffentlich")
+$Tooltips = @("Texte Français","Testo italiano","Deutscher text")
+$label = "Public"
+$DisplayNameLocaleSettings = [PSCustomObject]@{LocaleKey='DisplayName';
+Settings=@(
+@{key=$Languages[0];Value=$DisplayNames[0];}
+@{key=$Languages[1];Value=$DisplayNames[1];}
+@{key=$Languages[2];Value=$DisplayNames[2];})}
+$TooltipLocaleSettings = [PSCustomObject]@{LocaleKey='Tooltip';
+Settings=@(
+@{key=$Languages[0];Value=$Tooltips[0];}
+@{key=$Languages[1];Value=$Tooltips[1];}
+@{key=$Languages[2];Value=$Tooltips[2];})}
+Set-Label -Identity $Label -LocaleSettings (ConvertTo-Json $DisplayNameLocaleSettings -Depth 3 -Compress),(ConvertTo-Json $TooltipLocaleSettings -Depth 3 -Compress)
 ```
 
-This example sets the localized label name for "General" in different languages (English, German, and Spanish).
+This example sets the localized label name for "Public" in different languages (French, Italian, and German).
 
 ## PARAMETERS
 
diff --git a/exchange/exchange-ps/exchange/Set-SafeAttachmentPolicy.md b/exchange/exchange-ps/exchange/Set-SafeAttachmentPolicy.md
@@ -26,9 +26,15 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Set-SafeAttachmentPolicy [-Identity] <SafeAttachmentPolicyIdParameter>
- [-Action <SafeAttachmentAction>] [-ActionOnError <Boolean>]
- [-AdminDisplayName <String>] [-Confirm] [-Enable <Boolean>] [-Redirect <Boolean>]
- [-RedirectAddress <SmtpAddress>] [-WhatIf] [<CommonParameters>]
+ [-Action <SafeAttachmentAction>]
+ [-ActionOnError <Boolean>]
+ [-AdminDisplayName <String>]
+ [-Confirm]
+ [-Enable <Boolean>]
+ [-Redirect <Boolean>]
+ [-RedirectAddress <SmtpAddress>]
+ [-WhatIf]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md b/exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md
@@ -25,11 +25,22 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Set-SafeLinksPolicy [-Identity] <SafeLinksPolicyIdParameter> [-AdminDisplayName <String>]
- [-AllowClickThrough <Boolean>] [-Confirm] [-DoNotAllowClickThrough <Boolean>]
- [-DoNotRewriteUrls <MultiValuedProperty>] [-DoNotTrackUserClicks <Boolean>] [-Enabled <Boolean>]
- [-EnableForInternalSenders <Boolean>] [-ExcludedUrls <String[]>] [-IsEnabled <Boolean>]
- [-ScanUrls <Boolean>] [-TrackClicks <Boolean>] [-WhatIf] [-WhiteListedUrls <String>]
+Set-SafeLinksPolicy [-Identity] <SafeLinksPolicyIdParameter>
+ [-AdminDisplayName <String>]
+ [-AllowClickThrough <Boolean>]
+ [-Confirm]
+ [-DeliverMessageAfterScan <Boolean>
+ [-DoNotAllowClickThrough <Boolean>]
+ [-DoNotRewriteUrls <MultiValuedProperty>]
+ [-DoNotTrackUserClicks <Boolean>]
+ [-EnableForInternalSenders <Boolean>]
+ [-EnableSafeLinksForTeams <Boolean>]
+ [-ExcludedUrls <String[]>]
+ [-IsEnabled <Boolean>]
+ [-ScanUrls <Boolean>]
+ [-TrackClicks <Boolean>]
+ [-WhatIf]
+ [-WhiteListedUrls <String>]
  [<CommonParameters>]
 ```
 
@@ -125,12 +136,32 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DeliverMessageAfterScan
+The DeliverMessageAfterScan parameter specifies whether to deliver email messages only after Safe Links scanning is complete. Valid values are:
+
+- $true: Wait until Safe Links scanning is complete before delivering the message.
+
+- $false: If Safe Links scanning can't complete, deliver the message anyway. This is the default value.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -DoNotAllowClickThrough
 The DoNotAllowClickThrough parameter specifies whether to allow users to click through to the original URL. Valid values are:
 
-- $true: The user isn't allowed to click through to the original URL. This is the default value.
+- $true: The user isn't allowed to click through to the original URL.
 
-- $false: The user is allowed to click through to the original URL.
+- $false: The user is allowed to click through to the original URL. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -164,9 +195,9 @@ Accept wildcard characters: False
 ### -DoNotTrackUserClicks
 The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages. Valid values are:
 
-- $true: User clicks aren't tracked. This is the default value.
+- $true: User clicks aren't tracked.
 
-- $false: User clicks are tracked.
+- $false: User clicks are tracked. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -181,12 +212,12 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Enabled
-The Enabled parameter specifies whether the policy is enabled. Valid values are:
+### -EnableForInternalSenders
+The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
 
-- $true: The policy is enabled.
+- $true: The policy is applied to internal and external senders.
 
-- $false: The policy is disabled.
+- $false: The policy is applied only to external senders. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -201,12 +232,12 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -EnableForInternalSenders
-The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
+### -EnableSafeLinksForTeams
+The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
-- $true: The policy is applied to internal and external senders.
+- $true: Safe Links is enabled for Teams.
 
-- $false: The policy is applied only to external senders. This is the default value.
+- $false: Safe Links isn't enabled for Teams.
 
 ```yaml
 Type: Boolean
@@ -238,11 +269,11 @@ Accept wildcard characters: False
 ```
 
 ### -IsEnabled
-This parameter specifies whether the rule or policy is enabled. Valid values are:
+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:
 
-- $true: The rule or policy is enabled.
+- $true: Rewrite URLs and check against a list of known malicious links whenever a user clicks on a link.
 
-- $false: The rule or policy is disabled. This is the default value.
+- $false: Don't rewrite URLs. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -258,11 +289,11 @@ Accept wildcard characters: False
 ```
 
 ### -ScanUrls
-The ScanUrls parameter specifies whether to enable or disable the scanning of links in email messages. Valid values are:
+The ScanUrls parameter specifies whether to enable or disable real-time scanning of links in email messages. Valid values are:
 
-- $true: Scanning links in email messages is enabled.
+- $true: Real-time scanning links in email messages is enabled.
 
-- $false: Scanning links in email messages is disabled. This is the default value.
+- $false: Real-time scanning links in email messages is disabled. This is the default value.
 
 ```yaml
 Type: Boolean
