From ed942a9eb22d50f667909ad6184b45015d28d054 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sat, 28 Jun 2014 16:00:49 +0200
Subject: 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.
---
 man/systemd.network.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'man/systemd.network.xml')

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>
-- 
cgit v1.2.3-54-g00ecf