From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 21 Feb 2019 01:04:25 +0000 (+0900)
Subject: man: mention that LinkLocalAddressing= is disabled by default when Bridge= is set
X-Git-Tag: v242-rc1~248^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85fc09c97aa7bf361e8998956d545500fb0506be;p=thirdparty%2Fsystemd.git

man: mention that LinkLocalAddressing= is disabled by default when Bridge= is set
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index fc2ac4b505b..2058ba74a35 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -318,10 +318,10 @@
         <varlistentry>
           <term><varname>LinkLocalAddressing=</varname></term>
           <listitem>
-            <para>Enables link-local address autoconfiguration. Accepts
-            <literal>yes</literal>, <literal>no</literal>,
-            <literal>ipv4</literal>, or <literal>ipv6</literal>. Defaults to
-            <literal>ipv6</literal>.</para>
+            <para>Enables link-local address autoconfiguration. Accepts <literal>yes</literal>,
+            <literal>no</literal>, <literal>ipv4</literal>, or <literal>ipv6</literal>. If
+            <varname>Bridge=</varname> is set, defaults to <literal>no</literal>, and if not,
+            defaults to <literal>ipv6</literal>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>