summaryrefslogtreecommitdiffstats
path: root/components/onc/docs
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2014-09-04 13:48:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-04 20:50:48 +0000
commit6eae03953c8520292cf1ecdacfda6a171a3dbd4c (patch)
tree25573f2f6a357a9a11e88301e4b2a13ab18a9db8 /components/onc/docs
parenteaa12c7bbc8a2697d71676629b3f2bb06150741c (diff)
downloadchromium_src-6eae03953c8520292cf1ecdacfda6a171a3dbd4c.zip
chromium_src-6eae03953c8520292cf1ecdacfda6a171a3dbd4c.tar.gz
chromium_src-6eae03953c8520292cf1ecdacfda6a171a3dbd4c.tar.bz2
Translate Saved/StaticIPConfig properties from ONC to Shill
BUG=279351 Review URL: https://codereview.chromium.org/540613002 Cr-Commit-Position: refs/heads/master@{#293331}
Diffstat (limited to 'components/onc/docs')
-rw-r--r--components/onc/docs/onc_spec.html34
1 files changed, 32 insertions, 2 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index 6822117..a3648c5 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -254,11 +254,31 @@
<dt class="field">IPConfigs</dt>
<dd>
<span class="field_meta">
+ (optional for connected networks, read-only)
+ <span class="type">array of IPConfig</span>
+ </span>
+ Array of IPConfig properties associated with this connection.
+ </dd>
+
+ <dt class="field">StaticIPConfig</dt>
+ <dd>
+ <span class="field_meta">
(optional if <span class="field">Remove</span> is
<span class="value">false</span>, otherwise ignored)
- <span class="type">array of IPConfig</span>
+ <span class="type">IPConfig</span>
</span>
- Static IPv4 or IPv6 parameters to associate with this connection.
+ Each property set in this IPConfig object overrides the respective
+ parameter received over DHCP.
+ </dd>
+
+ <dt class="field">SavedIPConfig</dt>
+ <dd>
+ <span class="field_meta">
+ (optional for connected networks, read-only)
+ <span class="type">IPConfig</span>
+ </span>
+ IPConfig property containing the configuration that was received from the
+ DHCP server prior to applying any StaticIPConfig parameters.
</dd>
<dt class="field">Name</dt>
@@ -532,6 +552,16 @@
SearchDomains field for this configuration. If not specified, top level
values will be used.
</dd>
+
+ <dt class="field">WebProxyAutoDiscoveryUrl</dt>
+ <dd>
+ <span class="field_meta">
+ (optional if part of <span class="field">IPConfigs</span>)
+ <span class="type">string</span>
+ </span>
+ The Web Proxy Auto-Discovery URL for this network as reported over DHCP.
+ </dd>
+
</dl>
</section>