X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev.xml;h=7b31173b21870f6cc159e0331a7d342ec4f44b81;hb=c2e63452dda721bb7f127adefdfe444153a9bdca;hp=abbfee7ad13deff359a7fbe157b3f84b708e6572;hpb=7df0ed83c113e4744786e7804d398d9d34b43281;p=elogind.git

diff --git a/udev/udev.xml b/udev/udev.xml
index abbfee7ad..7b31173b2 100644
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -41,8 +41,8 @@
   </refsect1>
 
   <refsect1><title>Configuration</title>
-    <para>udev configuration files are placed in <filename>/etc/udev/</filename>
-    and <filename>/lib/udev/</filename>. All empty lines or lines beginning with
+    <para>udev configuration files are placed in <filename>/etc/udev</filename>
+    and <filename>/usr/lib/udev</filename>. All empty lines or lines beginning with
     '#' are ignored.</para>
 
     <refsect2><title>Configuration file</title>
@@ -71,14 +71,18 @@
 
     <refsect2><title>Rules files</title>
       <para>The udev rules are read from the files located in the
-      default rules directory <filename>/lib/udev/rules.d/</filename>,
-      the custom rules directory <filename>/etc/udev/rules.d/</filename>
-      and the temporary rules directory <filename>/run/udev/rules.d/</filename>.
-      All rule files are collectively sorted and processed in lexical order,
-      regardless of the directories in which they live. However, files in
-      <filename>/etc/udev/rules.d/</filename> take precedence over files with
-      the same name in <filename>/lib/udev/rules.d/</filename>; this can be
-      used to ignore a default rules file if needed.</para>
+      system rules directory <filename>/usr/lib/udev/rules.d</filename>,
+      the local administration directory <filename>/etc/udev/rules.d</filename>
+      and the volatile runtime directory <filename>/run/udev/rules.d</filename>.
+      All rules files are collectively sorted and processed in lexical order,
+      regardless of the directories in which they live. However, files with
+      identical file names replace each other. Files in <filename>/run</filename>
+      have the highest priority, files in <filename>/etc</filename> take precedence
+      over files with the same name in <filename>/lib</filename>. This can be
+      used to overwrite a system rules 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>,
+      disables the rules file entirely.</para>
 
       <para>Rule files must have the extension <filename>.rules</filename>; other
       extensions are ignored.</para>
@@ -394,7 +398,7 @@
             detached from the event process itself.</para>
             <para>If no absolute path is given, the program is expected to live in
             the directory provided at compile-time to configure via --libexecdir
-            (this is usually <filename>/lib/udev</filename>), otherwise the absolute
+            (this is usually <filename>/usr/lib/udev</filename>), otherwise the absolute
             path must be specified. The program name and following arguments are
             separated by spaces. Single quotes can be used to specify arguments with
             spaces.</para>
@@ -463,9 +467,6 @@
                 </listitem>
               </varlistentry>
             </variablelist>
-            <para>If no option is given, udev chooses between <option>program</option>
-            and <option>file</option> based on the executable bit of the file
-            permissions.</para>
           </listitem>
         </varlistentry>
 
@@ -510,7 +511,7 @@
                 <listitem>
                   <para>Apply the permissions specified in this rule to the static device node with
                   the specified name. Static device nodes might be provided by kernel modules
-                  or copied from <filename>/lib/udev/devices</filename>. These nodes might not have
+                  or copied from <filename>/usr/lib/udev/devices</filename>. These nodes might not have
                   a corresponding kernel device at the time udevd is started; they can trigger
                   automatic kernel module loading.</para>
                 </listitem>