man: udev - workaraound -> workaround

[elogind.git] / udev / udev.xml

diff --git a/udev/udev.xml b/udev/udev.xml
index b971fadea6b40f053b85bc3a5bae17103aafb8d5..3ef41033250f58bbfeae89c2a7a500f21c391da9 100644 (file)
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -75,12 +75,13 @@
       the custom rules directory <filename>/etc/udev/rules.d/</filename>
       and the temporary rules directory <filename>/dev/.udev/rules.d/</filename>.
       All rule files are sorted and processed in lexical order, regardless
-      in which of these directories they live.</para>
+      in which of these directories they live. Files in
+      <filename>/etc/udev/rules.d/</filename> have 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>
 
-      <para>Rule files are required to have a unique name, duplicate file names
-      are ignored. Files in <filename>/etc/udev/rules.d/</filename> have 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>
+      <para>Rule files must end in <filename>.rules</filename>, other extensions
+      are ignored.</para>
 
       <para>Every line in the rules file contains at least one key value pair.
       There are two kind of keys, match and assignment keys.
@@ -308,7 +309,7 @@
           <term><option>NAME</option></term>
           <listitem>
             <para>The name, a network interface should be renamed to. Or as
-            a temporary workaraound, the name a device node should be named.
+            a temporary workaround, the name a device node should be named.
             Usually the kernel provides the defined node name, or even creates
             and removes the node before udev even receives any event. Changing
             the node name from the kernel's default creates inconsistencies
@@ -465,7 +466,8 @@
           <term><option>WAIT_FOR</option></term>
           <listitem>
             <para>Wait for a file to become available or until a 10
-            seconds timeout expires.</para>
+            seconds timeout expires. The path is relative to the sysfs device,
+            i. e. if no path is specified this waits for an attribute to appear.</para>
           </listitem>
         </varlistentry>
 
@@ -513,6 +515,12 @@
                   writing, a change uevent will be synthesised.</para>
                 </listitem>
               </varlistentry>
+              <varlistentry>
+                <term><option>nowatch</option></term>
+                <listitem>
+                  <para>Disable the watching of a device node with inotify.</para>
+                </listitem>
+              </varlistentry>
             </variablelist>
           </listitem>
         </varlistentry>
@@ -571,8 +579,9 @@
           <listitem>
             <para>The value of a sysfs attribute found at the device, where
             all keys of the rule have matched. If the matching device does not have
-            such an attribute, follow the chain of parent devices and use the value
-            of the first attribute that matches.
+            such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or
+            ATTRS test selected a parent device, use the attribute from that
+            parent device.
             If the attribute is a symlink, the last element of the symlink target is
             returned as the value.</para>
           </listitem>