Merge branch 'master' into patch-2

Author: kenwith

.openpublishing.publish.config.json

@@ -7,8 +7,9 @@ ms.date: 7/10/2017
 ms.audience: Admin
 ms.topic: article
 ms.service: exchange-online
-localization_priority: Normal
-ms.custom: Strat_EX_Admin
+localization_priority: Priority
+ms.collection : Strat_EX_Admin
+ms.custom: 
 ms.assetid: c8bea338-6c1a-4bdf-8de0-7895d427ee5b
 description: "Learn how to use remote PowerShell to connect to Exchange Online."
 ---

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

@@ -93,7 +93,14 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
 4. In the verification window that opens, enter the verification code, and then click **Sign in**.
 
      ![Enter your verification code in the Exchange Online Remote PowerShell window](../../media/d3a405ce-5364-4732-a7bb-2cc9c678da2d.png)
-  
+
+> [!NOTE]
+> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Exchange Online Remote PowerShell Module window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect all currently open PowerShell sessions in the current window, run the following command:
+
+  ```
+  Get-PSSession | Remove-PSSession
+  ```
+
 ## How do you know this worked?
 
 After Step 4, the Exchange Online cmdlets are imported into your Exchange Online Remote PowerShell Module session and tracked by a progress bar. If you don't receive any errors, you connected successfully. A quick test is to run an Exchange Online cmdlet, for example, **Get-Mailbox**, and see the results.
@@ -105,5 +112,3 @@ If you receive errors, check the following requirements:
 - The account you use to connect to Exchange Online must be enabled for remote PowerShell. For more information, see [Enable or disable access to Exchange Online PowerShell](../disable-access-to-exchange-online-powershell.md).
 
 - TCP port 80 traffic needs to be open between your local computer and Office 365. It's probably open, but it's something to consider if your organization has a restrictive Internet access policy.
-    
-

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

@@ -11,7 +11,9 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Export-QuarantineMessage cmdlet to export quarantined messages from your cloud-based organization to .eml message files. You can then open the .eml files in Outlook.
+Use the Export-QuarantineMessage cmdlet to export quarantined messages and files from your cloud-based organization. Messages are exported to .eml message files so you can open them in Outlook.
+
+For files that are protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams, the files are exported in Base64 format.
 
 For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
 
@@ -43,6 +45,13 @@ Notes:
 
 - 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.
 
+### -------------------------- Example 2 --------------------------
+```
+$e = Export-QuarantineMessage -Identity 9c6bb3e8-db9e-4823-9759-08d594179bd3\7fec89fe-41b0-ae67-4887-5bede017d111; $bytes = [Convert]::FromBase64String($e.eml); [IO.File]::WriteAllBytes("C:\My Documents\Export1.txt", $bytes)
+```
+
+This example exports the quarantined file with the specified Identity value. The first command exports the file to a Base 64 string. The next two commands convert the string to byte format and write it to the output file.
+
 ## PARAMETERS
 
 ### -Identity

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

@@ -11,7 +11,9 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Get-QuarantineMessage cmdlet to view quarantined messages in your cloud-based organization.
+Use the Get-QuarantineMessage cmdlet to view quarantined messages and files in your cloud-based organization.
+
+**Not**: Quarantined files are files protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams. 
 
 For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
 
@@ -45,18 +47,32 @@ This example returns a summary list of messages quarantined between June 13, 201
 
 ### -------------------------- Example 2 --------------------------
 ```
+Get-QuarantineMessage -PageSize 50 -Page 3
+```
+
+This example presents 50 quarantined messages per page, and returns the third page of results.
+
+### -------------------------- Example 3 --------------------------
+```
 Get-QuarantineMessage -MessageID <[email protected]>
 ```
 
 This example returns the quarantined message with the Message-ID value \<[email protected]\>.
 
-### -------------------------- Example 3 --------------------------
+### -------------------------- Example 4 --------------------------
 ```
 Get-QuarantineMessage -Identity c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7 | Format-List
 ```
 
 This example returns detailed information for the quarantined message with the specified Identity value.
 
+### -------------------------- Example 5 --------------------------
+```
+Get-QuarantineMessage -QuarantineTypes SPOMalware | Format-List
+```
+
+This example returns detailed information for the files protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams.
+
 ## PARAMETERS
 
 ### -Identity
@@ -211,12 +227,16 @@ The QuarantineTypes parameter filters the results by what caused the message to
 
 - Spam
 
+- SPOMalware
+
 - TransportRule
 
 You can specify multiple values separated by commas.
 
 You don't need to use this parameter with the Type 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: Set1

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

@@ -13,6 +13,8 @@ This cmdlet is available only in the cloud-based service.
 
 Use the Preview-QuarantineMessage cmdlet to preview the contents of quarantined messages in your cloud-based organization.
 
+**Note**: This cmdlet isn't available for files that are protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business, and Microsoft Teams.
+
 For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
 
 ## SYNTAX

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

@@ -1,3 +1,5 @@
+ 
+
 ---
 external help file: Microsoft.Exchange.ServerStatus-Help.xml
 applicable: Exchange Online, Exchange Online Protection
@@ -13,6 +15,8 @@ This cmdlet is available only in the cloud-based service.
 
 Use the Release-QuarantineMessage cmdlet to release messages from quarantine in your cloud-based organization. You can release messages to all original recipients, or to specific recipients.
 
+For files that are protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams, you can unblock the files in the respective team sites and document libraries by using the Release-QuarantineMessage cmdlet so users can access, share, and download the files.
+
 For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
 
 ## SYNTAX
@@ -133,6 +137,8 @@ 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.
 
+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.
 
 You can't use the ReleaseToAll switch and the User parameter in the same command.

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

@@ -237,6 +237,8 @@ Accept wildcard characters: False
 ```
 
 ### -ExternalDsnMaxMessageAttachSize
+This parameter is available only in on-premises Exchange.
+
 The ExternalDsnMaxMessageAttachSize parameter specifies the maximum size of the original message attached to an external DSN message. If the original message exceeds this size, only the headers of the original message are included in the DSN message. The default value is 10 megabytes (MB).
 
 When you enter a value, qualify the value with one of the following units:
@@ -259,7 +261,7 @@ The valid input range for this parameter is from 0 through 2147483647 bytes. If
 Type: ByteQuantifiedSize
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016 
 Required: False
 Position: Named
 Default value: None
@@ -420,6 +422,8 @@ Accept wildcard characters: False
 ```
 
 ### -InternalDsnMaxMessageAttachSize
+This parameter is available only in on-premises Exchange.
+
 The InternalDsnMaxMessageAttachSize parameter specifies the maximum size of the original message that generated an internal DSN message. If the original message exceeds this size, only the headers of the original message are included in the DSN message. The default value is 10 MB.
 
 When you enter a value, qualify the value with one of the following units:
@@ -442,7 +446,7 @@ The valid input range for this parameter is from 0 through 2147483647 bytes. If
 Type: ByteQuantifiedSize
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016
 Required: False
 Position: Named
 Default value: None

exchange/exchange-ps/exchange/mail-flow/Set-TransportConfig.md

@@ -46,8 +46,6 @@ You can use the Search-Mailbox cmdlet to search messages in a specified mailbox
 
 - Delete messages from the source mailbox. You have to be assigned the Mailbox Import Export management role to delete messages.
 
-- Copy messages from the source mailbox and delete them from the target mailbox.
-
 - Perform single item recovery to recover items from a user's Recoverable Items folder.
 
 - Clean up the Recoverable Items folder for a mailbox when it has reached the Recoverable Items hard quota.