Merged PR 3356: converting 2 tables to lists

windows/client-management/mdm/policy-csp-system.md

@@ -6,7 +6,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 08/30/2017
+ms.date: 09/20/2017
 ---
 
 # Policy CSP - System
@@ -303,7 +303,13 @@ ms.date: 08/30/2017
 
 <p style="margin-left: 20px">The following tables describe the supported values:
 
-<table style="margin-left: 20px">
+Windows 8.1 Values:
+
+-   0 - Not allowed.
+-   1 – Allowed, except for Secondary Data Requests.
+-   2 (default) – Allowed.
+
+<!--<table style="margin-left: 20px">
 <colgroup>
 <col width="100%" />
 </colgroup>
@@ -324,10 +330,17 @@ ms.date: 08/30/2017
 <td style="vertical-align:top"><p>2 (default) – Allowed.</p></td>
 </tr>
 </tbody>
-</table>
+</table>-->
 
+Windows 10 Values:
 
-<table style="margin-left: 20px">
+-   0 – Security. Information that is required to help keep Windows more secure, including data about the Connected User Experience and Telemetry component settings, the Malicious Software Removal Tool, and Windows Defender.
+    Note: This value is only applicable to Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile Enterprise, Windows 10 IoT Core (IoT Core), and Windows Server 2016. Using this setting on other devices is equivalent to setting the value of 1.
+-   1 – Basic. Basic device info, including: quality-related data, app compatibility, app usage data, and data from the Security level.
+-   2 – Enhanced. Additional insights, including: how Windows, Windows Server, System Center, and apps are used, how they perform, advanced reliability data, and data from both the Basic and the Security levels.
+-   3 – Full. All data necessary to identify and help to fix problems, plus data from the Security, Basic, and Enhanced levels.
+
+<!--<table style="margin-left: 20px">
 <colgroup>
 <col width="100%" />
 </colgroup>
@@ -354,7 +367,7 @@ ms.date: 08/30/2017
 <td style="vertical-align:top"><p>3 – Full. All data necessary to identify and help to fix problems, plus data from the Security, Basic, and Enhanced levels.</p></td>
 </tr>
 </tbody>
-</table>
+</table>-->
 
 
 > [!IMPORTANT]

windows/client-management/mdm/policy-csp-update.md

@@ -6,7 +6,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 08/30/2017
+ms.date: 09/20/2017
 ---
 
 # Policy CSP - Update
@@ -595,7 +595,34 @@ This policy is accessible through the Update setting in the user interface or Gr
 
 <p style="margin-left: 20px">If the Allow Telemetry policy is enabled and the Options value is set to 0, then the "Defer upgrades by", "Defer updates by" and "Pause Updates and Upgrades" settings have no effect.
 
-<table style="margin-left: 20px">
+OS upgrade:
+-   Maximum deferral: 8 months
+-   Deferral increment: 1 month
+-   Update type/notes:
+   - Upgrade - 3689BDC8-B205-4AF4-8D4A-A63924C5E9D5
+
+Update:
+-   Maximum deferral: 1 month
+-   Deferral increment: 1 week
+-   Update type/notes:
+    If a machine has Microsoft Update enabled, any Microsoft Updates in these categories will also observe Defer / Pause logic.
+        - Security Update - 0FA1201D-4330-4FA8-8AE9-B877473B6441
+        - Critical Update - E6CF1350-C01B-414D-A61F-263D14D133B4
+        - Update Rollup - 28BC880E-0592-4CBF-8F95-C79B17911D5F
+        - Service Pack - 68C5B0A3-D1A6-4553-AE49-01D3A7827828
+        - Tools - B4832BD8-E735-4761-8DAF-37F882276DAB
+        - Feature Pack - B54E7D24-7ADD-428F-8B75-90A396FA584F
+        - Update - CD5FFD1E-E932-4E3A-BF74-18BF0B1BBD83
+        - Driver - EBFC1FC5-71A4-4F7B-9ACA-3B9A503104A0
+
+Other/cannot defer:
+-   Maximum deferral: No deferral
+-   Deferral increment: No deferral
+-   Update type/notes:
+    Any update category not specifically enumerated above falls into this category.
+        - Definition Update - E0789628-CE08-4437-BE74-2495B842F43B
+
+<!--<table style="margin-left: 20px">
 <colgroup>
 <col width="25%" />
 <col width="25%" />
@@ -644,7 +671,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
 <p>Definition Update - E0789628-CE08-4437-BE74-2495B842F43B</p></td>
 </tr>
 </tbody>
-</table>
+</table>-->
 
 <!--EndDescription-->
 <!--EndPolicy-->