Merged PR 7191: NetworkProxy CSP - added new setting

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)
 
 <a href="" id="networkproxy"></a>**./Vendor/MSFT/NetworkProxy**  
-<p style="margin-left: 20px">The root node for the NetworkProxy configuration service provider..</p>
+The root node for the NetworkProxy configuration service provider..</p>
+
+<a href="" id="proxysettingsperuser"></a>**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.
 
 <a href="" id="autodetect"></a>**AutoDetect**  
-<p style="margin-left: 20px">Automatically detect settings. If enabled, the system tries to find the path to a PAC script.</p>
+Automatically detect settings. If enabled, the system tries to find the path to a PAC script.</p>
-<p style="margin-left: 20px">Valid values:</p>
+Valid values:</p>
 <ul>
 <li>0 - Disabled</li>
 <li>1 (default) - Enabled</li>
 </ul>
-<p style="margin-left: 20px">The data type is int. Supported operations are Get and Replace.</p>
+The data type is int. Supported operations are Get and Replace.</p>
 
 <a href="" id="setupscripturl"></a>**SetupScriptUrl**  
-<p style="margin-left: 20px">Address to the PAC script you want to use.</p>
+Address to the PAC script you want to use.</p>
-<p style="margin-left: 20px">The data type is string. Supported operations are Get and Replace.</p>
+The data type is string. Supported operations are Get and Replace.</p>
 
 <a href="" id="proxyserver"></a>**ProxyServer**  
-<p style="margin-left: 20px">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.</p>
+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.</p>
-<p style="margin-left: 20px">Supported operation is Get.</p>
+Supported operation is Get.</p>
 
 <a href="" id="proxyaddress"></a>**ProxyAddress**  
-<p style="margin-left: 20px">Address to the proxy server. Specify an address in the format &lt;server&gt;[“:”&lt;port&gt;]. </p>
+Address to the proxy server. Specify an address in the format &lt;server&gt;[“:”&lt;port&gt;]. </p>
-<p style="margin-left: 20px">The data type is string. Supported operations are Get and Replace.</p>
+The data type is string. Supported operations are Get and Replace.</p>
 
 <a href="" id="exceptions"></a>**Exceptions**  
-<p style="margin-left: 20px">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. </p>
+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. </p>
-<p style="margin-left: 20px">The data type is string. Supported operations are Get and Replace.</p>
+The data type is string. Supported operations are Get and Replace.</p>
 
 <a href="" id="useproxyforlocaladdresses"></a>**UseProxyForLocalAddresses**  
-<p style="margin-left: 20px">Specifies whether the proxy server should be used for local (intranet) addresses. </p>
+Specifies whether the proxy server should be used for local (intranet) addresses. </p>
-<p style="margin-left: 20px">Valid values:</p>
+Valid values:</p>
 <ul>
 <li>0 (default) - Do not use proxy server for local addresses</li>
 <li>1 - Use proxy server for local addresses</li>
 </ul>
-<p style="margin-left: 20px">The data type is int. Supported operations are Get and Replace.</p>
+The data type is int. Supported operations are Get and Replace.</p>

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
 <li>UntrustedCertificates</li>
 </ul>
 </td></tr>
+<tr>
+<td style="vertical-align:top">[NetworkProxy CSP](\networkproxy--csp.md)</td>
+<td style="vertical-align:top"><p>Added the following node in Windows 10, version 1803:</p>
+<ul>
+<li>ProxySettingsPerUser</li>
+</ul>
+</td></tr>
 </tbody>
 </table>
 
@@ -1639,6 +1646,13 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
 </ul>
 </td></tr>
 <tr>
+<td style="vertical-align:top">[NetworkProxy CSP](\networkproxy--csp.md)</td>
+<td style="vertical-align:top"><p>Added the following node in Windows 10, version 1803:</p>
+<ul>
+<li>ProxySettingsPerUser</li>
+</ul>
+</td></tr>
+<tr>
 <td style="vertical-align:top">[Policy CSP](policy-configuration-service-provider.md)</td>
 <td style="vertical-align:top"><p>Added the following new policies for Windows 10, version 1803:</p>
 <ul>