chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: fix NULL-ptr deref
[elogind.git]
/
man
/
systemd.network.xml
diff --git
a/man/systemd.network.xml
b/man/systemd.network.xml
index 93920892357ac19d04c995a830847ee05a1f99a7..c072f08f61338ca7d90a226c70dc458470b419fe 100644
(file)
--- a/
man/systemd.network.xml
+++ b/
man/systemd.network.xml
@@
-220,8
+220,8
@@
<term><varname>DHCP=</varname></term>
<listitem>
<para>Enables DHCPv4 and/or DHCPv6 support. Accepts
<term><varname>DHCP=</varname></term>
<listitem>
<para>Enables DHCPv4 and/or DHCPv6 support. Accepts
- <literal>
both</literal>, <literal>none
</literal>,
- <literal>
v4</literal> or <literal>
v6</literal>.</para>
+ <literal>
yes</literal>, <literal>no
</literal>,
+ <literal>
ipv4</literal> or <literal>ip
v6</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
<varlistentry>
@@
-352,9
+352,14
@@
packets on the network
interface will be forwarded to
other interfaces according to
packets on the network
interface will be forwarded to
other interfaces according to
- the routing table. Takes a
- boolean
- argument.</para></listitem>
+ the routing table. Takes
+ either a boolean argument, or
+ the values
+ <literal>ipv4</literal> or
+ <literal>ipv6</literal>, which
+ only enables IP forwarding for
+ the specified address
+ family.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>IPMasquerade=</varname></term>
</varlistentry>
<varlistentry>
<term><varname>IPMasquerade=</varname></term>