deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-22 02:07:24 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
LizRoss 2016-11-23 09:59:56 -08:00
commit edc3d2c16b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/surface-hub/manage-windows-updates-for-surface-hub.md
View File

@ -19,7 +19,7 @@ New releases of the Surface Hub operating system are published through Windows U
You can also configure Surface Hub to receive updates from both Windows Update for Business and WSUS. See [Integrate Windows Update for Business with Windows Server Update Services](https://technet.microsoft.com/en-us/itpro/windows/manage/waas-integrate-wufb#integrate-windows-update-for-business-with-windows-server-update-services) for details.
| Capabilities | Windows Update for Business | Windows server Update Services (WSUS) |
| Capabilities | Windows Update for Business | Windows Server Update Services (WSUS) |
| ------------ | --------------------------- | ------------------------------------- |
| Receive updates directly from Microsoft's Windows Update service, with no additional infrastructure required. | Yes | No |
| Defer updates to provide additional time for testing and evaluation. | Yes | Yes |

2
windows/keep-secure/trusted-platform-module-overview.md
View File

@ -45,7 +45,7 @@ The TPM has several Group Policy settings that can be used to manage how it is u
## <a href="" id="bkmk-new"></a>New and changed functionality
For more info on new and changed functionality for Trusted Platform Module in Windows 10, see [What's new in Trusted Platform Module?](../whats-new/trusted-platform-module.md).
For more info on new and changed functionality for Trusted Platform Module in Windows 10, see [What's new in Trusted Platform Module?](../whats-new/whats-new-windows-10-version-1507-and-1511.md#trusted-platform-module).
## <a href="" id="bkmk-dha"></a>Device health attestation