Merge pull request MicrosoftDocs#4973 from MicrosoftDocs/chrisda

Chrisda to Master

Author: chrisda

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Disable-HostedContentFilterRule cmdlet to disable content filter rules in your cloud-based organization.
+Use the Disable-HostedContentFilterRule cmdlet to disable spam filter rules (content filter rules) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -35,12 +35,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Disable-HostedContentFilterRule "Contoso Recipients"
 ```
 
-This example disables the enabled content filter rule named Contoso Recipients.
+This example disables the enabled spam filter rule named Contoso Recipients.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the content filter rule that you want to disable. You can use any value that uniquely identifies the rule. For example:
+The Identity parameter specifies the spam filter rule that you want to disable. You can use any value that uniquely identifies the rule. For example:
 
 - Name
 

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Enable-HostedContentFilterRule cmdlet to enable content filter rules in your cloud-based organization.
+Use the Enable-HostedContentFilterRule cmdlet to enable spam filter rules (content filter rules) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -35,12 +35,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Enable-HostedContentFilterRule "Contoso Recipients"
 ```
 
-This example enables the disabled content filter rule named Contoso Recipients.
+This example enables the disabled spam filter rule named Contoso Recipients.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the content filter rule that you want to enable. You can use any value that uniquely identifies the rule. For example:
+The Identity parameter specifies the spam filter rule that you want to enable. You can use any value that uniquely identifies the rule. For example:
 
 - Name
 

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Get-HostedContentFilterPolicy cmdlet to view the settings of content filter policies in your cloud-based organization.
+Use the Get-HostedContentFilterPolicy cmdlet to view the settings of spam filter policies (content filter policies) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -35,19 +35,25 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-HostedContentFilterPolicy
 ```
 
-This example shows a summary list of all the content filter policies in your cloud-based organization.
+This example shows a summary list of all the spam filter policies in your cloud-based organization.
 
 ### Example 2
 ```powershell
 Get-HostedContentFilterPolicy Default | Format-List
 ```
 
-This example retrieves details about the content filter policy named Default.
+This example retrieves details about the spam filter policy named Default.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the content filter policy that you want to view. You can use any value that uniquely identifies the policy. For example, you can use the name, GUID or distinguished name (DN) of the content filter policy.
+The Identity parameter specifies the spam filter policy that you want to view. You can use any value that uniquely identifies the policy. For example:
+
+- Name
+
+- Distinguished name (DN)
+
+- GUID
 
 ```yaml
 Type: HostedContentFilterPolicyIdParameter

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Get-HostedContentFilterRule cmdlet to view content filter rules in your cloud-based organization.
+Use the Get-HostedContentFilterRule cmdlet to view spam filter rules (content filter rules) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -35,19 +35,19 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-HostedContentFilterRule
 ```
 
-This example shows a summary list of all the content filter rules in your cloud-based organization.
+This example shows a summary list of all the spam filter rules in your cloud-based organization.
 
 ### Example 2
 ```powershell
 Get-HostedContentFilterRule "Contoso Recipients" | Format-List
 ```
 
-This example retrieves details about the content filter rule named Contoso Recipients.
+This example retrieves details about the spam filter rule named Contoso Recipients.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the content filter rule that you want to view. You can use any value that uniquely identifies the rule. For example:
+The Identity parameter specifies the spam filter rule that you want to view. You can use any value that uniquely identifies the rule. For example:
 
 - Name
 

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the New-HostedContentFilterPolicy cmdlet to create content filter policies in your cloud-based organization.
+Use the New-HostedContentFilterPolicy cmdlet to create spam filter policies (content filter policies) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -85,10 +85,10 @@ For more information about the limits for allowed and blocked senders, see [Exch
 
 ### Example 1
 ```powershell
-New-HostedContentFilterPolicy -Name "Contoso Content Filter Policy" -HighConfidenceSpamAction Redirect -SpamAction Redirect -RedirectToRecipients [email protected] -FalsePositiveAdditionalRecipients [email protected]
+New-HostedContentFilterPolicy -Name "Contoso Spam Filter Policy" -HighConfidenceSpamAction Redirect -SpamAction Redirect -RedirectToRecipients [email protected] -FalsePositiveAdditionalRecipients [email protected]
 ```
 
-This example creates a content filter policy named Contoso Content Filter Policy with the following settings:
+This example creates a spam filter policy named Contoso Spam Filter Policy with the following settings:
 
 - Redirect messages that are definitely spam or that may be spam to [email protected].
 
@@ -97,7 +97,7 @@ This example creates a content filter policy named Contoso Content Filter Policy
 ## PARAMETERS
 
 ### -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 Name parameter specifies a unique name for the spam 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 (").
 
@@ -115,7 +115,7 @@ Accept wildcard characters: False
 ```
 
 ### -AddXHeaderValue
-The AddXHeaderValue parameter specifies the X-header value to add to spam messages when an action parameter is set to the value AddXHeader. The action parameters that use the value of this parameter are:
+The AddXHeaderValue parameter specifies the X-header value to add to spam messages when an action parameter is set to the value AddXHeader. The action parameters that use the this parameter are:
 
 - BulkSpamAction
 
@@ -127,9 +127,9 @@ The AddXHeaderValue parameter specifies the X-header value to add to spam messag
 
 The value that you specify for this parameter must contain less than 256 characters, and can't contain spaces.
 
-Note that when the TestModeAction parameter is set to AddXHeader, the following X-header value is automatically added to the message: X-CustomSpam: This message was filtered by the custom spam filter option.
+Note that when the TestModeAction parameter is set to AddXHeader, the following X-header value is automatically added to the message: `X-CustomSpam: This message was filtered by the custom spam filter option`.
 
-An X-header is a user-defined, unofficial header field that exists in the message header. X-headers aren't specifically mentioned in RFC 2822, but the use of an undefined header field starting with X- has become an accepted way to add unofficial header fields to a message. The value you specify must contain less than 256 characters, and it can't contain spaces.
+An X-header is a user-defined, unofficial header field that exists in the message header. X-headers aren't specifically mentioned in RFC 2822, but the use of an undefined header field starting with `X-` has become an accepted way to add unofficial header fields to a message.
 
 ```yaml
 Type: String
@@ -261,7 +261,7 @@ Accept wildcard characters: False
 ```
 
 ### -BulkThreshold
-The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/microsoft-365/security/office-365-security/configure-your-spam-filter-policies).
+The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Bulk Compliant Level values](https://docs.microsoft.com/microsoft-365/security/office-365-security/bulk-complaint-level-values).
 
 ```yaml
 Type: Int32

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the New-HostedContentFilterRule cmdlet to create content filter rules in your cloud-based organization.
+Use the New-HostedContentFilterRule cmdlet to create spam filter rules (content filter rules) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -43,19 +43,19 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### Example 1
 ```powershell
-New-HostedContentFilterRule -Name "Contoso Recipients" -HostedContentFilterPolicy "Contoso Content Filter Policy" -RecipientDomainIs contoso.com
+New-HostedContentFilterRule -Name "Contoso Recipients" -HostedContentFilterPolicy "Contoso Spam Filter Policy" -RecipientDomainIs contoso.com
 ```
 
-This example creates a new content filter rule named Contoso Recipients with the following settings: If the recipient is in the domain contoso.com, apply the content filter policy named Contoso Content Filter Policy.
+This example creates a new spam filter rule named Contoso Recipients with the following settings: If the recipient is in the domain contoso.com, apply the spam filter policy named Contoso Spam Filter Policy.
 
 ## PARAMETERS
 
 ### -HostedContentFilterPolicy
-The HostedContentFilterPolicy parameter specifies the content filter policy to apply to messages that match the conditions defined by this content filter rule.
+The HostedContentFilterPolicy parameter specifies the spam filter policy to apply to messages that match the conditions defined by this spam filter rule.
 
-You can use any value that uniquely identifies the policy. For example, you can specify the name, GUID, or distinguished name (DN) of the content filter policy.
+You can use any value that uniquely identifies the policy. For example, you can specify the name, GUID, or distinguished name (DN) of the spam filter policy.
 
-You can't specify the default content filter policy. And, you can't specify a content filter policy that's already associated with another content filter rule.
+You can't specify the default spam filter policy. And, you can't specify a spam filter policy that's already associated with another spam filter rule.
 
 ```yaml
 Type: HostedContentFilterPolicyIdParameter
@@ -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 Name parameter specifies a unique name for the spam filter rule. The maximum length is 64 characters. 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 (").
 

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Remove-HostedContentFilterPolicy cmdlet to remove content filter policies from your cloud-based organization.
+Use the Remove-HostedContentFilterPolicy cmdlet to remove spam filter policies (content filter policies) from your cloud-based organization.
 
 When a policy is removed and there are rules associated with it, the rules are not removed when the policy is removed. This is by design. If you want to remove the associated rules, you need to do this separately via the Remove-HostedContentFilterRule cmdlet.
 
@@ -38,12 +38,18 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Remove-HostedContentFilterPolicy "Contoso Content Filter Policy"
 ```
 
-This example removes the content filter policy named Contoso Content Filter Policy.
+This example removes the spam filter policy named Contoso Content Filter Policy.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the content filter policy you want to remove. You can use any value that uniquely identifies the policy, For example, you can use the name, GUID or distinguished name (DN) of the content filter policy.
+The Identity parameter specifies the spam filter policy that you want to remove. You can use any value that uniquely identifies the policy. For example:
+
+- Name
+
+- Distinguished name (DN)
+
+- GUID
 
 ```yaml
 Type: HostedContentFilterPolicyIdParameter

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

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Remove-HostedContentFilterRule cmdlet to remove content filter rules in your cloud-based organization.
+Use the Remove-HostedContentFilterRule cmdlet to remove spam filter rules (content filter rules) in your cloud-based organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
 
@@ -35,12 +35,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Remove-Rule "Contoso Recipients"
 ```
 
-This example removes the content filter rule named Contoso Recipients.
+This example removes the spam filter rule named Contoso Recipients.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the content filter rule that you want to rule. You can use any value that uniquely identifies the rule. For example:
+The Identity parameter specifies the spam filter rule that you want to remove. You can use any value that uniquely identifies the rule. For example:
 
 - Name