Move nbd-trdump.8 to nbd-trdump.1, where it belongs.

diff --git a/autogen.sh b/autogen.sh
index 0719077..a8fbf14 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -ex
 #!/bin/sh
 set -ex

-make -C man -f Makefile.am nbd-server.1.sh.in nbd-server.5.sh.in nbd-client.8.sh.in nbd-trdump.8.sh.in
+make -C man -f Makefile.am nbd-server.1.sh.in nbd-server.5.sh.in nbd-client.8.sh.in nbd-trdump.1.sh.in

 exec autoreconf -f -i
 exec autoreconf -f -i

diff --git a/configure.ac b/configure.ac
index 3c29625..e928aa3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,6 @@ AC_TYPE_PID_T
 nbd_server_CPPFLAGS=$nbd_server_CPPFLAGS" -DSYSCONFDIR='\"$sysconfdir\"'"
 AC_SUBST(nbd_server_CPPFLAGS)
 AC_CONFIG_HEADERS([config.h])
 nbd_server_CPPFLAGS=$nbd_server_CPPFLAGS" -DSYSCONFDIR='\"$sysconfdir\"'"
 AC_SUBST(nbd_server_CPPFLAGS)
 AC_CONFIG_HEADERS([config.h])

-AC_CONFIG_FILES([Makefile doc/Doxyfile man/Makefile man/nbd-client.8.sh man/nbd-server.5.sh man/nbd-server.1.sh man/nbd-trdump.8.sh])
+AC_CONFIG_FILES([Makefile doc/Doxyfile man/Makefile man/nbd-client.8.sh man/nbd-server.5.sh man/nbd-server.1.sh man/nbd-trdump.1.sh])

 AC_OUTPUT
 
 AC_OUTPUT
 

diff --git a/man/Makefile.am b/man/Makefile.am
index 2d1de20..10d244f 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,8 +1,8 @@
-man_MANS = nbd-server.1 nbd-server.5 nbd-client.8 nbd-trdump.8
+man_MANS = nbd-server.1 nbd-server.5 nbd-client.8 nbd-trdump.1

 CLEANFILES = manpage.links manpage.refs
 CLEANFILES = manpage.links manpage.refs

-DISTCLEANFILES = nbd-server.1 nbd-client.8 nbd-server.5 nbd-trdump.8
-MAINTAINERCLEANFILES = nbd-server.1.sh.in nbd-client.8.sh.in nbd-server.5.sh.in nbd-trdump.8.sh.in
-EXTRA_DIST = nbd-server.1.in.sgml nbd-client.8.in.sgml nbd-server.5.in.sgml nbd-trdump.8.in.sgml nbd-server.1.sh.in nbd-server.5.sh.in nbd-client.8.sh.in nbd-trdump.8.sh.in sh.tmpl
+DISTCLEANFILES = nbd-server.1 nbd-client.8 nbd-server.5 nbd-trdump.1
+MAINTAINERCLEANFILES = nbd-server.1.sh.in nbd-client.8.sh.in nbd-server.5.sh.in nbd-trdump.1.sh.in
+EXTRA_DIST = nbd-server.1.in.sgml nbd-client.8.in.sgml nbd-server.5.in.sgml nbd-trdump.1.in.sgml nbd-server.1.sh.in nbd-server.5.sh.in nbd-client.8.sh.in nbd-trdump.1.sh.in sh.tmpl

 
 nbd-server.1: nbd-server.1.sh
        sh nbd-server.1.sh > nbd-server.1
 
 nbd-server.1: nbd-server.1.sh
        sh nbd-server.1.sh > nbd-server.1

@@ -10,8 +10,8 @@ nbd-server.5: nbd-server.5.sh
        sh nbd-server.5.sh > nbd-server.5
 nbd-client.8: nbd-client.8.sh
        sh nbd-client.8.sh > nbd-client.8
        sh nbd-server.5.sh > nbd-server.5
 nbd-client.8: nbd-client.8.sh
        sh nbd-client.8.sh > nbd-client.8

-nbd-trdump.8: nbd-trdump.8.sh
-       sh nbd-trdump.8.sh > nbd-trdump.8
+nbd-trdump.1: nbd-trdump.1.sh
+       sh nbd-trdump.1.sh > nbd-trdump.1

 nbd-server.1.sh.in: nbd-server.1.in.sgml sh.tmpl
        LC_ALL=C docbook2man nbd-server.1.in.sgml
        cat sh.tmpl > nbd-server.1.sh.in
 nbd-server.1.sh.in: nbd-server.1.in.sgml sh.tmpl
        LC_ALL=C docbook2man nbd-server.1.in.sgml
        cat sh.tmpl > nbd-server.1.sh.in

@@ -30,9 +30,9 @@ nbd-server.5.sh.in: nbd-server.5.in.sgml sh.tmpl
        cat NBD-SERVER.5 >> nbd-server.5.sh.in
        echo "EOF" >> nbd-server.5.sh.in
        rm NBD-SERVER.5
        cat NBD-SERVER.5 >> nbd-server.5.sh.in
        echo "EOF" >> nbd-server.5.sh.in
        rm NBD-SERVER.5

-nbd-trdump.8.sh.in: nbd-trdump.8.in.sgml sh.tmpl
-       LC_ALL=C docbook2man nbd-trdump.8.in.sgml
-       cat sh.tmpl > nbd-trdump.8.sh.in
-       cat NBD-TRDUMP.8 >> nbd-trdump.8.sh.in
-       echo "EOF" >> nbd-trdump.8.sh.in
-       rm NBD-TRDUMP.8
+nbd-trdump.1.sh.in: nbd-trdump.1.in.sgml sh.tmpl
+       LC_ALL=C docbook2man nbd-trdump.1.in.sgml
+       cat sh.tmpl > nbd-trdump.1.sh.in
+       cat NBD-TRDUMP.1 >> nbd-trdump.1.sh.in
+       echo "EOF" >> nbd-trdump.1.sh.in
+       rm NBD-TRDUMP.1

diff --git a/man/nbd-trdump.1.in.sgml b/man/nbd-trdump.1.in.sgml
new file mode 100644 (file)
index 0000000..4e58617
--- /dev/null
+++ b/man/nbd-trdump.1.in.sgml
@@ -0,0 +1,143 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+       docbook-to-man $< > $@
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Wouter</firstname>">
+  <!ENTITY dhsurname   "<surname>Verhelst</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>$Date$</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>wouter@debian.org</email>">
+  <!ENTITY dhusername  "Wouter Verhelst">
+  <!ENTITY dhucpackage "<refentrytitle>NBD-TRDUMP</refentrytitle>">
+  <!ENTITY dhpackage   "nbd-trdump">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>translate an nbd transaction log into human readable form</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&dhpackage;</command> translates
+    a transaction log produced by <command>nbd-server</command>
+    (specifically by the <command>transactionlog</command>
+    configuration directive) into human readable form.</para>
+
+    <para>The command acts as a traditional UNIX filter, i.e. the
+    transaction log must be supplied on standard input, and the
+    human readable output is sent to standard output.</para>
+  </refsect1>
+  <refsect1>
+    <title>OUTPUT</title>
+
+    <para>The following may be output:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><option>&gt;</option></term>
+       <listitem>
+         <para>A request packet sent from the client to the server.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><option>&lt;</option></term>
+       <listitem>
+         <para>A reply packet sent from the server to the client.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><option>H</option></term>
+       <listitem>
+         <para>The handle of the packet.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><option>C</option></term>
+       <listitem>
+         <para>The command sent.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><option>O</option></term>
+       <listitem>
+         <para>The offet from the start of the disk.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><option>L</option></term>
+       <listitem>
+         <para>The length of data.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><option>E</option></term>
+       <listitem>
+         <para>The error returned.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>nbd-server (1).</para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+    <para>The NBD kernel module and the NBD tools have been written by
+    Pavel Macheck (pavel@ucw.cz).</para>
+
+    <para>The kernel module is now maintained by Paul Clements
+    (Paul.Clements@steeleye.com), while the userland tools are maintained by
+    Wouter Verhelst (wouter@debian.org)</para>
+
+    <para>This manual page was written by &dhusername; (&dhemail;) for
+    the &debian; system (but may be used by others).  Permission is
+    granted to copy, distribute and/or modify this document under the
+    terms of the <acronym>GNU</acronym> General Public License,
+    version 2, as published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>

diff --git a/man/nbd-trdump.8.in.sgml b/man/nbd-trdump.8.in.sgml
deleted file mode 100644 (file)
index d047f59..0000000
--- a/man/nbd-trdump.8.in.sgml
+++ /dev/null
@@ -1,143 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-       docbook-to-man $< > $@
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Wouter</firstname>">
-  <!ENTITY dhsurname   "<surname>Verhelst</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>$Date$</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>wouter@debian.org</email>">
-  <!ENTITY dhusername  "Wouter Verhelst">
-  <!ENTITY dhucpackage "<refentrytitle>NBD-TRDUMP</refentrytitle>">
-  <!ENTITY dhpackage   "nbd-trdump">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>translate an nbd transaction log into human readable form</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> translates
-    a transaction log produced by <command>nbd-server</command>
-    (specifically by the <command>transactionlog</command>
-    configuration directive) into human readable form.</para>
-
-    <para>The command acts as a traditional UNIX filter, i.e. the
-    transaction log must be supplied on standard input, and the
-    human readable output is sent to standard output.</para>
-  </refsect1>
-  <refsect1>
-    <title>OUTPUT</title>
-
-    <para>The following may be output:</para>
-
-    <variablelist>
-      <varlistentry>
-       <term><option>&gt;</option></term>
-       <listitem>
-         <para>A request packet sent from the client to the server.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>&lt;</option></term>
-       <listitem>
-         <para>A reply packet sent from the server to the client.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>H</option></term>
-       <listitem>
-         <para>The handle of the packet.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>C</option></term>
-       <listitem>
-         <para>The command sent.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>O</option></term>
-       <listitem>
-         <para>The offet from the start of the disk.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>L</option></term>
-       <listitem>
-         <para>The length of data.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>E</option></term>
-       <listitem>
-         <para>The error returned.</para>
-       </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>nbd-server (1).</para>
-
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-    <para>The NBD kernel module and the NBD tools have been written by
-    Pavel Macheck (pavel@ucw.cz).</para>
-
-    <para>The kernel module is now maintained by Paul Clements
-    (Paul.Clements@steeleye.com), while the userland tools are maintained by
-    Wouter Verhelst (wouter@debian.org)</para>
-
-    <para>This manual page was written by &dhusername; (&dhemail;) for
-    the &debian; system (but may be used by others).  Permission is
-    granted to copy, distribute and/or modify this document under the
-    terms of the <acronym>GNU</acronym> General Public License,
-    version 2, as published by the Free Software Foundation.</para>
-
-  </refsect1>
-</refentry>