From eb142d8ec11b4d0dbda882c18da7c859a5919459 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Tue, 23 Feb 2016 00:21:53 +0100
Subject: man: network - improve IPv6Token documentation

Enabling router advertisement may even trigger SLAAC or DHCPv6 to be used to configure
IPv6 addresses on the link. It may not be obvious that only in the SLAAC case will the
Token have an effect. Clarify this in the man page.

Addresses issue #863.
---
 man/systemd.network.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index b6f81cc9ba..a6e059ed17 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -270,8 +270,10 @@
           <term><varname>IPv6Token=</varname></term>
           <listitem>
             <para>An IPv6 address with the top 64 bits unset. When set, indicates the
-            64-bit interface part of SLAAC IPv6 addresses for this link. By default,
-            it is autogenerated.</para>
+            64-bit interface part of SLAAC IPv6 addresses for this link. Note that
+            the token is only ever used for SLAAC, and not for DHCPv6 addresses, even
+            in the case DHCP is requested by router advertisment. By default, the
+            token is autogenerated.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
-- 
cgit v1.2.3-54-g00ecf


From 2ae7505f011441d4209216e99398e677d7dbbcab Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Tue, 23 Feb 2016 00:29:32 +0100
Subject: man: network - clarify BindCarrier documentation

Make it clear that we are talking of links (in the sense used in networkd) and not ports.

Addresses issue #964.
---
 man/systemd.network.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index a6e059ed17..752a15a4e0 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -370,11 +370,9 @@
         <varlistentry>
           <term><varname>BindCarrier=</varname></term>
           <listitem>
-            <para>A port or a list of ports. When set, controls the
-            behavior of the current interface. When all ports in the list
-            are in an operational down state, the current interface is brought
-            down. When at least one port has carrier, the current interface
-            is brought up.
+            <para>A link name or a list of link names. When set, controls the behavior of the current
+            link. When all links in the list are in an operational down state, the current link is brought
+            down. When at least one link has carrier, the current interface is brought up.
             </para>
           </listitem>
         </varlistentry>
-- 
cgit v1.2.3-54-g00ecf


From 788f37c7258d554b7c12433ed07b33a991909212 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Tue, 23 Feb 2016 01:09:31 +0100
Subject: man: link - add suggestion for debugging

udevadm test-builtin can be very useful for testing .link files, so add a reference.

Addresses issue #2406.
---
 man/systemd.link.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index a9f8a654c8..d5b4d1038d 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -82,6 +82,10 @@
     shipped by the system, any user-supplied
     <filename>.link</filename> should hence have a lexically earlier
     name to be considered at all.</para>
+
+    <para>See
+    <citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    for diagnosing problems with <filename>.link</filename> files.</para>
   </refsect1>
 
   <refsect1>
-- 
cgit v1.2.3-54-g00ecf