Merge pull request MicrosoftDocs#2458 from MicrosoftDocs/master

Master to Live

Author: chrisda

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

@@ -20,27 +20,21 @@ For information about the parameter sets in the Syntax section below, see Exchan
 ```
 Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
  [-AdminDisplayName <Basic | High>]
- [-AntiSpoofEnforcementType <AntiSpoofEnforcementType>]
  [-AuthenticationFailAction <MoveToJmf | Quarantine>]
  [-Confirm]
  [-EnableAntispoofEnforcement <$true | $false>]
  [-EnableAuthenticationSafetyTip <$true | $false>]
  [-EnableAuthenticationSoftPassSafetyTip <$true | $false>]
  [-Enabled <$true | $false>]
  [-EnableMailboxIntelligence <$true | $false>]
- [-EnableMailboxIntelligenceProtection <$true | $false>]
  [-EnableOrganizationDomainsProtection <$true | $false>]
  [-EnableSimilarDomainsSafetyTips <$true | $false>]
  [-EnableSimilarUsersSafetyTips <$true | $false>]
- [-EnableSuspiciousSafetyTip <$true | $false>]
  [-EnableTargetedDomainsProtection <$true | $false>]
  [-EnableTargetedUserProtection <$true | $false>]
  [-EnableUnusualCharactersSafetyTips <$true | $false>]
  [-ExcludedDomains <MultiValuedProperty>]
  [-ExcludedSenders <MultiValuedProperty>]
- [-ImpersonationProtectionState <Default | Automatic | Manual | Off>]
- [-MailboxIntelligenceProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>]
- [-MailboxIntelligenceProtectionActionRecipients <MultiValuedProperty>]
  [-MakeDefault]
  [-PhishThresholdLevel <Int32>]
  [-TargetedDomainActionRecipients <MultiValuedProperty>]
@@ -103,21 +97,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -AntiSpoofEnforcementType
-{{Fill AntiSpoofEnforcementType Description}}
-
-```yaml
-Type: Basic | High
-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
-```
-
 ### -AuthenticationFailAction
 The AuthenticationFailAction parameter specifies the action to take when the message fails composite authentication. Valid values are:
 
@@ -247,21 +226,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -EnableMailboxIntelligenceProtection
-{{Fill EnableMailboxIntelligenceProtection Description}}
-
-```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
-```
-
 ### -EnableOrganizationDomainsProtection
 The EnableOrganizationDomainsProtection parameter specifies whether to enable ___domain impersonation protection for all registered domains in the Office 365 organization. Valid values are:
 
@@ -319,21 +283,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -EnableSuspiciousSafetyTip
-{{Fill EnableSuspiciousSafetyTip Description}}
-
-```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
-```
-
 ### -EnableTargetedDomainsProtection
 The EnableTargetedDomainsProtection parameter specifies whether to enable ___domain impersonation protection for a list of specified domains. Valid values are:
 
@@ -421,51 +370,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ImpersonationProtectionState
-{{Fill ImpersonationProtectionState Description}}
-
-```yaml
-Type: Default | Automatic | Manual | Off
-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
-```
-
-### -MailboxIntelligenceProtectionAction
-{{Fill MailboxIntelligenceProtectionAction Description}}
-
-```yaml
-Type: NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage
-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
-```
-
-### -MailboxIntelligenceProtectionActionRecipients
-{{Fill MailboxIntelligenceProtectionActionRecipients Description}}
-
-```yaml
-Type: MultiValuedProperty
-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
-```
-
 ### -MakeDefault
 {{Fill MakeDefault Description}}
 

exchange/exchange-ps/exchange/policy-and-compliance-content-search/New-ComplianceSearchAction.md

@@ -459,11 +459,11 @@ Accept wildcard characters: False
 ```
 
 ### -PurgeType
-The PurgeType parameter specifies how to remove items when the action is Purge.
+The PurgeType parameter specifies how to remove items when the action is Purge. Valid values are:
 
-The valid value for this parameter is SoftDelete, which means the purged items are recoverable by users until the deleted items retention period expires.
+- SoftDelete: Purged items are recoverable by users until the deleted item retention period expires.
 
-Note: To hard delete items, use the Search-Mailbox cmdlet with the DeleteContent switch. For more information, see Search for and delete messages (https://docs.microsoft.com/office365/SecurityCompliance/search-for-and-delete-messagesadmin-help).
+- HardDelete: Purged items are marked for permanent removal from the mailbox and will be permanently removed the next time the mailbox is processed by the Managed Folder Assistant. If single item recovery is enabled on the mailbox, purged items will be permanently removed after the deleted item retention period expires.
 
 ```yaml
 Type: ComplianceDestroyType