From 3e30e7544c131e56dd51d8d2c7556b79ecb30168 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Fri, 2 Feb 2018 15:31:44 -0800 Subject: [PATCH 1/3] fixed links in BitLocker topic --- .../bitlocker/bitlocker-basic-deployment.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/windows/device-security/bitlocker/bitlocker-basic-deployment.md b/windows/device-security/bitlocker/bitlocker-basic-deployment.md index 9a2d09f6a4..529ff6e574 100644 --- a/windows/device-security/bitlocker/bitlocker-basic-deployment.md +++ b/windows/device-security/bitlocker/bitlocker-basic-deployment.md @@ -17,14 +17,7 @@ ms.date: 04/19/2017 This topic for the IT professional explains how BitLocker features can be used to protect your data through drive encryption. -The following sections provide information that will help you put together your basic deployment plan for implementing BitLocker in your organization: - -- [Using BitLocker to encrypt volumes](#bkmk-dep1) -- [Down-level compatibility](#bkmk-dep2) -- [Using manage-bde to encrypt volumes with BitLocker](#bkmk-dep3) -- [Using PowerShell to encrypt volumes with BitLocker](#bkmk-dep4) - -## Using BitLocker to encrypt volumes +## Using BitLocker to encrypt volumes BitLocker provides full volume encryption (FVE) for operating system volumes, as well as fixed and removable data volumes. To support fully encrypted operating system volumes, BitLocker uses an unencrypted system volume for the files required to boot, decrypt, and load the operating system. This volume is automatically created during a new installation of both client and server operating systems. From 0a5d81c214b5d4dafd8fd1fd4a54a5dd6c931417 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Fri, 2 Feb 2018 15:45:59 -0800 Subject: [PATCH 2/3] added note about telemtry levels --- ...ws-operating-system-components-to-microsoft-services.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md index a34a6aa5a7..b4b6298953 100644 --- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md +++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md @@ -1430,11 +1430,14 @@ To change the level of diagnostic and usage data sent when you **Send your devic -or- -- Apply the Group Policy: **Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection And Preview Builds\\Allow Telemetry** +- Apply the Group Policy: **Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection And Preview Builds\\Allow Telemetry** and select the appropriate option for your deployment. -or- -- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DataCollection\\AllowTelemetry**, with a value of 0 (zero). +- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DataCollection\\AllowTelemetry**, with a value of 0-3, as appropriate for your deployment (see below for the values for each level). + +> [!NOTE] +> If **Security** or **Enhanced** options are configured by using Group Policy or the Registry, the value will not be reflected in the UI. -or- From ba9777fef37b3d23bd58474f42cd60d07af9ba33 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Mon, 5 Feb 2018 08:57:45 -0800 Subject: [PATCH 3/3] removed Enhanced option from the note --- ...windows-operating-system-components-to-microsoft-services.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md index b4b6298953..543b74e677 100644 --- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md +++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md @@ -1437,7 +1437,7 @@ To change the level of diagnostic and usage data sent when you **Send your devic - Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DataCollection\\AllowTelemetry**, with a value of 0-3, as appropriate for your deployment (see below for the values for each level). > [!NOTE] -> If **Security** or **Enhanced** options are configured by using Group Policy or the Registry, the value will not be reflected in the UI. +> If the **Security** option is configured by using Group Policy or the Registry, the value will not be reflected in the UI. -or-