Merge branch 'UALRetentionPolicy-chrisda' into markjjo-working

Author: markjjo

.openpublishing.redirection.json

@@ -64,6 +64,11 @@
       "source_path": "exchange/virtual-folder/exchange/policy-and-compliance-dlp/Set-DlpComplianceRuleV2.md",
       "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/set-dlpcompliancerule",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "exchange/exchange-ps-v2-module/connect-exchangeonline.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/powershell-v2-module/connect-exchangeonline",
+      "redirect_document_id": true
     }
    ] 
   }

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

@@ -55,10 +55,29 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
   ```
 
   You need to configure this setting only once on your computer, not every time you connect.
+  
+- Windows Remote Management (WinRM) on your computer needs to allow basic authentication (it's enabled by default). To verify that basic authentication is enabled, run this command **in a Command Prompt**:
+
+  ```
+  winrm get winrm/config/client/auth
+  ```
+
+  If you don't see the value `Basic = true`, you need to run this command to enable basic authentication for WinRM:
+
+  ```
+  winrm set winrm/config/client/auth @{Basic="true"}
+  ```
+
+  If basic authentication is disabled, you'll get this error when you try to connect:
+
+  `The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.`
 
 > [!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).
 
+> [!IMPORTANT]
+> On October 13th, 2020 we will retire Basic Authentication for Remote PowerShell (RPS) in Exchange Online.
+
 ## Connect to Exchange Online
 
 1. On your local computer, open Windows PowerShell and run the following command.

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

@@ -15,10 +15,10 @@ description: "Learn how to connect to Exchange Online PowerShell by using multi-
 
 # Connect to Exchange Online PowerShell using multi-factor authentication
 
-If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you can't use the instructions at [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md) to use remote PowerShell to connect to Exchange Online. MFA requires you to install the Exchange Online Remote PowerShell Module, and use the **Connect-ExoPSSession** cmdlet to connect.
+If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you can't use the instructions at [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md) to use remote PowerShell to connect to Exchange Online. MFA requires you to install the Exchange Online Remote PowerShell Module, and use the **Connect-EXOPSSession** cmdlet to connect.
 
 > [!NOTE]
-> The Exchange Online Remote PowerShell Module is not supported in PowerShell Core (macOS, Linux, or Windows Nano Server). As a workaround, you can install the module on a computer that's running a supported version of Windows (physical or virtual), and use remote desktop software to connect.
+> • The Exchange Online Remote PowerShell Module is not supported in PowerShell Core (macOS, Linux, or Windows Nano Server). As a workaround, you can install the module on a computer that's running a supported version of Windows (physical or virtual), and use remote desktop software to connect. <br/><br/>• To use the new Exchange Online PowerShell V2 module (which also supports MFA), see [Use the Exchange Online PowerShell V2 module](../exchange-online-powershell-v2/exchange-online-powershell-v2.md).)
 
 ## What do you need to know before you begin?
 
@@ -42,11 +42,11 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
 
     <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).
 
-- The Exchange Online Remote PowerShell Module needs to be installed on your computer:
+- The Exchange Online Remote PowerShell Module needs to be installed on your computer. You need to do the following steps in a browser that supports ClickOnce (for example, Internet Explorer or Edge):
 
-  1. In Internet Explorer or Edge, open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
+  **Note**: ClickOnce support is available in the Chromium-based version of Edge at <edge://flags/#edge-click-once>.
 
-     **Note**: A browser that uses ClickOnce to download (like Internet Explorer or Edge) is needed to complete the next step.
+  1. Open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
 
   2. In the EAC, go to **Hybrid** > **Setup** and click the appropriate **Configure** button to download the Exchange Online Remote PowerShell Module for multi-factor authentication.
 
@@ -70,7 +70,7 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
 
   If basic authentication is disabled, you'll get this error when you try to connect:
 
-  `The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.`
+  > The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.
 
 - When you use the Exchange Online Remote PowerShell Module, your session will end after one hour, which can be problematic for long-running scripts or processes. To avoid this issue, use [Trusted IPs](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-mfasettings#trusted-ips) to bypass MFA for connections from your intranet. Trusted IPs allow you to connect to Exchange Online PowerShell from your intranet using the old instructions at [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md). Also, if you have servers in a datacenter, be sure to add their public IP addresses to Trusted IPs as described [here](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-mfasettings#enable-the-trusted-ips-feature-by-using-service-settings).
 
@@ -113,7 +113,7 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
    This example connects to Exchange Online to manage another tenant
 
      ```PowerShell
-     Connect-ExoPSSession -UserPrincipalName [email protected] -ConnectionUri https://outlook.office.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
+     Connect-EXOPSSession -UserPrincipalName [email protected] -ConnectionUri https://outlook.office.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
      ```
 
 3. In the sign-in window that opens, enter your password, and then click **Sign in**.
@@ -135,9 +135,9 @@ Get-PSSession | Remove-PSSession
 
 ## Single sign-on
 
-If your organization has single sign-on (SSO) enabled and you are logged on to a computer as a user in the SSO ___domain, then **Connect-EXPOPSSession** may fail with the following error:
+If your organization has single sign-on (SSO) enabled and you are logged on to a computer as a user in the SSO ___domain, then **Connect-EXOPSSession** may fail with the following error:
 
-> New-ExoPSSession : User '[email protected]' returned by service does not match user '[email protected]' in the request.
+> New-EXOPSSession : User '[email protected]' returned by service does not match user '[email protected]' in the request.
 
 This error occurs because single sign-on overrides the specified user principal name (UPN). As a work-around, connect from a non-___domain-joined computer or log on to the ___domain-joined computer using a local user account.
 

exchange/docs-conceptual/exchange-online/exchange-online-powershell-v2/cmdlet-property-sets.md

@@ -18,7 +18,7 @@ description: "Learn about the available property sets in the Exchange Online Pow
 
 # Property sets in Exchange Online PowerShell V2 cmdlets
 
-This topic describes the property sets that are available in the new cmdlets in the [Exchange Online PowerShell V2 module](exchange-online-powershell-v2.md). For more information about property sets, see [Properties and property sets](exchange-online-powershell-v2.md#properties-and-property-sets).
+This topic describes the property sets that are available in the new cmdlets in the [Exchange Online PowerShell V2 module](exchange-online-powershell-v2.md). For more information about property sets, see [Properties and property sets in the EXO V2 module](exchange-online-powershell-v2.md#properties-and-property-sets-in-the-exo-v2-module).
 
 ## Get-EXOCasMailbox property sets