Merge branch 'master' into master

Author: tiburd

exchange/exchange-ps/exchange/New-AutoSensitivityLabelPolicy.md

@@ -14,7 +14,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in Security & Compliance Center PowerShell. For more information, see [Security & Compliance Center PowerShell](https://docs.microsoft.com/powershell/exchange/scc-powershell).
 
-Use the New-AutoSensitivityLabelPolicy cmdlet to create auto-labeling policies in your organization.
+Use the New-AutoSensitivityLabelPolicy cmdlet to create auto-labeling policies in your organization. Create auto-labeling policy rules using the New-AutoSensitivityLabelRule cmdlet and assoicate them with the policy to complete the policy creation.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 

exchange/exchange-ps/exchange/New-AutoSensitivityLabelRule.md

@@ -14,7 +14,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in Security & Compliance Center PowerShell. For more information, see [Security & Compliance Center PowerShell](https://docs.microsoft.com/powershell/exchange/scc-powershell).
 
-Use the New-AutoSensitivityLabelPolicy cmdlet to create auto-labeling policy rules in your organization.
+Use the New-AutoSensitivityLabelRule cmdlet to create auto-labeling rules and associate then with auto-labeling policies in your organization.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 

exchange/exchange-ps/exchange/New-MailboxRestoreRequest.md

@@ -222,14 +222,6 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### Example 1
 ```powershell
-Get-Mailbox -SoftDeletedMailbox "User Name" | Format-List ExchangeGUID
-New-MailboxRestoreRequest -SourceMailbox "ExchangeGUID" -TargetMailbox "User Name" -AllowLegacyDNMismatch
-```
-
-In Exchange Online, this example uses the Get-Mailbox cmdlet to find the ExchangeGUID value of the mailbox, which is required to restore the mailbox contents.
-
-### Example 2
-```powershell
 Get-MailboxStatistics -Database MBD01 | Where {$_.DisconnectReason -eq "SoftDeleted" -or $_.DisconnectReason -eq "Disabled"} | Format-List LegacyExchangeDN,DisplayName,MailboxGUID, DisconnectReason
 New-MailboxRestoreRequest -SourceDatabase "MBD01" -SourceStoreMailbox 1d20855f-fd54-4681-98e6-e249f7326ddd -TargetMailbox Ayla
 ```
@@ -238,7 +230,7 @@ In on-premises Exchange, this example uses the Get-MailboxStatistics cmdlet to r
 
 Using this information, the source mailbox with the MailboxGUID value 1d20855f-fd54-4681-98e6-e249f7326ddd is restored to the target mailbox that has the Alias value Ayla.
 
-### Example 3
+### Example 2
 ```powershell
 New-MailboxRestoreRequest -SourceDatabase "MBD01" -SourceStoreMailbox "Tony Smith" -TargetMailbox [email protected] -TargetIsArchive
 ```
@@ -509,6 +501,8 @@ The AllowLegacyDNMismatch switch specifies that the operation should continue if
 
 By default, this cmdlet checks to make sure that the LegacyExchangeDN on the source physical mailbox is present on the target user in the form of the LegacyExchangeDN or an X500 proxy address that corresponds to the LegacyExchangeDN. This check prevents you from accidentally restoring a source mailbox into the incorrect target mailbox.
 
+**Note**: This parameter is being deprecated in the cloud-based service. To complete a mailbox restore request for mailboxes with a LegacyExchangeDN that doesn't match, you need to obtain the LegacyExchangeDN value for the source mailbox and add it to the target mailbox as an X500 proxy address. For detailed instructions, see [Restore an inactive mailbox](https://docs.microsoft.com/microsoft-365/compliance/restore-an-inactive-mailbox#restore-inactive-mailboxes).
+
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)

exchange/exchange-ps/exchange/Test-Message.md

@@ -0,0 +1,344 @@
+---
+external help file: Microsoft.Exchange.ServerStatus-Help.xml
+online version: https://docs.microsoft.com/powershell/module/exchange/test-message
+applicable: Exchange Server 2013, Exchange Online
+title: Test-Message
+schema: 2.0.0
+author: chrisda
+ms.author: chrisda
+ms.reviewer:
+---
+
+# Test-Message
+
+## SYNOPSIS
+This cmdlet is available or functional only in the cloud-based service.
+
+Use the Test-Message cmdlet to simulate and report on the effects of mail flow rules (transport rules) and unified DLP rules on test email messages. Because this cmdlet introduces email into the DLP evaluation pipeline, actions such as Block, Moderate, etc. can take place on the test message. Related notifications will also be sent to any configured recipients.
+
+**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
+
+### Default
+```
+Test-Message
+ [-Confirm]
+ [-TransportRules]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### SecOpsOverrideRules
+```
+Test-Message -Recipients <ProxyAddressCollection>
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>]
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### PhishSimOverrideRules
+```
+Test-Message -Recipients <ProxyAddressCollection>
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>] 
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### UnifiedDLPRules
+```
+Test-Message -Recipients <ProxyAddressCollection> [-UnifiedDlpRules]
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>]
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### TransportRulesWithContent
+```
+Test-Message -Recipients <ProxyAddressCollection> [-UnifiedDlpRules]
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>]
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### TransportRules
+```
+Test-Message -Recipients <ProxyAddressCollection> [-TransportRules] [-UnifiedDlpRules]
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>]
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### JunkMail
+```
+Test-Message -Recipients <ProxyAddressCollection>
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>]
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### InboxRules
+```
+Test-Message -Recipients <ProxyAddressCollection>
+ [-Confirm]
+ [-Force]
+ [-MessageFileData <Byte[]>]
+ [-Sender <SmtpAddress>]
+ [-SendReportTo <RecipientIdParameter>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+### Arbitration
+```
+Test-Message -Recipients <ProxyAddressCollection> -Sender <SmtpAddress> -SendReportTo <RecipientIdParameter>
+ [-Confirm]
+ [-Force]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+## DESCRIPTION
+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
+$data = Get-Content -Path "C:\Data\test.eml" -Encoding Byte -ReadCount 0
+Test-Message -MessageFileData $data -Sender [email protected] -Recipients [email protected] -SendReportTo [email protected] -TransportRules -UnifiedDlpRules
+```
+
+This example uses the test.eml message file at C:\Data to test mail flow rules and unified DLP rules for the sender [email protected] to the recipient [email protected]. The results report is sent to [email protected].
+
+## PARAMETERS
+
+### -Recipients
+The Recipients parameter specifies the recipient email address to use for the test message.
+
+You can specify multiple email addresses separated by commas.
+
+```yaml
+Type: ProxyAddressCollection
+Parameter Sets: SecOpsOverrideRules, PhishSimOverrideRules, UnifiedDLPRules, TransportRulesWithContent, TransportRules, JunkMail, InboxRules, Arbitration
+Aliases:
+Applicable: Exchange Online
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Sender
+The Sender parameter specifies the sender email address to use for the test message.
+```yaml
+Type: SmtpAddress
+Parameter Sets: Arbitration
+Aliases:
+Applicable: Exchange Online
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+```yaml
+Type: SmtpAddress
+Parameter Sets: SecOpsOverrideRules, PhishSimOverrideRules, UnifiedDLPRules, TransportRulesWithContent, TransportRules, JunkMail, InboxRules
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SendReportTo
+The SendReportTo parameter specifies the target email address for the command results.
+
+```yaml
+Type: RecipientIdParameter
+Parameter Sets: Arbitration
+Aliases:
+Applicable: Exchange Online
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+```yaml
+Type: RecipientIdParameter
+Parameter Sets: SecOpsOverrideRules, PhishSimOverrideRules, UnifiedDLPRules, TransportRulesWithContent, TransportRules, JunkMail, InboxRules
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -TransportRules
+The TransportRules switch specifies that you want to test mail flow rules. You don't need to specify a value with this switch.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: Default, TransportRules
+Aliases:
+Applicable: Exchange Server 2013, Exchange Online
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -UnifiedDlpRules
+The UnifiedDlpRules switch specifies that you want to unified DLP rules. You don't need to specify a value with this switch.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: UnifiedDLPRules
+Aliases:
+Applicable: Exchange Online
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: TransportRulesWithContent, TransportRules
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Confirm
+The Confirm switch specifies whether to show or hide the confirmation prompt. How this switch affects the cmdlet depends on if the cmdlet requires confirmation before proceeding.
+
+- Destructive cmdlets (for example, Remove-\* cmdlets) have a built-in pause that forces you to acknowledge the command before proceeding. For these cmdlets, you can skip the confirmation prompt by using this exact syntax: `-Confirm:$false`.
+- Most other cmdlets (for example, New-\* and Set-\* cmdlets) don't have a built-in pause. For these cmdlets, specifying the Confirm switch without a value introduces a pause that forces you acknowledge the command before proceeding.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: cf
+Applicable: Exchange Server 2013, Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Force
+The Force switch specifies whether to suppress warning or confirmation messages. You can use this switch to run tasks programmatically where prompting for administrative input is inappropriate. You don't need to specify a value with this switch.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: SecOpsOverrideRules, PhishSimOverrideRules, UnifiedDLPRules, TransportRulesWithContent, TransportRules, JunkMail, InboxRules, Arbitration
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -MessageFileData
+The MessageFileData parameter specifies the .eml message file to test.
+
+A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
+
+```yaml
+Type: Byte[]
+Parameter Sets: SecOpsOverrideRules, PhishSimOverrideRules, UnifiedDLPRules, TransportRulesWithContent, TransportRules, JunkMail, InboxRules
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -WhatIf
+The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: wi
+Applicable: Exchange Server 2013, Exchange Online
+
+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