Merge pull request #2707 from teg/man-network

network: minor manpage clarifications

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>

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>
@@ -368,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>