X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm.xml;h=44e286bba64f8b05a6b86c9ec58e7118bc8a4e14;hb=e85f5ec15f1c0a820cc81b422c2fa157d9805896;hp=093dd21428400dbfcba802cc0bfea85c319cbce0;hpb=0254b2118f123504c268edb0b382c587ac15aaa3;p=elogind.git

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index 093dd2142..44e286bba 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -7,8 +7,7 @@
     <title>udevadm</title>
     <refentry>
       <refentryinfo>
-        <title>udevd</title>
-        <date>November 2007</date>
+        <title>udevadm</title>
         <productname>udev</productname>
       </refentryinfo>
 
@@ -150,7 +149,7 @@
         </refsect2>
 
         <refsect2><title>udevadm trigger <optional>options</optional></title>
-          <para>Request device events from the kernel. Usually used to replay events at system coldplug time.</para>
+          <para>Request device events from the kernel. Primarily used to replay events at system coldplug time.</para>
           <variablelist>
             <varlistentry>
               <term><option>--verbose</option></term>
@@ -175,7 +174,7 @@
             <varlistentry>
               <term><option>--action=<replaceable>action</replaceable></option></term>
               <listitem>
-                <para>Type of event to be triggered. The default value is <command>add</command>.</para>
+                <para>Type of event to be triggered. The default value is <command>change</command>.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -213,7 +212,21 @@
             <varlistentry>
               <term><option>--property-match=<replaceable>property</replaceable>=<replaceable>value</replaceable></option></term>
               <listitem>
-                <para>Trigger events for devices with a matching propery value. This option can be
+                <para>Trigger events for devices with a matching property value. This option can be
+                specified multiple times and supports shell style pattern matching.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--tag-match=<replaceable>property</replaceable></option></term>
+              <listitem>
+                <para>Trigger events for devices with a matching tag. This option can be
+                specified multiple times.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--sysname-match=<replaceable>name</replaceable></option></term>
+              <listitem>
+                <para>Trigger events for devices with a matching sys device name. This option can be
                 specified multiple times and supports shell style pattern matching.</para>
               </listitem>
             </varlistentry>
@@ -298,9 +311,9 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>--env=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term>
+              <term><option>--property=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term>
               <listitem>
-                <para>Set global variable.</para>
+                <para>Set a global property for all events.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -325,13 +338,6 @@
           event timing, by comparing the timestamps of the kernel uevent and the udev event.
           </para>
           <variablelist>
-            <varlistentry>
-              <term><option>--environment</option></term>
-              <listitem>
-                <para>Print the complete environment for all events. Can be used to compare the
-                kernel supplied and the udev added environment values.</para>
-              </listitem>
-            </varlistentry>
             <varlistentry>
               <term><option>--kernel</option></term>
               <listitem>
@@ -344,6 +350,24 @@
                 <para>Print the udev event after the rule processing.</para>
               </listitem>
             </varlistentry>
+            <varlistentry>
+              <term><option>--property</option></term>
+              <listitem>
+                <para>Also print the properties of the event.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--subsystem-match=<replaceable>string[/string]</replaceable></option></term>
+              <listitem>
+                <para>Filter events by subsystem[/devtype]. Only udev events with a matching subsystem value will pass.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--tag-match=<replaceable>string</replaceable></option></term>
+              <listitem>
+                <para>Filter events by property. Only udev events with a given tag attached will pass.</para>
+              </listitem>
+            </varlistentry>
             <varlistentry>
               <term><option>--help</option></term>
               <listitem>