Updates to HostedContentFilterPolicy cmdlet topics

Revied and edited weird/non-functional PR #4074

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

@@ -62,10 +62,12 @@ New-HostedContentFilterPolicy [-Name] <String>
  [-MarkAsSpamWebBugsInHtml <Off | On | Test>]
  [-ModifySubjectValue <String>]
  [-PhishSpamAction <MoveToJmf | AddXHeader | ModifySubject | Redirect | Delete | Quarantine | NoAction>]
+ [-PhishZapEnabled <$true | $false>
  [-QuarantineRetentionPeriod <Int32>]
  [-RedirectToRecipients <MultiValuedProperty>]
  [-RegionBlockList <MultiValuedProperty>]
  [-SpamAction <MoveToJmf | AddXHeader | ModifySubject | Redirect | Delete | Quarantine | NoAction>]
+ [-SpamZapEnabled <$true | $false>]
  [-TestModeAction <None | AddXHeader | BccMessage>]
  [-TestModeBccToRecipients <MultiValuedProperty>]
  [-WhatIf]
@@ -796,6 +798,27 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PhishZapEnabled
+The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
+
+- $true: Phish ZAP is enabled. Phish messages that are detected in the user's Inbox (regardless of read or unread status) are automatically moved to the Junk Email folder. This is the default value.
+
+- $false: Phish ZAP is disabled.
+
+**Note**: The ZapEnabled parameter that controls both phish ZAP and spam ZAP will be deprecated in a future release. During the transition, both parameters will be available. If you have scripts that use the ZapEnabled parameter for phish, we recommend updating them to use this parameter instead. By default, the value for this parameter is inherited from the ZapEnabled parameter. After you configure phish ZAP in the admin center or by using this parameter, the value of the ZapEnabled parameter for phish ZAP is ignored.
+
+```yaml
+Type: $true | $false
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -QuarantineRetentionPeriod
 The QuarantineRetentionPeriod parameter specifies the length of time in days that spam messages remain in the quarantine. Valid input for this parameter is an integer between 1 and 15. The default value is 15.
 
@@ -872,6 +895,27 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -SpamZapEnabled
+The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
+
+- $true: Spam ZAP is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
+
+- $false: Spam ZAP is disabled.
+
+**Note**: The ZapEnabled parameter that controls both phish ZAP and spam ZAP will be deprecated in a future release. During the transition, both parameters will be available. If you have scripts that use the ZapEnabled parameter for spam, we recommend updating them to use this parameter instead. By default, the value for this parameter is inherited from the ZapEnabled parameter. After you configure spam ZAP in the admin center or by using this parameter, the value of the ZapEnabled parameter for spam ZAP is ignored.
+
+```yaml
+Type: $true | $false
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -TestModeAction
 The TestModeAction parameter specifies the additional action to take on messages that match any of the IncreaseScoreWith or MarkAsSpam parameters that are set to the value Test. Valid values are:
 
@@ -926,21 +970,13 @@ Accept wildcard characters: False
 ```
 
 ### -ZapEnabled
-The ZapEnabled parameter specifies whether to enable zero-hour auto purge (ZAP) for spam. ZAP detects unread spam messages that have already been delivered to the user's Inbox. Valid values are:
-
-- $true: ZAP for spam is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
-
-- $false: ZAP for spam is disabled.
-
-Note: ZAP for spam requires that the following action parameters are set to the value MoveToJmf:
+The ZapEnabled parameter specifies whether to enable zero-hour auto purge (ZAP) for phish and spam. Valid values are:
 
-- BulkSpamAction
+- $true: ZAP for phish and spam is enabled. Unread spam messages or phish messages (regardless of read or unread status) that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
 
-- HighConfidenceSpamAction
+- $false: ZAP for phish and spam is disabled.
 
-- PhishSpamAction
-
-- SpamAction
+**Note**: This parameter will be deprecated in a future release. During the transition, this parameter and the PhishZapEnabled and SpamZapEnabled parameters will be available. If you have scripts that use this parameter, we recommend updating them to use the PhishZapEnabled and SpamZapEnabled parameters instead. By default, the value for the PhishZapEnabled and SpamZapEnabled parameters is inherited from this parameter. After you configure phish ZAP or spam ZAP in the admin center or by using the PhishZapEnabled and SpamZapEnabled parameters, the value of this parameter is ignored.
 
 ```yaml
 Type: $true | $false

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

@@ -63,10 +63,12 @@ Set-HostedContentFilterPolicy [-Identity] <HostedContentFilterPolicyIdParameter>
  [-MarkAsSpamWebBugsInHtml <Off | On | Test>]
  [-ModifySubjectValue <String>]
  [-PhishSpamAction <MoveToJmf | AddXHeader | ModifySubject | Redirect | Delete | Quarantine | NoAction>]
+ [-PhishZapEnabled <$true | $false>
  [-QuarantineRetentionPeriod <Int32>]
  [-RedirectToRecipients <MultiValuedProperty>]
  [-RegionBlockList <MultiValuedProperty>]
  [-SpamAction <MoveToJmf | AddXHeader | ModifySubject | Redirect | Delete | Quarantine | NoAction>]
+ [-SpamZapEnabled <$true | $false>]
  [-TestModeAction <None | AddXHeader | BccMessage>]
  [-TestModeBccToRecipients <MultiValuedProperty>]
  [-WhatIf]
@@ -818,6 +820,27 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PhishZapEnabled
+The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
+
+- $true: Phish ZAP is enabled. Phish messages that are detected in the user's Inbox (regardless of read or unread status) are automatically moved to the Junk Email folder. This is the default value.
+
+- $false: Phish ZAP is disabled.
+
+**Note**: The ZapEnabled parameter that controls both phish ZAP and spam ZAP will be deprecated in a future release. During the transition, both parameters will be available. If you have scripts that use the ZapEnabled parameter for phish, we recommend updating them to use this parameter instead. By default, the value for this parameter is inherited from the ZapEnabled parameter. After you configure phish ZAP in the admin center or by using this parameter, the value of the ZapEnabled parameter for phish ZAP is ignored.
+
+```yaml
+Type: $true | $false
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -QuarantineRetentionPeriod
 The QuarantineRetentionPeriod parameter specifies the length of time in days that spam messages remain in the quarantine. Valid input for this parameter is an integer between 1 and 15. The default value is 15.
 
@@ -902,6 +925,28 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -SpamZapEnabled
+The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
+
+- $true: Spam ZAP is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
+
+- $false: Spam ZAP is disabled.
+
+**Note**: The ZapEnabled parameter that controls both phish ZAP and spam ZAP will be deprecated in a future release. During the transition, both parameters will be available. If you have scripts that use the ZapEnabled parameter for spam, we recommend updating them to use this parameter instead. By default, the value for this parameter is inherited from the ZapEnabled parameter. After you configure spam ZAP in the admin center or by using this parameter, the value of the ZapEnabled parameter for spam ZAP is ignored.
+
+```yaml
+Type: $true | $false
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+
 ### -TestModeAction
 The TestModeAction parameter specifies the additional action to take on messages when the IncreaseScoreWith or MarkAsSpam parameters that are set to the value Test. Valid values are:
 
@@ -956,11 +1001,13 @@ Accept wildcard characters: False
 ```
 
 ### -ZapEnabled
-The ZapEnabled parameter specifies whether to enable zero-hour auto purge (ZAP). ZAP detects unread messages that have already been delivered to the user's Inbox. Valid values are:
+The ZapEnabled parameter specifies whether to enable zero-hour auto purge (ZAP) for phish and spam. Valid values are:
+
+- $true: ZAP for phish and spam is enabled. Unread spam messages or phish messages (regardless of read or unread status) that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
 
-- $true: ZAP is enabled. Unread messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
+- $false: ZAP for phish and spam is disabled.
 
-- $false: ZAP is disabled.
+**Note**: This parameter will be deprecated in a future release. During the transition, this parameter and the PhishZapEnabled and SpamZapEnabled parameters will be available. If you have scripts that use this parameter, we recommend updating them to use the PhishZapEnabled and SpamZapEnabled parameters instead. By default, the value for the PhishZapEnabled and SpamZapEnabled parameters is inherited from this parameter. After you configure phish ZAP or spam ZAP in the admin center or by using the PhishZapEnabled and SpamZapEnabled parameters, the value of this parameter is ignored.
 
 ```yaml
 Type: $true | $false