man/udevadm: list --version as a common option

Then, drop --version and --help from each sub commands.

diff --git a/man/udevadm.xml b/man/udevadm.xml
index 507ab49b48435391c1ee9820da02bd3c71e3430d..5104eee12b7f4e8847a2315f0a4dcd3f807205ce 100644 (file)
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -73,7 +73,9 @@
     the event queue, and provides simple debugging mechanisms.</para>
   </refsect1>
 
-  <refsect1><title>Options</title>
+  <refsect1>
+    <title>Options</title>
+
     <variablelist>
       <varlistentry>
         <term><option>-d</option></term>
@@ -84,6 +86,12 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-V</option></term>
+        <term><option>--version</option></term>
+        <xi:include href="standard-options.xml" xpointer="version-text" />
+      </varlistentry>
+
       <xi:include href="standard-options.xml" xpointer="help" />
     </variablelist>
 
@@ -310,12 +318,11 @@
             <para>When used with <option>--export-db</option>, only show devices that are initialized or not
             initialized respectively.</para>
 
-          <xi:include href="version-info.xml" xpointer="v255"/>
+            <xi:include href="version-info.xml" xpointer="v255"/>
           </listitem>
         </varlistentry>
 
         <xi:include href="standard-options.xml" xpointer="json" />
-        <xi:include href="standard-options.xml" xpointer="help" />
         <xi:include href="standard-options.xml" xpointer="no-pager" />
       </variablelist>
 
@@ -627,8 +634,6 @@
             <xi:include href="version-info.xml" xpointer="v241"/>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
 
       <para>In addition, optional positional arguments can be used
@@ -661,8 +666,6 @@
             <para>Stop waiting if file exists.</para>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
 
       <para>See
@@ -856,8 +859,6 @@
             specified tags are monitored.</para>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
     </refsect2>
 
@@ -944,9 +945,6 @@
           <xi:include href="version-info.xml" xpointer="v250"/>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
-        <xi:include href="standard-options.xml" xpointer="version" />
       </variablelist>
     </refsect2>
 
@@ -1019,8 +1017,6 @@
             <xi:include href="version-info.xml" xpointer="v254"/>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
     </refsect2>
 
@@ -1078,8 +1074,6 @@
             <xi:include href="version-info.xml" xpointer="v258"/>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
     </refsect2>
 
@@ -1142,8 +1136,6 @@
             <xi:include href="version-info.xml" xpointer="v251"/>
           </listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
     </refsect2>
 
@@ -1232,8 +1224,6 @@
 
           <xi:include href="version-info.xml" xpointer="v251"/></listitem>
         </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
       </variablelist>
     </refsect2>
   </refsect1>

diff --git a/tools/command_ignorelist b/tools/command_ignorelist
index 6d0a81f33095cc180c9ee1564301600b78215e59..f68577e937501cec753cb74d88149899c131ef8b 100644 (file)
--- a/tools/command_ignorelist
+++ b/tools/command_ignorelist
@@ -485,6 +485,7 @@ udev.xml /refsect1[title="Rules Files"]/refsect2[title="Keys"]/variablelist[4]/v
 udev.xml /refsect1[title="Rules Files"]/refsect2[title="Keys"]/variablelist[4]/varlistentry[term="%%"]
 udev.xml /refsect1[title="Rules Files"]/refsect2[title="Keys"]/variablelist[4]/varlistentry[term="$$"]
 udevadm.xml /refsect1[title="Options"]/variablelist/varlistentry[term="-d"]
+udevadm.xml /refsect1[title="Options"]/variablelist/varlistentry[term="-V"]
 udevadm.xml /refsect1[title="Options"]/refsect2[title="udevadm info\n      options\n      devpath|file|unit\n    "]/variablelist/varlistentry[term="-q"]
 udevadm.xml /refsect1[title="Options"]/refsect2[title="udevadm info\n      options\n      devpath|file|unit\n    "]/variablelist/varlistentry[term="-p"]
 udevadm.xml /refsect1[title="Options"]/refsect2[title="udevadm info\n      options\n      devpath|file|unit\n    "]/variablelist/varlistentry[term="-n"]