Merge branch 'main' into DefaultTenant-chrisda

Author: chrisda

.openpublishing.redirection.json

@@ -6347,12 +6347,12 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/New-EOPDistributionGroup.md",
-      "redirect_url": "/powershell/module/exchange/new-eopdistributiongroup",
+      "redirect_url": "/powershell/module/exchange/new-distributiongroup",
       "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/New-EOPMailUser.md",
-      "redirect_url": "/powershell/module/exchange/new-eopmailuser",
+      "redirect_url": "/powershell/module/exchange/new-mailuser",
       "redirect_document_id": false
     },
     {
@@ -6387,12 +6387,12 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Remove-EOPDistributionGroup.md",
-      "redirect_url": "/powershell/module/exchange/remove-eopdistributiongroup",
+      "redirect_url": "/powershell/module/exchange/remove-distributiongroup",
       "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Remove-EOPMailUser.md",
-      "redirect_url": "/powershell/module/exchange/remove-eopmailuser",
+      "redirect_url": "/powershell/module/exchange/remove-mailuser",
       "redirect_document_id": false
     },
     {
@@ -6432,22 +6432,22 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Set-EOPDistributionGroup.md",
-      "redirect_url": "/powershell/module/exchange/set-eopdistributiongroup",
+      "redirect_url": "/powershell/module/exchange/set-distributiongroup",
       "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Set-EOPGroup.md",
-      "redirect_url": "/powershell/module/exchange/set-eopgroup",
+      "redirect_url": "/powershell/module/exchange/set-group",
       "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Set-EOPMailUser.md",
-      "redirect_url": "/powershell/module/exchange/set-eopmailuser",
+      "redirect_url": "/powershell/module/exchange/set-mailuser",
       "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Set-EOPUser.md",
-      "redirect_url": "/powershell/module/exchange/set-eopuser",
+      "redirect_url": "/powershell/module/exchange/set-user",
       "redirect_document_id": false
     },
     {
@@ -6492,7 +6492,7 @@
     },
     {
       "source_path": "exchange/virtual-folder/exchange/users-and-groups/Update-EOPDistributionGroupMember.md",
-      "redirect_url": "/powershell/module/exchange/update-eopdistributiongroupmember",
+      "redirect_url": "/powershell/module/exchange/update-distributiongroupmember",
       "redirect_document_id": false
     },
     {
@@ -6874,6 +6874,51 @@
       "source_path": "exchange/docs-conceptual/v1-module-mfa-connect-to-exo-powershell.md",
       "redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/New-EOPDistributionGroup.md",
+      "redirect_url": "/powershell/module/exchange/new-distributiongroup",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/New-EOPMailUser.md",
+      "redirect_url": "/powershell/module/exchange/new-mailuser",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Remove-EOPDistributionGroup.md",
+      "redirect_url": "/powershell/module/exchange/remove-distributiongroup",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Remove-EOPMailUser.md",
+      "redirect_url": "/powershell/module/exchange/remove-mailuser",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Set-EOPDistributionGroup.md",
+      "redirect_url": "/powershell/module/exchange/set-distributiongroup",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Set-EOPGroup.md",
+      "redirect_url": "/powershell/module/exchange/set-group",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Set-EOPMailUser.md",
+      "redirect_url": "/powershell/module/exchange/set-mailuser",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Set-EOPUser.md",
+      "redirect_url": "/powershell/module/exchange/set-user",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Update-EOPDistributionGroupMember.md",
+      "redirect_url": "/powershell/module/exchange/update-distributiongroupmember",
+      "redirect_document_id": false
     }
   ]
 }

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

@@ -42,8 +42,6 @@ To connect to Exchange Online PowerShell from C#, see [Use C# to connect to Exch
 
   To find the permissions that are required to run specific Exchange Online cmdlets, see [Find the permissions required to run any Exchange cmdlet](find-exchange-cmdlet-permissions.md).
 
-- 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 article.
-
 > [!TIP]
 > Having problems? Ask in the [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542) forum.
 

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

@@ -22,15 +22,17 @@ This article contains instructions for how to connect to Exchange Online Protect
 
 The Exchange Online PowerShell module uses modern authentication for connecting to all Exchange-related PowerShell environments in Microsoft 365: Exchange Online PowerShell, Security & Compliance PowerShell, and standalone Exchange Online Protection (EOP) PowerShell. For more information about the module, see [About the Exchange Online PowerShell module](exchange-online-powershell-v2.md).
 
+For more information about Exchange Online Protection PowerShell, see [Exchange Online Protection PowerShell](exchange-online-protection-powershell.md).
+
 > [!NOTE]
 > Version 2.0.5 and earlier is known as the Exchange Online PowerShell V2 module (abbreviated as the EXO V2 module). Version 3.0.0 and later is known as the Exchange Online PowerShell V3 module (abbreviated as the EXO V3 module).
+>
+> As of June 2020, the instructions for connecting to standalone Exchange Online Protection PowerShell and Exchange Online PowerShell are basically the same. If you use the **Connect-IPPSSession** cmdlet with the _ConnectionUri_ parameter value `https://ps.protection.outlook.com/powershell-liveid/`, you're redirected to the same `https://outlook.office365.com/powershell-liveid/` endpoint that's used by **Connect-ExchangeOnline** for Exchange Online PowerShell connections.
+>  
+> Remote PowerShell support in Exchange Online PowerShell will be deprecated. For more information, see [Announcing Deprecation of Remote PowerShell (RPS) Protocol in Exchange Online PowerShell](https://aka.ms/RPSDeprecation).
 
 ## What do you need to know before you begin?
 
-- **The procedures in this article are only for Microsoft 365 organizations that don't have Exchange Online mailboxes**. For example, you have a standalone EOP subscription that protects your on-premises email environment. If your Microsoft 365 subscription includes Exchange Online mailboxes, you can't connect to EOP PowerShell; instead, you [connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md).
-
-  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. Use the Exchange Online PowerShell connection instructions in [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md) instead of the instructions in this article.
-
 - The requirements for installing and using the module are described in [Install and maintain the Exchange Online PowerShell module](exchange-online-powershell-v2.md#install-and-maintain-the-exchange-online-powershell-module).
 
 - After you connect, the cmdlets and parameters that you have or don't have access to is controlled by role-based access control (RBAC). For more information, see [Permissions in standalone EOP](/exchange/standalone-eop/manage-admin-role-group-permissions-in-eop).
@@ -45,7 +47,7 @@ These connection instructions use modern authentication and work with or without
 ## Step 1: Load the Exchange Online PowerShell module
 
 > [!NOTE]
-> If the module is already installed, you can typically skip this step and run **Connect-IPPSSession** without manually loading the module first.
+> If the module is already installed, you can typically skip this step and run **Connect-ExchangeOnline** without manually loading the module first.
 
 After you've [installed the module](exchange-online-powershell-v2.md#install-and-maintain-the-exchange-online-powershell-module), open a PowerShell window and load the module by running the following command:
 
@@ -55,24 +57,29 @@ Import-Module ExchangeOnlineManagement
 
 ## Step 2: Connect and authenticate
 
+> [!NOTE]
+> Connect commands will likely fail if the profile path of the account that you used to connect contains special PowerShell characters (for example, `$`). The workaround is to connect using a different account that doesn't have special characters in the profile path.
+
 The command that you need to run uses the following syntax:
 
 ```powershell
-Connect-IPPSSession -UserPrincipalName <UPN> -ConnectionUri `https://ps.protection.outlook.com/powershell-liveid/ [-PSSessionOption $ProxyOptions]
+Connect-ExchangeOnline -UserPrincipalName <UPN> [-UseRPSSession] [-PSSessionOption $ProxyOptions] [-ShowBanner:$false]
 ```
 
 For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
 
 - _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
 
-- If you're behind a proxy server, you can use the _PSSessionOption_ parameter in the connection command. First, run this command: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the value `$ProxyOptions` for the _PSSessionOption_ parameter. For more information, see [New-PSSessionOption](/powershell/module/microsoft.powershell.core/new-pssessionoption).
+- With the EXO V3 module (v3.0.0 or later), if you don't use the _UseRPSSession_ switch, you're using REST API cmdlets only. For more information, see [Updates for the EXO V3 module)](exchange-online-powershell-v2.md#updates-for-the-exo-v3-module).
+
+- If you're behind a proxy server, you can use the _PSSessionOption_ parameter in the connection command, but only if you also use the _UseRPSSession_ switch. First, run this command: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the value `$ProxyOptions` for the _PSSessionOption_ parameter. For more information, see [New-PSSessionOption](/powershell/module/microsoft.powershell.core/new-pssessionoption).
 
-### Connect to Security & Compliance PowerShell with an interactive login prompt
+### Connect to Exchange Online Protection PowerShell with an interactive login prompt
 
-This example connects to Exchange Online Protection PowerShell in a Microsoft 365 organization:
+This example works in Windows PowerShell 5.1 and PowerShell 7 for accounts with or without MFA:
 
 ```powershell
-Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.protection.outlook.com/powershell-liveid/
+Connect-ExchangeOnline -UserPrincipalName [email protected]
 ```
 
 ## Step 3: Disconnect when you're finished
@@ -101,10 +108,6 @@ If you receive errors, check the following requirements:
 
 - TCP port 80 traffic needs to be open between your local computer and Microsoft 365. It's probably open, but it's something to consider if your organization has a restrictive Internet access policy.
 
-- 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.
-
 - 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.

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

@@ -15,10 +15,14 @@ description: "Learn about using PowerShell in Exchange Online Protection"
 
 # Exchange Online Protection PowerShell
 
-Exchange Online Protection PowerShell is the administrative interface that enables you to manage your standalone Exchange Online Protection (EOP) organization from the command line. For example, you can use Exchange Online Protection PowerShell to configure mail flow rules (also known as transport rules) and connectors.
+Exchange Online Protection PowerShell is the administrative interface that enables you to manage your standalone Exchange Online Protection (EOP) organization from the command line. For example, you can use Exchange Online Protection PowerShell to configure anti-spam policies, mail flow rules (also known as transport rules) and connectors.
 
-> [!NOTE]
-> Exchange Online Protection PowerShell is only used in *standalone* EOP organizations. For example, your Microsoft 365 subscription only includes EOP (no Exchange mailboxes), and you use EOP to protect your on-premises email environment. If you have a Microsoft 365 subscription that includes Exchange Online mailboxes (A3/E3/G3, A5/E5/G5, Microsoft 365 Business Premium, etc.), you can't use Exchange Online Protection PowerShell; the same features are available in [Exchange Online PowerShell](exchange-online-powershell.md).
+Exchange Online Protection PowerShell includes the following Microsoft 365 environments:
+
+- **Standalone EOP organizations**: Your Microsoft 365 subscription includes no Exchange Online mailboxes, because you use EOP to protect your on-premises email environment.
+- **Exchange Enterprise CAL with Services**: The licenses for your on-premises Exchange organization include Exchange Enterprise CAL with Services (EOP is one of the services).
+
+If your Microsoft 365 subscription includes Exchange Online mailboxes (A3/E3/G3, A5/E5/G5, Microsoft 365 Business Premium, etc.), the same EOP features are available in [Exchange Online PowerShell](exchange-online-powershell.md).
 
 The following articles provide information about using Exchange Online Protection PowerShell:
 
@@ -27,8 +31,8 @@ The following articles provide information about using Exchange Online Protectio
   > [!NOTE]
   > Version 2.0.5 and earlier is known as the Exchange Online PowerShell V2 module (abbreviated as the EXO V2 module). Version 3.0.0 and later is known as the Exchange Online PowerShell V3 module (abbreviated as the EXO V3 module).
 
-- To create a remote PowerShell session to your standalone Exchange Online Protection organization that supports both modern authentication and multi-factor authentication (MFA), see [Connect to Exchange Online Protection PowerShell](connect-to-exchange-online-protection-powershell.md).
+- To use PowerShell to connect to your standalone Exchange Online Protection organization using modern authentication and multi-factor authentication (MFA), see [Connect to Exchange Online Protection PowerShell](connect-to-exchange-online-protection-powershell.md).
 
 - To learn about the structure and layout of the cmdlet reference articles in Exchange Online Protection PowerShell, see [Exchange cmdlet syntax](exchange-cmdlet-syntax.md).
 
-- For a sample script that lets admins who manage multiple organizations apply configuration settings to all of their organizations, see [Sample script for applying EOP settings to multiple tenants](/microsoft-365/security/office-365-security/sample-script-for-applying-eop-settings-to-multiple-tenants).
+- For a sample script that lets admins who manage multiple organizations apply configuration settings to all of their organizations, see [Sample script for applying EOP settings to multiple tenants](/exchange/standalone-eop/sample-script-standalone-eop-settings-to-multiple-tenants).

exchange/docs-conceptual/filter-properties.md

@@ -1833,7 +1833,7 @@ For example, `Get-User -Filter "UpgradeStatus -ne 'None'"`.
 |---|---|---|
 |_msExchUsageLocation_|**Get-Mailbox** <br> **Get-MailUser** <br> **Get-Recipient**|String or `$null`|
 
-This filter requires the ISO 3166-1 country name (for example, `United States`), or two-letter country code (for example `US`) for the user in Microsoft 365. For more information, see [Country Codes - ISO 3166](https://www.iso.org/iso-3166-country-codes.html). <br> For example, `Get-Recipient -Filter 'UsageLocation -ne $null'`.
+This filter requires the ISO 3166-1 country name (for example, `United States`), or two-letter country code (for example `US`) for the user in Microsoft 365. For more information, see [Country Codes - ISO 3166](https://www.iso.org/iso-3166-country-codes.html). <br> For example, `Get-Recipient -Filter 'UsageLocation -eq "US"'`.
 
 ### UseDatabaseQuotaDefaults