diff --git a/mdop/uev-v2/security-considerations-for-ue-v-2x-both-uevv2.md b/mdop/uev-v2/security-considerations-for-ue-v-2x-both-uevv2.md index ef418d7c0c..7aa983fc6e 100644 --- a/mdop/uev-v2/security-considerations-for-ue-v-2x-both-uevv2.md +++ b/mdop/uev-v2/security-considerations-for-ue-v-2x-both-uevv2.md @@ -33,143 +33,36 @@ Because settings packages might contain personal information, you should take ca 1. Set the following share-level SMB permissions for the setting storage location folder. -
User account | -Recommended permissions | -
---|---|
Everyone |
- No permissions |
-
Security group of UE-V |
- Full control |
-
User account | -Recommended permissions | -Folder | -
---|---|---|
Creator/Owner |
- No permissions |
- No permissions |
-
Domain Admins |
- Full control |
- This folder, subfolders, and files |
-
Security group of UE-V users |
- List folder/read data, create folders/append data |
- This folder only |
-
Everyone |
- Remove all permissions |
- No permissions |
-
User account | -Recommend permissions | -
---|---|
Everyone |
- No permissions |
-
Domain computers |
- Read permission Levels |
-
Administrators |
- Read/write permission levels |
-
User account | -Recommended permissions | -Apply to | -
---|---|---|
Creator/Owner |
- Full control |
- This folder, subfolders, and files |
-
Domain Computers |
- List folder contents and Read permissions |
- This folder, subfolders, and files |
-
Everyone |
- No permissions |
- No permissions |
-
Administrators |
- Full Control |
- This folder, subfolders, and files |
-
Virtual machine
For PCs running Windows 10, version 1607, you can run Credential Guard on a Generation 2 virtual machine.
For PCs running Windows 10, version 1607 or Windows Server 2016, you can run Credential Guard on a Generation 2 virtual machine.
MaxConcurrentPublishingRefresh
|
diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md
index 340f28cdea..f43d1438fa 100644
--- a/windows/manage/change-history-for-manage-and-update-windows-10.md
+++ b/windows/manage/change-history-for-manage-and-update-windows-10.md
@@ -17,9 +17,12 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
| New or changed topic | Description |
| --- | --- |
+| [Create mandatory user profiles](mandatory-user-profile.md) | New |
+| [Update Windows 10 in the enterprise](waas-update-windows-10.md) | New section |
| [Configure Windows 10 taskbar](configure-windows-10-taskbar.md) | Updated sample XML for combined Start and taskbar layout; added note to explain the difference between applying taskbar configuration by Group Policy and by provisioning package |
| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Updated instructions for exiting assigned access mode. |
| Application development for Windows as a service | Topic moved to MSDN: [Application development for Windows as a service](https://msdn.microsoft.com/windows/uwp/get-started/application-development-for-windows-as-a-service)
+| Windows 10 servicing options | New content replaced this topic; see [Overview of Windows as a service](https://technet.microsoft.com/en-us/itpro/windows/manage/waas-overview) |
## RELEASE: Windows 10, version 1607
diff --git a/windows/manage/diagnostics-for-mdm-devices.md b/windows/manage/diagnostics-for-mdm-devices.md
deleted file mode 100644
index 32998541e9..0000000000
--- a/windows/manage/diagnostics-for-mdm-devices.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-title: Diagnostics for Windows 10 devices (Windows 10)
-description: Device Policy State log in Windows 10, Version 1607, collects info about policies.
-keywords: ["mdm", "udiag", "device policy", "mdmdiagnostics"]
-ms.prod: W10
-ms.mktglfcycl: manage
-ms.sitesec: library
-author: jdeckerMS
----
-
-# Diagnostics for Windows 10 devices
-
-**Applies to**
-
-- Windows 10
-- Windows 10 Mobile
-
-(which SKUs?)
-
-(this isn't really MDM-managed only, is it? It can be done locally/email?)
-
-Two new diagnostic tools for Windows 10, version 1607, help IT administrators diagnose and resolve issues with remote devices enrolled in mobile device management (MDM): the [Device Policy State Log](#device-policy-state-log) and [UDiag](#udiag). Windows 10 for desktop editions and Windows 10 Mobile make it simple for users to export log files that you can then analyze with these tools.
-
-## Export management log files
-
-Go to **Settings > Accounts > Work access > Export your management log files**.
-
-
-
-- On desktop devices, the file is saved to C:/Users/Public/Public Documents/MDMDiagnostics/MDMDiagReport.xml
-- On phones, the file is saved to *phone*/Documents/MDMDiagnostics/MDMDiagReport.xml
-
-The MDMDiagReport.xml can be used with [Device Policy State Log](#device-policy-state-log) and [UDiag](#udiag) to help you resolve issues.
-
-## Device Policy State Log
-
-The Device Policy State Log collects information on the state of policies applied to the device to help you determine which sources are applying policies or configurations to the device. Help desk personnel can use this log to diagnose and resolve issues with a remote device.
-
-After you obtain the management log file from the user's device, run the mdmReportGenerator.ps1 script on log to create report. (download mdmReportGenerator.ps1 and mdmDiagnoseHelpers.psm1) This PowerShell script asks you to enter the name of the management log file and a name for the report that it will create, as shown in the following example:
-
-
-
-The script produces the report in html format. There are two sections to the report, Configuration and Policy Information.
-
- The configuration section lists the GUID of the sources that are applying configurations to the device.
-
- 
-
-The policy information section displays information about the specific policies that are being enforced and on the device. For each policy, you will see the Area grouping, the Policy name, its default and current value, and the configuration source. You can compare the configuration source GUID in the policy information section to the GUIDs in the configuration section to identify the source of the policy.
-
-
-
-
-## UDiag
-
-The UDiag tool applies rules to Event Tracing for Windows (ETW) files to help determine the root cause of an issue.
-
-(download UDiag)
-
-To analyze MDMDiagReport.xml using UDiag
-1. Open UDiag, and select Device Management.
-2. Select your source for the log files ("cab of logs" or "directory of logs")
-
-Investigating log content, identifying patterns, and adding a root cause analysis to the database (Advanced users/providers)
-
-1. While at the 'Root Causes List' panel, click the 'Diagnose' button at the bottom.
-2. You will then be brought to the Diagnosis panel where you can investigate and tag root causes from the content
- - Evidence Groups: When a set of logs are loaded into UDiag, the contents are processed (e.g. ETW) and organized into evidence groups.
- - Decision Tree View: This view shows the loaded decision tree for the current topic/topic area. When a decision node is selected, a user can modify the regular expression and add/edit/delete an RCA for that node. Any RCA matches found in the current log set will have an 'RCA' label that is either Red or Yellow.
- - Evidence View: Selecting an evidence group loads its content into this evidence view. Use this view to investigate issues and determine root causes. Drag and drop lines from the Evidence View into the Decision Tree View, to build your root cause analysis pattern. ([Learn more about techniques for root cause analysis.](https://technet.microsoft.com/en-us/library/cc543298.aspx))
-
-
-
-
-
- Can admin pull logs without user action? [DK] Yes via the diagnostic log CSP
-
-
-
- "Run PowerShell script to process the file" – is that the user doing it? How can this workflow work in an enterprise where employees aren't computer-savvy? [DK] This is intended to be done by the help desk guy.
-
- Where did (user|admin) get mdmReportGenerator.ps1? [DK] Publishing on DLC later this summer
-
- In Viewing the report, how does the admin make sense of the source GUIDs? [DK] Correlates the value in the table with the entries at the top of the page.
-
- UDiag – where does admin get this? [DK] Publishing on DLC later this summer
-
- Can admins create custom rule sets? [DK] Right now, no. but open to feedback on this.
-
-
-
-Link to [Diagnose MDM failures in Windows 10](https://msdn.microsoft.com/en-us/library/windows/hardware/mt632120%28v=vs.85%29.aspx)
-
-[Diagnostics capability for devices managed by any MDM provider.](https://microsoft.sharepoint.com/teams/osg_core_ens/mgmt/OSMan Wiki/MDM Diagnostics - Generating and Processing Log files.aspx)
-
-[Redstone spec](https://microsoft.sharepoint.com/teams/specstore/_layouts/15/WopiFrame.aspx?sourcedoc=%7b7E8742A2-03A1-451C-BA07-F2573B044CBF%7d&file=DM%20-%20MDM%20Diagnostics-RS.docx&action=default&DefaultItemOpen=1)
-
-## Related topics
-
-[DiagnosticLog CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/mt219118.aspx)
-
-[Diagnose MDM failures in Windows 10](https://msdn.microsoft.com/en-us/library/windows/hardware/mt632120.aspx)
\ No newline at end of file
diff --git a/windows/manage/group-policies-for-enterprise-and-education-editions.md b/windows/manage/group-policies-for-enterprise-and-education-editions.md
index 37005acc03..40c5250e62 100644
--- a/windows/manage/group-policies-for-enterprise-and-education-editions.md
+++ b/windows/manage/group-policies-for-enterprise-and-education-editions.md
@@ -1,6 +1,6 @@
---
-title: Group Policies that apply only to Windows 10 Enterprise and Education Editions (Windows 10)
-description: Use this topic to learn about Group Policy objects that apply only to Windows 10 Enterprise and Windows 10 Education.
+title: Group Policy settings that apply only to Windows 10 Enterprise and Education Editions (Windows 10)
+description: Use this topic to learn about Group Policy settings that apply only to Windows 10 Enterprise and Windows 10 Education.
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
@@ -8,13 +8,13 @@ author: brianlic-msft
localizationpriority: high
---
-# Group Policies that apply only to Windows 10 Enterprise and Education Editions
+# Group Policy settings that apply only to Windows 10 Enterprise and Education Editions
**Applies to**
- Windows 10
-In Windows 10, version 1607, the following Group Policies apply only to Windows 10 Enterprise and Windows 10 Education.
+In Windows 10, version 1607, the following Group Policy settings apply only to Windows 10 Enterprise and Windows 10 Education.
| Policy name | Policy path | Comments |
| --- | --- | --- |
diff --git a/windows/manage/images/checklistbox.gif b/windows/manage/images/checklistbox.gif
index 8af13c51d1..44cf17b07b 100644
Binary files a/windows/manage/images/checklistbox.gif and b/windows/manage/images/checklistbox.gif differ
diff --git a/windows/manage/images/checklistdone.png b/windows/manage/images/checklistdone.png
new file mode 100644
index 0000000000..7e53f74d0e
Binary files /dev/null and b/windows/manage/images/checklistdone.png differ
diff --git a/windows/manage/images/copy-to-change.png b/windows/manage/images/copy-to-change.png
new file mode 100644
index 0000000000..21aa250c0c
Binary files /dev/null and b/windows/manage/images/copy-to-change.png differ
diff --git a/windows/manage/images/copy-to-path.png b/windows/manage/images/copy-to-path.png
new file mode 100644
index 0000000000..1ef00fc86b
Binary files /dev/null and b/windows/manage/images/copy-to-path.png differ
diff --git a/windows/manage/images/copy-to.PNG b/windows/manage/images/copy-to.PNG
new file mode 100644
index 0000000000..dad84cedc8
Binary files /dev/null and b/windows/manage/images/copy-to.PNG differ
diff --git a/windows/manage/images/gp-branch.png b/windows/manage/images/gp-branch.png
new file mode 100644
index 0000000000..997bcc830a
Binary files /dev/null and b/windows/manage/images/gp-branch.png differ
diff --git a/windows/manage/images/gp-exclude-drivers.png b/windows/manage/images/gp-exclude-drivers.png
new file mode 100644
index 0000000000..0010749139
Binary files /dev/null and b/windows/manage/images/gp-exclude-drivers.png differ
diff --git a/windows/manage/images/gp-feature.png b/windows/manage/images/gp-feature.png
new file mode 100644
index 0000000000..b862d545d4
Binary files /dev/null and b/windows/manage/images/gp-feature.png differ
diff --git a/windows/manage/images/gp-quality.png b/windows/manage/images/gp-quality.png
new file mode 100644
index 0000000000..d7ff30172d
Binary files /dev/null and b/windows/manage/images/gp-quality.png differ
diff --git a/windows/manage/images/sysprep-error.png b/windows/manage/images/sysprep-error.png
new file mode 100644
index 0000000000..aa004efbb6
Binary files /dev/null and b/windows/manage/images/sysprep-error.png differ
diff --git a/windows/manage/images/waas-do-fig1.png b/windows/manage/images/waas-do-fig1.png
new file mode 100644
index 0000000000..e739d0b670
Binary files /dev/null and b/windows/manage/images/waas-do-fig1.png differ
diff --git a/windows/manage/images/waas-do-fig2.png b/windows/manage/images/waas-do-fig2.png
new file mode 100644
index 0000000000..0c315fddaa
Binary files /dev/null and b/windows/manage/images/waas-do-fig2.png differ
diff --git a/windows/manage/images/waas-do-fig3.png b/windows/manage/images/waas-do-fig3.png
new file mode 100644
index 0000000000..66ac342b51
Binary files /dev/null and b/windows/manage/images/waas-do-fig3.png differ
diff --git a/windows/manage/images/waas-do-fig4.png b/windows/manage/images/waas-do-fig4.png
new file mode 100644
index 0000000000..3de9605bac
Binary files /dev/null and b/windows/manage/images/waas-do-fig4.png differ
diff --git a/windows/manage/images/waas-overview-patch.png b/windows/manage/images/waas-overview-patch.png
new file mode 100644
index 0000000000..b16c211c59
Binary files /dev/null and b/windows/manage/images/waas-overview-patch.png differ
diff --git a/windows/manage/images/waas-overview-timeline.png b/windows/manage/images/waas-overview-timeline.png
new file mode 100644
index 0000000000..8488b2b680
Binary files /dev/null and b/windows/manage/images/waas-overview-timeline.png differ
diff --git a/windows/manage/images/waas-rings.png b/windows/manage/images/waas-rings.png
new file mode 100644
index 0000000000..a5446f3dff
Binary files /dev/null and b/windows/manage/images/waas-rings.png differ
diff --git a/windows/manage/images/waas-sccm-fig1.png b/windows/manage/images/waas-sccm-fig1.png
new file mode 100644
index 0000000000..7557888301
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig1.png differ
diff --git a/windows/manage/images/waas-sccm-fig10.png b/windows/manage/images/waas-sccm-fig10.png
new file mode 100644
index 0000000000..b029618b67
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig10.png differ
diff --git a/windows/manage/images/waas-sccm-fig11.png b/windows/manage/images/waas-sccm-fig11.png
new file mode 100644
index 0000000000..fc6528e7ef
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig11.png differ
diff --git a/windows/manage/images/waas-sccm-fig12.png b/windows/manage/images/waas-sccm-fig12.png
new file mode 100644
index 0000000000..87464dd5f1
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig12.png differ
diff --git a/windows/manage/images/waas-sccm-fig2.png b/windows/manage/images/waas-sccm-fig2.png
new file mode 100644
index 0000000000..a1d7183a7c
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig2.png differ
diff --git a/windows/manage/images/waas-sccm-fig3.png b/windows/manage/images/waas-sccm-fig3.png
new file mode 100644
index 0000000000..cd406d9c5d
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig3.png differ
diff --git a/windows/manage/images/waas-sccm-fig4.png b/windows/manage/images/waas-sccm-fig4.png
new file mode 100644
index 0000000000..782c5ca6ef
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig4.png differ
diff --git a/windows/manage/images/waas-sccm-fig5.png b/windows/manage/images/waas-sccm-fig5.png
new file mode 100644
index 0000000000..5f215dec58
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig5.png differ
diff --git a/windows/manage/images/waas-sccm-fig6.png b/windows/manage/images/waas-sccm-fig6.png
new file mode 100644
index 0000000000..bd7df6f6d2
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig6.png differ
diff --git a/windows/manage/images/waas-sccm-fig7.png b/windows/manage/images/waas-sccm-fig7.png
new file mode 100644
index 0000000000..5b7c37b6a1
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig7.png differ
diff --git a/windows/manage/images/waas-sccm-fig8.png b/windows/manage/images/waas-sccm-fig8.png
new file mode 100644
index 0000000000..1db4dae84a
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig8.png differ
diff --git a/windows/manage/images/waas-sccm-fig9.png b/windows/manage/images/waas-sccm-fig9.png
new file mode 100644
index 0000000000..632b859232
Binary files /dev/null and b/windows/manage/images/waas-sccm-fig9.png differ
diff --git a/windows/manage/images/waas-strategy-fig1.png b/windows/manage/images/waas-strategy-fig1.png
new file mode 100644
index 0000000000..c12cc660de
Binary files /dev/null and b/windows/manage/images/waas-strategy-fig1.png differ
diff --git a/windows/manage/images/waas-wsus-fig1.png b/windows/manage/images/waas-wsus-fig1.png
new file mode 100644
index 0000000000..1d0dd4cc6b
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig1.png differ
diff --git a/windows/manage/images/waas-wsus-fig10.png b/windows/manage/images/waas-wsus-fig10.png
new file mode 100644
index 0000000000..fe9f6a6447
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig10.png differ
diff --git a/windows/manage/images/waas-wsus-fig11.png b/windows/manage/images/waas-wsus-fig11.png
new file mode 100644
index 0000000000..0ad08f70c2
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig11.png differ
diff --git a/windows/manage/images/waas-wsus-fig12.png b/windows/manage/images/waas-wsus-fig12.png
new file mode 100644
index 0000000000..fa9fb5c7a4
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig12.png differ
diff --git a/windows/manage/images/waas-wsus-fig13.png b/windows/manage/images/waas-wsus-fig13.png
new file mode 100644
index 0000000000..d2e916dc48
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig13.png differ
diff --git a/windows/manage/images/waas-wsus-fig14.png b/windows/manage/images/waas-wsus-fig14.png
new file mode 100644
index 0000000000..a0c8e30736
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig14.png differ
diff --git a/windows/manage/images/waas-wsus-fig15.png b/windows/manage/images/waas-wsus-fig15.png
new file mode 100644
index 0000000000..fd59e9ce23
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig15.png differ
diff --git a/windows/manage/images/waas-wsus-fig16.png b/windows/manage/images/waas-wsus-fig16.png
new file mode 100644
index 0000000000..57a34228d9
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig16.png differ
diff --git a/windows/manage/images/waas-wsus-fig17.png b/windows/manage/images/waas-wsus-fig17.png
new file mode 100644
index 0000000000..13e755e456
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig17.png differ
diff --git a/windows/manage/images/waas-wsus-fig18.png b/windows/manage/images/waas-wsus-fig18.png
new file mode 100644
index 0000000000..0b13e936fb
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig18.png differ
diff --git a/windows/manage/images/waas-wsus-fig19.png b/windows/manage/images/waas-wsus-fig19.png
new file mode 100644
index 0000000000..b67d17a56e
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig19.png differ
diff --git a/windows/manage/images/waas-wsus-fig2.png b/windows/manage/images/waas-wsus-fig2.png
new file mode 100644
index 0000000000..ff273ea10f
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig2.png differ
diff --git a/windows/manage/images/waas-wsus-fig20.png b/windows/manage/images/waas-wsus-fig20.png
new file mode 100644
index 0000000000..58fa43444f
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig20.png differ
diff --git a/windows/manage/images/waas-wsus-fig3.png b/windows/manage/images/waas-wsus-fig3.png
new file mode 100644
index 0000000000..1247e2f874
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig3.png differ
diff --git a/windows/manage/images/waas-wsus-fig4.png b/windows/manage/images/waas-wsus-fig4.png
new file mode 100644
index 0000000000..9fbc673814
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig4.png differ
diff --git a/windows/manage/images/waas-wsus-fig5.png b/windows/manage/images/waas-wsus-fig5.png
new file mode 100644
index 0000000000..7068f487cd
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig5.png differ
diff --git a/windows/manage/images/waas-wsus-fig6.png b/windows/manage/images/waas-wsus-fig6.png
new file mode 100644
index 0000000000..6256f5d617
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig6.png differ
diff --git a/windows/manage/images/waas-wsus-fig7.png b/windows/manage/images/waas-wsus-fig7.png
new file mode 100644
index 0000000000..69d3e6fe6f
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig7.png differ
diff --git a/windows/manage/images/waas-wsus-fig8.png b/windows/manage/images/waas-wsus-fig8.png
new file mode 100644
index 0000000000..8ec17f2741
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig8.png differ
diff --git a/windows/manage/images/waas-wsus-fig9.png b/windows/manage/images/waas-wsus-fig9.png
new file mode 100644
index 0000000000..dd430897ff
Binary files /dev/null and b/windows/manage/images/waas-wsus-fig9.png differ
diff --git a/windows/manage/images/waas-wufb-gp-broad.png b/windows/manage/images/waas-wufb-gp-broad.png
new file mode 100644
index 0000000000..9fdd9e97f1
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-broad.png differ
diff --git a/windows/manage/images/waas-wufb-gp-cb2-settings.png b/windows/manage/images/waas-wufb-gp-cb2-settings.png
new file mode 100644
index 0000000000..97dc6ce41a
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-cb2-settings.png differ
diff --git a/windows/manage/images/waas-wufb-gp-cb2.png b/windows/manage/images/waas-wufb-gp-cb2.png
new file mode 100644
index 0000000000..9be7638ed7
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-cb2.png differ
diff --git a/windows/manage/images/waas-wufb-gp-cbb1-settings.png b/windows/manage/images/waas-wufb-gp-cbb1-settings.png
new file mode 100644
index 0000000000..dae9866faf
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-cbb1-settings.png differ
diff --git a/windows/manage/images/waas-wufb-gp-cbb2-settings.png b/windows/manage/images/waas-wufb-gp-cbb2-settings.png
new file mode 100644
index 0000000000..2aa7bc212c
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-cbb2-settings.png differ
diff --git a/windows/manage/images/waas-wufb-gp-cbb2q-settings.png b/windows/manage/images/waas-wufb-gp-cbb2q-settings.png
new file mode 100644
index 0000000000..8076b5a99e
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-cbb2q-settings.png differ
diff --git a/windows/manage/images/waas-wufb-gp-create.png b/windows/manage/images/waas-wufb-gp-create.png
new file mode 100644
index 0000000000..63c2ce74aa
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-create.png differ
diff --git a/windows/manage/images/waas-wufb-gp-edit-defer.png b/windows/manage/images/waas-wufb-gp-edit-defer.png
new file mode 100644
index 0000000000..40da5b7709
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-edit-defer.png differ
diff --git a/windows/manage/images/waas-wufb-gp-edit.png b/windows/manage/images/waas-wufb-gp-edit.png
new file mode 100644
index 0000000000..e39bc829ff
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-edit.png differ
diff --git a/windows/manage/images/waas-wufb-gp-scope-cb2.png b/windows/manage/images/waas-wufb-gp-scope-cb2.png
new file mode 100644
index 0000000000..bb29adf5e1
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-scope-cb2.png differ
diff --git a/windows/manage/images/waas-wufb-gp-scope.png b/windows/manage/images/waas-wufb-gp-scope.png
new file mode 100644
index 0000000000..b8e6863c82
Binary files /dev/null and b/windows/manage/images/waas-wufb-gp-scope.png differ
diff --git a/windows/manage/images/waas-wufb-intune-cb2.png b/windows/manage/images/waas-wufb-intune-cb2.png
new file mode 100644
index 0000000000..3e8c1ce19e
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-cb2.png differ
diff --git a/windows/manage/images/waas-wufb-intune-cbb1.png b/windows/manage/images/waas-wufb-intune-cbb1.png
new file mode 100644
index 0000000000..6f1e815334
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-cbb1.png differ
diff --git a/windows/manage/images/waas-wufb-intune-cbb2.png b/windows/manage/images/waas-wufb-intune-cbb2.png
new file mode 100644
index 0000000000..b8eef5bb5e
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-cbb2.png differ
diff --git a/windows/manage/images/waas-wufb-intune-step11.png b/windows/manage/images/waas-wufb-intune-step11.png
new file mode 100644
index 0000000000..48db2f63af
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-step11.png differ
diff --git a/windows/manage/images/waas-wufb-intune-step19.png b/windows/manage/images/waas-wufb-intune-step19.png
new file mode 100644
index 0000000000..5a68ca7211
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-step19.png differ
diff --git a/windows/manage/images/waas-wufb-intune-step2.png b/windows/manage/images/waas-wufb-intune-step2.png
new file mode 100644
index 0000000000..1c7a8a1cae
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-step2.png differ
diff --git a/windows/manage/images/waas-wufb-intune-step7.png b/windows/manage/images/waas-wufb-intune-step7.png
new file mode 100644
index 0000000000..daa96ba18c
Binary files /dev/null and b/windows/manage/images/waas-wufb-intune-step7.png differ
diff --git a/windows/manage/images/wufb-config1.png b/windows/manage/images/wufb-config1.png
new file mode 100644
index 0000000000..76185e86fe
Binary files /dev/null and b/windows/manage/images/wufb-config1.png differ
diff --git a/windows/manage/images/wufb-config2.png b/windows/manage/images/wufb-config2.png
new file mode 100644
index 0000000000..0ab09d4868
Binary files /dev/null and b/windows/manage/images/wufb-config2.png differ
diff --git a/windows/manage/images/wufb-config3.png b/windows/manage/images/wufb-config3.png
new file mode 100644
index 0000000000..a76d1569be
Binary files /dev/null and b/windows/manage/images/wufb-config3.png differ
diff --git a/windows/manage/images/wufb-do.png b/windows/manage/images/wufb-do.png
new file mode 100644
index 0000000000..8d6c9d0b8a
Binary files /dev/null and b/windows/manage/images/wufb-do.png differ
diff --git a/windows/manage/images/wufb-groups.png b/windows/manage/images/wufb-groups.png
new file mode 100644
index 0000000000..13cdea04b0
Binary files /dev/null and b/windows/manage/images/wufb-groups.png differ
diff --git a/windows/manage/images/wufb-pause-feature.png b/windows/manage/images/wufb-pause-feature.png
new file mode 100644
index 0000000000..afeac43e29
Binary files /dev/null and b/windows/manage/images/wufb-pause-feature.png differ
diff --git a/windows/manage/images/wufb-qual.png b/windows/manage/images/wufb-qual.png
new file mode 100644
index 0000000000..4a93408522
Binary files /dev/null and b/windows/manage/images/wufb-qual.png differ
diff --git a/windows/manage/images/wufb-sccm.png b/windows/manage/images/wufb-sccm.png
new file mode 100644
index 0000000000..1d568c1fe4
Binary files /dev/null and b/windows/manage/images/wufb-sccm.png differ
diff --git a/windows/manage/index.md b/windows/manage/index.md
index 2996b55b2f..28c3d13437 100644
--- a/windows/manage/index.md
+++ b/windows/manage/index.md
@@ -31,10 +31,9 @@ Learn about managing and updating Windows 10.
||||
[Cortana integration in your business or enterprise](manage-cortana-in-enterprise.md) |
The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. |
-|||
[Update Windows 10 in the enterprise](waas-update-windows-10.md) | Learn how to manage updates to Windows 10 in your organization, including Windows Update for Business. | [Manage corporate devices](manage-corporate-devices.md) |
-You can use the same management tools to manage all device types running Windows 10 : desktops, laptops, tablets, and phones. And your current management tools, such as Group Policy, Windows Management Instrumentation (WMI), PowerShell scripts, Orchestrator runbooks, System Center tools, and so on, will continue to work for Windows 10 on desktop editions. |
+You can use the same management tools to manage all device types running Windows 10: desktops, laptops, tablets, and phones. And your current management tools, such as Group Policy, Windows Management Instrumentation (WMI), PowerShell scripts, Orchestrator runbooks, System Center tools, and so on, will continue to work for Windows 10 on desktop editions. |
[Windows Spotlight on the lock screen](windows-spotlight.md) |
@@ -44,6 +43,7 @@ Learn about managing and updating Windows 10.
[Manage Windows 10 Start layout options](windows-10-start-layout-options-and-policies.md) |
Organizations might want to deploy a customized Start screen and menu to devices running Windows 10 Enterprise or Windows 10 Education. A standard Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. |
||
[Create mandatory user profiles](mandatory-user-profile.md) | Mandatory user profiles are useful when standardization is important, such as on a kiosk device or in educational settings. | |||
[Lock down Windows 10](lock-down-windows-10.md) |
Enterprises often need to manage how people use corporate devices. Windows 10 provides a number of features and methods to help you lock down specific parts of a Windows 10 device. |
@@ -57,10 +57,6 @@ Learn about managing and updating Windows 10.
Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise. |
||
[Windows 10 servicing options](introduction-to-windows-10-servicing.md) |
-This article describes the new servicing options available in Windows 10, Windows 10 Mobile, and Windows 10 IoT Core (IoT Core) and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles. |
-|||
[Application Virtualization for Windows (App-V)](appv-for-windows.md) |
When you deploy Application Virtualization (App-V) in your orgnazation, you can deliver Win32 applications to users as virtual applications. Virtual applications are installed on centrally managed servers and delivered to users as a service – in real time and on as as-needed basis. Users launch virtual applications from familiar access points, including the Windows Store, and interact with them as if they were installed locally. |
Version 1511 GPO keys | Version 1607 GPO keys | +
---|---|
**DeferUpgrade**: *enable/disable* +Enabling allows user to set deferral periods for upgrades and updates. It also puts the device on CBB (no ability to defer updates while on the CB branch).**DeferUpgradePeriod**: *0 - 8 months***DeferUpdatePeriod**: *1 – 4 weeks***Pause**: *enable/disable* Enabling will pause both upgrades and updates for a max of 35 days | **DeferFeatureUpdates**: *enable/disable***BranchReadinessLevel** Set device on CB or CBB**DeferFeatureUpdatesPeriodinDays**: *1 - 180 days***PauseFeatureUpdates**: *enable/disable* Enabling will pause Feature updates for a max of 60 days**DeferQualityUpdates**: *Enable/disable***DeferQualityUpdatesPeriodinDays**: *0 - 30 days***PauseQualityUpdates**: *enable/disable* Enabling will pause Quality updates for a max of 35 days**ExcludeWUDrivers**: *enable/disable* |
Version 1511 MDM keys | Version 1607 MDM keys | +
---|---|
**RequireDeferUpgade**: *bool* Puts the device on CBB (no ability to defer updates while on the CB branch).**DeferUpgradePeriod**: *0 - 8 months***DeferUpdatePeriod**: *1 – 4 weeks***PauseDeferrals**: *bool* Enabling will pause both upgrades and updates for a max of 35 days | **BranchReadinessLevel** Set system on CB or CBB**DeferFeatureUpdatesPeriodinDays**: *1 - 180 days***PauseFeatureUpdates**: *enable/disable* Enabling will pause Feature updates for a max of 60 days**DeferQualityUpdatesPeriodinDays**: *0 - 30 days***PauseQualityUpdates**: *enable/disable* Enabling will pause Quality updates for a max of 35 days**ExcludeWUDriversInQualityUpdate**: *enable/disable<*/td> |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | Build deployment rings for Windows 10 updates +(this topic) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
Content | Metadata source | Payload source | Deferred? | + |
---|---|---|---|---|
Windows Update | Windows Update | Windows Update | Yes |  |
Microsoft Update (such as Office updates) | WSUS | WSUS | No | |
Third-party drivers | WSUS | WSUS | No |
Content | Metadata source | Payload source | Deferred? | + |
---|---|---|---|---|
Windows Update (exclude driver) | Windows Update | Windows Update | Yes |  |
Windows Update drivers | WSUS | WSUS | No | |
Microsoft Update (such as Office updates) | WSUS | WSUS | No | |
Windows drivers, third-party drivers | WSUS | WSUS | No |
Content | Metadata source | Payload source | Deferred? | + |
---|---|---|---|---|
Windows Update (exclude drivers) | Windows Update | Windows Update | Yes |  |
Microsoft Update (such as Office updates) | Microsoft Update | Microsoft Update | No | |
Drivers, third-party | WSUS | WSUS | No |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or Manage Windows 10 updates using System Center Configuration Manager (this topic) |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or Manage Windows 10 updates using Windows Server Update Services (this topic) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
Category | +Maximum deferral | +Deferral increments | +Example | +Classification GUID | +
---|---|---|---|---|
Feature Updates | +180 days | +Days | +From Windows 10, version 1511 to version 1607 | +3689BDC8-B205-4AF4-8D4A-A63924C5E9D5 | +
Quality Updates | +30 days | +Days | +Security updates | +0FA1201D-4330-4FA8-8AE9-B877473B6441 | +
Drivers (optional) | +EBFC1FC5-71A4-4F7B-9ACA-3B9A503104A0 | +|||
Non-security updates | +CD5FFD1E-E932-4E3A-BF74-18BF0B1BBD83 | +|||
Microsoft updates (Office, Visual Studio, etc.) | varies | |||
Non-deferrable | +No deferral | +No deferral | +Definition updates | +E0789628-CE08-4437-BE74-2495B842F43B | +
Capability | Windows 10, version 1511 | Windows 10, version 1607 | +
---|---|---|
Select Servicing Options: CB or CBB | Not available. To defer updates, all systems must be on the Current Branch for Business (CBB) | Ability to set systems on the Current Branch (CB) or Current Branch for Business (CBB). |
Quality Updates | Able to defer receiving Quality Updates:
| Able to defer receiving Quality Updates:
|
Feature Updates | Able to defer receiving Feature Updates:
| Able to defer receiving Feature Updates:
|
Pause updates |
| Features and Quality Updates can be paused separately.
|
Drivers | No driver-specific controls | Drivers can be selectively excluded from Windows Update for Business. |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | Manage updates using Windows Update for Business (this topic) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | Optimize update delivery for Windows 10 updates (this topic) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
 | Learn about updates and servicing branches (this topic) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | Assign devices to servicing branches for Windows 10 updates (this topic) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
 | [Learn about updates and servicing branches](waas-overview.md) |
 | Prepare servicing strategy for Windows 10 updates (this topic) |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
 | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
 | [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) +or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md) +or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
Category | +Maximum deferral | +Deferral increments | +Classification type | +Classification GUID | +
---|---|---|---|---|
OS upgrades | +8 months | +1 month | +Upgrade | +3689BDC8-B205-4AF4-8D4A-A63924C5E9D5 | +
OS updates | +4 weeks | +1 week | +Security updates | +0FA1201D-4330-4FA8-8AE9-B877473B6441 | +
Drivers | +EBFC1FC5-71A4-4F7B-9ACA-3B9A503104A0 | +|||
Updates | +CD5FFD1E-E932-4E3A-BF74-18BF0B1BBD83 | +|||
Other/non-deferrable | +No deferral | +No deferral | +Definition updates | +E0789628-CE08-4437-BE74-2495B842F43B | +
Category | +Maximum deferral | +Deferral increments | +Example | +Classification GUID | +
---|---|---|---|---|
Feature Updates | +180 days | +Days | +From Windows 10, version 1511 to version 1607 | +3689BDC8-B205-4AF4-8D4A-A63924C5E9D5 | +
Quality Updates | +30 days | +Days | +Security updates | +0FA1201D-4330-4FA8-8AE9-B877473B6441 | +
Drivers (optional) | +EBFC1FC5-71A4-4F7B-9ACA-3B9A503104A0 | +|||
Non-security updates | +CD5FFD1E-E932-4E3A-BF74-18BF0B1BBD83 | +|||
Microsoft updates (Office, Visual Studio, etc.) | varies | |||
Non-deferrable | +No deferral | +No deferral | +Definition updates | +E0789628-CE08-4437-BE74-2495B842F43B | +