X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevadm.xml;h=ccbeeca404cdb2b083745780fc2d0044463c818f;hp=0518c3ba1a334751e84442559b3eaf99469b2754;hb=0d57399d92cfc6ff082df22ff0047e41927490d1;hpb=a9780590f4459da37368ab55a32568ca7f0d6821

diff --git a/udevadm.xml b/udevadm.xml
index 0518c3ba1..ccbeeca40 100644
--- a/udevadm.xml
+++ b/udevadm.xml
@@ -57,7 +57,7 @@
 
       <refsect1><title>OPTIONS</title>
 
-        <refsect2><title>udevadm info</title>
+        <refsect2><title>udevadm info <replaceable>options</replaceable></title>
           <para>Queries the udev database for device information
           stored in the udev database. It can also query the properties
           of a device from its sysfs representation to help creating udev
@@ -80,7 +80,7 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>--name=<replaceable>node</replaceable></option></term>
+              <term><option>--name=<replaceable>file</replaceable></option></term>
               <listitem>
                 <para>The name of the device node or a symlink to query</para>
               </listitem>
@@ -101,6 +101,13 @@
                 along the chain, up to the root of sysfs that can be used in udev rules.</para>
               </listitem>
             </varlistentry>
+            <varlistentry>
+              <term><option>--device-id-of-file=<replaceable>file</replaceable></option></term>
+              <listitem>
+                <para>Print major/minor numbers of the underlying device, where the file
+                lives on.</para>
+              </listitem>
+            </varlistentry>
             <varlistentry>
               <term><option>--export-db</option></term>
               <listitem>
@@ -122,7 +129,7 @@
           </variablelist>
         </refsect2>
 
-        <refsect2><title>udevadm trigger</title>
+        <refsect2><title>udevadm trigger <optional>options</optional></title>
           <para>Request kernel device uevents, usually used to replay events at system coldplug.</para>
           <variablelist>
             <varlistentry>
@@ -184,13 +191,14 @@
           </variablelist>
         </refsect2>
 
-        <refsect2><title>udevadm settle</title>
+        <refsect2><title>udevadm settle <optional>options</optional></title>
           <para>Watches the udev event queue, and exits if all current events are handled.</para>
           <variablelist>
             <varlistentry>
               <term><option>--timeout=<replaceable>seconds</replaceable></option></term>
               <listitem>
-                <para>Maximum seconds to wait for the queue to become empty.</para>
+                <para>Maximum number of seconds to wait for the event queue to become empty.
+                The default value is 180 seconds.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -202,11 +210,11 @@
           </variablelist>
         </refsect2>
 
-        <refsect2><title>udevadm control <replaceable>instruction</replaceable></title>
+        <refsect2><title>udevadm control <replaceable>command</replaceable></title>
           <para>Modify the internal state of the running udev daemon.</para>
           <variablelist>
             <varlistentry>
-              <term><option>log_priority=<replaceable>value</replaceable></option></term>
+              <term><option>--log_priority=<replaceable>value</replaceable></option></term>
               <listitem>
                 <para>Set the internal log level of udevd. Valid values are the numerical
                 syslog priorities or their textual representations: <option>err</option>,
@@ -214,46 +222,46 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>stop_exec_queue</option></term>
+              <term><option>--stop_exec_queue</option></term>
               <listitem>
                 <para>Signal udevd to stop executing new events. Incoming events
                 will be queued.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>start_exec_queue</option></term>
+              <term><option>--start_exec_queue</option></term>
               <listitem>
                 <para>Signal udevd to enable the execution of events.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>reload_rules</option></term>
+              <term><option>--reload_rules</option></term>
               <listitem>
                 <para>Signal udevd to reload the rules from the config.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>env <replaceable>var</replaceable>=<replaceable>value</replaceable></option></term>
+              <term><option>--env <replaceable>var</replaceable>=<replaceable>value</replaceable></option></term>
               <listitem>
                 <para>Set global variable.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>max_childs</option></term>
+              <term><option>--max_childs</option></term>
               <listitem>
                 <para>Set the maximum number of events, udevd will handle at the
                 same time.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>max_childs_running</option></term>
+              <term><option>--max_childs_running</option></term>
               <listitem>
                 <para>Set the maximum number of events, which are allowed to run at the
                 same time.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>help</option></term>
+              <term><option>--help</option></term>
               <listitem>
                 <para>Print help text.</para>
               </listitem>
@@ -261,7 +269,7 @@
           </variablelist>
         </refsect2>
 
-        <refsect2><title>udevadm monitor</title>
+        <refsect2><title>udevadm monitor <optional>options</optional></title>
           <para>Listens to the kernel uevents and events sent out by a udev rule
           and prints the devpath of the event to the console. It can be used to analyze the
           event timing, by comparing the timestamps of the kernel uevent and the udev event.
@@ -295,7 +303,7 @@
           </variablelist>
         </refsect2>
 
-        <refsect2><title>udevadm test</title>
+        <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>
           <variablelist>