Skip to content

Commit 6958234

Browse files
authored
Merge branch 'master' into patch-249
2 parents 0e28494 + 663b3ac commit 6958234

File tree

7 files changed

+53
-49
lines changed

7 files changed

+53
-49
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ The following introductory video shows you how to connect to and use Exchange On
3939
- Windows Server 2019
4040
- Windows Server 2016
4141
- Windows Server 2012 or Windows Server 2012 R2
42-
- Windows 7 Service Pack 1 (SP1)<sup>*</sup>
43-
- Windows Server 2008 R2 SP1<sup>*</sup>
42+
- Windows 7 Service Pack 1 (SP1)<sup>\*</sup>
43+
- Windows Server 2008 R2 SP1<sup>\*</sup>
4444

4545
<sup>\*</sup> This version of Windows has reached end of support, and is now only supported when running in Azure virtual machines. To use this version of Windows, you need to install the Microsoft .NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Install the .NET Framework](https://docs.microsoft.com/dotnet/framework/install/on-windows-7), [Windows Management Framework 3.0](https://aka.ms/wmf3download), [Windows Management Framework 4.0](https://aka.ms/wmf4download), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
4646

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To use the older Exchange Online Remote PowerShell Module to connect to Exchange
2929

3030
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
3131

32-
- 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 as described in this topic.
32+
- 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 topic.
3333

3434
> [!TIP]
3535
> Having problems? Ask in the [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542) forum.
@@ -47,11 +47,11 @@ If you account uses multi-factor authentication, use the steps in this section.
4747
2. The command that you need to run uses the following syntax:
4848

4949
```powershell
50-
Connect-ExchangeOnline -UserPrincipalName <UPN> -ShowProgress $true [-ConnectionUri <URL>] [-AzureADAuthorizationEndPointUri <URL>] [-DelegatedOrganization <String>]
50+
Connect-ExchangeOnline -UserPrincipalName <UPN> -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>]
5151
```
5252

5353
- _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
54-
- The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
54+
- When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
5555
- The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/partners).
5656

5757
**This example connects to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
@@ -63,19 +63,19 @@ If you account uses multi-factor authentication, use the steps in this section.
6363
**This example connects to Exchange Online PowerShell in an Office 365 Germany organization**:
6464

6565
```powershell
66-
Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ConnectionUri https://outlook.office.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
66+
Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ExchangeEnvironmentName O365GermanyCloud
6767
```
6868

6969
**This example connects to Exchange Online PowerShell in a Microsoft GCC High organization**:
7070

7171
```powershell
72-
Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ConnectionUri https://outlook.office365.us/powershell-liveid -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
72+
Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ExchangeEnvironmentName O365USGovGCCHigh
7373
```
7474

7575
**This example connects to Exchange Online PowerShell in a Microsoft 365 DoD organization**:
7676

7777
```powershell
78-
Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ConnectionUri https://webmail.apps.mil/powershell-liveid -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
78+
Connect-ExchangeOnline -UserPrincipalName [email protected] -ShowProgress $true -ExchangeEnvironmentName O365USGovDoD
7979
```
8080

8181
**This example connects to Exchange Online PowerShell to manage another tenant**:
@@ -114,10 +114,10 @@ If your account doesn't use multi-factor authentication, use the steps in this s
114114
3. The command that you need to run uses the following syntax:
115115

116116
```powershell
117-
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true [-ConnectionUri <URL>] [-DelegatedOrganization <String>]
117+
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>]
118118
```
119119

120-
- The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
120+
- When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
121121
- The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/partners).
122122

123123
**Connect to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
@@ -129,25 +129,25 @@ If your account doesn't use multi-factor authentication, use the steps in this s
129129
**Connect to Exchange Online PowerShell in an Office 365 Germany organization**:
130130

131131
```powershell
132-
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://outlook.office.de/powershell-liveid/
132+
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365GermanyCloud
133133
```
134134

135135
**Connect to Exchange Online PowerShell in an Office 365 operated by 21Vianet organization**:
136136

137137
```powershell
138-
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://partner.outlook.cn/PowerShell
138+
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365China
139139
```
140140

141141
**Connect to Exchange Online PowerShell in a Microsoft 365 GCC High organization**:
142142

143143
```powershell
144-
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://outlook.office365.us/powershell-liveid/
144+
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365USGovGCCHigh
145145
```
146146

147147
**Connect to Exchange Online PowerShell in a Microsoft 365 DoD organization**:
148148

149149
```powershell
150-
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ConnectionUri https://webmail.apps.mil/powershell-liveid
150+
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true -ExchangeEnvironmentName O365USGovDoD
151151
```
152152

153153
For detailed syntax and parameter information, see [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).

exchange/exchange-ps/exchange/Connect-ExchangeOnline.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@ After the Connect-ExchangeOnline command is successful, you can run ExO V2 modul
7373
## PARAMETERS
7474

7575
### -AzureADAuthorizationEndpointUri
76-
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.
76+
**Note**: If you use the ExchangeEnvironmentName parameter, you don't need to use the AzureADAuthorizationEndpointUri or ConnectionUri parameters.
7777

78-
- For Exchange Online PowerShell in Microsoft 365 or Microsoft 365 GCC, don't use this parameter.
79-
- For Exchange Online PowerShell in Office 365 Germany, use the value `https://login.microsoftonline.de/common` for this parameter.
80-
- For Exchange Online PowerShell in Microsoft 365 GCC High and Microsoft 365 DoD, use the value `https://login.microsoftonline.us/common` for this parameter.
78+
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 Exchange Online PowerShell environments and related values are supported:
79+
80+
- Microsoft 365 or Microsoft 365 GCC: Don't use this parameter.
81+
- Office 365 Germany: `https://login.microsoftonline.de/common`
82+
- Microsoft 365 GCC High or Microsoft 365 DoD: `https://login.microsoftonline.us/common`.
8183

8284
**Note**: MFA authentication or federated authentication isn't available in Office 365 operated by 21Vianet.
8385

@@ -111,15 +113,17 @@ Accept wildcard characters: False
111113
```
112114
113115
### -ConnectionUri
114-
The ConnectionUri parameter specifies the connection endpoint for the remote Exchange Online PowerShell session.
116+
**Note**: If you use the ExchangeEnvironmentName parameter, you don't need to use the AzureADAuthorizationEndpointUri or ConnectionUri parameters.
117+
118+
The ConnectionUri parameter specifies the connection endpoint for the remote Exchange Online PowerShell session. The following Exchange Online PowerShell environments and related values are supported:
115119
116-
- For Exchange Online PowerShell in Microsoft 365 or Microsoft 365 GCC, you don't use this parameter.
117-
- For Exchange Online PowerShell in Office 365 Germany, use the value <https://outlook.office.de/PowerShell-LiveID> for this parameter.
118-
- For Exchange Online PowerShell in Office 365 operated by 21Vianet, use the value <https://partner.outlook.cn/PowerShell> for this parameter.
119-
- For Exchange Online PowerShell in Microsoft 365 GCC High, use the value <https://outlook.office365.us/powershell-liveid> for this parameter.
120-
- For Exchange Online PowerShell in Microsoft 365 DoD, use the value <https://webmail.apps.mil/powershell-liveid> for this parameter.
120+
- Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `https://outlook.office365.com/powershell-liveid/`, but that's also the default value, so you don't need to use this parameter for these environments.
121+
- Office 365 Germany: `https://outlook.office.de/PowerShell-LiveID`
122+
- Office 365 operated by 21Vianet: `https://partner.outlook.cn/PowerShell`
123+
- Microsoft 365 GCC High: `https://outlook.office365.us/powershell-liveid`
124+
- Microsoft 365 DoD: `https://webmail.apps.mil/powershell-liveid`
121125

122-
**Note**: If your organization is on-premises Exchange, and you have Exchange Enterprise CAL with Services licenses for EOP, use the this cmdlet without the _ConnectionUri_ parameter to connect to EOP PowerShell (the same connection instructions as Exchange Online PowerShell).
126+
**Note**: If your organization is on-premises Exchange, and you have Exchange Enterprise CAL with Services licenses for Exchange Online Protection, use the this cmdlet without the _ConnectionUri_ parameter to connect to EOP PowerShell (the same connection instructions as Exchange Online PowerShell in Microsoft 365 or Microsoft GCC).
123127

124128
```yaml
125129
Type: String
@@ -189,17 +193,13 @@ Accept wildcard characters: False
189193
```
190194

191195
### -ExchangeEnvironmentName
192-
The ExchangeEnvironmentName specifies the Exchange Online environment. Valid values are:
193-
194-
- O365China
195-
196-
- O365Default (this is the default value)
197-
198-
- O365GermanyCloud
199-
200-
- O365USGovDoD
196+
The ExchangeEnvironmentName specifies the Exchange Online environment and replaces the need to use the AzureADAuthorizationEndpointUri or ConnectionUri parameters. The following Exchange Online PowerShell environments are supported:
201197

202-
- O365USGovGCCHigh
198+
- Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `O365Default`, but that's also the default value, so you don't need to use this parameter for these environments.
199+
- Office 365 Germany: `O365GermanyCloud`
200+
- Office 365 operated by 21Vianet: `O365China`
201+
- Microsoft 365 GCC High: `O365USGovGCCHigh`
202+
- Microsoft 365 DoD: `O365USGovDoD`
203203

204204
```yaml
205205
Type: ExchangeEnvironment
@@ -284,7 +284,7 @@ The PSSessionOption parameter specifies the PowerShell session options to use in
284284

285285
`$Options = New-PSSessionOption <Settings>`
286286

287-
And you use the variable name as the value for this parameter (for example, $Options).
287+
And you use the variable name as the value for this parameter (for example, `$Options`).
288288

289289
```yaml
290290
Type: PSSessionOption
@@ -302,9 +302,9 @@ Accept wildcard characters: False
302302
### -ShowBanner
303303
The ShowBanner switch shows or hides the banner message that's displayed when you run Connect-ExchangeOnline. You don't need to specify a value with this switch.
304304

305-
To show the banner, you don't need to use this switch (the banner is displayed by default).
305+
- To show the banner, you don't need to use this switch (the banner is displayed by default).
306306

307-
To hide the banner, use this exact syntax: `-ShowBanner:$false`.
307+
- To hide the banner, use this exact syntax: `-ShowBanner:$false`.
308308

309309
```yaml
310310
Type: SwitchParameter

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ This example connects to standalone Exchange Online Protection PowerShell in an
6464
## PARAMETERS
6565

6666
### -AzureADAuthorizationEndpointUri
67-
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.
67+
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:
6868

69-
- For Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC, don't use this parameter.
70-
- For Security & Compliance Center PowerShell in Office 365 Germany, use the value `https://login.microsoftonline.de/common` for this parameter.
69+
- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter.
70+
- Security & Compliance Center PowerShell in Office 365 Germany: `https://login.microsoftonline.de/common`
7171

7272
```yaml
7373
Type: String
@@ -98,11 +98,11 @@ Accept wildcard characters: False
9898
```
9999
100100
### -ConnectionUri
101-
The ConnectionUri parameter specifies the connection endpoint for the remote PowerShell session.
101+
The ConnectionUri parameter specifies the connection endpoint for the remote PowerShell session. The following PowerShell environments and related values are supported:
102102
103-
- For Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC, don't use this parameter.
104-
- For Security & Compliance Center PowerShell in Office 365 Germany, use the value <https://ps.compliance.protection.outlook.de/PowerShell-LiveID> for this parameter.
105-
- For Exchange Online Protection PowerShell in standalone EOP organizations without Exchange Online mailboxes, use the value <https://ps.protection.outlook.com/powershell-liveid/> for this parameter.
103+
- 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.
104+
- Security & Compliance Center PowerShell in Office 365 Germany: `https://ps.compliance.protection.outlook.de/PowerShell-LiveID`
105+
- Exchange Online Protection PowerShell in standalone EOP organizations without Exchange Online mailboxes: `https://ps.protection.outlook.com/powershell-liveid/`
106106

107107
```yaml
108108
Type: String
@@ -158,7 +158,7 @@ The PSSessionOption parameter specifies the PowerShell session options to use in
158158

159159
`$Options = New-PSSessionOption <Settings>`
160160

161-
And you use the variable name as the value for this parameter (for example, $Options).
161+
And you use the variable name as the value for this parameter (for example, `$Options`).
162162

163163
```yaml
164164
Type: PSSessionOption

exchange/exchange-ps/exchange/Get-MoveRequestStatistics.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,11 @@ Accept wildcard characters: False
227227
### -DiagnosticInfo
228228
This parameter is available only in the cloud-based service.
229229
230-
Typically, you use the DiagnosticInfo parameter only at the request of Microsoft Customer Service and Support to troubleshoot problems.
230+
Typically, you use the DiagnosticInfo parameter only at the request of Microsoft Customer Service and Support to troubleshoot problems. Valid values are:
231+
232+
- ShowTimeline
233+
- ShowTimeslot
234+
- Verbose
231235
232236
```yaml
233237
Type: String

skype/skype-ps/skype/New-CsAutoAttendantMenuOption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This example creates a menu option to call the operator when the 0 key is presse
3737
### -------------------------- Example 2 --------------------------
3838
```
3939
$troubleShootObjectId = (Get-CsOnlineUser [email protected]).ObjectId
40-
$troubleShootEntity = New-CsAutoAttendantCallableEntity -Identity $troubleShootObjectId -Type AApplicationEndpoint
40+
$troubleShootEntity = New-CsAutoAttendantCallableEntity -Identity $troubleShootObjectId -Type ApplicationEndpoint
4141
$menuOption = New-CsAutoAttendantMenuOption -Action TransferCallToTarget -DtmfResponse Tone1 -VoiceResponses "Sales" -CallTarget $troubleShootEntity
4242
```
4343

skype/skype-ps/skype/Set-CsTeamsMeetingPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ Accept wildcard characters: False
598598
```
599599
600600
### -AllowNDIStreaming
601-
This parameter is reserved for internal Microsoft use.
601+
This parameter enables the use of NDI technology to capture and deliver broadcast-quality audio and video over your network.
602602
603603
```yaml
604604
Type: Boolean

0 commit comments

Comments
 (0)