about summary refs log tree commit diff
path: root/docs/api/html/NetworkManager.conf.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/html/NetworkManager.conf.html')
-rw-r--r--docs/api/html/NetworkManager.conf.html33
1 files changed, 19 insertions, 14 deletions
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 550eab7b..174f6ecc 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -8,7 +8,7 @@
 <link rel="up" href="manpages.html" title="Part I. Manual Pages">
 <link rel="prev" href="NetworkManager.html" title="NetworkManager">
 <link rel="next" href="NetworkManager-dispatcher.html" title="NetworkManager-dispatcher">
-<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.34.0 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -171,17 +171,16 @@ plugins-=remove-me
 <td><p><span class="term"><code class="varname">dhcp</code></span></p></td>
 <td>
 <p>This key sets up what DHCP client
-        NetworkManager will use. Allowed values are
-        <code class="literal">dhclient</code>, <code class="literal">dhcpcd</code>, and
-        <code class="literal">internal</code>. The <code class="literal">dhclient</code>
-        and <code class="literal">dhcpcd</code> options require the indicated
-        clients to be installed. The <code class="literal">internal</code>
-        option uses a built-in DHCP client which is not currently as
-        featureful as the external clients.</p>
-<p>If this key is missing, it defaults to <code class="literal">internal</code>.
-        If the chosen plugin is not available, clients are looked for
-        in this order: <code class="literal">dhclient</code>, <code class="literal">dhcpcd</code>,
-        <code class="literal">internal</code>.</p>
+        NetworkManager will use. Allowed values depend on build configuration and
+        typically include <code class="literal">internal</code> and <code class="literal">dhcpcd</code>.
+        Support for unmaintained <code class="literal">dhclient</code> client has been deprecated
+        and disabled by default.</p>
+<p>The <code class="literal">internal</code> client is built-in, while other options
+        may require an external DHCP client to be installed.</p>
+<p>If this key is missing, <code class="literal">internal</code>
+        is used with a fallback to other suppored clients in this order:
+        <code class="literal">internal</code>, <code class="literal">dhcpcd</code>,
+        <code class="literal">dhclient</code>.</p>
 </td>
 </tr>
 <tr>
@@ -480,7 +479,7 @@ no-auto-default=*
             files without preserving their contents.
           </p>
 <p>
-            The path can also be overriden by pointing to a specific
+            The path can also be overridden by pointing to a specific
             existing and writable directory.  On the other hand setting
             this to an empty string or any other value disables the
             profile conversion mechanism.
@@ -1473,6 +1472,12 @@ managed=1
           default is 300 seconds.</p></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">timeout</code></span></p></td>
+<td><p>Specified in seconds; controls how long
+          to wait for a response before connectivity is marked as
+          limited.  If missing, the default is 20 seconds.</p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">response</code></span></p></td>
 <td><p>If set, controls what body content
           NetworkManager checks for when requesting the URI for
@@ -1937,6 +1942,6 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.33.1</div>
+<hr>Generated by GTK-Doc V1.34.0</div>
 </body>
 </html>
\ No newline at end of file