Skip to content

Commit 98e840f

Browse files
authored
Merge branch 'master' into patch-76
2 parents 674209c + 0307c28 commit 98e840f

File tree

16 files changed

+89
-52
lines changed

16 files changed

+89
-52
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
4242

4343
<sup>*</sup> For older versions 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 [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
4444

45-
- The Exchange Online Remote PowerShell Module needs to be installed on your computer:
45+
- The Exchange Online Remote PowerShell Module needs to be installed on your computer. You need to do the following steps in a browser that supports ClickOnce (for example, Internet Explorer or the non-Chromium version of Edge):
4646

47-
1. In Internet Explorer or Edge, open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
48-
49-
**Note**: A browser that uses ClickOnce to download (like Internet Explorer or Edge) is needed to complete the next step.
47+
1. Open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
5048

5149
2. In the EAC, go to **Hybrid** > **Setup** and click the appropriate **Configure** button to download the Exchange Online Remote PowerShell Module for multi-factor authentication.
5250

@@ -70,7 +68,7 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
7068

7169
If basic authentication is disabled, you'll get this error when you try to connect:
7270

73-
`The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.`
71+
> The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.
7472
7573
- When you use the Exchange Online Remote PowerShell Module, your session will end after one hour, which can be problematic for long-running scripts or processes. To avoid this issue, use [Trusted IPs](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-mfasettings#trusted-ips) to bypass MFA for connections from your intranet. Trusted IPs allow you to connect to Exchange Online PowerShell from your intranet using the old instructions at [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md). Also, if you have servers in a datacenter, be sure to add their public IP addresses to Trusted IPs as described [here](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-mfasettings#enable-the-trusted-ips-feature-by-using-service-settings).
7674

exchange/exchange-ps/exchange/advanced-threat-protection/Set-AtpPolicyForO365.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Accept pipeline input: False
145145
Accept wildcard characters: False
146146
```
147147
148-
### -EnableSafeLinksForO365Clients
149-
The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
148+
### -EnableSafeLinksForClients
149+
The EnableSafeLinksForClients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
150150
151151
- $true: Safe Links are enabled for Office 365 apps. This is the default value.
152152

exchange/exchange-ps/exchange/client-access-servers/Get-MapiVirtualDirectory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Accept wildcard characters: False
147147
```
148148
149149
### CommonParameters
150-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
150+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
151151
152152
## INPUTS
153153

exchange/exchange-ps/exchange/client-access-servers/New-MapiVirtualDirectory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ Accept wildcard characters: False
317317
```
318318
319319
### CommonParameters
320-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
320+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
321321
322322
## INPUTS
323323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ Accept wildcard characters: False
293293
```
294294
295295
### CommonParameters
296-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
296+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
297297
298298
## INPUTS
299299

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,11 +1212,7 @@ Accept wildcard characters: False
12121212
### -LinkedInEnabled
12131213
This parameter is available only in the cloud-based service.
12141214
1215-
The LinkedInEnabled parameter specifies whether users can synchronize their LinkedIn contacts to their Contacts folder. Valid values are:
1216-
1217-
- $true: LinkedIn integration is enabled. This is the default value.
1218-
1219-
- $false: LinkedIn integration is disabled.
1215+
LinkedIn integration is no longer supported.
12201216
12211217
```yaml
12221218
Type: Boolean
@@ -1474,11 +1470,11 @@ Accept wildcard characters: False
14741470
### -PersonalAccountCalendarsEnabled
14751471
This parameter is available only in the cloud-based service.
14761472
1477-
The PersonalAccountCalendarsEnabled parameter specifies whether to allow users to connect to their personal Outlook.com or Gmail calendars in Outlook on the web. Valid values are:
1473+
The PersonalAccountCalendarsEnabled parameter specifies whether to allow users to connect to their personal Outlook.com or Google Calendar in Outlook on the web. Valid values are:
14781474
1479-
- $true: Users can connect to their Outlook.com or Gmail calendars to see those events in their Outlook on the web calendar. This is the default value.
1475+
- $true: Users can connect to their Outlook.com or Google Calendar to see those events in their Outlook on the web calendar. This is the default value.
14801476
1481-
- $false: Users can't connect to their Outlook.com or Gmail calendars in Outlook on the web.
1477+
- $false: Users can't connect to their Outlook.com or Google Calendar in Outlook on the web.
14821478
14831479
```yaml
14841480
Type: Boolean

exchange/exchange-ps/exchange/encryption-and-certificates/New-ExchangeCertificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Exchange uses certificates for SSL and TLS encryption.
6767

6868
There are many factors to consider when you configure certificates for Transport Layer Security (TLS) and Secure Sockets Layer (SSL) services. You need to understand how these factors might affect your overall configuration. For more information, see [Digital certificates and encryption in Exchange Server](https://docs.microsoft.com/Exchange/architecture/client-access/certificates).
6969

70-
Secure Sockets Layer (SSL) is being replaced by Transport Layer Security (TLS) as the protocol that's used to encrypt data sent between computer systems. They're so closely related that the terms "SSL" and "TLS" (without versions) are often used interchangeably. Because of this similarity, references to "SSL" in Exchange topics, the Exchange admin center, and the Exchange Management Shell have often been used to encompass both the SSL and TLS protocols. Typically, "SSL" refers to the actual SSL protocol only when a version is also provided (for example, SSL 3.0). To find out why you should disable the SSL protocol and switch to TLS, check out [Protecting you against the SSL 3.0 vulnerability](https://blogs.office.com/2014/10/29/protecting-ssl-3-0-vulnerability/).
70+
Secure Sockets Layer (SSL) is being replaced by Transport Layer Security (TLS) as the protocol that's used to encrypt data sent between computer systems. They're so closely related that the terms "SSL" and "TLS" (without versions) are often used interchangeably. Because of this similarity, references to "SSL" in Exchange topics, the Exchange admin center, and the Exchange Management Shell have often been used to encompass both the SSL and TLS protocols. Typically, "SSL" refers to the actual SSL protocol only when a version is also provided (for example, SSL 3.0). To find out why you should disable the SSL protocol and switch to TLS, check out [Protecting you against the SSL 3.0 vulnerability](https://azure.microsoft.com/blog/protecting-against-the-ssl-3-0-vulnerability/).
7171

7272
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/exchange-server/find-exchange-cmdlet-permissions).
7373

exchange/exchange-ps/exchange/mailboxes/Set-Place.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Set-Place [-Identity] <RecipientIdParameter>
3030
[-CountryOrRegion <CountryInfo>]
3131
[-DisplayDeviceName <String>]
3232
[-Floor <System.Int32>]
33+
[-FloorLabel <String>]
3334
[-GeoCoordinates <GeoCoordinates>]
3435
[-IsWheelChairAccessible <Boolean>]
3536
[-Label <String>]
@@ -220,6 +221,22 @@ Accept pipeline input: False
220221
Accept wildcard characters: False
221222
```
222223
224+
### -FloorLabel
225+
The FloorLabel parameter specifies a descriptive label for the floor that the room is on. If the value contains spaces, enclose the value in quotation marks (").
226+
227+
```yaml
228+
Type: String
229+
Parameter Sets: (All)
230+
Aliases:
231+
Applicable: Exchange Online
232+
233+
Required: False
234+
Position: Named
235+
Default value: None
236+
Accept pipeline input: False
237+
Accept wildcard characters: False
238+
```
239+
223240
### -GeoCoordinates
224241
The GeoCoordinates parameter specifies the room's location in latitude, longitude and (optionally) altitude coordinates. A valid value for this parameter uses one of the following formats:
225242

exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpCompliancePolicy.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ Accept wildcard characters: False
131131
```
132132
133133
### -ExchangeSenderMemberOf
134-
{{ Fill ExchangeSenderMemberOf Description }}
134+
The ExchangeSenderMemberOf parameter specifies the distribution groups, mail-enabled security groups, or dynamic distribution groups to include in the DLP policy. You identify the group by its email address.
135+
136+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>.
137+
138+
You can't use this parameter to specify Office 365 Groups.
135139
136140
```yaml
137141
Type: SmtpAddress[]
@@ -147,7 +151,11 @@ Accept wildcard characters: False
147151
```
148152
149153
### -ExchangeSenderMemberOfException
150-
{{ Fill ExchangeSenderMemberOfException Description }}
154+
The ExchangeSenderMemberOf parameter specifies the distribution groups, mail-enabled security groups, or dynamic distribution groups to exclude from the DLP policy. You identify the group by its email address.
155+
156+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>.
157+
158+
You can't use this parameter to specify Office 365 Groups.
151159
152160
```yaml
153161
Type: SmtpAddress[]
@@ -333,7 +341,9 @@ Accept wildcard characters: False
333341
```
334342
335343
### -TeamsLocation
336-
{{ Fill TeamsLocation Description }}
344+
The TeamsLocation parameter specifies the Teams accounts to include in the DLP policy. You identify the account by its name or email address, or you can use the value All to include all accounts.
345+
346+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
337347
338348
```yaml
339349
Type: MultiValuedProperty
@@ -349,7 +359,9 @@ Accept wildcard characters: False
349359
```
350360
351361
### -TeamsLocationException
352-
{{ Fill TeamsLocationException Description }}
362+
The TeamsLocation parameter specifies the Teams accounts to exclude form the DLP policy when you use the value All for the TeamsLocation parameter. You identify the account by its name or email address.
363+
364+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
353365
354366
```yaml
355367
Type: MultiValuedProperty

exchange/exchange-ps/exchange/policy-and-compliance-dlp/Set-DlpCompliancePolicy.md

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
2020

2121
## SYNTAX
2222

23-
### RetryDistribution
24-
```
25-
Set-DlpCompliancePolicy [-Identity] <PolicyIdParameter> [-RetryDistribution]
26-
[-Confirm]
27-
[-WhatIf] [<CommonParameters>]
28-
```
29-
3023
### Identity
3124
```
3225
Set-DlpCompliancePolicy [-Identity] <PolicyIdParameter>
@@ -54,6 +47,13 @@ Set-DlpCompliancePolicy [-Identity] <PolicyIdParameter>
5447
[-WhatIf] [<CommonParameters>]
5548
```
5649

50+
### RetryDistribution
51+
```
52+
Set-DlpCompliancePolicy [-Identity] <PolicyIdParameter> [-RetryDistribution]
53+
[-Confirm]
54+
[-WhatIf] [<CommonParameters>]
55+
```
56+
5757
## DESCRIPTION
5858
You need to be assigned permissions in the Office 365 Security & Compliance Center before you can use this cmdlet. For more information, see [Permissions in Office 365 Security & Compliance Center](https://go.microsoft.com/fwlink/p/?LinkId=511920).
5959

@@ -206,7 +206,9 @@ Accept wildcard characters: False
206206
```
207207
208208
### -AddTeamsLocation
209-
{{ Fill AddTeamsLocation Description }}
209+
The AddTeamsLocation parameter specifies the Teams accounts to add to the list of included accounts when you aren't using the value All for the TeamsLocation parameter. You identify the account by its name or email address.
210+
211+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
210212
211213
```yaml
212214
Type: MultiValuedProperty
@@ -222,7 +224,9 @@ Accept wildcard characters: False
222224
```
223225
224226
### -AddTeamsLocationException
225-
{{ Fill AddTeamsLocationException Description }}
227+
The AddTeamsLocationException parameter specifies the Teams accounts to add to the list of excluded accounts when you use the value All for the TeamsLocation parameter. You identify the account by its name or email address.
228+
229+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
226230
227231
```yaml
228232
Type: MultiValuedProperty
@@ -274,7 +278,11 @@ Accept wildcard characters: False
274278
```
275279
276280
### -ExchangeSenderMemberOf
277-
{{ Fill ExchangeSenderMemberOf Description }}
281+
The ExchangeSenderMemberOf parameter specifies the distribution groups, mail-enabled security groups, or dynamic distribution groups to include in the DLP policy. You identify the group by its email address.
282+
283+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>.
284+
285+
You can't use this parameter to specify Office 365 Groups.
278286
279287
```yaml
280288
Type: SmtpAddress[]
@@ -290,7 +298,11 @@ Accept wildcard characters: False
290298
```
291299
292300
### -ExchangeSenderMemberOfException
293-
{{ Fill ExchangeSenderMemberOfException Description }}
301+
The ExchangeSenderMemberOf parameter specifies the distribution groups, mail-enabled security groups, or dynamic distribution groups to exclude from the DLP policy. You identify the group by its email address.
302+
303+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>.
304+
305+
You can't use this parameter to specify Office 365 Groups.
294306
295307
```yaml
296308
Type: SmtpAddress[]
@@ -460,7 +472,9 @@ Accept wildcard characters: False
460472
```
461473
462474
### -RemoveTeamsLocation
463-
{{ Fill RemoveTeamsLocation Description }}
475+
The RemoveTeamsLocation parameter specifies the Teams accounts to remove from the list of included accounts when you use the value All for the TeamsLocation parameter. You identify the account by its name or email address.
476+
477+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
464478
465479
```yaml
466480
Type: MultiValuedProperty
@@ -476,7 +490,9 @@ Accept wildcard characters: False
476490
```
477491
478492
### -RemoveTeamsLocationException
479-
{{ Fill RemoveTeamsLocationException Description }}
493+
The RemoveTeamsLocation parameter specifies the Teams accounts to remove from the list of excluded accounts when you aren't using the value All for the TeamsLocation parameter. You identify the account by its name or email address.
494+
495+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
480496
481497
```yaml
482498
Type: MultiValuedProperty

exchange/exchange-ps/exchange/role-based-access-control/New-RoleGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Accept wildcard characters: False
340340
```
341341

342342
### -Members
343-
The Members parameter specifies the mailboxes or USGs to add as a member of the role group. You can use the name, DN, or primary SMTP address of the user or USG you want to add. If the name of the user or USG contains spaces, enclose the name in quotation marks ("). If you want to add more than one user or USG, separate them using commas.
343+
The Members parameter specifies the mailboxes or mail-enabled USGs to add as a member of the role group. You can identify the user or group by the name, DN, or primary SMTP address value. You can specify multiple members separated by commas (`Value1,Value2,...ValueN`). If the value contains spaces, enclose the value in quotation marks (`"Value 1","Value 2",..."Value N"`).
344344

345345
If you use the Members parameter, you can't use the LinkedForeignGroup, LinkedDomainController or LinkedCredential parameters.
346346

0 commit comments

Comments
 (0)