Import changes from XORG-6.8.2CYGWIN-6_8_2-MERGECYGWIN

2 files changed, 65 insertions, 53 deletions

diff --git a/xplsprinters.man b/xplsprinters.man
index 7330b3f..57220b5 100644
--- a/xplsprinters.man
+++ b/xplsprinters.man
@@ -1,48 +1,46 @@
-.\" 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 "XPLSPRINTERS" "__mansuffix__" "29 June 2004" "" ""
+.\" -*- coding: us-ascii -*-
+.TH xplsprinters __appmansuffix__ "8 October 2004"  
 .SH NAME
 xplsprinters \- shows a list of Xprint printers and it's attributes
 .SH SYNOPSIS
-
-\fBxplsprinters\fR [ \fB-printer \fIprintername\fB\fR]  [ \fB-d\fR]  [ \fB-l\fR]  [ \fB-dump\fR]  [ \fB-h\fR] 
-
-.SH "DESCRIPTION"
-.PP
-\fBxplsprinters\fR is a utility for Xprint, the
+.ad l
+\fBxplsprinters\fR \kx
+.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
+'in \n(.iu+\nxu
+[\fB\-printer \fBprintername\fR\fR] [\fB\-d\fR] [\fB\-l\fR] [\fB\-dump\fR] [\fB\-h\fR]
+'in \n(.iu-\nxu
+.ad b
+.SH DESCRIPTION
+xplsprinters is a utility for Xprint, the
 printing system for the X Window system. It can deliver both a list
 of printers and attributes supported for a specific list of
 printers.
-.SH "OPTIONS"
-.TP
-\fB-printer \fIprintername\fB \fR
+.SH OPTIONS
+.TP 
+\fB\-printer \fIprintername\fB\fR 
 printer to use
-.TP
-\fB-dump \fR
+.TP 
+\fB\-dump\fR 
 dump all available printer attributes
-.TP
-\fB-h | -? \fR
+.TP 
+\fB\-h | \-?\fR 
 print usage
-.TP
-\fB-d \fR
+.TP 
+\fB\-d\fR 
 print description for each printer
-.TP
-\fB-l \fR
+.TP 
+\fB\-l\fR 
 list detailed printer attribute information
-.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 "EXAMPLES"
-.SS "LIST ALL AVAILABLE \&"X PRINT SPECIFIERS\&" (PRINTER NAMES)"
+.SH EXAMPLES
+\fBList all available "X Print Specifiers" (printer names)\fR
 .PP
-
 .nf
 % \fBxplsprinters\fR
 .fi
@@ -56,24 +54,26 @@ printer: laser19@meridian:19
 printer: xp_ps_spooldir_tmp_Xprintjobs@meridian:19
 printer: xp_pdf_spooldir_tmp_Xprintjobs@meridian:19
 .fi
-.SS "GET INFORMATION ABOUT THE SUPPORTED ATTRIBUTES OF PRINTER \&"PS002\&":"
-.PP
 
+.PP
+\fBGet information about the supported attributes of printer "ps002":\fR
+.PP
 .nf
-% \fBxplsprinters -printer ps002 -l\fR
+% \fBxplsprinters \-printer ps002 \-l\fR
 .fi
 .PP
 would print:
 
 .nf
+
 printer: ps002@castor:18
         description=
-        model-identifier=HPDJ1600C
-        default-medium=iso-a4
-        default-input-tray=
-        medium-source-sizes-supported=iso-a4 false 6.35 203.65 6.35 290.65
-        medium-source-sizes-supported=na-letter false 6.35 209.55 6.35 273.05
-        default-printer-resolution=300
+        model\-identifier=HPDJ1600C
+        default\-medium=iso\-a4
+        default\-input\-tray=
+        medium\-source\-sizes\-supported=iso\-a4 false 6.35 203.65 6.35 290.65
+        medium\-source\-sizes\-supported=na\-letter false 6.35 209.55 6.35 273.05
+        default\-printer\-resolution=300
         resolution=300
         default_orientation=
         orientation=portrait
@@ -81,6 +81,9 @@ printer: ps002@castor:18
         default_plex=
         plex=simplex
 .fi
+
+.SH NOTES
+The list of builtin fonts supported by a printer can be obtained
+using the xlsfonts command.
 .SH "SEE ALSO"
-.PP
-\fBXprint\fR(__miscmansuffix__), \fBX11\fR(__miscmansuffix__), \fBxprehashprinterlist\fR(__mansuffix__), \fBxphelloworld\fR(__mansuffix__), \fBxpxmhelloworld\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/>)
+\fBXprint\fR(__miscmansuffix__), \fBX11\fR(__miscmansuffix__), \fBxprehashprinterlist\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpxmhelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBxlsfonts\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/xplsprinters.sgml b/xplsprinters.sgml
index 206b2ce..57f267e 100644
--- a/xplsprinters.sgml
+++ b/xplsprinters.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>xplsprinters</refentrytitle>
-    <manvolnum>__mansuffix__</manvolnum>
+    <manvolnum>__appmansuffix__</manvolnum>
   </refmeta>
 
   <refnamediv>
@@ -151,6 +151,14 @@ printer: ps002@castor:18
   </refsect1>
 
   <refsect1>
+    <title>NOTES</title>
+    <para>
+      The list of builtin fonts supported by a printer can be obtained
+      using the <command>xlsfonts</command> command.
+    </para>
+  </refsect1>
+
+  <refsect1>
     <title>SEE ALSO</title>
     <para>
       <simplelist type="inline">
@@ -161,16 +169,17 @@ printer: ps002@castor:18
         <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>xplsprinters</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
 -->
-        <member><citerefentry><refentrytitle>xprehashprinterlist</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xphelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xpxmhelloworld</refentrytitle><manvolnum>__mansuffix__</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>xprehashprinterlist</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xphelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xpxmhelloworld</refentrytitle><manvolnum>__appmansuffix__</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>xlsfonts</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>