Updated preferences and proxy settings API documentation

chrome/common/extensions/docs/static/proxy.html

 <div id="pageData-name" class="pageData">Proxy Settings</div>
 
 <!-- BEGIN AUTHORED CONTENT -->
 <p id="classSummary">
 Use the <code>chrome.proxy</code> module to manage Chrome's
-proxy settings.
+proxy settings. This module relies on the <a href="preferences.html">preferences
+  API</a> for getting and setting the proxy configuration.
 </p>
 
 <h2 id="manifest">Manifest</h2>
 <p>You must declare the "proxy" permission
 in the <a href="manifest.html">extension manifest</a>
 to use the proxy settings API.
 For example:</p>
 <pre>{
   "name": "My extension",
   ...
@@ skipping 125 matching lines @@
   range is specified using CIDR notation.<br>
   Examples: <code>"192.168.1.1/16", "fefe:13::abc/33"</code></dd>
 
   <dt><code>&lt;local&gt;</code></dt>
   <dd>Match local addresses. An address is local if the host is "127.0.0.1",
   "::1", or "localhost".<br>
   Example: <code>"&lt;local&gt;"</code></dd>
 </dl>
 
 
-<h2 id="precedence">Precedence</h2>
-
-<p>
-Chrome manages settings on different layers. The following list describes the
-layers that may influence the effective proxy settings, in increasing order of
-precedence.
-<ol>
-  <li>System settings provided by the operating system</li>
-  <li>Command line parameters</li>
-  <li>Preferences set by extensions</li>
-  <li>Policies</li>
-</ol>
-</p>
-
-<p>
-As the list implies, policies might overrule any changes that you specify with
-the proxy settings API.
-</p>
-
-<!--
-<p>
-Chrome allows using different proxy settings for regular windows and incognito
-windows. The following example illustrates the behavior. Assume that no policy
-overrides the proxy settings and that an extension can set proxy settings for
-regular windows <b>(R)</b> and proxy settings for incognito windows <b>(I)</b>.
-</p>
-
-<p>
-<ul>
-  <li>If only <b>(R)</b> is set, these settings are effective for both regular
-  and incognito windows.</li>
-  <li>If only <b>(I)</b> is set, these settings are effective for only incognito
-  windows. Regular windows use the proxy settings determined by the lower layers
-  (command-line options and system settings).</li>
-  <li>If both <b>(R)</b> and <b>(I)</b> are set, the respective settings are
-  used for regular and incognito windows.</li>
-</ul>
-</p>
-
-<p>
-If two extensions want to set proxy settings, the extension installed last takes
-precedence over the other extensions. If the extension installed last sets only
-<b>(I)</b>, the settings of regular windows can be defined by more recently
-installed extensions.
-</p>
--->
-
-
-
 <h2 id="overview-examples">Examples</h2>
 
 <p>
 The following code sets a SOCKS 5 proxy for HTTP connections to all servers but
 foobar.com and uses direct connections for all other protocols. The settings
-apply to regular and incognito windows.
+apply to regular and incognito windows, as incognito windows inherit preferences
+from regular windows. Please also consult the <a
+  href="preferences.html">Preferences API</a> documentation.
 </p>
 
 <pre>
 var config = {
   mode: "fixed_servers",
   rules: {
     httpProxy: {
       scheme: "socks5",
       host: "1.2.3.4"
     },
     bypassList: ["foobar.com"]
   }
 };
 chrome.proxy.settings.set(
     {value: config, scope: 'regular'},
     function() {});
 </pre>
 
 <p>
 The following code sets a custom pac script.

[kathyw, 2011/05/24 18:57:50]

pac -> PAC

(to match other uses)

[battre, 2011/05/24 19:18:03]

Done.

 </p>
 
 <pre>
 var config = {
   mode: "pac_script",
   pacScript: {
     data: "function FindProxyForURL(url, host) {\n" +
           "  if (host == 'foobar.com')\n" +
           "    return 'PROXY blackhole:80';\n" +
           "  return 'DIRECT';\n" +
           "}"
   }
 };
 chrome.proxy.settings.set(
     {value: config, scope: 'regular'},
     function() {});
 </pre>
 
 <p>
-The next snippet queries the current proxy settings.
+The next snippet queries the currently effective proxy settings. The effective
+proxy settings can be determined by another extension or by a policy, see the <a

[kathyw, 2011/05/24 18:57:50]

, see ->
. See

documentation. -> 
documentation for details.

[battre, 2011/05/24 19:18:03]

Done.

+  href="preferences.html">Preferences API</a> documentation.
 </p>
 
 <pre>
 chrome.proxy.settings.getEffective(
     {'incognito': false},
     function(config) {console.log(JSON.stringify(config));});
 </pre>
 
 <p>
 Note that the <code>value</code> object passed to <code>set()</code> is not
 identical to the <code>value</code> object passed to callback function of
 <code>getEffective()</code>. The latter will contain a
 <code>rules.httpProxy.port</code> element.
 </p>
 
 <!-- END AUTHORED CONTENT -->