summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@redhat.com>2014-11-18 16:58:00 -0500
committerDan Winship <danw@redhat.com>2014-11-19 12:03:03 -0500
commit93799e68ba47e1cc59f2b87c827ff23bdf0314c3 (patch)
treef3acea79286b9c177228e788ed051981cf227572
parent4f2c553172183889f5f6ec6a1ff7e5c708468fef (diff)
downloadNetworkManager-93799e68ba47e1cc59f2b87c827ff23bdf0314c3.tar.gz
man: document the "internal" DHCP client
-rw-r--r--man/NetworkManager.conf.xml.in18
1 files changed, 12 insertions, 6 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index 5928843b75..d9d51b846a 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -133,12 +133,18 @@ Copyright 2010 - 2014 Red Hat, Inc.
<varlistentry>
<term><varname>dhcp</varname></term>
<listitem><para>This key sets up what DHCP client
- NetworkManager will use. Presently
- <literal>dhclient</literal> and <literal>dhcpcd</literal>
- are supported. The client configured here should be
- available on your system too. If this key is missing,
- available DHCP clients are looked for in this order:
- dhclient, dhcpcd.</para></listitem>
+ NetworkManager will use. Allowed values are
+ <literal>dhclient</literal>, <literal>dhcpcd</literal>, and
+ <literal>internal</literal>. The <literal>dhclient</literal>
+ and <literal>dhcpcd</literal> options require the indicated
+ clients to be installed. The <literal>internal</literal>
+ option uses a built-in DHCP client which is not currently as
+ featureful as the external clients (and in particular, does
+ not yet support DHCPv6).</para>
+ <para>If this key is missing, available DHCP clients are
+ looked for in this order: <literal>dhclient</literal>,
+ <literal>dhcpcd</literal>,
+ <literal>internal</literal>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>no-auto-default</varname></term>