Merge branch 'master' into patch-1

Author: chrisda

exchange/docs-conceptual/toc.yml

@@ -23,6 +23,8 @@
               href: filter-properties.md
             - name: Filterable properties for the RecipientFilter parameter
               href: recipientfilter-properties.md
+        - name: Values for the CustomPropertyNames parameter
+          href: values-for-custompropertynames-parameter.md
     - name: Exchange Online PowerShell
       href: exchange-online-powershell.md
       items:

exchange/docs-conceptual/values-for-custompropertynames-parameter.md

@@ -113,7 +113,9 @@ The ComponentName parameter specifies the component that you want to retrieve th
 - RemindersAssistant
 - SharingMigrationAssistant
 - SharingSyncAssistant
+- SubstrateHoldTracking
 - SweepRules
+- TimeProfile
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/Export-MailboxDiagnosticLogs.md

@@ -24,6 +24,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 Export-TransportRuleCollection [[-Identity] <RuleIdParameter>]
  [-Confirm]
  [-DomainController <Fqdn>]
+ [-Format <RuleCollectionFormat>]
  [-ExportLegacyRules]
  [-WhatIf]
  [<CommonParameters>]
@@ -61,7 +62,11 @@ In Exchange Server 2010, this example exports legacy transport rules created in
 ### -Identity
 This cmdlet is available only in on-premises Exchange, and is functional only in Exchange Server 2010.
 
-The Identity parameter specifies the name or GUID of a transport rule to be exported.
+The Identity parameter specifies the transport rule that you want to export. You can use any value that uniquely identifies the rule. For example:
+
+- Name
+- Distinguished name (DN)
+- GUID
 
 ```yaml
 Type: RuleIdParameter
@@ -133,6 +138,28 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Format
+This parameter is available only in the cloud-based service.
+
+The Format parameter specifics the format of the exported transport rule collection. Valid values are:
+
+- RuleCollectionXML
+- InternalXML
+- DlpMigrationRuleCollection
+
+```yaml
+Type: RuleCollectionFormat
+Parameter Sets: (All)
+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.
 

exchange/exchange-ps/exchange/Export-TransportRuleCollection.md

@@ -135,7 +135,9 @@ Accept wildcard characters: False
 ```
 
 ### -CustomPropertyNames
-The CustomPropertyNames parameter returns the specified calendar item custom property in the results. You can specify multiple values separated by commas.
+The CustomPropertyNames parameter returns the specified calendar item custom property in the results. For valid values, see [Values for the CustomPropertyNames parameter in Exchange Online PowerShell](https://docs.microsoft.com/powershell/exchange/values-for-custompropertynames-parameter).
+
+You can specify multiple values separated by commas.
 
 ```yaml
 Type: String[]

exchange/exchange-ps/exchange/Get-CalendarDiagnosticObjects.md

@@ -0,0 +1,142 @@
+---
+external help file: Microsoft.Exchange.WebClient-Help.xml
+online version: https://docs.microsoft.com/powershell/module/exchange/get-m365dataatrestencryptionpolicy
+applicable: Exchange Online
+title: Get-M365DataAtRestEncryptionPolicy
+schema: 2.0.0
+author: chrisda
+ms.author: chrisda
+ms.reviewer:
+---
+
+# Get-M365DataAtRestEncryptionPolicy
+
+## SYNOPSIS
+This cmdlet is available only in the cloud-based service.
+
+Use the Get-M365DataAtRestEncryptionPolicy cmdlet to view existing Microsoft 365 data-at-rest encryption policies.
+
+**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-M365DataAtRestEncryptionPolicy [[-Identity] <DataEncryptionPolicyIdParameter>]
+ [-Confirm]
+ [-DomainController <Fqdn>]
+ [-WhatIf]
+ [<CommonParameters>]
+```
+
+## DESCRIPTION
+M365 data-at-rest encryption policy cmdlets are accessible to compliance administrator role as part of the Exchange Online infrastructure. For more information, see [Overview of M365 Customer Key at the tenant level](https://docs.microsoft.com/microsoft-365/compliance/customer-key-tenant-level#get-policy-details).
+
+You can create and assign a data-at-rest encryption policy at the tenant level by using the appropriate M365DataAtRestEncryptionPolicy cmdlets in Exchange Online PowerShell.
+
+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-M365DataAtRestEncryptionPolicy
+```
+
+This example returns a summary list of all data-at-rest encryption policies.
+
+### Example 2
+```powershell
+Get-M365DataAtRestEncryptionPolicy -Identity "Contoso Corporate" | Format-List
+```
+
+This example returns detailed information about the policy named Contoso Corporate.
+
+## PARAMETERS
+
+### -Identity
+The Identity parameter specifies the data-at-rest encryption policy that you want to view. You can use any value that uniquely identifies the policy. For example:
+
+- Name
+- Distinguished name (DN)
+- GUID
+
+```yaml
+Type: DataEncryptionPolicyIdParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: True (ByPropertyName, ByValue)
+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 Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DomainController
+This parameter is reserved for internal Microsoft use.
+
+```yaml
+Type: Fqdn
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -WhatIf
+This parameter is reserved for internal Microsoft use.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: wi
+Applicable: 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

exchange/exchange-ps/exchange/Get-M365DataAtRestEncryptionPolicy.md

@@ -0,0 +1,63 @@
+---
+external help file: Microsoft.Exchange.WebClient-Help.xml
+online version: https://docs.microsoft.com/powershell/module/exchange/get-m365dataatrestencryptionpolicyassignment
+applicable: Exchange Online
+title: Get-M365DataAtRestEncryptionPolicyAssignment
+schema: 2.0.0
+author: chrisda
+ms.author: chrisda
+ms.reviewer:
+---
+
+# Get-M365DataAtRestEncryptionPolicyAssignment
+
+## SYNOPSIS
+This cmdlet is available only in the cloud-based service.
+
+Use the Get-M365DataAtRestEncryptionPolicyAssignment cmdlet to view the currently assigned Microsoft 365 data-at-rest encryption policy.
+
+**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-M365DataAtRestEncryptionPolicyAssignment [<CommonParameters>]
+```
+
+## DESCRIPTION
+This cmdlet lists the policy that's currently assigned to the tenant.
+
+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-M365DataAtRestEncryptionPolicyAssignment
+```
+
+This example returns a summary list of all data-at-rest encryption policy assignments.
+
+### Example 2
+```powershell
+Get-M365DataAtRestEncryptionPolicyAssignment | Format-List
+```
+
+This example returns detailed information for all data-at-rest encryption policy assignments.
+
+### 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/Get-M365DataAtRestEncryptionPolicyAssignment.md

@@ -110,7 +110,7 @@ Accept wildcard characters: False
 ```
 
 ### -ActiveSync
-The ActiveSync switch specifies whether to include mobile devices that synchronize with Exchange ActiveSync. You don't need to specify a value with this switch.
+The ActiveSync switch filters the results by Exchange ActiveSync devices. You don't need to specify a value with this switch.
 
 ```yaml
 Type: SwitchParameter

exchange/exchange-ps/exchange/Get-MobileDevice.md

@@ -36,7 +36,7 @@ Get-SafeLinksDetailReport [-Action <MultiValuedProperty>]
 ```
 
 ## DESCRIPTION
-**Note**: If you run Get-SafeLinksAggregateReport without specifying a date range, the command will return an unspecified error.
+**Note**: If you run Get-SafeLinksDetailReport without specifying a date range, the command will return an unspecified error.
 
 Safe Links is a feature in Microsoft Defender for Office 365 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.
 

exchange/exchange-ps/exchange/Get-SafeLinksDetailReport.md

@@ -14,8 +14,6 @@ ms.author: chrisda
 ## SYNOPSIS
 This cmdlet is available only in the Exchange Online PowerShell V2 module. For more information, see [About the Exchange Online PowerShell V2 module](https://docs.microsoft.com/powershell/exchange/exchange-online-powershell-v2).
 
-**Note**: This cmdlet is being replaced by the [Get-MyAnalyticsFeatureConfig](https://docs.microsoft.com/powershell/module/exchange/get-myanalyticsfeatureconfig) cmdlet.
-
 Use the Get-UserBriefingConfig cmdlet to get the current state of the Briefing email flag for the specified user. For more details about configuring the Briefing email, see [Configure Briefing email](https://docs.microsoft.com/Briefing/be-admin).
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).