Skip to content

Commit c49425e

Browse files
authored
Merge branch 'master' into patch-3
2 parents 2627ca7 + 4277002 commit c49425e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

exchange/exchange-ps/exchange/antispam-antimalware/New-MalwareFilterPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The Action parameter specifies the action to take when malware is detected in a
8080
8181
- DeleteAttachmentAndUseCustomAlert: Delivers the message, but replaces the message contents with the custom alert text specified by the AlertText parameter.
8282
83-
Note: For Exchange Online Protection, any of these actions result in the message and any attachments being routed to quarantine. For more information about quarantined messages, see https://go.microsoft.com/fwlink/p/?linkid=874388.
83+
Note: For Exchange Online Protection, any of these actions result in the message being delivered. Attachments that contain malware are quarantined. For more information about quarantined messages, see https://docs.microsoft.com/microsoft-365/security/office-365-security/manage-quarantined-messages-and-files.
8484
8585
```yaml
8686
Type: DeleteMessage | DeleteAttachmentAndUseDefaultAlertText | DeleteAttachmentAndUseCustomAlertText

exchange/exchange-ps/exchange/antispam-antimalware/Set-MalwareFilterPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The Action parameter specifies the action to take when malware is detected in a
9898
9999
- DeleteAttachmentAndUseCustomAlert: Delivers the message, but replaces the message contents with the custom alert text specified by the AlertText parameter.
100100
101-
Note: For Exchange Online Protection, any of these actions results in the message and any attachments being routed to quarantine. For more information about quarantined messages, see https://go.microsoft.com/fwlink/p/?linkid=874388.
101+
Note: For Exchange Online Protection, any of these actions result in the message being delivered. Attachments that contain malware are quarantined. For more information about quarantined messages, see https://docs.microsoft.com/microsoft-365/security/office-365-security/manage-quarantined-messages-and-files.
102102
103103
```yaml
104104
Type: DeleteMessage | DeleteAttachmentAndUseDefaultAlertText | DeleteAttachmentAndUseCustomAlertText

exchange/exchange-ps/exchange/policy-and-compliance/New-Label.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ Accept wildcard characters: False
127127
### -LocaleSettings
128128
The LocaleSettings parameter specifies one or more localized label name or label Tooltips in different languages. Regions include all region codes supported in Office Client applications. Valid values use the following syntax:
129129
130-
- Label display names: {"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de",Value":"Deutscher Anzeigename"},{"Key":"es-es",Value":"Nombre para mostrar en español"}]}
130+
- Label display names: {"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de","Value":"Deutscher Anzeigename"},{"Key":"es-es","Value":"Nombre para mostrar en español"}]}
131131
132-
- Label Tooltips: {"localeKey":"Tooltip","Settings":[{"Key":"en-us","Value":"English Tooltip"},{"Key":"de-de",Value":"Deutscher Tooltip"},{"Key":"es-es",Value":"Tooltip Español"}]}
132+
- Label Tooltips: {"localeKey":"Tooltip","Settings":[{"Key":"en-us","Value":"English Tooltip"},{"Key":"de-de",Value":"Deutscher Tooltip"},{"Key":"es-es","Value":"Tooltip Español"}]}
133133
134134
```yaml
135135
Type: MultiValuedProperty

0 commit comments

Comments
 (0)