Merge branch 'master' into 4579745

windows/security/threat-protection/microsoft-defender-antivirus/manage-updates-baselines-microsoft-defender-antivirus.md

@@ -13,7 +13,7 @@ ms.author: deniseb
 ms.custom: nextgen
 ms.reviewer: 
 manager: dansimp
-ms.date: 10/08/2020
+ms.date: 10/21/2020
 ---
 
 # Manage Microsoft Defender Antivirus updates and apply baselines
@@ -319,6 +319,7 @@ The below table provides the Microsoft Defender Antivirus platform and engine ve
 
 |Windows 10 release  |Platform version  |Engine version |Support phase |
 |-|-|-|-|
+|2004  (20H1) |4.18.2004.6 |1.1.17000.2 | Technical upgrade Support (Only) |
 |1909  (19H2) |4.18.1902.5 |1.1.16700.3 | Technical upgrade Support (Only) |
 |1903  (19H1) |4.18.1902.5 |1.1.15600.4 | Technical upgrade Support (Only) |
 |1809  (RS5) |4.18.1807.18075 |1.1.15000.2 | Technical upgrade Support (Only) |

windows/security/threat-protection/microsoft-defender-atp/exploit-protection.md

@@ -11,7 +11,7 @@ ms.localizationpriority: medium
 audience: ITPro
 author: denisebmsft
 ms.author: deniseb
-ms.date: 04/02/2019
+ms.date: 10/21/2020
 ms.reviewer: 
 manager: dansimp
 ms.custom: asr
@@ -65,7 +65,7 @@ DeviceEvents
 You can review the Windows event log to see events that are created when exploit protection blocks (or audits) an app:
 
 |Provider/source | Event ID | Description|
-|---|---|---|
+|:---|:---|:---|
 |Security-Mitigations | 1 | ACG audit |
 |Security-Mitigations | 2 | ACG enforce |
 |Security-Mitigations | 3 | Do not allow child processes audit |
@@ -100,7 +100,7 @@ The mitigations available in EMET are included natively in Windows 10 (starting
 The table in this section indicates the availability and support of native mitigations between EMET and exploit protection.
 
 |Mitigation | Available under exploit protection | Available in EMET |
-|---|---|---|
+|:---|:---|:---|
 |Arbitrary code guard (ACG) | yes | yes<br />As "Memory Protection Check" |
 |Block remote images | yes | yes<br/>As "Load Library Check" |
 |Block untrusted fonts | yes | yes |
@@ -131,8 +131,6 @@ The table in this section indicates the availability and support of native mitig
 ## See also
 
 - [Protect devices from exploits](exploit-protection.md)
-- [Evaluate exploit protection](evaluate-exploit-protection.md)
-- [Enable exploit protection](enable-exploit-protection.md)
 - [Configure and audit exploit protection mitigations](customize-exploit-protection.md)
-- [Import, export, and deploy exploit protection configurations](import-export-exploit-protection-emet-xml.md)
 - [Troubleshoot exploit protection](troubleshoot-exploit-protection-mitigations.md)
+- [Optimize ASR rule deployment and detections](configure-machines-asr.md)

windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security.md

@@ -12,7 +12,7 @@ manager: dansimp
 audience: ITPro
 ms.collection: M365-security-compliance
 ms.topic: conceptual
-ms.date: 10/13/2017
+ms.date: 10/21/2020
 ms.reviewer: 
 ms.custom: asr
 ---
@@ -20,8 +20,9 @@ ms.custom: asr
 # Windows Defender Firewall with Advanced Security
 
 **Applies to**
--   Windows 10
--   Windows Server 2016
+- Windows 10
+- Windows Server 2016
+- Windows Server 2019
 
 This is an overview of the Windows Defender Firewall with Advanced Security (WFAS) and Internet Protocol security (IPsec) features.
 
@@ -48,4 +49,3 @@ To help address your organizational network security challenges, Windows Defende
 
 -   **Extends the value of existing investments.**  Because Windows Defender Firewall is a host-based firewall that is included with the operating system, there is no additional hardware or software required. Windows Defender Firewall is also designed to complement existing non-Microsoft network security solutions through a documented application programming interface (API).
 
-