diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
| commit | 02d69323d320e0df4d7daa6115ee1ac1239b1a58 (patch) | |
| tree | b83a6b9a01b302117d31476361971212f9fd1750 /docs/libnm-util/html/NMSettingIP4Config.html | |
| parent | d31839fb4152978db9734e24c00fbac4f42debb7 (diff) | |
| parent | 9c202e3e860b3be9e1f8882630b69affbb130102 (diff) | |
Merge tag 'upstream/0.9.7.995' into experimental
Upstream version 0.9.7.995
Diffstat (limited to 'docs/libnm-util/html/NMSettingIP4Config.html')
| -rw-r--r-- | docs/libnm-util/html/NMSettingIP4Config.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html index 1f9e666b..df6762af 100644 --- a/docs/libnm-util/html/NMSettingIP4Config.html +++ b/docs/libnm-util/html/NMSettingIP4Config.html @@ -1675,7 +1675,7 @@ either automatic or disabled with these methods. <pre class="programlisting"> "dhcp-client-id" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> <p> A string sent to the DHCP server to identify the local machine which the -DHCP server may use to cusomize the DHCP lease and options. +DHCP server may use to customize the DHCP lease and options. </p> <p>Default value: NULL</p> </div> @@ -1710,7 +1710,7 @@ the current persistent hostname of the computer is sent. List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration. DNS servers cannot be used with the 'shared', 'link-local', -or 'disabled' methods as there is no usptream network. In all other +or 'disabled' methods as there is no upstream network. In all other methods, these DNS servers are used as the only DNS servers for this connection. </p> |