diff --git a/windows/client-management/mdm/images/provisioning-csp-networkproxy.png b/windows/client-management/mdm/images/provisioning-csp-networkproxy.png index e46232fa42..23671d20f1 100644 Binary files a/windows/client-management/mdm/images/provisioning-csp-networkproxy.png and b/windows/client-management/mdm/images/provisioning-csp-networkproxy.png differ diff --git a/windows/client-management/mdm/networkproxy-csp.md b/windows/client-management/mdm/networkproxy-csp.md index 74bed4f1aa..6348228427 100644 --- a/windows/client-management/mdm/networkproxy-csp.md +++ b/windows/client-management/mdm/networkproxy-csp.md @@ -6,7 +6,7 @@ ms.topic: article ms.prod: w10 ms.technology: windows author: nickbrower -ms.date: 06/26/2017 +ms.date: 04/12/2018 --- # NetworkProxy CSP @@ -31,38 +31,41 @@ The following diagram shows the NetworkProxy configuration service provider in t ![networkproxy csp](images/provisioning-csp-networkproxy.png) **./Vendor/MSFT/NetworkProxy** -

The root node for the NetworkProxy configuration service provider..

+The root node for the NetworkProxy configuration service provider..

+ +**ProxySettingsPerUser** +Added in Windows 10, version 1803. When set to 0, it enables proxy configuration as global, machine wide; set to 1 for proxy configuratio per user. **AutoDetect** -

Automatically detect settings. If enabled, the system tries to find the path to a PAC script.

-

Valid values:

+Automatically detect settings. If enabled, the system tries to find the path to a PAC script.

+Valid values:

-

The data type is int. Supported operations are Get and Replace.

+The data type is int. Supported operations are Get and Replace.

**SetupScriptUrl** -

Address to the PAC script you want to use.

-

The data type is string. Supported operations are Get and Replace.

+Address to the PAC script you want to use.

+The data type is string. Supported operations are Get and Replace.

**ProxyServer** -

Node for configuring a static proxy for Ethernet and Wi-Fi connections. The same proxy server is used for all protocols - including HTTP, HTTPS, FTP, and SOCKS. These settings do not apply to VPN connections.

-

Supported operation is Get.

+Node for configuring a static proxy for Ethernet and Wi-Fi connections. The same proxy server is used for all protocols - including HTTP, HTTPS, FTP, and SOCKS. These settings do not apply to VPN connections.

+Supported operation is Get.

**ProxyAddress** -

Address to the proxy server. Specify an address in the format <server>[“:”<port>]. 

-

The data type is string. Supported operations are Get and Replace.

+Address to the proxy server. Specify an address in the format <server>[“:”<port>]. 

+The data type is string. Supported operations are Get and Replace.

**Exceptions** -

Addresses that should not use the proxy server. The system will not use the proxy server for addresses beginning with what is specified in this node. Use semicolons (;) to separate entries. 

-

The data type is string. Supported operations are Get and Replace.

+Addresses that should not use the proxy server. The system will not use the proxy server for addresses beginning with what is specified in this node. Use semicolons (;) to separate entries. 

+The data type is string. Supported operations are Get and Replace.

**UseProxyForLocalAddresses** -

Specifies whether the proxy server should be used for local (intranet) addresses. 

-

Valid values:

+Specifies whether the proxy server should be used for local (intranet) addresses. 

+Valid values:

-

The data type is int. Supported operations are Get and Replace.

+The data type is int. Supported operations are Get and Replace.

diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 31bc357659..ade8803846 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -1348,6 +1348,13 @@ For details about Microsoft mobile device management protocols for Windows 10 s
  • UntrustedCertificates
  • + +[NetworkProxy CSP](\networkproxy--csp.md) +

    Added the following node in Windows 10, version 1803:

    + + @@ -1639,6 +1646,13 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware +[NetworkProxy CSP](\networkproxy--csp.md) +

    Added the following node in Windows 10, version 1803:

    + + + [Policy CSP](policy-configuration-service-provider.md)

    Added the following new policies for Windows 10, version 1803: