Skip to content

Commit d3676b2

Browse files
authored
Merge pull request #3027 from MicrosoftDocs/main
Published main to live, Wednesday 10:30 AM PST, 03/05
2 parents 7bfaa90 + e7f2ecc commit d3676b2

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

defender-endpoint/breadcrumb/toc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
- name: 'Microsoft Defender for Endpoint'
1212
tocHref: /defender-xdr/
1313
topicHref: /defender-xdr/pilot-deploy-defender-endpoint
14+
- name: 'Microsoft Defender for Endpoint'
15+
tocHref: /defender-xdr/
16+
topicHref: /defender-xdr/index

defender-endpoint/linux-preferences.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: defender-endpoint
66
ms.author: deniseb
77
author: denisebmsft
88
ms.localizationpriority: medium
9-
ms.date: 02/19/2025
9+
ms.date: 03/05/2025
1010
manager: deniseb
1111
audience: ITPro
1212
ms.collection:
@@ -143,6 +143,8 @@ Specifies the degree of parallelism for on-demand scans. This corresponds to the
143143

144144
Specifies the merge policy for exclusions. It can be a combination of administrator-defined and user-defined exclusions (`merge`) or only administrator-defined exclusions (`admin_only`). Administrator-defined (admin_only) are exclusions that are configured by Defender for Endpoint policy. This setting can be used to restrict local users from defining their own exclusions.
145145

146+
As it is under `antivirusEngine`, this policy is only applicable for `epp` exclusions, unless `mergePolicy` under `exclusionSettings` is configured as (`admin_only`).
147+
146148
|Description|JSON Value|Defender Portal Value|
147149
|---|---|---|
148150
|**Key**|exclusionsMergePolicy|Exclusions merge|
@@ -151,7 +153,7 @@ Specifies the merge policy for exclusions. It can be a combination of administra
151153

152154
> [!NOTE]
153155
> Available in Defender for Endpoint version `100.83.73` or later.
154-
> Can also configure exclusions under [exclusionSettings](#exclusion-setting-preferences)
156+
> We recommend to configure exclusions and the merge policy under [exclusionSettings](#exclusion-setting-preferences), which allows you to configure exclusion of both `epp` and `global` scope with a single `mergePolicy`.
155157
156158
#### Scan exclusions
157159

exposure-management/integration-licensing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The following licenses will allow access to Microsoft Secure Score experience on
6767
- Microsoft 365 E3
6868
- Microsoft 365 A3
6969
- Microsoft Defender for Endpoint (Plan 2)
70-
- Microsoft Defender for Office 365 (Plan 2)
70+
- Microsoft Defender for Office 365 (Plan 1)
7171

7272
## Next steps
7373

0 commit comments

Comments
 (0)