From f3b3290529c65f39271b50a9a997470e33d8cf39 Mon Sep 17 00:00:00 2001 From: Elizabeth Ross Date: Tue, 17 Oct 2017 17:48:53 +0000 Subject: [PATCH] Merged PR 3884: Merge vs-typos to master --- windows/configuration/TOC.md | 2 +- .../change-history-for-configure-windows-10.md | 1 + .../configure-windows-telemetry-in-your-organization.md | 2 +- windows/configuration/index.md | 3 ++- windows/configuration/windows-diagnostic-data.md | 8 ++++---- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/windows/configuration/TOC.md b/windows/configuration/TOC.md index 0e0a9d6017..88c44d0c4c 100644 --- a/windows/configuration/TOC.md +++ b/windows/configuration/TOC.md @@ -3,7 +3,7 @@ ## [Windows 10, version 1709 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md) ## [Windows 10, version 1709 enhanced telemetry events and fields used by Windows Analytics](EventName.md) ## [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md) -## [Windows 10 Diagnostic Data for the Full telemetry level](windows-diagnostic-data.md) +## [Windows 10 diagnostic data for the Full telemetry level](windows-diagnostic-data.md) ## [Beginning your General Data Protection Regulation (GDPR) journey for Windows 10](gdpr-win10-whitepaper.md) ## [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) ## [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md index bac379bfb0..072c72fd15 100644 --- a/windows/configuration/change-history-for-configure-windows-10.md +++ b/windows/configuration/change-history-for-configure-windows-10.md @@ -23,6 +23,7 @@ The topics in this library have been updated for Windows 10, version 1709 (also - [Create a Windows 10 kiosk that runs multiple apps](lock-down-windows-10-to-specific-apps.md) - [Multi-app kiosk XML reference](multi-app-kiosk-xml.md) - [Windows 10, version 1709 basic diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md) +- [Windows 10, version 1709 enhanced telemetry events and fields used by Windows Analytics](EventName.md) ## September 2017 diff --git a/windows/configuration/configure-windows-telemetry-in-your-organization.md b/windows/configuration/configure-windows-telemetry-in-your-organization.md index 676d9f543d..8dd61480ff 100644 --- a/windows/configuration/configure-windows-telemetry-in-your-organization.md +++ b/windows/configuration/configure-windows-telemetry-in-your-organization.md @@ -293,7 +293,7 @@ In Windows 10, version 1709, we introduce the **Limit Enhanced diagnostic data t b. Using MDM, use the Policy CSP to set the **System/AllowTelemetry** value to **2**. --AND- + -AND- 2. Enable the **LimitEnhancedDiagnosticDataWindowsAnalytics** setting, using either Group Policy or MDM. diff --git a/windows/configuration/index.md b/windows/configuration/index.md index a542f4ef0d..d3e9db3364 100644 --- a/windows/configuration/index.md +++ b/windows/configuration/index.md @@ -20,8 +20,9 @@ Enterprises often need to apply custom configurations to devices for their users | --- | --- | | [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md) | Use this article to make informed decisions about how you can configure Windows telemetry in your organization. | | [Windows 10, version 1709 basic diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1709. | +|[Windows 10, version 1709 enhanced telemetry events and fields used by Windows Analytics](EventName.md)|Learn about diagnostic data that is collected by Windows Analytics.| | [Windows 10, version 1703 basic diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1703. | -| [Windows 10 Diagnostic Data for the Full telemetry level](windows-diagnostic-data.md) | Learn about the types of data that is collected at the full level in Windows 10, version 1703 and later. | +| [Windows 10 diagnostic data for the Full telemetry level](windows-diagnostic-data.md) | Learn about the types of data that is collected at the full level in Windows 10, version 1703 and later. | |[Beginning your General Data Protection Regulation (GDPR) journey for Windows 10](gdpr-win10-whitepaper.md)|Learn about Windows 10 and the upcoming GDPR-compliance requirements.| | [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Learn about the network connections that Windows components make to Microsoft and also the privacy settings that affect data that is shared with either Microsoft or apps and how they can be managed by an IT Pro. | | [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. It can connect you to open Wi-Fi hotspots it knows about through crowdsourcing, or to Wi-Fi networks your contacts have shared with you by using Wi-Fi Sense. The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10. | diff --git a/windows/configuration/windows-diagnostic-data.md b/windows/configuration/windows-diagnostic-data.md index e0973c8941..f540930a40 100644 --- a/windows/configuration/windows-diagnostic-data.md +++ b/windows/configuration/windows-diagnostic-data.md @@ -1,6 +1,6 @@ --- -title: Windows 10 Diagnostic Data for the Full telemetry level (Windows 10) -description: Use this article to learn about the types of that is collected the the Full telemetry level. +title: Windows 10 diagnostic data for the Full telemetry level (Windows 10) +description: Use this article to learn about the types of data that is collected the the Full telemetry level. keywords: privacy,Windows 10 ms.prod: w10 ms.mktglfcycl: manage @@ -11,12 +11,12 @@ ms.author: lizross ms.date: 10/17/2017 --- -# Windows 10 Diagnostic Data for the Full telemetry level +# Windows 10 diagnostic data for the Full telemetry level **Applies to:** - Windows 10, version 1703 and later -Microsoft collects Windows diagnostic data to keep Windows up-to-date, secure, and operating properly. It also helps us improve Windows and, for users who have turned on “tailored experiences”, can be used to provide more relevant tips and recommendations to tailor Microsoft products to the user’s needs. This article describes all types diagnostic data collected by Windows at the Full telemetry level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1709 Basic level diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md). +Microsoft collects Windows diagnostic data to keep Windows up-to-date, secure, and operating properly. It also helps us improve Windows and, for users who have turned on “tailored experiences”, can be used to provide more relevant tips and recommendations to tailor Microsoft products to the user’s needs. This article describes all types diagnostic data collected by Windows at the Full telemetry level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1709 Basic level diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md) and [Windows 10, version 1703 Basic level diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md). The data covered in this article is grouped into the following categories: