chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: merge DHCPv4 and DHCPv6 config
[elogind.git]
/
man
/
systemd.network.xml
diff --git
a/man/systemd.network.xml
b/man/systemd.network.xml
index 5bff4d9d87a42700f639d8864e53fa243458a8b0..67f10e1ef5887103977e5f68b9e179e8a9727c1b 100644
(file)
--- a/
man/systemd.network.xml
+++ b/
man/systemd.network.xml
@@
-195,7
+195,9
@@
<varlistentry>
<term><varname>DHCP=</varname></term>
<listitem>
<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>
</listitem>
</varlistentry>
<varlistentry>
@@
-361,8
+363,8
@@
</refsect1>
<refsect1>
</refsect1>
<refsect1>
- <title>[DHCP
v4
] Section Options</title>
- <para>The <literal>[DHCP
v4
]</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>
<variablelist class='network-directives'>
<varlistentry>