Put manual pages in reference section of main Docbook. Ensure metaproxy(1)

manual page is first in list.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index de174df..94a3671 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,15 +1,15 @@
-## $Id: Makefile.am,v 1.26 2006-09-07 09:00:09 adam Exp $
+## $Id: Makefile.am,v 1.27 2006-09-07 10:00:43 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
 
 SUFFIXES=.3mp .1
 
-XMLFILES = book.xml manref.xml progref.xml copyright.xml metaproxy.xml
+XMLFILES = book.xml manref.xml copyright.xml
 
 MAINXML = $(srcdir)/book.xml
 
-XMLMAN = auth_simple.xml backend_test.xml frontend_net.xml \
+XMLMAN = metaproxy.xml auth_simple.xml backend_test.xml frontend_net.xml \
        http_file.xml log.xml multi.xml query_rewrite.xml \
        session_shared.xml template.xml virt_db.xml z3950_client.xml
 MANFILES = auth_simple.3mp backend_test.3mp frontend_net.3mp \
@@ -50,16 +50,12 @@ metaproxy.pdf: $(XMLFILES) multi.pdf
        pdfjadetex metaproxy.tex >/dev/null
        pdfjadetex metaproxy.tex >/dev/null
 
-manref.xml: $(XMLMAN) $(srcdir)/common/ref2dbinc.xsl
+manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
        rm -f manref.xml
        for i in $(XMLMAN); do \
-               xsltproc $(srcdir)/common/ref2dbinc.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
+               xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
        done
 
-progref.xml: metaproxy.xml
-       rm -f $@
-       xsltproc $(srcdir)/common/ref2dbinc.xsl $? | sed 1d >> $@
-
 multi.png: multi.svg
        inkscape --export-png=$@ --export-width=800 --export-area-drawing $?
 

diff --git a/doc/book.xml b/doc/book.xml
index be53892..406e7bf 100644 (file)
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -17,7 +17,7 @@
      -->
      <!NOTATION PDF SYSTEM "PDF">
 ]>
-<!-- $Id: book.xml,v 1.36 2006-09-07 09:42:53 mike Exp $ -->
+<!-- $Id: book.xml,v 1.37 2006-09-07 10:00:43 adam Exp $ -->
 <book id="metaproxy">
  <bookinfo>
   <title>Metaproxy - User's Guide and Reference</title>
@@ -27,6 +27,9 @@
   <author>
    <firstname>Adam</firstname><surname>Dickmeiss</surname>
   </author>
+  <author>
+   <firstname>Marc</firstname><surname>Cromme</surname>
+  </author>
   <copyright>
    <year>2006</year>
    <holder>Index Data ApS</holder>
@@ -1690,31 +1693,20 @@ Z>
    </para>
   </section>
  </chapter>
-
-
-
- <chapter id="refguide">
+ 
+ 
+ 
+ <reference id="refguide">
   <title>Reference guide</title>
-  <para>
-   The material in this chapter is drawn directly from the individual
-   manual entries.  In particular, the Metaproxy invocation section is
-   available using <command>man metaproxy</command>, and the section
-   on each individual filter is available using the name of the filter
-   as the argument to the <command>man</command> command.
-  </para>
-
-
-  <section id="progref">
-   <title>Metaproxy invocation</title>
-   &progref;
-  </section>
-
-
-  <section id="filterref">
-   <title>Reference guide to Metaproxy filters</title>
-   &manref;
-  </section>
- </chapter>
+    <para>
+     The material in this chapter is drawn directly from the individual
+     manual entries.  In particular, the Metaproxy invocation section is
+     available using <command>man metaproxy</command>, and the section
+     on each individual filter is available using the name of the filter
+     as the argument to the <command>man</command> command.
+    </para>
+    &manref;
+ </reference>
 </book>
 
  <!-- Keep this comment at the end of the file