From: David Herrmann <dh.herrmann@gmail.com>
Date: Sat, 4 Jul 2015 11:08:29 +0000 (+0200)
Subject: man: fix sysctl references in networkd-manpage
X-Git-Tag: v222~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2bccc9d9974eb1290653ecfa3ccfd03c313842b;p=platform%2Fupstream%2Fsystemd.git

man: fix sysctl references in networkd-manpage

We refer to the same sysctl-setting twice, which is misleading. Correctly
list all global forwarding options. As we _always_ change the forwarding
setting on links, they will get disabled by default. The global sysctl
defaults thus will not have any effect.
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 1a2699a..71ced09 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -376,8 +376,9 @@
          <para>Note: unless this option is turned on, or set to <literal>kernel</literal>,
           no IP forwarding is done on this interface, even if this is
           globally turned on in the kernel, with the
-          <filename>net.ipv4.ip_forward</filename> and
-          <filename>net.ipv4.ip_forward</filename> sysctl
+          <filename>net.ipv4.ip_forward</filename>,
+          <filename>net.ipv4.conf.all.forwarding</filename>, and
+          <filename>net.ipv6.conf.all.forwarding</filename> sysctl
           options.</para>
           </listitem>
         </varlistentry>