configure.ac: fix broken firmware search path in configure.ac

[elogind.git] / udev / udev.xml

diff --git a/udev/udev.xml b/udev/udev.xml
index b6c5933419e5e61bf42be01855bf3a67b7a8f8a3..192a6f1238d806c642322c774d65e469e7f6ad7e 100644 (file)
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -297,8 +297,13 @@
             <varlistentry>
               <term><option>NAME</option></term>
               <listitem>
             <varlistentry>
               <term><option>NAME</option></term>
               <listitem>

-                <para>The name of the node to be created, or the name the network interface
-                should be renamed to.</para>
+                <para>The name, a network interface should be renamed to, or 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 receives
+                any event. Changing the node name from the kernel's default may result
+                in unexpected behavior and is not supported. Udev is only expected to
+                handle device node permissions and to create additional symlinks, which
+                do not conflict with the kernel device node names.</para>

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


@@ -306,9 +311,16 @@
               <term><option>SYMLINK</option></term>
               <listitem>
                 <para>The name of a symlink targeting the node. Every matching rule will add
               <term><option>SYMLINK</option></term>
               <listitem>
                 <para>The name of a symlink targeting the node. Every matching rule will add

-                this value to the list of symlinks to be created along with the device  node.
+                this value to the list of symlinks to be created along with the device node.

                 Multiple symlinks may be specified by separating the names by the space
                 Multiple symlinks may be specified by separating the names by the space

-                character.</para>
+                character. In case multiple devices claim the same name, the link will
+                always point to the device with the highest link_priority. If the current device
+                goes away, the links will be re-evaluated and the device with the next highest
+                link_priority will own the link. If no link_priority is specified, the order
+                of the devices, and which of them will own the link, is undefined. Claiming
+                the same name for a node and links may result in unexpected behavior and is
+                not supported.
+                </para>

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


@@ -398,6 +410,14 @@
                       environment key format.</para>
                     </listitem>
                   </varlistentry>
                       environment key format.</para>
                     </listitem>
                   </varlistentry>

+                  <varlistentry>
+                    <term><option>db</option></term>
+                    <listitem>
+                      <para>Import a single property specified as the assigned value from the
+                      current device database. This works only if the database is already populated
+                      by an earlier event.</para>
+                    </listitem>
+                  </varlistentry>

                   <varlistentry>
                     <term><option>parent</option></term>
                     <listitem>
                   <varlistentry>
                     <term><option>parent</option></term>
                     <listitem>


@@ -418,7 +438,8 @@
             <varlistentry>
               <term><option>WAIT_FOR</option></term>
               <listitem>
             <varlistentry>
               <term><option>WAIT_FOR</option></term>
               <listitem>

-                <para>Wait for a file to become available.</para>
+                <para>Wait for a file to become available or until a 10
+                seconds timeout expires.</para>

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


@@ -427,13 +448,6 @@
               <listitem>
                 <para>Rule and device options:</para>
                 <variablelist>
               <listitem>
                 <para>Rule and device options:</para>
                 <variablelist>

-                  <varlistentry>
-                    <term><option>ignore_remove</option></term>
-                    <listitem>
-                      <para>Do not remove the device node when the device goes away. This may be
-                      useful as a workaround for broken device drivers.</para>
-                    </listitem>
-                  </varlistentry>

                   <varlistentry>
                     <term><option>link_priority=<replaceable>value</replaceable></option></term>
                     <listitem>
                   <varlistentry>
                     <term><option>link_priority=<replaceable>value</replaceable></option></term>
                     <listitem>


@@ -441,14 +455,6 @@
                       priorities overwrite existing symlinks of other devices. The default is 0.</para>
                     </listitem>
                   </varlistentry>
                       priorities overwrite existing symlinks of other devices. The default is 0.</para>
                     </listitem>
                   </varlistentry>

-                  <varlistentry>
-                    <term><option>all_partitions</option></term>
-                    <listitem>
-                      <para>Create the device nodes for all available partitions of a block device.
-                      This may be useful for removable media devices where media changes are not
-                      detected.</para>
-                    </listitem>
-                  </varlistentry>

                   <varlistentry>
                     <term><option>event_timeout=</option></term>
                     <listitem>
                   <varlistentry>
                     <term><option>event_timeout=</option></term>
                     <listitem>


@@ -468,7 +474,7 @@
                     <term><option>watch</option></term>
                     <listitem>
                       <para>Watch the device node with inotify, when closed after being opened for
                     <term><option>watch</option></term>
                     <listitem>
                       <para>Watch the device node with inotify, when closed after being opened for

-                     writing, a change uevent will be synthesised.</para>
+                      writing, a change uevent will be synthesised.</para>

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