Merge branch 'atp-phase2-justinha' of https://cpubwin.visualstudio.com/_git/it-client into atp-phase2-justinha

windows/security/index.yml

@@ -22,7 +22,7 @@ metadata:
 
   manager: brianlic
 
-  ms.date: 07/12/2018
+  ms.date: 08/01/2018
 
   ms.topic: article
 

windows/security/threat-protection/TOC.md

@@ -149,32 +149,45 @@
 
 
 ### [Attack surface reduction - Chris, Amitai, Justin](windows-defender-exploit-guard\attack-surface-reduction-exploit-guard.md)
-#### [Hardware based isolation](windows-defender-application-guard/wd-app-guard-overview.md)
+#### [Hardware-based isolation](windows-defender-application-guard/wd-app-guard-overview.md)
 ##### [Frequently Asked Questions - Windows Defender Application Guard](windows-defender-application-guard/faq-wd-app-guard.md)
-#### [Windows Defender Application Control](windows-defender-application-control/windows-defender-application-control.md)
 
+#### [Application Control](windows-defender-application-control/windows-defender-application-control.md)
+##### [Design](windows-defender-application-control/windows-defender-application-control-design-guide.md)
+##### [Deploy](windows-defender-application-control/windows-defender-application-control-deployment-guide.md)
+##### [AppLocker](windows-defender-application-control/applocker/applocker-overview.md)
 
 #### [Exploit protection - Chris, Amitai, Justin](windows-defender-exploit-guard\exploit-protection-exploit-guard.md)
-##### [Comparison with Enhanced Mitigation Experience Toolkit](windows-defender-exploit-guard\emet-exploit-protection-exploit-guard.md)
-
-##### [Enable Exploit protection - Chris, Amitai, Justin](windows-defender-exploit-guard\enable-exploit-protection.md)
-##### [Customize Exploit protection](windows-defender-exploit-guard\customize-exploit-protection.md)
-###### [Import, export, and deploy Exploit protection configurations](windows-defender-exploit-guard/import-export-exploit-protection-emet-xml.md)
+##### [Compare with EMET](windows-defender-exploit-guard\emet-exploit-protection-exploit-guard.md)
+##### [Evaluate](windows-defender-exploit-guard\evaluate-exploit-protection.md)
+##### [Enable](windows-defender-exploit-guard\enable-exploit-protection.md)
+##### [Customize](windows-defender-exploit-guard\customize-exploit-protection.md)
+###### [Import, export, and deploy](windows-defender-exploit-guard/import-export-exploit-protection-emet-xml.md)
 
 #### [Network Protection](windows-defender-exploit-guard\network-protection-exploit-guard.md)
+##### [Evaluate](windows-defender-exploit-guard\evaluate-network-protection.md)
+##### [Enable](windows-defender-exploit-guard\enable-network-protection.md)
+##### [Troubleshoot](windows-defender-exploit-guard\troubleshoot-np.md)
 
-##### [Enable Network Protection](windows-defender-exploit-guard\enable-network-protection.md)
-##### [Troubleshoot Network protection](windows-defender-exploit-guard\troubleshoot-np.md)
 #### [Controlled folder access](windows-defender-exploit-guard\controlled-folders-exploit-guard.md)
-
-##### [Enable Controlled folder access](windows-defender-exploit-guard\enable-controlled-folders-exploit-guard.md)
-##### [Customize Controlled folder access](windows-defender-exploit-guard\customize-controlled-folders-exploit-guard.md)
+##### [Evaluate](windows-defender-exploit-guard\evaluate-controlled-folder-access.md)
+##### [Enable](windows-defender-exploit-guard\enable-controlled-folders-exploit-guard.md)
+##### [Customize](windows-defender-exploit-guard\customize-controlled-folders-exploit-guard.md)
 
 
+#### [ASR controls]
+##### [Evaluate](windows-defender-exploit-guard\evaluate-attack-surface-reduction.md)
+##### [Enable](windows-defender-exploit-guard\enable-attack-surface-reduction.md)
+##### [Customize](windows-defender-exploit-guard\customize-attack-surface-reduction.md)
+##### [Troubleshoot](windows-defender-exploit-guard\troubleshoot-asr.md)
+
+#### [Network firewall](windows-firewall\windows-firewall-with-advanced-security.md)
+##### [Isolate Store Apps](windows-firewall\isolating-apps-on-your-network.md)
+##### [Secure IPsec Connections](windows-firewall\securing-end-to-end-ipsec-connections-by-using-ikev2.md)
+##### [PowerShell](windows-firewall\windows-firewall-with-advanced-security-administration-with-windows-powershell.md)
+##### [Design](windows-firewall\windows-firewall-with-advanced-security-design-guide.md)
+##### [Deploy](windows-firewall\windows-firewall-with-advanced-security-deployment-guide.md)
 
-##### [Enable Attack surface reduction](windows-defender-exploit-guard\enable-attack-surface-reduction.md)
-##### [Customize Attack surface reduction](windows-defender-exploit-guard\customize-attack-surface-reduction.md)
-##### [Troubleshoot Attack surface reduction rules](windows-defender-exploit-guard\troubleshoot-asr.md)
 
 ### [Next gen protection - Andrea, Chris, Amitai](windows-defender-antivirus\configure-windows-defender-antivirus-features.md)
 #### [Utilize Microsoft cloud-delivered protection](windows-defender-antivirus\utilize-microsoft-cloud-protection-windows-defender-antivirus.md)
@@ -494,7 +507,7 @@
 ####### [Event 4733 S: A member was removed from a security-enabled local group.](auditing/event-4733.md)
 ####### [Event 4734 S: A security-enabled local group was deleted.](auditing/event-4734.md)
 ####### [Event 4735 S: A security-enabled local group was changed.](auditing/event-4735.md)
-####### [Event 4764 S: A group’s type was changed.](auditing/event-4764.md)
+####### [Event 4764 S: A group<EFBFBD>s type was changed.](auditing/event-4764.md)
 ####### [Event 4799 S: A security-enabled local group membership was enumerated.](auditing/event-4799.md)
 ###### [Audit User Account Management](auditing/audit-user-account-management.md)
 ####### [Event 4720 S: A user account was created.](auditing/event-4720.md)