udevadm: settle - kill alarm()

[elogind.git] / udev / udev.xml

diff --git a/udev/udev.xml b/udev/udev.xml
index 336b203becb3522abc0e059ba8da8410efc80684..ae9179826a390d253c430d9689889e1c491e60be 100644 (file)
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -73,7 +73,7 @@
       <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>/dev/.udev/rules.d/</filename>.
+      and the temporary rules directory <filename>/run/udev/rules.d/</filename>.
       All rule files are sorted and processed in lexical order, regardless
       in which of these directories they live. Files in
       <filename>/etc/udev/rules.d/</filename> have precedence over files with
@@ -309,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
@@ -383,10 +383,7 @@
             device. This can only be used for very short running tasks. Running an
             event process for a long period of time may block all further events for
             this or a dependent device. Long running tasks need to be immediately
-            detached from the event process itself. If the option
-            <option>RUN{<replaceable>fail_event_on_error</replaceable>}</option> is
-            specified, and the executed program returns non-zero, the event will be
-            marked as failed for a possible later handling.</para>
+            detached from the event process itself.</para>
             <para>If no absolute path is given, the program is expected to live in
             <filename>/lib/udev</filename>, otherwise the absolute path must be
             specified. Program name and arguments are separated by spaces. Single quotes
@@ -466,7 +463,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>
 
@@ -578,8 +576,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>