Merge branch 'master' into Labels-chrisda

Author: chrisda

exchange/docs-conceptual/filter-properties.md

@@ -234,7 +234,7 @@ The properties that have been _confirmed_ to work with the _Filter_ parameter in
 |_PostalCode_|_postalCode_|**Get-Contact** <br/> **Get-LinkedUser** <br/> **Get-Recipient** <br/> **Get-User**|String (wildcards accepted) or `$null`|For example, `Get-Recipient -Filter "PostalCode -eq 90210"`.|
 |_PostOfficeBox_|_postOfficeBox_|**Get-Contact** <br/> **Get-LinkedUser** <br/> **Get-User**|String (wildcards accepted) or `$null`|For example, `Get-User -Filter "PostOfficeBox -like '*555*'"`.|
 |_PreviousRecipientTypeDetails_|_msExchPreviousRecipientTypeDetails_|**Get-LinkedUser** <br/> **Get-User**|String or `$null`|For valid values, see the description of the _RecipientTypeDetails_ parameter in[Get-Recipient](../exchange-ps/exchange/get-recipient.md). <br/> For example, `Get-User -Filter 'PreviousRecipientTypeDetails -ne $null'`.|
-|_PrimarySmtpAddress_|n/a|**Get-CASMailbox** <br/> **Get-DistributionGroup** <br/> **Get-DynamicDistributionGroup** <br/> **Get-Mailbox** <br/> **Get-MailContact** <br/> **Get-MailPublicFolder** <br/> **Get-MailUser** <br/> **Get-Recipient** <br/> **Get-RemoteMailbox** <br/> **Get-UMMailbox** <br/> **Get-UnifiedGroup**|String (wildcards accepted)|For example, `Get-Recipient -Filter "PrimarySMTPAddress -like 'vasil*'"`.|
+|_PrimarySmtpAddress_|n/a|**Get-CASMailbox** <br/> **Get-DistributionGroup** <br/> **Get-DynamicDistributionGroup** <br/> **Get-Mailbox** <br/> **Get-MailContact** <br/> **Get-MailPublicFolder** <br/> **Get-MailUser** <br/> **Get-Recipient** <br/> **Get-RemoteMailbox** <br/> **Get-UMMailbox** <br/> **Get-UnifiedGroup**|String (wildcards accepted)|Don't use the _PrimarySmtpAddress_ property; use the _EmailAddresses_ property instead. Any filter that uses the _PrimarySmtpAddress_ property will also search values in the _EmailAddresses_ property. For example, if a mailbox has the primary email address [email protected], and the additional proxy addresses [email protected] and [email protected], all of the following filters will return that mailbox in the result: `"PrimarySmtpAddress -eq '[email protected]'"`, `"PrimarySmtpAddress -eq '[email protected]'"`, or `"PrimarySmtpAddress -eq '[email protected]'"`.|
 |_ProhibitSendQuota_|_mDBOverQuotaLimit_|**Get-Mailbox** <br/> **Get-MailUser** <br/> **Get-RemoteMailbox**|A byte quantified size value (for example, `300MB` or `1.5GB`), or `Unlimited`. Unqualified values are treated as bytes.|You can only use the _Filter_ parameter to look for the value `Unlimited` for this property. For example, `Get-Mailbox -Filter "ProhibitSendQuota -eq 'Unlimited'"` or `Get-Mailbox -Filter "ProhibitSendQuota -ne 'Unlimited'"`. <br/> You can't use the _Filter_ parameter to look for size values of this property. Instead, use this syntax: `Get-Mailbox | where "$_.ProhibitSendQuota -<Operator> '<Size>'"`. For example, `Get-Mailbox | where "$_.ProhibitSendQuota -lt '70GB'"`.|
 |_ProhibitSendReceiveQuota_|_mDBOverHardQuotaLimit_|**Get-Mailbox** <br/> **Get-MailUser** <br/> **Get-RemoteMailbox**|A byte quantified size value (for example, `300MB` or `1.5GB`), or `Unlimited`. Unqualified values are treated as bytes.|You can only use the _Filter_ parameter to look for the value `Unlimited` for this property. For example, `Get-Mailbox -Filter "ProhibitSendReceiveQuota -eq 'Unlimited'"` or `Get-Mailbox -Filter "ProhibitSendReceiveQuota -ne 'Unlimited'"`. <br/> You can't use the _Filter_ parameter to look for size values of this property. Instead, use this syntax: `Get-Mailbox | where "$_.ProhibitSendReceiveQuota -<Operator> '<Size>'"`. For example, `Get-Mailbox | where "$_.ProhibitSendReceiveQuota -lt '70GB'"`.|
 |_ProtocolSettings_|_protocolSettings_|**Get-Mailbox** <br/> **Get-MailUser** <br/> **Get-RemoteMailbox**|String (wildcards accepted) or `$null`|The default value of this property on mailboxes is `RemotePowerShell§1`. This property is populated with additional values when you use Set-CASMailbox to disable protocols (for example, POP3 or IMAP4). <br/> For example, `Get-Mailbox -Filter "ProtocolSettings -like '*POP3*'"`.|

exchange/docs-conceptual/recipientfilter-properties.md

@@ -222,7 +222,7 @@ The recipient properties that have been *confirmed* to work with the _RecipientF
 |_PostOfficeBox_|_postOfficeBox_|String (wildcards accepted).||
 |_PreviousRecipientTypeDetails_|_msExchPreviousRecipientTypeDetails_|For valid values, see the description of the _RecipientTypeDetails_ parameter in [Get-Recipient](../exchange-ps/exchange/get-recipient.md).||
 |_PrimaryGroupId_|_primaryGroupId_|Integer|For ___domain users, the value of this property is typically 513, which corresponds to the Domain Users group.|
-|_PrimarySmtpAddress_|n/a|String (wildcards accepted).||
+|_PrimarySmtpAddress_|n/a|String (wildcards accepted).|Don't use the _PrimarySmtpAddress_ property; use the _EmailAddresses_ property instead. Any filter that uses the _PrimarySmtpAddress_ property will also search values in the _EmailAddresses_ property. For example, if a mailbox has the primary email address [email protected], and the additional proxy addresses [email protected] and [email protected], all of the following filters will return that mailbox in the result: `"PrimarySmtpAddress -eq '[email protected]'"`, `"PrimarySmtpAddress -eq '[email protected]'"`, or `"PrimarySmtpAddress -eq '[email protected]'"`.|
 |_ProhibitSendQuota_|_mDBOverQuotaLimit_|Dynamic distribution groups: A byte quantified size value (for example, `50MB` or `1.5GB`). Unqualified values are treated as bytes. <br/> Others: Blank or non-blank.||
 |_ProhibitSendReceiveQuota_|_mDBOverHardQuotaLimit_|Dynamic distribution groups: A byte quantified size value (for example, `50MB` or `1.5GB`). Unqualified values are treated as bytes. <br/> Others: Blank or non-blank.||
 |_ProtocolSettings_|_protocolSettings_|String (wildcards accepted).||