diff --git a/windows/manage/images/wufb-config1a.png b/windows/manage/images/wufb-config1a.png index 44ce007a76..1514b87528 100644 Binary files a/windows/manage/images/wufb-config1a.png and b/windows/manage/images/wufb-config1a.png differ diff --git a/windows/manage/images/wufb-config2.png b/windows/manage/images/wufb-config2.png index 0ab09d4868..f54eef9a50 100644 Binary files a/windows/manage/images/wufb-config2.png and b/windows/manage/images/wufb-config2.png differ diff --git a/windows/manage/images/wufb-config3a.png b/windows/manage/images/wufb-config3a.png index a76d1569be..538028cfdc 100644 Binary files a/windows/manage/images/wufb-config3a.png and b/windows/manage/images/wufb-config3a.png differ diff --git a/windows/manage/waas-integrate-wufb.md b/windows/manage/waas-integrate-wufb.md index d00083ad6c..bf9f2ebf78 100644 --- a/windows/manage/waas-integrate-wufb.md +++ b/windows/manage/waas-integrate-wufb.md @@ -23,10 +23,10 @@ You can integrate Windows Update for Business deployments with existing manageme ## Integrate Windows Update for Business with Windows Server Update Services -For Windows 10, version 1607, devices can now be configured to receive updates from both Windows Update and Windows Server Update Services (WSUS). In a joint WSUS and Windows Update for Business setup: +For Windows 10, version 1607, devices can now be configured to receive updates from both Windows Update (or Microsoft Update) and Windows Server Update Services (WSUS). In a joint WSUS and Windows Update for Business setup: - Devices will receive their Windows content from Microsoft and defer these updates according to Windows Update for Business policy -- All other content synced from WSUS will be directly applied to the device; that is, non-Windows Updates content will not follow your Windows Update for Business deferral policies +- All other content synced from WSUS will be directly applied to the device; that is, updates to products other than Windows will not follow your Windows Update for Business deferral policies ### Configuration example \#1: Deferring Windows Update updates with other update content hosted on WSUS @@ -34,13 +34,13 @@ For Windows 10, version 1607, devices can now be configured to receive updates f - Device is configured to defer Windows Quality Updates using Windows Update for Business - Device is also configured to be managed by WSUS -- Device is not configured to include Microsoft Updates from Windows Update (**Update/AllowMUUpdateService** = not enabled) -- Admin has opted to put Microsoft updates on WSUS +- Device is not configured to enable Microsoft Update (**Update/AllowMUUpdateService** = not enabled) +- Admin has opted to put updates to Office and other products on WSUS - Admin has also put 3rd party drivers on WSUS - - + +
ContentMetadata sourcePayload sourceDeferred?
Windows UpdateWindows UpdateWindows UpdateYes![diagram of content flow](images/wufb-config1a.png)
Microsoft Update (such as Office updates)WSUSWSUSNo
Updates to WindowsWindows UpdateWindows UpdateYes![diagram of content flow](images/wufb-config1a.png)
Updates to Office and other productsWSUSWSUSNo
Third-party driversWSUSWSUSNo
@@ -54,10 +54,9 @@ For Windows 10, version 1607, devices can now be configured to receive updates f - - - - + + +
ContentMetadata sourcePayload sourceDeferred?
Windows Update (exclude driver)Windows UpdateWindows UpdateYes![diagram of content flow](images/wufb-config2.png)
Windows Update driversWSUSWSUSNo
Microsoft Update (such as Office updates)WSUSWSUSNo
Windows drivers, third-party driversWSUSWSUSNo
Updates to Windows (excluding drivers)Windows UpdateWindows UpdateYes![diagram of content flow](images/wufb-config2.png)
Updates to Office and other productsWSUSWSUSNo
DriversWSUSWSUSNo
@@ -66,18 +65,18 @@ For Windows 10, version 1607, devices can now be configured to receive updates f **Configuration:** - Device is configured to defer Quality Updates using Windows Update for Business and to be managed by WSUS -- Device is configured to “receive updates for other Microsoft products” along with Windows Update updates (**Update/AllowMUUpdateService** = enabled) -- Admin has also placed Microsoft Update content on the WSUS server +- Device is configured to “receive updates for other Microsoft products” along with updates to Windows (**Update/AllowMUUpdateService** = enabled) +- Admin has also placed Microsoft Update, third-paprty, and locally-published update content on the WSUS server -In this example, the Microsoft Update deferral behavior is slightly different than if WSUS were not enabled. -- In a non-WSUS case, the Microsoft Update updates would be deferred just as any Windows Update update would be. -- However, with WSUS also configured, Microsoft Update content is sourced from Microsoft but deferral policies are not applied. +In this example, the deferral behavior for updates to Office and other non-Windows products is slightly different than if WSUS were not enabled. +- In a non-WSUS case, these updates would be deferred just as any update to Windows would be. +- However, with WSUS also configured, these updates are sourced from Microsoft but deferral policies are not applied. - - - + + +
ContentMetadata sourcePayload sourceDeferred?
Windows Update (exclude drivers)Windows UpdateWindows UpdateYes![diagram of content flow](images/wufb-config3a.png)
Microsoft Update (such as Office updates)Microsoft UpdateMicrosoft UpdateNo
Drivers, third-partyWSUSWSUSNo
Updates to Windows (excluding drivers)Microsoft UpdateMicrosoft UpdateYes![diagram of content flow](images/wufb-config3a.png)
Updates to Office and other productsMicrosoft UpdateMicrosoft UpdateNo
Drivers, third-party applicationsWSUSWSUSNo
>[!NOTE] diff --git a/windows/manage/waas-restart.md b/windows/manage/waas-restart.md index 84f1227699..e8a8394d2d 100644 --- a/windows/manage/waas-restart.md +++ b/windows/manage/waas-restart.md @@ -27,7 +27,7 @@ When you set the **Configure Automatic Updates** policy to **Auto download and s When **Configure Automatic Updates** is enabled, you can enable one of the following additional policies to manage device restart: - **Turn off auto-restart for updates during active hours** prevents automatic restart during active hours. -- **Always automatically restart at the scheduled time** forces a restart after the specified installation time and lets you configure a timer to warn a signed-in user that a restart is going to occur. +- **Always automatically restart at the scheduled time** forces a restart after the specified installation time and lets you configure a timer to warn a signed-in user that a restart is going to occur. To set the time, you need to go **Configure Automatic Updates**, select option **4 - Auto download and schedule the install**, and then enter a time in the **Scheduled install time** dropdown. - **No auto-restart with logged on users for scheduled automatic updates installations** prevents automatic restart when a user is signed in. If a user schedules the restart in the update notification, the device will restart at the time the user specifies even if a user is signed in at the time. This policy only applies when **Configure Automatic Updates** is set to option **4-Auto download and schedule the install**. ## Configure active hours