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

# Conflicts:
#	windows/manage/TOC.md
#	windows/manage/index.md
This commit is contained in:
jdeckerMS
2017-02-21 10:22:39 -08:00
21 changed files with 87 additions and 169 deletions

View File

@ -22,6 +22,7 @@ The topics in this library have been updated for Windows 10, version 1703 (also
| New or changed topic | Description |
| --- | --- |
| [Windows Libraries](windows-libraries.md) | New |
| [Monitor Windows Updates with Update Compliance](update-compliance-monitor.md) | New |
| [Get started with Update Compliance](update-compliance-get-started.md) | New |
| [Use Update Compliance to monitor Windows Updates](update-compliance-using.md) | New |
@ -189,4 +190,4 @@ The topics in this library have been updated for Windows 10, version 1607 (also
[Change history for Keep Windows 10 secure](../keep-secure/change-history-for-keep-windows-10-secure.md)
 
 

View File

@ -21,6 +21,7 @@ Learn about managing Windows 10.
## In this section
| Topic | Description |
| --- | --- |
| [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md) | Strategies for deploying and managing Windows 10, including deploying Windows 10 in a mixed environment. |
@ -40,6 +41,7 @@ Learn about managing Windows 10.
 
## Related topics
[Windows 10 and Windows 10 Mobile](../index.md)