Merge branch 'main' into main

Author: Jeahenng

.openpublishing.publish.config.json

@@ -37,7 +37,7 @@
             "docset_name": "exchange-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -46,8 +46,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -86,7 +86,7 @@
             "docset_name": "skype-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -95,8 +95,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -108,7 +108,7 @@
             "docset_name": "spmt-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -117,8 +117,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -135,7 +135,7 @@
             "docset_name": "teams-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -144,8 +144,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -162,7 +162,7 @@
             "docset_name": "whiteboard-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -171,8 +171,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -199,4 +199,4 @@
             "template_folder": "_themes.pdf"
         }
     }
-}
+}

exchange/docs-conceptual/app-only-auth-powershell-v2.md

@@ -33,22 +33,24 @@ Certificate based authentication (CBA) or app-only authentication as described i
 >
 >   For instructions on how to install or update the module, see [Install and maintain the Exchange Online PowerShell module](exchange-online-powershell-v2.md#install-and-maintain-the-exchange-online-powershell-module). For instructions on how to use the module in Azure automation, see [Manage modules in Azure Automation](/azure/automation/shared-resources/modules).
 >
+> - CBA or app-only authentication is available in Office 365 operated by 21Vianet in China.
+>
 > - REST API connections in the Exchange Online PowerShell V3 module require the PowerShellGet and PackageManagement modules. For more information, see [PowerShellGet for REST-based connections in Windows](exchange-online-powershell-v2.md#powershellget-for-rest-api-connections-in-windows).
 >
 >   If the procedures in this article don't work for you, verify that you don't have Beta versions of the PackageManagement or PowerShellGet modules installed by running the following command: `Get-InstalledModule PackageManagement -AllVersions; Get-InstalledModule PowerShellGet -AllVersions`.
 >
 > - In Exchange Online PowerShell, you can't use the procedures in this article with the following Microsoft 365 Group cmdlets:
->   - [New-UnifiedGroup](/powershell/module/exchange/new-unifiedgroup)
->   - [Remove-UnifiedGroup](/powershell/module/exchange/remove-unifiedgroup)
->   - [Remove-UnifiedGroupLinks](/powershell/module/exchange/remove-unifiedgrouplinks)
->   - [Add-UnifiedGroupLinks](/powershell/module/exchange/add-unifiedgrouplinks)
+>   - [New-UnifiedGroup](/powershell/module/exchangepowershell/new-unifiedgroup)
+>   - [Remove-UnifiedGroup](/powershell/module/exchangepowershell/remove-unifiedgroup)
+>   - [Remove-UnifiedGroupLinks](/powershell/module/exchangepowershell/remove-unifiedgrouplinks)
+>   - [Add-UnifiedGroupLinks](/powershell/module/exchangepowershell/add-unifiedgrouplinks)
 >
 >   You can use Microsoft Graph to replace most of the functionality from those cmdlets. For more information, see [Working with groups in Microsoft Graph](/graph/api/resources/groups-overview).
 >
 > - In Security & Compliance PowerShell, you can't use the procedures in this article with the following Microsoft 365 Group cmdlets:
->   - [Get-ComplianceSearchAction](/powershell/module/exchange/get-compliancesearchaction)
->   - [New-ComplianceSearch](/powershell/module/exchange/new-compliancesearch)
->   - [Start-ComplianceSearch](/powershell/module/exchange/start-compliancesearch)
+>   - [Get-ComplianceSearchAction](/powershell/module/exchangepowershell/get-compliancesearchaction)
+>   - [New-ComplianceSearch](/powershell/module/exchangepowershell/new-compliancesearch)
+>   - [Start-ComplianceSearch](/powershell/module/exchangepowershell/start-compliancesearch)
 >
 > - Delegated scenarios are supported in Exchange Online. The recommended method for connecting with delegation is using GDAP and App Consent. For more information, see [Use the Exchange Online PowerShell v3 Module with GDAP and App Consent](/powershell/partnercenter/exchange-online-gdap-app). You can also use multi-tenant applications when CSP relationships are not created with the customer. The required steps for using multi-tenant applications are called out within the regular instructions in this article.
 >
@@ -523,7 +525,7 @@ To assign custom role groups to the application using service principals, do the
    $SP = Get-ServicePrincipal -Identity "SP for Azure AD App ExO PowerShell CBA"
    ```
 
-   For detailed syntax and parameter information, see [New-ServicePrincipal](/powershell/module/exchange/new-serviceprincipal).
+   For detailed syntax and parameter information, see [New-ServicePrincipal](/powershell/module/exchangepowershell/new-serviceprincipal).
 
 3. In Exchange Online PowerShell or Security & Compliance PowerShell, run the following command to add the service principal as a member of the custom role group:
 
@@ -537,4 +539,4 @@ To assign custom role groups to the application using service principals, do the
    Add-RoleGroupMember -Identity "Contoso View-Only Recipients" -Member $SP.Identity
    ```
 
-   For detailed syntax and parameter information, see [Add-RoleGroupMember](/powershell/module/exchange/add-rolegroupmember).
+   For detailed syntax and parameter information, see [Add-RoleGroupMember](/powershell/module/exchangepowershell/add-rolegroupmember).

exchange/docs-conceptual/client-advanced-settings.md

@@ -21,8 +21,8 @@ description: "Security & Compliance PowerShell advanced settings for Microsoft P
 
 This article contains the [Security & Compliance PowerShell](/powershell/exchange/office-365-scc/office-365-scc-powershell) advanced settings that are supported by [Microsoft Purview Information Protection client](/purview/information-protection-client) when you use the following cmdlets:
 
-- [New-Label](/powershell/module/exchange/new-label) or [Set-Label](/powershell/module/exchange/set-label)
-- [New-LabelPolicy](/powershell/module/exchange/new-labelpolicy) or [Set-LabelPolicy](/powershell/module/exchange/set-labelpolicy)
+- [New-Label](/powershell/module/exchangepowershell/new-label) or [Set-Label](/powershell/module/exchangepowershell/set-label)
+- [New-LabelPolicy](/powershell/module/exchangepowershell/new-labelpolicy) or [Set-LabelPolicy](/powershell/module/exchangepowershell/set-labelpolicy)
 
 The advanced settings that are supported by sensitivity labels built into Microsoft 365 apps and services are included on the cmdlet page itself. You might also find useful [PowerShell tips for specifying the advanced settings](/purview/create-sensitivity-labels#powershell-tips-for-specifying-the-advanced-settings).
 
@@ -317,11 +317,11 @@ Use this advanced setting in conjunction with *ScannerMinCPU* to limit CPU consu
 
 - Value: \<number>**
 
-The value is set to **100** by default, which means there is no limit of maximum CPU consumption. In this case, the scanner process will try to use all available CPU time to maximize your scan rates.
+The value is set to **100** by default, which means there is no limit of maximum CPU consumption. In this case, the scanner process tries to use all available CPU time to maximize your scan rates.
 
-If you set **ScannerMaxCPU** to less than 100, the scanner will monitor the CPU consumption over the last 30 minutes. If the average CPU crossed the limit you set, it will start to reduce the number of threads allocated for new files.
+If you set **ScannerMaxCPU** to less than 100, the scanner monitors the CPU consumption over the last 30 minutes. If the average CPU crossed the limit you set, it starts to reduce the number of threads allocated for new files.
 
-The limit on the number of threads will continue as long as CPU consumption is higher than the limit set for **ScannerMaxCPU**.
+The limit on the number of threads continues as long as CPU consumption is higher than the limit set for **ScannerMaxCPU**.
 
 ## ScannerMinCPU
 
@@ -334,7 +334,7 @@ Used only if *ScannerMaxCPU* is not equal to 100, and cannot be set to a number
 
 We recommend keeping **ScannerMinCPU** set at least 15 points lower than the value of *ScannerMaxCPU*.
 
-The value is set to **50** by default, which means that if CPU consumption in the last 30 minutes when lower than this value, the scanner will start adding new threads to scan more files in parallel, until the CPU consumption reaches the level you have set for *ScannerMaxCPU*-15.
+The value is set to **50** by default, which means that if CPU consumption in the last 30 minutes when lower than this value, the scanner starts adding new threads to scan more files in parallel, until the CPU consumption reaches the level you have set for *ScannerMaxCPU*-15.
 
 ## ScannerConcurrencyLevel
 
@@ -361,17 +361,17 @@ Set-LabelPolicy -Identity Scanner -AdvancedSettings @{ScannerConcurrencyLevel="8
 
 By default, the information protection scanner scans all relevant files. However, you might want to define specific files to be skipped, such as for archived files or files that have been moved.
 
-Enable the scanner to skip specific files based on their file attributes by using the **ScannerFSAttributesToSkip** advanced setting. In the setting value, list the file attributes that will enable the file to be skipped when they are all set to **true**. This list of file attributes uses the AND logic.
+Enable the scanner to skip specific files based on their file attributes by using the **ScannerFSAttributesToSkip** advanced setting. In the setting value, list the file attributes that enable the file to be skipped when they are all set to **true**. This list of file attributes uses the AND logic.
 
 Example PowerShell commands, where your label policy is named "Global".
 
-**Skip files that are both read-only and archived**
+**Skip files that are both read-only and archived**:
 
 ```PowerShell
 Set-LabelPolicy -Identity Global -AdvancedSettings @{ ScannerFSAttributesToSkip =" FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE"}
 ```
 
-**Skip files that are either read-only or archived**
+**Skip files that are either read-only or archived**:
 
 To use an OR logic, run the same property multiple times. For example:
 

exchange/docs-conceptual/cmdlet-property-sets.md

@@ -49,8 +49,8 @@ The available property sets for the **Get-EXOCasMailbox** cmdlet and the propert
 
 For more information, see:
 
-- [Get-EXOCASMailbox](/powershell/module/exchange/get-exocasmailbox)
-- [Get-CASMailbox](/powershell/module/exchange/get-casmailbox)
+- [Get-EXOCASMailbox](/powershell/module/exchangepowershell/get-exocasmailbox)
+- [Get-CASMailbox](/powershell/module/exchangepowershell/get-casmailbox)
 
 ## Get-EXOMailbox property sets
 
@@ -86,8 +86,8 @@ The available property sets for the **Get-EXOMailbox** cmdlet and the properties
 
 For more information, see:
 
-- [Get-EXOMailbox](/powershell/module/exchange/get-exomailbox)
-- [Get-Mailbox](/powershell/module/exchange/get-mailbox)
+- [Get-EXOMailbox](/powershell/module/exchangepowershell/get-exomailbox)
+- [Get-Mailbox](/powershell/module/exchangepowershell/get-mailbox)
 
 ## Get-EXOMailboxStatistics property sets
 
@@ -100,8 +100,8 @@ The available property sets for the **Get-EXOMailboxStatistics** cmdlet and the
 
 For more information, see:
 
-- [Get-EXOMailboxStatistics](/powershell/module/exchange/get-exomailboxstatistics)
-- [Get-MailboxStatistics](/powershell/module/exchange/get-mailboxstatistics)
+- [Get-EXOMailboxStatistics](/powershell/module/exchangepowershell/get-exomailboxstatistics)
+- [Get-MailboxStatistics](/powershell/module/exchangepowershell/get-mailboxstatistics)
 
 ## Get-EXORecipient property sets
 
@@ -121,5 +121,5 @@ The available property sets for the **Get-EXORecipient** cmdlet and the properti
 
 For more information, see:
 
-- [Get-EXORecipient](/powershell/module/exchange/get-exorecipient)
-- [Get-Recipient](/powershell/module/exchange/get-recipient)
+- [Get-EXORecipient](/powershell/module/exchangepowershell/get-exorecipient)
+- [Get-Recipient](/powershell/module/exchangepowershell/get-recipient)

exchange/docs-conceptual/connect-exo-powershell-managed-identity.md

@@ -28,10 +28,10 @@ The rest of this article explains how to connect using managed identity, and the
 > [!NOTE]
 > In Exchange Online PowerShell, you can't use the procedures in this article with the following Microsoft 365 Group cmdlets:
 >
-> - [New-UnifiedGroup](/powershell/module/exchange/new-unifiedgroup)
-> - [Remove-UnifiedGroup](/powershell/module/exchange/remove-unifiedgroup)
-> - [Remove-UnifiedGroupLinks](/powershell/module/exchange/remove-unifiedgrouplinks)
-> - [Add-UnifiedGroupLinks](/powershell/module/exchange/add-unifiedgrouplinks)
+> - [New-UnifiedGroup](/powershell/module/exchangepowershell/new-unifiedgroup)
+> - [Remove-UnifiedGroup](/powershell/module/exchangepowershell/remove-unifiedgroup)
+> - [Remove-UnifiedGroupLinks](/powershell/module/exchangepowershell/remove-unifiedgrouplinks)
+> - [Add-UnifiedGroupLinks](/powershell/module/exchangepowershell/add-unifiedgrouplinks)
 >
 > You can use Microsoft Graph to replace most of the functionality from those cmdlets. For more information, see [Working with groups in Microsoft Graph](/graph/api/resources/groups-overview).
 >
@@ -68,7 +68,7 @@ The first command in the PowerShell runbook must be the `Connect-ExchangeOnline.
 Connect-ExchangeOnline -ManagedIdentity -Organization contoso.onmicrosoft.com
 ```
 
-After that, as a test, you can start with as simple, low-impact command in the runbook before moving on to more complex commands or scripts. For example:
+After that, as a test, you can start with as simple, low risk command in the runbook before moving on to more complex commands or scripts. For example:
 
 ```powershell
 Get-AcceptedDomain | Format-Table Name
@@ -118,7 +118,7 @@ Connect-ExchangeOnline -ManagedIdentity -Organization contoso.onmicrosoft.com -M
 
 You get the ManagedIdentityAccount value from [Step 3: Store the user-assigned managed identity in a variable](#step-3-store-the-user-assigned-managed-identity-in-a-variable).
 
-After that, as a test, you can start with as simple, low-impact command in the runbook before moving on to more complex commands or scripts. For example:
+After that, as a test, you can start with as simple, low risk command in the runbook before moving on to more complex commands or scripts. For example:
 
 ```powershell
 Get-AcceptedDomain | Format-Table Name
@@ -285,7 +285,7 @@ To verify that the module imported successfully, run the following command:
 Get-AzAutomationModule -ResourceGroupName ContosoRG -AutomationAccountName ContosoAzAuto1 -Name ExchangeOnlineManagement
 ```
 
-During the import, the ProvisioningState property will have the value Creating. When the module import is complete, the value will change to Succeeded.
+During the import, the ProvisioningState property has the value Creating. When the module import is complete, the value changes to Succeeded.
 
 For detailed syntax and parameter information, see [New-AzAutomationModule](/powershell/module/az.automation/new-azautomationmodule).
 

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

@@ -61,7 +61,7 @@ The command that you need to run uses the following syntax:
 Connect-ExchangeOnline [-UserPrincipalName <UPN>] [-ExchangeEnvironmentName <Value>] [-ShowBanner:$false] [-LoadCmdletHelp] [-DelegatedOrganization <String>] [-SkipLoadingFormatData] [-DisableWAM]
    ```
 
-For detailed syntax and parameter information, see [Connect-ExchangeOnline](/powershell/module/exchange/connect-exchangeonline).
+For detailed syntax and parameter information, see [Connect-ExchangeOnline](/powershell/module/exchangepowershell/connect-exchangeonline).
 
 - _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
 

exchange/docs-conceptual/connect-to-exo-powershell-c-sharp.md

@@ -207,7 +207,7 @@ void ParallelConnectionsToExchangeOnline()
 
         // Set the ThreadOptions to reuse the same threads for the runspaces so that
 
-        // the Exchange Online cmdlets will be available after running Connect-ExchangeOnline in each runspace.
+        // the Exchange Online cmdlets are available after running Connect-ExchangeOnline in each runspace.
 
         pool.ThreadOptions = PSThreadOptions.ReuseThread;
 

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

@@ -54,7 +54,7 @@ The command that you need to run uses the following syntax:
 Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>] [-AzureADAuthorizationEndpointUri <URL>] [-DelegatedOrganization <String>] [-PSSessionOption $ProxyOptions]
 ```
 
-For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
+For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchangepowershell/connect-ippssession).
 
 - _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).