Skip to content

Commit 173d756

Browse files
authored
Merge branch 'master' into Dariomws18
2 parents 1638591 + 1b18125 commit 173d756

File tree

16 files changed

+84
-949
lines changed

16 files changed

+84
-949
lines changed

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

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
4747

4848
To require all PowerShell scripts that you download from the internet are signed by a trusted publisher, run the following command in an elevated Windows PowerShell window (a Windows PowerShell window you open by selecting **Run as administrator**):
4949

50-
```
51-
Set-ExecutionPolicy RemoteSigned
52-
```
50+
```
51+
Set-ExecutionPolicy RemoteSigned
52+
```
5353

5454
You need to configure this setting only once on your computer, not every time you connect.
5555

@@ -60,9 +60,10 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
6060

6161
1. On your local computer, open Windows PowerShell and run the following command.
6262

63-
```
64-
$UserCredential = Get-Credential
65-
```
63+
```
64+
$UserCredential = Get-Credential
65+
```
66+
6667
In the **Windows PowerShell Credential Request** dialog box, type your work or school account and password, and then click **OK**.
6768

6869
2. Run the following command.
@@ -71,23 +72,25 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
7172
$Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://outlook.office365.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
7273
```
7374

74-
**Notes**:
75+
**Notes**:
7576

76-
- For Office 365 operated by 21Vianet, use the _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
77+
- For Office 365 operated by 21Vianet, use the _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
7778

78-
- For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
79+
- For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
7980

80-
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where the _ProxyAccessType_ value is `IEConfig`, `WinHttpConfig`, or `AutoDetect`.
81+
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/`
82+
83+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where the _ProxyAccessType_ value is `IEConfig`, `WinHttpConfig`, or `AutoDetect`.
8184

82-
Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
85+
Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
8386

84-
For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
87+
For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
8588

8689
3. Run the following command.
8790

88-
```
89-
Import-PSSession $Session -DisableNameChecking
90-
```
91+
```
92+
Import-PSSession $Session -DisableNameChecking
93+
```
9194

9295
> [!NOTE]
9396
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command.
@@ -108,7 +111,7 @@ If you receive errors, check the following requirements:
108111

109112
- The account you use to connect to Exchange Online must be enabled for remote PowerShell. For more information, see [Enable or disable access to Exchange Online PowerShell](../disable-access-to-exchange-online-powershell.md).
110113

111-
- TCP port 80 traffic needs to be open between your local computer and Office 365. It's probably open, but it's something to consider if your organization has a restrictive Internet access policy.
114+
- TCP port 80 traffic needs to be open between your local computer and Office 365. It's probably open, but it's something to consider if your organization has a restrictive internet access policy.
112115

113116
## See also
114117

@@ -124,5 +127,4 @@ The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more
124127

125128
- [Set-ExecutionPolicy](https://go.microsoft.com/fwlink/p/?LinkId=389623)
126129

127-
For more information about managing Office 365, see [Manage Office 365](https://docs.microsoft.com/en-us/Office365/).
128-
130+
For more information about managing Office 365, see [Manage Office 365](https://docs.microsoft.com/Office365/).

exchange/exchange-ps/exchange/client-access-servers/Set-OwaVirtualDirectory.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ Accept wildcard characters: False
336336
```
337337
338338
### -AllowedMimeTypes
339-
The AllowedMimeTypes parameter specifies the MIME extentions of attachments that allow the attachments to be saved locally or viewed from Outlook on the web. The default values are:
339+
The AllowedMimeTypes parameter specifies the MIME extensions of attachments that allow the attachments to be saved locally or viewed from Outlook on the web. The default values are:
340340
341341
- image/bmp
342342
@@ -459,7 +459,7 @@ Accept wildcard characters: False
459459
```
460460
461461
### -BlockedMimeTypes
462-
The BlockedMimeTypes parameter specifies MIME extentions in attachments that prevent the attachments from being saved locally or viewed from Outlook on the web. The default values are:
462+
The BlockedMimeTypes parameter specifies MIME extensions in attachments that prevent the attachments from being saved locally or viewed from Outlook on the web. The default values are:
463463
464464
- application/hta
465465
@@ -1167,7 +1167,7 @@ Accept wildcard characters: False
11671167
```
11681168
11691169
### -ForceSaveMimeTypes
1170-
The ForceSaveMimeTypes parameter specifies the MIME extentions in attachments that only allow the attachments to be saved locally (not opened). The default values are:
1170+
The ForceSaveMimeTypes parameter specifies the MIME extensions in attachments that only allow the attachments to be saved locally (not opened). The default values are:
11711171
11721172
- Application/futuresplash
11731173
@@ -2640,7 +2640,7 @@ Accept wildcard characters: False
26402640
### -WebReadyMimeTypes
26412641
This parameter is available only in Exchange Server 2010 and Exchange Server 2013.
26422642
2643-
The WebReadyMimeTypes parameter specifies the MIME extentions of attachments that allow the attachments to be viewed by WebReady Document Viewing in Outlook on the web. The default value is all supported MIME types:
2643+
The WebReadyMimeTypes parameter specifies the MIME extensions of attachments that allow the attachments to be viewed by WebReady Document Viewing in Outlook on the web. The default value is all supported MIME types:
26442644
26452645
- application/msword
26462646

exchange/exchange-ps/exchange/client-access/Set-OwaMailboxPolicy.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Accept wildcard characters: False
292292
```
293293
294294
### -AllowedMimeTypes
295-
The AllowedMimeTypes parameter specifies the MIME extentions of attachments that allow the attachments to be saved locally or viewed from Outlook on the web. The default values are:
295+
The AllowedMimeTypes parameter specifies the MIME extensions of attachments that allow the attachments to be saved locally or viewed from Outlook on the web. The default values are:
296296
297297
- image/bmp
298298
@@ -375,7 +375,7 @@ Accept wildcard characters: False
375375
```
376376
377377
### -BlockedMimeTypes
378-
The BlockedMimeTypes parameter specifies MIME extentions in attachments that prevent the attachments from being saved locally or viewed from Outlook on the web. The default values are:
378+
The BlockedMimeTypes parameter specifies MIME extensions in attachments that prevent the attachments from being saved locally or viewed from Outlook on the web. The default values are:
379379
380380
- application/hta
381381
@@ -477,7 +477,7 @@ Accept wildcard characters: False
477477
### -ConditionalAccessPolicy
478478
This parameter is available only in the cloud-based service.
479479
480-
The ConditionalAccessPolicy parameter specifies the Outlook on the Web Policy for limited access. For this feature to properly work, you will need to additioanlly configure a Conditional Access policy in the Azure Active Directory Portal.
480+
The ConditionalAccessPolicy parameter specifies the Outlook on the Web Policy for limited access. For this feature to properly work, you will need to additionally configure a Conditional Access policy in the Azure Active Directory Portal.
481481
482482
Valid values are:
483483
@@ -639,7 +639,7 @@ The DisableFacebook switch specifies whether users can synchronize their Faceboo
639639
640640
- To disable Facebook integration, use this switch without a value.
641641
642-
- To enable Facebook ingetration after it's been disabled, use this exact syntax: -DisableFacebook:$false.
642+
- To enable Facebook integration after it's been disabled, use this exact syntax: -DisableFacebook:$false.
643643
644644
Note that the value of this parameter is stored in the FacebookEnabled property in the output of the Get-OwaMailboxPolicy cmdlet.
645645
@@ -774,7 +774,7 @@ Accept wildcard characters: False
774774
```
775775
776776
### -ForceSaveMimeTypes
777-
The ForceSaveMimeTypes parameter specifies the MIME extentions in attachments that only allow the attachments to be saved locally (not opened). The default values are:
777+
The ForceSaveMimeTypes parameter specifies the MIME extensions in attachments that only allow the attachments to be saved locally (not opened). The default values are:
778778
779779
- Application/futuresplash
780780
@@ -1223,8 +1223,6 @@ Accept wildcard characters: False
12231223
```
12241224
12251225
### -OnSendAddinsEnabled
1226-
This parameter is available or functional only in the cloud-based service.
1227-
12281226
The OnSendAddinsEnabled parameter specifies whether to enable or disable on send add-ins in Outlook on the web (add-ins that support events when a user clicks Send). Valid values are:
12291227
12301228
- $true: On send add-ins are enabled.
@@ -1235,7 +1233,7 @@ The OnSendAddinsEnabled parameter specifies whether to enable or disable on send
12351233
Type: $true | $false
12361234
Parameter Sets: (All)
12371235
Aliases:
1238-
Applicable: Exchange Online
1236+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
12391237
Required: False
12401238
Position: Named
12411239
Default value: None
@@ -1672,7 +1670,7 @@ Accept wildcard characters: False
16721670
### -SkipCreateUnifiedGroupCustomSharepointClassification
16731671
This parameter is available only in the cloud-based service.
16741672
1675-
The SkipCreateUnifiedGroupCustomSharepointClassification parameter specifies whether to skip a custom Sharepoint page during the creation of Office 365 Groups in Outlook web app. Valid values are:
1673+
The SkipCreateUnifiedGroupCustomSharepointClassification parameter specifies whether to skip a custom SharePoint page during the creation of Office 365 Groups in Outlook web app. Valid values are:
16761674
16771675
- $true: The custom SharePoint page is skipped when a user creates an Office 365 group in Outlook on the web. This is the default value.
16781676
@@ -1821,7 +1819,7 @@ This parameter is available only in the cloud-based service.
18211819
18221820
The ThirdPartyFileProvidersEnabled parameter specifies whether to allow third-party (for example, Box, Dropbox, and Egnyte) attachments in Outlook on the web. Valid values are:
18231821
1824-
- $true: Third-party attachments are enabled in Outlook on the web. Users can connect their third-party file sharing accounts and share files over emailp.
1822+
- $true: Third-party attachments are enabled in Outlook on the web. Users can connect their third-party file sharing accounts and share files over email.
18251823
18261824
- $false: Third-party attachments are disabled in Outlook on the web. Users can't connect their third-party file sharing accounts or share files over email. This is the default value.
18271825
@@ -2243,7 +2241,7 @@ Accept wildcard characters: False
22432241
### -WebReadyMimeTypes
22442242
This parameter is available only in Exchange Server 2010 and Exchange Server 2013.
22452243
2246-
The WebReadyMimeTypes parameter specifies the MIME extentions of attachments that allow the attachments to be viewed by WebReady Document Viewing in Outlook on the web. The default value is all supported MIME types:
2244+
The WebReadyMimeTypes parameter specifies the MIME extensions of attachments that allow the attachments to be viewed by WebReady Document Viewing in Outlook on the web. The default value is all supported MIME types:
22472245
22482246
- application/msword
22492247

exchange/exchange-ps/exchange/email-addresses-and-address-books/Get-EmailAddressPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ monikerRange: "exchserver-ps-2010 || exchserver-ps-2013 || exchserver-ps-2016 ||
1414
## SYNOPSIS
1515
This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
1616

17-
Use the Get-EmailAddressPolicy cmdlet to view email address policies.
17+
Use the Get-EmailAddressPolicy cmdlet to view email address policies. In Exchange Online, email address policies are only available for Office 365 groups.
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

exchange/exchange-ps/exchange/email-addresses-and-address-books/New-EmailAddressPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ monikerRange: "exchserver-ps-2010 || exchserver-ps-2013 || exchserver-ps-2016 ||
1414
## SYNOPSIS
1515
This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
1616

17-
Use the New-EmailAddressPolicy cmdlet to create email address policies.
17+
Use the New-EmailAddressPolicy cmdlet to create email address policies. In Exchange Online, email address policies are only available for Office 365 groups.
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

exchange/exchange-ps/exchange/email-addresses-and-address-books/Remove-EmailAddressPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ monikerRange: "exchserver-ps-2010 || exchserver-ps-2013 || exchserver-ps-2016 ||
1414
## SYNOPSIS
1515
This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
1616

17-
Use the Remove-EmailAddressPolicy cmdlet to remove existing email address policies and update the affected recipients.
17+
Use the Remove-EmailAddressPolicy cmdlet to remove existing email address policies and update the affected recipients. In Exchange Online, email address policies are only available for Office 365 groups.
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

exchange/exchange-ps/exchange/email-addresses-and-address-books/Set-EmailAddressPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ monikerRange: "exchserver-ps-2010 || exchserver-ps-2013 || exchserver-ps-2016 ||
1414
## SYNOPSIS
1515
This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
1616

17-
Use the Set-EmailAddressPolicy cmdlet to modify email address policies.
17+
Use the Set-EmailAddressPolicy cmdlet to modify email address policies. In Exchange Online, email address policies are only available for Office 365 groups.
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,11 @@ Accept wildcard characters: False
575575
### -BookingsPaymentsEnabled
576576
This parameter is available only in the cloud-based service.
577577
578-
{{Fill BookingsPaymentsEnabled Description}}
578+
The BookingsPaymentsEnabled parameter specifies whether to enable online payment node inside Bookings. Valid values are:
579+
580+
- $true: Online payments are enabled.
581+
582+
- $false: Online payments are disabled. This is the default value.
579583
580584
```yaml
581585
Type: $true | $false
@@ -592,7 +596,11 @@ Accept wildcard characters: False
592596
### -BookingsSocialSharingRestricted
593597
This parameter is available only in the cloud-based service.
594598
595-
{{Fill BookingsSocialSharingRestricted Description}}
599+
The BookingsSocialSharingRestricted parameter allows you to control whether, or not, your users can see social sharing options inside Bookings. Valid values are:
600+
601+
- $true: Social sharing options are restricted.
602+
603+
- $false: Users can see social sharing options inside Bookings. This is the default value.
596604
597605
```yaml
598606
Type: $true | $false

exchange/exchange-ps/exchange/policy-and-compliance-retention/New-ComplianceTag.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,17 @@ For information about the parameter sets in the Syntax section below, see Exchan
2121
## SYNTAX
2222

2323
```
24-
New-ComplianceTag [-Name] <String> [-Comment <String>] [-Confirm] [-EventType <ComplianceRuleIdParameter>]
25-
[-IsRecordLabel <$true | $false>] [-RetentionAction <String>] [-RetentionDuration <Unlimited>]
26-
[-RetentionType <String>] [-ReviewerEmail <SmtpAddress[]>] [-WhatIf] [<CommonParameters>]
24+
New-ComplianceTag [-Name] <String>
25+
[-Comment <String>]
26+
[-Confirm]
27+
[-EventType <ComplianceRuleIdParameter>]
28+
[-IsRecordLabel <$true | $false>]
29+
[-Notes <String>]
30+
[-RetentionAction <String>]
31+
[-RetentionDuration <Unlimited>]
32+
[-RetentionType <String>]
33+
[-ReviewerEmail <SmtpAddress[]>]
34+
[-WhatIf] [<CommonParameters>]
2735
```
2836

2937
## DESCRIPTION
@@ -137,6 +145,21 @@ Accept pipeline input: False
137145
Accept wildcard characters: False
138146
```
139147
148+
### -Notes
149+
The Notes parameter specifies an optional note. If you specify a value that contains spaces, enclose the value in quotation marks ("), for example: "This is a user note".
150+
151+
```yaml
152+
Type: String
153+
Parameter Sets: (All)
154+
Aliases:
155+
Applicable: Office 365 Security & Compliance Center
156+
Required: False
157+
Position: Named
158+
Default value: None
159+
Accept pipeline input: False
160+
Accept wildcard characters: False
161+
```
162+
140163
### -RetentionAction
141164
The RetentionAction parameter specifies the action for the label. Valid values are:
142165

exchange/exchange-ps/exchange/users-and-groups/New-MailUser.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,16 +222,16 @@ Accept pipeline input: False
222222
Accept wildcard characters: False
223223
```
224224
225-
```yaml
226-
Type: ProxyAddress
227-
Parameter Sets: MicrosoftOnlineServicesID, FederatedUser
228-
Aliases:
229-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
230-
Required: False
231-
Position: Named
232-
Default value: None
233-
Accept pipeline input: False
234-
Accept wildcard characters: False
225+
```yaml
226+
Type: ProxyAddress
227+
Parameter Sets: MicrosoftOnlineServicesID, FederatedUser
228+
Aliases:
229+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
230+
Required: False
231+
Position: Named
232+
Default value: None
233+
Accept pipeline input: False
234+
Accept wildcard characters: False
235235
```
236236
237237
### -FederatedIdentity

0 commit comments

Comments
 (0)