Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox

windows/configure/change-history-for-configure-windows-10.md

@@ -22,3 +22,5 @@ The topics in this library have been updated for Windows 10, version 1703 (also
 - [Use the Lockdown Designer app to create a Lockdown XML file](mobile-lockdown-designer.md)
 - [Add image for secondary tiles](start-secondary-tiles.md)
 - [Provision PCs with apps](provision-pcs-with-apps.md)
+- [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md)
+- [Windows 10, version 1703 Diagnostic Data](windows-diagnostic-data.md)

windows/configure/index.md

@@ -19,6 +19,8 @@ Enterprises often need to apply custom configurations to devices for their users
 | Topic | Description |
 | --- | --- |
 | [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. |
+| [Basic level Windows diagnostic data](windows-diagnostic-data.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1703. |
+| [Windows 10, version 1703 diagnostic data](windows-diagnostic-data.md) | Learn about the types of data that is collected at the full level in Windows 10, version 1703. |
 | [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.  |
 | [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md) | These topics help you configure Windows 10 devices to be shared by multiple users or to run as a kiosk device that runs a single app. |

windows/keep-secure/bitlocker-frequently-asked-questions.md

@@ -116,7 +116,7 @@ The following table lists what action you need to take before you perform an upg
 <td align="left"><p>Decrypt</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>Upgrade to Windows 10</p></td>
+<td align="left"><p>[Feature updates](https://technet.microsoft.com/itpro/windows/manage/waas-quick-start) for Windows 10 (example: Windows 10, version 1703)</p></td>
 <td align="left"><p>Suspend</p></td>
 </tr>
 <tr class="odd">
@@ -129,7 +129,7 @@ The following table lists what action you need to take before you perform an upg
 <td align="left"><p>Suspend</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>Software and operating system updates from Windows Update</p></td>
+<td align="left"><p>Software and [quality updates](https://technet.microsoft.com/itpro/windows/manage/waas-quick-start) from Windows Update</p></td>
 <td align="left"><p>Nothing</p></td>
 </tr>
 </tbody>

windows/update/waas-quick-start.md

@@ -42,7 +42,7 @@ See [Assign devices to servicing branches for Windows 10 updates](waas-servicing
 
 ## Staying up to date
 
-The process for keeping Windows 10 up to date involves deploying a feature update, at an appropriate time after its release.  A variety of tools management and patching tools such as Windows Update, Windows Update for Business, Windows Server Update Services, System Center Configuration Manager, and third-party products) can be used to help with this process.  [Windows Upgrade Analytics](https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics), a free tool to streamline Windows upgrade projects, is another important tool to help.
+The process for keeping Windows 10 up to date involves deploying a feature update, at an appropriate time after its release.  A variety of tools management and patching tools such as Windows Update, Windows Update for Business, Windows Server Update Services, System Center Configuration Manager, and third-party products) can be used to help with this process.  [Windows Analytics Upgrade Readiness](https://www.microsoft.com/en-us/WindowsForBusiness/windows-analytics), a free tool to streamline Windows upgrade projects, is another important tool to help.
 
 Because app compatibility, both for desktop apps and web apps, is outstanding with Windows 10, extensive advanced testing isn’t required.  Instead, only business-critical apps need to be tested, with the remaining apps validated through a series of pilot deployment rings.  Once these pilot deployments have validated most apps and CBB has been declared, broad deployment can begin.
 

windows/whats-new/whats-new-windows-10-version-1703.md

@@ -243,6 +243,13 @@ For more info, see the following topics:
 - [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](../manage/appv-auto-batch-updating.md)
 - [Automatically cleanup unpublished packages on the App-V client](../manage/appv-auto-clean-unpublished-packages.md)
 
+### Windows diagnostic data
+
+Learn more about the diagnostic data that's collected at the Basic level and some examples of the types of data that is collected at the Full level.
+
+- [Windows 10, version 1703 basic level Windows diagnostic events and fields](../configure/basic-level-windows-diagnostic-events-and-fields.md)
+- [Windows 10, version 1703 Diagnostic Data](../configure/windows-diagnostic-data.md)
+
 ## Windows 10 Mobile enhancements
 
 ### Lockdown Designer