summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-06-28 16:00:49 +0200
committerTom Gundersen <teg@jklm.no>2014-06-29 15:18:21 +0200
commited942a9eb22d50f667909ad6184b45015d28d054 (patch)
tree760aa4ceb830afc515d98dfc6539cbefd48bfd6c /man
parent68ceb9df6a39a7f86ffc3cf8266ca677a5d5271b (diff)
networkd: merge DHCPv4 and DHCPv6 config
If there are v4 or v6 specific options we can keep those in separate sections, but for the common options, we will use only one. Moreovere only use DHCP=[yes/both|no/none|v4|v6] to enable or disable the clients.
Diffstat (limited to 'man')
-rw-r--r--man/systemd.network.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 5bff4d9d87..67f10e1ef5 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -195,7 +195,9 @@
<varlistentry>
<term><varname>DHCP=</varname></term>
<listitem>
- <para>A boolean. When true, enables basic DHCPv4 support.</para>
+ <para>Enables DHCPv4 and/or DHCPv6 support. Accepts
+ <literal>both</literal>, <literal>none</literal>,
+ <literal>v4</literal> or <literal>v6</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -361,8 +363,8 @@
</refsect1>
<refsect1>
- <title>[DHCPv4] Section Options</title>
- <para>The <literal>[DHCPv4]</literal> section accepts the following keys:</para>
+ <title>[DHCP] Section Options</title>
+ <para>The <literal>[DHCP]</literal> section accepts the following keys:</para>
<variablelist class='network-directives'>
<varlistentry>