diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md
index c3f0b02f73..10a90e34ec 100644
--- a/windows/client-management/mdm/TOC.md
+++ b/windows/client-management/mdm/TOC.md
@@ -172,6 +172,7 @@
#### [Policy DDF file](policy-ddf-file.md)
#### [ApplicationRestrictions XSD](applicationrestrictions-xsd.md)
#### [AboveLock](policy-csp-abovelock.md)
+#### [AccountPoliciesAccountLockoutPolicy](policy-csp-accountpoliciesaccountlockoutpolicy.md)
#### [Accounts](policy-csp-accounts.md)
#### [ActiveXControls](policy-csp-activexcontrols.md)
#### [ApplicationDefaults](policy-csp-applicationdefaults.md)
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 5b0addf713..5b84c2bf80 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -148,6 +148,20 @@ The following diagram shows the Policy configuration service provider in tree fo
+### AccountPoliciesAccountLockoutPolicy policies
+
+
+ -
+ AccountPoliciesAccountLockoutPolicy/AccountLockoutDuration
+
+ -
+ AccountPoliciesAccountLockoutPolicy/AccountLockoutThreshold
+
+ -
+ AccountPoliciesAccountLockoutPolicy/ResetAccountLockoutCounterAfter
+
+
+
### Accounts policies
@@ -780,12 +794,26 @@ The following diagram shows the Policy configuration service provider in tree fo
-
DeliveryOptimization/DOAllowVPNPeerCaching
+ -
+ DeliveryOptimization/DOCacheHost
+
+ -
+ DeliveryOptimization/DODelayBackgroundDownloadFromHttp
+
+ -
+ DeliveryOptimization/DODelayForegroundDownloadFromHttp
+
+ -
-
DeliveryOptimization/DODownloadMode
-
DeliveryOptimization/DOGroupId
+ -
+ DeliveryOptimization/DOGroupIdSource
+
+ -
-
DeliveryOptimization/DOMaxCacheAge
@@ -819,9 +847,24 @@ The following diagram shows the Policy configuration service provider in tree fo
-
DeliveryOptimization/DOMonthlyUploadDataCap
+ -
+ DeliveryOptimization/DOPercentageMaxBackDownloadBandwidth
+
-
DeliveryOptimization/DOPercentageMaxDownloadBandwidth
+ -
+ DeliveryOptimization/DOPercentageMaxForeDownloadBandwidth
+
+ -
+ DeliveryOptimization/DORestrictPeerSelectionBy
+
+ -
+ DeliveryOptimization/DOSetHoursToLimitBackgroundDownloadBandwidth
+
+ -
+ DeliveryOptimization/DOSetHoursToLimitForegroundDownloadBandwidth
+
### Desktop policies
diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md
index 863777815f..3448fec985 100644
--- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md
+++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md
@@ -6,11 +6,13 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
-ms.date: 12/14/2017
+ms.date: 01/03/2018
---
# Policy CSP - DeliveryOptimization
+> [!WARNING]
+> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
@@ -25,12 +27,24 @@ ms.date: 12/14/2017
DeliveryOptimization/DOAllowVPNPeerCaching
+
+ DeliveryOptimization/DOCacheHost
+
+
+ DeliveryOptimization/DODelayBackgroundDownloadFromHttp
+
+
+ DeliveryOptimization/DODelayForegroundDownloadFromHttp
+
DeliveryOptimization/DODownloadMode
DeliveryOptimization/DOGroupId
+
+ DeliveryOptimization/DOGroupIdSource
+
DeliveryOptimization/DOMaxCacheAge
@@ -64,9 +78,24 @@ ms.date: 12/14/2017
DeliveryOptimization/DOMonthlyUploadDataCap
+
+ DeliveryOptimization/DOPercentageMaxBackDownloadBandwidth
+
DeliveryOptimization/DOPercentageMaxDownloadBandwidth
+
+ DeliveryOptimization/DOPercentageMaxForeDownloadBandwidth
+
+
+ DeliveryOptimization/DORestrictPeerSelectionBy
+
+
+ DeliveryOptimization/DOSetHoursToLimitBackgroundDownloadBandwidth
+
+
+ DeliveryOptimization/DOSetHoursToLimitForegroundDownloadBandwidth
+
@@ -170,6 +199,167 @@ The following list shows the supported values:
+**DeliveryOptimization/DOCacheHost**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. TBD
+
+
+
+
+
+
+
+
+
+
+
+
+
+**DeliveryOptimization/DODelayBackgroundDownloadFromHttp**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. This policy allows you to delay the use of an HTTP source in a background download that is allowed to use peer-to-peer.
+
+After the max delay is reached, the download will resume using HTTP, either downloading the entire payload or complementing the bytes that could not be downloaded from peers. Note that a download that is waiting for peer sources, will appear to be stuck for the end user. The recommended value is 1 hour (3600).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+**DeliveryOptimization/DODelayForegroundDownloadFromHttp**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. This policy allows you to delay the use of an HTTP source in a foreground (interactive) download that is allowed to use peer-to-peer.
+
+After the max delay has reached, the download will resume using HTTP, either downloading the entire payload or complementing the bytes that could not be downloaded from Peers.
+
+Value of 0 equals "unlimited" which means the download will not progress unless a peer source is found. Note that a download that is waiting for peer sources, will appear to be stuck for the end user.
+
+The recommended value is 1 minute (60).
+
+
+
+The following list shows the supported values as number of seconds:
+
+- 0 to 86400 (1 day)
+- 0 - managed by the cloud service
+- Default is not configured.
+
+
+
+
+
+
+
+
+
+
**DeliveryOptimization/DODownloadMode**
@@ -274,6 +464,69 @@ The following list shows the supported values:
+**DeliveryOptimization/DOGroupIdSource**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Set this policy to restrict peer selection to a specific source. Options available are: 1 = AD Site, 2 = Authenticated domain SID, 3 = DHCP Option ID, 4 = DNS Suffix
+
+When set, the Group ID will be assigned automatically from the selected source.
+
+If you set this policy, the GroupID policy will be ignored.
+
+The options set in this policy only apply to Group (2) download mode. If Group (2) isn't set as Download mode, this policy will be ignored.
+
+For option 4 - DHCP Option ID, the client will query DHCP Option ID 234 and use the returned GUID value as the Group ID.
+
+
+
+The following list shows the supported values:
+
+- 1 - AD site
+- 2 - Authenticated domain SID
+- 3 - DHCP user option
+- 4 - DNS suffix
+
+
+
+
+
+
+
+
+
+
**DeliveryOptimization/DOMaxCacheAge**
@@ -795,6 +1048,57 @@ The following list shows the supported values:
+**DeliveryOptimization/DOPercentageMaxBackDownloadBandwidth**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Specifies the maximum background download bandwidth that Delivery Optimization uses across all concurrent download activities as a percentage of available download bandwidth. The default value 0 (zero) means that Delivery Optimization dynamically adjusts to use the available bandwidth for background downloads.
+
+Note that downloads from LAN peers will not be throttled even when this policy is set.
+
+
+
+
+
+
+
+
+
+
+
+
+
**DeliveryOptimization/DOPercentageMaxDownloadBandwidth**
@@ -841,6 +1145,223 @@ The following list shows the supported values:
+
+**DeliveryOptimization/DOPercentageMaxForeDownloadBandwidth**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Specifies the maximum foreground download bandwidth that Delivery Optimization uses across all concurrent download activities as a percentage of available download bandwidth. The default value 0 (zero) means that Delivery Optimization dynamically adjusts to use the available bandwidth for foreground downloads.
+
+Note that downloads from LAN peers will not be throttled even when this policy is set.
+
+
+
+
+
+
+
+
+
+
+
+
+
+**DeliveryOptimization/DORestrictPeerSelectionBy**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Set this policy to restrict peer selection via selected option.
+Options available are: 1=Subnet mask (more options will be added in a future release).
+
+Option 1 (Subnet mask) applies to both Download Mode LAN (1) and Group (2).
+
+
+
+The following list shows the supported values:
+
+- 1 - Subnet mask.
+
+
+
+
+
+
+
+
+
+
+
+**DeliveryOptimization/DOSetHoursToLimitBackgroundDownloadBandwidth**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Specifies the maximum background download bandwidth that Delivery Optimization uses during and outside business hours across all concurrent download activities as a percentage of available download bandwidth.
+
+Note that downloads from LAN peers will not be throttled even when this policy is set.
+
+
+This policy allows an IT Admin to define the following:
+
+- Business hours range (for example 06:00 to 18:00)
+- % of throttle for foreground traffic during business hours
+- % of throttle for foreground traffic outside of business hours
+
+
+
+
+
+
+
+
+
+
+**DeliveryOptimization/DOSetHoursToLimitForegroundDownloadBandwidth**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Specifies the maximum foreground download bandwidth that Delivery Optimization uses during and outside business hours across all concurrent download activities as a percentage of available download bandwidth.
+
+Note that downloads from LAN peers will not be throttled even when this policy is set.
+
+
+This policy allows an IT Admin to define the following:
+
+- Business hours range (for example 06:00 to 18:00)
+- % of throttle for foreground traffic during business hours
+- % of throttle for foreground traffic outside of business hours
+
+
+
+
+
+
+
+
+
Footnote:
diff --git a/windows/client-management/mdm/policy-csp-kioskbrowser.md b/windows/client-management/mdm/policy-csp-kioskbrowser.md
index a45a6aaefe..ab4e33bba0 100644
--- a/windows/client-management/mdm/policy-csp-kioskbrowser.md
+++ b/windows/client-management/mdm/policy-csp-kioskbrowser.md
@@ -334,7 +334,9 @@ Added in Windows 10, next major update. Enable/disable kiosk browser's navigatio
-Added in Windows 10, next major update. Amount of time in minutes the session is idle until the kiosk browser restarts in a fresh state.
+Added in Windows 10, next major update. Amount of time in minutes the session is idle until the kiosk browser restarts in a fresh state.
+
+The value is an int 1-1440 that specifies the amount of minutes the session is idle until the kiosk browser restarts in a fresh state. The default value is empty which means there is no idle timeout within the kiosk browser.