Merge pull request MicrosoftDocs#4269 from MicrosoftDocs/master

Master to Live

Author: chrisda

exchange/docs-conceptual/exchange-online/disable-access-to-exchange-online-powershell.md

@@ -65,7 +65,7 @@ $<VariableName> | foreach {Set-User -Identity $_ -RemotePowerShellEnabled $false
 This example removes access to Exchange Online PowerShell for all users whose **Title** attribute contains the value "Sales Associate".
 
 ```PowerShell
-$DSA = Get-User -ResultSize unlimited -Filter {(RecipientType -eq 'UserMailbox') -and (Title -like '*Sales Associate*')}
+$DSA = Get-User -ResultSize unlimited -Filter "(RecipientType -eq 'UserMailbox') -and (Title -like '*Sales Associate*')"
 ```
 
 ```PowerShell
@@ -121,11 +121,11 @@ Get-User -ResultSize unlimited | Format-Table -Auto Name,DisplayName,RemotePower
 To display only those users who don't have access to Exchange Online PowerShell, run the following command:
 
 ```PowerShell
-Get-User -ResultSize unlimited -Filter {RemotePowerShellEnabled -eq $false}
+Get-User -ResultSize unlimited -Filter "RemotePowerShellEnabled -eq $false"
 ```
 
 To display only those users who have access to Exchange Online PowerShell, run the following command:
 
 ```PowerShell
-Get-User -ResultSize unlimited -Filter {RemotePowerShellEnabled -eq $true}
+Get-User -ResultSize unlimited -Filter "RemotePowerShellEnabled -eq $true"
 ```

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

@@ -68,7 +68,7 @@ $<VariableName> | foreach {Set-User -RemotePowerShellEnabled $false}
 This example removes access to remote PowerShell for all users whose **Title** attribute contains the value "Sales Associate".
 
 ```PowerShell
-$DSA = Get-User -ResultSize unlimited -Filter {(RecipientType -eq 'UserMailbox') -and (Title -like '*Sales Associate*')}
+$DSA = Get-User -ResultSize unlimited -Filter "(RecipientType -eq 'UserMailbox') -and (Title -like '*Sales Associate*')"
 ```
 
 ```PowerShell
@@ -124,11 +124,11 @@ Get-User -ResultSize unlimited | Format-Table -Auto Name,DisplayName,RemotePower
 To display only those users who don't have access to remote PowerShell, run the following command:
 
 ```PowerShell
-Get-User -ResultSize unlimited -Filter {RemotePowerShellEnabled -eq $false}
+Get-User -ResultSize unlimited -Filter "RemotePowerShellEnabled -eq $false"
 ```
 
 To display only those users who have access to remote PowerShell, run the following command:
 
 ```PowerShell
-Get-User -ResultSize unlimited -Filter {RemotePowerShellEnabled -eq $true}
+Get-User -ResultSize unlimited -Filter "RemotePowerShellEnabled -eq $true"
 ```

exchange/docs-conceptual/exchange-server/recipient-filters/filter-properties.md

@@ -122,7 +122,7 @@ The following example uses the _RecipientFilter_ parameter to create a dynamic d
 This example uses custom filters to create a dynamic distribution group for user mailboxes that have the **Company** attribute defined as Contoso and the **Office** attribute defined as North Building.
 
 ```PowerShell
-New-DynamicDistributionGroup -Name AllContosoNorth -OrganizationalUnit contoso.com/Users -RecipientFilter { ((RecipientType -eq 'UserMailbox') -and (Company -eq 'Contoso') -and (Office -eq 'North Building')) }
+New-DynamicDistributionGroup -Name AllContosoNorth -OrganizationalUnit contoso.com/Users -RecipientFilter "((RecipientType -eq 'UserMailbox') -and (Company -eq 'Contoso') -and (Office -eq 'North Building'))"
 ```
 
 ## Custom filters using the Filter parameter
@@ -176,19 +176,19 @@ For more information about the filterable properties you can use with the _Filte
 This example uses the _Filter_ parameter to return information about users whose title contains the word "manager".
 
 ```PowerShell
-Get-User -Filter {Title -like 'Manager*'}
+Get-User -Filter "Title -like 'Manager*'"
 ```
 
 ## Custom filters using the ContentFilter parameter
 
 You can use the _ContentFilter_ parameter to select specific message content to export when using the [New-MailboxExportRequest](../../../exchange-ps/exchange/mailboxes/new-mailboxexportrequest.md) cmdlet. If the command finds a message that contains the match to the content filter, it exports the message to a .pst file.
 
-### ContentFilter paramter example
+### ContentFilter parameter example
 
 This example creates an export request that searches Ayla's mailbox for messages where the body contains the phrase "company prospectus". If that phrase is found, the command exports all messages with that phrase to a .pst file.
 
 ```PowerShell
-New-MailboxExportRequest -Mailbox Ayla -ContentFilter {Body -like "company prospectus*"}
+New-MailboxExportRequest -Mailbox Ayla -ContentFilter "Body -like "company prospectus*""
 ```
 
 For more information about the filterable properties you can use with the _ContentFilter_ parameter, see [Filterable Properties for the ContentFilter Parameter](https://technet.microsoft.com/library/cf504a59-1938-489c-bb48-b27b2ac3234e.aspx).
@@ -197,7 +197,9 @@ For more information about the filterable properties you can use with the _Conte
 
 When creating your own custom filters, be aware of the following:
 
-- Use braces { } around the entire OPATH filter string with the _Filter_ or _RecipientFilter_ parameters.
+- With the _Filter_ or _RecipientFilter_ parameters, enclose the whole OPath filter in double quotation marks " ". Braces { } will also work, but only if the filter doesn't contain variables.
+
+- Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). Don't use quotation marks with integers or the system values `$true`, `$false`, or `$null`. You need to escape any variables with values that contain single quotation marks. For example, instead of `"Property -eq '$x'"`, use `"Property -eq '$($x -Replace "'","''")'"`.
 
 - Include the hyphen before all operators. The most common operators include:
 
@@ -223,9 +225,9 @@ When creating your own custom filters, be aware of the following:
 
 - For more information about operators you can use, see:
 
-  - [About Logical Operators](https://technet.microsoft.com/library/hh847789.aspx)
+  - [about_Logical_Operators](https://technet.microsoft.com/library/hh847789.aspx)
 
-  - [About Comparison Operators](https://technet.microsoft.com/library/hh847759.aspx)
+  - [about_Comparison_Operators](https://technet.microsoft.com/library/hh847759.aspx)
 
 ## Recipient filter documentation
 

exchange/docs-conceptual/exchange-server/recipient-filters/recipient-filters.md

@@ -45,7 +45,7 @@ This example returns all UPN suffixes for the Active Directory forest.
 ## PARAMETERS
 
 ### -OrganizationalUnit
-The OrganizationalUnit parameter filters the results based on the object's location in Active Directory. Only objects that exist in the specified location are returned. Valid input for this parameter is an organizational unit (OU) or domain that's visible using the Get-OrganizationalUnit cmdlet. You can use any value that uniquely identifies the OU or domain. For example:
+The OrganizationalUnit parameter filters the results based on the object's location in Active Directory. Only objects that exist in the specified location are returned. Valid input for this parameter is an organizational unit (OU) or domain that's returned by the Get-OrganizationalUnit cmdlet. You can use any value that uniquely identifies the OU or domain. For example:
 
 - Name
 

exchange/exchange-ps/exchange/active-directory/Get-UserPrincipalNamesSuffix.md

@@ -140,12 +140,12 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -EnableSafeLinksForClients
-The EnableSafeLinksForClients parameter specifies whether Safe Links is enabled for Office 365 ProPlus clients. Valid values are:
+### -EnableSafeLinksForO365Clients
+The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
 
-- $true: Safe Links are enabled for Office clients.
+- $true: Safe Links are enabled for Office 365 apps. This is the default value.
 
-- $false: Safe Links are disabled for Office clients. This is the default value.
+- $false: Safe Links are disabled for Office 365 apps.
 
 ```yaml
 Type: $true | $false

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

@@ -98,7 +98,7 @@ This example creates a content filter policy named Contoso Content Filter Policy
 ### -Name
 The Name parameter specifies a unique name for the content filter policy. If the value contains spaces, enclose the value in quotation marks (").
 
-The value itself can't contain the following characters: \\, %, &, \*, +, /, =, ?, {, }, \|, \<, \>, (, ), ;, :, [, ], comma (,), or double-quotation mark (").
+The value itself can't contain the following characters: \\, %, &, \*, +, /, =, ?, {, }, \|, \<, \>, (, ), ;, :, [, ], comma (,), or double quotation mark (").
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/antispam-antimalware/New-HostedContentFilterPolicy.md

@@ -71,7 +71,7 @@ Accept wildcard characters: False
 ### -Name
 The Name parameter specifies a unique name for the content filter rule. If the value contains spaces, enclose the value in quotation marks (").
 
-The value itself can't contain the following characters: \\, %, &, \*, +, /, =, ?, {, }, \|, \<, \>, (, ), ;, :, [, ], comma (,), or double-quotation mark (").
+The value itself can't contain the following characters: \\, %, &, \*, +, /, =, ?, {, }, \|, \<, \>, (, ), ;, :, [, ], comma (,), or double quotation mark (").
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/antispam-antimalware/New-HostedContentFilterRule.md

@@ -196,7 +196,7 @@ Accept wildcard characters: False
 ### -Name
 The Name parameter specifies a unique name for the content filter rule. If the value contains spaces, enclose the value in quotation marks (").
 
-The value itself can't contain the following characters: \\, %, &, \*, +, /, =, ?, {, }, \|, \<, \>, (, ), ;, :, [, ], comma (,), or double-quotation mark (").
+The value itself can't contain the following characters: \\, %, &, \*, +, /, =, ?, {, }, \|, \<, \>, (, ), ;, :, [, ], comma (,), or double quotation mark (").
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/antispam-antimalware/Set-HostedContentFilterRule.md

@@ -190,87 +190,19 @@ Accept wildcard characters: False
 ```
 
 ### -Filter
-The Filter parameter uses OPATH filter syntax to filter the results by the specified properties and values. The search criteria uses the syntax {\<Property\> -\<Comparison operator\> '\<Value\>'}.
+The Filter parameter uses OPath syntax to filter the results by the specified properties and values. The search criteria uses the syntax `"Property -ComparisonOperator 'Value'"`.
 
-- \<Property\> is a filterable property.
+- Enclose the whole OPath filter in double quotation marks " ". Braces { } will also work, but only if the filter doesn't contain variables.
 
-- -\<Comparison Operator\> 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://go.microsoft.com/fwlink/p/?LinkId=620712).
+- Property is a filterable property.
 
-- \<Value\> is the property value. Text values with or without spaces need to be enclosed in quotation marks ('\<Value\>'). Don't use quotation marks with integers or the system values $true, $false, or $null.
+- 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://go.microsoft.com/fwlink/p/?LinkId=620712).
 
-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\>}.
+- Value is the property value. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). Don't use quotation marks with integers or the system values $true, $false, or $null. You need to escape any variables with values that contain single quotation marks. For example, instead of `"Property -eq '$x'"`, use `"Property -eq '$($x -Replace "'","''")'"`.
 
-You can filter by the following properties:
+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"`.
 
-- ActiveSyncAllowedDeviceIDs
-
-- ActiveSyncBlockedDeviceIDs
-
-- ActiveSyncDebugLogging
-
-- ActiveSyncEnabled
-
-- ActiveSyncMailboxPolicy
-
-- ActiveSyncSuppressReadReceipt
-
-- DisplayName
-
-- DistinguishedName
-
-- ECPEnabled
-
-- EmailAddresses
-
-- EwsApplicationAccessPolicy
-
-- EwsEnabled
-
-- ExchangeVersion
-
-- Guid
-
-- HasActiveSyncDevicePartnership
-
-- Id
-
-- ImapEnabled
-
-- LegacyExchangeDN
-
-- MAPIEnabled
-
-- Name
-
-- ObjectCategory
-
-- ObjectClass
-
-- OWAEnabled
-
-- OWAforDevicesEnabled
-
-- OwaMailboxPolicy
-
-- PopEnabled
-
-- PrimarySmtpAddress
-
-- SamAccountName
-
-- ServerLegacyDN
-
-- ServerName
-
-- WhenChanged
-
-- WhenChangedUTC
-
-- WhenCreated
-
-- WhenCreatedUTC
-
-For more information, see [Filterable properties for the Filter parameter](https://docs.microsoft.com/powershell/exchange/exchange-server/recipient-filters/filter-properties).
+For more information about the filterable properties, see [Filterable properties for the Filter parameter](https://docs.microsoft.com/powershell/exchange/exchange-server/recipient-filters/filter-properties).
 
 ```yaml
 Type: String
@@ -360,7 +292,7 @@ Accept wildcard characters: False
 ```
 
 ### -OrganizationalUnit
-The OrganizationalUnit parameter filters the results based on the object's location in Active Directory. Only objects that exist in the specified location are returned. Valid input for this parameter is an organizational unit (OU) or domain that's visible using the Get-OrganizationalUnit cmdlet. You can use any value that uniquely identifies the OU or domain. For example:
+The OrganizationalUnit parameter filters the results based on the object's location in Active Directory. Only objects that exist in the specified location are returned. Valid input for this parameter is an organizational unit (OU) or domain that's returned by the Get-OrganizationalUnit cmdlet. You can use any value that uniquely identifies the OU or domain. For example:
 
 - Name
 

exchange/exchange-ps/exchange/client-access/Get-CASMailbox.md

@@ -93,9 +93,17 @@ Accept wildcard characters: False
 ```
 
 ### -Filter
-The Filter parameter indicates the OPath filter used to filter recipients.
+The Filter parameter uses OPath syntax to filter the results by the specified properties and values. The search criteria uses the syntax `"Property -ComparisonOperator 'Value'"`.
 
-For more information about the filterable properties, see [Filterable properties for the Filter parameter](https://docs.microsoft.com/powershell/exchange/exchange-server/recipient-filters/filter-properties).
+- Enclose the whole OPath filter in double quotation marks " ". Braces { } will also work, but only if the filter doesn't contain variables.
+
+- Property is a filterable property.
+
+- 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://go.microsoft.com/fwlink/p/?LinkId=620712).
+
+- Value is the property value. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). Don't use quotation marks with integers or the system values $true, $false, or $null. You need to escape any variables with values that contain single quotation marks. For example, instead of `"Property -eq '$x'"`, use `"Property -eq '$($x -Replace "'","''")'"`.
+
+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"`.
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/client-access/Get-CASMailboxPlan.md

@@ -435,7 +435,19 @@ Accept wildcard characters: True
 ### -UserRecipientFilter
 This parameter is available only in the cloud-based service.
 
-The UserRecipientFilter parameter specifies a condition for the client access rule that uses OPath filter syntax to identify the user. For example, {City -eq "Redmond"}. The filterable attributes that you can use with this parameter are:
+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'"`).
+
+- Enclose the whole OPath filter in double quotation marks " ". Braces { } will also work, but only if the filter doesn't contain variables.
+
+- Property is a filterable property.
+
+- 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://go.microsoft.com/fwlink/p/?LinkId=620712).
+
+- Value is the property value. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). Don't use quotation marks with integers or the system values $true, $false, or $null. You need to escape any variables with values that contain single quotation marks. For example, instead of `"Property -eq '$x'"`, use `"Property -eq '$($x -Replace "'","''")'"`.
+
+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"`.
+
+The filterable attributes that you can use with this parameter are:
 
 - City
 

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

@@ -458,7 +458,17 @@ Accept wildcard characters: False
 ### -UserRecipientFilter
 This parameter is available only in the cloud-based service.
 
-The UserRecipientFilter parameter specifies a condition for the client access rule that uses OPath filter syntax to identify the user. For example, {City -eq "Redmond"}. The filterable attributes that you can use with this parameter are:
+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'"`).
+
+- Enclose the whole OPath filter in double quotation marks " ". Braces { } will also work, but only if the filter doesn't contain variables.
+
+- Property is a filterable property.
+
+- 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://go.microsoft.com/fwlink/p/?LinkId=620712).
+
+- Value is the property value. Enclose text values and variables in single quotation marks (`'Value'` or `'$Variable'`). Don't use quotation marks with integers or the system values $true, $false, or $null. You need to escape any variables with values that contain single quotation marks. For example, instead of `"Property -eq '$x'"`, use `"Property -eq '$($x -Replace "'","''")'"`.
+
+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"`.
 
 - City