Attachment 1811 Details for Bug 2415 – Updated patch for 2005-02-01-trunk, including automated xmore.man update and Changelog diff

[patch] Updated patch for 2005-02-01-trunk, including automated xmore.man update and Changelog diff

patch.gudiff (text/plain), 6.02 KB, created by Roland Mainz on 2005-02-01 14:58:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2005-02-01 14:58:27 UTC

Size: 6.02 KB

patch

obsolete

>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'>
> 
> 
> 
> <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>
> 
> 
> 
>   <refsect1>
>     <title>SEE ALSO</title>
>     <para>
>       <simplelist type="inline">
>         
>         
>         
>         
>         <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>
> 
>

Actions: View | Splinter Review

Attachments on bug 2415: 1786 | 1811

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.