X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.link.xml;h=3fac760b016d0c22f2feacc955046b0a0daf317b;hp=2cfe7107f883b5adeeda88b738163ea59d876b2c;hb=00c53f4283ca41878a84b370840a84760b00d46e;hpb=798d3a524ea57aaf40cb53858aaa45ec702f012d

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 2cfe7107f..3fac760b0 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
@@ -103,10 +102,10 @@
       <varlistentry>
         <term><varname>OriginalName=</varname></term>
         <listitem>
-          <para>The device name, as exposed by the udev 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 advised when matching on
+          <para>A whitespace-separated list of shell-style globs matching
+          the device name, as exposed by the udev property
+          "INTERFACE". This can not be used to match on names that have
+          already been changed from userspace. Caution is advised when matching on
           kernel-assigned names, as they are known to be unstable
           between reboots.</para>
         </listitem>
@@ -114,15 +113,16 @@
       <varlistentry>
         <term><varname>Path=</varname></term>
         <listitem>
-          <para>The persistent path, as exposed by the
-          udev property <literal>ID_PATH</literal>. May
-          contain shell style globs.</para>
+          <para>A whitespace-separated list of shell-style globs matching
+          the persistent path, as exposed by the udev property
+          <literal>ID_PATH</literal>.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>Driver=</varname></term>
         <listitem>
-          <para>The driver currently bound to the device,
+          <para>A whitespace-separated list of shell-style globs matching
+          the driver currently bound to the device,
           as exposed by the udev property <literal>DRIVER</literal>
           of its parent device, or if that is not set, the
           driver as exposed by <literal>ethtool -i</literal>
@@ -132,7 +132,8 @@
       <varlistentry>
         <term><varname>Type=</varname></term>
         <listitem>
-          <para>The device type, as exposed by the udev
+          <para>A whitespace-separated list of shell-style globs matching
+          the device type, as exposed by the udev
           property <literal>DEVTYPE</literal>.</para>
         </listitem>
       </varlistentry>
@@ -216,7 +217,10 @@
                 nothing is done. Otherwise, a new MAC address is
                 generated which is guaranteed to be the same on every
                 boot for the given machine and the given device, but
-                which is otherwise random.</para>
+                which is otherwise random. This feature depends on ID_NET_NAME_*
+                properties existing for the link, on hardware where these
+                properties are not set the generation of a persistent MAC address
+                will fail.</para>
               </listitem>
             </varlistentry>
             <varlistentry>