Skip to content

Commit 7d00333

Browse files
authored
Merge branch 'master' into patch-1
2 parents 3250624 + ce6f547 commit 7d00333

22 files changed

+47
-62
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ If you encounter problems, check the [required permssions](https://docs.microsof
105105

106106
- **Name**: Enter something descriptive.
107107

108-
- **Supported account types**: Select **Accounts in this organizational directory only (Microsoft)**.
108+
- **Supported account types**: Select **Accounts in this organizational directory only (\<YourOrganizationName\> only - Single tenant)**.
109109

110110
- **Redirect URI (optional)**: In the first box, select **Web**. In the second box, enter the URI where the access token is sent.
111111

@@ -133,11 +133,11 @@ You need to assign the API permission `Exchange.ManageAsApp` so the application
133133

134134
5. In the **Select permissions** section that appears on the page, expand **Exchange** and select **Exchange.ManageAsApp**
135135

136-
![Select Exchange API permssions](media/app-only-auth-exchange-manageasapp.png)
136+
![Select Exchange.ManageAsApp permssions](media/app-only-auth-exchange-manageasapp.png)
137137

138138
When you're finished, click **Add permissions**.
139139

140-
6. Back on the **Configured permissions** page that appears, click **Grant admin consent for <\tenant name\>**, and select **Yes** in the dialog that appears.
140+
6. Back on the **Configured permissions** page that appears, click **Grant admin consent for \<tenant name\>**, and select **Yes** in the dialog that appears.
141141

142142
7. Close the flyout when you're finished.
143143

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-it-pro
9+
ms.service: exchange-powershell
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
1212
ms.custom:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If your account uses multi-factor authentication, use the steps in this section.
4949

5050
- _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
5151
- 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).
52-
- When you use the _UserPrincipalName_ parameter, you don't need to use the
52+
- When you use the _UserPrincipalName_ parameter, you don't need to use the _AzureADAuthorizationEndpointUri_ parameter in environments that would otherwise require it.
5353

5454
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-it-pro
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid: 064e3bb0-38bf-495e-9994-784f823b88dd
1212
description: "Administrators can learn how to block or allow users' remote PowerShell access to Exchange servers."

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-it-pro
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid: 925ad66f-2f05-4269-9923-c353d9c19312
1212
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
4242

4343
For details, see the following topics:
4444

45-
- [Exchange 2019 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2019)
46-
- [Exchange 2016 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2016)
45+
- [Exchange 2019 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2019&preserve-view=true)
46+
- [Exchange 2016 system requirements](https://docs.microsoft.com/Exchange/plan-and-deploy/system-requirements?view=exchserver-2016&preserve-view=true)
4747
- [Exchange 2013 system requirements](https://docs.microsoft.com/exchange/exchange-2013-system-requirements-exchange-2013-help)
4848
- [Exchange 2010 system requirements](https://docs.microsoft.com/previous-versions/office/exchange-server-2010/aa996719(v=exchg.141))
4949

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-it-pro
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid: 63976059-25f8-4b4f-b597-633e78b803c0
1212
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/use-update-exchangehelp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-it-pro
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid: 219f78a3-f0e5-4dc6-9787-9a0b9756ee09
1212
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/exchange-ps/exchange/Get-EventsFromEmailConfiguration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Get-EventsFromEmailConfiguration [-Identity] <RecipientIdParameter> [<CommonPara
2525
```
2626

2727
## DESCRIPTION
28+
**Note**: The following output properties have been deprecated: EventReservationProcessingLevel, FoodEstablishmentReservationProcessingLevel, InvoiceProcessingLevel, and ServiceReservationProcessingLevel.
29+
2830
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).
2931

3032
## EXAMPLES

exchange/exchange-ps/exchange/Set-EventsFromEmailConfiguration.md

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,7 @@ Accept wildcard characters: False
107107
```
108108
109109
### -EventReservationProcessingLevel
110-
The EventReservationProcessingLevel parameter specifies whether event reservations are automatically discovered from messages, and whether these reservations are automatically added to the user's calendar. Valid values are:
111-
112-
- Disabled: Do not discover event reservations from messages.
113-
114-
- Email: Discover event reservations from messages, but don't automatically add them to the user's calendar.
115-
116-
- Calendar: Discover event reservations from messages and automatically add them to the user's calendar. This is the default value.
110+
This parameter has been deprecated and is no longer used.
117111
118112
```yaml
119113
Type: String
@@ -151,13 +145,7 @@ Accept wildcard characters: False
151145
```
152146
153147
### -FoodEstablishmentReservationProcessingLevel
154-
The FoodEstablishmentProcessingLevel parameter specifies whether dining reservations are automatically discovered from messages, and whether these reservations are automatically added to the user's calendar. Valid values are:
155-
156-
- Disabled: Do not discover restaurant reservations from messages.
157-
158-
- Email: Discover restaurant reservations from messages however do not automatically add these to the user's calendar.
159-
160-
- Calendar: Discover restaurant reservations from messages and automatically add them to the user's calendar. This is the default value.
148+
This parameter has been deprecated and is no longer used.
161149
162150
```yaml
163151
Type: String
@@ -173,13 +161,7 @@ Accept wildcard characters: False
173161
```
174162
175163
### -InvoiceProcessingLevel
176-
The InvoiceProcessingLevel parameter specifies whether invoices are automatically discovered from messages, and whether these reservations are automatically added to the user's calendar. Valid values are:
177-
178-
- Disabled: Do not discover invoices from messages.
179-
180-
- Email: Discover invoices from messages however do not automatically add these to the user's calendar.
181-
182-
- Calendar: Discover invoices from messages and automatically add them to the user's calendar. This is the default value.
164+
This parameter has been deprecated and is no longer used.
183165
184166
```yaml
185167
Type: String
@@ -277,13 +259,7 @@ Accept wildcard characters: False
277259
```
278260
279261
### -ServiceReservationProcessingLevel
280-
The ServiceReservationProcessingLevel parameter specifies whether service reservations are automatically discovered from messages, and whether these reservations are automatically added to the user's calendar. Valid values are:
281-
282-
- Disabled: Do not discover service reservations from messages.
283-
284-
- Email: Discover service reservations from messages, but don't automatically add them to the user's calendar.
285-
286-
- Calendar: Discover service reservations from messages and automatically add them to the user's calendar. This is the default value.
262+
This parameter has been deprecated and is no longer used.
287263
288264
```yaml
289265
Type: String

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ Set-OrganizationConfig
5858
[-DistributionGroupNamingPolicy <DistributionGroupNamingPolicy>]
5959
[-ElcProcessingDisabled <Boolean>]
6060
[-EndUserDLUpgradeFlowsDisabled <Boolean>]
61-
[-ExternalInOutlookEnabled <Boolean>]
6261
[-EwsAllowEntourage <Boolean>]
6362
[-EwsAllowList <MultiValuedProperty>]
6463
[-EwsAllowMacOutlook <Boolean>]
@@ -1462,17 +1461,6 @@ Accept pipeline input: False
14621461
Accept wildcard characters: False
14631462
```
14641463

1465-
### -ExternalInOutlookEnabled
1466-
This parameter is available only in the cloud-based service.
1467-
1468-
The ExternalInOutlookEnabled parameter specifies whether to add identifiers to messages from external senders in Outlook on the web (formerly known as Outlook Web App). Valid values are:
1469-
1470-
- $true: External senders are identified as external in list view and the reading pane.
1471-
1472-
- $false: External senders are not identified as external. This is the default value.
1473-
1474-
Whether the sender's domain is considered internal or external is controlled by the Set-AcceptedDomain cmdlet.
1475-
14761464
```yaml
14771465
Type: Boolean
14781466
Parameter Sets: Default

0 commit comments

Comments
 (0)