man: clarify $attr{} parent searching

[elogind.git] / udev.xml

diff --git a/udev.xml b/udev.xml
index e4329653170e1921482e9510cb684f9cd7755dd5..7fefe48a44b11b719e78d86ce8326408db2186b7 100644 (file)
--- a/udev.xml
+++ b/udev.xml
@@ -159,6 +159,15 @@
               </listitem>
             </varlistentry>
 
               </listitem>
             </varlistentry>
 

+            <varlistentry>
+              <term><option>NAME</option></term>
+              <listitem>
+                <para>Match the name of the node or network interface. It can
+                be used once the NAME key has been set in one of the preceding
+                rules.</para>
+              </listitem>
+            </varlistentry>
+

             <varlistentry>
               <term><option>SUBSYSTEM</option></term>
               <listitem>
             <varlistentry>
               <term><option>SUBSYSTEM</option></term>
               <listitem>


@@ -394,10 +403,9 @@
             </varlistentry>
 
             <varlistentry>
             </varlistentry>
 
             <varlistentry>

-              <term><option>WAIT_FOR_SYSFS</option></term>
+              <term><option>WAIT_FOR</option></term>

               <listitem>
               <listitem>

-                <para>Wait for the specified sysfs file of the device to be created. Can be used
-                to fight against kernel sysfs timing issues.</para>
+                <para>Wait for a file to become available.</para>

               </listitem>
             </varlistentry>
 
               </listitem>
             </varlistentry>
 


@@ -441,6 +449,13 @@
                       detected.</para>
                     </listitem>
                   </varlistentry>
                       detected.</para>
                     </listitem>
                   </varlistentry>

+                  <varlistentry>
+                    <term><option>event_timeout=</option></term>
+                    <listitem>
+                      <para>Number of seconds an event will wait for operations to finish, before it
+                      will terminate itself.</para>
+                    </listitem>
+                  </varlistentry>

                   <varlistentry>
                     <term><option>string_escape=<replaceable>none|replace</replaceable></option></term>
                     <listitem>
                   <varlistentry>
                     <term><option>string_escape=<replaceable>none|replace</replaceable></option></term>
                     <listitem>


@@ -455,7 +470,7 @@
           </variablelist>
 
           <para>The <option>NAME</option>, <option>SYMLINK</option>, <option>PROGRAM</option>,
           </variablelist>
 
           <para>The <option>NAME</option>, <option>SYMLINK</option>, <option>PROGRAM</option>,

-          <option>OWNER</option>, <option>GROUP</option>  and  <option>RUN</option>
+          <option>OWNER</option>, <option>GROUP</option>, <option>MODE</option>  and  <option>RUN</option>

           fields support simple printf-like string substitutions. The <option>RUN</option>
           format chars gets applied after all rules have been processed, right before the program
           is executed. It allows the use of the complete environment set by earlier matching
           fields support simple printf-like string substitutions. The <option>RUN</option>
           format chars gets applied after all rules have been processed, right before the program
           is executed. It allows the use of the complete environment set by earlier matching


@@ -507,8 +522,8 @@
               <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
               <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, all devices along the chain of parents are searched
-                for a matching attribute.
+                such an attribute, follow the chain of parent devices and use the value
+                of the first attribute that matches.

                 If the attribute is a symlink, the last element of the symlink target is
                 returned as the value.</para>
               </listitem>
                 If the attribute is a symlink, the last element of the symlink target is
                 returned as the value.</para>
               </listitem>


@@ -556,8 +571,16 @@
             <varlistentry>
               <term><option>$name</option></term>
               <listitem>
             <varlistentry>
               <term><option>$name</option></term>
               <listitem>

-                <para>The name of the device node. The value is only set if an earlier
-                rule assigned a value, or during a remove events.</para>
+                <para>The current name of the device node. If not changed by a rule, it is the
+                name of the kernel device.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>$links</option></term>
+              <listitem>
+                <para>The current list of symlinks, separated by a space character. The value is
+                only set if an earlier rule assigned a value, or during a remove events.</para>

               </listitem>
             </varlistentry>
 
               </listitem>
             </varlistentry>