Merge branch 'master' into patch-5

Author: tiburd

exchange/exchange-ps/exchange/New-OutboundConnector.md

@@ -35,7 +35,8 @@ New-OutboundConnector [-Name] <String>
  [-LinkForModifiedConnector <Guid>]
  [-RecipientDomains <MultiValuedProperty>]
  [-RouteAllMessagesViaOnPremises <Boolean>]
- [-SmartHosts <MultiValuedProperty>]
+ [-SenderRewritingEnabled <Boolean>]
+ [-SmartHosts <MultiValuedProperty>] 
  [-TestMode <Boolean>]
  [-TlsDomain <SmtpDomainWithSubdomains>]
  [-TlsSettings <TlsAuthLevel>]
@@ -288,6 +289,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -SenderRewritingEnabled
+The SenderRewritingEnabled parameter specifies that all messages that normally qualify for SRS rewritting are rewritten for traffic to on-premises. This parameter is only effective for OnPremises connectors as Partner connectors already have SRS rewritting enabled. Valid values are:
+
+- $true: Messages are rewritten by SRS if they need to be before being routed through the on-premises messaging system. This setting requires you to set the ConnectorType parameter to the value OnPremises in the same command.
+- $false: Messages aren't rewritten by SRS before being routed through the on-premises messaging system. 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
+```
+
 ### -SmartHosts
 The SmartHosts parameter specifies the smart host that the Outbound connector uses to route mail. Valid values are:
 

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

@@ -42,6 +42,7 @@ New-SafeLinksPolicy [-Name] <String>
  [-TrackClicks <Boolean>]
  [-UseTranslatedNotificationText <Boolean>]
  [-WhatIf]
+ [-DisableUrlRewrite <Boolean>]
  [-WhiteListedUrls <String>]
  [<CommonParameters>]
 ```
@@ -170,6 +171,24 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DisableUrlRewrite
+The DisableUrlRewrite parameter specifies whether to rewrite (wrap) URLs in email messages. Valid values are:
+
+- $true: URLs in messages are not rewritten, but messages are still scanned by Safe Links prior to delivery. Time of click checks on links are done using the Safe Links API in supported Outlook clients (currently, Outlook for Windows and Outlook for Mac). Typically, we don't recommend using this value.
+- $false: URLs in messages are rewritten. API checks still occur on unwrapped URLs in supported clients if the user is in a valid Safe Links policy. This is the default value.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+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 on warning pages. Valid values are:
 

exchange/exchange-ps/exchange/Set-OutboundConnector.md

@@ -37,6 +37,7 @@ Set-OutboundConnector [-Identity] <OutboundConnectorIdParameter>
  [-Name <String>]
  [-RecipientDomains <MultiValuedProperty>]
  [-RouteAllMessagesViaOnPremises <Boolean>]
+ [-SenderRewritingEnabled <Boolean>] 
  [-SmartHosts <MultiValuedProperty>]
  [-TestMode <Boolean>]
  [-TlsDomain <SmtpDomainWithSubdomains>]
@@ -332,6 +333,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -SenderRewritingEnabled
+The SenderRewritingEnabled parameter specifies that all messages that normally qualify for SRS rewritting are rewritten for traffic to on-premises. This parameter is only effective for OnPremises connectors as Partner connectors already have SRS rewritting enabled. Valid values are:
+
+- $true: Messages are rewritten by SRS if they need to be before being routed through the on-premises messaging system. This setting requires you to set the ConnectorType parameter to the value OnPremises in the same command.
+- $false: Messages aren't rewritten by SRS before being routed through the on-premises messaging system. 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
+```
+
 ### -SmartHosts
 The SmartHosts parameter specifies the smart host that the Outbound connector uses to route mail. Valid values are:
 

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

@@ -41,6 +41,7 @@ Set-SafeLinksPolicy [-Identity] <SafeLinksPolicyIdParameter>
  [-TrackClicks <Boolean>]
  [-UseTranslatedNotificationText <Boolean>]
  [-WhatIf]
+ [-DisableUrlRewrite <Boolean>]
  [-WhiteListedUrls <String>]
  [<CommonParameters>]
 ```
@@ -389,6 +390,24 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DisableUrlRewrite
+The DisableUrlRewrite parameter specifies whether to rewrite (wrap) URLs in email messages. Valid values are:
+
+- $true: URLs in messages are not rewritten, but messages are still scanned by Safe Links prior to delivery. Time of click checks on links are done using the Safe Links API in supported Outlook clients (currently, Outlook for Windows and Outlook for Mac). Typically, we don't recommend using this value.
+- $false: URLs in messages are rewritten. API checks still occur on unwrapped URLs in supported clients if the user is in a valid Safe Links policy. This is the default value.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhiteListedUrls
 This parameter has been deprecated. Use the DoNotRewriteUrls parameter instead.