Merge branch 'master' into markjjo-working

Author: markjjo

.openpublishing.redirection.json

@@ -69,6 +69,101 @@
       "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
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/unified-messaging/Test-ExchangeUMCallFlow.md",
+      "redirect_url": "https://www.microsoft.com/download/details.aspx?id=20839",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Get-ConnectSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Get-HotmailSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Get-ImapSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Get-PopSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Get-SendAddress.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Get-Subscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/New-ConnectSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/New-HotmailSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/New-ImapSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/New-PopSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/New-Subscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Remove-ConnectSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Remove-Subscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Set-ConnectSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Set-HotmailSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/connected-accounts/Set-ImapSubscription.md",
+      "redirect_url": "https://support.office.com/article/5cc526bf-e928-4a99-8b9f-5e089df7d887",
+      "redirect_document_id": false
+    },
+    {
+      "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/docs-conceptual/exchange-eop/connect-to-exchange-online-protection-powershell.md

@@ -38,11 +38,11 @@ Exchange Online Protection PowerShell allows you to manage your Exchange Online
 
   - Windows Server 2008 R2 SP1<sup>*</sup>
 
-    <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).
+  <sup>\*</sup> This version of windows has reached end of support, and is now only supported when running in Azure virtual machines. To use this version 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:
 
-    `Files cannot be loaded because running scripts is disabled on this system. Provide a valid certificate with which to sign the files.`
+    > 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**):
 
@@ -104,11 +104,11 @@ If you receive errors, check the following requirements:
 
 - The account you use to connect to Exchange Online Protection PowerShell must be represented as a [mail user in EOP](https://docs.microsoft.com/microsoft-365/security/office-365-security/manage-mail-users-in-eop) (created manually or by directory synchronization). If the account is not visible in the Exchange admin center (EAC) as a mail user at **Recipients** \> **Contacts**, you'll receive the following error when you try to connect:
 
-  `Import-PSSession : Running the Get-Command command in a remote session reported the following error: Processing data for a remote command failed with the following error message: The request for the Windows Remote Shell with ShellId <GUID> 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.`
+  > Import-PSSession : Running the Get-Command command in a remote session reported the following error: Processing data for a remote command failed with the following error message: The request for the Windows Remote Shell with ShellId <GUID> 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 **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.
 

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

@@ -42,7 +42,7 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
 
   - Windows Server 2008 R2 SP1<sup>*</sup>
 
-    <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).
+  <sup>\*</sup> This version of windows has reached end of support, and is now only supported when running in Azure virtual machines. To use this version 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:
 
@@ -56,19 +56,19 @@ 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**:
+- 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:
+  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:
+  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.`
 

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

@@ -18,7 +18,7 @@ description: "Learn how to connect to Exchange Online PowerShell by using multi-
 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. <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).)
+> 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?
 
@@ -40,11 +40,11 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
 
   - Windows Server 2008 R2 SP1<sup>*</sup>
 
-    <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).
+  <sup>\*</sup> This version of windows has reached end of support, and is now only supported when running in Azure virtual machines. To use this version 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. You need to do the following steps in a browser that supports ClickOnce (for example, Internet Explorer or Edge):
 
-  **Note**: ClickOnce support is available in the Chromium-based version of Edge at <edge://flags/#edge-click-once>.
+  **Note**: ClickOnce support is available in the Chromium-based version of Edge at <edge://flags/#edge-click-once>, and might not be enabled by default.
 
   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).
 
@@ -56,19 +56,22 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
 
      ![Click Install in the Exchange Online PowerShell Module window](../../media/0fd389a1-a32d-4e2f-bf5f-78e9b6407d4c.png)
 
-- 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**:
+- 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:
+  > [!NOTE]
+  > The Basic authentication header is required to transport the session's OAuth token, since the client-side WinRM implementation has no support for OAuth.
+
+  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:
+  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.
 
@@ -110,11 +113,11 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
    Connect-EXOPSSession -UserPrincipalName [email protected] -ConnectionUri https://outlook.office.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
    ```
 
-   This example connects to Exchange Online to manage another tenant
+   This example connects to Exchange Online to manage another tenant.
 
-     ```PowerShell
-     Connect-EXOPSSession -UserPrincipalName lukas@fabrikam.com -ConnectionUri https://outlook.office.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
-     ```
+   ```PowerShell
+   Connect-EXOPSSession -UserPrincipalName chris@contoso.com -DelegatedOrganization fabrikam.onmicrosoft.com
+   ```
 
 3. In the sign-in window that opens, enter your password, and then click **Sign in**.
 
@@ -139,7 +142,7 @@ If your organization has single sign-on (SSO) enabled and you are logged on to a
 
 > 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.
+This error occurs because single sign-on overrides the specified user principal name (UPN). As a work-around, use Connect-EXOPSSession without -UserPrincipalName parameter or use -Credential parameter instead.
 
 ## How do you know this worked?