summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-02-23 08:25:13 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2016-02-23 08:25:13 +0100
commit16fe5e8b1d5b073c5731b170c34bddd52ccbc4ec (patch)
tree0382e34d7424484073deee1a953a75abb5229629 /man
parent548bd139fed78a83ce063afb4b4d68dd0971884b (diff)
parent788f37c7258d554b7c12433ed07b33a991909212 (diff)
Merge pull request #2707 from teg/man-network
network: minor manpage clarifications
Diffstat (limited to 'man')
-rw-r--r--man/systemd.link.xml4
-rw-r--r--man/systemd.network.xml14
2 files changed, 11 insertions, 7 deletions
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>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index b6f81cc9ba..752a15a4e0 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>
@@ -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>