Merge branch 'master' into patch-19

Author: chrisda

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

@@ -21,7 +21,34 @@ For information about the parameter sets in the Syntax section below, see Exchan
 ## SYNTAX
 
 ```
-New-AntiPhishPolicy -Name <String> [-AdminDisplayName <String>] [-AuthenticationFailAction <MoveToJmf | Quarantine>] [-Confirm] [-EnableAntispoofEnforcement <$true | $false>] [-EnableAuthenticationSafetyTip <$true | $false>] [-EnableAuthenticationSoftPassSafetyTip <$true | $false>] [-Enabled <$true | $false>] [-EnableMailboxIntelligence <$true | $false>] [-EnableOrganizationDomainsProtection <$true | $false>] [-EnableSimilarDomainsSafetyTips <$true | $false>] [-EnableSimilarUsersSafetyTips <$true | $false>] [-EnableTargetedDomainsProtection <$true | $false>] [-EnableTargetedUserProtection <$true | $false>] [-EnableUnusualCharactersSafetyTips <$true | $false>] [-ExcludedDomains <MultiValuedProperty>] [-ExcludedSenders <MultiValuedProperty>] [-PhishThresholdLevel <Int32>] [-TargetedDomainActionRecipients <MultiValuedProperty>] [-TargetedDomainProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>] [-TargetedDomainsToProtect <MultiValuedProperty>] [-TargetedUserActionRecipients <MultiValuedProperty>] [-TargetedUserProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>] [-TargetedUsersToProtect <MultiValuedProperty>] [-TreatSoftPassAsAuthenticated <$true | $false>] [-WhatIf] [<CommonParameters>]
+New-AntiPhishPolicy -Name <String>
+ [-AdminDisplayName <String>]
+ [-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>]
+ [-EnableTargetedDomainsProtection <$true | $false>]
+ [-EnableTargetedUserProtection <$true | $false>]
+ [-EnableUnauthenticatedSender <$true | $false>]
+ [-EnableUnusualCharactersSafetyTips <$true | $false>]
+ [-ExcludedDomains <MultiValuedProperty>]
+ [-ExcludedSenders <MultiValuedProperty>]
+ [-PhishThresholdLevel <Int32>]
+ [-TargetedDomainActionRecipients <MultiValuedProperty>]
+ [-TargetedDomainProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>]
+ [-TargetedDomainsToProtect <MultiValuedProperty>]
+ [-TargetedUserActionRecipients <MultiValuedProperty>]
+ [-TargetedUserProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>]
+ [-TargetedUsersToProtect <MultiValuedProperty>]
+ [-TreatSoftPassAsAuthenticated <$true | $false>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -231,6 +258,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EnableMailboxIntelligenceProtection
+The EnableMailboxIntelligenceProtection specifies whether to enable or disable intelligence based impersonation protection. Valid values are:
+
+- $true: Enable intelligence based impersonation protection.
+
+- $false: Don't enable intelligence based impersonation protection. This is the default value.
+
+```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:
 
@@ -326,6 +372,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EnableUnauthenticatedSender
+The EnableUnauthenticatedSender parameter specifies whether to apply a "?" symbol in Outlook's sender card if the sender fails authentication checks. Valid values are:
+
+- $true: Apply the "?" symbol.
+
+- $false: Do not apply the "?" symbol.
+
+```yaml
+Type: $true | $false
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+Required: False
+Position: Named
+Default value: True
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -EnableUnusualCharactersSafetyTips
 The EnableUnusualCharactersSafetyTips parameter specifies whether to enable safety tips that are shown to recipients in messages for unusual characters in domain and user impersonation detections. Valid values are:
 
@@ -375,6 +440,71 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ImpersonationProtectionState
+The ImpersonationProtectionState parameter specifies the configuration of impersonation protection. Valid values are:
+
+- Automatic
+
+- Manual (This is the default value)
+
+- Off
+
+```yaml
+Type: ImpersonationProtectionState
+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
+The MailboxIntelligenceProtectionAction parameter specifies what to do with messages that fail mailbox intelligence protection. Valid values are:
+
+- NoAction (This is the default value)
+
+- BccMessage: Add the recipients specified by the MailboxIntelligenceProtectionActionRecipients parameter to the Bcc field of the message.
+
+- Delete: Delete the message during filtering. Use caution when selecting this value, because you can't recover the deleted message.
+
+- MoveToJmf: Move the message to the user's Junk Email folder.
+
+- Quarantine: Move the message to the phishing quarantine.
+
+- Redirect: Redirect the message to the recipients specified by the MailboxIntelligenceProtectionActionRecipients parameter.
+
+```yaml
+Type: ImpersonationAction
+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
+The MailboxIntelligenceProtectionActionRecipients parameter specifies the recipients to add to detected messages when the MailboxIntelligenceProtectionAction parameter is set to the value Redirect or BccMessage.
+
+A valid value for this parameter is an email address. You can specify multiple email addresses separated by commas.
+
+```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
+```
+
 ### -PhishThresholdLevel
 The PhishThresholdLevel parameter specifies the tolerance level that's used by machine learning in the handling of phishing messages. Valid values are:
 
@@ -477,7 +607,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetedUserProtectionAction
-The TargetedUserProtectionAction parameter specifies the action to take on detected user impersonation messages for the users specified by the TargetedUsersToProtect parameter. Valid values are:
+The TargetedUserProtectionAction parameter specifies the action to take on detected messages for the users specified by the TargetedUsersToProtect parameter. Valid values are:
 
 - NoAction (This is the default value)
 

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

@@ -30,6 +30,7 @@ Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
  [-EnableAuthenticationSoftPassSafetyTip <$true | $false>]
  [-Enabled <$true | $false>]
  [-EnableMailboxIntelligence <$true | $false>]
+ [-EnableMailboxIntelligenceProtection <$true | $false>]
  [-EnableOrganizationDomainsProtection <$true | $false>]
  [-EnableSimilarDomainsSafetyTips <$true | $false>]
  [-EnableSimilarUsersSafetyTips <$true | $false>]
@@ -39,6 +40,9 @@ Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
  [-EnableUnusualCharactersSafetyTips <$true | $false>]
  [-ExcludedDomains <MultiValuedProperty>]
  [-ExcludedSenders <MultiValuedProperty>]
+ [-ImpersonationProtectionState <ImpersonationProtectionState>]
+ [-MailboxIntelligenceProtectionAction <ImpersonationAction>]
+ [-MailboxIntelligenceProtectionActionRecipients <MultiValuedProperty>]
  [-MakeDefault]
  [-PhishThresholdLevel <Int32>]
  [-TargetedDomainActionRecipients <MultiValuedProperty>]
@@ -199,8 +203,14 @@ Accept wildcard characters: False
 ```
 
 ### -Enabled
+The Enabled parameter specifies whether the antiphish policy is enabled or disabled. Valid values are:
+
+$true: The policy is enabled.
+
+$false: The policy is disabled.
+
 ```yaml
-Type:
+Type: $true | $false
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online, Exchange Online Protection
@@ -230,6 +240,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EnableMailboxIntelligenceProtection
+The EnableMailboxIntelligenceProtection specifies whether to enable or disable intelligence based impersonation protection. Valid values are:
+
+- $true: Enable intelligence based impersonation protection.
+
+- $false: Don't enable intelligence based impersonation protection. This is the default value.
+
+```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:
 
@@ -393,6 +422,71 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ImpersonationProtectionState
+The ImpersonationProtectionState parameter specifies the configuration of impersonation protection. Valid values are:
+
+- Automatic
+
+- Manual (This is the default value)
+
+- Off
+
+```yaml
+Type: ImpersonationProtectionState
+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
+The MailboxIntelligenceProtectionAction parameter specifies what to do with messages that fail mailbox intelligence protection. Valid values are:
+
+- NoAction (This is the default value)
+
+- BccMessage: Add the recipients specified by the MailboxIntelligenceProtectionActionRecipients parameter to the Bcc field of the message.
+
+- Delete: Delete the message during filtering. Use caution when selecting this value, because you can't recover the deleted message.
+
+- MoveToJmf: Move the message to the user's Junk Email folder.
+
+- Quarantine: Move the message to the phishing quarantine.
+
+- Redirect: Redirect the message to the recipients specified by the MailboxIntelligenceProtectionActionRecipients parameter.
+
+```yaml
+Type: ImpersonationAction
+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
+The MailboxIntelligenceProtectionActionRecipients parameter specifies the recipients to add to detected messages when the MailboxIntelligenceProtectionAction parameter is set to the value Redirect or BccMessage.
+
+A valid value for this parameter is an email address. You can specify multiple email addresses separated by commas.
+
+```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}}
 
@@ -493,7 +587,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetedUserActionRecipients
-The TargetedUserActionRecipients parameter specifies the replacement or additional recipients for detected user impersonation messages when the TargetedUserProtectionAction parameter is set to the value Redirect or BccMessage.
+The TargetedUserActionRecipients parameter specifies the replacement or additional recipients for detected messages when the TargetedUserProtectionAction parameter is set to the value Redirect or BccMessage.
 
 A valid value for this parameter is an email address. You can specify multiple email addresses separated by commas.