Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.739
diff -u -2 -0 -r1.739 ChangeLog
--- xc/ChangeLog	1 Feb 2005 22:27:00 -0000	1.739
+++ xc/ChangeLog	1 Feb 2005 22:52:12 -0000
@@ -1,20 +1,32 @@
+2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/xmore/xmore.man
+	* xc/programs/xmore/xmore.sgml
+	Bugzilla #2410 (https://bugs.freedesktop.org/show_bug.cgi?id=2410)
+	attachment #1786 (https://bugs.freedesktop.org/attachment.cgi?id=1786):
+	Fix formatting problem in the xmore(1x) manual page.
+	Patch by Matthieu Herrb <matthieu.herrb@laas.fr> and Roland Mainz
+	<roland.mainz@nrubsig.org>.
+	Approved in the 2005-01-31 Xorg release-wranglers phone call (the
+	xmore.man diff is an automatic update from the DocBook--->man
+	conversion).
+
 2005-02-01  Adam Jackson  <ajax@freedesktop.org>
 
 	* config/cf/Imake.rules:
 	* config/cf/Imake.tmpl:
 	Bug #1054: dlloader modules need to statically link against libgcc.
 
 2005-02-01 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
 	Check return value of i830InitDma() and fail to initialize the DRI
 	if that fails.
 	Also, check the DRM module name that it matches i915 and not the
 	older i830 driver which some people were still trying to use
 	and was causing Dma Initialization failures and lockups.
 
 2005-02-01  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* xc/programs/Xserver/xkb/ddxLoad.c
 	* xc/programs/Xserver/xkb/ddxList.c:
 	Bugzilla #2245 (https://bugs.freedesktop.org/show_bug.cgi?id=2245)
 	attachment #1649 (https://bugs.freedesktop.org/attachment.cgi?id=1649):
Index: xc/programs/xmore/xmore.man
===================================================================
RCS file: /cvs/xorg/xc/programs/xmore/xmore.man,v
retrieving revision 1.1
diff -u -2 -0 -r1.1 xmore.man
--- xc/programs/xmore/xmore.man	24 May 2004 03:17:44 -0000	1.1
+++ xc/programs/xmore/xmore.man	1 Feb 2005 22:53:46 -0000
@@ -1,25 +1,23 @@
-.\" 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 "XMORE" "__mansuffix__" "24 May 2004" "" ""
+.\" -*- coding: us-ascii -*-
+.TH xmore __appmansuffix__ "1 February 2005"  
 .SH NAME
 xmore \- plain text display program for the X Window System
 .SH SYNOPSIS
-
-\fBxmore\fR [ \fB\fIfilename\fB\fR] 
-
-.SH "DESCRIPTION"
-.PP
-\fBxmore\fR is a plain text browser.
-.SH "ENVIRONMENT"
-.TP
-\fBXPSERVERLIST \fR
+.ad l
+\fBxmore\fR \kx
+.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
+'in \n(.iu+\nxu
+[\fB\fBfilename\fR\fR]
+'in \n(.iu-\nxu
+.ad b
+.SH DESCRIPTION
+xmore is a plain text browser.
+.SH ENVIRONMENT
+.TP 
+\fBXPSERVERLIST\fR 
 \fB${XPSERVERLIST}\fR must be set,
 identifying the available Xprint servers.
 See \fBXprint\fR(__miscmansuffix__)
 for more details.
 .SH "SEE ALSO"
-.PP
-\fBX11\fR(__miscmansuffix__), \fBxman\fR(__mansuffix__)
+\fBX11\fR(__miscmansuffix__), \fBxman\fR(__appmansuffix__)
Index: xc/programs/xmore/xmore.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/xmore/xmore.sgml,v
retrieving revision 1.1
diff -u -2 -0 -r1.1 xmore.sgml
--- xc/programs/xmore/xmore.sgml	24 May 2004 03:17:44 -0000	1.1
+++ xc/programs/xmore/xmore.sgml	1 Feb 2005 22:53:49 -0000
@@ -1,38 +1,39 @@
-<!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/__misc
+mansuffix__/${MISCMANSUFFIX}/g"
 assuming that env vars like MANSUFFIX etc. have been set to the matching
 manual volume numbers.
   -->
 
 <refentry>
   <refmeta>
     <refentrytitle>xmore</refentrytitle>
-    <manvolnum>__mansuffix__</manvolnum>
+    <manvolnum>__appmansuffix__</manvolnum>
   </refmeta>
   <refnamediv>
     <refname>xmore</refname>
 
     <refpurpose>plain text display program for the X Window System</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>xmore</command>
 
       <arg><option><replaceable>filename</replaceable></option></arg>     
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
 
     <para><command>xmore</command> is a plain text browser.
     </para>
 
   </refsect1>
@@ -55,28 +56,28 @@
     </variablelist>
   </refsect1>
 
 <!-- not yet
   <refsect1>
     <title>KNOWN BUGS</title>
     <para>
     </para>
   </refsect1>
 -->
 
   <refsect1>
     <title>SEE ALSO</title>
     <para>
       <simplelist type="inline">
         <!-- specific references -->
         <!-- none -->
         
         <!-- Xprint general references -->
         <member><citerefentry><refentrytitle>X11</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xman</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xman</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
       </simplelist>
     </para>
   </refsect1>
 
 </refentry>