Skip to content

Commit d391764

Browse files
authored
Merge pull request MicrosoftDocs#7148 from MicrosoftDocs/DAREP-chrisda
Darep-chrisda to Master
2 parents 371a182 + d57d7ed commit d391764

File tree

3 files changed

+11
-24
lines changed

3 files changed

+11
-24
lines changed

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

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
2222

2323
## SYNTAX
2424

25-
### DCAdminPurgeKeyRequest
26-
```
27-
Set-M365DataAtRestEncryptionPolicy [-Identity] <DataEncryptionPolicyIdParameter>
28-
[-Confirm]
29-
[-Description <String>]
30-
[-DomainController <Fqdn>]
31-
[-Enabled <Boolean>]
32-
[-Force]
33-
[-Name <String>]
34-
[-WhatIf]
35-
[<CommonParameters>]
36-
```
37-
3825
### TenantAdminPurgeKeyRequest
3926
```
4027
Set-M365DataAtRestEncryptionPolicy [-Identity] <DataEncryptionPolicyIdParameter> [-Confirm]
@@ -66,17 +53,17 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
6653

6754
### Example 1
6855
```powershell
69-
Set-M365DataAtRestEncryptionPolicy -Identity "US Mailboxes" -Enabled $false
56+
Set-M365DataAtRestEncryptionPolicy -Identity "Tenant Default Policy" -Enabled $false
7057
```
7158

72-
This example disabled the data-at-rest encryption policy named US Mailboxes.
59+
This example disabled the Microsoft 365 data-at-rest encryption policy named Tenant Default Policy.
7360

7461
### Example 2
7562
```powershell
76-
Set-M365DataAtRestEncryptionPolicy -Identity "Europe Mailboxes" -Refresh
63+
Set-M365DataAtRestEncryptionPolicy -Identity "Tenant Default Policy" -Refresh
7764
```
7865

79-
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.
66+
This example updates the Microsoft 365 data-at-rest encryption policy named Tenant Default Policy after one of the associated keys has been rotated in the Azure Key Vault.
8067

8168
## PARAMETERS
8269

@@ -187,7 +174,7 @@ Accept wildcard characters: False
187174
```
188175

189176
### -Name
190-
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 (").
177+
The Name parameter specifies a unique name for the Microsoft 365 data-at-rest encryption policy. If the value contains spaces, enclose the value in quotation marks (").
191178

192179
```yaml
193180
Type: String
@@ -203,7 +190,7 @@ Accept wildcard characters: False
203190
```
204191

205192
### -Refresh
206-
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.
193+
Use the Refresh switch to update the Microsoft 365 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.
207194

208195
```yaml
209196
Type: SwitchParameter

exchange/exchange-ps/exchange/Set-M365DataAtRestEncryptionPolicyAssignment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
3636
Set-M365DataAtRestEncryptionPolicyAssignment -DataEncryptionPolicy "Contoso Corporate"
3737
```
3838

39-
This example assigns the data-at-rest encryption policy named Contoso Corporate.
39+
This example assigns the Microsoft 365 data-at-rest encryption policy named Contoso Corporate.
4040

4141
## PARAMETERS
4242

4343
### -DataEncryptionPolicy
44-
The DataEncryptionPolicy parameter specifies the data-at-rest encryption policy. You can use any value that uniquely identifies the policy. For example:
44+
The DataEncryptionPolicy parameter specifies the Microsoft 365 data-at-rest encryption policy. You can use any value that uniquely identifies the policy. For example:
4545

4646
- Name
4747
- Distinguished name (DN)

exchange/exchange-ps/exchange/Test-M365DataAtRestEncryptionPolicy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414
## SYNOPSIS
1515
This cmdlet is available only in the cloud-based service.
1616

17-
Use the Test-M365DataAtRestEncryptionPolicy cmdlet to test an existing M365 data-at-rest encryption policy.
17+
Use the Test-M365DataAtRestEncryptionPolicy cmdlet to test an existing Microsoft 365 data-at-rest encryption policy.
1818

1919
**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).
2020

@@ -40,12 +40,12 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
4040
Test-M365DataAtRestEncryptionPolicy -Identity "Contoso Corporate"
4141
```
4242

43-
This example tests the data-at-rest encryption policy named Contoso Corporate.
43+
This example tests the Microsoft 365 data-at-rest encryption policy named Contoso Corporate.
4444

4545
## PARAMETERS
4646

4747
### -Identity
48-
The Identity parameter specifies the data-at-rest encryption policy that you want to test. You can use any value that uniquely identifies the policy. For example:
48+
The Identity parameter specifies the Microsoft 365 data-at-rest encryption policy that you want to test. You can use any value that uniquely identifies the policy. For example:
4949

5050
- Name
5151
- Distinguished name (DN)

0 commit comments

Comments
 (0)