From 303ab9f3adad1f866e558688b0096d56d087cba1 Mon Sep 17 00:00:00 2001
From: Joey Caparas <macapara@microsoft.com>
Date: Tue, 10 May 2016 16:38:41 +1000
Subject: [PATCH] commend out AAD, comment out manual reg mods, update links to
 conf proxy & internet topic

---
 ...windows-defender-advanced-threat-protection.md |  8 ++++----
 ...windows-defender-advanced-threat-protection.md | 15 +++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md b/windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md
index 2df5b585fd..45d894c1e5 100644
--- a/windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md
+++ b/windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md
@@ -1,5 +1,5 @@
 ---
-title: Configure Windows Defender ATP proxy and Internet connectivity settings
+title: Configure Windows Defender ATP endpoint proxy and Internet connectivity settings
 description: Configure the Windows Defender ATP proxy and internet settings to enable communication with the cloud service.
 keywords: configure, proxy, internet, internet connectivity, settings, proxy settings
 search.product: eADQiWindows 10XVcnh
@@ -10,7 +10,7 @@ author: mjcaparas
 ---
 
 
-# Configure proxy and Internet connectivity settings
+# Configure Windows Defender ATP endpoint proxy and Internet connectivity settings
 
 **Applies to:**
 
@@ -24,11 +24,11 @@ The embedded Windows Defender ATP sensor runs in system context using the LocalS
 
 The WinHTTP configuration setting is independent of the Windows Internet (WinINet) internet browsing proxy settings and can only discover a proxy server by using the following discovery methods:
 
-- Configure Web Proxy Auto Detect (WPAD) settings and configure Windows to automatically detect the proxy server 
+- Configure Web Proxy Auto Detect (WPAD) settings and configure Windows to automatically detect the proxy server
 
 - Configure the proxy server manually using Netsh
 
-## Configure Web Proxy Auto Detect (WPAD) settings and proxy server 
+## Configure Web Proxy Auto Detect (WPAD) settings and proxy server
 
 Configure WPAD in the environment and configure Windows to automatically detect the proxy server through Policy or the local Windows settings.
 
diff --git a/windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md b/windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md
index 45afdb8c1b..0044cd4e74 100644
--- a/windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md
+++ b/windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md
@@ -21,8 +21,8 @@ There are some minimum requirements for onboarding your network and endpoints.
 ## Minimum requirements
 
 ### Network and data storage and configuration requirements
-Your organization must use Azure Active Directory (AAD) to manage users. AAD is used during
-service onboarding to manage user-based access to the [Windows Defender ATP portal](https://securitycenter.windows.com/).
+<!---Your organization must use Azure Active Directory (AAD) to manage users. AAD is used during
+service onboarding to manage user-based access to the [Windows Defender ATP portal](https://securitycenter.windows.com/).--->
 
 <!--If you’d like help with using AAD to set up user access, contact the
 [Windows Defender ATP Yammer group](https://www.yammer.com/wsscengineering/\#/threads/inGroup?type=in\_group&feedId=7108776&view=all)
@@ -47,12 +47,11 @@ TAP.
 > **Note**&nbsp;&nbsp; Endpoints that are running Windows
 Server and mobile versions of Windows are not supported.
 
-Internet connectivity on endpoints is also required. See the
-[Troubleshoot Windows Defender Advanced Threat Protection onboarding issues](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md)
-section for additional proxy configuration settings.
+Internet connectivity on endpoints is also required. See
+[Configure Windows Defender ATP endpoint proxy and Internet connectivity settings](configure-proxy-internet-windows-defender-advanced-threat-protection.md)
+ additional proxy configuration settings.
 
-Before you configure endpoints, the telemetry and diagnostics service must be enabled. The service is enabled by default in Windows 10 TAP, but if it has been
-disabled you can turn it on by following the instructions in the
+Before you configure endpoints, the telemetry and diagnostics service must be enabled. The service is enabled by default in Windows 10 TAP, but if it has been disabled you can turn it on by following the instructions in the
 [Troubleshoot Windows Defender Advanced Threat Protection onboarding issues](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md) section.
 
 ### Deployment channel operating system requirements
@@ -69,4 +68,4 @@ Deployment channel | Minimum server requirements
 :---|:---
 Group Policy settings | Windows Server 2008 R2
 System Center Configuration Manager | SCCM 2012
-Manual registry modifications | No minimum requirements
+<!--Manual registry modifications | No minimum requirements-->