shared/capability: go frugal on space for caps

[elogind.git] / man / systemd.link.xml

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 0eb395089df7c558f65848f0bf5dccc6a2a34f22..ecf7954d1b3c26b95aa5770282361c4d3d428d74 100644 (file)
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -71,11 +71,17 @@
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the link file entirely.</para>
 
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the link file entirely.</para>
 

-                <para>The link file contains a <literal>[Match]</literal> section, which
-                determines if a given link file may be applied to a given device; and a
-                <literal>[Link]</literal> section specifying how the device should be
-                configured. The first (in lexical order) of the link files that matches
-                a given device is applied.</para>
+                <para>The link file contains a
+                <literal>[Match]</literal> section, which determines
+                if a given link file may be applied to a given device,
+                as well as a <literal>[Link]</literal> section specifying how
+                the device should be configured. The first (in lexical
+                order) of the link files that matches a given device
+                is applied. Note that a default file
+                <filename>99-default.link</filename> is shipped by the
+                system, any user-supplied <filename>.link</filename>
+                should hence have a lexically earlier name to be
+                considered at all.</para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>


@@ -99,7 +105,7 @@
                                         property "INTERFACE". May contain shell style
                                         globs. This can not be used to match on names
                                         that have already been changed from userspace.
                                         property "INTERFACE". May contain shell style
                                         globs. This can not be used to match on names
                                         that have already been changed from userspace.

-                                        Caution is adviced when matching on
+                                        Caution is advised when matching on

                                         kernel-assigned names, as they are known to
                                         be unstable between reboots.</para>
                                 </listitem>
                                         kernel-assigned names, as they are known to
                                         be unstable between reboots.</para>
                                 </listitem>


@@ -407,6 +413,12 @@ MACAddress=cb:a9:87:65:43:21</programlisting>
                         </citerefentry>,
                         <citerefentry>
                                 <refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>
                         </citerefentry>,
                         <citerefentry>
                                 <refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>

+                        </citerefentry>,
+                        <citerefentry>
+                                <refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum>
+                        </citerefentry>,
+                        <citerefentry>
+                                <refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum>

                         </citerefentry>
                 </para>
         </refsect1>
                         </citerefentry>
                 </para>
         </refsect1>