Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1557 - Update

    DocBook SGML+XML manual pages and docmentation and the in-tree copies
    of the generated files (*.man, *.html) to get them properly working
    with newer versions of the tools within the Xorg tree.

2 files changed, 38 insertions, 41 deletions

diff --git a/xpxmhelloworld/xpxmhelloworld.man b/xpxmhelloworld/xpxmhelloworld.man
index 5bf7f81..768d413 100644
--- a/xpxmhelloworld/xpxmhelloworld.man
+++ b/xpxmhelloworld/xpxmhelloworld.man
@@ -1,46 +1,43 @@
-.\" This manpage has been automatically generated by docbook2man 
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-.\" Please send any bug reports, improvements, comments, patches, 
-.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "XPXMHELLOWORLD" "__mansuffix__" "13 February 2004" "" ""
+.\" -*- coding: us-ascii -*-
+.TH xpxmhelloworld __appmansuffix__ "8 October 2004"  
 .SH NAME
-xpxmhelloworld \- \&"Hello World\&"-like Xprint sample utility based on the Motif2 toolkit
+xpxmhelloworld \- "Hello World"-like Xprint sample utility based on the Motif2 toolkit
 .SH SYNOPSIS
-
-\fBxpxmhelloworld\fR [ \fB-print\fR]  [ \fB-printer \fIprinternname\fB\fR]  [ \fB-v\fR]  [ \fB-h\fR]  \fB\fIstring\fB\fR\fI ...\fR
-
-.SH "DESCRIPTION"
-.PP
-\fBxpxmhelloworld\fR is a sample utility for Xprint, the
+.ad l
+\fBxpxmhelloworld\fR \kx
+.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
+'in \n(.iu+\nxu
+[\fB\-print\fR] [\fB\-printer \fBprinternname\fR\fR] [\fB\-v\fR] [\fB\-h\fR] \fBstring\fR \&...
+'in \n(.iu-\nxu
+.ad b
+.SH DESCRIPTION
+xpxmhelloworld is a sample utility for Xprint, the
 printing system for the X Window system. It demonstrates how to send a test page to
 the specified printer (or the default printer, if none is specified) based on
 the Motif2 toolkit using the
 \fBXmPrintShell\fR(__libmansuffix__)
 widget class.
-.SH "OPTIONS"
-.TP
-\fB-print \fR
+.SH OPTIONS
+.TP 
+\fB\-print\fR 
 Print (default is to display on the video Xserver)
-.TP
-\fB-printer \fIprinternname\fB \fR
+.TP 
+\fB\-printer \fIprinternname\fB\fR 
 printer to use
-.TP
-\fB-v \fR
+.TP 
+\fB\-v\fR 
 verbose output
-.TP
-\fB-h \fR
+.TP 
+\fB\-h\fR 
 print usage
-.SH "ENVIRONMENT"
-.TP
-\fBXPSERVERLIST \fR
+.SH ENVIRONMENT
+.TP 
+\fBXPSERVERLIST\fR 
 \fB${XPSERVERLIST}\fR must be set,
 identifying the available Xprint servers.
 See \fBXprint\fR(__miscmansuffix__)
 for more details.
 .SH "KNOWN BUGS"
-.PP
-A full list of bugs can be obtained from the Xprint.org bug database (http://xprint.mozdev.org/xprint_bugs.html <URL:http://xprint.mozdev.org/xprint_bugs.html>).
+A full list of bugs can be obtained from the Xprint.org bug database (http://xprint.mozdev.org/xprint_bugs.html).
 .SH "SEE ALSO"
-.PP
-http://nscp.upenn.edu/aix4.3html/libs/motiftr/XmPrintShell.htm <URL:http://nscp.upenn.edu/aix4.3html/libs/motiftr/XmPrintShell.htm>, http://nscp.upenn.edu/aix4.3html/libs/motiftr/XmText.htm <URL:http://nscp.upenn.edu/aix4.3html/libs/motiftr/XmText.htm>, \fBXprint\fR(__miscmansuffix__), \fBX11\fR(__miscmansuffix__), \fBxplsprinters\fR(__mansuffix__), \fBxphelloworld\fR(__mansuffix__), \fBxpawhelloworld\fR(__mansuffix__), \fBxpxthelloworld\fR(__mansuffix__), \fBxpsimplehelloworld\fR(__mansuffix__), \fBXserver\fR(__mansuffix__), \fBXprt\fR(__mansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html <URL:http://xprint.mozdev.org/docs/Xprint_FAQ.html>), Xprint main site (http://xprint.mozdev.org/ <URL:http://xprint.mozdev.org/>)
+http://nscp.upenn.edu/aix4.3html/libs/motiftr/XmPrintShell.htm, http://nscp.upenn.edu/aix4.3html/libs/motiftr/XmText.htm, \fBXprint\fR(__miscmansuffix__), \fBX11\fR(__miscmansuffix__), \fBxplsprinters\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBXserver\fR(__appmansuffix__), \fBXprt\fR(__appmansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html), Xprint main site (http://xprint.mozdev.org/)
diff --git a/xpxmhelloworld/xpxmhelloworld.sgml b/xpxmhelloworld/xpxmhelloworld.sgml
index d3ae5cf..e53c521 100644
--- a/xpxmhelloworld/xpxmhelloworld.sgml
+++ b/xpxmhelloworld/xpxmhelloworld.sgml
@@ -1,13 +1,13 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" '/usr/share/sgml/docbook_4.2/docbook.dtd'>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" 'http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd'>
 
 <!-- Process this file with DocBook tools to generate the output format
 (such as manual pages or HTML documents).
 
-Note that strings like __mansuffix__, __filemansuffix__, __libmansuffix__,
+Note that strings like __appmansuffix__, __filemansuffix__, __libmansuffix__,
 __miscmansuffix__ etc. have to be replaced first (in theory that's the
 job of ENTITIES but some XML tools are highly allergic to such stuff... ;-().
 A quick way to do that is to filter this document via
-/usr/bin/sed "s/__mansuffix__/${MANSUFFIX}/g;s/__filemansuffix__/${FILEMANSUFFIX}/g;s/__libmansuffix__/${LIBMANSUFFIX}/g;s/__miscmansuffix__/${MISCMANSUFFIX}/g"
+/usr/bin/sed "s/__appmansuffix__/${MANSUFFIX}/g;s/__filemansuffix__/${FILEMANSUFFIX}/g;s/__libmansuffix__/${LIBMANSUFFIX}/g;s/__miscmansuffix__/${MISCMANSUFFIX}/g"
 assuming that env vars like MANSUFFIX etc. have been set to the matching
 manual volume numbers.
   -->
@@ -15,7 +15,7 @@ manual volume numbers.
 <refentry>
   <refmeta>
     <refentrytitle>xpxmhelloworld</refentrytitle>
-    <manvolnum>__mansuffix__</manvolnum>
+    <manvolnum>__appmansuffix__</manvolnum>
   </refmeta>
   <refnamediv>
     <refname>xpxmhelloworld</refname>
@@ -121,16 +121,16 @@ manual volume numbers.
         <!-- Xprint general references -->
         <member><citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>X11</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xplsprinters</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xphelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xplsprinters</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xphelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
 <!--
-        <member><citerefentry><refentrytitle>xpxmhelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xpxmhelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
 -->
-        <member><citerefentry><refentrytitle>xpawhelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xpxthelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xpsimplehelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>Xserver</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>Xprt</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xpawhelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xpxthelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xpsimplehelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>Xserver</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>Xprt</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
         <!-- ToDO: Add manual pages for the single Xprint DDX implementations (PostScript/PDF/PCL/PCL-MONO/Raster/etc.) -->
         <member><citerefentry><refentrytitle>libXp</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>libXprintUtils</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>