X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fudev.xml;h=32a520e7b8c5b0be2ecb5c55bad0c39d2c4ac0c4;hb=fccd44ec3a7abd305b558d39f54b5ef223f00b68;hp=5e00a4e2728f435348c098866341cafbc225e2da;hpb=1f06807cc3df506b2085d43106459106c36a6220;p=elogind.git

diff --git a/man/udev.xml b/man/udev.xml
index 5e00a4e27..32a520e7b 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -63,10 +63,10 @@
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied rules file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a rules file in
-      <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the rules file entirely. Rule files must have the extension
       <filename>.rules</filename>; other extensions are ignored.</para>
 
@@ -715,10 +715,10 @@
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied hwdb file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a hwdb file in
-      <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the hwdb file entirely. hwdb files must have the extension
       <filename>.hwdb</filename>; other extensions are ignored.</para>
 
@@ -742,23 +742,23 @@
   </refsect1>
 
   <refsect1><title>Network Link Configuration</title>
-      <para>Network link configuration is performed by the <literal>net-setup-link</literal>
+      <para>Network link configuration is performed by the <literal>net_setup_link</literal>
       udev builtin.</para>
 
       <para>The link files are read from the files located in the
       system network directory <filename>/usr/lib/systemd/network</filename>,
       the volatile runtime network directory <filename>/run/systemd/network</filename>
       and the local administration network directory <filename>/etc/systemd/network</filename>.
+      Link files must have the extension <filename>.link</filename>; other extensions are ignored.
       All link files are collectively sorted and processed in lexical order,
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied link file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a link file in
-      <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
-      disables the link file entirely. Link files must have the extension
-      <filename>.link</filename>; other extensions are ignored.</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
@@ -804,7 +804,13 @@
         <varlistentry>
           <term><varname>Description</varname></term>
           <listitem>
-            <para>A description of the device. The <literal>ifalias</literal> is set to this value.</para>
+            <para>A description of the device.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>Alias</varname></term>
+          <listitem>
+            <para>The <literal>ifalias</literal> is set to this value.</para>
           </listitem>
         </varlistentry>
         <varlistentry>