Merge branch 'master' into patch-1

Author: kenwith

exchange/exchange-ps/exchange/advanced-threat-protection/Get-UrlTrace.md

@@ -27,7 +27,7 @@ Get-UrlTrace [-ClickId <Guid>] [-EndDate <DateTime>] [-Expression <Expression>]
 ```
 
 ## 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. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site. For more information about Advanced Threat Protection Safe Links, see [Office 365 ATP Safe Links](https://docs.microsoft.com/office365/securitycompliance/atp-safe-links).
+Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site. For more information about Advanced Threat Protection Safe Links, see [Office 365 ATP Safe Links](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-safe-links).
 
 The following list described the values that are returned in the output of this cmdlet:
 

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

@@ -19,7 +19,7 @@ Use the Set-AntiPhishPolicy cmdlet to modify antiphishing policies in your cloud
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
 > [!NOTE]
-> Please take into account the [recommended settings](https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/recommended-settings-for-eop-and-office365-atp) for EOP and Office 365 ATP security.
+> Please take into account the [recommended settings](https://docs.microsoft.com/microsoft-365/security/office-365-security/recommended-settings-for-eop-and-office365-atp) for EOP and Office 365 ATP security.
 
 ## SYNTAX
 

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

@@ -260,7 +260,7 @@ Accept wildcard characters: False
 ```
 
 ### -BulkThreshold
-The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/office365/SecurityCompliance/configure-your-spam-filter-policies).
+The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/microsoft-365/security/office-365-security/configure-your-spam-filter-policies).
 
 ```yaml
 Type: Int32
@@ -840,7 +840,7 @@ Accept wildcard characters: False
 ```
 
 ### -PhishZapEnabled
-The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
+The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
 
 - $true: Phish ZAP is enabled. Phish messages that are detected in the user's Inbox (regardless of read or unread status) are automatically moved to the Junk Email folder. This is the default value.
 
@@ -942,7 +942,7 @@ Accept wildcard characters: False
 ```
 
 ### -SpamZapEnabled
-The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
+The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
 
 - $true: Spam ZAP is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
 

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

@@ -180,7 +180,7 @@ Accept wildcard characters: False
 ```
 
 ### -RecipientLimitExternalPerHour
-The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
+The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
 
 ```yaml
 Type: UInt32
@@ -196,7 +196,7 @@ Accept wildcard characters: False
 ```
 
 ### -RecipientLimitInternalPerHour
-The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
+The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
 
 ```yaml
 Type: UInt32
@@ -212,7 +212,7 @@ Accept wildcard characters: False
 ```
 
 ### -RecipientLimitPerDay
-The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
+The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
 
 ```yaml
 Type: UInt32

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

@@ -267,7 +267,7 @@ Accept wildcard characters: False
 ```
 
 ### -BulkThreshold
-The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/office365/SecurityCompliance/configure-your-spam-filter-policies).
+The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/microsoft-365/security/office-365-security/configure-your-spam-filter-policies).
 
 ```yaml
 Type: Int32
@@ -863,7 +863,7 @@ Accept wildcard characters: False
 ```
 
 ### -PhishZapEnabled
-The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
+The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
 
 - $true: Phish ZAP is enabled. Phish messages that are detected in the user's Inbox (regardless of read or unread status) are automatically moved to the Junk Email folder. This is the default value.
 
@@ -973,7 +973,7 @@ Accept wildcard characters: False
 ```
 
 ### -SpamZapEnabled
-The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
+The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
 
 - $true: Spam ZAP is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
 
@@ -1092,6 +1092,4 @@ To see the return types, which are also known as output types, that this cmdlet
 
 [Online Version](https://docs.microsoft.com/powershell/module/exchange/antispam-antimalware/set-hostedcontentfilterpolicy)
 
-[Safe sender and blocked sender lists in Exchange Online](https://docs.microsoft.com/office365/securitycompliance/safe-sender-and-blocked-sender-lists-faq)
-
-
+[Safe sender and blocked sender lists in Exchange Online](https://docs.microsoft.com/microsoft-365/security/office-365-security/safe-sender-and-blocked-sender-lists-faq)

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

@@ -211,7 +211,7 @@ Accept wildcard characters: False
 ```
 
 ### -RecipientLimitExternalPerHour
-The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
+The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
 
 ```yaml
 Type: UInt32
@@ -227,7 +227,7 @@ Accept wildcard characters: False
 ```
 
 ### -RecipientLimitInternalPerHour
-The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
+The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
 
 ```yaml
 Type: UInt32
@@ -243,7 +243,7 @@ Accept wildcard characters: False
 ```
 
 ### -RecipientLimitPerDay
-The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
+The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
 
 ```yaml
 Type: UInt32

exchange/exchange-ps/exchange/client-access/Set-OwaMailboxPolicy.md

@@ -2566,10 +2566,10 @@ To see the return types, which are also known as output types, that this cmdlet
 
 [Online Version](https://docs.microsoft.com/powershell/module/exchange/client-access/set-owamailboxpolicy)
 
-[New-OwaMailboxPolicy](New-OwaMailboxPolicy.md)
+[New-OwaMailboxPolicy](https://docs.microsoft.com/powershell/module/exchange/client-access/new-owamailboxpolicy)
 
-[Get-OwaMailboxPolicy](Get-OwaMailboxPolicy.md)
+[Get-OwaMailboxPolicy](https://docs.microsoft.com/powershell/module/exchange/client-access/get-owamailboxpolicy)
 
-[Set-CASMailbox](Set-CASMailbox.md)
+[Set-CASMailbox](https://docs.microsoft.com/powershell/module/exchange/client-access/set-casmailbox)
 
 [Outlook on the web mailbox policy procedures in Exchange Online](https://docs.microsoft.com/exchange/clients-and-mobile-in-exchange-online/outlook-on-the-web/outlook-web-app-mailbox-policy-procedures)

exchange/exchange-ps/exchange/mailbox-databases-and-servers/Disable-MetaCacheDatabase.md

@@ -115,4 +115,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## RELATED LINKS
 
-[Online Version][Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/disable-metacachedatabase)
+[Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/disable-metacachedatabase)

exchange/exchange-ps/exchange/mailbox-databases-and-servers/Enable-MetaCacheDatabase.md

@@ -115,4 +115,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## RELATED LINKS
 
-[Online Version][Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/enable-metacachedatabase)
+[Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/enable-metacachedatabase)

exchange/exchange-ps/exchange/mailboxes/Set-Mailbox.md

@@ -1722,7 +1722,7 @@ The AuditEnabled parameter specifies whether to enable or disable mailbox audit
 
 - $false: Mailbox audit logging is disabled. This is the default value.
 
-**Note**: In Exchange Online, mailbox auditing on by default was enabled for all organizations in January, 2019. For more information, see [Manage mailbox auditing](https://docs.microsoft.com/office365/securitycompliance/enable-mailbox-auditing).
+**Note**: In Exchange Online, mailbox auditing on by default was enabled for all organizations in January, 2019. For more information, see [Manage mailbox auditing](https://docs.microsoft.com/microsoft-365/compliance/enable-mailbox-auditing).
 
 ```yaml
 Type: Boolean
@@ -2336,7 +2336,7 @@ The DefaultAuditSet parameter specifies whether to revert the mailbox operations
 
 - Owner: Reverts the mailbox operations to log for mailbox owners back to the default list of operations.
 
-With on-by-default mailbox auditing in the cloud-based service, a set of mailbox operations are logged by default for each logon type. This list of operations is managed by Microsoft, who will automatically add new operations to be audited when they are released. If you change the list of mailbox operations for any logon type (by using the AuditAdmin, AuditDelegate, or AuditOwner parameters), any new mailbox operation released by Microsoft will not be audited; you'll need to explicitly add new mailbox operations to the list of operations for a logon type. Use this parameter to revert the mailbox back to the Microsoft-managed list of mailbox operations that are audited for a logon type. For more information about on-by-default mailbox auditing, see [Manage mailbox auditing](https://docs.microsoft.com/office365/securitycompliance/enable-mailbox-auditing).
+With on-by-default mailbox auditing in the cloud-based service, a set of mailbox operations are logged by default for each logon type. This list of operations is managed by Microsoft, who will automatically add new operations to be audited when they are released. If you change the list of mailbox operations for any logon type (by using the AuditAdmin, AuditDelegate, or AuditOwner parameters), any new mailbox operation released by Microsoft will not be audited; you'll need to explicitly add new mailbox operations to the list of operations for a logon type. Use this parameter to revert the mailbox back to the Microsoft-managed list of mailbox operations that are audited for a logon type. For more information about on-by-default mailbox auditing, see [Manage mailbox auditing](https://docs.microsoft.com/microsoft-365/compliance/enable-mailbox-auditing).
 
 ```yaml
 Type: MultiValuedProperty

exchange/exchange-ps/exchange/organization/Get-AuthenticationPolicy.md

@@ -1,20 +1,20 @@
 ---
 external help file: Microsoft.Exchange.RolesAndAccess-Help.xml
-applicable: Exchange Online
+applicable: Exchange Server 2019, Exchange Online
 title: Get-AuthenticationPolicy
 schema: 2.0.0
 author: chrisda
 ms.author: chrisda
 ms.reviewer:
-monikerRange: "exchonline-ps"
+monikerRange: "exchserver-ps-2019 || exchonline-ps"
 ---
 
 # Get-AuthenticationPolicy
 
 ## SYNOPSIS
-This cmdlet is available only in the cloud-based service.
+This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
 
-Use the Get-AuthenticationPolicy cmdlet to view authentication policies in Exchange Online.
+Use the Get-AuthenticationPolicy cmdlet to view authentication policies in your organization. 
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -58,7 +58,7 @@ The Identity parameter specifies the authentication policy you want to view. You
 Type: AuthPolicyIdParameter
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Server 2019, Exchange Online
 
 Required: False
 Position: 0