Merge branch 'master' into patch-261

Author: Kateyanne

.openpublishing.publish.config.json

@@ -253,5 +253,8 @@
       "target_framework": "net45",
       "version": "latest"
     }
-  ]
+  ],
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  }
 }

.openpublishing.redirection.json

@@ -163,7 +163,7 @@
     {
       "source_path": "sharepoint/docs-conceptual/overview.md",
       "redirect_url": "https://docs.microsoft.com/powershell/sharepoint",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "exchange/virtual-folder/exchange/active-directory/Add-ADPermission.md",
@@ -6547,7 +6547,7 @@
     },
     {
       "source_path": "exchange/docs-conceptual/exchange-server/use-update-exchangehelp.md",
-      "redirect_url": "https://docs.microsoft.com/powershell/exchange/use-update-exchangehelp.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/exchange/use-update-exchangehelp",
       "redirect_document_id": true
     },
     {

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: eop
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 ROBOTS: NOINDEX

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Priority
 ms.collection: Strat_EX_Admin
 ms.custom:

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: o365-security-and-compliance
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 ROBOTS: NOINDEX

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

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

@@ -5,7 +5,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

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

@@ -5,7 +5,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

exchange/docs-conceptual/connect-to-exchange-servers-using-remote-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Priority
 ms.collection: Strat_EX_Admin
 ms.custom:

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

@@ -5,7 +5,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin
@@ -31,9 +31,6 @@ To use the older Exchange Online Remote PowerShell Module to connect to Security
 
 ## Connect to Security & Compliance PowerShell using MFA
 
-> [!NOTE]
-> Currently, you can't use the EXO V2 module to connect to Security & Compliance Center PowerShell in GCC High or DoD environments using MFA. Instead, use the older instructions [V1 module - Connect to Security & Compliance Center PowerShell using MFA](v1-module-mfa-connect-to-scc-powershell.md).
-
 If your account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Security & Compliance Center PowerShell without using MFA](#connect-to-security--compliance-center-powershell-without-using-mfa) section.
 
 1. In a Windows PowerShell window, load the EXO V2 module by running the following command:
@@ -47,11 +44,12 @@ If your 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-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>] [-AzureADAuthorizationEndPointUri <URL>]
+   Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>]
    ```
 
    - _\<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-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
+   - The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
+   - When you use the _UserPrincipalName_ parameter, you don't need to use the _AzureADAuthorizationEndpointUri_ parameter in environments that would otherwise require it.
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
 
@@ -62,7 +60,19 @@ If your account uses multi-factor authentication, use the steps in this section.
    **This example connects to Security & Compliance Center PowerShell in an Office 365 Germany organization**.
 
    ```powershell
-   Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.outlook.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
+   Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.outlook.de/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/
+   ```
+
+   **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/
    ```
 
 For detailed syntax and parameter information, see [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
@@ -97,10 +107,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-IPPSSession -Credential $UserCredential -ConnectionUri <URL>
+   Connect-IPPSSession -Credential $UserCredential [-ConnectionUri <URL>] [-AzureADAuthorizationEndpointUri <URL>]
    ```
 
-   The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
+   The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
 
@@ -111,19 +121,19 @@ If your account doesn't use multi-factor authentication, use the steps in this s
    **This example connects to Security & Compliance Center PowerShell in an Office 365 Germany organization**.
 
    ```powershell
-   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.outlook.de/
+   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.outlook.de/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.de/common
    ```
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
 
    ```powershell
-   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
+   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common
    ```
 
    **This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
 
    ```powershell
-   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
+   Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common
    ```
 
 For detailed syntax and parameter information, see [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).

exchange/docs-conceptual/control-remote-powershell-access-to-exchange-servers.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 064e3bb0-38bf-495e-9994-784f823b88dd
 description: "Administrators can learn how to block or allow users' remote PowerShell access to Exchange servers."

exchange/docs-conceptual/disable-access-to-exchange-online-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: f969816a-2607-4655-9d47-9e8767fb5633
 search.appverid: MET150

exchange/docs-conceptual/exchange-management-shell.md

@@ -2,11 +2,11 @@
 title: "Exchange Server PowerShell (Exchange Management Shell)"
 ms.author: chrisda
 author: chrisda
-manager: sansimp
+manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 925ad66f-2f05-4269-9923-c353d9c19312
 description: "Learn about Exchange Server PowerShell, also known as the Exchange Management Shell. This topic describes how PowerShell works on Exchange servers, and provides links to other topics that can help you learn how to use the Exchange Management Shell."
@@ -42,8 +42,8 @@ A benefit of remote PowerShell is that you can use Windows PowerShell on a local
 
 For details, see the following topics:
 
-- [Exchange 2019 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2019)
-- [Exchange 2016 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2016)
+- [Exchange 2019 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2019&preserve-view=true)
+- [Exchange 2016 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2016&preserve-view=true)
 - [Exchange 2013 system requirements](https://docs.microsoft.com/exchange/exchange-2013-system-requirements-exchange-2013-help)
 - [Exchange 2010 system requirements](https://docs.microsoft.com/previous-versions/office/exchange-server-2010/aa996719(v=exchg.141))
 

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date: 2/20/2018
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 1cb603b0-2961-4afe-b879-b048fe0f64a2
 search.appverid: MET150

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

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date: 2/20/2018
 ms.audience: Admin
 ms.topic: article
-ms.service: eop
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: f7918a88-774a-405e-945b-bc2f5ee9f748
 description: "Learn about using PowerShell in Exchange Online Protection"

exchange/docs-conceptual/filter-properties.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: b02b0005-2fb6-4bc2-8815-305259fa5432
 description: "Learn about the filterable properties for the Filter parameter in Exchange Server and Exchange Online."

exchange/docs-conceptual/filters-v2.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 ms.reviewer: navgupta
 localization_priority: Priority
 ms.collection: Strat_EX_Admin

exchange/docs-conceptual/find-exchange-cmdlet-permissions.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 5bcc46d3-8a07-4e9f-b1b0-e4cb0b0afc12
 description: "Admins can learn how to use PowerShell to find the permissions required to run any cmdlet in Exchange Server PowerShell or Exchange Online PowerShell."

exchange/docs-conceptual/open-the-exchange-management-shell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 63976059-25f8-4b4f-b597-633e78b803c0
 description: "Find and open the shortcut for Exchange PowerShell (also known as the Exchange Management Shell) on Exchange servers or computers that have the Exchange management tools installed."

exchange/docs-conceptual/recipient-filters.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: reference
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: fb4b1396-9aae-4037-be1a-b09e336b890e
 description: "Learn about creating different kinds of recipient filters in the Exchange Management Shell and Exchange Online PowerShell."

exchange/docs-conceptual/recipientfilter-properties.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: cf78aca5-6699-485c-9b15-e0adba252176
 description: "Learn about the recipient properties that you can use with the RecipientFilter parameter in Exchange Server and Exchange Online cmdlets."

exchange/docs-conceptual/scc-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date: 9/29/2015
 ms.audience: Admin
 ms.topic: article
-ms.service: o365-security-and-compliance
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 2f33bb84-cede-46f6-9d39-d246e8ce3543
 search.appverid: MET150

exchange/docs-conceptual/use-update-exchangehelp.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: ITPro
 ms.topic: article
-ms.prod: exchange-server-itpro
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid: 219f78a3-f0e5-4dc6-9787-9a0b9756ee09
 description: "Administrators can learn how to use Update-ExchangeHelp to update Exchange cmdlet reference topics that are available in Exchange Management Shell in Exchange 2016"

exchange/docs-conceptual/v1-module-mfa-connect-to-exo-powershell.md

@@ -6,12 +6,12 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: exchange-online
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 search.appverid: MET150
 ROBOTS: NOINDEX
-description: "Admins can learn how to use the older Exchange Online Remote PowerShell Module to connect to Security & Compliance Center PowerShell for multi-factor authentication (MFA) or federated authentication."
+description: "Admins can learn how to use the older Exchange Online Remote PowerShell Module to connect to Exchange Online PowerShell for multi-factor authentication (MFA) or federated authentication."
 ---
 
 # V1 module - Connect to Exchange Online PowerShell using MFA

exchange/docs-conceptual/v1-module-mfa-connect-to-scc-powershell.md

@@ -6,7 +6,7 @@ manager: dansimp
 ms.date:
 ms.audience: Admin
 ms.topic: article
-ms.service: o365-security-and-compliance
+ms.service: exchange-powershell
 localization_priority: Normal
 ms.assetid:
 search.appverid: MET150

exchange/exchange-ps/exchange/Connect-IPPSSession.md

@@ -63,12 +63,14 @@ This example connects to standalone Exchange Online Protection PowerShell in an
 ## PARAMETERS
 
 ### -AzureADAuthorizationEndpointUri
-The AzureADAuthorizationEndpointUri parameter specifies the Azure AD Authorization endpoint Uri that can issue OAuth2 access tokens. You use this parameter with multi-factor authentication (MFA) and federated authentication. The following PowerShell environments and related values are supported:
+The AzureADAuthorizationEndpointUri parameter specifies the Azure AD Authorization endpoint Uri that can issue OAuth2 access tokens. The following PowerShell environments and related values are supported:
 
 - Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter.
 - Security & Compliance Center PowerShell in Office 365 Germany: `https://login.microsoftonline.de/common`
 - Security & Compliance Center PowerShell in Microsoft 365 GCC High or Microsoft 365 DoD: `https://login.microsoftonline.us/common`
 
+This parameter is required in Office 365 Germany, Microsoft 365 GCC High, or Microsoft 365 DoD organizations when you don't use the UserPrincipalName parameter.
+
 ```yaml
 Type: String
 Parameter Sets: (All)
@@ -100,7 +102,7 @@ Accept wildcard characters: False
 ### -ConnectionUri
 The ConnectionUri parameter specifies the connection endpoint for the remote PowerShell session. The following PowerShell environments and related values are supported:
 
-- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `https://ps.compliance.protection.outlook.com/powershell-liveid/`, but that's also the default value, so you don't need to use this parameter for these environments.
+- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `https://ps.compliance.protection.outlook.com/powershell-liveid/`, but that's also the default value, so you don't need to use this parameter in those environments.
 - Security & Compliance Center PowerShell in Office 365 Germany: `https://ps.compliance.protection.outlook.de/PowerShell-LiveID`
 - Security & Compliance Center PowerShell in Microsoft 365 GCC High: `https://ps.compliance.protection.office365.us/powershell-liveid/`
 - Security & Compliance Center PowerShell in Microsoft 365 DoD: `https://l5.ps.compliance.protection.office365.us/powershell-liveid/`

exchange/exchange-ps/exchange/Get-EventsFromEmailConfiguration.md

@@ -25,6 +25,8 @@ Get-EventsFromEmailConfiguration [-Identity] <RecipientIdParameter> [<CommonPara
 ```
 
 ## DESCRIPTION
+**Note**: The following output properties have been deprecated: EventReservationProcessingLevel, FoodEstablishmentReservationProcessingLevel, InvoiceProcessingLevel, and ServiceReservationProcessingLevel.
+
 You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
 
 ## EXAMPLES