Merge remote-tracking branch 'refs/remotes/origin/master' into live

browsers/internet-explorer/ie11-deploy-guide/.vscode/settings.json

@@ -0,0 +1,5 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "editor.snippetSuggestions": "none",
+    "editor.quickSuggestions": false
+}

browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md

@@ -79,6 +79,7 @@ The codes in this table can tell you what document mode was set by IE for a webp
 |5 |Page is using an X-UA-compatible HTTP header. |
 |6 |Page appears on an active **Compatibility View** list. |
 |7 |Page is using native XML parsing. |
+|9 |Page is using a special Quirks Mode Emulation (QME) mode that uses the modern layout engine, but the quirks behavior of Internet Explorer 5. |
 
 #### Browser state reason
 The codes in this table can tell you why the browser is in its current state. Also called “browser mode”.<br>These codes only apply to Internet Explorer 10 and Internet Explorer 11.

windows/keep-secure/windows-defender-advanced-threat-protection.md

@@ -20,7 +20,7 @@ author: mjcaparas
 - Windows 10 Pro Education
 - Windows Defender Advanced Threat Protection (Windows Defender ATP)
 
-Windows Defender Advanced Threat Protection (Windows Defender ATP) is a security service, built into Windows 10 that enables enterprise customers to detect, investigate, and respond to advanced threats on their networks.
+Windows Defender Advanced Threat Protection (Windows Defender ATP) is a security service that enables enterprise customers to detect, investigate, and respond to advanced threats on their networks.
 
 Windows Defender ATP uses the following combination of technology built into Windows 10 and Microsoft's robust cloud service:
 

windows/manage/uev-release-notes-1607.md

@@ -16,9 +16,9 @@ This topic includes information required to successfully install and use UE-V th
 
 ### Upgrading from UE-V 1.0 to the in-box version of UE-V is blocked
 
-Version 1.0 of UE-V includes client-side caching technology used to pin the UE-V sync folder, however, this technology was removed in UE-V 2.x. As a result, UE-V 1.0 users are blocked from upgrading to UE-V for Windows 10, version 1607.
+Version 1.0 of UE-V used Offline Files (Client Side Caching) for settings synchronization and pinned the UE-V sync folder to be available when the network was offline, however, this technology was removed in UE-V 2.x. As a result, UE-V 1.0 users are blocked from upgrading to UE-V for Windows 10, version 1607.
 
-WORKAROUND: Unpin the UE-V 1.0 client-side caching sync folder and then upgrade to the in-box version included in UE-V for Windows, version 1607 release.
+WORKAROUND: Remove the UE-V 1.0 sync folder from the Offline Files configuration and then upgrade to the in-box version of UE-V for Windows, version 1607 release.
 
 ### UE-V settings location templates for Skype cause Skype to crash
 

windows/plan/TOC.md

@@ -1,5 +1,5 @@
 # [Plan for Windows 10 deployment](index.md)
-## [Windows 10 servicing options](windows-10-servicing-options.md)
+## [Windows 10 servicing overview](windows-10-servicing-options.md)
 ## [Windows 10 deployment considerations](windows-10-deployment-considerations.md)
 ## [Windows 10 compatibility](windows-10-compatibility.md)
 ## [Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md)

windows/plan/windows-10-servicing-options.md

@@ -1,5 +1,5 @@
 ---
-title: Windows 10 servicing options (Windows 10)
+title: Windows 10 servicing overview (Windows 10)
 description: Windows 10 provides a new model for organizations to deploy and upgrade Windows by providing updates to features and capabilities through a continual process.
 ms.assetid: 6EF0792C-B587-497D-8489-4A7F5848D92A
 keywords: deploy, upgrade, update, servicing