Merge pull request MicrosoftDocs#2689 from MicrosoftDocs/master

Master to Live

Author: chrisda

exchange/exchange-ps/exchange/policy-and-compliance/New-TransportRule.md

@@ -4484,7 +4484,9 @@ In on-premises Exchange, this action is only available on Mailbox servers.
 
 The RejectMessageEnhancedStatusCode parameter specifies the enhanced status code that's used when the rule rejects messages. Valid values are 5.7.1 or between 5.7.900 and 5.7.999.
 
-You can use this parameter with the NotifySender and RejectMessageReasonText parameters to specify the custom enhanced status code that's used. If you don't use this parameter, the default value 5.7.1 is used.
+You can use this parameter with the NotifySender parameter for a custom non-delivery report (also known as an NDR or bounce message).
+
+If you use this parameter with the RejectMessageReasonText parameter, the enhanced status code value is set to 5.7.1.
 
 To further customize the NDR (for example, multiple languages), you need to create a custom message by using the New-SystemMessage cmdlet.
 
@@ -4507,7 +4509,9 @@ In on-premises Exchange, this action is only available on Mailbox servers.
 
 The RejectMessageReasonText parameter specifies the explanation text that's used when the rule rejects messages. If the value contains spaces, enclose the value in quotation marks (").
 
-You can use this parameter with the NotifySender and RejectMessageEnhancedStatusCode parameters to specify the custom explanation text that's used. If you don't use this parameter, the default value Delivery not authorized, message refused is used.
+You can use this parameter with the NotifySender parameter for a custom non-delivery report (also known as an NDR or bounce message).
+
+If you use this parameter with the RejectMessageEnhancedStatusCode parameter, the custom explanation text value is set to "Delivery not authorized, message refused".
 
 To further customize the NDR (for example, multiple languages), you need to create a custom message by using the New-SystemMessage cmdlet.
 

exchange/exchange-ps/exchange/policy-and-compliance/Set-TransportRule.md

@@ -4479,7 +4479,9 @@ In on-premises Exchange, this action is only available on Mailbox servers.
 
 The RejectMessageEnhancedStatusCode parameter specifies the enhanced status code that's used when the rule rejects messages. Valid values are 5.7.1 or between 5.7.900 and 5.7.999.
 
-You can use this parameter with the NotifySender and RejectMessageReasonText parameters to specify the custom enhanced status code that's used. If you don't use this parameter, the default value 5.7.1 is used.
+You can use this parameter with the NotifySender parameter for a custom non-delivery report (also known as an NDR or bounce message).
+
+If you use this parameter with the RejectMessageReasonText parameter, the enhanced status code value is set to 5.7.1.
 
 To further customize the NDR (for example, multiple languages), you need to create a custom message by using the New-SystemMessage cmdlet.
 
@@ -4502,7 +4504,9 @@ In on-premises Exchange, this action is only available on Mailbox servers.
 
 The RejectMessageReasonText parameter specifies the explanation text that's used when the rule rejects messages. If the value contains spaces, enclose the value in quotation marks (").
 
-You can use this parameter with the NotifySender and RejectMessageEnhancedStatusCode parameters to specify the custom explanation text that's used. If you don't use this parameter, the default value Delivery not authorized, message refused is used.
+You can use this parameter with the NotifySender parameter for a custom non-delivery report (also known as an NDR or bounce message).
+
+If you use this parameter with the RejectMessageEnhancedStatusCode parameter, the custom explanation text value is set to "Delivery not authorized, message refused".
 
 To further customize the NDR (for example, multiple languages), you need to create a custom message by using the New-SystemMessage cmdlet.
 

exchange/exchange-ps/exchange/reporting/Set-UserAnalyticsConfig.md

@@ -79,11 +79,11 @@ Accept wildcard characters: False
 ### -PrivacyMode
 The PrivacyMode parameter specifies the MyAnalytics privacy setting for the user. Valid values are:
 
-- Exclude
+- Excluded
 
-- OptIn
+- Opt-In
 
-- OptOut
+- Opt-Out
 
 ```yaml
 Type: String

tools/office-cmdlet-updater/README.md

@@ -2,7 +2,7 @@
 
 ## Usage:
 1. Clone repo at: https://github.com/microsoftdocs/office-docs-powershell
-2. Configure your email address in tools/.local/default.json to receive emailed logs. (OPTIONAL)
+2. Configure your email address in `tools/.local/default.json` to receive emailed logs. (OPTIONAL)
 3. Confirm you have NodeJS installed.
     Open PowerShell or GitBash and type `npm --version`.
     If not, install from [https://nodejs.org/en/download/](https://nodejs.org/en/download/).
@@ -29,5 +29,3 @@
 ## Notes
 1. Some modules could be installed from the PowerShell Gallery (PSGallery). This gallery contains user submitted code. If you would rather not install modules from the PSGallery then you can install the modules manually prior to running the tool. If you need to add PSGallery as a trusted source, you can do so with the following command: `Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted`
 2. Run the tool from PowerShell x64 as an Administrator user
-
-## Sample Run