Skip to content

Commit b3dcd6e

Browse files
committed
Merge branch 'main' into chrisda
2 parents e6216aa + cd19ed4 commit b3dcd6e

File tree

5 files changed

+81
-29
lines changed

5 files changed

+81
-29
lines changed

exchange/exchange-ps/exchange/Add-UnifiedGroupLinks.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ ms.reviewer:
1414
## SYNOPSIS
1515
This cmdlet is available only in the cloud-based service.
1616

17-
Use the Add-UnifiedGroupLinks cmdlet to add members, owners and subscribers to Microsoft 365 Groups in your cloud-based organization. To remove members, owners and subscribers, use the Remove-UnifiedGroupLinks cmdlet. To modify other properties of Microsoft 365 Groups, use the Set-UnifiedGroup cmdlet.
17+
Use the Add-UnifiedGroupLinks cmdlet to add members, owners and subscribers to Microsoft 365 Groups in your cloud-based organization. To remove members, owners, and subscribers, use the Remove-UnifiedGroupLinks cmdlet. To modify other properties of Microsoft 365 Groups, use the Set-UnifiedGroup cmdlet.
18+
19+
**Note**: You can't use this cmdlet to modify Microsoft 365 Group members, owners, or subscribers if you connect using certificate based authentication (also known as CBA or app-only authentication for unattended scripts). You can use Microsoft Graph instead. For more information, see [Group resource type](https://docs.microsoft.com/graph/api/resources/group).
1820

1921
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
2022

exchange/exchange-ps/exchange/Get-Label.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Accept wildcard characters: False
6969
```
7070
7171
### -IncludeDetailedLabelActions
72-
The IncludeDetailedLabelActions parameter specifies whether to expand label actions into properties for better readability. Value values are:
72+
The IncludeDetailedLabelActions parameter specifies whether to expand label actions into properties for better readability. Valid values are:
7373
7474
- $true: Include detailed label actions.
7575
- $false: Don't include detailed label actions.

exchange/exchange-ps/exchange/New-ClientAccessRule.md

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ New-ClientAccessRule [-Name] <String> -Action <ClientAccessRulesAction>
4747
## DESCRIPTION
4848
Client access rules are like mail flow rules (also known as transport rules) for client connections to your organization. You use conditions and exceptions to identify the connections based on their properties, and actions that allow or block the connections.
4949

50-
**Note**: Currently, not all authentication types are supported for all protocols. The supported authentication types per protocol are described in this list:
50+
**Note**: Not all protocols support authentication type filters, and even protocols that support authentication type filters don't support all authentication types. The supported combinations are described in the following lists. Use caution when mixing protocols and authentication types in the same rule.
51+
52+
Protocols that support authentication type filters:
5153

5254
- ExchangeActiveSync: BasicAuthentication, OAuthAuthentication, and CertificateBasedAuthentication.
5355
- ExchangeAdminCenter: BasicAuthentication and AdfsAuthentication.
@@ -56,6 +58,15 @@ Client access rules are like mail flow rules (also known as transport rules) for
5658
- POP3: BasicAuthentication and OAuthAuthentication.
5759
- RemotePowerShell: BasicAuthentication and NonBasicAuthentication.
5860

61+
Protcols that don't support authentication type filters:
62+
63+
- ExchangeWebServices
64+
- OfflineAddressBook
65+
- OutlookAnywhere
66+
- PowerShellWebServices
67+
- REST
68+
- UniversalOutlook
69+
5970
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).
6071

6172
## EXAMPLES
@@ -123,6 +134,8 @@ Valid values for this parameter are:
123134
124135
You can enter multiple values separated by commas. Don't use quotation marks.
125136
137+
**Note**: Refer to the Description section to see which authentication types can be used with what protocols.
138+
126139
```yaml
127140
Type: MultiValuedProperty
128141
Parameter Sets: (All)
@@ -279,6 +292,8 @@ Valid values for this parameter are:
279292

280293
You can enter multiple values separated by commas. Don't use quotation marks.
281294

295+
**Note**: Refer to the Description section to see which authentication types can be used with what protocols.
296+
282297
```yaml
283298
Type: MultiValuedProperty
284299
Parameter Sets: (All)
@@ -485,29 +500,39 @@ Accept wildcard characters: True
485500
### -UserRecipientFilter
486501
This parameter is functional only in the cloud-based service.
487502

488-
The UserRecipientFilter parameter specifies a condition for the client access rule that uses OPath filter syntax to identify the user. The syntax is `"Property -ComparisonOperator 'Value'"` (for example, `"City -eq 'Redmond'"`).
489-
490-
- Enclose the whole OPath filter in double quotation marks " ". If the filter contains system values (for example, `$true`, `$false`, or `$null`), use single quotation marks ' ' instead. Although this parameter is a string (not a system block), you can also use braces { }, but only if the filter doesn't contain variables.
491-
- Property is a filterable property. For filterable recipient properties, see [Filterable properties for the RecipientFilter parameter on Exchange cmdlets](https://docs.microsoft.com/powershell/exchange/recipientfilter-properties).
492-
- ComparisonOperator is an OPath comparison operator (for example `-eq` for equals and `-like` for string comparison). For more information about comparison operators, see [about_Comparison_Operators](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comparison_operators).
493-
- Value is the property value to search for. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). If a variable value contains single quotation marks, you need to identify (escape) the single quotation marks to expand the variable correctly. For example, instead of `'$User'`, use `'$($User -Replace "'","''")'`. Don't enclose integers or system values (for example, `500`, `$true`, `$false`, or `$null`).
494-
495-
You can chain multiple search criteria together using the logical operators `-and` and `-or`. For example, `"Criteria1 -and Criteria2"` or `"(Criteria1 -and Criteria2) -or Criteria3"`.
496-
497-
For detailed information about OPath filters in Exchange, see [Additional OPATH syntax information](https://docs.microsoft.com/powershell/exchange/recipient-filters#additional-opath-syntax-information).
503+
The UserRecipientFilter parameter specifies a condition for the client access rule that uses OPath filter syntax to identify the user based on a limited set of recipient properties. Client Access Rules don't support the full list of available recipient properties.
498504

499-
The filterable properties that you can use with this parameter are:
505+
You can use the following properties with this parameter:
500506

501507
- City
502508
- Company
503-
- CountryOrRegion
509+
- CountryOrRegion (ISO 3166-1 alpha-2 country code.)
504510
- CustomAttribute1 to CustomAttribute15
505511
- Department
506512
- Office
507513
- PostalCode
508514
- StateOrProvince
509515
- StreetAddress
510516

517+
The basic syntax for this parameter is `"Property -ComparisonOperator 'Value'"`:
518+
519+
- Property is one of the filterable properties in the list above (for example `City` or `CustomAttribute1`).
520+
- ComparisonOperator is an OPath comparison operator (for example `-eq` for equals and `-like` for string comparison). For more information about comparison operators, see [about_Comparison_Operators](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comparison_operators).
521+
- Value is the property value to search for. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). If a variable value contains single quotation marks, you need to identify (escape) the single quotation marks to expand the variable correctly. For example, instead of `'$User'`, use `'$($User -Replace "'","''")'`. Don't enclose integers or system values in quotation marks (for example, use `500`, `$true`, `$false`, or `$null` instead).
522+
- Enclose the whole OPath filter in double quotation marks " ". If the filter contains system values (for example, `$true`, `$false`, or `$null`), use single quotation marks ' ' instead. Although this parameter is a string (not a system block), you can also use braces { }, but only if the filter doesn't contain variables.
523+
524+
For example:
525+
526+
- `"City -eq 'Redmond'"`
527+
- `"CountryOrRegion -eq 'SG'"`.
528+
529+
You can chain multiple search criteria together using the logical operators `-and` and `-or`. For example:
530+
531+
- `"CustomAttribute1 -eq 'AllowOWA' -and CountryOrRegion -eq AU'"`
532+
- `"(CountryOrRegion -eq 'US' -and Department -eq 'Sales') -or Department -eq 'Research'"`.
533+
534+
For detailed information about OPath filter syntax in Exchange, see [Additional OPATH syntax information](https://docs.microsoft.com/powershell/exchange/recipient-filters#additional-opath-syntax-information).
535+
511536
```yaml
512537
Type: String
513538
Parameter Sets: (All)

exchange/exchange-ps/exchange/Set-ClientAccessRule.md

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ Set-ClientAccessRule [-Identity] <ClientAccessRuleIdParameter>
4949
## DESCRIPTION
5050
Client access rules are like mail flow rules (also known as transport rules) for client connections to your organization. You use conditions and exceptions to identify the connections based on their properties, and actions that allow or block the connections.
5151

52-
**Note**: Not all authentication types are supported for all protocols. The supported authentication types per protocol are described in this list:
52+
**Note**: Not all protocols support authentication type filters, and even protocols that support authentication type filters don't support all authentication types. The supported combinations are described in the following lists. Use caution when mixing protocols and authentication types in the same rule.
53+
54+
Protocols that support authentication type filters:
5355

5456
- ExchangeActiveSync: BasicAuthentication, OAuthAuthentication, and CertificateBasedAuthentication.
5557
- ExchangeAdminCenter: BasicAuthentication and AdfsAuthentication.
@@ -58,6 +60,15 @@ Client access rules are like mail flow rules (also known as transport rules) for
5860
- POP3: BasicAuthentication and OAuthAuthentication.
5961
- RemotePowerShell: BasicAuthentication and NonBasicAuthentication.
6062

63+
Protcols that don't support authentication type filters:
64+
65+
- ExchangeWebServices
66+
- OfflineAddressBook
67+
- OutlookAnywhere
68+
- PowerShellWebServices
69+
- REST
70+
- UniversalOutlook
71+
6172
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).
6273

6374
## EXAMPLES
@@ -124,6 +135,8 @@ To enter multiple values and overwrite any existing entries, use the following s
124135

125136
To add or remove one or more values without affecting any existing entries, use the following syntax: `@{Add="Value1","Value2"...; Remove="Value3","Value4"...}`.
126137

138+
**Note**: Refer to the Description section to see which authentication types can be used with what protocols.
139+
127140
```yaml
128141
Type: MultiValuedProperty
129142
Parameter Sets: (All)
@@ -286,6 +299,8 @@ To enter multiple values and overwrite any existing entries, use the following s
286299

287300
To add or remove one or more values without affecting any existing entries, use the following syntax: `@{Add="Value1","Value2"...; Remove="Value3","Value4"...}`.
288301

302+
**Note**: Refer to the Description section to see which authentication types can be used with what protocols.
303+
289304
```yaml
290305
Type: MultiValuedProperty
291306
Parameter Sets: (All)
@@ -508,29 +523,39 @@ Accept wildcard characters: False
508523
### -UserRecipientFilter
509524
This parameter is functional only in the cloud-based service.
510525

511-
The UserRecipientFilter parameter specifies a condition for the client access rule that uses OPath filter syntax to identify the user. The syntax is `"Property -ComparisonOperator 'Value'"` (for example, `"City -eq 'Redmond'"`).
512-
513-
- Enclose the whole OPath filter in double quotation marks " ". If the filter contains system values (for example, `$true`, `$false`, or `$null`), use single quotation marks ' ' instead. Although this parameter is a string (not a system block), you can also use braces { }, but only if the filter doesn't contain variables.
514-
- Property is a filterable property.
515-
- ComparisonOperator is an OPath comparison operator (for example `-eq` for equals and `-like` for string comparison). For more information about comparison operators, see [about_Comparison_Operators](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comparison_operators).
516-
- Value is the property value to search for. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). If a variable value contains single quotation marks, you need to identify (escape) the single quotation marks to expand the variable correctly. For example, instead of `'$User'`, use `'$($User -Replace "'","''")'`. Don't enclose integers or system values (for example, `500`, `$true`, `$false`, or `$null`).
517-
518-
You can chain multiple search criteria together using the logical operators `-and` and `-or`. For example, `"Criteria1 -and Criteria2"` or `"(Criteria1 -and Criteria2) -or Criteria3"`.
519-
520-
For detailed information about OPath filters in Exchange, see [Additional OPATH syntax information](https://docs.microsoft.com/powershell/exchange/recipient-filters#additional-opath-syntax-information).
526+
The UserRecipientFilter parameter specifies a condition for the client access rule that uses OPath filter syntax to identify the user based on a limited set of recipient properties. Client Access Rules don't support the full list of available recipient properties.
521527

522-
The filterable properties that you can use with this parameter are:
528+
You can use the following properties with this parameter:
523529

524530
- City
525531
- Company
526-
- CountryOrRegion
532+
- CountryOrRegion (ISO 3166-1 alpha-2 country code.)
527533
- CustomAttribute1 to CustomAttribute15
528534
- Department
529535
- Office
530536
- PostalCode
531537
- StateOrProvince
532538
- StreetAddress
533539

540+
The basic syntax for this parameter is `"Property -ComparisonOperator 'Value'"`:
541+
542+
- Property is one of the filterable properties in the list above (for example `City` or `CustomAttribute1`).
543+
- ComparisonOperator is an OPath comparison operator (for example `-eq` for equals and `-like` for string comparison). For more information about comparison operators, see [about_Comparison_Operators](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comparison_operators).
544+
- Value is the property value to search for. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). If a variable value contains single quotation marks, you need to identify (escape) the single quotation marks to expand the variable correctly. For example, instead of `'$User'`, use `'$($User -Replace "'","''")'`. Don't enclose integers or system values in quotation marks (for example, use `500`, `$true`, `$false`, or `$null` instead).
545+
- Enclose the whole OPath filter in double quotation marks " ". If the filter contains system values (for example, `$true`, `$false`, or `$null`), use single quotation marks ' ' instead. Although this parameter is a string (not a system block), you can also use braces { }, but only if the filter doesn't contain variables.
546+
547+
For example:
548+
549+
- `"City -eq 'Redmond'"`
550+
- `"CountryOrRegion -eq 'SG'"`.
551+
552+
You can chain multiple search criteria together using the logical operators `-and` and `-or`. For example:
553+
554+
- `"CustomAttribute1 -eq 'AllowOWA' -and CountryOrRegion -eq AU'"`
555+
- `"(CountryOrRegion -eq 'US' -and Department -eq 'Sales') -or Department -eq 'Research'"`.
556+
557+
For detailed information about OPath filter syntax in Exchange, see [Additional OPATH syntax information](https://docs.microsoft.com/powershell/exchange/recipient-filters#additional-opath-syntax-information).
558+
534559
```yaml
535560
Type: String
536561
Parameter Sets: (All)

exchange/exchange-ps/exchange/Set-Label.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ Accept wildcard characters: False
690690
```
691691

692692
### -EncryptionEnabled
693-
The EncryptionEnabled parameter specifies whether encryption in enabled. Value values are:
693+
The EncryptionEnabled parameter specifies whether encryption in enabled. Valid values are:
694694

695695
- $true: Encryption is enabled.
696696
- $false: Encryption is disabled.

0 commit comments

Comments
 (0)