Merge branch 'master' into docs-build-v3

Author: chrisda

exchange/docs-conceptual/basic-auth-connect-to-eop-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: eop
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 ROBOTS: NOINDEX

exchange/docs-conceptual/basic-auth-connect-to-exo-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Priority
 ms.collection: Strat_EX_Admin
 ms.custom:

exchange/docs-conceptual/basic-auth-connect-to-scc-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: o365-security-and-compliance
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 ROBOTS: NOINDEX

exchange/docs-conceptual/cmdlet-property-sets.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

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

@@ -5,7 +5,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

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

@@ -5,7 +5,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

exchange/docs-conceptual/connect-to-exchange-servers-using-remote-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.prod: exchange-server-it-pro
 localization_priority: Priority
 ms.collection: Strat_EX_Admin
 ms.custom:

exchange/docs-conceptual/connect-to-scc-powershell.md

@@ -5,7 +5,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

exchange/docs-conceptual/control-remote-powershell-access-to-exchange-servers.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.prod: exchange-server-it-pro
 localization_priority: Normal
 ms.assetid: 064e3bb0-38bf-495e-9994-784f823b88dd
 description: "Administrators can learn how to block or allow users' remote PowerShell access to Exchange servers."

exchange/docs-conceptual/disable-access-to-exchange-online-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: f969816a-2607-4655-9d47-9e8767fb5633
 search.appverid: MET150

exchange/docs-conceptual/exchange-management-shell.md

@@ -6,7 +6,7 @@ manager: sansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.prod: exchange-server-it-pro
 localization_priority: Normal
 ms.assetid: 925ad66f-2f05-4269-9923-c353d9c19312
 description: "Learn about Exchange Server PowerShell, also known as the Exchange Management Shell. This topic describes how PowerShell works on Exchange servers, and provides links to other topics that can help you learn how to use the Exchange Management Shell."

exchange/docs-conceptual/exchange-online-powershell-v2.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

exchange/docs-conceptual/exchange-online-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date: 2/20/2018
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 1cb603b0-2961-4afe-b879-b048fe0f64a2
 search.appverid: MET150

exchange/docs-conceptual/exchange-online-protection-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date: 2/20/2018
 ms.audience: Admin
 ms.topic: article
-ms.service: eop
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: f7918a88-774a-405e-945b-bc2f5ee9f748
 description: "Learn about using PowerShell in Exchange Online Protection"

exchange/docs-conceptual/filter-properties.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: b02b0005-2fb6-4bc2-8815-305259fa5432
 description: "Learn about the filterable properties for the Filter parameter in Exchange Server and Exchange Online."

exchange/docs-conceptual/filters-v2.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

exchange/docs-conceptual/find-exchange-cmdlet-permissions.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 5bcc46d3-8a07-4e9f-b1b0-e4cb0b0afc12
 description: "Admins can learn how to use PowerShell to find the permissions required to run any cmdlet in Exchange Server PowerShell or Exchange Online PowerShell."

exchange/docs-conceptual/open-the-exchange-management-shell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.prod: exchange-server-it-pro
 localization_priority: Normal
 ms.assetid: 63976059-25f8-4b4f-b597-633e78b803c0
 description: "Find and open the shortcut for Exchange PowerShell (also known as the Exchange Management Shell) on Exchange servers or computers that have the Exchange management tools installed."

exchange/docs-conceptual/recipient-filters.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: reference
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: fb4b1396-9aae-4037-be1a-b09e336b890e
 description: "Learn about creating different kinds of recipient filters in the Exchange Management Shell and Exchange Online PowerShell."

exchange/docs-conceptual/recipientfilter-properties.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: cf78aca5-6699-485c-9b15-e0adba252176
 description: "Learn about the recipient properties that you can use with the RecipientFilter parameter in Exchange Server and Exchange Online cmdlets."

exchange/docs-conceptual/scc-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date: 9/29/2015
 ms.audience: Admin
 ms.topic: article
-ms.service: o365-security-and-compliance
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 2f33bb84-cede-46f6-9d39-d246e8ce3543
 search.appverid: MET150

exchange/docs-conceptual/use-update-exchangehelp.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.prod: exchange-server-it-pro
 localization_priority: Normal
 ms.assetid: 219f78a3-f0e5-4dc6-9787-9a0b9756ee09
 description: "Administrators can learn how to use Update-ExchangeHelp to update Exchange cmdlet reference topics that are available in Exchange Management Shell in Exchange 2016"

exchange/docs-conceptual/v1-module-mfa-connect-to-exo-powershell.md

@@ -6,12 +6,12 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 search.appverid: MET150
 ROBOTS: NOINDEX
-description: "Admins can learn how to use the older Exchange Online Remote PowerShell Module to connect to Security & Compliance Center PowerShell for multi-factor authentication (MFA) or federated authentication."
+description: "Admins can learn how to use the older Exchange Online Remote PowerShell Module to connect to Exchange Online PowerShell for multi-factor authentication (MFA) or federated authentication."
 ---
 
 # V1 module - Connect to Exchange Online PowerShell using MFA

exchange/docs-conceptual/v1-module-mfa-connect-to-scc-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: o365-security-and-compliance
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 search.appverid: MET150

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

@@ -155,7 +155,7 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotAllowClickThrough
-The DoNotAllowClickThrough parameter specifies whether to allow users to click through to the original URL. Valid values are:
+The DoNotAllowClickThrough parameter specifies whether to allow users to click through to the original URL on warning pages. Valid values are:
 
 - $true: The user isn't allowed to click through to the original URL.
 
@@ -175,7 +175,13 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotRewriteUrls
-The DoNotRewriteUrls parameter specifies the URLs that skip Safe Links scanning and are always allowed. You can specify multiple values separated by commas. Wildcards are supported (up to three).
+The DoNotRewriteUrls parameter specifies the URLs that are not rewritten by Safe Links scanning. The list of entries allows users who are included in the policy to access the specified URLs that would otherwise be blocked by Safe Links.
+
+To enter multiple values and overwrite any existing entries, use the following syntax: \<value1\>,\<value2\>,...\<valueN\>. If the values contain spaces or otherwise require quotation marks, you need to use the following syntax: "\<value1\>","\<value2\>",..."\<valueN\>".
+
+To add or remove one or more values without affecting any existing entries, use the following syntax: @{Add="\<value1\>","\<value2\>"...; Remove="\<value1\>","\<value2\>"...}.
+
+For details about the entry syntax, see [Entry syntax for the "Do not rewrite the following URLs" list](https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/atp-safe-links#entry-syntax-for-the-do-not-rewrite-the-following-urls-list).
 
 ```yaml
 Type: MultiValuedProperty
@@ -191,11 +197,11 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotTrackUserClicks
-The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages and Microsoft Teams. Valid values are:
+The DoNotTrackUserClicks parameter specifies whether to track user clicks related to Safe Links protection of links in email messages. Valid values are:
 
-- $true: User clicks aren't tracked.
+- $true: User clicks in email messages aren't tracked.
 
-- $false: User clicks are tracked. This is the default value.
+- $false: User clicks in email messages are tracked. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -231,6 +237,8 @@ Accept wildcard characters: False
 ```
 
 ### -EnableSafeLinksForTeams
+**Note**: As of March 2020, this parameter is in Preview and is available only for members of the Microsoft Teams Technology Adoption Program (TAP).
+
 The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
 - $true: Safe Links is enabled for Teams. If a protected user clicks a malicious link in a Teams conversation, group chat, or from channels, a warning page will appear in the default web browser.
@@ -267,11 +275,11 @@ Accept wildcard characters: False
 ```
 
 ### -IsEnabled
-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:
+The IsEnabled parameter specifies whether to enable Safe Links protection for email messages. Valid values are:
 
-- $true: Rewrite URLs and check against a list of known malicious links whenever a user clicks on a link.
+- $true: Enable Safe Links protection for email messages. Rewrite URLs and check against a list of known malicious links whenever a user clicks a link in an email message.
 
-- $false: Don't rewrite URLs. This is the default value.
+- $false: Disable Safe Links protection for email messages. Don't rewrite URLs and do not check clicked links in email messages. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -287,11 +295,11 @@ Accept wildcard characters: False
 ```
 
 ### -ScanUrls
-The ScanUrls parameter specifies whether to enable or disable real-time scanning of links in email messages. Valid values are:
+The ScanUrls parameter specifies whether to enable or disable real-time scanning of clicked links in email messages. Valid values are:
 
-- $true: Real-time scanning of links in email messages is enabled.
+- $true: Real-time scanning of clicked links in email messages, including links that point to files, is enabled.
 
-- $false: Real-time scanning of links in email messages is disabled. This is the default value.
+- $false: Real-time scanning of clicked links in email messages, including links that point to files, is disabled. This is the default value.
 
 ```yaml
 Type: Boolean

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

@@ -14,13 +14,13 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Set-AtpPolicyForO365 cmdlet to modify the Advanced Threat Protection (ATP) policy in Office 365. The ATP policy enables the following protections in Office 365 ATP:
+Use the Set-AtpPolicyForO365 cmdlet to modify the Advanced Threat Protection (ATP) policy in Office 365. The ATP policy configures the following protections:
 
-- Safe Links for Office 365 ProPlus desktop clients, web, and mobile apps.
+- Safe Links in supported Office 365 apps in Office 365 ATP.
 
-- Safe Documents: Before a user is allowed to trust a file open in Office 365 ProPlus, the file will be verified by Microsoft Defender ATP.
+- Safe Documents in Microsoft Defender Advanced Threat Protection (MDATP).
 
-- ATP protection for files in SharePoint Online, OneDrive for Business and Microsoft Teams.
+- ATP for SharePoint Online, OneDrive for Business and Microsoft Teams in Office 365 ATP.
 
 **Note**: We recommend that you use the Exchange Online PowerShell V2 module to connect to Exchange Online PowerShell. For instructions, see [Connect to Exchange Online PowerShell](https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell).
 
@@ -42,9 +42,11 @@ Set-AtpPolicyForO365 [[-Identity] <AtpPolicyForO365IdParameter>]
 ```
 
 ## DESCRIPTION
-Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. For more information, see [Office 365 ATP Safe Links](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-safe-links).
+Safe Links is a feature in Advanced Threat Protection that checks links in email messages and other supported locations to see if they lead to malicious web sites. For more information, see [Safe Links in Office 365 ATP](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-safe-links).
 
-ATP can also protect files in SharePoint Online, OneDrive for Business and Microsoft Teams by preventing users from opening and downloading files that are identified as malicious. For more information, see [ATP for SharePoint, OneDrive, and Microsoft Teams](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-for-spo-odb-and-teams).
+ATP for SharePoint Online, OneDrive for Business and Microsoft Teams prevents users from opening and downloading files that are identified as malicious. For more information, see [ATP for SharePoint, OneDrive, and Microsoft Teams](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-for-spo-odb-and-teams).
+
+Safe Documents in MDATP scans documents and files that are opened in Protected View. For more information, see [Safe Documents in Microsoft 365 E5](https://docs.microsoft.com/microsoft-365/security/office-365-security/safe-docs).
 
 You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
 
@@ -76,11 +78,11 @@ Accept wildcard characters: False
 ```
 
 ### -AllowClickThrough
-The AllowClickThrough parameter specifies whether to allow users to click through to the original blocked URL in Office 365 apps on desktop, mobile, and web clients. Valid values are:
+The AllowClickThrough parameter specifies whether to allow users to click through to the original blocked URL in supported Office 365 desktop, mobile, and web apps. Valid values are:
 
-- $true: Users are allowed to click through to the original URL.
+- $true: Users are allowed to click through to the original URL in supported Office 365 apps.
 
-- $false: Users aren't allowed to click through to the original URL. This is the default value.
+- $false: Users aren't allowed to click through to the original URL in supported Office 365 apps. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -116,7 +118,13 @@ Accept wildcard characters: False
 ```
 
 ### -BlockUrls
-The BlockUrls parameter specifies the URLs that are always blocked by Safe Links scanning in email messages, Microsoft Teams, and Office documents. You can specify multiple values separated by commas.
+The BlockUrls parameter specifies the URLs that are always blocked by Safe Links scanning in email messages, and supported Office 365 desktop and mobile apps.
+
+To enter multiple values and overwrite any existing entries, use the following syntax: \<value1\>,\<value2\>,...\<valueN\>. If the values contain spaces or otherwise require quotation marks, you need to use the following syntax: "\<value1\>","\<value2\>",..."\<valueN\>".
+
+To add or remove one or more values without affecting any existing entries, use the following syntax: @{Add="\<value1\>","\<value2\>"...; Remove="\<value1\>","\<value2\>"...}.
+
+For details about the entry syntax, see [Entry syntax for the "Block the following URLs" list](https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/atp-safe-links#entry-syntax-for-the-block-the-following-urls-list).
 
 ```yaml
 Type: MultiValuedProperty
@@ -192,11 +200,13 @@ Accept wildcard characters: False
 ```
 
 ### -EnableSafeLinksForO365Clients
-The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Microsoft 365 apps on desktop, mobile, and web clients. Valid values are:
+The EnableSafeLinksForO365Clients parameter specifies whether Safe Links scanning is enabled for supported Office 365 desktop, mobile, and web apps. Valid values are:
+
+- $true: Safe Links scanning is enabled in supported Office 365 apps. This is the default value.
 
-- $true: Safe Links are enabled for Microsoft 365 desktop, mobile, and web apps. This is the default value.
+- $false: Safe Links scanning is disabled in supported Office 365 apps.
 
-- $false: Safe Links are disabled for Microsoft 365 desktop, mobile, and web apps.
+Note that this protection applies to links in Office documents, not links in email messages. Safe Links protection for links in email messages is controlled by Safe Links policies (the [New-SafeLinksPolicy](https://docs.microsoft.com/powershell/module/exchange/new-safelinkspolicy) or [Set-SafeLinksPolicy](https://docs.microsoft.com/powershell/module/exchange/set-safelinkspolicy) cmdlets).
 
 ```yaml
 Type: Boolean
@@ -212,11 +222,11 @@ Accept wildcard characters: False
 ```
 
 ### -TrackClicks
-The TrackClicks parameter specifies whether to track user clicks related to blocked URLs in Office documents. Valid values are:
+The TrackClicks parameter specifies whether to track user clicks related to blocked URLs in supported Office 365 apps. Valid values are:
 
-- $true: User clicks are tracked.
+- $true: User clicks in supported Office 365 apps are tracked.
 
-- $false: User clicks aren't tracked. This is the default value.
+- $false: User clicks in supported Office 365 apps aren't tracked. This is the default value.
 
 ```yaml
 Type: Boolean