man pages: work around xmlto which tries to be smart

16 files changed, 136 insertions, 205 deletions

diff --git a/udev.7 b/udev.7
index 332db04f1f..8a2ea16a61 100644
--- a/udev.7
+++ b/udev.7
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udev
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: August 2005
+.\"    Manual: udev
+.\"    Source: udev
+.\"
 .TH "UDEV" "7" "August 2005" "udev" "udev"
 .\" disable hyphenation
 .nh
@@ -28,22 +31,23 @@ All udev configuration files are placed in
 .PP
 udev expects its main configuration file at
 \fI/etc/udev/udev.conf\fR. It consists of a set of variables allowing the user to override default udev values. The following variables can be set:
-.TP
+.TP 3n
 \fBudev_root\fR
 Specifies where to place the device nodes in the filesystem. The default value is
 \fI/dev\fR.
-.TP
+.TP 3n
 \fBudev_rules\fR
 The name of the udev rules file or directory to look for files with the suffix
 \fI.rules\fR. Multiple rule files are read in lexical order. The default value is
 \fI/etc/udev/rules.d\fR.
-.TP
+.TP 3n
 \fBudev_log\fR
 The logging priority. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
 \fBdebug\fR.
+.\" end of SS subsection "Configuration file"
 .SS "Rules files"
 .PP
 The udev rules are read from the files located in the
@@ -51,105 +55,105 @@ The udev rules are read from the files located in the
 directory or at the location specified value in the configuraton file. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignement keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned. A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling. If no matching rule is found, the default device node name is used.
 .PP
 A rule may consists of a list of one or more key value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are:
-.TP
+.TP 3n
 \fB==\fR
 Compare for equality.
-.TP
+.TP 3n
 \fB!=\fR
 Compare for non\-equality.
-.TP
+.TP 3n
 \fB=\fR
 Asign a value to a key. Keys that represent a list, are reset and only this single value is assigned.
-.TP
+.TP 3n
 \fB+=\fR
 Add the value to a key that holds a list of entries.
-.TP
+.TP 3n
 \fB:=\fR
 Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules.
 .PP
 The following key names can be used to match against device properties:
-.TP
+.TP 3n
 \fBACTION\fR
 Match the name of the event action.
-.TP
+.TP 3n
 \fBKERNEL\fR
 Match the name of the device.
-.TP
+.TP 3n
 \fBDEVPATH\fR
 Match the devpath of the device.
-.TP
+.TP 3n
 \fBSUBSYSTEM\fR
 Match the subsystem of the device.
-.TP
+.TP 3n
 \fBBUS\fR
 Search the devpath upwards for a matching device subsystem name.
-.TP
+.TP 3n
 \fBDRIVER\fR
 Search the devpath upwards for a matching device driver name.
-.TP
+.TP 3n
 \fBID\fR
 Search the devpath upwards for a matching device name.
-.TP
+.TP 3n
 \fBSYSFS{\fR\fB\fIfilename\fR\fR\fB}\fR
 Search the devpath upwards for a device with matching sysfs attribute values. Up to five
 \fBSYSFS\fR
 keys can be specified per rule. All attributes must match on the same device. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself.
-.TP
+.TP 3n
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 Match against the value of an environment variable. Up to five
 \fBENV\fR
 keys can be specified per rule. This key can also be used to export a variable to the environment.
-.TP
+.TP 3n
 \fBPROGRAM\fR
 Execute external program. The key is true, if the program returns without exit code zero. The whole event environment is available to the executed program. The program's output printed to stdout is available for the RESULT key.
-.TP
+.TP 3n
 \fBRESULT\fR
 Match the returned string of the last PROGRAM call. This key can be used in the same or in any later rule after a PROGRAM call.
 .PP
 Most of the fields support a shell style pattern matching. The following pattern characters are supported:
-.TP
+.TP 3n
 \fB*\fR
 Matches zero, or any number of characters.
-.TP
+.TP 3n
 \fB?\fR
 Matches any single character.
-.TP
+.TP 3n
 \fB[]\fR
 Matches any single character specified within the brackets. example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. Ranges are also supported within this match with the '\-' character. For example, to match on the range of all digits, the pattern [0\-9] would be used. If the first character following the '[' is a '!', any characters not enclosed are matched.
 .PP
 The following keys can get values assigned:
-.TP
+.TP 3n
 \fBNAME\fR
 The name of the node to be created, or the name the network interface should be renamed to. Only one rule can set the node name, all later rules with a NAME key will be ignored.
-.TP
+.TP 3n
 \fBSYMLINK\fR
 The name of a symlink targeting the node. Every matching rule can add 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 character.
-.TP
+.TP 3n
 \fBOWNER, GROUP, MODE\fR
 The permissions for the device node. Every specified value overwrites the compiled\-in default value.
-.TP
+.TP 3n
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 Export a variable to the environment. This key can also be used to match against an environment variable.
-.TP
+.TP 3n
 \fBRUN\fR
 Add a program to the list of programs to be executed for a specific device. This can only be used for very short running tasks. Running an event process for a long period of time may block all further events for this or a dependent device. Long running tasks need to be immediately detached from the event process itself.
-.TP
+.TP 3n
 \fBLABEL\fR
 Named label where a GOTO can jump to.
-.TP
+.TP 3n
 \fBGOTO\fR
 Jumps to the next LABEL with a matching name
-.TP
+.TP 3n
 \fBIMPORT{\fR\fB\fItype\fR\fR\fB}\fR
 Import the printed result or the value of a file in environment key format into the event environment.
 \fBprogram\fR
 will execute an external program and read its output.
 \fBfile\fR
 will inport a text file. If no option is given, udev will determine it from the executable bit of of the file permissions.
-.TP
+.TP 3n
 \fBWAIT_FOR_SYSFS\fR
 Wait for the specified sysfs file of the device to be created. Can be used to fight against kernel sysfs timing issues.
-.TP
+.TP 3n
 \fBOPTIONS\fR
 \fBlast_rule\fR
 stops further rules application. No later rules will have any effect.
@@ -171,56 +175,58 @@ and
 fields support simple printf\-like string substitutions. The
 \fBRUN\fR
 format chars gets applied after all rules have been processed, right before the program is executed. It allows the use of the complete environment set by earlier matching rules. For all other fields, substitutions are applied while the individual rule is being processed. The available substitutions are:
-.TP
+.TP 3n
 \fB$kernel\fR, \fB%k\fR
 The kernel name for this device.
-.TP
+.TP 3n
 \fB$number\fR, \fB%n\fR
 The kernel number for this device. For example, 'sda3' has kernel number of '3'
-.TP
+.TP 3n
 \fB$devpath\fR, \fB%p\fR
 The devpath of the device.
-.TP
+.TP 3n
 \fB$id\fR, \fB%b\fR
 The name of the device matched while searching the devpath upwards for
 \fBBUS\fR,
-\fBID\fR\fBDRIVER\fR
+\fBID\fR
+\fBDRIVER\fR
 and
 \fBSYSFS\fR.
-.TP
+.TP 3n
 \fB$sysfs{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
 The value of a sysfs attribute found at the current or a parent device.
-.TP
+.TP 3n
 \fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
 The value of an environment variable.
-.TP
+.TP 3n
 \fB$major\fR, \fB%M\fR
 The kernel major number for the device.
-.TP
+.TP 3n
 \fB$minor\fR \fB%m\fR
 The kernel minor number for the device.
-.TP
+.TP 3n
 \fB$result\fR, \fB%c\fR
 The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
 \fB%c{N}\fR. If the number is followed by the '+' char this part plus all remaining parts of the result string are substituted:
 \fB%c{N+}\fR
-.TP
+.TP 3n
 \fB$parent\fR, \fB%P\fR
 The node name of the parent device.
-.TP
+.TP 3n
 \fB$root\fR, \fB%r\fR
 The udev_root value.
-.TP
+.TP 3n
 \fB$tempnode\fR, \fB%N\fR
 The name of a created temporary device node to provide access to the device from a external program before the real node is created.
-.TP
+.TP 3n
 \fB%%\fR
 The '%' character itself.
-.TP
+.TP 3n
 \fB$$\fR
 The '$' character itself.
 .PP
 The count of characters to be substituted may be limited by specifying the format length value. For example, '%3s{file}' will only insert the first three characters of the sysfs attribute
+.\" end of SS subsection "Rules files"
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
diff --git a/udev.xml b/udev.xml
index 958c10d1d6..84c66c626e 100644
--- a/udev.xml
+++ b/udev.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udev</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udev</refentrytitle>
         <manvolnum>7</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevd.8 b/udevd.8
index 6fbe1cbf91..a57ff7aab0 100644
--- a/udevd.8
+++ b/udevd.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevd
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: August 2005
+.\"    Manual: udevd, udevcontrol
+.\"    Source: udev
+.\"
 .TH "UDEVD" "8" "August 2005" "udev" "udevd, udevcontrol"
 .\" disable hyphenation
 .nh
@@ -18,24 +21,24 @@ udevd \- event managing daemon
 .PP
 udevd listens to kernel uevents and passes the incoming events to udev. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling.
 .SH "OPTIONS"
-.TP
+.TP 3n
 \fB\-\-daemon\fR
 Detach and run in the background.
-.TP
+.TP 3n
 \fBlog_priority=\fR\fB\fIvalue\fR\fR
 udevcontrol can dynamically set the log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
 \fBdebug\fR.
-.TP
+.TP 3n
 \fBstop_exec_queue\fR
 udevcontrol stops the execution of events from udevd.
-.TP
+.TP 3n
 \fBstart_exec_queue\fR
 udevcontrol starts the execution of events from udevd.
 .SH "ENVIRONMENT"
-.TP
+.TP 3n
 \fBUDEV_LOG\fR
 Overrides the syslog priority specified in the config file.
 .SH "AUTHOR"
diff --git a/udevd.xml b/udevd.xml
index 1a035b71e9..7feede2777 100644
--- a/udevd.xml
+++ b/udevd.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevd, udevcontrol</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevd</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevinfo.8 b/udevinfo.8
index 93aea361e9..4430f5d9d3 100644
--- a/udevinfo.8
+++ b/udevinfo.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevinfo
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: August 2005
+.\"    Manual: udevinfo
+.\"    Source: udev
+.\"
 .TH "UDEVINFO" "8" "August 2005" "udev" "udevinfo"
 .\" disable hyphenation
 .nh
@@ -11,12 +14,12 @@
 udevinfo \- query device information from the udev database
 .SH "SYNOPSIS"
 .HP 9
-\fBudevinfo\fR [\fB\-q\ \fR\fB\fIquery\-type\fR\fR] [\fB\-a\ \fR] [\fB\-p\ \fR\fB\fIdevice\-path\fR\fR] [\fB\-n\ \fR\fB\fInode\-name\fR\fR] [\fB\-r\fR] [\fB\-e\fR] [\fB\-V\fR] [\fB\-h\fR]
+\fBudevinfo\fR [\fB\-q\ \fR\fB\fIquery\-type\fR\fR] [\fB\-a\ \fR] [\fB\-p\ \fR\fB\fIdevpath\fR\fR] [\fB\-n\ \fR\fB\fInode\fR\fR] [\fB\-r\fR] [\fB\-e\fR] [\fB\-V\fR] [\fB\-h\fR]
 .SH "DESCRIPTION"
 .PP
 udevinfo 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 rules that match this device.
 .SH "OPTIONS"
-.TP
+.TP 3n
 \fB\-q\fR
 Query the database for specified type of device data. It needs the
 \fB\-p\fR
@@ -28,16 +31,16 @@ to identify the specified device. Valid queries are:
 \fBpath\fR,
 \fBenv\fR,
 \fBall\fR.
-.TP
+.TP 3n
 \fB\-a\fR
 Print all sysfs properties of the specified device that can be used in udev rules to match the specified device. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules.
-.TP
-\fB\-p \fR\fB\fIdevice\-path\fR\fR
-The sysfs path of the device to query.
-.TP
-\fB\-n \fR\fB\fInode\-name\fR\fR
+.TP 3n
+\fB\-p \fR\fB\fIdevpath\fR\fR
+The devpath of the device to query.
+.TP 3n
+\fB\-n \fR\fB\fInode\fR\fR
 The name of the device node or a symlink to query
-.TP
+.TP 3n
 \fB\-r\fR
 The udev root directory:
 \fI/dev\fR. If used in conjunction with a
@@ -45,10 +48,10 @@ The udev root directory:
 or
 \fBsymlink\fR
 query, the query returns the absolute path.
-.TP
+.TP 3n
 \fB\-e\fR
 Export the content of the udev database.
-.TP
+.TP 3n
 \fB\-h\fR
 Print help text.
 .SH "AUTHOR"
diff --git a/udevinfo.xml b/udevinfo.xml
index 0e2874973b..9bd0b8dc17 100644
--- a/udevinfo.xml
+++ b/udevinfo.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevinfo</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevinfo</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevmonitor.8 b/udevmonitor.8
index 243e7b8279..4577aef95c 100644
--- a/udevmonitor.8
+++ b/udevmonitor.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevmonitor
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: August 2005
+.\"    Manual: udevmonitor
+.\"    Source: udev
+.\"
 .TH "UDEVMONITOR" "8" "August 2005" "udev" "udevmonitor"
 .\" disable hyphenation
 .nh
@@ -16,7 +19,7 @@ udevmonitor \- print the kernel and udev event sequence to the console
 .PP
 udevmonitor listens to the kernel uevents and events send out by a udev rule and prints the devpath of the event to the console. It can be used analyze to the event timing by comparing the timestamps of the kernel uevent with the udev event.
 .SH "OPTIONS"
-.TP
+.TP 3n
 \fB\-\-env\fR
 Print the complete environment for all events. Can be used to compare the kernel supplied and the udev added environment values.
 .SH "AUTHOR"
diff --git a/udevmonitor.xml b/udevmonitor.xml
index 349ec2ca3d..d40a14c698 100644
--- a/udevmonitor.xml
+++ b/udevmonitor.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevmonitor</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevmonitor</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevsettle.8 b/udevsettle.8
index 601553980d..2a51948d74 100644
--- a/udevsettle.8
+++ b/udevsettle.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevsettle
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: March 2006
+.\"    Manual: udevsettle
+.\"    Source: udev
+.\"
 .TH "UDEVSETTLE" "8" "March 2006" "udev" "udevsettle"
 .\" disable hyphenation
 .nh
@@ -16,11 +19,11 @@ udevsettle \- wait until queued kernel/udev events are handled
 .PP
 Waits watching the udev event queue and exits if all current events are handled.
 .SH "OPTIONS"
-.TP
+.TP 3n
 \fB\-\-timeout=\fR\fB\fIseconds\fR\fR
 maximum seconds to wait for the queue to become empty.
 .SH "ENVIRONMENT"
-.TP
+.TP 3n
 \fBUDEV_LOG\fR
 Overrides the syslog priority specified in the config file.
 .SH "AUTHOR"
diff --git a/udevsettle.xml b/udevsettle.xml
index 5f8f1ee0a5..8eb8cbd523 100644
--- a/udevsettle.xml
+++ b/udevsettle.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevsettle</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevsettle</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevstart.8 b/udevstart.8
index 11ac92d313..9f18c05d07 100644
--- a/udevstart.8
+++ b/udevstart.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevstart
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: August 2005
+.\"    Manual: udevstart
+.\"    Source: udev
+.\"
 .TH "UDEVSTART" "8" "August 2005" "udev" "udevstart"
 .\" disable hyphenation
 .nh
diff --git a/udevstart.xml b/udevstart.xml
index b3e283f523..c48de7c32c 100644
--- a/udevstart.xml
+++ b/udevstart.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevstart</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevstart</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevtest.8 b/udevtest.8
index d33abd1aa3..da435bc4e4 100644
--- a/udevtest.8
+++ b/udevtest.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevtest
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: August 2005
+.\"    Manual: udevtest
+.\"    Source: udev
+.\"
 .TH "UDEVTEST" "8" "August 2005" "udev" "udevtest"
 .\" disable hyphenation
 .nh
diff --git a/udevtest.xml b/udevtest.xml
index 58714be5a7..81f674da9d 100644
--- a/udevtest.xml
+++ b/udevtest.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevtest</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevtest</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>
diff --git a/udevtrigger.8 b/udevtrigger.8
index e0c2059ba0..de31f2e745 100644
--- a/udevtrigger.8
+++ b/udevtrigger.8
@@ -1,7 +1,10 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.\"     Title: udevtrigger
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\"      Date: March 2006
+.\"    Manual: udevtrigger
+.\"    Source: udev
+.\"
 .TH "UDEVTRIGGER" "8" "March 2006" "udev" "udevtrigger"
 .\" disable hyphenation
 .nh
@@ -16,14 +19,14 @@ udevtrigger \- request kernel devices events for coldplug
 .PP
 Trigger kernel device uevents to replay missing events at system coldplug.
 .SH "OPTIONS"
-.TP
+.TP 3n
 \fB\-\-verbose\fR
 print out the devices found in sysfs.
-.TP
+.TP 3n
 \fB\-\-dry\-run\fR
 don't actually trigger the event.
 .SH "ENVIRONMENT"
-.TP
+.TP 3n
 \fBUDEV_LOG\fR
 Overrides the syslog priority specified in the config file.
 .SH "AUTHOR"
diff --git a/udevtrigger.xml b/udevtrigger.xml
index c9b60d18fe..990cf63589 100644
--- a/udevtrigger.xml
+++ b/udevtrigger.xml
@@ -3,19 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article>
-  <articleinfo>
-    <title>xmlto</title>
-    <author>
-      <firstname>Kay</firstname>
-      <surname>Sievers</surname>
-      <email>kay.sievers@vrfy.org</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Kay Sievers</holder>
-    </copyright>
-  </articleinfo>
-
   <section>
     <title>udevtrigger</title>
     <refentry>
@@ -28,6 +15,7 @@
       <refmeta>
         <refentrytitle>udevtrigger</refentrytitle>
         <manvolnum>8</manvolnum>
+        <refmiscinfo class="version"></refmiscinfo>
       </refmeta>
 
       <refnamediv>