merging master

browsers/edge/TOC.md

@@ -1,6 +1,5 @@
-#Table of Contents
-##[Microsoft Edge - Deployment Guide for IT Pros](microsoft-edge-deployment-guide-for-it-pros.md)
-###[Microsoft Edge requirements and language support](hardware-and-software-requirements.md)
-###[Available policies for Microsoft Edge](available-policies.md)
-###[Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
+#[Microsoft Edge - Deployment Guide for IT Pros](index.md)
+##[Microsoft Edge requirements and language support](hardware-and-software-requirements.md)
+##[Available policies for Microsoft Edge](available-policies.md)
+##[Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
 

browsers/edge/emie-to-improve-compatibility.md

@@ -83,7 +83,8 @@ You can add the **Send all intranet traffic over to Internet Explorer** Group Po
 
 ## Related topics
 * [Blog: How Microsoft Edge and Internet Explorer 11 on Windows 10 work better together in the Enterprise](http://go.microsoft.com/fwlink/p/?LinkID=624035)
-* [Enterprise Mode Site List Manager download](http://go.microsoft.com/fwlink/p/?LinkId=394378)
+* [Enterprise Mode Site List Manager for Windows 7 and Windows 8.1 download](http://go.microsoft.com/fwlink/p/?LinkId=394378)
+* [Enterprise Mode Site List Manager for Windows 10 download](http://go.microsoft.com/fwlink/?LinkId=746562)
 * [Enterprise Mode for Internet Explorer 11 (IE11)](http://go.microsoft.com/fwlink/p/?linkid=618377)
 * [Set the default browser using Group Policy]( http://go.microsoft.com/fwlink/p/?LinkId=620714)
  

browsers/internet-explorer/TOC.md

@@ -1,4 +1,4 @@
-#[IE11 Deployment Guide for IT Pros](ie11-deploy-guide/ie11-deployment-guide-for-it-pros.md)
+#[IE11 Deployment Guide for IT Pros](ie11-deploy-guide/index.md)
 ##[System requirements and language support for Internet Explorer 11](ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md)
 ##[List of updated features and tools - Internet Explorer 11 (IE11)](ie11-deploy-guide/updated-features-and-tools-with-ie11.md)
 ##[Install and Deploy Internet Explorer 11 (IE11)](ie11-deploy-guide/install-and-deploy-ie11.md)

browsers/internet-explorer/ie11-deploy-guide/activex-installation-using-group-policy.md

@@ -1,5 +1,5 @@
 ---
-Description: Using Group Policy to install ActiveX controls.
+Description: How to use Group Policy to install ActiveX controls.
 ms.assetid: 59185370-558c-47e0-930c-8a5ed657e9e3
 author: eross-msft
 ms.prod: IE11

browsers/internet-explorer/ie11-deploy-guide/add-multiple-sites-to-enterprise-mode-site-list-using-the-version-2-schema-and-enterprise-mode-tool.md

@@ -1,5 +1,5 @@
 ---
-Description: You can add multiple sites to your Enterprise Mode site list by creating a custom text (TXT) or Extensible Markup Language (XML) file of problematic sites and then adding it in the Bulk add from file area of the Windows 10 Enterprise Mode Site List Manager tool. You can only add specific URLs, not Internet or Intranet Zones.To add your websites one at a time, see Add sites to the Enterprise Mode site list using the Windows 10 Enterprise Mode Site List Manager tool.
+Description: Add multiple sites to your Enterprise Mode site list using a file and the Windows 10 Enterprise Mode Site List Manager tool.
 ms.assetid: da659ff5-70d5-4852-995e-4df67c4871dd
 author: eross-msft
 ms.prod: IE11

browsers/internet-explorer/ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md

@@ -19,7 +19,7 @@ title: Add sites to the Enterprise Mode site list using the Windows 7 and Window
 
 Enterprise Mode is a compatibility mode that runs on Internet Explorer 11, letting websites render using a modified browser configuration that’s designed to emulate either Windows Internet Explorer 7 or Windows Internet Explorer 8, avoiding the common compatibility problems associated with web apps written and tested on older versions of Internet Explorer.<p>**Important**<br>You can only add specific URLs, not Internet or Intranet Zones.
 
-<p>**Note**<br>If you need to include a lot of sites, instead of adding them one at a time, you can create a list of websites and add them all at the same time. For more information, see [Add multiple sites to the Enterprise Mode site list using a file and the Windows 7 and 8.1 Enterprise Mode Site List Manager tool](add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md).
+<p>**Note**<br>If you need to include a lot of sites, instead of adding them one at a time, you can create a list of websites and add them all at the same time. For more information, see [Add multiple sites to the Enterprise Mode site list using a file and the Windows 7 and 8.1 Enterprise Mode Site List Manager tool](add-multiple-sites-to-enterprise-mode-site-list-using-the-version-1-schema-and-enterprise-mode-tool.md).
 
 ## Adding a site to your compatibility list
 You can add individual sites to your compatibility list by using the Enterprise Mode Site List Manager tool.

browsers/internet-explorer/ie11-deploy-guide/administrative-templates-and-ie11.md

@@ -69,3 +69,7 @@ Regardless which tool you're using to edit your Group Policy settings, you'll ne
 -   **If you're using the Group Policy Management Console (GPMC) or the Local Group Policy Editor.** See [Edit Administrative Template Policy Settings](http://go.microsoft.com/fwlink/p/?LinkId=214521) for step-by-step instructions about editing your Administrative Templates.
 
 -   **If you're using GPMC with Advanced Group Policy Management (AGPM).** See [Checklist: Create, Edit, and Deploy a GPO](http://go.microsoft.com/fwlink/p/?LinkId=214522) for step-by-step instructions about how to check out a GPO from the AGPM archive, edit it, and request deployment.
+
+## Related topics
+- [Administrative templates (.admx) for Windows 10 download](http://go.microsoft.com/fwlink/p/?LinkId=746579)
+- [Administrative Templates (.admx) for Windows 8.1 and Windows Server 2012 R2](http://go.microsoft.com/fwlink/p/?LinkId=746580)

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

@@ -1,8 +1,9 @@
 ---
-Description: Use Internet Explorer to collect data on computers running Windows Internet Explorer 8 through Internet Explorer 11 on Windows 10, Windows 8.1, or Windows 7.
+description: Use Internet Explorer to collect data on computers running Windows Internet Explorer 8 through Internet Explorer 11 on Windows 10, Windows 8.1, or Windows 7.
 ms.assetid: a145e80f-eb62-4116-82c4-3cc35fd064b6
 ms.prod: IE11
-mauthor: eross-msft
+author: eross-msft
+title: Collect data using Enterprise Site Discovery
 ---
 
 # Collect data using Enterprise Site Discovery
@@ -209,7 +210,7 @@ You can collect your hardware inventory using the using the Systems Management S
 
  ![](images/wedge.gif) **To collect your inventory**
 
-1.  Using a text editor like Notepad, open the SMS\DEF.MOF file, located in your `<Config_Manager_install_location>\inboxes\clifiles.src\hinv` directory.
+1.  Using a text editor like Notepad, open the SMS\DEF.MOF file, located in your `<configmanager_install_location>\inboxes\clifiles.src\hinv` directory.
 
 2.  Add this text to the end of the file:
 
@@ -321,7 +322,7 @@ After the XML files are created, you can use your own solutions to extract and p
      <IEURLInfo>…</IEURLInfo>
 </IETelemetry>
 ```
-You can import this XML data into the [Enterprise Mode Site List Manager](http://go.microsoft.com/fwlink/p/?linkid=394378), automatically adding the included sites to your Enterprise Mode site list.
+You can import this XML data into the correct version of the Enterprise Mode Site List Manager, automatically adding the included sites to your Enterprise Mode site list.
 
  ![](images/wedge.gif) **To add your XML data to your Enterprise Mode site list**
 
@@ -363,8 +364,9 @@ You can completely remove the data stored on your employee’s computers.
 
     -   `Remove-Item -Path 'HKCU:\Software\Microsoft\Internet Explorer\WMITelemetry'`
 
- 
-
+ ## Related topics
+* [Enterprise Mode Site List Manager for Windows 10 download](http://go.microsoft.com/fwlink/?LinkId=746562)
+* [Enterprise Mode for Internet Explorer 11 (IE11)](http://go.microsoft.com/fwlink/p/?linkid=618377)
  
 
 

browsers/internet-explorer/ie11-deploy-guide/delete-sites-from-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md

@@ -1,5 +1,5 @@
 ---
-Description: You can delete a single site from your global Enterprise Mode site list. If you delete a site by mistake, you’ll need to manually add it back using the instructions in the following topics, based on operating system.
+Description: Delete a single site from your global Enterprise Mode site list.
 title: Delete sites from your Enterprise Mode site list in the Enterprise Mode Site List Manager (Internet Explorer 11 for IT Pros)
 ms.assetid: 41413459-b57f-48da-aedb-4cbec1e2981a
 author: eross-msft

browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md

@@ -260,7 +260,7 @@ We recommend that you not add any of the following items to your schema because
 - Don’t use query strings, ampersands break parsing.
 
 ## Related topics
-- [Use the Enterprise Mode Site List Manager tool](https://technet.microsoft.com/en-us/library/dn640701.aspx)
+- [Use the Enterprise Mode Site List Manager tool](use-the-enterprise-mode-site-list-manager-tool.md)
 
 
 

browsers/internet-explorer/ie11-deploy-guide/install-ie11-using-microsoft-intune.md

@@ -20,7 +20,7 @@ You can add and then deploy the IE11 package to any computer that's managed by M
 
 2.  Add your IE11 package as either an external link or as a Windows installer package (.exe or .msi). 
 
-For more info about how to decide which one to use, and how to use it, see [Adding Software Packages](http://go.microsoft.com/fwlink/p/?LinkId=301806).
+For more info about how to decide which one to use, and how to use it, see [Deploy and configure apps](http://go.microsoft.com/fwlink/p/?LinkId=301806).
 
  ![](images/wedge.gif) **To automatically deploy and install the IE11 package**
 
@@ -30,7 +30,7 @@ For more info about how to decide which one to use, and how to use it, see [Addi
 
 3.  After the package is on your employee's computers, the installation process runs, based on what you set up in your wizard. 
 
-For more info about this, see [Automatically Deploying Software Packages to Devices and Users](http://go.microsoft.com/fwlink/p/?LinkId=301807)
+For more info about this, see [Deploy and configure apps](http://go.microsoft.com/fwlink/p/?LinkId=301806).
 
  ![](images/wedge.gif) **To let your employees install the IE11 package**
 
@@ -38,7 +38,7 @@ For more info about this, see [Automatically Deploying Software Packages to Devi
 
 2.  Any employee in the assigned group can now install the package. 
 
-For more info about this, see [User Initiated Software Installation](http://go.microsoft.com/fwlink/p/?LinkId=301808)
+For more info about this, see [Update apps using Microsoft Intune](http://go.microsoft.com/fwlink/p/?LinkId=301808)
 
  
 

browsers/internet-explorer/ie11-deploy-guide/install-problems-with-ie11.md

@@ -1,5 +1,5 @@
 ---
-Description:How to fix potential installation problems with Internet Explorer 11
+description: How to fix potential installation problems with Internet Explorer 11
 ms.assetid: 3ae77745-86ac-40a9-a37d-eebbf37661a3
 author: eross-msft
 ms.prod: IE11

browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md

@@ -52,6 +52,7 @@ When IE blocks an outdated ActiveX control, you’ll see a notification bar simi
 **Internet Explorer 9 through Internet Explorer 11**
 
 ![Warning about outdated activex controls (ie9+)](images/outdatedcontrolwarning.png)
+
 **Windows Internet Explorer 8**
 
 ![Warning about outdated activex controls (ie8)](images/ieoutdatedcontrolwarning.png)
@@ -95,7 +96,7 @@ reg add "HKCU\Software\Microsoft\Internet Explorer\VersionManager" /v DownloadVe
 Turning off this automatic download breaks the out-of-date ActiveX control blocking feature by not letting the version list update with newly outdated controls, potentially compromising the security of your computer. Use this configuration option at your own risk.
 
 ## Out-of-date ActiveX control blocking on managed devices
-Out-of-date ActiveX control blocking includes 4 new Group Policy settings that you can use to manage your web browser configuration, based on your domain controller. You can download the administrative templates, including the new settings, from the [Administrative Templates for Internet Explorer](http://go.microsoft.com/fwlink/p/?LinkId=444484) page.
+Out-of-date ActiveX control blocking includes 4 new Group Policy settings that you can use to manage your web browser configuration, based on your domain controller. You can download the administrative templates, including the new settings, from the [Administrative templates (.admx) for Windows 10](http://go.microsoft.com/fwlink/p/?LinkId=746579) page or the [Administrative Templates (.admx) for Windows 8.1 and Windows Server 2012 R2](http://go.microsoft.com/fwlink/p/?LinkId=746580) page, depending on your operating system.
 
 ### Group Policy settings
 Here’s a list of the new Group Policy info, including the settings, location, requirements, and Help text strings. All of these settings can be set in either the Computer Configuration or User Configuration scope, but Computer Configuration takes precedence over User Configuration.

browsers/internet-explorer/ie11-deploy-guide/problems-after-installing-ie11.md

@@ -54,7 +54,7 @@ After you turn each item back on, see if IE crashes or slows down. Doing it this
 1.  Open Internet Explorer for the desktop, click the **Tools** menu, and then click **Internet Options**.
 
 2.  On the **Advanced** tab, go to the **Accelerated graphics** section, and then turn on Software Rendering mode by choosing the **Use software rendering instead of GPU rendering** box.<p>
-If the **Use software rendering instead of GPU rendering** option is greyed out, it means that your current video card or video driver doesn't support GPU hardware acceleration. For more information, see [Is Internet Explorer slow? 5 things to try](http://go.microsoft.com/fwlink/p/?LinkId=214531).
+If the **Use software rendering instead of GPU rendering** option is greyed out, it means that your current video card or video driver doesn't support GPU hardware acceleration. For more information, see [Windows 10 Support](http://go.microsoft.com/fwlink/?LinkId=746588).
 
 ## Adaptive streaming and DRM playback don’t work with Windows Server 2012 R2
 IE11 in Windows Server 2012 R2 doesn’t include media features like adaptive streaming or Digital Rights Management (DRM) playback. To add these features, you’ll need to download and install the Media Feature Pack from the [Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=320789), as well as an app that uses PlayReady DRM from the Windows Store, such as the Xbox Music app or Xbox Video app. The app must be installed to specifically turn on DRM features, while all other media features are installed with the Media Feature Pack.

browsers/internet-explorer/ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md

@@ -43,7 +43,7 @@ Some of the components in this table might also need additional system resources
 You might experience start up issues where IE11 fails to launch an application that uses managed browser hosting controls with your legacy apps. This is because, starting with Internet Explorer 10, the browser started blocking legacy apps from using the .NET Framework 1.1 and 2.0. To fix this problem, see [.NET Framework problems with Internet Explorer 11](net-framework-problems-with-ie11.md).
 
 ## Support for multiple languages
-IE11 is available in 108 languages for Windows 8.1 and 97 languages for Windows 7 with SP1. For the list of languages and download links, see [Windows 8 Language Packs](http://go.microsoft.com/fwlink/p/?LinkId=281818) and [Windows 7 Language Packs](http://go.microsoft.com/fwlink/p/?LinkId=281819).
+IE11 is available in 108 languages for Windows 8.1 and Windows 10 and in 97 languages for Windows 7 with SP1. For the list of languages and download links, see [Available language packs based on operating system](http://go.microsoft.com/fwlink/p/?LinkId=281818).
 
 Computers running localized versions of Windows should run the same version of IE11. For example, if your employees use the Spanish edition of Windows, you should deploy the Spanish version of IE11. On the other hand, if your employees use multiple localized versions of Windows, like Spanish, French, and Catalan, you should install IE11 in one of the languages, and then install language packs for the others.
 

browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager-tool.md

@@ -1,6 +1,6 @@
 ---
 Description: Use the topics in this section to learn about how to use the Enterprise Mode Site List Manager tool.
-ms.assetid: 
+ms.assetid: f4dbed4c-08ff-40b1-ab3f-60d3b6e8ec9b
 author: eross-msft
 ms.prod: IE11
 ms.mktglfcycl: deploy
@@ -39,7 +39,7 @@ The following topics give you more information about the things that you can do
 |[Add sites to the Enterprise Mode site list using the Windows 10 Enterprise Mode Site List Manager tool](add-single-sites-to-enterprise-mode-site-list-using-the-version-2-enterprise-mode-tool.md) |How to add websites to your site list using the Windows 10 Enterprise Mode Site List Manager. |
 |[Add sites to the Enterprise Mode site list using the Windows 7 and Windows 8.1 Enterprise Mode Site List Manager tool](add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md) |How to add websites to your site list using the Windows 7 and Windows 8.1 Enterprise Mode Site List Manager. |
 |[Add multiple sites to the Enterprise Mode site list using a file and the Windows 10 Enterprise Mode Site List Manager tool](add-multiple-sites-to-enterprise-mode-site-list-using-the-version-2-schema-and-enterprise-mode-tool.md) |How to add several websites to your site list at the same time, using a text or XML file and the Windows 10 Enterprise Mode Site List Manager. |
-|[Add multiple sites to the Enterprise Mode site list using a file and the Windows 7 and Windows 8.1 Enterprise Mode Site List Manager tool]add-multiple-sites-to-enterprise-mode-site-list-using-the-version-1-schema-and-enterprise-mode-tool.md) |How to add several websites to your site list at the same time, using a text or XML file and the Windows 7 and Windows 8.1 Enterprise Mode Site List Manager. |
+|[Add multiple sites to the Enterprise Mode site list using a file and the Windows 7 and Windows 8.1 Enterprise Mode Site List Manager tool](add-multiple-sites-to-enterprise-mode-site-list-using-the-version-1-schema-and-enterprise-mode-tool.md) |How to add several websites to your site list at the same time, using a text or XML file and the Windows 7 and Windows 8.1 Enterprise Mode Site List Manager. |
 |[Edit the Enterprise Mode site list using the Enterprise Mode Site List Manager tool](edit-the-enterprise-mode-site-list-using-the-enterprise-mode-site-list-manager.md) |How to edit the compatibility mode for specific websites.<p>This topic applies to both versions of the Enterprise Mode Site List Manager tool. |
 |[Fix validation problems using the Enterprise Mode Site List Manager tool](fix-validation-problems-using-the-enterprise-mode-site-list-manager.md) |How to fix common site list validation errors.<p>This topic applies to both versions of the Enterprise Mode Site List Manager tool. |
 |[Search your Enterprise Mode site list in the Enterprise Mode Site List Manager tool](search-your-enterprise-mode-site-list-in-the-enterprise-mode-site-list-manager.md) |How to look to see if a site is already in your global Enterprise Mode site list.<p>This topic applies to both versions of the Enterprise Mode Site List Manager tool. |

browsers/internet-explorer/ie11-faq/faq-for-it-pros-ie11.md

@@ -59,7 +59,7 @@ Supported web standards include:
 For more information about specific changes and additions, see the [IE11 guide for developers](http://go.microsoft.com/fwlink/p/?LinkId=313188).
 
 **Q: What test tools exist to test for potential application compatibility issues?**<br>
-The Compat Inspector tool supports Windows Internet Explorer 9 through IE11. For more information, see [Compat Inspector User Guide](http://go.microsoft.com/fwlink/p/?LinkId=313189). In addition, you can use the new [F12 Developer Tools](http://go.microsoft.com/fwlink/p/?LinkId=313190) that are included with IE11, or the [modern.ie](http://go.microsoft.com/fwlink/p/?linkid=308902) website for older versions of IE.
+The Compat Inspector tool supports Windows Internet Explorer 9 through IE11. For more information, see [Compat Inspector User Guide](http://go.microsoft.com/fwlink/p/?LinkId=313189). In addition, you can use the new [F12 Developer Tools](http://go.microsoft.com/fwlink/p/?LinkId=313190) that are included with IE11, or the [modern.ie](http://go.microsoft.com/fwlink/p/?linkid=308902) website for Microsoft Edge.
 
 **Q: Why am I having problems launching my legacy apps with Internet Explorer 11**?<br>
 It’s most likely because IE no longer starts apps that use managed browser hosting controls, like in the .NET Framework 1.1 and 2.0. You can get IE11 to use managed browser hosting controls again, by:
@@ -71,7 +71,7 @@ It’s most likely because IE no longer starts apps that use managed browser hos
 For more information, see the [Web Applications](http://go.microsoft.com/fwlink/p/?LinkId=308903) section of the Application Compatibility in the .NET Framework 4.5 page.
 
 **Q: Is there a compatibility list for IE?**<br>
-Yes. You can review the XML-based [compatibility list](http://go.microsoft.com/fwlink/p/?LinkId=242586).
+Yes. You can review the XML-based [compatibility version list](http://go.microsoft.com/fwlink/p/?LinkId=403864).
 
 **Q: What is Enterprise Mode?**<br>
 Enterprise Mode is a compatibility mode designed for Enterprises. This mode lets websites render using a modified browser configuration that’s designed to avoid the common compatibility problems associated with web apps written and tested on older versions of IE, like Windows Internet Explorer 7 or Windows Internet Explorer 8.<p>
@@ -119,7 +119,7 @@ Yes. The Internet Explorer Administration Kit 11 (IEAK 11) is available for do
 -   [Internet Explorer Administration Kit 11 product documentation](http://go.microsoft.com/fwlink/p/?LinkId=327739) on TechNet.
 
 **Q: Where can I get more information about IE11 for IT pros?**<br>
-Visit the [Springboard Series for IE11](http://go.microsoft.com/fwlink/p/?LinkId=313191) webpage on TechNet.
+Visit the [Springboard Series for Microsoft Browsers](http://go.microsoft.com/fwlink/p/?LinkId=313191) webpage on TechNet.
 
 **Q: Is there a version of the Internet Explorer Blocker Toolkit that will prevent automatic installation of IE11?**<br>
 Yes. The IE11 Blocker Toolkit is available for download. For more information, see [Toolkit to Disable Automatic Delivery of IE11](http://go.microsoft.com/fwlink/p/?LinkId=328195) on the Microsoft Download Center.
@@ -127,7 +127,7 @@ Yes. The IE11 Blocker Toolkit is available for download. For more information, s
 **Q: Can I customize settings for IE on Windows 8.1?**<br>
 Settings can be customized in the following ways:
 
--   IE11**Settings** charm.
+-   IE11 **Settings** charm.
 
 -   IE11-related Group Policy settings.
 

devices/surface-hub/TOC.md

@@ -0,0 +1 @@
+#[Placeholder](index.md)

devices/surface-hub/index.md

@@ -0,0 +1 @@
+#Placeholder content

devices/surface/TOC.md

@@ -0,0 +1 @@
+#[Placeholder](index.md)

devices/surface/index.md

@@ -0,0 +1 @@
+#Placeholder content