Merge branch 'master' into patch-192

Author: chrisda

exchange/exchange-ps/exchange/Get-MigrationBatch.md

@@ -58,10 +58,12 @@ The Get-MigrationBatch cmdlet displays status information about the current migr
 
 - Migration errors
 
-- Date and time when the migration was started
+- Date and time when the migration was started and completed.
 
 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).
 
+**Note**: In the cloud-based service, if you don't use the TimeZone parameter in the New-MigrationBatch command, the default time zone for the migration batch is UTC. The CompleteAfter and CompleteAfterUTC properties will contain the same value (as will the StartAfter and StartAfterUTC properties). When you create the migration batch in the Exchange admin center (EAC), the time zone that's used is based on your regional configuration.
+
 ## EXAMPLES
 
 ### Example 1

exchange/exchange-ps/exchange/Get-UrlTrace.md

@@ -24,24 +24,61 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Get-UrlTrace [-ClickId <Guid>] [-EndDate <DateTime>] [-Expression <Expression>] [-Page <Int32>]
- [-PageSize <Int32>] [-RecipientAddress <MultiValuedProperty>] [-StartDate <DateTime>]
- [-UrlOrDomain <MultiValuedProperty>] [-Workloads <MultiValuedProperty>] [<CommonParameters>]
+Get-UrlTrace
+ [-ClickId <Guid>]
+ [-EndDate <DateTime>]
+ [-Expression <Expression>]
+ [-Page <Int32>]
+ [-PageSize <Int32>]
+ [-RecipientAddress <MultiValuedProperty>]
+ [-StartDate <DateTime>]
+ [-UrlOrDomain <MultiValuedProperty>]
+ [-Workloads <MultiValuedProperty>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
 Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site. For more information about Advanced Threat Protection Safe Links, see [Office 365 ATP Safe Links](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-safe-links).
 
-The following list described the values that are returned in the output of this cmdlet:
+For the reporting period you specify, the cmdlet returns the following information:
+
+- Time Clicked: The date/time when the URL in the message body was clicked. Every analyzed URL click is recorded, even when a user clicks a URL in an existing message that's already been scanned.
+
+- Workload
+
+- Application Name
+
+- Message ID
+
+- Message Trace ID
+
+- Source ID
+
+- Source Details
 
 - ClickId: A GUID for each URL that was analyzed in a message.
 
-- Clicked: The date/time when the URL in the message body was clicked. Every analyzed URL click is recorded, even when a user clicks a URL in an existing message that's already been scanned.
+- Recipient Address
+
+- URL
+
+- User IP Address
 
 - UrlBlocked: The URL was detected as malicious by Safe Links (only the initial block, not subsequent clicks), or the user clicked the URL while the scan in progress (users are taken to a notification page that asks them to try again after the scan is complete).
 
 - UrlClicked: The URL is blocked, but the applicable Safe Links policy has the DoNotAllowClickThrough parameter value $false (click through is allowed). Updated policies aren't applied to existing messages that have already been scanned. New or updated policies are applied to new messages that were received after the policy is applied to the mailbox.
 
+- Click Action: The action of a specific click. Possible values are:
+
+• None: We were unable to capture the verdict for the URL. The user might have clicked through the URL.
+• Allowed: The user was allowed to navigate to the URL.
+• Blocked: The User was blocked from navigating to the URL.
+• Pending verdict: The user was presented with the detonation pending page.
+• Blocked overridden: The user was blocked from navigating to the URL; however, the user overrode the block to navigate to the URL.
+• Pending verdict bypassed: The user presented with the detonation page; however, the user overrode the page to navigate to the URL.
+• Error: The user was presented with the error page. This can also mean there was an error in capturing the verdict.
+• Failure: There was unknown exception while capturing the verdict. The user might have clicked through the URL.
+
 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

exchange/exchange-ps/exchange/New-DlpEdmSchema.md

@@ -22,7 +22,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-DlpEdmSchema [-FileData] <Byte[]> [-WhatIf] [-Confirm] [<CommonParameters>]
+New-DlpEdmSchema [-FileData] <Byte[]> [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION

exchange/exchange-ps/exchange/New-MigrationBatch.md

@@ -336,7 +336,17 @@ $OnboardingBatch = New-MigrationBatch -Name RemoteOnBoarding1 -SourceEndpoint $M
 Start-MigrationBatch -Identity $OnboardingBatch.Identity
 ```
 
-This example is the same as Example 3, but the CompleteAfter parameter is also used. Data migration for the batch will start, but won't complete until 09/01/2018 7:00 PM. This method allows you to start a migration and then leave it to complete after business hours.
+This example is the same as Example 3, but the CompleteAfter parameter is also used. Data migration for the batch will start, but won't complete until 09/01/2018 7:00 PM (UTC). This method allows you to start a migration and then leave it to complete after business hours if your time zone is Coordinated Universal Time.
+
+### Example 9
+```powershell
+$Credentials = Get-Credential; 
+$MigrationEndpointOnPrem = New-MigrationEndpoint -ExchangeRemoteMove -Name OnpremEndpoint -Autodiscover -EmailAddress [email protected] -Credentials $Credentials; 
+$OnboardingBatch = New-MigrationBatch -Name RemoteOnBoarding1 -SourceEndpoint $MigrationEndpointOnprem.Identity -TargetDeliveryDomain cloud.contoso.com -CSVData ([System.IO.File]::ReadAllBytes("C:\Users\Administrator\Desktop\RemoteOnBoarding1.csv")) -CompleteAfter "09/01/2018 7:00 PM" -TimeZone "Pacific Standard Time"; 
+Start-MigrationBatch -Identity $OnboardingBatch.Identity
+```
+
+This example is the same as Example 8, but the TimeZone parameter is also used. Data migration for the batch will start, but won't complete until 09/01/2018 7:00 PM (PST). This method allows you to start a migration and then leave it to complete after business hours if your time zone is Pacific Standard Time.
 
 ## PARAMETERS
 
@@ -616,17 +626,15 @@ Accept wildcard characters: False
 ### -CompleteAfter
 This parameter is available only in the cloud-based service.
 
-The CompleteAfter parameter specifies a delay before the batch is completed. Data migration for the batch will start, but won't complete until the date/time you specify with this parameter.
+The CompleteAfter parameter specifies a delay before the batch is completed. Data migration for the batch will start, but completion won't start until the date/time you specify with this parameter.
 
 Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
 
-In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC).
-
-To specify a date/time value for this parameter, use either of the following options:
+In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC). To specify a value, use either of the following options:
 
-- Specify the date/time value in UTC: For example, "2016-05-06 14:30:00z".
+- Specify the date/time value in UTC: For example, `"7/30/2020 9:00PM Z"`.
 
-- Specify the date/time value as a formula that converts the date/time in your local time zone to UTC: For example, `(Get-Date "5/6/2016 9:30 AM").ToUniversalTime()`. For more information, see [Get-Date](https://docs.microsoft.com/powershell/module/Microsoft.PowerShell.Utility/Get-Date).
+- Specify the date/time value in your local time zone: For example, `"7/30/2020 9:00PM -700"`. The value will be converted to UTC if you don't use the TimeZone parameter.
 
 ```yaml
 Type: DateTime
@@ -1014,13 +1022,11 @@ The StartAfter parameter specifies a delay before the data migration for the use
 
 Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
 
-In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC).
-
-To specify a date/time value for this parameter, use either of the following options:
+In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC). To specify a value, use either of the following options:
 
-- Specify the date/time value in UTC: For example, "2016-05-06 14:30:00z".
+- Specify the date/time value in UTC: For example, `"7/30/2020 9:00PM Z"`.
 
-- Specify the date/time value as a formula that converts the date/time in your local time zone to UTC: For example, `(Get-Date "5/6/2016 9:30 AM").ToUniversalTime()`. For more information, see [Get-Date](https://docs.microsoft.com/powershell/module/Microsoft.PowerShell.Utility/Get-Date).
+- Specify the date/time value in your local time zone. For example, `"7/30/2020 9:00PM -700"`. The value will be converted to UTC if you don't use the TimeZone parameter.
 
 ```yaml
 Type: DateTime
@@ -1124,11 +1130,15 @@ Accept wildcard characters: False
 ### -TimeZone
 The TimeZone parameter specifies the time zone of the administrator who submits the migration batch.
 
-A valid value for this parameter is a supported time zone key name (for example, "Pacific Standard Time").
+A valid value for this parameter is a supported time zone key name (for example, `"Pacific Standard Time"`).
 
 To see the available values, run the following command: `$TimeZone = Get-ChildItem "HKLM:\Software\Microsoft\Windows NT\CurrentVersion\Time zones" | foreach {Get-ItemProperty $_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display`.
 
-If the value contains spaces, enclose the value in quotation marks ("). The default value is the time zone setting of the Exchange server.
+If the value contains spaces, enclose the value in quotation marks (").
+
+In on-premises Exchange, the default value is the time zone setting of the Exchange server.
+
+In Exchange Online, the default value is `UTC`.
 
 ```yaml
 Type: ExTimeZoneValue

exchange/exchange-ps/exchange/Remove-DlpEdmSchema.md

@@ -22,7 +22,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Remove-DlpEdmSchema [-Identity] <EdmStorageIdParameter> [-WhatIf] [-Confirm] [<CommonParameters>]
+Remove-DlpEdmSchema [-Identity] <EdmStorageIdParameter> [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION

exchange/exchange-ps/exchange/Set-MigrationBatch.md

@@ -204,17 +204,15 @@ Accept wildcard characters: False
 ### -CompleteAfter
 This parameter is available only in the cloud-based service.
 
-The CompleteAfter parameter specifies a delay before the batch is completed. Data migration for the batch will start, but won't complete until the date/time you specify with this parameter.
+The CompleteAfter parameter specifies a delay before the batch is completed. Data migration for the batch will start, but completion won't start until the date/time you specify with this parameter.
 
 Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
 
-In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC).
+In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC). To specify a value, use either of the following options:
 
-To specify a date/time value for this parameter, use either of the following options:
+- Specify the date/time value in UTC: For example, `"7/30/2020 9:00PM Z"`.
 
-- Specify the date/time value in UTC: For example, "2016-05-06 14:30:00z".
-
-- Specify the date/time value as a formula that converts the date/time in your local time zone to UTC: For example, `(Get-Date "5/6/2016 9:30 AM").ToUniversalTime()`. For more information, see [Get-Date](https://docs.microsoft.com/powershell/module/Microsoft.PowerShell.Utility/Get-Date).
+- Specify the date/time value in your local time zone. For example, `"7/30/2020 9:00PM -700"`. The value will be converted to UTC if you don't use the TimeZone parameter.
 
 ```yaml
 Type: DateTime
@@ -472,13 +470,11 @@ The StartAfter parameter specifies a delay before the data migration for the use
 
 Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
 
-In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC).
-
-To specify a date/time value for this parameter, use either of the following options:
+In Exchange Online PowerShell, if you specify a date/time value without a time zone, the value is in Coordinated Universal Time (UTC). To specify a value, use either of the following options:
 
-- Specify the date/time value in UTC: For example, "2016-05-06 14:30:00z".
+- Specify the date/time value in UTC: For example, `"7/30/2020 9:00PM Z"`.
 
-- Specify the date/time value as a formula that converts the date/time in your local time zone to UTC: For example, `(Get-Date "5/6/2016 9:30 AM").ToUniversalTime()`. For more information, see [Get-Date](https://docs.microsoft.com/powershell/module/Microsoft.PowerShell.Utility/Get-Date).
+- Specify the date/time value in your local time zone. For example, `"7/30/2020 9:00PM -700"`. The value will be converted to UTC if you don't use the TimeZone parameter.
 
 ```yaml
 Type: DateTime