From 905a03e71dc00a47396344170592faaedc6c44f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 17 Nov 2020 11:53:10 +0100
Subject: [PATCH] NEWS,man: improve descriptions of Independent=

In NEWS, the new option was described twice, most likely because the first
description was tucked away in a paragraph about some other subject.

While at it, improve the descriptions in the man page to make it easier to grok
what that option really does.
---
 NEWS                   |  9 +++------
 man/systemd.netdev.xml | 18 +++++++++---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/NEWS b/NEWS
index 5077a2faf8..0a92ca4010 100644
--- a/NEWS
+++ b/NEWS
@@ -457,9 +457,7 @@ CHANGES WITH 247 in spe:
           discipline in the [FlowQueuePIE] sections.
 
         * systemd-networkd's .netdev files may now be used to create "BareUDP"
-          tunnels, configured in the new [BareUDP] setting. VXLAN tunnels may
-          now be marked to be independent of any underlying network interface
-          via the new Independent= boolean setting.
+          tunnels, configured in the new [BareUDP] setting.
 
         * systemd-networkd's Gateway= setting in .network files now accepts the
           special values "_dhcp4" and "_ipv6ra" to configure additional,
@@ -482,9 +480,8 @@ CHANGES WITH 247 in spe:
           prefix will be announced through IPv6 router advertisement (IPv6 RA).
           The setting is enabled by default.
 
-        * systemd-networkd's .netdev files gained the Independent= boolean
-          setting in [VXLAN] section. When enabled, the vxlan interface will be
-          created without underlying interfaces. Defaults to false.
+        * VXLAN tunnels may now be marked as independent of any underlying
+          network interface via the new Independent= boolean setting.
 
         * systemctl gained support for two new verbs: "service-log-level" and
           "service-log-target" may be used on services that implement the
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index fab5f0cdef..f8a5c6dc86 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -819,8 +819,9 @@
       <varlistentry>
         <term><varname>Independent=</varname></term>
         <listitem>
-          <para>Takes a boolean. When true, the vxlan interface is created without underlying interfaces.
-          Defaults to <literal>false</literal>.</para>
+          <para>Takes a boolean. When true, the vxlan interface is created without any underlying network
+          interface. Defaults to false, which means that a .network file that requests this tunnel using
+          <varname>Tunnel=</varname> is required for the tunnel to be created.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -1277,9 +1278,10 @@
       <varlistentry>
         <term><varname>Independent=</varname></term>
         <listitem>
-          <para>Takes a boolean. When true tunnel does not require .network file. Created as "tunnel@NONE".
-          Defaults to <literal>false</literal>.
-          </para>
+          <para>Takes a boolean. When false (the default), the tunnel is always created over some network
+          device, and a .network file that requests this tunnel using <varname>Tunnel=</varname> is required
+          for the tunnel to be created. When true, the tunnel is created independently of any network as
+          "tunnel@NONE".</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1949,10 +1951,8 @@
       <varlistentry>
         <term><varname>Independent=</varname></term>
         <listitem>
-          <para>Takes a boolean. If set to <literal>no</literal>, the xfrm interface should have an
-          underlying device which can be used for hardware offloading. Defaults to <literal>no</literal>.
-          See <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-          for how to configure the underlying device.</para>
+          <para>Takes a boolean. If false (the default), the xfrm interface must have an underlying device
+          which can be used for hardware offloading.</para>
         </listitem>
       </varlistentry>
     </variablelist>