From 2972cba11712c3bfbe9fa07d1f3c3c4330127733 Mon Sep 17 00:00:00 2001
From: Nick Owens <nick.owens@coreos.com>
Date: Tue, 2 Jun 2015 15:42:21 -0700
Subject: man: document IPForward=kernel option

---
 man/systemd.network.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index bd061c270a..54fef4c9c4 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -366,7 +366,8 @@
           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. This controls the
+          family, or <literal>kernel</literal>, which preserves existing sysctl settings.
+          This controls the
           <filename>net.ipv4.conf.&lt;interface&gt;.forwarding</filename>
           and
           <filename>net.ipv6.conf.&lt;interface&gt;.forwarding</filename>
@@ -375,8 +376,8 @@
           for details about sysctl options). Defaults to
           <literal>no</literal>.</para>
 
-          <para>Note: unless this option is turned on, no IP
-          forwarding is done on this interface, even if this is
+         <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
-- 
cgit v1.2.3-54-g00ecf