Merge branch 'master' of https://cpubwin.visualstudio.com/_git/it-client into FromPrivateRepo

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 the **Security** option is configured by using Group Policy or the Registry, the value will not be reflected in the UI.
 
    -or-
 

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)
-
-## <a href="" id="bkmk-dep1"></a>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.
 

windows/hub/index.md

@@ -8,7 +8,7 @@ author: greg-lindsay
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: security
-ms.date: 12/18/2017
+ms.date: 02/02/2018
 ---
 
 # Windows 10 and Windows 10 Mobile
@@ -19,51 +19,48 @@ Find the latest how to and support content that IT pros need to evaluate, plan,
 
 > [!video https://www.microsoft.com/en-us/videoplayer/embed/43942201-bec9-4f8b-8ba7-2d9bfafa8bba?autoplay=false]
 
+
 <br>
-<table border="0" width="100%" align='center'>
+<table border="0" width="100%" align="center">
   <tr style="text-align:center;">
     <td align="center" style="width:25%; border:0;">
       <a href="/windows/whats-new/whats-new-windows-10-version-1709"> 
         <img src="images/whatsnew.png" alt="Read what's new in Windows 10" title="Whats new" />
-      <br/>What's New? </a>
+      <br/>What's New? </a><br>
     </td>
      <td align="center" style="width:25%; border:0;">
       <a href="/windows/configuration/index">
         <img src="images/configuration.png" alt="Configure Windows 10 in your enterprise" title="Configure Windows 10" />
-      <br/>Configuration </a>
+      <br/>Configuration </a><br>
     </td>
     <td align="center" style="width:25%; border:0;">
       <a href="/windows/deployment/index">
         <img src="images/deployment.png" alt="Windows 10 deployment" title="Windows 10 deployment" />
-      <br/>Deployment </a>
+      <br/>Deployment </a><br>
     </td>
        <td align="center" style="width:25%; border:0;">
       <a href="/windows/client-management/index">
         <img src="images/clientmanagement.png" alt="Windows 10 client management" title="Client management" />
-      <br/>Client Management </a>
+      <br/>Client Management </a><br>
     </td>
   </tr>
-  <tr>
-   <td align="center" style="width:25%; border:0;"><BR>
-   </td>
-  </tr>
   <tr style="text-align:center;">
-    <td align="center" style="width:25%; border:0;">
+    <td align="center" style="width:25%; border:0;"><br>
       <a href="/windows/application-management/index">
         <img src="images/applicationmanagement.png" alt="Manage applications in your Windows 10 enterprise deployment" title="Application management" />
       <br/>Application Management </a>
     </td>
-    <td align="center" style="width:25%; border:0;">
+    <td align="center" style="width:25%; border:0;"><br>
       <a href="/windows/access-protection/index">
         <img src="images/accessprotection.png" alt="Windows 10 access protection" title="Windows 10 access protection" />
       <br/>Access Protection </a>
     </td>
-    <td align="center" style="width:25%; border:0;">
+    <td align="center" style="width:25%; border:0;"><br>
       <a href="/windows/device-security/index">
         <img src="images/devicesecurity.png" alt="Windows 10 device security" title="W10 device security" />
       <br/>Device Security </a>
     </td>
-    <td align="center" style="width:25%; border:0;">
+    <td align="center" style="width:25%; border:0;"><br>
       <a href="/windows/threat-protection/index">
         <img src="images/threatprotection.png" alt="Windows 10 threat protection" title="Windows 10 threat protection" />
       <br/>Threat Protection </a>