X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.xml;h=9d905abd0c9d34806e0e91844dda2d2c38b24849;hp=b86b33ac44d67491ccd08621e5373821b8b71930;hb=e5e641518bb20d44db58d9715ac4cd450fcb4dcc;hpb=3bc7c84cf07eae90aee2a0972a4441652e4d38f6

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index b86b33ac4..9d905abd0 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -150,7 +150,7 @@
         </refsect2>
 
         <refsect2><title>udevadm trigger <optional>options</optional></title>
-          <para>Request device uevents, usually used to replay events at system coldplug.</para>
+          <para>Request device events from the kernel. Usually used to replay events at system coldplug time.</para>
           <variablelist>
             <varlistentry>
               <term><option>--verbose</option></term>
@@ -165,15 +165,17 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>--retry-failed</option></term>
+              <term><option>--type=<replaceable>type</replaceable></option></term>
               <listitem>
-                <para>Trigger only the events which are failed during a previous run.</para>
+                <para>Trigger a specific type of devices. Valid types are:
+                <command>devices</command>, <command>subsystems</command>, <command>failed</command>.
+                The default value is <command>devices</command>.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term><option>--action=<replaceable>action</replaceable></option></term>
               <listitem>
-                <para>Type of event to be triggered. The default value is "add".</para>
+                <para>Type of event to be triggered. The default value is <command>add</command>.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -208,23 +210,6 @@
                 of the sysfs attribute is checked. This option can be specified multiple times.</para>
               </listitem>
             </varlistentry>
-            <varlistentry>
-              <term><option>--socket=<replaceable>path</replaceable></option></term>
-              <listitem>
-                <para>Pass the synthesized events to the specified socket, instead of triggering
-                a global kernel event. All available event values will be send in the same format
-                the kernel sends an uevent, or <option>RUN+="socket:<replaceable>path</replaceable>"</option>
-                sends a message. If the first character of the specified path is an @ character,
-                an abstract namespace socket is used, instead of an existing socket file.</para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term><option>--env=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term>
-              <listitem>
-                <para>Pass an additional environemt key to the event. This works only with the
-                --socket option.</para>
-              </listitem>
-            </varlistentry>
           </variablelist>
         </refsect2>
 
@@ -235,7 +220,14 @@
               <term><option>--timeout=<replaceable>seconds</replaceable></option></term>
               <listitem>
                 <para>Maximum number of seconds to wait for the event queue to become empty.
-                The default value is 180 seconds.</para>
+                The default value is 180 seconds. A value of 0 will check if the queue is empty
+                and always return immediately.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--quiet</option></term>
+              <listitem>
+                <para>Do not print any output, like the remaining queue entries when reaching the timeout.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -334,8 +326,7 @@
         </refsect2>
 
         <refsect2><title>udevadm test <optional>options</optional> <replaceable>devpath</replaceable></title>
-          <para>Simulate a udev event run for the given device, and print out debug
-          output. Unless forced to, no device node or symlink will be created.</para>
+          <para>Simulate a udev event run for the given device, and print debug output.</para>
           <variablelist>
             <varlistentry>
               <term><option>--action=<replaceable>string</replaceable></option></term>
@@ -349,13 +340,6 @@
                 <para>The subsystem string.</para>
               </listitem>
             </varlistentry>
-            <varlistentry>
-              <term><option>--force</option></term>
-              <listitem>
-                <para>Force the creation of a device node or symlink. Usually the test run
-                prints only debug output.</para>
-              </listitem>
-            </varlistentry>
             <varlistentry>
               <term><option>--help</option></term>
               <listitem>