From 1f3b23b2c4ff5c42a58ebfca51dc078688f3b2af Mon Sep 17 00:00:00 2001 From: LizRoss Date: Wed, 3 Aug 2016 17:37:03 -0700 Subject: [PATCH 01/14] Fixed improper formatting in topic --- .../manage/appv-deploying-the-appv-server.md | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/windows/manage/appv-deploying-the-appv-server.md b/windows/manage/appv-deploying-the-appv-server.md index 38fa2690b4..b39b978779 100644 --- a/windows/manage/appv-deploying-the-appv-server.md +++ b/windows/manage/appv-deploying-the-appv-server.md @@ -14,24 +14,23 @@ You can install the App-V server features by using different deployment configur For information about deploying the App-V Server, see [About App-V](appv-about-appv.md). -> [!IMPORTANT] -> Before you install and configure the App-V servers, you must specify a port where each component will be hosted. You must also add the associated firewall rules to allow incoming requests to access the specified ports. The installer does not modify firewall settings. +>**Important**
Before you install and configure the App-V servers, you must specify a port where each component will be hosted. You must also add the associated firewall rules to allow incoming requests to access the specified ports. The installer does not modify firewall settings. ## Download and install App-V Server components App-V offers the following five server components, each of which serves a specific purpose in an App-V environment. All five server components are included in the Microsoft Desktop Optimization Pack (MDOP) 2015 ISO package, which can be downloaded from the [Microsoft Developer Network (MSDN) subscription site](https://msdn.microsoft.com/en-us/subscriptions/downloads/default.aspx#FileId=65215). You must have a MSDN subscription to download MDOP. -- **Management server**. Use the App-V management server and console to manage your App-V infrastructure. See [Administering App-V with the management console](appv-administering-virtual-applications-with-the-management-console.md) for more information about the management server. +- **Management server.** Use the App-V management server and console to manage your App-V infrastructure. See [Administering App-V with the management console](appv-administering-virtual-applications-with-the-management-console.md) for more information about the management server. - **Note**: If you are using App-V with your electronic software distribution solution, you don’t need to use the management server and console. However, you can still take advantage of the reporting and streaming capabilities in App-V. + >**Note**
If you are using App-V with your electronic software distribution solution, you don’t need to use the management server and console. However, you can still take advantage of the reporting and streaming capabilities in App-V. -- **Management database**. Use the App-V management database to facilitate database pre-deployments for App-V management. See [How to deploy the App-V server components](appv-deploy-the-appv-server.md) for more information about the management database. +- **Management database.** Use the App-V management database to facilitate database pre-deployments for App-V management. See [How to deploy the App-V server components](appv-deploy-the-appv-server.md) for more information about the management database. -- **Publishing server**. Use the App-V publishing server to host and stream virtual applications. The publishing server supports the HTTP and HTTPS protocols and does not require a database connection. See [How to install the App-V publishing server](appv-install-the-publishing-server-on-a-remote-computer.md) for more information about configuring the publishing server. +- **Publishing server.** Use the App-V publishing server to host and stream virtual applications. The publishing server supports the HTTP and HTTPS protocols and does not require a database connection. See [How to install the App-V publishing server](appv-install-the-publishing-server-on-a-remote-computer.md) for more information about configuring the publishing server. -- **Reporting server**. Use the App-V reporting server to generate reports that help you manage your App-V infrastructure. The reporting server requires a connection to the reporting database. See [About App-V reporting](appv-reporting.md) for more information about the reporting capabilities in App-V. +- **Reporting server.** Use the App-V reporting server to generate reports that help you manage your App-V infrastructure. The reporting server requires a connection to the reporting database. See [About App-V reporting](appv-reporting.md) for more information about the reporting capabilities in App-V. -- **Reporting database**. Use the App-V reporting database to facilitate database pre-deployments for App-V reporting. See [How to deploy the App-V server](appv-deploy-the-appv-server.md) for more information about the reporting database. +- **Reporting database.** Use the App-V reporting database to facilitate database pre-deployments for App-V reporting. See [How to deploy the App-V server](appv-deploy-the-appv-server.md) for more information about the reporting database. In large organizations, you might want to install more than one instance of the server components to get: @@ -42,34 +41,33 @@ In large organizations, you might want to install more than one instance of the - Scalability to support a high load. For example, you can install additional servers behind a network load balancer. ## App-V standalone deployment - - The App-V standalone deployment provides a good topology for a small deployment or a test environment. When you use this type of implementation, all server components are deployed to a single computer. The services and associated databases will compete for the resources on the computer that runs the App-V components. Therefore, you should not use this topology for larger deployments. - [How to Deploy the App-V Server](appv-deploy-the-appv-server.md) + - [How to Deploy the App-V Server Using a Script](appv-deploy-the-appv-server-with-a-script.md) ## App-V Server distributed deployment - The distributed deployment topology can support a large App-V client base and it allows you to more easily manage and scale your environment. When you use this type of deployment, the App-V Server components are deployed across multiple computers, based on the structure and requirements of the organization. - [How to Install the Management and Reporting Databases on Separate Computers from the Management and Reporting Services](appv-install-the-management-and-reporting-databases-on-separate-computers.md) + - [How to install the Management Server on a Standalone Computer and Connect it to the Database](appv-install-the-management-server-on-a-standalone-computer.md) + - [How to Deploy the App-V Server Using a Script](appv-deploy-the-appv-server-with-a-script.md) + - [How to Install the Publishing Server on a Remote Computer](appv-install-the-publishing-server-on-a-remote-computer.md) + - [How to install the Management Server on a Standalone Computer and Connect it to the Database](appv-install-the-management-server-on-a-standalone-computer.md) ## Using an Enterprise Software Distribution (ESD) solution and App-V - You can also deploy the App-V clients and packages by using an ESD without having to deploy App-V. The full capabilities for integration will vary depending on the ESD that you use. -> [!NOTE] -> The App-V reporting server and reporting database can still be deployed alongside the ESD to collect the reporting data from the App-V clients. However, the other three server components should not be deployed, because they will conflict with the ESD functionality. +>**Note**
The App-V reporting server and reporting database can still be deployed alongside the ESD to collect the reporting data from the App-V clients. However, the other three server components should not be deployed, because they will conflict with the ESD functionality. [Deploying App-V Packages by Using Electronic Software Distribution (ESD)](appv-deploying-packages-with-electronic-software-distribution-solutions.md) ## App-V Server logs - You can use App-V server log information to help troubleshoot the server installation and operational events while using App-V. The server-related log information can be reviewed with the **Event Viewer**. The following line displays the specific path for Server-related events: **Event Viewer \\ Applications and Services Logs \\ Microsoft \\ App V** @@ -79,7 +77,6 @@ Associated setup logs are saved in the following directory: **%temp%** ## App-V reporting - App-V reporting allows App-V clients to collect data and then send it back to be stored in a central repository. You can use this information to get a better view of the virtual application usage within your organization. The following list displays some of the types of information the App-V client collects: - Information about the computer that runs the App-V client. @@ -92,13 +89,10 @@ The reporting information will be maintained until it is successfully sent to th If you want to retrieve report information, you must use Microsoft SQL Server Reporting Services (SSRS) which is available with Microsoft SQL. SSRS is not installed when you install the App-V reporting server and it must be deployed separately to generate the associated reports. - For more information, see [About App-V Reporting](appv-reporting.md) and [How to Enable Reporting on the App-V Client by Using PowerShell](appv-enable-reporting-on-the-appv-client-with-powershell.md). ## Other resources for the App-V server - - [Deploying App-V](appv-deploying-appv.md) ## Have a suggestion for App-V? - -Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). For App-V issues, use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/en-US/home?forum=mdopappv). +Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). For App-V issues, use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/en-US/home?forum=mdopappv). \ No newline at end of file From 0804a33ef1628c2bac2f4c36f8082be6fe044a4a Mon Sep 17 00:00:00 2001 From: LizRoss Date: Wed, 3 Aug 2016 17:54:20 -0700 Subject: [PATCH 02/14] Fixed note that was missed previously --- windows/manage/appv-deploying-the-appv-server.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/windows/manage/appv-deploying-the-appv-server.md b/windows/manage/appv-deploying-the-appv-server.md index c50f2b96fc..309a23843c 100644 --- a/windows/manage/appv-deploying-the-appv-server.md +++ b/windows/manage/appv-deploying-the-appv-server.md @@ -36,11 +36,9 @@ All five App-V server components are included in the Microsoft Desktop Optimizat - The [MSDN (Microsoft Developer Network) subscriptions site](https://msdn.microsoft.com/en-us/subscriptions/downloads/default.aspx#FileId=65215) You must have a MSDN subscription to download the MDOP ISO package from the MSDN subscriptions site. -- The [Volume Licensing Service Center](https://www.microsoft.com/en-us/licensing/default.aspx) if you're using [Windows 10 for Enterprise or Education](https://www.microsoft.com/en-us/WindowsForBusiness/windows-product-home). - - - >**Note** If you're already using App-V 5.x, you don't need to re-deploy the App-V server components as they haven't changed since App-V 5.0 was released. +- The [Volume Licensing Service Center](https://www.microsoft.com/en-us/licensing/default.aspx) if you're using [Windows 10 for Enterprise or Education](https://www.microsoft.com/en-us/WindowsForBusiness/windows-product-home). + >**Note**
If you're already using App-V 5.x, you don't need to re-deploy the App-V server components as they haven't changed since App-V 5.0 was released. In large organizations, you might want to install more than one instance of the server components to get: From 2bd166c8ba348465360125f1ad67b5c416e7ac68 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 4 Aug 2016 07:26:07 -0700 Subject: [PATCH 03/14] Roger fix sample --- windows/manage/configure-windows-10-taskbar.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/windows/manage/configure-windows-10-taskbar.md b/windows/manage/configure-windows-10-taskbar.md index 0424d18166..752739b1ea 100644 --- a/windows/manage/configure-windows-10-taskbar.md +++ b/windows/manage/configure-windows-10-taskbar.md @@ -62,7 +62,6 @@ The easiest way to find this data for an application is to: xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout" xmlns:taskbar="http://schemas.microsoft.com/Start/2014/TaskbarLayout" Version="1"> - @@ -76,7 +75,14 @@ The easiest way to find this data for an application is to: ### Sample taskbar configuration added to Start layout XML ```xml - + + + @@ -87,6 +93,7 @@ The easiest way to find this data for an application is to: + From b4e1922b02da9e18e1cb5b7d675b36b69f88bd8b Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 4 Aug 2016 07:28:07 -0700 Subject: [PATCH 04/14] add fix to change history --- .../change-history-for-manage-and-update-windows-10.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md index 60d0c5fc89..67f0217f4c 100644 --- a/windows/manage/change-history-for-manage-and-update-windows-10.md +++ b/windows/manage/change-history-for-manage-and-update-windows-10.md @@ -13,6 +13,12 @@ author: jdeckerMS This topic lists new and updated topics in the [Manage and update Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md). +## August 2016 + +| New or changed topic | Description | +| --- | --- | +| [Configure Windows 10 taskbar](configure-windows-10-taskbar.md) | Updated sample XML for combined Start and taskbar layout | + ## RELEASE: Windows 10, version 1607 The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added: From eb3165f758e2afec7c7676370e5135b9c3edd641 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 4 Aug 2016 08:07:20 -0700 Subject: [PATCH 05/14] Added tables about the returned reason codes --- ...ct-data-using-enterprise-site-discovery.md | 64 +++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md index 86fa6692fe..b9796882f3 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md +++ b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md @@ -64,9 +64,50 @@ Data is collected on the configuration characteristics of IE and the sites it br |Number of visits | X | X | X | X |Number of times a site has been visited. | |Zone | X | X | X | X |Zone used by IE to browse sites, based on browser settings. | -

**Important**
By default, IE doesn’t collect this data; you have to turn this feature on if you want to use it. After you turn on this feature, data is collected on all sites visited by IE, except during InPrivate sessions. -The data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. +**Important**
By default, IE doesn’t collect this data; you have to turn this feature on if you want to use it. After you turn on this feature, data is collected on all sites visited by IE, except during InPrivate sessions. Additionally, the data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. + +### Understanding the returned reason codes +The following tables provide more info about the Document mode reason, Browser state reason, and the Zone codes that are returned as part of your data collection. + +#### DocMode reason +The codes in this table can tell you what document mode was set by IE for a webpage. These codes only apply to Internet Explorer 10 and Internet Explorer 11. + +|Code |Description | +|-----|------------| +|3 |Page state is set by the `FEATURE_DOCUMENT_COMPATIBLE_MODE` feature control key.| +|4 |Page is using an X-UA-compatible meta tag. | +|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. | +|8 |Page is using the mode set by the top-level QME FCK. | + +#### Browser state reason +The codes in this table can tell you why the browser is in its current state. Also called “browser mode”. These codes only apply to Internet Explorer 10 and Internet Explorer 11. + +|Code |Description | +|-----|------------| +|1 |Site is on the intranet, with the **Display intranet sites in Compatibility View** box checked. | +|2 |Site appears on an active **Compatibility View** list, created in Group Policy. | +|3 |Site appears on an active **Compatibility View** list, created by the user. | +|4 |Page is using an X-UA-compatible tag. | +|5 |Page state is set by the **Developer** toolbar. | +|6 |Page state is set by the `FEATURE_BROWSER_EMULATION` feature control key. | +|7 |Site appears on the Microsoft **Compatibility View (CV)** list. | +|8 |Site appears on the **Quirks** list, created in Group Policy. | +|11 |Site is using the default browser. | + +#### Zone +The codes in this table can tell you what zone is being used by IE to browse sites, based on browser settings. These codes apply to Internet Explorer 8, Internet Explorer 9, Internet Explorer 10, and Internet Explorer 11. + +|Code |Description | +|-----|------------| +|-1 |Internet Explorer is using an invalid zone. | +|0 |Internet Explorer is using the Local machine zone. | +|1 |Internet Explorer is using the Local intranet zone. | +|2 |Internet Explorer is using the Trusted sites zone. | +|3 |Internet Explorer is using the Internet zone. | +|4 |Internet Explorer is using the Restricted sites zone. | ## Where is the data stored and how do I collect it? The data is stored locally, in an industry-standard WMI class, .MOF file or in an XML file, depending on your configuration. This file remains on the client computer until it’s collected. To collect the files, we recommend: @@ -94,14 +135,14 @@ Before you can start to collect your data, you must run the provided PowerShell You need to set up your computers for data collection by running the provided PowerShell script (IETelemetrySetUp.ps1) to compile the .mof file and to update security privileges for the new WMI classes.

**Important**
You must run this script if you’re using WMI as your data output. It's not necessary if you're using XML as your data output. -![](images/wedge.gif) **To set up Enterprise Site Discovery** +**To set up Enterprise Site Discovery** - Start PowerShell in elevated mode (using admin privileges) and run IETElemetrySetUp.ps1 by by-passing the PowerShell execution policy, using this command: `powershell -ExecutionPolicy Bypass .\IETElemetrySetUp.ps1`. For more info, see [about Execution Policies](http://go.microsoft.com/fwlink/p/?linkid=517460). ### WMI only: Set up your firewall for WMI data If you choose to use WMI as your data output, you need to make sure that your WMI data can travel through your firewall for the domain. If you’re sure, you can skip this section; otherwise, follow these steps: -![](images/wedge.gif) **To set up your firewall** +**To set up your firewall** 1. In **Control Panel**, click **System and Security**, and then click **Windows Firewall**. @@ -117,13 +158,13 @@ You can determine which zones or domains are used for data collection, using Pow - **Zone allow list.** If you have a zone allow list, a comma-separated list of zones that should have this feature turned on, you should use this process. - ![](images/wedge.gif) **To set up data collection using a domain allow list** +**To set up data collection using a domain allow list** - Start PowerShell in elevated mode (using admin privileges) and run IETElemetrySetUp.ps1, using this command: `.\IETElemetrySetUp.ps1 [other args] -SiteAllowList sharepoint.com,outlook.com,onedrive.com`. **Important**
Wildcards, like \*.microsoft.com, aren’t supported. - ![](images/wedge.gif) **To set up data collection using a zone allow list** +**To set up data collection using a zone allow list** - Start PowerShell in elevated mode (using admin privileges) and run IETElemetrySetUp.ps1, using this command: `.\IETElemetrySetUp.ps1 [other args] -ZoneAllowList Computer,Intranet,TrustedSites,Internet,RestrictedSites`. @@ -223,7 +264,7 @@ Your environment is now ready to collect your hardware inventory and review the ### Collect your hardware inventory using the SMS\DEF.MOF file (System Center Configuration Manager 2007 only) You can collect your hardware inventory using the using the Systems Management Server (SMS\DEF.MOF) file. Editing this file lets you collect your data for System Center Configuration Manager 2007. If you aren’t using this version of Configuration Manager, you won’t want to use this option. - ![](images/wedge.gif) **To collect your inventory** +**To collect your inventory** 1. Using a text editor like Notepad, open the SMS\DEF.MOF file, located in your `\inboxes\clifiles.src\hinv` directory. @@ -339,7 +380,7 @@ After the XML files are created, you can use your own solutions to extract and p ``` 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** +**To add your XML data to your Enterprise Mode site list** 1. Open the Enterprise Mode Site List Manager, click **File**, and then click **Bulk add from file**. ![Enterprise Mode Site List Manager with Bulk add from file option](images/bulkadd-emiesitelistmgr.png) @@ -352,13 +393,12 @@ Each site is validated and if successful, added to the global site list when you ## Turn off data collection on your client devices After you’ve collected your data, you’ll need to turn Enterprise Site Discovery off. - ![](images/wedge.gif) **To stop collecting data, using PowerShell** +**To stop collecting data, using PowerShell** - On your client computer, start Windows PowerShell in elevated mode (using admin privileges) and run `IETelemetrySetUp.ps1`, using this command: `powershell -ExecutionPolicy Bypass .\IETElemetrySetUp.ps1 –IEFeatureOff`.

**Note**
Turning off data collection only disables the Enterprise Site Discovery feature – all data already written to WMI stays on your employee’s computer. -   - ![](images/wedge.gif) **To stop collecting data, using Group Policy** +**To stop collecting data, using Group Policy** 1. Open your Group Policy editor, go to `Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery WMI output`, and click **Off**. @@ -367,7 +407,7 @@ Turning off data collection only disables the Enterprise Site Discovery feature ### Delete already stored data from client computers You can completely remove the data stored on your employee’s computers. - ![](images/wedge.gif) **To delete all existing data** +**To delete all existing data** - On the client computer, start PowerShell in elevated mode (using admin privileges) and run these four commands: From 0d1789d05872a1dfeed1b6c5f3e24acbf960735e Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 4 Aug 2016 08:18:33 -0700 Subject: [PATCH 06/14] Fixed broken formatting --- ...ct-data-using-enterprise-site-discovery.md | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md index b9796882f3..1d47983620 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md +++ b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md @@ -9,7 +9,6 @@ title: Collect data using Enterprise Site Discovery ms.sitesec: library --- - # Collect data using Enterprise Site Discovery **Applies to:** @@ -65,7 +64,7 @@ Data is collected on the configuration characteristics of IE and the sites it br |Zone | X | X | X | X |Zone used by IE to browse sites, based on browser settings. | -**Important**
By default, IE doesn’t collect this data; you have to turn this feature on if you want to use it. After you turn on this feature, data is collected on all sites visited by IE, except during InPrivate sessions. Additionally, the data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. +>**Important**
By default, IE doesn’t collect this data; you have to turn this feature on if you want to use it. After you turn on this feature, data is collected on all sites visited by IE, except during InPrivate sessions. Additionally, the data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. ### Understanding the returned reason codes The following tables provide more info about the Document mode reason, Browser state reason, and the Zone codes that are returned as part of your data collection. @@ -120,7 +119,8 @@ The data is stored locally, in an industry-standard WMI class, .MOF file or in a We recommend that you collect your data for at most a month at a time, to capture a user’s typical workflow. We don’t recommend collecting data longer than that because the data is stored in a WMI provider and can fill up your computer’s hard drive. You may also want to collect data only for pilot users or a representative sample of people, instead of turning this feature on for everyone in your company. On average, a website generates about 250bytes of data for each visit, causing only a minor impact to Internet Explorer’s performance. Over the course of a month, collecting data from 20 sites per day from 1,000 users, you’ll get about 150MB of data:
\[250bytes (per site visit) \* 20sites/day\* 30days = (approximately) 150KB \*1000users = (approximately) 150MB\]. -

**Important**
The data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. + +>**Important**
The data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. ## Getting ready to use Enterprise Site Discovery Before you can start to collect your data, you must run the provided PowerShell script (IETelemetrySetUp.ps1) on your client devices to start generating the site discovery data and to set up a place to store this data locally. Then, you must start collecting the site discovery data from the client devices, using one of these three options: @@ -133,7 +133,8 @@ Before you can start to collect your data, you must run the provided PowerShell ### WMI only: Running the PowerShell script to compile the .MOF file and to update security privileges You need to set up your computers for data collection by running the provided PowerShell script (IETelemetrySetUp.ps1) to compile the .mof file and to update security privileges for the new WMI classes. -

**Important**
You must run this script if you’re using WMI as your data output. It's not necessary if you're using XML as your data output. + +>**Important**
You must run this script if you’re using WMI as your data output. It's not necessary if you're using XML as your data output. **To set up Enterprise Site Discovery** @@ -152,7 +153,8 @@ If you choose to use WMI as your data output, you need to make sure that your WM ## Use PowerShell to finish setting up Enterprise Site Discovery You can determine which zones or domains are used for data collection, using PowerShell. If you don’t want to use PowerShell, you can do this using Group Policy. For more info, see [Use Group Policy to finish setting up Enterprise Site Discovery](#use-group-policy-to-finish-setting-up-enterprise-site-discovery). -

**Important**
The .ps1 file updates turn on Enterprise Site Discovery and WMI collection for all users on a device. + +>**Important**
The .ps1 file updates turn on Enterprise Site Discovery and WMI collection for all users on a device. - **Domain allow list.** If you have a domain allow list, a comma-separated list of domains that should have this feature turned on, you should use this process. @@ -162,51 +164,52 @@ You can determine which zones or domains are used for data collection, using Pow - Start PowerShell in elevated mode (using admin privileges) and run IETElemetrySetUp.ps1, using this command: `.\IETElemetrySetUp.ps1 [other args] -SiteAllowList sharepoint.com,outlook.com,onedrive.com`. - **Important**
Wildcards, like \*.microsoft.com, aren’t supported. + >**Important**
Wildcards, like \*.microsoft.com, aren’t supported. **To set up data collection using a zone allow list** - Start PowerShell in elevated mode (using admin privileges) and run IETElemetrySetUp.ps1, using this command: `.\IETElemetrySetUp.ps1 [other args] -ZoneAllowList Computer,Intranet,TrustedSites,Internet,RestrictedSites`. - **Important**
Only Computer, Intranet, TrustedSites, Internet, and RestrictedSites are supported. + >**Important**
Only Computer, Intranet, TrustedSites, Internet, and RestrictedSites are supported. ## Use Group Policy to finish setting up Enterprise Site Discovery You can use Group Policy to finish setting up Enterprise Site Discovery. If you don’t want to use Group Policy, you can do this using PowerShell. For more info, see [Use Powershell to finish setting up Enterprise Site Discovery](#use-powershell-to-finish-setting-up-enterprise-site-discovery). -

**Note**
 All of the Group Policy settings can be used individually or as a group. - ![](images/wedge.gif) **To set up Enterprise Site Discovery using Group Policy** +>**Note**
 All of the Group Policy settings can be used individually or as a group. + + **To set up Enterprise Site Discovery using Group Policy** - Open your Group Policy editor, and go to these new settings: |Setting name and location |Description |Options | |---------------------------|-------------|---------| |Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery WMI output |Writes collected data to a WMI class, which can be aggregated using a client-management solution like Configuration Manager. |

  • **On.** Turns on WMI recording.
  • **Off.** Turns off WMI recording.
| -|Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery XML output |Writes collected data to an XML file, which is stored in your specified location. |
  • **XML file path.** Including this turns on XML recording.
  • **Blank.** Turns off XML recording.
| +|Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery XML output |Writes collected data to an XML file, which is stored in your specified location. |
  • **XML file path.** Including this turns on XML recording.
  • **Blank.** Turns off XML recording.
| |Administrative Templates\Windows Components\Internet Explorer\Limit Site Discovery output by Zone |Manages which zone can collect data. |To specify which zones can collect data, you must include a binary number that represents your selected zones, based on this order:

0 – Restricted Sites zone
0 – Internet zone
0 – Trusted Sites zone
0 – Local Intranet zone
0 – Local Machine zone

**Example 1:** Include only the Local Intranet zone

Binary representation: *00010*, based on:

0 – Restricted Sites zone
0 – Internet zone
0 – Trusted Sites zone
1 – Local Intranet zone
0 – Local Machine zone

**Example 2:** Include only the Restricted Sites, Trusted Sites, and Local Intranet zones

Binary representation: *10110*, based on:

1 – Restricted Sites zone
0 – Internet zone
1 – Trusted Sites zone
1 – Local Intranet zone
1 – Local Machine zone | |Administrative Templates\Windows Components\Internet Explorer\Limit Site Discovery output by domain |Manages which domains can collect data |To specify which domains can collect data, you must include your selected domains, one domain per line, in the provided box. It should look like:

microsoft.sharepoint.com
outlook.com
onedrive.com
timecard.contoso.com
LOBApp.contoso.com | ### Combining WMI and XML Group Policy settings You can use both the WMI and XML settings individually or together, based on: - ![](images/wedge.gif) **To turn off Enterprise Site Discovery** + **To turn off Enterprise Site Discovery**

  • Turn on Site Discovery WMI output: Off
  • Turn on Site Discovery XML output: Blank
- ![](images/wedge.gif) **To turn on WMI recording only** + **To turn on WMI recording only**
  • Turn on Site Discovery WMI output: On
  • Turn on Site Discovery XML output: Blank
- ![](images/wedge.gif) **To turn on XML recording only** + **To turn on XML recording only**
  • Turn on Site Discovery WMI output: Off
  • Turn on Site Discovery XML output: XML file path
- ![](images/wedge.gif) **To turn on both WMI and XML recording** + **To turn on both WMI and XML recording**
  • Turn on Site Discovery WMI output: On
  • Turn on Site Discovery XML output: XML file path
    • @@ -224,7 +227,7 @@ After you’ve collected your data, you’ll need to get the local files off of ### Collect your hardware inventory using the MOF Editor while connected to a client device You can collect your hardware inventory using the MOF Editor, while you’re connected to your client devices. - ![](images/wedge.gif) **To collect your inventory** + **To collect your inventory** 1. From the Configuration Manager, click **Administration**, click **Client Settings**, double-click **Default Client Settings**, click **Hardware Inventory**, and then click **Set Classes**. @@ -250,7 +253,7 @@ Your environment is now ready to collect your hardware inventory and review the ### Collect your hardware inventory using the MOF Editor with a .MOF import file You can collect your hardware inventory using the MOF Editor and a .MOF import file. - ![](images/wedge.gif) **To collect your inventory** + **To collect your inventory** 1. From the Configuration Manager, click **Administration**, click **Client Settings**, double-click **Default Client Settings**, click **Hardware Inventory**, and then click **Set Classes**. @@ -332,8 +335,8 @@ You can collect your hardware inventory using the using the Systems Management S }; ``` -3. Save the file and close it to the same location.
    -Your environment is now ready to collect your hardware inventory and review the sample reports. +3. Save the file and close it to the same location. + Your environment is now ready to collect your hardware inventory and review the sample reports. ## View the sample reports with your collected data The sample reports, **SCCM Report Sample – ActiveX.rdl** and **SCCM Report Sample – Site Discovery.rdl**, work with System Center 2012, so you can review your collected data. @@ -383,10 +386,10 @@ You can import this XML data into the correct version of the Enterprise Mode Sit **To add your XML data to your Enterprise Mode site list** 1. Open the Enterprise Mode Site List Manager, click **File**, and then click **Bulk add from file**. -![Enterprise Mode Site List Manager with Bulk add from file option](images/bulkadd-emiesitelistmgr.png) -2. Go to your XML file to add the included sites to the tool, and then click **Open**.
    -Each site is validated and if successful, added to the global site list when you click **OK** to close the menu. If a site doesn’t pass validation, you can try to fix the issues or pick the site and click **Add to list** to ignore the validation problem. For more information about fixing validation problems, see [Fix validation problems using the Enterprise Mode Site List Manager](fix-validation-problems-using-the-enterprise-mode-site-list-manager.md). + ![Enterprise Mode Site List Manager with Bulk add from file option](images/bulkadd-emiesitelistmgr.png) + +2. Go to your XML file to add the included sites to the tool, and then click **Open**.
    Each site is validated and if successful, added to the global site list when you click **OK** to close the menu. If a site doesn’t pass validation, you can try to fix the issues or pick the site and click **Add to list** to ignore the validation problem. For more information about fixing validation problems, see [Fix validation problems using the Enterprise Mode Site List Manager](fix-validation-problems-using-the-enterprise-mode-site-list-manager.md). 3. Click **OK** to close the **Bulk add sites to the list** menu. @@ -395,9 +398,11 @@ After you’ve collected your data, you’ll need to turn Enterprise Site Discov **To stop collecting data, using PowerShell** -- On your client computer, start Windows PowerShell in elevated mode (using admin privileges) and run `IETelemetrySetUp.ps1`, using this command: `powershell -ExecutionPolicy Bypass .\IETElemetrySetUp.ps1 –IEFeatureOff`.

    **Note**
    -Turning off data collection only disables the Enterprise Site Discovery feature – all data already written to WMI stays on your employee’s computer. -   +- On your client computer, start Windows PowerShell in elevated mode (using admin privileges) and run `IETelemetrySetUp.ps1`, using this command: `powershell -ExecutionPolicy Bypass .\IETElemetrySetUp.ps1 –IEFeatureOff`. + + >**Note**
    Turning off data collection only disables the Enterprise Site Discovery feature – all data already written to WMI stays on your employee’s computer. + + **To stop collecting data, using Group Policy** 1. Open your Group Policy editor, go to `Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery WMI output`, and click **Off**. @@ -419,7 +424,7 @@ You can completely remove the data stored on your employee’s computers. - `Remove-Item -Path 'HKCU:\Software\Microsoft\Internet Explorer\WMITelemetry'` - ## Related topics +## Related topics * [Enterprise Mode Site List Manager (schema v.2) download](http://go.microsoft.com/fwlink/?LinkId=746562) * [Enterprise Mode for Internet Explorer 11 (IE11)](enterprise-mode-overview-for-ie11.md)   From 26ee9048ba9ec778a4e2208a60aa2f9064932084 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 4 Aug 2016 08:39:47 -0700 Subject: [PATCH 07/14] Fixing formatting --- ...ct-data-using-enterprise-site-discovery.md | 105 ++++++++++++------ 1 file changed, 73 insertions(+), 32 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md index 1d47983620..98e822b6b1 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md +++ b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md @@ -70,7 +70,7 @@ Data is collected on the configuration characteristics of IE and the sites it br The following tables provide more info about the Document mode reason, Browser state reason, and the Zone codes that are returned as part of your data collection. #### DocMode reason -The codes in this table can tell you what document mode was set by IE for a webpage. These codes only apply to Internet Explorer 10 and Internet Explorer 11. +The codes in this table can tell you what document mode was set by IE for a webpage.
    These codes only apply to Internet Explorer 10 and Internet Explorer 11. |Code |Description | |-----|------------| @@ -79,10 +79,9 @@ 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. | -|8 |Page is using the mode set by the top-level QME FCK. | #### Browser state reason -The codes in this table can tell you why the browser is in its current state. Also called “browser mode”. These codes only apply to Internet Explorer 10 and Internet Explorer 11. +The codes in this table can tell you why the browser is in its current state. Also called “browser mode”.
    These codes only apply to Internet Explorer 10 and Internet Explorer 11. |Code |Description | |-----|------------| @@ -97,7 +96,7 @@ The codes in this table can tell you why the browser is in its current state. Al |11 |Site is using the default browser. | #### Zone -The codes in this table can tell you what zone is being used by IE to browse sites, based on browser settings. These codes apply to Internet Explorer 8, Internet Explorer 9, Internet Explorer 10, and Internet Explorer 11. +The codes in this table can tell you what zone is being used by IE to browse sites, based on browser settings.
    These codes apply to Internet Explorer 8, Internet Explorer 9, Internet Explorer 10, and Internet Explorer 11. |Code |Description | |-----|------------| @@ -118,7 +117,9 @@ The data is stored locally, in an industry-standard WMI class, .MOF file or in a ## WMI Site Discovery suggestions We recommend that you collect your data for at most a month at a time, to capture a user’s typical workflow. We don’t recommend collecting data longer than that because the data is stored in a WMI provider and can fill up your computer’s hard drive. You may also want to collect data only for pilot users or a representative sample of people, instead of turning this feature on for everyone in your company. -On average, a website generates about 250bytes of data for each visit, causing only a minor impact to Internet Explorer’s performance. Over the course of a month, collecting data from 20 sites per day from 1,000 users, you’ll get about 150MB of data:
    \[250bytes (per site visit) \* 20sites/day\* 30days = (approximately) 150KB \*1000users = (approximately) 150MB\]. +On average, a website generates about 250bytes of data for each visit, causing only a minor impact to Internet Explorer’s performance. Over the course of a month, collecting data from 20 sites per day from 1,000 users, you’ll get about 150MB of data: + + 250 bytes (per site visit) X 20 sites/day X 30 days = (approximately) 150KB X 1000 users = (approximately) 150MB >**Important**
    The data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. @@ -181,39 +182,79 @@ You can use Group Policy to finish setting up Enterprise Site Discovery. If you - Open your Group Policy editor, and go to these new settings: -|Setting name and location |Description |Options | -|---------------------------|-------------|---------| -|Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery WMI output |Writes collected data to a WMI class, which can be aggregated using a client-management solution like Configuration Manager. |

    • **On.** Turns on WMI recording.
    • **Off.** Turns off WMI recording.
    | -|Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery XML output |Writes collected data to an XML file, which is stored in your specified location. |
    • **XML file path.** Including this turns on XML recording.
    • **Blank.** Turns off XML recording.
    | -|Administrative Templates\Windows Components\Internet Explorer\Limit Site Discovery output by Zone |Manages which zone can collect data. |To specify which zones can collect data, you must include a binary number that represents your selected zones, based on this order:

    0 – Restricted Sites zone
    0 – Internet zone
    0 – Trusted Sites zone
    0 – Local Intranet zone
    0 – Local Machine zone

    **Example 1:** Include only the Local Intranet zone

    Binary representation: *00010*, based on:

    0 – Restricted Sites zone
    0 – Internet zone
    0 – Trusted Sites zone
    1 – Local Intranet zone
    0 – Local Machine zone

    **Example 2:** Include only the Restricted Sites, Trusted Sites, and Local Intranet zones

    Binary representation: *10110*, based on:

    1 – Restricted Sites zone
    0 – Internet zone
    1 – Trusted Sites zone
    1 – Local Intranet zone
    1 – Local Machine zone | -|Administrative Templates\Windows Components\Internet Explorer\Limit Site Discovery output by domain |Manages which domains can collect data |To specify which domains can collect data, you must include your selected domains, one domain per line, in the provided box. It should look like:

    microsoft.sharepoint.com
    outlook.com
    onedrive.com
    timecard.contoso.com
    LOBApp.contoso.com | + |Setting name and location |Description |Options | + |---------------------------|-------------|---------| + |Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery WMI output |Writes collected data to a WMI class, which can be aggregated using a client-management solution like Configuration Manager. |

    • **On.** Turns on WMI recording.
    • **Off.** Turns off WMI recording.
    | + |Administrative Templates\Windows Components\Internet Explorer\Turn on Site Discovery XML output |Writes collected data to an XML file, which is stored in your specified location. |
    • **XML file path.** Including this turns on XML recording.
    • **Blank.** Turns off XML recording.
    | + |Administrative Templates\Windows Components\Internet Explorer\Limit Site Discovery output by Zone |Manages which zone can collect data. |To specify which zones can collect data, you must include a binary number that represents your selected zones, based on this order:

    0 – Restricted Sites zone
    0 – Internet zone
    0 – Trusted Sites zone
    0 – Local Intranet zone
    0 – Local Machine zone

    **Example 1:** Include only the Local Intranet zone

    Binary representation: *00010*, based on:

    0 – Restricted Sites zone
    0 – Internet zone
    0 – Trusted Sites zone
    1 – Local Intranet zone
    0 – Local Machine zone

    **Example 2:** Include only the Restricted Sites, Trusted Sites, and Local Intranet zones

    Binary representation: *10110*, based on:

    1 – Restricted Sites zone
    0 – Internet zone
    1 – Trusted Sites zone
    1 – Local Intranet zone
    1 – Local Machine zone | + |Administrative Templates\Windows Components\Internet Explorer\Limit Site Discovery output by domain |Manages which domains can collect data |To specify which domains can collect data, you must include your selected domains, one domain per line, in the provided box. It should look like:

    microsoft.sharepoint.com
    outlook.com
    onedrive.com
    timecard.contoso.com
    LOBApp.contoso.com | ### Combining WMI and XML Group Policy settings -You can use both the WMI and XML settings individually or together, based on: +You can use both the WMI and XML settings individually or together: - **To turn off Enterprise Site Discovery** -

      -
    • Turn on Site Discovery WMI output: Off
      • -
    • Turn on Site Discovery XML output: Blank
      • -
    +**To turn off Enterprise Site Discovery** + + + + + + + + + + + + + +
    Setting nameOption
    Turn on Site Discovery WMI outputOff
    Turn on Site Discovery XML outputBlank
    - **To turn on WMI recording only** -
      -
    • Turn on Site Discovery WMI output: On
      • -
    • Turn on Site Discovery XML output: Blank
      • -
    +**Turn on WMI recording only** + + + + + + + + + + + + + +
    Setting nameOption
    Turn on Site Discovery WMI outputOn
    Turn on Site Discovery XML outputBlank
    - **To turn on XML recording only** -
      -
    • Turn on Site Discovery WMI output: Off
      • -
    • Turn on Site Discovery XML output: XML file path
      • -
    +**To turn on XML recording only** + + + + + + + + + + + + + +
    Setting nameOption
    Turn on Site Discovery WMI outputOff
    Turn on Site Discovery XML outputXML file path
    - **To turn on both WMI and XML recording** -
      -
    • Turn on Site Discovery WMI output: On
      • -
    • Turn on Site Discovery XML output: XML file path
      • -
    +**To turn on both WMI and XML recording** + + + + + + + + + + + + + +
    Setting nameOption
    Turn on Site Discovery WMI outputOn
    Turn on Site Discovery XML outputXML file path
    ## Use Configuration Manager to collect your data After you’ve collected your data, you’ll need to get the local files off of your employee’s computers. To do this, use the hardware inventory process in Configuration Manager, using one of these options: From 96fa79f500899dc72d06e3415beea07073f0bd61 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 4 Aug 2016 09:21:50 -0700 Subject: [PATCH 08/14] Fixed text that was appearing as code incorrectly --- .../collect-data-using-enterprise-site-discovery.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md index 98e822b6b1..25c671a6b9 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md +++ b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md @@ -117,9 +117,7 @@ The data is stored locally, in an industry-standard WMI class, .MOF file or in a ## WMI Site Discovery suggestions We recommend that you collect your data for at most a month at a time, to capture a user’s typical workflow. We don’t recommend collecting data longer than that because the data is stored in a WMI provider and can fill up your computer’s hard drive. You may also want to collect data only for pilot users or a representative sample of people, instead of turning this feature on for everyone in your company. -On average, a website generates about 250bytes of data for each visit, causing only a minor impact to Internet Explorer’s performance. Over the course of a month, collecting data from 20 sites per day from 1,000 users, you’ll get about 150MB of data: - - 250 bytes (per site visit) X 20 sites/day X 30 days = (approximately) 150KB X 1000 users = (approximately) 150MB +On average, a website generates about 250bytes of data for each visit, causing only a minor impact to Internet Explorer’s performance. Over the course of a month, collecting data from 20 sites per day from 1,000 users, you’ll get about 150MB of data:

    250 bytes (per site visit) X 20 sites/day X 30 days = (approximately) 150KB X 1000 users = (approximately) 150MB >**Important**
    The data collection process is silent, so there’s no notification to the employee. Therefore, you must get consent from the employee before you start collecting info. You must also make sure that using this feature complies with all applicable local laws and regulatory requirements. From b3514d3822f5040b9e7e477e504c356a4d2ba9c2 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 4 Aug 2016 11:47:05 -0700 Subject: [PATCH 09/14] make fix --- windows/manage/configure-windows-10-taskbar.md | 1 - 1 file changed, 1 deletion(-) diff --git a/windows/manage/configure-windows-10-taskbar.md b/windows/manage/configure-windows-10-taskbar.md index 752739b1ea..b96590c3b1 100644 --- a/windows/manage/configure-windows-10-taskbar.md +++ b/windows/manage/configure-windows-10-taskbar.md @@ -102,7 +102,6 @@ The easiest way to find this data for an application is to: - ``` From a662cab18243fab7a7840b8c168d4bfcf8c93c72 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 4 Aug 2016 12:25:22 -0700 Subject: [PATCH 10/14] fix title field --- windows/plan/windows-10-servicing-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/plan/windows-10-servicing-options.md b/windows/plan/windows-10-servicing-options.md index de610fd342..00418ae8ae 100644 --- a/windows/plan/windows-10-servicing-options.md +++ b/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 From f4c5a08eb67f14e985fd9fbce4751624f00ca331 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 4 Aug 2016 13:06:37 -0700 Subject: [PATCH 11/14] Updated for code 9, QME --- .../collect-data-using-enterprise-site-discovery.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md index 25c671a6b9..ab5a60cbce 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md +++ b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md @@ -79,7 +79,8 @@ 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”.
    These codes only apply to Internet Explorer 10 and Internet Explorer 11. From f986e4d4c935f9ad4771af59f8dd06db865cc6f3 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 4 Aug 2016 13:36:35 -0700 Subject: [PATCH 12/14] fix toc --- windows/plan/TOC.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/plan/TOC.md b/windows/plan/TOC.md index 803e29432b..7118e1238c 100644 --- a/windows/plan/TOC.md +++ b/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) From 2826b6592e621ec68986883b1a2082c9ecb69099 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Fri, 5 Aug 2016 20:37:16 +1000 Subject: [PATCH 13/14] Removed 'built in windows 10' --- .../windows-defender-advanced-threat-protection.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/windows-defender-advanced-threat-protection.md b/windows/keep-secure/windows-defender-advanced-threat-protection.md index 16a3332352..108dd74507 100644 --- a/windows/keep-secure/windows-defender-advanced-threat-protection.md +++ b/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: @@ -87,4 +87,4 @@ Topic | Description [Windows Defender Advanced Threat Protection settings](settings-windows-defender-advanced-threat-protection.md) | Learn about setting the time zone and configuring the suppression rules to configure the service to your requirements. [Troubleshoot Windows Defender Advanced Threat Protection](troubleshoot-windows-defender-advanced-threat-protection.md) | This topic contains information to help IT Pros find workarounds for the known issues and troubleshoot issues in Windows Defender ATP. [Review events and errors on endpoints with Event Viewer](event-error-codes-windows-defender-advanced-threat-protection.md)| Review events and errors associated with event IDs to determine if further troubleshooting steps are required. -[Windows Defender compatibility](defender-compatibility-windows-defender-advanced-threat-protection.md) | Learn about how Windows Defender works in conjunction with Windows Defender ATP. \ No newline at end of file +[Windows Defender compatibility](defender-compatibility-windows-defender-advanced-threat-protection.md) | Learn about how Windows Defender works in conjunction with Windows Defender ATP. From 9f114cb6f6af68b492400ad533535fbd3ce1b81f Mon Sep 17 00:00:00 2001 From: LizRoss Date: Fri, 5 Aug 2016 08:30:17 -0700 Subject: [PATCH 14/14] Stopped snippets from showing --- .../ie11-deploy-guide/.vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 browsers/internet-explorer/ie11-deploy-guide/.vscode/settings.json diff --git a/browsers/internet-explorer/ie11-deploy-guide/.vscode/settings.json b/browsers/internet-explorer/ie11-deploy-guide/.vscode/settings.json new file mode 100644 index 0000000000..d6332e1831 --- /dev/null +++ b/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 +} \ No newline at end of file