Merge branch 'master' into patch-109

Author: chrisda

.openpublishing.redirection.json

@@ -159,6 +159,11 @@
       "source_path": "exchange/virtual-folder/exchange/connected-accounts/Set-PopSubscription.md",
       "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "sharepoint/docs-conceptual/overview.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/sharepoint",
+      "redirect_document_id": true
     }
    ] 
   }

exchange/exchange-ps/exchange/advanced-threat-protection/New-SafeAttachmentPolicy.md

@@ -81,6 +81,8 @@ The Action parameter specifies the action for the Safe Attachments policy. Valid
 
 - Replace: Deliver the email message, but remove the malware attachment and replace it with warning text.
 
+- DynamicDelivery: Deliver the email message with a placeholder for each email attachment. The placeholder remains until a copy of the attachment is scanned and determined to be safe. For more information, see [How Dynamic Delivery works](https://docs.microsoft.com/microsoft-365/security/office-365-security/dynamic-delivery-and-previewing#how-dynamic-delivery-works).
+
 The results of all actions are available in message trace.
 
 ```yaml

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

@@ -80,6 +80,8 @@ The Action parameter specifies the action for the Safe Attachments policy. Valid
 
 - Replace: Deliver the email message, but remove the malware attachment and replace it with warning text.
 
+- DynamicDelivery: Deliver the email message with a placeholder for each email attachment. The placeholder remains until a copy of the attachment is scanned and determined to be safe. For more information, see [How Dynamic Delivery works](https://docs.microsoft.com/microsoft-365/security/office-365-security/dynamic-delivery-and-previewing#how-dynamic-delivery-works).
+
 The results of all actions are available in message trace.
 
 ```yaml

exchange/exchange-ps/exchange/antispam-antimalware/Delete-QuarantineMessage.md

@@ -64,7 +64,7 @@ This example deletes all quarantined messages. The Identity parameter is require
 ## PARAMETERS
 
 ### -Identities
-The Identities parameter identifies quarantined messages for bulk operations. You identify the messages by using the syntax: value1,value2...valueN. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7.
+The Identities parameter identifies quarantined messages for bulk operations. You identify the messages by using the syntax: `value1,value2...valueN`. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 
@@ -84,7 +84,7 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-The Identity parameter specifies the quarantined message that you want to delete. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7.
+The Identity parameter specifies the quarantined message that you want to delete. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the Identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 

exchange/exchange-ps/exchange/antispam-antimalware/Export-QuarantineMessage.md

@@ -48,7 +48,7 @@ The third command exports the message to the specified file using the message en
 
 Notes:
 
-- The "| select -ExpandProperty Eml" part of the command specifies the whole message, including attachments.
+- The `| select -ExpandProperty Eml`" part of the command specifies the whole message, including attachments.
 
 - You need to use the Out-File cmdlet to write the .eml message file with the required encoding. If you use the default PowerShell redirection operator ">" to write the output file, the default encoding is Unicode, which might not match the actual message encoding.
 
@@ -62,7 +62,7 @@ This example exports the quarantined file with the specified Identity value. The
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the quarantined message that you want to export. The value is a unique quarantined message identifier in the format GUID1\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7).
+The Identity parameter specifies the quarantined message that you want to export. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the Identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 

exchange/exchange-ps/exchange/antispam-antimalware/Get-QuarantineMessage.md

@@ -77,7 +77,7 @@ This example presents 50 quarantined messages per page, and returns the third pa
 Get-QuarantineMessage -MessageID "<[email protected]>"
 ```
 
-This example returns the quarantined message with the Message-ID value \<[email protected]\>.
+This example returns the quarantined message with the Message-ID value `<[email protected]>`.
 
 ### Example 4
 ```powershell
@@ -96,9 +96,9 @@ This example returns detailed information for the files protected by Office 365
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the quarantined message that you want to view. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7.
+The Identity parameter specifies the quarantined message that you want to view. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
-When you identify the quarantine message by using this parameter, the RecipientAddress, QuarantineUser, and ReleasedUser properties are available. To see these values, you need to use a formatting cmdlet. For example, Get-QuarantineMessage -Identity \<Identity\> | Format-List.
+When you identify the quarantine message by using this parameter, the RecipientAddress, QuarantineUser, and ReleasedUser properties are available. To see these values, you need to use a formatting cmdlet. For example, `Get-QuarantineMessage -Identity <Identity> | Format-List`.
 
 ```yaml
 Type: QuarantineMessageIdentity
@@ -114,7 +114,7 @@ Accept wildcard characters: False
 ```
 
 ### -Direction
-The Direction parameter filters the results by incoming or outgoing messages. Valid values for this parameter are Inbound and Outbound.
+The Direction parameter filters the results by incoming or outgoing messages. Valid are Inbound and Outbound.
 
 ```yaml
 Type: QuarantineMessageDirectionEnum
@@ -184,7 +184,7 @@ Accept wildcard characters: False
 ```
 
 ### -MessageId
-The MessageId parameter filters the results by the Message-ID header field of the message. This value is also known as the Client ID. The format of the Message-ID depends on the messaging server that sent the message. The value should be unique for each message. However, not all messaging servers create values for the Message-ID in the same way. Be sure to include the full Message ID string (which may include angle brackets) and enclose the value in quotation marks (for example, "<d9683b4c-127b-413a-ae2e-fa7dfb32c69d@DM3NAM06BG401.Eop-nam06.prod.protection.outlook.com>").
+The MessageId parameter filters the results by the Message-ID header field of the message. This value is also known as the Client ID. The format of the Message-ID depends on the messaging server that sent the message. The value should be unique for each message. However, not all messaging servers create values for the Message-ID in the same way. Be sure to include the full Message ID string (which may include angle brackets) and enclose the value in quotation marks (for example, `"<d9683b4c-127b-413a-ae2e-fa7dfb32c69d@DM3NAM06BG401.Eop-nam06.prod.protection.outlook.com>"`).
 
 ```yaml
 Type: String
@@ -252,11 +252,13 @@ The QuarantineTypes parameter filters the results by what caused the message to
 
 - Bulk
 
+- HighConfPhish
+
 - Phish
 
 - Spam
 
-- SPOMalware
+- SPOMalware (ATP only)
 
 - TransportRule
 
@@ -390,14 +392,20 @@ The Type parameter filters the results by what caused the message to be quaranti
 
 - Bulk
 
+- HighConfPhish
+
 - Phish
 
 - Spam
 
+- SPOMalware (ATP only)
+
 - TransportRule
 
 You don't need to use this parameter with the QuarantineTypes parameter.
 
+For files protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams, the detection information can be found in CustomData field in the output.
+
 ```yaml
 Type: QuarantineMessageTypeEnum
 Parameter Sets: Summary

exchange/exchange-ps/exchange/antispam-antimalware/Get-QuarantineMessageHeader.md

@@ -52,7 +52,7 @@ This example displays the message header of the first message that's returned by
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the quarantined message that you want to view the header for. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7.
+The Identity parameter specifies the quarantined message that you want to view the header for. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the Identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 

exchange/exchange-ps/exchange/antispam-antimalware/Preview-QuarantineMessage.md

@@ -40,7 +40,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-QuarantineMessage -MessageID <[email protected]> | Preview-QuarantineMessage
 ```
 
-This example previews the quarantined message with the Message-ID value \<[email protected]\>.
+This example previews the quarantined message with the Message-ID value `<[email protected]>`.
 
 ### Example 2
 ```powershell
@@ -52,7 +52,7 @@ This example previews the quarantined message that has the specified Identity va
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the quarantined message that you want to preview. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7.
+The Identity parameter specifies the quarantined message that you want to preview. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the Identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 

exchange/exchange-ps/exchange/antispam-antimalware/Release-QuarantineMessage.md

@@ -77,7 +77,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-QuarantineMessage -MessageID "<[email protected]>" | Release-QuarantineMessage -User [email protected]
 ```
 
-This example uses the Get-QuarantineMessage cmdlet to release the quarantined message with the Message-ID value \<[email protected]\> to an original recipient [email protected].
+This example uses the Get-QuarantineMessage cmdlet to release the quarantined message with the Message-ID value `<[email protected]>` to an original recipient [email protected].
 
 ### Example 2
 ```powershell
@@ -103,7 +103,7 @@ This example releases a file that was quarantined as part of Office 365 Advanced
 ## PARAMETERS
 
 ### -Identities
-The Identities parameter identifies quarantined messages for bulk operations. You identify the messages by using the syntax: value1,value2,...valueN. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7).
+The Identities parameter identifies quarantined messages for bulk operations. You identify the messages by using the syntax: `value1,value2,...valueN`. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 
@@ -136,7 +136,7 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-The Identity parameter specifies the quarantined message that you want to release. The value is a unique quarantined message identifier in the format GUID1\\GUID2 (for example c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7).
+The Identity parameter specifies the quarantined message that you want to release. The value is a unique quarantined message identifier in the format `GUID1\GUID2` (for example `c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7`).
 
 You can find the Identity value for a quarantined message by using the Get-QuarantineMessage cmdlet.
 
@@ -167,11 +167,11 @@ Accept wildcard characters: False
 ```
 
 ### -ReleaseToAll
-The ReleaseToAll switch releases the quarantined message to all original recipients. You don't have to specify a value with this switch.
+The ReleaseToAll switch releases the quarantined message to all original recipients. You don't need to specify a value with this switch.
 
 This parameter is required for the quarantine type SPOMalware.
 
-If you previously used the User parameter or the ReleaseToAll switch to release the quarantined message to some or all of the original recipients, those recipients are skipped when you use the ReleaseToAll parameter again. You don't have to specify a value with the ReleaseToAll switch.
+If you previously used the User parameter or the ReleaseToAll switch to release the quarantined message to some or all of the original recipients, those recipients are skipped when you use the ReleaseToAll switch again.
 
 You can't use the ReleaseToAll switch and the User parameter in the same command.
 

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

@@ -25,10 +25,16 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Set-MailboxJunkEmailConfiguration [-Identity] <MailboxIdParameter>
- [-BlockedSendersAndDomains <MultiValuedProperty>] [-Confirm] [-ContactsTrusted <Boolean>]
- [-DomainController <Fqdn>] [-Enabled <Boolean>] [-IgnoreDefaultScope]
- [-TrustedListsOnly <Boolean>] [-TrustedSendersAndDomains <MultiValuedProperty>] [-WhatIf]
- [-TrustedRecipientsAndDomains <MultiValuedProperty>] [<CommonParameters>]
+ [-BlockedSendersAndDomains <MultiValuedProperty>]
+ [-Confirm]
+ [-ContactsTrusted <Boolean>]
+ [-DomainController <Fqdn>]
+ [-Enabled <Boolean>]
+ [-IgnoreDefaultScope]
+ [-TrustedListsOnly <Boolean>]
+ [-TrustedRecipientsAndDomains <MultiValuedProperty>]
+ [-TrustedSendersAndDomains <MultiValuedProperty>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -257,6 +263,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -TrustedRecipientsAndDomains
+This parameter is reserved for internal Microsoft use.
+
+```yaml
+Type: MultiValuedProperty
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -TrustedSendersAndDomains
 The TrustedSendersAndDomains parameter specifies the Safe Senders list and Safe Recipients list, which are lists of email addresses and domains. Messages from these senders that reach the mailbox are never delivered to the Junk Email folder, regardless of the content. This parameter corresponds to the Outlook on the web setting: Don't move email from these senders or domains to my Junk Email folder.
 
@@ -303,22 +325,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -TrustedRecipientsAndDomains
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: MultiValuedProperty
-Parameter Sets: (All)
-Aliases:
-Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).