Merge branch 'master' into bl-7475998

This commit is contained in:
Brian Lich
2016-07-13 10:04:56 -07:00
308 changed files with 9111 additions and 802 deletions

View File

@ -28,7 +28,18 @@
#### [Testing scenarios for enterprise data protection (EDP)](testing-scenarios-for-edp.md)
## [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md)
## [VPN profile options](vpn-profile-options.md)
## [Windows security baselines](windows-security-baselines.md)
## [Security technologies](security-technologies.md)
### [Access Control Overview](access-control.md)
#### [Dynamic Access Control Overview](dynamic-access-control.md)
#### [Security identifiers](security-identifiers.md)
#### [Security Principals](security-principals.md)
#### [Local Accounts](local-accounts.md)
#### [Active Directory Accounts](active-directory-accounts.md)
#### [Microsoft Accounts](microsoft-accounts.md)
#### [Service Accounts](service-accounts.md)
#### [Active Directory Security Groups](active-directory-security-groups.md)
#### [Special Identities](special-identities.md)
### [AppLocker](applocker-overview.md)
#### [Administer AppLocker](administer-applocker.md)
##### [Maintain AppLocker policies](maintain-applocker-policies.md)
@ -670,7 +681,6 @@
#### [Minimum requirements](minimum-requirements-windows-defender-advanced-threat-protection.md)
#### [Data storage and privacy](data-storage-privacy-windows-defender-advanced-threat-protection.md)
#### [Onboard endpoints and set up access](onboard-configure-windows-defender-advanced-threat-protection.md)
<!--##### [Service onboarding](service-onboarding-windows-defender-advanced-threat-protection.md)-->
##### [Configure endpoints](configure-endpoints-windows-defender-advanced-threat-protection.md)
##### [Configure proxy and Internet settings](configure-proxy-internet-windows-defender-advanced-threat-protection.md)
##### [Additional configuration settings](additional-configuration-windows-defender-advanced-threat-protection.md)
@ -692,6 +702,7 @@
### [Windows Defender in Windows 10](windows-defender-in-windows-10.md)
#### [Update and manage Windows Defender in Windows 10](get-started-with-windows-defender-for-windows-10.md)
#### [Configure Windows Defender in Windows 10](configure-windows-defender-in-windows-10.md)
#### [Use PowerShell cmdlets for Windows Defender](use-powershell-cmdlets-windows-defender-for-windows-10.md)
#### [Troubleshoot Windows Defender in Windows 10](troubleshoot-windows-defender-in-windows-10.md)
### [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md)
#### [Isolating Windows Store Apps on Your Network](isolating-apps-on-your-network.md)