Skip to content

Commit a6cfff8

Browse files
authored
Merge pull request MicrosoftDocs#1661 from MicrosoftDocs/chrisda
Chrisda to Master
2 parents f24297e + 2d0e44c commit a6cfff8

File tree

5 files changed

+109
-66
lines changed

5 files changed

+109
-66
lines changed

exchange/exchange-ps/exchange/encryption-and-certificates/Set-IRMConfiguration.md

Lines changed: 105 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ For information about the parameter sets in the Syntax section below, see Exchan
2020
## SYNTAX
2121

2222
```
23-
Set-IRMConfiguration [-AutomaticServiceUpdateEnabled <$true | $false>] [-ClientAccessServerEnabled <$true | $false>]
24-
[-Confirm] [-DomainController <Fqdn>] [-EDiscoverySuperUserEnabled <$true | $false>]
25-
[-ExternalLicensingEnabled <$true | $false>] [-Force] [-InternalLicensingEnabled <$true | $false>]
26-
[-JournalReportDecryptionEnabled <$true | $false>] [-LicensingLocation <MultiValuedProperty>]
27-
[-PublishingLocation <Uri>] [-RefreshServerCertificates] [-SearchEnabled <$true | $false>]
28-
[-ServiceLocation <Uri>] [-TransportDecryptionSetting <Disabled | Optional | Mandatory>] [-WhatIf]
29-
[-RMSOnlineKeySharingLocation <Uri>] [-AzureRMSLicensingEnabled <$true | $false>]
30-
[-SimplifiedClientAccessEnabled <$true | $false>] [<CommonParameters>]
23+
Set-IRMConfiguration [-AutomaticServiceUpdateEnabled <$true | $false>] [-AzureRMSLicensingEnabled <$true | $false>]
24+
[-ClientAccessServerEnabled <$true | $false>] [-Confirm] [-DecryptAttachmentForEncryptOnly <$true | $false>]
25+
[-DecryptAttachmentFromPortal <$true | $false>] [-DomainController <Fqdn>]
26+
[-EDiscoverySuperUserEnabled <$true | $false>] [-ExternalLicensingEnabled <$true | $false>] [-Force]
27+
[-InternalLicensingEnabled <$true | $false>] [-JournalReportDecryptionEnabled <$true | $false>]
28+
[-LicensingLocation <MultiValuedProperty>] [-PublishingLocation <Uri>] [-RefreshServerCertificates]
29+
[-RMSOnlineKeySharingLocation <Uri>] [-SearchEnabled <$true | $false>] [-ServiceLocation <Uri>]
30+
[-SimplifiedClientAccessEnabled <$true | $false>]
31+
[-TransportDecryptionSetting <Disabled | Optional | Mandatory>] [-WhatIf] [<CommonParameters>]
3132
```
3233

3334
## DESCRIPTION
@@ -81,6 +82,27 @@ Accept pipeline input: False
8182
Accept wildcard characters: False
8283
```
8384
85+
### -AzureRMSLicensingEnabled
86+
This parameter is available only in the cloud-based service.
87+
88+
The AzureRMSLicensingEnabled parameter specifies whether the Exchange Online organization can to connect directly to Azure Rights Management. Valid values are:
89+
90+
- $true: The Exchange Online organization can connect directly to Azure Rights Management. This enables Office 365 Message Encryption.
91+
92+
- $false: The Exchange Online organization can't connect directly to Azure Rights Management. Do not configure this value unless you're directed to do so by Microsoft Customer Service and Support.
93+
94+
```yaml
95+
Type: $true | $false
96+
Parameter Sets: (All)
97+
Aliases:
98+
Applicable: Exchange Online
99+
Required: False
100+
Position: Named
101+
Default value: None
102+
Accept pipeline input: False
103+
Accept wildcard characters: False
104+
```
105+
84106
### -ClientAccessServerEnabled
85107
The ClientAccessServerEnabled parameter specifies whether to enable IRM for Outlook on the web (formerly known as Outlook Web App) and Exchange ActiveSync. Valid values are:
86108
@@ -157,6 +179,48 @@ Accept pipeline input: False
157179
Accept wildcard characters: False
158180
```
159181
182+
### -DecryptAttachmentForEncryptOnly
183+
This parameter is available only in the cloud-based service.
184+
185+
The DecryptAttachmentForEncryptOnly parameter specifies whether mail recipients have unrestricted rights on the attachment or not for Encrypt-only mails sent using new Office 365 Message Encryption capabilities. Valid values are:
186+
187+
- $true: The recipients will have unrestricted rights on attachments sent using Encrypt-Only policy.
188+
189+
- $false: The recipients will not have unrestricted rights on attachments sent using Encrypt-Only policy.
190+
191+
```yaml
192+
Type: $true | $false
193+
Parameter Sets: (All)
194+
Aliases:
195+
Applicable: Exchange Online
196+
Required: False
197+
Position: Named
198+
Default value: None
199+
Accept pipeline input: False
200+
Accept wildcard characters: False
201+
```
202+
203+
### -DecryptAttachmentFromPortal
204+
This parameter is available only in the cloud-based service.
205+
206+
The DecryptAttachmentFromPortal parameter specifies whether Office attachments are protected for recipients outside of Office 365 when Encrypt-only policy is used for sending mails using new Office 365 Message Encryption capabilities. Use this option when you don't need to retain the original protection for the attachment upon download. Valid values are:
207+
208+
- $true: The recipients will have permissions to download Encrypt-only attachments without protection.
209+
210+
- $false: The recipients will continue to have Encrypt-only attachments protected even after download.
211+
212+
```yaml
213+
Type: $true | $false
214+
Parameter Sets: (All)
215+
Aliases:
216+
Applicable: Exchange Online
217+
Required: False
218+
Position: Named
219+
Default value: None
220+
Accept pipeline input: False
221+
Accept wildcard characters: False
222+
```
223+
160224
### -ExternalLicensingEnabled
161225
The ExternalLicensingEnabled parameter specifies whether to enable IRM features for messages that are sent to external recipients. Valid values are:
162226
@@ -282,29 +346,10 @@ Accept pipeline input: False
282346
Accept wildcard characters: False
283347
```
284348
285-
### -SearchEnabled
286-
The SearchEnabled parameter specifies whether to enable searching of IRM-encrypted messages in Outlook on the web. Valid values are:
287-
288-
- $true: Searching IRM-encrypted messages in Outlook on the web is enabled. This is the default value.
289-
290-
- $false: Searching IRM-encrypted messages in Outlook on the web is disabled.
291-
292-
```yaml
293-
Type: $true | $false
294-
Parameter Sets: (All)
295-
Aliases:
296-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
297-
Required: False
298-
Position: Named
299-
Default value: None
300-
Accept pipeline input: False
301-
Accept wildcard characters: False
302-
```
303-
304-
### -ServiceLocation
349+
### -RMSOnlineKeySharingLocation
305350
This parameter is available only in the cloud-based service.
306351
307-
The ServiceLocation parameter specifies the AD RMS service URL.
352+
The RMSOnlineKeySharingLocation parameter specifies the Azure Rights Management URL that's used to get the trusted publishing domain (TPD) for the Exchange Online organization.
308353
309354
```yaml
310355
Type: Uri
@@ -318,17 +363,15 @@ Accept pipeline input: False
318363
Accept wildcard characters: False
319364
```
320365
321-
### -TransportDecryptionSetting
322-
The TransportDecryptionSetting parameter specifies the transport decryption configuration. Valid values are:
323-
324-
- Disabled: Transport decryption is disabled for internal and external messages.
366+
### -SearchEnabled
367+
The SearchEnabled parameter specifies whether to enable searching of IRM-encrypted messages in Outlook on the web. Valid values are:
325368
326-
- Mandatory: Messages that can't be decrypted are rejected with a non-delivery report (also known as an NDR or bounce message).
369+
- $true: Searching IRM-encrypted messages in Outlook on the web is enabled. This is the default value.
327370
328-
- Optional: Messages are decrypted if possible, but are delivered even if decryption fails. This is the default value.
371+
- $false: Searching IRM-encrypted messages in Outlook on the web is disabled.
329372
330373
```yaml
331-
Type: Disabled | Optional | Mandatory
374+
Type: $true | $false
332375
Parameter Sets: (All)
333376
Aliases:
334377
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
@@ -339,28 +382,34 @@ Accept pipeline input: False
339382
Accept wildcard characters: False
340383
```
341384
342-
### -WhatIf
343-
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.
385+
### -ServiceLocation
386+
This parameter is available only in the cloud-based service.
387+
388+
The ServiceLocation parameter specifies the AD RMS service URL.
344389
345390
```yaml
346-
Type: SwitchParameter
391+
Type: Uri
347392
Parameter Sets: (All)
348-
Aliases: wi
349-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
393+
Aliases:
394+
Applicable: Exchange Online
350395
Required: False
351396
Position: Named
352397
Default value: None
353398
Accept pipeline input: False
354399
Accept wildcard characters: False
355400
```
356401
357-
### -RMSOnlineKeySharingLocation
402+
### -SimplifiedClientAccessEnabled
358403
This parameter is available only in the cloud-based service.
359404
360-
The RMSOnlineKeySharingLocation parameter specifies the Azure Rights Management URL that's used to get the trusted publishing domain (TPD) for the Exchange Online organization.
405+
The SimplifiedClientAccessEnabled parameter specifies whether to enable the Protect button in Outlook on the web. Valid values are:
406+
407+
- $true: The Protect button is enabled in Outlook on the web.
408+
409+
- $false: The Protect button is disabled in Outlook on the web. This is the default value.
361410
362411
```yaml
363-
Type: Uri
412+
Type: $true | $false
364413
Parameter Sets: (All)
365414
Aliases:
366415
Applicable: Exchange Online
@@ -371,41 +420,35 @@ Accept pipeline input: False
371420
Accept wildcard characters: False
372421
```
373422
374-
### -AzureRMSLicensingEnabled
375-
This parameter is available only in the cloud-based service.
423+
### -TransportDecryptionSetting
424+
The TransportDecryptionSetting parameter specifies the transport decryption configuration. Valid values are:
376425
377-
The AzureRMSLicensingEnabled parameter specifies whether the Exchange Online organization can to connect directly to Azure Rights Management. Valid values are:
426+
- Disabled: Transport decryption is disabled for internal and external messages.
378427
379-
- $true: The Exchange Online organization can connect directly to Azure Rights Management. This enables Office 365 Message Encryption.
428+
- Mandatory: Messages that can't be decrypted are rejected with a non-delivery report (also known as an NDR or bounce message).
380429
381-
- $false: The Exchange Online organization can't connect directly to Azure Rights Management. Do not configure this value unless you're directed to do so by Microsoft Customer Service and Support.
430+
- Optional: Messages are decrypted if possible, but are delivered even if decryption fails. This is the default value.
382431
383432
```yaml
384-
Type: $true | $false
433+
Type: Disabled | Optional | Mandatory
385434
Parameter Sets: (All)
386435
Aliases:
387-
Applicable: Exchange Online
436+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
388437
Required: False
389438
Position: Named
390439
Default value: None
391440
Accept pipeline input: False
392441
Accept wildcard characters: False
393442
```
394443
395-
### -SimplifiedClientAccessEnabled
396-
This parameter is available only in the cloud-based service.
397-
398-
The SimplifiedClientAccessEnabled parameter specifies whether to enable the Protect button in Outlook on the web. Valid values are:
399-
400-
- $true: The Protect button is enabled in Outlook on the web.
401-
402-
- $false: The Protect button is disabled in Outlook on the web. This is the default value.
444+
### -WhatIf
445+
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.
403446
404447
```yaml
405-
Type: $true | $false
448+
Type: SwitchParameter
406449
Parameter Sets: (All)
407-
Aliases:
408-
Applicable: Exchange Online
450+
Aliases: wi
451+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
409452
Required: False
410453
Position: Named
411454
Default value: None

exchange/exchange-ps/exchange/mailboxes/Set-CalendarProcessing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Aliases:
223223
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Online
224224
Required: False
225225
Position: Named
226-
Default value: None
226+
Default value: False
227227
Accept pipeline input: False
228228
Accept wildcard characters: False
229229
```

exchange/exchange-ps/exchange/policy-and-compliance-audit/Search-UnifiedAuditLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ monikerRange: "exchonline-ps"
1111
## SYNOPSIS
1212
This cmdlet is available only in the cloud-based service.
1313

14-
Use the Search-UnifiedAuditLog cmdlet to search the unified audit log. This log contains events from Exchange Online, SharePoint Online, OneDrive for Business, Azure Active Directory, Microsoft Teams, Power BI, Sway, and other Office 365 services. You can search for all events in a specified date rage, or you can filter the results based on specific criteria, such as the user who performed the action, the action, or the target object.
14+
Use the Search-UnifiedAuditLog cmdlet to search the unified audit log. This log contains events from Exchange Online, SharePoint Online, OneDrive for Business, Azure Active Directory, Microsoft Teams, Power BI, Sway, and other Office 365 services. You can search for all events in a specified date range, or you can filter the results based on specific criteria, such as the user who performed the action, the action, or the target object.
1515

1616
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1717

exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpSensitiveInformationType.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
3232

3333
### -------------------------- Example 1 --------------------------
3434
```
35-
$Employee_Template = Get-Content "C:\My Documents\Contoso Employee Template.docx" -Encoding byte; $Employee_Fingerprint = New-DlpFingerprint -FileData $Employee_Template -Description "Contoso Employee Template"; $Customer_Template = Get-Content "D:\Data\Contoso Customer Template.docx" -Encoding byte; $Customer_Fingerprint = New-DlpFingerprint -FileData $Customer_Template -Description "Contoso Customer Template"; New-DlpSensitiveInformationType -Name "Contoso Employee-Customer Confidential" -Fingerprints $Employee_Fingerprint,$Customer_Fingerprint -Description "Message contains Contoso employee or customer information."
35+
$Employee_Template = Get-Content "C:\My Documents\Contoso Employee Template.docx" -Encoding byte -ReadCount 0; $Employee_Fingerprint = New-DlpFingerprint -FileData $Employee_Template -Description "Contoso Employee Template"; $Customer_Template = Get-Content "D:\Data\Contoso Customer Template.docx" -Encoding byte; $Customer_Fingerprint = New-DlpFingerprint -FileData $Customer_Template -Description "Contoso Customer Template"; New-DlpSensitiveInformationType -Name "Contoso Employee-Customer Confidential" -Fingerprints $Employee_Fingerprint[0],$Customer_Fingerprint[0] -Description "Message contains Contoso employee or customer information."
3636
```
3737

3838
This example creates a new sensitive information type rule named "Contoso Employee-Customer Confidential" that uses the document fingerprints of the files C:\\My Documents\\Contoso Employee Template.docx and D:\\Data\\Contoso Customer Template.docx.

exchange/exchange-ps/exchange/policy-and-compliance-dlp/Set-DlpSensitiveInformationType.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This example removes the existing Spanish translation from the sensitive informa
4646

4747
### -------------------------- Example 3 --------------------------
4848
```
49-
$Benefits_Template = Get-Content "C:\My Documents\Contoso Benefits Template.docx" -Encoding byte; $Benefits_Fingerprint = New-DlpFingerprint -FileData $Benefits_Template -Description "Contoso Benefits Template"; $Contoso_Confidential = Get-DlpSensitiveInformationType "Contoso Confidential"; $Array = [System.Collections.ArrayList]($Contoso_Confidential.Fingerprints); $Array.Add($Benefits_FingerPrint); Set-DlpSensitiveInformationType $Contoso_Confidential.Identity -FingerPrints $Array
49+
$Benefits_Template = Get-Content "C:\My Documents\Contoso Benefits Template.docx" -Encoding byte -ReadCount 0; $Benefits_Fingerprint = New-DlpFingerprint -FileData $Benefits_Template -Description "Contoso Benefits Template"; $Contoso_Confidential = Get-DlpSensitiveInformationType "Contoso Confidential"; $Array = [System.Collections.ArrayList]($Contoso_Confidential.Fingerprints); $Array.Add($Benefits_FingerPrint[0]); Set-DlpSensitiveInformationType $Contoso_Confidential.Identity -FingerPrints $Array
5050
```
5151

5252
This example modifies the existing sensitive information type rule named "Contoso Confidential" by adding a new document fingerprint for the file C:\\My Documents\\Contoso Benefits Template.docx without affecting any existing document fingerprints that are already defined.

0 commit comments

Comments
 (0)