Merge branch 'master' into patch-1

Author: chrisda

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

@@ -2,8 +2,8 @@
 title: "Connect to Exchange Online Protection PowerShell"
 ms.author: chrisda
 author: chrisda
-manager: serdars
-ms.date: 5/9/2018
+manager: dansimp
+ms.date: 
 ms.audience: Admin
 ms.topic: article
 ms.service: eop
@@ -14,18 +14,22 @@ description: "Use remote PowerShell to connect to an Exchange Online Protection
 
 # Connect to Exchange Online Protection PowerShell
 
-Exchange Online Protection PowerShell allows you to manage your Exchange Online Protection settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online Protection. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online Protection cmdlets into your local Windows PowerShell session so that you can use them.
+Exchange Online Protection PowerShell allows you to manage your Exchange Online Protection organization from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online Protection. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online Protection cmdlets into your local Windows PowerShell session so that you can use them.
 
 ## What do you need to know before you begin?
 
 - Estimated time to complete: 5 minutes
 
+- Exchange Online Protection PowerShell is only used in *standalone* EOP organizations (for example, you have a standalone EOP subscription to protect your on-premises email environment). If you have an Office 365 subscription that includes EOP (E3, E5, etc.), you don't use Exchange Online Protection PowerShell; the same features are available in [Exchange Online PowerShell](../exchange-online/exchange-online-powershell.md).
+
 - You can use the following versions of Windows:
 
   - Windows 10
 
   - Windows 8.1
 
+  - Windows Server 2019
+
   - Windows Server 2016
 
   - Windows Server 2012 or Windows Server 2012 R2
@@ -36,13 +40,13 @@ Exchange Online Protection PowerShell allows you to manage your Exchange Online
 
     <sup>*</sup> For older versions of Windows, you need to install the Microsoft.NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
 
- - Windows PowerShell needs to be configured to run scripts, and by default, it isn't. You'll get the following error when you try to connect:
+  - Windows PowerShell needs to be configured to run scripts, and by default, it isn't. You'll get the following error when you try to connect:
 
     `Files cannot be loaded because running scripts is disabled on this system. Provide a valid certificate with which to sign the files.`
 
     To require all scripts that you download from the internet are signed by a trusted publisher, run the following command in an elevated Windows PowerShell window (a Windows PowerShell window you open by selecting **Run as administrator**):
 
-    ```
+    ```PowerShell
     Set-ExecutionPolicy RemoteSigned
     ```
 
@@ -55,15 +59,15 @@ Exchange Online Protection PowerShell allows you to manage your Exchange Online
 
 1. On your local computer, open Windows PowerShell and run the following command:
 
-    ```
+    ```PowerShell
     $UserCredential = Get-Credential
     ```
 
     In the **Windows PowerShell Credential Request** dialog box, type your work or school account and password, and then click **OK**.
 
 2. Run the following command:
 
-    ```
+    ```PowerShell
     $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
     ```
 
@@ -75,23 +79,23 @@ Exchange Online Protection PowerShell allows you to manage your Exchange Online
 
 3. Run the following command:
 
-   ```
+   ```PowerShell
    Import-PSSession $Session -DisableNameChecking
    ```
 
-      [!NOTE]
-      Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell 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 the remote PowerShell session, run the following command: 
-  
-   ```
+   > [!NOTE]
+   > Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell 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 the remote PowerShell session, run the following command:
+
+   ```PowerShell
    Remove-PSSession $Session
    ```
 
 ## How do you know this worked?
 
 After Step 3, the Exchange Online Protection cmdlets are imported into your local Windows PowerShell 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 Protection cmdlet, for example, **Get-TransportRule**, and see the results.
-  
+
 If you receive errors, check the following requirements:
-  
+
 - A common problem is an incorrect password. Run the three steps again and pay close attention to the user name and password you enter in Step 1.
 
 - To help prevent denial-of-service (DoS) attacks, you're limited to three open remote PowerShell connections to your Exchange Online Protection organization.
@@ -100,14 +104,14 @@ If you receive errors, check the following requirements:
 
 - The **New-PSSession** command (Step 2) might fail to connect if your client IP address changes during the connection request. This can happen if your organization uses a source network address translation (SNAT) pool that contains multiple IP addresses. The connection error looks like this:
 
-    `The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
+  `The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
 
-    To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Exchange Online Protection PowerShell endpoint.
+  To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Exchange Online Protection PowerShell endpoint.
 
 ## See also
 
 The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more information about these cmdlets, see the following topics.
-  
+
 - [Get-Credential](https://go.microsoft.com/fwlink/p/?LinkId=389618)
 
 - [New-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389621)

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

@@ -2,7 +2,7 @@
 title: "Exchange Online Protection PowerShell"
 ms.author: chrisda
 author: chrisda
-manager: serdars
+manager: dansimp
 ms.date: 2/20/2018
 ms.audience: Admin
 ms.topic: article
@@ -14,16 +14,19 @@ description: "Learn about using PowerShell in Exchange Online Protection"
 
 # Exchange Online Protection PowerShell
 
-Exchange Online Protection PowerShell is the administrative interface that enables you to manage your Exchange Online Protection (EOP) organization from the command line. For example, you can use Exchange Online Protection PowerShell to configure mail flow rules (also known as transport rules) and connectors. The following topics provide information about using Exchange Online Protection PowerShell:
+Exchange Online Protection PowerShell is the administrative interface that enables you to manage your Exchange Online Protection (EOP) organization from the command line. For example, you can use Exchange Online Protection PowerShell to configure mail flow rules (also known as transport rules) and connectors.
+
+> [!NOTE]
+> Exchange Online Protection PowerShell is only used in *standalone* EOP organizations (for example, you have a standalone EOP subscription to protect your on-premises email environment). If you have an Office 365 subscription that includes EOP (E3, E5, etc.), you don't use Exchange Online Protection PowerShell; the same features are available in [Exchange Online PowerShell](../exchange-online/exchange-online-powershell.md).
+
+The following topics provide information about using Exchange Online Protection PowerShell:
 
-- To create a remote PowerShell session to your Exchange Online Protection organization, see [Connect to Exchange Online Protection PowerShell](connect-to-exchange-online-protection-powershell.md).
+- To create a remote PowerShell session to your standalone Exchange Online Protection organization, see [Connect to Exchange Online Protection PowerShell](connect-to-exchange-online-protection-powershell.md).
 
 - For a sample script that lets admins who manage multiple tenants (companies) apply configuration settings to their tenants, see [Sample script for applying EOP settings to multiple tenants](https://technet.microsoft.com/library/e87e84e1-7be0-44bf-a414-d91d60ed8817.aspx).
 
 - The following introductory video shows you how to connect to and use Exchange Online Protection PowerShell.
 
-  **Note:** This video applies to Exchange Online and EOP organizations. When you connect to your organization, be careful to specify the correct URL (_ConnectionUri_ value). The required URL is different for Exchange Online and EOP organizations.
+  **Note:** This video applies to Exchange Online and standalone EOP organizations. When you connect to your organization, be sure to specify the correct URL (_ConnectionUri_ value). The required URL is different for Exchange Online and standalone EOP organizations.
 
   [Use Remote PowerShell in EOP](https://videoplayercdn.osi.office.net/hub/?csid=ux-cms-en-us-msoffice&uuid=9cb28006-c2cb-45b6-b72e-eeed8767dee7&AutoPlayVideo=false)
-  
-

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

@@ -2,7 +2,7 @@
 title: "Connect to Exchange Online PowerShell"
 ms.author: chrisda
 author: chrisda
-manager: serdars
+manager: dansimp
 ms.date: 7/10/2017
 ms.audience: Admin
 ms.topic: article
@@ -16,10 +16,11 @@ description: "Learn how to use remote PowerShell to connect to Exchange Online."
 ---
 
 # Connect to Exchange Online PowerShell
+
 Exchange Online PowerShell allows you to manage your Exchange Online settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online cmdlets into your local Windows PowerShell session so that you can use them.
 
 > [!IMPORTANT]
-> If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). <br/><br/> If you're an Exchange Online Protection (EOP) standalone customer, and you're using the service to protect on-premises mailboxes, use the connection instructions in the topic [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you.
+> If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). <br/><br/> If you're a standalone Exchange Online Protection (EOP) customer (for example, you're using EOP to protect your on-premises email environment), use the connection instructions in [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your standalone EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you.
 
 ## What do you need to know before you begin?
 
@@ -31,6 +32,8 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
 
   - Windows 8.1
 
+  - Windows Server 2019
+
   - Windows Server 2016
 
   - Windows Server 2012 or Windows Server 2012 R2
@@ -47,7 +50,7 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
 
   To require all PowerShell scripts that you download from the internet are signed by a trusted publisher, run the following command in an elevated Windows PowerShell window (a Windows PowerShell window you open by selecting **Run as administrator**):
 
-  ```
+  ```PowerShell
   Set-ExecutionPolicy RemoteSigned
   ```
 
@@ -56,19 +59,19 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
 > [!TIP]
 > Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351).
 
-## Connect to Exchange Online PowerShell
+## Connect to Exchange Online
 
 1. On your local computer, open Windows PowerShell and run the following command.
 
-   ```
+   ```PowerShell
    $UserCredential = Get-Credential
    ```
 
    In the **Windows PowerShell Credential Request** dialog box, type your work or school account and password, and then click **OK**.
 
-2. Run the following command.
+2. Run the following command:
 
-   ```
+   ```PowerShell
    $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://outlook.office365.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
    ```
 
@@ -86,16 +89,16 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
 
      For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
 
-3. Run the following command.
+3. Run the following command:
 
-   ```
+   ```PowerShell
    Import-PSSession $Session -DisableNameChecking
    ```
 
 > [!NOTE]
-> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell 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 the remote PowerShell session, run the following command. 
+> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell 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 the remote PowerShell session, run the following command.
 
-```
+```PowerShell
 Remove-PSSession $Session
 ```
 
@@ -113,6 +116,8 @@ If you receive errors, check the following requirements:
 
 - 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.
 
+- If your organization uses federated authentication, and your identity provider (IDP) and/or security token service (STS) isn't publicly available, you can't use a federated account to connect to Exchange Online PowerShell. Instead, create and use a non-federated account in Office 365 to connect to Exchange Online PowerShell.
+
 ## See also
 
 The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more information about these cmdlets, see the following topics.