Merge branch 'master' into remove-monikerinfo

Author: byszhoubin

exchange/docfx.json

@@ -52,7 +52,35 @@
         "src": "virtual-folder",
         "version": "exchange-ps",
         "dest": "module"
-      }
+      },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2010", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2010", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2010", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2010", "dest": "module/exchange-ps" },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2013", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2013", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2013", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2013", "dest": "module/exchange-ps" },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2016", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2016", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2016", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2016", "dest": "module/exchange-ps" },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2019", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2019", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2019", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2019", "dest": "module/exchange-ps" },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchonline-ps", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchonline-ps", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "exchonline-ps", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "exchonline-ps", "dest": "module/exchange-ps" },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "o365scc-ps", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "o365scc-ps", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "o365scc-ps", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "o365scc-ps", "dest": "module/exchange-ps" },
+      { "files": ["**/*.md"], "src": "docs-conceptual", "version": "eop-ps", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
+      { "files": ["toc.yml"], "src": "docs-conceptual", "version": "eop-ps", "dest": "exchange/exchange-ps" },
+      { "files": ["**/*.md"], "src": "exchange-ps", "version": "eop-ps", "dest": "module" },
+      { "files": ["toc.yml"], "src": "exchange-ps", "version": "eop-ps", "dest": "module/exchange-ps" }
     ],
     "resource": [
       {
@@ -65,12 +93,24 @@
           "**/obj/**",
           "**/includes/**"
         ]
-      }
+      },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2010", "exclude": ["**/obj/**", "**/includes/**"] },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2013", "exclude": ["**/obj/**", "**/includes/**"] },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2016", "exclude": ["**/obj/**", "**/includes/**"] },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2019", "exclude": ["**/obj/**", "**/includes/**"] },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "exchonline-ps", "exclude": ["**/obj/**", "**/includes/**"] },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "o365scc-ps", "exclude": ["**/obj/**", "**/includes/**"] },
+      { "files": ["**/*.png", "**/*.jpg"], "version": "eop-ps", "exclude": ["**/obj/**", "**/includes/**"] }
     ],
     "versions": {
-      "exchange-ps": {
-        "dest": "exchange-ps"
-      }
+      "exchange-ps": { "dest": "exchange-ps" },
+      "exchserver-ps-2010": { "dest": "exchserver-ps-2010" },
+      "exchserver-ps-2013": { "dest": "exchserver-ps-2013" },
+      "exchserver-ps-2016": { "dest": "exchserver-ps-2016" },
+      "exchserver-ps-2019": { "dest": "exchserver-ps-2019" },
+      "exchonline-ps": { "dest": "exchonline-ps" },
+      "o365scc-ps": { "dest": "o365scc-ps" },
+      "eop-ps": { "dest": "eop-ps" }
     },
     "overwrite": [],
     "externalReference": [],

exchange/docs-conceptual/basic-auth-connect-to-eop-powershell.md

@@ -39,10 +39,10 @@ The following introductory video shows you how to connect to and use Exchange On
   - Windows Server 2019
   - Windows Server 2016
   - Windows Server 2012 or Windows Server 2012 R2
-  - Windows 7 Service Pack 1 (SP1)<sup>*</sup>
-  - Windows Server 2008 R2 SP1<sup>*</sup>
+  - Windows 7 Service Pack 1 (SP1)<sup>\*</sup>
+  - Windows Server 2008 R2 SP1<sup>\*</sup>
 
-  <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 [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://www.microsoft.com/download/details.aspx?id=34595), [Windows Management Framework 4.0](https://www.microsoft.com/download/details.aspx?id=40855), 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 [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://aka.ms/wmf3download), [Windows Management Framework 4.0](https://aka.ms/wmf4download), 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:
 

exchange/docs-conceptual/basic-auth-connect-to-exo-powershell.md

@@ -45,7 +45,7 @@ The following introductory video shows you how to connect to and use Exchange On
   - Windows 7 Service Pack 1 (SP1)<sup>*</sup>
   - Windows Server 2008 R2 SP1<sup>*</sup>
 
-  <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 [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://www.microsoft.com/download/details.aspx?id=34595), [Windows Management Framework 4.0](https://www.microsoft.com/download/details.aspx?id=40855), 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 [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://aka.ms/wmf3download), [Windows Management Framework 4.0](https://aka.ms/wmf4download), 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:
 

exchange/docs-conceptual/basic-auth-connect-to-scc-powershell.md

@@ -50,7 +50,7 @@ Security & Compliance Center PowerShell allows you to manage your Security & Com
   - Windows 7 Service Pack 1 (SP1)<sup>*</sup>
   - Windows Server 2008 R2 SP1<sup>*</sup>
 
-  <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 [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://www.microsoft.com/download/details.aspx?id=34595), [Windows Management Framework 4.0](https://www.microsoft.com/download/details.aspx?id=40855), 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 [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://aka.ms/wmf3download), [Windows Management Framework 4.0](https://aka.ms/wmf4download), 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:
 

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

@@ -29,7 +29,7 @@ To use the older Exchange Online Remote PowerShell Module to connect to Exchange
 
 - The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
 
-- If your organization is on-premises Exchange, and you have Exchange Enterprise CAL with Services licenses for EOP, your EOP PowerShell connection instructions are the same as Exchange Online PowerShell as described in this topic.
+- If your organization is on-premises Exchange, and you have Exchange Enterprise CAL with Services licenses for Exchange Online Protection (EOP), your EOP PowerShell connection instructions are the same as Exchange Online PowerShell as described in this topic.
 
 > [!TIP]
 > Having problems? Ask in the [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542) forum.
@@ -47,11 +47,11 @@ If you account uses multi-factor authentication, use the steps in this section.
 2. The command that you need to run uses the following syntax:
 
    ```powershell
-   Connect-ExchangeOnline -UserPrincipalName <UPN> -ShowProgress $true [-ConnectionUri <URL>] [-AzureADAuthorizationEndPointUri <URL>] [-DelegatedOrganization <String>]
+   Connect-ExchangeOnline -UserPrincipalName <UPN> -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>]
    ```
 
    - _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
-   - The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
+   - When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
    - The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/partners).
 
    **This example connects to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
@@ -63,19 +63,19 @@ If you account uses multi-factor authentication, use the steps in this section.
    **This example connects to Exchange Online PowerShell in an Office 365 Germany organization**:
 
    ```powershell
-   Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ConnectionUri https://outlook.office.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
+   Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ExchangeEnvironmentName O365GermanyCloud
    ```
 
    **This example connects to Exchange Online PowerShell in a Microsoft GCC High organization**:
 
    ```powershell
-   Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ConnectionUri https://outlook.office365.us/powershell-liveid -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
+   Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ExchangeEnvironmentName O365USGovGCCHigh
    ```
 
    **This example connects to Exchange Online PowerShell in a Microsoft 365 DoD organization**:
 
    ```powershell
-   Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ConnectionUri https://webmail.apps.mil/powershell-liveid -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
+   Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ExchangeEnvironmentName O365USGovDoD
    ```
 
    **This example connects to Exchange Online PowerShell to manage another tenant**:
@@ -114,10 +114,10 @@ If your account doesn't use multi-factor authentication, use the steps in this s
 3. The command that you need to run uses the following syntax:
 
    ```powershell
-   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true [-ConnectionUri <URL>] [-DelegatedOrganization <String>]
+   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>]
    ```
 
-   - The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
+   - When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
    - The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/partners).
 
    **Connect to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
@@ -129,25 +129,25 @@ If your account doesn't use multi-factor authentication, use the steps in this s
    **Connect to Exchange Online PowerShell in an Office 365 Germany organization**:
 
    ```powershell
-   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://outlook.office.de/powershell-liveid/
+   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365GermanyCloud
    ```
 
    **Connect to Exchange Online PowerShell in an Office 365 operated by 21Vianet organization**:
 
    ```powershell
-   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://partner.outlook.cn/PowerShell
+   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365China
    ```
 
    **Connect to Exchange Online PowerShell in a Microsoft 365 GCC High organization**:
 
    ```powershell
-   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://outlook.office365.us/powershell-liveid/
+   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365USGovGCCHigh
    ```
 
    **Connect to Exchange Online PowerShell in a Microsoft 365 DoD organization**:
 
    ```powershell
-   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://webmail.apps.mil/powershell-liveid
+   Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365USGovDoD
    ```
 
 For detailed syntax and parameter information, see [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).

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

@@ -21,7 +21,7 @@ The Exchange Online PowerShell V2 module (abbreviated as the EXO V2 module) uses
 
 **This topic contains instructions for how to connect to Exchange Online Protection PowerShell using the EXO V2 module with or without using MFA.**
 
-To use the older, less secure remote PowerShell connection instructions that [will eventually be deprecated](https://techcommunity.microsoft.com/t5/exchange-team-blog/basic-authentication-and-exchange-online-july-update/ba-p/1530163), see [Bssic auth - Connect to Exchange Online Protection PowerShell](basic-auth-connect-to-eop-powershell.md).
+To use the older, less secure remote PowerShell connection instructions that [will eventually be deprecated](https://techcommunity.microsoft.com/t5/exchange-team-blog/basic-authentication-and-exchange-online-july-update/ba-p/1530163), see [Basic auth - Connect to Exchange Online Protection PowerShell](basic-auth-connect-to-eop-powershell.md).
 
 ## What do you need to know before you begin?
 
@@ -71,7 +71,7 @@ For detailed syntax and parameter information, see [Connect-IPPSSession](https:/
 > 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
-Get-PSSession | Remove-PSSession
+Disconnect-ExchangeOnline
 ```
 
 ## Connect to Exchange Online Protection PowerShell without using MFA
@@ -118,7 +118,7 @@ For detailed syntax and parameter information, see [Connect-IPPSSession](https:/
 > 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
-Get-PSSession | Remove-PSSession
+Disconnect-ExchangeOnline
 ```
 
 ## How do you know this worked?