Merge branch 'master' into patch-2

Author: Kateyanne

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

@@ -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

@@ -14,7 +14,7 @@ ms.reviewer:
 ## 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.
+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).
 
@@ -31,6 +31,10 @@ Get-M365DataAtRestEncryptionPolicy [[-Identity] <DataEncryptionPolicyIdParameter
 ```
 
 ## 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
@@ -40,7 +44,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-M365DataAtRestEncryptionPolicy
 ```
 
-This example returns a summary list of all data at rest encryption policies.
+This example returns a summary list of all data-at-rest encryption policies.
 
 ### Example 2
 ```powershell
@@ -52,7 +56,7 @@ This example returns detailed information about the policy named Contoso Corpora
 ## 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:
+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)

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

@@ -14,7 +14,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Get-M365DataAtRestEncryptionPolicyAssignment cmdlet to view existing Microsoft 365 data at rest encryption policy assignments.
+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).
 
@@ -27,6 +27,8 @@ 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
@@ -36,14 +38,14 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-M365DataAtRestEncryptionPolicyAssignment
 ```
 
-This example returns a summary list of all data at rest encryption policy assignments.
+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.
+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).

exchange/exchange-ps/exchange/Get-M365DataAtRestEncryptionPolicyAssignment.md

@@ -14,7 +14,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the New-M365DataAtRestEncryptionPolicy cmdlet to create a new Microsoft 365 data at rest encryption policy.
+Use the New-M365DataAtRestEncryptionPolicy cmdlet to create a new 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).
 
@@ -42,12 +42,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 New-M365DataAtRestEncryptionPolicy -Name "US Mailboxes" -AzureKeyIDs "https://contoso.vault.azure.net/keys/key1/",https://contoso.vault.azure.net/keys/key2/" -Description "Root key for mailboxes located in US territories"
 ```
 
-This example creates a data at rest encryption policy named US Mailboxes with the specified Azure Key Vault keys and description.
+This example creates a data-at-rest encryption policy named US Mailboxes with the specified Azure Key Vault keys and description.
 
 ## PARAMETERS
 
 ### -Name
-The Name parameter specifies a unique name for the data at rest encryption policy. If the value contains spaces, enclose the value in quotation marks (").
+The Name parameter specifies a unique name for the data-at-rest encryption policy. If the value contains spaces, enclose the value in quotation marks (").
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/New-M365DataAtRestEncryptionPolicy.md

@@ -48,7 +48,7 @@ This example removes John's permissions to the Training folder in Kim's mailbox.
 Remove-MailboxFolderPermission -Identity [email protected]:\Calendar -ResetDelegateUserCollection
 ```
 
-This example will clear any corrupted delegate information from Kim’s mailbox.
+This example will clear any corrupted delegate information from Kim's mailbox.
 
 ## PARAMETERS
 

exchange/exchange-ps/exchange/Remove-MailboxFolderPermission.md

@@ -88,10 +88,10 @@ In on-premises Exchange, this example clears the disabled email address template
 
 ### Example 3
 ```powershell
-Set-EmailAddressPolicy -Identity 'Office 365 Groups' -EnabledEmailAddressTemplates "SMTP:@contoso.com","@contoso.onmicrosoft.com","smtp:@contoso.microsoftonline.com"
+Set-EmailAddressPolicy -Identity "Office 365 Groups" -EnabledEmailAddressTemplates "SMTP:@contoso.com","smtp:@contoso.onmicrosoft.com","smtp:@contoso.microsoftonline.com"
 ```
 
-In Exchange Online, this example modifies the existing email adress policy named Office 365 Groups by setting the enabled email address templates to "SMTP:@contoso.com", and "@contoso.onmicrosoft.com", and "smtp:@contoso.microsoftonline.com". This will also set the enabled primary SMTP address template to "@contoso.com".
+In Exchange Online, this example modifies the existing email adress policy named "Office 365 Groups" and sets the enabled email address templates to use "@contoso.com" as the primary SMTP address and "@contoso.onmicrosoft.com" and "@contoso.microsoftonline.com" as proxy addresses.
 
 ## PARAMETERS
 

exchange/exchange-ps/exchange/Set-EmailAddressPolicy.md

@@ -14,7 +14,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Set-M365DataAtRestEncryptionPolicy cmdlet to enable or disable a Microsoft 365 data at rest encryption policy.
+Use the Set-M365DataAtRestEncryptionPolicy cmdlet to modify Microsoft 365 data-at-rest encryption policies in Exchange Online.
 
 **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).
 
@@ -69,19 +69,19 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Set-M365DataAtRestEncryptionPolicy -Identity "US Mailboxes" -Enabled $false
 ```
 
-This example disabled the data at rest encryption policy named US Mailboxes.
+This example disabled the data-at-rest encryption policy named US Mailboxes.
 
 ### Example 2
 ```powershell
 Set-M365DataAtRestEncryptionPolicy -Identity "Europe Mailboxes" -Refresh
 ```
 
-This example updates the data at rest encryption policy named Europe Mailboxes after one of the associated keys has been rotated in the Azure Key Vault.
+This example updates the data-at-rest encryption policy named Europe Mailboxes after one of the associated keys has been rotated in the Azure Key Vault.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the data at rest encryption policy that you want to modify. You can use any value that uniquely identifies the policy. For example:
+The Identity parameter specifies the data-at-rest encryption policy that you want to modify. You can use any value that uniquely identifies the policy. For example:
 
 - Name
 - Distinguished name (DN)
@@ -187,7 +187,7 @@ Accept wildcard characters: False
 ```
 
 ### -Name
-The Name parameter specifies a unique name for the data at rest encryption policy. If the value contains spaces, enclose the value in quotation marks (").
+The Name parameter specifies a unique name for the data-at-rest encryption policy. If the value contains spaces, enclose the value in quotation marks (").
 
 ```yaml
 Type: String
@@ -203,7 +203,7 @@ Accept wildcard characters: False
 ```
 
 ### -Refresh
-Use the Refresh switch to update the data at rest encryption policy in Exchange Online after you rotate any of the associated keys in the Azure Key Vault. You don't need to specify a value with this switch.
+Use the Refresh switch to update the data-at-rest encryption policy in Exchange Online after you rotate any of the associated keys in the Azure Key Vault. You don't need to specify a value with this switch.
 
 ```yaml
 Type: SwitchParameter

exchange/exchange-ps/exchange/Set-M365DataAtRestEncryptionPolicy.md

@@ -14,7 +14,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Set-M365DataAtRestEncryptionPolicyAssignment cmdlet to assign a Microsoft 365 data at rest encryption policy.
+Use the Set-M365DataAtRestEncryptionPolicyAssignment cmdlet to assign a Microsoft 365 data-at-rest encryption policy at the tenant level.
 
 **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).
 
@@ -36,12 +36,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Set-M365DataAtRestEncryptionPolicyAssignment -DataEncryptionPolicy "Contoso Corporate"
 ```
 
-This example assigns the data at rest encryption policy named Contoso Corporate.
+This example assigns the data-at-rest encryption policy named Contoso Corporate.
 
 ## PARAMETERS
 
 ### -DataEncryptionPolicy
-The DataEncryptionPolicy parameter specifies the data at rest encryption policy. You can use any value that uniquely identifies the policy. For example:
+The DataEncryptionPolicy parameter specifies the data-at-rest encryption policy. You can use any value that uniquely identifies the policy. For example:
 
 - Name
 - Distinguished name (DN)