Merge branch 'master' into emergencydisclaimer2

Author: tiburd

exchange/exchange-ps/exchange/Get-QuarantinePolicy.md

@@ -0,0 +1,114 @@
+---
+external help file: Microsoft.Exchange.TransportMailflow-Help.xml
+online version: https://docs.microsoft.com/powershell/module/exchange/get-quarantinepolicy
+applicable: Exchange Online, Exchange Online Protection
+title: Get-QuarantinePolicy
+schema: 2.0.0
+author: chrisda
+ms.author: chrisda
+ms.reviewer:
+---
+
+# Get-QuarantinePolicy
+
+## SYNOPSIS
+This cmdlet is available only in the cloud-based service.
+
+Use the Get-QuarantinePolicy cmdlet to view quarantine policies in your cloud-based organization.
+
+**Note**: We recommend that you use the Exchange Online PowerShell V2 module to connect to Exchange Online PowerShell. For instructions, see [Connect to Exchange Online PowerShell](https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell).
+
+For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
+
+## SYNTAX
+
+```
+Get-QuarantinePolicy [[-Identity] <QuarantineTagIdParameter>]
+ [-QuarantinePolicyType <QuarantinePolicyTypeEnum>]
+ [<CommonParameters>]
+```
+
+## DESCRIPTION
+Quarantine policies define what users are allowed to do to quarantined messages based on why the message was quarantined (for supported features). For more information, see [Quarantine policies](https://docs.microsoft.com/microsoft-365/security/office-365-security/quarantine-policies).
+
+You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
+
+## EXAMPLES
+
+### Example 1
+```powershell
+Get-QuarantinePolicy | Format-Table Name
+```
+
+This example returns as summary list of all quarantine policies.
+
+### Example 2
+```powershell
+Get-QuarantinePolicy -Identity NoAccess
+```
+
+This example returns detailed information about the quarantine policy named NoAccess.
+
+### Example 3
+```powershell
+Get-QuarantinePolicy -QuarantinePolicyType GlobalQuarantinePolicy
+```
+
+This example returns detailed information about the default quarantine policy named GlobalDefaultTag that controls the global quarantine notification (formerly known as end-user spam notification) settings.
+
+## PARAMETERS
+
+### -Identity
+The Identity parameter specifies the quarantine policy you want to view. You can use any value that uniquely identifies the quarantine policy. For example:
+
+- Name
+- Distinguished name (DN)
+- GUID
+
+```yaml
+Type: QuarantineTagIdParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: True (ByPropertyName, ByValue)
+Accept wildcard characters: False
+```
+
+### -QuarantinePolicyType
+The QuarantinePolicyType parameter filters the results by the specified quarantine policy type. Valid values are:
+
+- QuarantinePolicy: This is the default value, and returns built-in and custom quarantine policies.
+- GlobalQuarantinePolicy: This value is required to return the global settings (quarantine notification settings) in the quarantine policy named GlobalDefaultTag.
+
+```yaml
+Type: QuarantinePolicyTypeEnum
+Parameter Sets: (All)
+Aliases:
+Accepted values: QuarantinePolicy, GlobalQuarantinePolicy
+Applicable: Exchange Online, Exchange Online Protection
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
+
+## INPUTS
+
+###  
+
+## OUTPUTS
+
+###  
+
+## NOTES
+
+## RELATED LINKS

exchange/exchange-ps/exchange/New-HostedContentFilterPolicy.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.