From 130b62ca3fa8835c43eec5815fa75c0f4cfc5eca Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Wed, 7 Feb 2018 17:18:07 -0800 Subject: [PATCH 1/5] fixing capitalization of HVCI --- .../enable-virtualization-based-protection-of-code-integrity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/threat-protection/enable-virtualization-based-protection-of-code-integrity.md b/windows/security/threat-protection/enable-virtualization-based-protection-of-code-integrity.md index 4483edb168..158b2fede1 100644 --- a/windows/security/threat-protection/enable-virtualization-based-protection-of-code-integrity.md +++ b/windows/security/threat-protection/enable-virtualization-based-protection-of-code-integrity.md @@ -16,7 +16,7 @@ ms.date: 11/28/2017 - Windows 10 - Windows Server 2016 -Virtualization-based protection of code integrity (herein referred to as Hypervisor-protected Code Integrity, or HVCI) is a powerful system mitigation that leverages hardware virtualization and the Windows Hyper-V hypervisor to protect Windows kernel-mode processes against the injection and execution of malicious or unverified code. +Virtualization-based protection of code integrity (herein referred to as hypervisor-protected code integrity, or HVCI) is a powerful system mitigation that leverages hardware virtualization and the Windows Hyper-V hypervisor to protect Windows kernel-mode processes against the injection and execution of malicious or unverified code. Code integrity validation is performed in a secure environment that is resistant to attack from malicious software, and page permissions for kernel mode are set and maintained by the Hyper-V hypervisor. Some applications, including device drivers, may be incompatible with HVCI. From 89a6d43054e90fa3a2ad6f32bebe4622313164bb Mon Sep 17 00:00:00 2001 From: modcaster Date: Sun, 11 Feb 2018 14:55:55 -0500 Subject: [PATCH 2/5] 20180212 Update --- devices/surface/change-history-for-surface.md | 10 ++++++++-- .../surface/microsoft-surface-data-eraser.md | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/devices/surface/change-history-for-surface.md b/devices/surface/change-history-for-surface.md index d115d86ecf..a12b0c33f7 100644 --- a/devices/surface/change-history-for-surface.md +++ b/devices/surface/change-history-for-surface.md @@ -5,19 +5,25 @@ ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library author: jdeckerms -ms.date: 01/29/2018 +ms.date: 02/12/2018 --- # Change history for Surface documentation This topic lists new and updated topics in the Surface documentation library. +## February 2018 + +|New or changed topic | Description | +| --- | --- | +|[Microsoft Surface Data Eraser](microsoft-surface-data-eraser.md) | Added version 3.2.46.0 information | + ## January 2018 |New or changed topic | Description | | --- | --- | |[Windows AutoPilot and Surface devices](windows-autopilot-and-surface-devices.md) | New article | -|[Microsoft Surface Data Eraser](microsoft-surface-data-eraser.md) | Added version 3.2.45 information | +|[Microsoft Surface Data Eraser](microsoft-surface-data-eraser.md) | Added version 3.2.45.0 information | |[Surface device compatibility with Windows 10 Long-Term Servicing Channel (LTSC)](surface-device-compatibility-with-windows-10-ltsc.md) | Updated Current Branch (CB) or Current Branch for Business (CBB) servicing options with Semi-Annual Channel (SAC) information | |[Wake On LAN for Surface devices](wake-on-lan-for-surface-devices.md) | Added Surface Book 2, Surface Laptop, Surface Pro, Surface Pro with LTE Advanced, and Surface Pro information | diff --git a/devices/surface/microsoft-surface-data-eraser.md b/devices/surface/microsoft-surface-data-eraser.md index fd67224039..b1f7c26052 100644 --- a/devices/surface/microsoft-surface-data-eraser.md +++ b/devices/surface/microsoft-surface-data-eraser.md @@ -10,7 +10,7 @@ ms.pagetype: surface, devices, security ms.sitesec: library author: brecords ms.author: jdecker -ms.date: 01/03/2018 +ms.date: 02/12/2018 --- # Microsoft Surface Data Eraser @@ -139,25 +139,32 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo 8. Click the **Yes** button to continue erasing data on the Surface device. +>[!NOTE] +>When you run Surface Data Eraser on the Surface Data Eraser USB drive, a log file is generated in the **SurfaceDataEraserLogs** folder. + ## Changes and updates Microsoft Surface Data Eraser is periodically updated by Microsoft. For information about the changes provided in each new version, see the following: -### Version 3.2.45 +### Version 3.2.46.0 +This version of Microsoft Surface Data Eraser adds support for the following: + +- Surface Pro with LTE Advanced + + +### Version 3.2.45.0 This version of Microsoft Surface Data Eraser adds support for the following: - Surface Book 2 -- Surface Pro with LTE Advanced - - Surface Pro 1TB >[!NOTE] ->Surface Data Eraser v3.2.45 and above can be used to restore Surface Pro or Surface Laptop devices with the 1TB storage option in the scenario that the device shows two separate 512GB volumes or encounters errors when attempting to deploy or install Windows 10. See [Surface Pro Model 1796 and Surface Laptop 1TB display two drives](https://support.microsoft.com/en-us/help/4046105/surface-pro-model-1796-and-surface-laptop-1tb-display-two-drives) for more information. +>Surface Data Eraser v3.2.45.0 and above can be used to restore Surface Pro or Surface Laptop devices with the 1TB storage option in the scenario that the device shows two separate 512GB volumes or encounters errors when attempting to deploy or install Windows 10. See [Surface Pro Model 1796 and Surface Laptop 1TB display two drives](https://support.microsoft.com/en-us/help/4046105/surface-pro-model-1796-and-surface-laptop-1tb-display-two-drives) for more information. -### Version 3.2.36 +### Version 3.2.36.0 This version of Microsoft Surface Data Eraser adds support for the following: From e3ea6ac828516e74628979afe9e994fc03e9040d Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Mon, 12 Feb 2018 17:35:49 +0000 Subject: [PATCH 3/5] Merged PR 5837: Added upgrade support info for LTSC Added upgrade support info for LTSC Also trimmed the table for better display --- .../upgrade/windows-10-edition-upgrades.md | 37 +++++++------ .../upgrade/windows-10-upgrade-paths.md | 55 +++++++++++++++++-- 2 files changed, 69 insertions(+), 23 deletions(-) diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md index 359c1cb9bc..b139ec0d0a 100644 --- a/windows/deployment/upgrade/windows-10-edition-upgrades.md +++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md @@ -8,7 +8,7 @@ ms.localizationpriority: high ms.sitesec: library ms.pagetype: mobile author: greg-lindsay -ms.date: 01/18/2018 +ms.date: 02/9/2018 --- # Windows 10 edition upgrade @@ -20,7 +20,7 @@ ms.date: 01/18/2018 With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported. For information on what edition of Windows 10 is right for you, see [Compare Windows 10 Editions](https://go.microsoft.com/fwlink/p/?LinkID=690882). For a comprehensive list of all possible upgrade paths to Windows 10, see [Windows 10 upgrade paths](windows-10-upgrade-paths.md). -The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer. Note that the reboot requirement for upgrading from Pro to Enterprise was removed in version 1607. +The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer. **Note**: The reboot requirement for upgrading from Pro to Enterprise was removed in version 1607. ![not supported](../images/x_blk.png) (X) = not supported
![supported, reboot required](../images/check_grn.png) (green checkmark) = supported, reboot required
@@ -46,25 +46,28 @@ X = unsupported
| **Home > Pro for Workstations** | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | | **Home > Pro Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | | **Home > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **S > Pro** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | -| **S > Pro for Workstations** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | -| **S > Pro Education** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | -| **S > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **S > Enterprise** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | -| **Pro > Pro for Workstations** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (MSfB) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | -| **Pro > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | -| **Pro > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **Pro > Enterprise** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | -| **Pro for Workstations > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | -| **Pro for Workstations > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **Pro for Workstations > Enterprise** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | -| **Pro Education > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **Enterprise > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **S > Pro** | ![supported, no reboot](../images/check_blu.png)
(1709) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![supported, no reboot](../images/check_blu.png)
(1709) | +| **S > Pro for Workstations** | ![supported, no reboot](../images/check_blu.png)
(1709) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![supported, no reboot](../images/check_blu.png)
(1709) | +| **S > Pro Education** | ![supported, no reboot](../images/check_blu.png)
(1709) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png)
(1709 - MSfB) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![not supported](../images/x_blk.png) | +| **S > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png)
(MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **S > Enterprise** | ![supported, no reboot](../images/check_blu.png)
(1709) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png)
(1703 - PC)
(1709 - MSfB) | ![supported, no reboot](../images/check_blu.png)
(1709) | ![not supported](../images/x_blk.png) | +| **Pro > Pro for Workstations** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png)
(MSfB) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | +| **Pro > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png)
(MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)
(MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **Pro > Enterprise** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png)
(1703 - PC)
(1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro for Workstations > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png)
(MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro for Workstations > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)
(MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **Pro for Workstations > Enterprise** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png)
(1703 - PC)
(1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro Education > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)
(MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **Enterprise > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)
(MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **Enterprise LTSC > Enterprise** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)
(MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **Pro for Workstations > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png)
(MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | | **Mobile > Mobile Enterprise** | ![supported, no reboot](../images/check_blu.png) |![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | > [!NOTE] > Each desktop edition in the table also has an N and KN SKU. These editions have had media-related functionality removed. Devices with N or KN SKUs installed can be upgraded to corresponding N or KN SKUs using the same methods. - +>
+>
Due to [naming changes](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#naming-changes) the term LTSB might still be displayed in some products. This name will change to LTSC with subsequent feature updates. ## Upgrade using mobile device management (MDM) - To upgrade desktop editions of Windows 10 using MDM, you'll need to enter the product key for the upgraded edition in the **UpgradeEditionWithProductKey** policy setting of the **WindowsLicensing** CSP. For more info, see [WindowsLicensing CSP](https://go.microsoft.com/fwlink/p/?LinkID=690907). diff --git a/windows/deployment/upgrade/windows-10-upgrade-paths.md b/windows/deployment/upgrade/windows-10-upgrade-paths.md index 4ac4288fcb..f3fa9fd3a5 100644 --- a/windows/deployment/upgrade/windows-10-upgrade-paths.md +++ b/windows/deployment/upgrade/windows-10-upgrade-paths.md @@ -20,14 +20,16 @@ ms.date: 01/18/2018 This topic provides a summary of available upgrade paths to Windows 10. You can upgrade to Windows 10 from Windows 7 or a later operating system. This includes upgrading from one release of Windows 10 to later release of Windows 10. Migrating from one edition of Windows 10 to a different edition of the same release is also supported. For more information about migrating to a different edition of Windows 10, see [Windows 10 edition upgrade](windows-10-edition-upgrades.md). ->**Windows 10 LTSB**: The upgrade paths displayed below do not apply to Windows 10 LTSB. In-place upgrade from Windows 7 or Windows 8.1 to Windows 10 LTSB is not supported. (Note that Windows 10 LTSB 2015 did not block this upgrade path. This was corrected in the Windows 10 LTSB 2016 release, which will now only allow data-only and clean install options.) +>**Windows 10 LTSC/LTSB**: Due to [naming changes](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#naming-changes), product versions that display Windows 10 LTSB will be replaced with Windows 10 LTSC in subsequent feature updates. The term LTSC is used here to refer to all long term servicing versions. + +>In-place upgrade from Windows 7, Windows 8.1, or Windows 10 semi-annual channel to Windows 10 LTSC is not supported. **Note**: Windows 10 LTSC 2015 did not block this upgrade path. This was corrected in the Windows 10 LTSC 2016 release, which will now only allow data-only and clean install options. You can upgrade from Windows 10 LTSC to Windows 10 semi-annual channel, provided that you upgrade to the same or a newer build version. For example, Windows 10 Enterprise 2016 LTSB can be upgraded to Windows 10 Enterprise version 1607 or later. >**Windows N/KN**: Windows "N" and "KN" SKUs follow the same upgrade paths shown below. If the pre-upgrade and post-upgrade editions are not the same type (e.g. Windows 8.1 Pro N to Windows 10 Pro), personal data will be kept but applications and settings will be removed during the upgrade process. ✔ = Full upgrade is supported including personal data, settings, and applications.
D = Edition downgrade; personal data is maintained, applications and settings are removed. - +
@@ -36,6 +38,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -51,6 +54,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -61,6 +65,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -71,6 +76,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -81,6 +87,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -91,6 +98,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -101,6 +109,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -114,6 +123,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -124,6 +134,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -134,6 +145,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -144,6 +156,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -154,6 +167,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -164,6 +178,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -174,6 +189,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -187,6 +203,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -197,6 +214,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -207,6 +225,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -217,6 +236,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -227,6 +247,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -237,6 +258,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -247,6 +269,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -257,6 +280,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -265,11 +289,12 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + - + @@ -280,6 +305,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -290,6 +316,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -300,6 +327,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -310,6 +338,18 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + + + + + + + + + + + + @@ -318,6 +358,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar + @@ -328,16 +369,18 @@ D = Edition downgrade; personal data is maintained, applications and settings ar +
       Windows 10 Pro Education Windows 10 Education Windows 10 EnterpriseWindows 10 Enterprise LTSC Windows 10 Mobile Windows 10 Mobile Enterprise
Home Basic
Home Premium
Professional✔
Ultimate✔
Enterprise✔
Windows 8
Professional✔
Professional WMC✔
Enterprise✔
Embedded Industry✔
Windows RT
Windows Phone 8
Windows 8.1
Connected
Professional✔
Professional Student✔
Professional WMC✔
Enterprise✔
Embedded Industry✔
Windows RT
Windows Phone 8.1 ✔
Windows 10Windows 10
Home
Professional✔
EducationD
Enterprise✔
Enterprise LTSC✔✔
Mobile ✔ ✔
D ✔
+ ## Related Topics -[Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)
-[Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md) -  +[Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)
+[Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md)
+[Windows 10 edition upgrade](windows-10-edition-upgrades.md) From 90a5f5582326176eaa81adc92f21a6e591fa7ce3 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Mon, 12 Feb 2018 19:16:09 +0000 Subject: [PATCH 4/5] Merged PR 5842: Update telemetry topic for 13 Feb update --- ...el-windows-diagnostic-events-and-fields.md | 245 ++++++++++++++---- ...change-history-for-configure-windows-10.md | 3 +- 2 files changed, 190 insertions(+), 58 deletions(-) diff --git a/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md index 7db5063374..eac9fde18a 100644 --- a/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md +++ b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md @@ -1,5 +1,5 @@ --- -description: Use this article to learn more about what Windows diagnostic data is gathered at the basic level. +description: Learn more about the Windows diagnostic data that is gathered at the basic level. title: Windows 10, version 1709 basic diagnostic events and fields (Windows 10) keywords: privacy, diagnostic data ms.prod: w10 @@ -9,7 +9,7 @@ ms.pagetype: security localizationpriority: high author: eross-msft ms.author: lizross -ms.date: 10/26/2017 +ms.date: 02/12/2018 --- @@ -101,7 +101,7 @@ The following fields are available: - **epoch** Represents the epoch and seqNum fields, which help track how many events were fired and how many events were uploaded, and enables identification of data lost during upload and de-duplication of events on the ingress server. - **seqNum** Represents the sequence field used to track absolute order of uploaded events. It is an incrementing identifier for each event added to the upload queue.  The Sequence helps track how many events were fired and how many events were uploaded and enables identification of data lost during upload and de-duplication of events on the ingress server. - **iKey** Represents an ID for applications or other logical groupings of events. -- **flags** Represents a collection of bits that describe how the event should be processed by the Connected User Experience and Telemetry component pipeline. The lowest-order byte is the event persistence. The next byte is the event latency. +- **flags** Represents a collection of bits that describe how the event should be processed by the Connected User Experiences and Telemetry component pipeline. The lowest-order byte is the event persistence. The next byte is the event latency. - **os** Represents the operating system name. - **osVer** Represents the OS version, and its format is OS dependent. - **appId** Represents a unique identifier of the client application currently loaded in the process producing the event; and is used to group events together and understand usage pattern, errors by application. @@ -255,7 +255,7 @@ The following fields are available: ### Microsoft.Windows.Appraiser.General.RunContext -"This event indicates what should be expected in the data payload. " +This event indicates what should be expected in the data payload. The following fields are available: @@ -1604,6 +1604,39 @@ The following fields are available: - **SocketCount** Number of physical CPU sockets of the machine. +### Census.Security + +This event provides information on about security settings used to help keep Windows up-to-date and secure. + +- **AvailableSecurityProperties** Enumerates and reports state on the relevant security properties for Device Guard. +- **CGRunning** Is Credential Guard running? +- **DGState** A summary of the Device Guard state. +- **HVCIRunning** Is HVCI running? +- **IsSawGuest** Describes whether the device is running as a Secure Admin Workstation Guest. +- **IsSawHost** Describes whether the device is running as a Secure Admin Workstation Host. +- **RequiredSecurityProperties** Describes the required security properties to enable virtualization-based security. +- **SecureBootCapable** Is this device capable of running Secure Boot? +- **VBSState** Is virtualization-based security enabled, disabled, or running? + + +### Census.Speech + +This event is used to gather basic speech settings on the device. + +The following fields are available: + +- **AboveLockEnabled** Cortana setting that represents if Cortana can be invoked when the device is locked. +- **GPAllowInputPersonalization** Indicates if a Group Policy setting has enabled speech functionalities. +- **HolographicSpeechInputDisabled** Holographic setting that represents if the attached HMD devices have speech functionality disabled by the user. +- **HolographicSpeechInputDisabledRemote** Indicates if a remote policy has disabled speech functionalities for the HMD devices. +- **KWSEnabled** "Cortana setting that represents if a user has enabled the ""Hey Cortana"" keyword spotter (KWS)." +- **MDMAllowInputPersonalization** Indicates if an MDM policy has enabled speech functionalities. +- **RemotelyManaged** Indicates if the device is being controlled by a remote admininistrator (MDM or Group Policy) in the context of speech functionalities. +- **SpeakerIdEnabled** Cortana setting that represents if keyword detection has been trained to try to respond to a single user's voice. +- **SpeechServicesEnabled** Windows setting that represents whether a user is opted-in for speech services on the device. + + + ### Census.Storage This event sends data about the total capacity of the system volume and primary disk, to help keep Windows up to date. @@ -1614,34 +1647,6 @@ The following fields are available: - **PrimaryDiskType** Retrieves an enumerator value of type STORAGE_BUS_TYPE that indicates the type of bus to which the device is connected. This should be used to interpret the raw device properties at the end of this structure (if any). - **SystemVolumeTotalCapacity** Retrieves the size of the partition that the System volume is installed on in MB. - -### Census.VM - -This event sends data indicating whether virtualization is enabled on the device, and its various characteristics, to help keep Windows up to date. - -The following fields are available: - -- **CloudService** Indicates which cloud service, if any, that this virtual machine is running within. -- **HyperVisor** Retrieves whether the current OS is running on top of a Hypervisor. -- **IOMMUPresent** Represents if an input/output memory management unit (IOMMU) is present. -- **isVDI** Is the device using Virtual Desktop Infrastructure? -- **IsVirtualDevice** Retrieves that when the Hypervisor is Microsoft's Hyper-V Hypervisor or other Hv#HASH#1 Hypervisor, this field will be set to FALSE for the Hyper-V host OS and TRUE for any guest OS's. This field should not be relied upon for non-Hv#HASH#1 Hypervisors. -- **SLATSupported** Represents whether Second Level Address Translation (SLAT) is supported by the hardware. -- **VirtualizationFirmwareEnabled** Represents whether virtualization is enabled in the firmware. - - -### Census.Xbox - -This event sends data about the Xbox Console, such as Serial Number and DeviceId, to help keep Windows up to date. - -The following fields are available: - -- **XboxConsolePreferredLanguage** Retrieves the preferred language selected by the user on Xbox console. -- **XboxConsoleSerialNumber** Retrieves the serial number of the Xbox console. -- **XboxLiveDeviceId** Retrieves the unique device id of the console. -- **XboxLiveSandboxId** Retrieves the developer sandbox id if the device is internal to MS. - - ### Census.Userdefault This event sends data about the current user's default preferences for browser and several of the most popular extensions and protocols, to help keep Windows up to date. @@ -1664,6 +1669,25 @@ The following fields are available: - **KeyboardInputLanguages** The Keyboard input languages installed on the device. - **SpeechInputLanguages** The Speech Input languages installed on the device. +### Census.VM + +This event sends data indicating whether virtualization is enabled on the device, and its various characteristics, to help keep Windows up to date. + +The following fields are available: + +- **CloudService** Indicates which cloud service, if any, that this virtual machine is running within. +- **HyperVisor** Retrieves whether the current OS is running on top of a Hypervisor. +- **IOMMUPresent** Represents if an input/output memory management unit (IOMMU) is present. +- **isVDI** Is the device using Virtual Desktop Infrastructure? +- **IsVirtualDevice** Retrieves that when the Hypervisor is Microsoft's Hyper-V Hypervisor or other Hv#HASH#1 Hypervisor, this field will be set to FALSE for the Hyper-V host OS and TRUE for any guest OS's. This field should not be relied upon for non-Hv#HASH#1 Hypervisors. +- **SLATSupported** Represents whether Second Level Address Translation (SLAT) is supported by the hardware. +- **VirtualizationFirmwareEnabled** Represents whether virtualization is enabled in the firmware. + + + + + + ### Census.WU @@ -1695,34 +1719,18 @@ The following fields are available: - **WUPauseState** Retrieves WU setting to determine if updates are paused - **WUServer** Retrieves the HTTP(S) URL of the WSUS server that is used by Automatic Updates and API callers (by default). +### Census.Xbox -### Census.Speech - -This event is used to gather basic speech settings on the device. +This event sends data about the Xbox Console, such as Serial Number and DeviceId, to help keep Windows up to date. The following fields are available: -- **AboveLockEnabled** Cortana setting that represents if Cortana can be invoked when the device is locked. -- **GPAllowInputPersonalization** Indicates if a Group Policy setting has enabled speech functionalities. -- **HolographicSpeechInputDisabled** Holographic setting that represents if the attached HMD devices have speech functionality disabled by the user. -- **HolographicSpeechInputDisabledRemote** Indicates if a remote policy has disabled speech functionalities for the HMD devices. -- **KWSEnabled** "Cortana setting that represents if a user has enabled the ""Hey Cortana"" keyword spotter (KWS)." -- **MDMAllowInputPersonalization** Indicates if an MDM policy has enabled speech functionalities. -- **RemotelyManaged** Indicates if the device is being controlled by a remote admininistrator (MDM or Group Policy) in the context of speech functionalities. -- **SpeakerIdEnabled** Cortana setting that represents if keyword detection has been trained to try to respond to a single user's voice. -- **SpeechServicesEnabled** Windows setting that represents whether a user is opted-in for speech services on the device. +- **XboxConsolePreferredLanguage** Retrieves the preferred language selected by the user on Xbox console. +- **XboxConsoleSerialNumber** Retrieves the serial number of the Xbox console. +- **XboxLiveDeviceId** Retrieves the unique device id of the console. +- **XboxLiveSandboxId** Retrieves the developer sandbox id if the device is internal to MS. -### Census.Security -This event provides information on about security settings used to help keep Windows up-to-date and secure. - -- **AvailableSecurityProperties** Enumerates and reports state on the relevant security properties for Device Guard. -- **CGRunning** Is Credential Guard running? -- **DGState** A summary of the Device Guard state. -- **HVCIRunning** Is HVCI running? -- **RequiredSecurityProperties** Describes the required security properties to enable virtualization-based security. -- **SecureBootCapable** Is this device capable of running Secure Boot? -- **VBSState** Is virtualization-based security enabled, disabled, or running? ## Diagnostic data events @@ -1812,7 +1820,7 @@ The following fields are available: - **LastEventSizeOffender** The name of the last event that exceeded the maximum event size. - **LastInvalidHttpCode** The last invalid HTTP code received from Vortex. - **MaxActiveAgentConnectionCount** The maximum number of active agents during this heartbeat timeframe. -- **MaxInUseScenarioCounter** The soft maximum number of scenarios loaded by the Connected User Experience and Telemetry component. +- **MaxInUseScenarioCounter** The soft maximum number of scenarios loaded by the Connected User Experiences and Telemetry component. - **PreviousHeartBeatTime** The time of last heartbeat event. This allows chaining of events. - **SettingsHttpAttempts** The number of attempts to contact the OneSettings service. - **SettingsHttpFailures** The number of failures from contacting the OneSettings service. @@ -1990,8 +1998,9 @@ The following fields are available: This event provides data on the installed Office Add-ins. -- **AddInCLSID** The CLSID key office the Office addin. -- **AddInId** The ID of the Office addin. +- **AddInCLSID** The CLSID key office for the Office addin. +- **AddInId** The identifier of the Office addin. +- **AddinType** The type of the Office addin. - **BinFileTimestamp** The timestamp of the Office addin. - **BinFileVersion** The version of the Office addin. - **Description** The description of the Office addin. @@ -2004,8 +2013,58 @@ This event provides data on the installed Office Add-ins. - **OfficeArchitecture** The architecture of the addin. - **OfficeVersion** The Office version for this addin. - **OutlookCrashingAddin** A boolean value that indicates if crashes have been found for this addin. +- **ProductCompany** The name of the company associated with the Office addin. +- **ProductName** The product name associated with the Office addin. +- **ProductVersion** The version associated with the Office addin. +- **ProgramId** The unique program identifier of the Office addin. - **Provider** The provider name for this addin. +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeAddInRemove + +This event indicates that the particular data object represented by the objectInstanceId is no longer present. + +There are no fields in this event. + + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeInsightsAdd + +This event provides insight data on the installed Office products. + +The following fields are available: + +- **OfficeApplication** The name of the Office application. +- **OfficeArchitecture** The bitness of the Office application. +- **OfficeVersion** The version of the Office application. +- **Value** The insights collected about this entity. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeInsightsRemove + +This event indicates that the particular data object represented by the objectInstanceId is no longer present. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeInsightsStartSync + +This diagnostic event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeSettingsAdd + +This event describes various Office settings. + +The following fields are available: + +- **BrowserFlags** Browser flags for Office-related products. +- **ExchangeProviderFlags** Provider policies for Office Exchange. +- **SharedComputerLicensing** Office shared computer licensing policies. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeSettingsStartSync + +Diagnostic event to indicate a new sync is being generated for this object type. + +There are no fields in this event. ### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBAAdd @@ -2036,6 +2095,18 @@ The following fields are available: - **Validation_x64** Count of files that require additional manual validation for 64-bit issues +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBARemove + +This event indicates that the particular data object represented by the objectInstanceId is no longer present. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBARuleViolationsRemove + +This event indicates that the particular data object represented by the objectInstanceId is no longer present. + +There are no fields in this event. + ### Microsoft.Windows.Inventory.Core.InventoryApplicationFrameworkStartSync This event indicates that a new set of InventoryApplicationFrameworkAdd events will be sent @@ -2412,6 +2483,66 @@ This event indicates that a new sync is being generated for this object type. There are no fields in this event. +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIdentifiersAdd + +This event provides data on the installed Office identifiers. + +- **OAudienceData** The Office Audience descriptor. +- **OAudienceId** The Office Audience ID. +- **OMID** The Office machine ID. +- **OPlatform** The Office architecture. +- **OVersion** The Office version +- **OTenantId** The Office 365 Tenant GUID. +- **OWowMID** The Office machine ID. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIdentifiersStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIESettingsAdd + +This event provides data on the installed Office-related Internet Explorer features. + +- **OIeFeatureAddon** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeMachineLockdown** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeMimeHandling** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeMimeSniffing** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeNoAxInstall** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeNoDownload** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeObjectCaching** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIePasswordDisable** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeSafeBind** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeSecurityBand** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeUncSaveCheck** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeValidateUrl** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeWebOcPopup** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeWinRestrict** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeZoneElevate** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIESettingsStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeProductsAdd + +This event describes the Office products that are installed. + +- **OC2rApps** The Office Click-to-Run apps. +- **OC2rSkus** The Office Click-to-Run products. +- **OMsiApps** The Office MSI apps. +- **OProductCodes** The Office MSI product code. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeProductsStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + ### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBARuleViolationsStartSync This event indicates that a new sync is being generated for this object type. diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md index eef0a970c9..144f6425e6 100644 --- a/windows/configuration/change-history-for-configure-windows-10.md +++ b/windows/configuration/change-history-for-configure-windows-10.md @@ -8,7 +8,7 @@ ms.sitesec: library ms.pagetype: security ms.localizationpriority: high author: jdeckerms -ms.date: 02/08/2018 +ms.date: 02/12/2018 --- # Change history for Configure Windows 10 @@ -19,6 +19,7 @@ This topic lists new and updated topics in the [Configure Windows 10](index.md) New or changed topic | Description --- | --- +[Windows 10, version 1709 basic diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md) | Added events and fields that were added in the February update. [Create a Windows 10 kiosk that runs multiple apps](lock-down-windows-10-to-specific-apps.md) | Added steps for configuring a kiosk in Microsoft Intune. [Customize Windows 10 Start and taskbar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md) | Updated the instructions for applying a customized Start layout using Microsoft Intune. From 80e912b8fe25c3f89dff97fb448b53bfd9b8e075 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Mon, 12 Feb 2018 21:42:43 +0000 Subject: [PATCH 5/5] Merged PR 5844: add import-startlayout --- windows/configuration/configure-windows-10-taskbar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/configuration/configure-windows-10-taskbar.md b/windows/configuration/configure-windows-10-taskbar.md index eb38b5217a..ac50964c8f 100644 --- a/windows/configuration/configure-windows-10-taskbar.md +++ b/windows/configuration/configure-windows-10-taskbar.md @@ -43,7 +43,7 @@ The following example shows how apps will be pinned: Windows default apps to the 3. Apply the layout modification XML file to devices using [Group Policy](customize-windows-10-start-screens-by-using-group-policy.md) or a [provisioning package created in Windows Imaging and Configuration Designer (Windows ICD)](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md). >[!IMPORTANT] ->If you use a provisioning package to configure the taskbar, your configuration will be reapplied each time the explorer.exe process restarts. If your configuration pins an app and the user then unpins that app, the user's change will be overwritten the next time the configuration is applied. To apply a taskbar configuration that allows users to make changes that will persist, apply your configuration by using Group Policy. +>If you use a provisioning package or import-startlayout to configure the taskbar, your configuration will be reapplied each time the explorer.exe process restarts. If your configuration pins an app and the user then unpins that app, the user's change will be overwritten the next time the configuration is applied. To apply a taskbar configuration that allows users to make changes that will persist, apply your configuration by using Group Policy. > >If you use Group Policy and your configuration only contains a taskbar layout, the default Windows tile layout will be applied and cannot be changed by users. If you use Group Policy and your configuration includes taskbar and a full Start layout, users can only make changes to the taskbar. If you use Group Policy and your configuration includes taskbar and a [partial Start layout](https://technet.microsoft.com/itpro/windows/manage/customize-and-export-start-layout#configure-a-partial-start-layout), users can make changes to the taskbar and to tile groups not defined in the partial Start layout.