Skip to content

Commit 16c0fb7

Browse files
authored
Merge branch 'main' into patch-1
2 parents a1aa77a + f015fb6 commit 16c0fb7

35 files changed

+117
-109
lines changed

defender-endpoint/TOC.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
href: microsoft-defender-endpoint-ios.md
1919
- name: Defender for Endpoint for US Government customers
2020
href: gov.md
21-
- name: Supported Defender for Endpoint capabilities by platform
22-
href: supported-capabilities-by-platform.md
23-
- name: Antivirus solution compatibility with Defender for Endpoint
24-
href: defender-compatibility.md
2521
- name: Defender for Endpoint Plan 1
2622
items:
2723
- name: Overview of Defender for Endpoint Plan 1
@@ -30,6 +26,12 @@
3026
href: mde-p1-setup-configuration.md
3127
- name: Get started
3228
href: mde-plan1-getting-started.md
29+
- name: Minimum requirements
30+
href: minimum-requirements.md
31+
- name: Supported Defender for Endpoint capabilities by platform
32+
href: supported-capabilities-by-platform.md
33+
- name: Antivirus solution compatibility with Defender for Endpoint
34+
href: defender-compatibility.md
3335
- name: What's new in Defender for Endpoint
3436
href: whats-new-in-microsoft-defender-endpoint.md
3537
items:
@@ -45,8 +47,6 @@
4547
href: ios-whatsnew.md
4648
- name: Previous Defender for Endpoint releases (archive)
4749
href: whats-new-mde-archive.md
48-
- name: Minimum requirements
49-
href: minimum-requirements.md
5050
- name: Trial user guide - Defender for Endpoint
5151
href: defender-endpoint-trial-user-guide.md
5252
- name: Pilot and deploy Defender for Endpoint

defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: emmwalshh
88
ms.author: ewalsh
99
ms.reviewer: yongrhee
1010
ms.topic: conceptual
11-
ms.date: 04/03/2024
11+
ms.date: 05/08/2025
1212
manager: deniseb
1313
ms.custom: nextgen
1414
ms.collection:

defender-endpoint/device-discovery.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ms.service: defender-endpoint
55
ms.subservice: onboard
66
f1.keywords:
77
- NOCSH
8-
ms.author: deniseb
9-
author: denisebmsft
8+
ms.author: ewalsh
9+
author: emmwalshh
1010
ms.localizationpriority: medium
1111
manager: deniseb
1212
audience: ITPro
@@ -18,7 +18,7 @@ ms.collection:
1818
ms.custom: admindeeplinkDEFENDER
1919
ms.topic: conceptual
2020
search.appverid: met150
21-
ms.date: 04/23/2024
21+
ms.date: 05/08/2025
2222
---
2323

2424
# Device discovery overview

defender-endpoint/enable-attack-surface-reduction.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.collection:
1515
- mde-asr
1616
ms.custom: admindeeplinkDEFENDER
1717
search.appverid: met150
18-
ms.date: 04/30/2025
18+
ms.date: 05/08/2025
1919
---
2020

2121
# Enable attack surface reduction rules
@@ -102,7 +102,7 @@ When adding exclusions, keep these points in mind:
102102

103103
If a conflicting policy is applied via MDM and GP, the setting applied from Group Policy takes precedence.
104104

105-
Attack surface reduction rules for managed devices now support behavior for merging settings from different policies to create a policy superset for each device. Only the settings that aren't in conflict are merged, whereas policy conficts aren't added to the superset of rules. Previously, if two policies included conflicts for a single setting, both policies were flagged as being in conflict, and no settings from either profile were deployed.
105+
Attack surface reduction rules for managed devices now support behavior for merging settings from different policies to create a policy superset for each device. Only the settings that aren't in conflict are merged, whereas policy conflicts aren't added to the superset of rules. Previously, if two policies included conflicts for a single setting, both policies were flagged as being in conflict, and no settings from either profile were deployed.
106106

107107
Attack surface reduction rule merge behavior works as follows:
108108

@@ -139,6 +139,7 @@ The following procedures for enabling attack surface reduction rules include ins
139139
> If you're using Intune on Windows Server 2012 R2 and Windows Server 2016 with the [modern unified solution](onboard-server.md#functionality-in-the-modern-unified-solution-for-windows-server-2016-and-windows-server-2012-r2), you need to set the following attack surface reduction rules to `Not Configured` because they're not supported on these OS versions. Otherwise, these policies fail to apply:
140140
> - [Block persistence through Windows Management Instrumentation (WMI) event subscription](/defender-endpoint/attack-surface-reduction-rules-reference#block-persistence-through-wmi-event-subscription)
141141
> - [Block JavaScript or VBScript from launching downloaded executable content](/defender-endpoint/attack-surface-reduction-rules-reference#block-javascript-or-vbscript-from-launching-downloaded-executable-content)
142+
> - [Block Win32 API calls from Office macro](/defender-endpoint/attack-surface-reduction-rules-reference#block-win32-api-calls-from-office-macros)
142143
143144
#### Endpoint security policy (Preferred)
144145

defender-endpoint/host-firewall-reporting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ title: Host firewall reporting in Microsoft Defender for Endpoint
33
description: Host and view firewall reporting in Microsoft Defender portal.
44
ms.service: defender-endpoint
55
ms.localizationpriority: medium
6-
ms.date: 04/11/2024
6+
ms.date: 05/08/2025
77
audience: ITPro
88
ms.topic: conceptual
9-
author: denisebmsft
10-
ms.author: deniseb
9+
author: emmwalshh
10+
ms.author: ewalsh
1111
manager: deniseb
1212
ms.subservice: asr
1313
ms.collection:

0 commit comments

Comments
 (0)