Merge branch 'master' into patch-9

Author: tiburd

.openpublishing.redirection.json

@@ -282,7 +282,7 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/advanced-threat-protection/Get-AdvancedThreatProtectionTrafficReport.md",
-      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-advancedthreatprotectiontrafficreport",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
       "redirect_document_id": false
     },
     {
@@ -342,7 +342,7 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/advanced-threat-protection/Get-UrlTrace.md",
-      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-urltrace",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-safelinksaggregatereport",
       "redirect_document_id": false
     },
     {
@@ -5247,12 +5247,12 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/reporting/Get-MailDetailMalwareReport.md",
-      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailmalwarereport",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
       "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/reporting/Get-MailDetailSpamReport.md",
-      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailspamreport",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
       "redirect_document_id": false
     },
     {
@@ -6626,24 +6626,54 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "exchange/virtual-folder/exchange/mailboxes/Get-TenantAnalyticsConfig.md",
+      "source_path": "exchange/virtual-folder/exchange/Get-TenantAnalyticsConfig.md",
       "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-myanalyticsfeatureconfig",
       "redirect_document_id": false
     },
     {
-      "source_path": "exchange/virtual-folder/exchange/mailboxes/Set-TenantAnalyticsConfig.md",
+      "source_path": "exchange/virtual-folder/exchange/Set-TenantAnalyticsConfig.md",
       "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/set-myanalyticsfeatureconfig",
       "redirect_document_id": false
     },
     {
-      "source_path": "exchange/virtual-folder/exchange/mailboxes/Get-UserAnalyticsConfig.md",
+      "source_path": "exchange/virtual-folder/exchange/Get-UserAnalyticsConfig.md",
       "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-myanalyticsfeatureconfig",
       "redirect_document_id": false
     },
     {
-      "source_path": "exchange/virtual-folder/exchange/mailboxes/Set-UserAnalyticsConfig.md",
+      "source_path": "exchange/virtual-folder/exchange/Set-UserAnalyticsConfig.md",
       "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/set-myanalyticsfeatureconfig",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-MailDetailMalwareReport.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-MailDetailSpamReport.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-AdvancedThreatProtectionTrafficReport.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-UrlTrace.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-safelinksaggregatereport",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-MailTrafficReport.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/exchange/get-maildetailatpreport",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Import-ContactList.md",
+      "redirect_url": "https://support.microsoft.com/office/import-contacts-to-outlook-bb796340-b58a-46c1-90c7-b549b8f3c5f8",
+      "redirect_document_id": false
     }
   ]
 }

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

@@ -133,11 +133,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](/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/basic-auth-connect-to-scc-powershell.md

@@ -140,7 +140,7 @@ 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 Security & Compliance Center PowerShell endpoint.
 

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

@@ -47,7 +47,8 @@ If your account uses multi-factor authentication, use the steps in this section.
    Import-Module ExchangeOnlineManagement
    ```
 
-   **Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
+   > [!NOTE]
+   > If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
 
 2. The command that you need to run uses the following syntax:
 
@@ -65,12 +66,6 @@ If your account uses multi-factor authentication, use the steps in this section.
    Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.protection.outlook.com/powershell-liveid/
    ```
 
-   **This example connects to Exchange Online Protection PowerShell in an Office 365 Germany organization**:
-
-   ```powershell
-   Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.protection.outlook.de/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
-   ```
-
 For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-exchangeonline).
 
 > [!NOTE]
@@ -90,7 +85,8 @@ If your account doesn't use multi-factor authentication, use the steps in this s
    Import-Module ExchangeOnlineManagement
    ```
 
-   **Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
+   > [!NOTE]
+   > If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
 
 2. Run the following command:
 
@@ -118,12 +114,6 @@ If your account doesn't use multi-factor authentication, use the steps in this s
    Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.protection.outlook.com/powershell-liveid/
    ```
 
-   **This example connects to Exchange Online Protection PowerShell in an Office 365 Germany organization**:
-
-   ```powershell
-   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.protection.outlook.de/powershell-liveid/
-   ```
-
 For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-exchangeonline).
 
 > [!NOTE]
@@ -147,10 +137,10 @@ If you receive errors, check the following requirements:
 
 - The account that you use to connect to Exchange Online Protection PowerShell must be represented as a [mail user in EOP](/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.
 
 - You 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/connect-to-scc-powershell.md

@@ -61,22 +61,22 @@ If your account uses multi-factor authentication, use the steps in this section.
    Connect-IPPSSession -UserPrincipalName [email protected]
    ```
 
-   **This example connects to Security & Compliance Center PowerShell in an Office 365 Germany organization**.
+   **This example connects to Security & Compliance Center PowerShell in an Office 365 operated by 21Vianet organization**.
 
    ```powershell
-   Connect-IPPSSession -UserPrincipalName lukas@fabrikam.de -ConnectionUri https://ps.compliance.protection.outlook.de/PowerShell-LiveID
+   Connect-IPPSSession -UserPrincipalName li@fabrikam.cn -ConnectionUri https://ps.compliance.protection.partner.outlook.cn/powershell-liveid
    ```
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
 
    ```powershell
-   Connect-IPPSSession -UserPrincipalName -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
+   Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
    ```
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
 
    ```powershell
-   Connect-IPPSSession -UserPrincipalName -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
+   Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
    ```
 
 For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
@@ -128,10 +128,10 @@ If your account doesn't use multi-factor authentication, use the steps in this s
    Connect-IPPSSession -Credential $UserCredential
    ```
 
-   **This example connects to Security & Compliance Center PowerShell in an Office 365 Germany organization**.
+   **This example connects to Security & Compliance Center PowerShell in aOffice 365 operated by 21Vianet organization**.
 
    ```powershell
-   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.outlook.de/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.de/common
+   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.partner.outlook.cn/powershell-liveid -AzureADAuthorizationEndpointUri https://login.chinacloudapi.cn/common
    ```
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.