Merge pull request MicrosoftDocs#8389 from MicrosoftDocs/PhishSim-chrisda

PhishSim-chrisda to Master

Author: chrisda

exchange/exchange-ps/exchange/New-PhishSimOverrideRule.md

@@ -21,9 +21,11 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-PhishSimOverrideRule [-Name] <String> -Policy <PolicyIdParameter> -SenderDomainIs <MultiValuedProperty> -SenderIpRanges <MultiValuedProperty>
+New-PhishSimOverrideRule [-Name] <String> -Policy <PolicyIdParameter> -SenderIpRanges <MultiValuedProperty>
  [-Comment <String>]
  [-Confirm]
+ [-Domains <MultiValuedProperty>]
+ [-SenderDomainIs <MultiValuedProperty>]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -35,7 +37,7 @@ You need to be assigned permissions in the Security & Compliance Center before y
 
 ### Example 1
 ```powershell
-New-PhishSimOverrideRule -Name PhishSimOverrideRule -Policy PhishSimOverridePolicy -SenderDomainIs fabrikam.com,wingtiptoys.com -SenderIpRanges 192.168.1.55
+New-PhishSimOverrideRule -Name PhishSimOverrideRule -Policy PhishSimOverridePolicy -Domains fabrikam.com,wingtiptoys.com -SenderIpRanges 192.168.1.55
 ```
 
 This example creates a new phishing simulation override rule with the specified settings.
@@ -79,24 +81,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -SenderDomainIs
-The SenderDomainIs parameter specifies the email ___domain that's used by the third-party phishing simulation.
-
-You can specify up to 10 values separated by commas.
-
-```yaml
-Type: MultiValuedProperty
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance Center
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -SenderIpRanges
 The SenderIpRanges parameter specifies the source IP address that's used by the third-party phishing simulation. Valid values are:
 
@@ -106,6 +90,8 @@ The SenderIpRanges parameter specifies the source IP address that's used by the
 
 You can specify up to 10 entries separated by commas.
 
+A phishing simulation entry requires at least one IP address in this parameter and at least one ___domain in the Domains parameter.
+
 ```yaml
 Type: MultiValuedProperty
 Parameter Sets: (All)
@@ -154,6 +140,45 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Domains
+The Domains parameter specifies the email ___domain that's used by the third-party phishing simulation. You can use either of the following values:
+
+- The `5321.MailFrom` address (also known as the MAIL FROM address, P1 sender, or envelope sender).
+- The DKIM ___domain.
+
+You can specify up to 10 values separated by commas.
+
+A phishing simulation requires at least one ___domain from this parameter and at least one IP address in the SenderIPRanges parameter.
+
+```yaml
+Type: MultiValuedProperty
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance Center
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SenderDomainIs
+This parameter has been replaced by the Domains parameter.
+
+```yaml
+Type: MultiValuedProperty
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance Center
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 The WhatIf switch doesn't work in Security & Compliance Center PowerShell.
 

exchange/exchange-ps/exchange/Set-PhishSimOverrideRule.md

@@ -22,24 +22,28 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Set-PhishSimOverrideRule [-Identity] <ComplianceRuleIdParameter>
+ [-AddDomains <MultiValuedProperty>]
  [-AddSenderDomainIs <MultiValuedProperty>]
  [-AddSenderIpRanges <MultiValuedProperty>]
  [-Comment <String>]
  [-Confirm]
+ [-RemoveDomains <MultiValuedProperty>]
  [-RemoveSenderDomainIs <MultiValuedProperty>]
  [-RemoveSenderIpRanges <MultiValuedProperty>]
  [-WhatIf]
  [<CommonParameters>]
 ```
 
 ## DESCRIPTION
+A phishing simulation requires at least one ___domain and at least one IP address.
+
 You need to be assigned permissions in the Security & Compliance Center before you can use this cmdlet. For more information, see [Permissions in the Security & Compliance Center](https://docs.microsoft.com/microsoft-365/security/office-365-security/permissions-in-the-security-and-compliance-center).
 
 ## EXAMPLES
 
 ### Example 1
 ```powershell
-Set-PhishSimOverrideRule -Identity PhishSimOverrideRulea0eae53e-d755-4a42-9320-b9c6b55c5011 -AddSenderDomainIs blueyonderairlines.com -RemoveSenderIpRanges 192.168.1.55
+Set-PhishSimOverrideRule -Identity PhishSimOverrideRulea0eae53e-d755-4a42-9320-b9c6b55c5011 -AddDomains blueyonderairlines.com -RemoveSenderIpRanges 192.168.1.55
 ```
 
 This example modifies the phishing simulation override rule with the specified settings.
@@ -67,8 +71,8 @@ Accept pipeline input: True (ByPropertyName, ByValue)
 Accept wildcard characters: False
 ```
 
-### -AddSenderDomainIs
-The AddSenderDomainIs parameter specifies an existing entry to add to the list of email domains that are used by the third-party phishing simulation.
+### -AddDomains
+The AddDomains parameter specifies an existing entry to add to the list of email domains that are used by the third-party phishing simulation.
 
 You can specify multiple values separated by commas. A maximum of 10 entries are allowed in the list.
 
@@ -85,6 +89,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AddSenderDomainIs
+This parameter has been replaced by the AddDomains parameter.
+
+```yaml
+Type: MultiValuedProperty
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance Center
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AddSenderIpRanges
 The AddSenderIpRanges parameter specifies an existing entry to add to the list of source IP addresses that are used by the third-party phishing simulation. Valid values are:
 
@@ -144,8 +164,8 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -RemoveSenderDomainIs
-The RemoveSenderDomainIs parameter specifies an existing entry to remove from the list of email domains that are used by the third-party phishing simulation.
+### -RemoveDomains
+The RemoveDomains parameter specifies an existing entry to remove from the list of email domains that are used by the third-party phishing simulation.
 
 You can specify multiple values separated by commas.
 
@@ -162,6 +182,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -RemoveSenderDomainIs
+This parameter has been replaced by the RemoveDomains parameter.
+
+```yaml
+Type: MultiValuedProperty
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance Center
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -RemoveSenderIpRanges
 The RemoveSenderIpRanges parameter specifies an existing entry to remove from the list of source IP addresses that are used by the third-party phishing simulation. Valid values are: