Merge pull request MicrosoftDocs#4793 from MicrosoftDocs/master

Merges Master to Live. See commits for details.

Author: chrisda

exchange/docs-conceptual/exchange-online/connect-to-exchange-online-powershell/mfa-connect-to-exchange-online-powershell.md

@@ -44,6 +44,8 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
 
 - The Exchange Online Remote PowerShell Module needs to be installed on your computer. You need to do the following steps in a browser that supports ClickOnce (for example, Internet Explorer or Edge):
 
+  **Note**: ClickOnce support is available in the Chromium-based version of Edge at <edge://flags/#edge-click-once>.
+
   1. Open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
 
   2. In the EAC, go to **Hybrid** > **Setup** and click the appropriate **Configure** button to download the Exchange Online Remote PowerShell Module for multi-factor authentication.

exchange/docs-conceptual/office-365-scc/connect-to-scc-powershell/mfa-connect-to-scc-powershell.md

@@ -44,9 +44,9 @@ If your account uses multi-factor authentication (MFA) or federated authenticati
 
 - The Exchange Online Remote PowerShell Module needs to be installed on your computer. If your installed version of the Exchange Online Remote PowerShell Module doesn't have the **Connect-IPPSSession** cmdlet, you need to install the latest version of the module:
 
-  1. In Internet Explorer or Edge, open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
+  1. In a browser that supports ClickOnce (for example, Internet Explorer or Edge), open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
 
-     **Note**: Internet Explorer or Edge is required because the download in the next step uses ClickOnce, so Google Chrome or Mozilla Firefox won't work.
+     **Note**: ClickOnce support is available in the Chromium-based version of Edge at <edge://flags/#edge-click-once>.
 
   2. In the EAC, go to **Hybrid** > **Setup** and click the appropriate **Configure** button to download the Exchange Online Remote PowerShell Module for multi-factor authentication.
 

exchange/exchange-ps/exchange/advanced-threat-protection/Set-PhishFilterPolicy.md

@@ -36,7 +36,9 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### Example 1
 ```powershell
-Get-PhishFilterPolicy -Detailed -SpoofAllowBlockList | Export-CSV "C:\My Documents\Spoofed Senders.csv"; $UpdateSpoofedSenders = Get-Content -Raw "C:\My Documents\Spoofed Senders.csv"; Set-PhishFilterPolicy -Identity Default -SpoofAllowBlockList $UpdateSpoofedSenders
+Get-PhishFilterPolicy -Detailed -SpoofAllowBlockList | Export-CSV "C:\My Documents\Spoofed Senders.csv"
+$UpdateSpoofedSenders = Get-Content -Raw "C:\My Documents\Spoofed Senders.csv"
+Set-PhishFilterPolicy -Identity Default -SpoofAllowBlockList $UpdateSpoofedSenders
 ```
 
 This configures the phish filter policy to block or allow all spoofed email messages from a source messaging server.
@@ -49,7 +51,9 @@ This configures the phish filter policy to block or allow all spoofed email mess
 
 ### Example 2
 ```powershell
-Get-PhishFilterPolicy -Detailed -SpoofAllowBlockList | Export-CSV "C:\My Documents\Spoofed Senders.csv"; $UpdateSpoofedSenders = Get-Content -Raw "C:\My Documents\Spoofed Senders.csv"; Set-PhishFilterPolicy -Identity Default -SpoofAllowBlockList $UpdateSpoofedSenders
+Get-PhishFilterPolicy -Detailed -SpoofAllowBlockList | Export-CSV "C:\My Documents\Spoofed Senders.csv"
+$UpdateSpoofedSenders = Get-Content -Raw "C:\My Documents\Spoofed Senders.csv"
+Set-PhishFilterPolicy -Identity Default -SpoofAllowBlockList $UpdateSpoofedSenders
 ```
 
 This example configures the phish filter policy to selectively block or allow some spoofed email messages from a source messaging server.

exchange/exchange-ps/exchange/advanced-threat-protection/Set-SafeLinksPolicy.md

@@ -219,7 +219,7 @@ Accept wildcard characters: False
 ```
 
 ### -ExcludedUrls
-The ExcludedUrls parameter specifies a URL that's skipped by Safe Links scanning. You can specify multiple values separated by commas.
+The ExcludedUrls parameter has been deprecated. Use the DoNotRewriteUrls parameter instead. If you have any scripts that use the ExcludedUrls parameter, update them to use the DoNotRewriteUrls parameter.
 
 ```yaml
 Type: String[]
@@ -307,7 +307,7 @@ Accept wildcard characters: False
 ```
 
 ### -WhiteListedUrls
-This parameter is reserved for internal Microsoft use.
+The WhiteListedUrls parameter has been deprecated. Use the DoNotRewriteUrls parameter instead. If you have any scripts that use the WhiteListedUrls parameter, update them to use the DoNotRewriteUrls parameter.
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/antispam-antimalware/New-MalwareFilterPolicy.md

@@ -32,7 +32,7 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
 
 ### Example 1
 ```powershell
-Get-ComplianceRetentionEvent
+Get-ComplianceRetentionEvent | Format-Table Name,Description
 ```
 
 The example returns a summary list of all compliance retention events.

exchange/exchange-ps/exchange/antispam-antimalware/Set-MalwareFilterPolicy.md

@@ -22,7 +22,16 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-ComplianceRetentionEvent -Name <String> [-AssetId <String>] [-Comment <String>] [-Confirm] [-EventDateTime <DateTime>] [-EventTags <MultiValuedProperty>] [-EventType <ComplianceRuleIdParameter>] [-ExchangeAssetIdQuery <String>] [-SharePointAssetIdQuery <String>] [-WhatIf] [<CommonParameters>]
+New-ComplianceRetentionEvent -Name <String>
+ [-AssetId <String>]
+ [-Comment <String>]
+ [-Confirm]
+ [-EventDateTime <DateTime>]
+ [-EventTags <MultiValuedProperty>]
+ [-EventType <ComplianceRuleIdParameter>]
+ [-ExchangeAssetIdQuery <String>]
+ [-SharePointAssetIdQuery <String>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -32,22 +41,21 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
 
 ### Example 1
 ```powershell
-Insert example commands for example 1.
+New-ComplianceRetentionEvent -Name "Research Project Employees" -EventTag 80e0d620-13ea-4ed9-b6a6-aa883278bcca -EventType e823b782-9a07-4e30-8091-034fc01f9347 -SharePointAssetIDQuery "EmployeeNumber:123456 EmployeeNumber:456789"
 ```
 
-Insert descriptive text for example 1.
+This example creates a compliance retention event named Research Project Employees with the following settings:
 
-### Example 2
-```powershell
-Insert example commands for example 2.
-```
+- EventTag: 80e0d620-13ea-4ed9-b6a6-aa883278bcca
 
-Insert descriptive text for example 2.
+- EventTpe: e823b782-9a07-4e30-8091-034fc01f9347
+
+- SharePointAssetIDQuery: EmployeeNumber:123456 EmployeeNumber:456789
 
 ## PARAMETERS
 
 ### -Name
-The Name parameter specifies a unique name for the compliance retention event. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks.
+The Name parameter specifies a unique name for the compliance retention event. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks (").
 
 ```yaml
 Type: String
@@ -63,7 +71,13 @@ Accept wildcard characters: False
 ```
 
 ### -AssetId
-The AssetId parameter.
+The AssetId parameter specifies the Property:Value pair found in the properties of SharePoint or OneDrive for Business documents that's used for retention. For example:
+
+- Product codes that you can use to retain content for only a specific product.
+
+- Project codes that you can use to retain content for only a specific project.
+
+- Employee IDs that you can use to retain content for only a specific person.
 
 ```yaml
 Type: String
@@ -133,7 +147,9 @@ Accept wildcard characters: False
 ```
 
 ### -EventTags
-The EventTags parameter.
+The EventTags parameter specifies the GUID value of the labels tha are associated with the compliance retention event. Run the following command to see the available GUID values: `Get-ComplianceTag | Format-Table Name,GUID`.
+
+You can specify multiple values separated by commas.
 
 ```yaml
 Type: MultiValuedProperty
@@ -149,7 +165,7 @@ Accept wildcard characters: False
 ```
 
 ### -EventType
-The EventType parameter.
+The EventType parameter specifies the GUID value of the event that will start the retention period for labels that use this event type. Run the following command to see the available GUID values: `Get-ComplianceRetentionEventType | Format-Table Name,GUID`.
 
 ```yaml
 Type: ComplianceRuleIdParameter
@@ -165,7 +181,7 @@ Accept wildcard characters: False
 ```
 
 ### -ExchangeAssetIdQuery
-The ExchangeAssetIdQuery parameter.
+The ExchangeAssetIdQuery parameter specifies the keywords that are used to scope Exchange content for the compliance retention event. For details, see [Keyword queries and search conditions for Content Search](https://go.microsoft.com/fwlink/p/?linkid=828045).
 
 ```yaml
 Type: String
@@ -181,7 +197,7 @@ Accept wildcard characters: False
 ```
 
 ### -SharePointAssetIdQuery
-The SharePointAssetIdQuery parameter.
+The SharePointAssetIdQuery parameter specifies one or more the Property:Value pairs that you've specified in the properties (also known as Columns) of SharePoint and OneDrive for Business documents to scope the compliance retention event.
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/policy-and-compliance-retention/Get-ComplianceRetentionEvent.md

@@ -76,7 +76,7 @@ Enables Microsoft Flow for this site
 
 ### ------------------EXAMPLE 5------------------
 ```powershell
-Set-PnPSite -SiteLogoPath c:\images\mylogo.png
+Set-PnPSite -LogoFilePath c:\images\mylogo.png
 ```
 
 Sets the logo if the site is a modern team site