X Strike Force XFree86 SVN commit: r1712 - in trunk/debian: . patches
Author: branden
Date: 2004-08-02 22:34:12 -0500 (Mon, 02 Aug 2004)
New Revision: 1712
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
Log:
Update manpage cross-references to refer to XF86Config-4(5x) instead of
XF86Config(5x), and add brief explanatory note to top of XF86Config-4(5x)
(patch #911).
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-03 03:30:11 UTC (rev 1711)
+++ trunk/debian/CHANGESETS 2004-08-03 03:34:12 UTC (rev 1712)
@@ -239,4 +239,9 @@
(Closes: #257440)
1711
+Update manpage cross-references to refer to XF86Config-4(5x) instead of
+XF86Config(5x), and add brief explanatory note to top of XF86Config-4(5x)
+(patch #911).
+ 1712
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-03 03:30:11 UTC (rev 1711)
+++ trunk/debian/changelog 2004-08-03 03:34:12 UTC (rev 1712)
@@ -175,6 +175,10 @@
manpages (e.g. radeon(4x)), and fix some typos (patch #099e).
(Closes: #257440)
+ * Update manpage cross-references to refer to XF86Config-4(5x) instead of
+ XF86Config(5x), and add brief explanatory note to top of XF86Config-4(5x)
+ (patch #911).
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -207,7 +211,7 @@
* Get glxinfo to link properly with g++ (instead of adding -lstdc++).
- -- Branden Robinson <branden@debian.org> Mon, 2 Aug 2004 22:11:52 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 2 Aug 2004 22:32:25 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
===================================================================
--- trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2004-08-03 03:30:11 UTC (rev 1711)
+++ trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2004-08-03 03:34:12 UTC (rev 1712)
@@ -1,5 +1,7 @@
$Id$
+[Do not recode this file!]
+
Debian preferentially uses the name XF86Config-4 for the XFree86 4.x X
server configuration file. This is for two reasons:
1) The XF86Config file format changed from XFree86 3.x to 4.x, and it's
@@ -12,28 +14,43 @@
This patch by Branden Robinson.
---- xc/programs/Xserver/hw/xfree86/XF86Config.man~ 2003-08-01 15:38:20.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/XF86Config.man 2003-08-01 15:39:38.000000000 -0500
-@@ -1,13 +1,13 @@
+diff -urN xc/programs/Xserver/hw/xfree86~/XF86Config.man xc/programs/Xserver/hw/xfree86/XF86Config.man
+--- xc/programs/Xserver/hw/xfree86~/XF86Config.man 2004-08-02 16:46:08.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/XF86Config.man 2004-08-02 17:24:09.000000000 -0500
+@@ -1,14 +1,28 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.man,v 1.14 2003/02/26 18:59:49 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH XF86Config __filemansuffix__ __vendorversion__
-+.TH XF86Config-4 __filemansuffix__ __vendorversion__
++.TH XF86Config\-4 __filemansuffix__ __vendorversion__
.SH NAME
--XF86Config - Configuration File for XFree86
-+XF86Config-4 - Configuration File for XFree86
+-XF86Config \- configuration file for XFree86 X server
++XF86Config\-4 \- configuration file for XFree86 X server
.SH DESCRIPTION
- .I XFree86
--uses a configuration file called
--.B XF86Config
-+(version 4.x) uses a configuration file called
-+.B XF86Config-4
- for its initial setup. This configuration file is searched for in the
- following places when the server is started as a normal user:
+ .B XFree86
+ uses a configuration file called
+ .I XF86Config
+ for its initial setup.
++.PP
++(On the Debian system, the name
++.I XF86Config\-4
++is preferred to
++.I XF86Config
++so that XFree86
++.RI 3. x
++X servers can be installed on the system simultaneously with the XFree86
++.RI 4. x
++X server.
++This manual page documents the configuration file for version
++.RI 4. x
++of the XFree86 X server.)
++.PP
+ This configuration file is searched for in the following places when the
+ server is started as a normal user:
.PP
---- xc/programs/Xserver/hw/xfree86/XFree86.man~ 2004-03-26 19:34:38.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/XFree86.man 2004-03-26 19:34:44.000000000 -0500
+diff -urN xc/programs/Xserver/hw/xfree86~/XFree86.man xc/programs/Xserver/hw/xfree86/XFree86.man
+--- xc/programs/Xserver/hw/xfree86~/XFree86.man 2004-08-02 16:46:07.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/XFree86.man 2004-08-02 17:24:09.000000000 -0500
@@ -93,21 +93,24 @@
Allow the server to start up even if the mouse device can't be opened
or initialised. This is equivalent to the
@@ -236,8 +253,1188 @@
apm(__drivermansuffix__),
ati(__drivermansuffix__),
chips(__drivermansuffix__),
---- xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig Tue Jan 14 14:47:33 2003
-+++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c Tue Jan 14 14:47:45 2003
+diff -urN xc/programs/Xserver/hw/xfree86~/doc/man/XF86DGA.man xc/programs/Xserver/hw/xfree86/doc/man/XF86DGA.man
+--- xc/programs/Xserver/hw/xfree86~/doc/man/XF86DGA.man 2004-08-02 16:46:06.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/doc/man/XF86DGA.man 2004-08-02 17:24:09.000000000 -0500
+@@ -196,7 +196,7 @@
+ assigned to the extension.
+ .SH "SEE ALSO"
+ .IR XFree86(__mansuffix__),
+-.IR XF86Config(__filemansuffix__)
++.IR XF86Config-4(__filemansuffix__)
+ .SH AUTHORS
+ Jon Tombs, Harm Hanemaayer, Mark Vojkovich.
+
+diff -urN xc/programs/Xserver/hw/xfree86~/doc/man/XF86Misc.man xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man
+--- xc/programs/Xserver/hw/xfree86~/doc/man/XF86Misc.man 2002-12-21 19:46:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man 2004-08-02 17:24:09.000000000 -0500
+@@ -210,7 +210,7 @@
+ .IP \fBMF_\fP* 1i
+ Mouse flags
+ .SH "SEE ALSO"
+-xset(1), XF86Config(__filemansuffix__)
++xset(1), XF86Config-4(__filemansuffix__)
+ .SH AUTHORS
+ Joe Moss and David Dawes, The XFree86 Project, Inc.
+
+diff -urN xc/programs/Xserver/hw/xfree86~/doc/man/XF86VM.man xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man
+--- xc/programs/Xserver/hw/xfree86~/doc/man/XF86VM.man 2002-12-21 19:46:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man 2004-08-02 17:24:09.000000000 -0500
+@@ -410,6 +410,6 @@
+ functions need to be documented. In the meantime, check the source
+ code for information about how to use them.
+ .SH SEE ALSO
+-XFree86(1), XF86Config(__filemansuffix__), xvidtune(1)
++XFree86(1), XF86Config-4(__filemansuffix__), xvidtune(1)
+ .SH AUTHORS
+ Kaleb Keithley, Jon Tombs, David Dawes, and Joe Moss
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/apm/apm.man xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/apm/apm.man 2002-05-07 07:53:49.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man 2004-08-02 17:24:09.000000000 -0500
+@@ -35,7 +35,7 @@
+ .TP 12
+ .B AT25
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -101,6 +101,6 @@
+ .BI "Option \*qShadowFB\*q \*q" boolean \*q
+ Enable or disable use of the shadow framebuffer layer. Default: off.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/ati/ati.man xc/programs/Xserver/hw/xfree86/drivers/ati/ati.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/ati/ati.man 2004-08-02 16:45:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/ati.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B ati
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/ati/r128.man xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/ati/r128.man 2002-06-04 18:04:50.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man 2004-08-02 17:24:09.000000000 -0500
+@@ -26,7 +26,7 @@
+ driver supports all ATI Rage 128 based video cards including the Rage
+ Fury AGP 32MB, the XPERT 128 AGP 16MB and the XPERT 99 AGP 8MB.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -125,7 +125,7 @@
+ development debug option. Default: off.
+
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ .nf
+ Rickard E. (Rik) Faith \fIfaith@precisioninsight.com\fP
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/ati/radeon.man xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/ati/radeon.man 2004-08-02 16:45:56.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2004-08-02 17:24:09.000000000 -0500
+@@ -68,7 +68,7 @@
+ Radeon 9600XT (2d only)
+
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -311,7 +311,7 @@
+ "k", "kHz", "M", "MHz".
+
+ .SH SEE ALSO
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ .nf
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/chips/chips.man xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/chips/chips.man 2002-01-04 16:22:27.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man 2004-08-02 17:24:09.000000000 -0500
+@@ -77,7 +77,7 @@
+ The DirectColor visual is supported on all color depths except the 8+16
+ overlay mode. Full acceleration is supplied for all chipsets.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -206,7 +206,7 @@
+ rate on the two screens.
+ Default: off.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .PP
+ You are also recommended to read the README.chips file that comes with all
+ XFree86 distributions, which discusses the
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/cirrus/cirrus.man xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/cirrus/cirrus.man 2001-01-27 13:20:47.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B cirrus
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/cyrix/cyrix.man xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/cyrix/cyrix.man 2002-11-06 06:38:59.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,7 +28,7 @@
+ performance on a MediaGX machine pick backgrounds that compress well
+ horizonally.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -69,7 +69,7 @@
+ .PP
+ Hardware cursors are not currently supported.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Richard Hecker, Annius Groenink, Dirk Hohndel, The GGI
+ Project, Alan Cox.
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/fbdev/fbdev.man xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/fbdev/fbdev.man 2001-10-02 10:57:32.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man 2004-08-02 17:24:09.000000000 -0500
+@@ -27,7 +27,7 @@
+ to the kernel
+ device driver. Currently a fbdevhw module is available for linux.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to
+ this driver.
+ .PP
+@@ -56,7 +56,7 @@
+ 90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise,
+ 270 degrees). Implies use of the shadow framebuffer layer. Default: off.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1),
+ X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
+ .SH AUTHORS
+ Authors include: Gerd Knorr, Michel D�er, Geert Uytterhoeven
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/glide/glide.man xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/glide/glide.man 2001-02-07 17:51:56.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man 2004-08-02 17:24:09.000000000 -0500
+@@ -121,7 +121,7 @@
+ .B glide
+ driver supports any board that can be used with Glide (such as 3Dfx Voodoo boards)
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -293,6 +293,6 @@
+ .PP
+ $ xinit -- +xinerama
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Author: Henrik Harmsen.
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/glint/glint.man xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/glint/glint.man 2003-02-14 07:03:09.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man 2004-08-02 17:24:09.000000000 -0500
+@@ -25,7 +25,7 @@
+ GLINT DELTA, GLINT GAMMA2, Permedia, Permedia 2, Permedia 2v, Permedia 3, R3,
+ R4) and Texas Instruments (Permedia, Permedia 2) chips.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -104,7 +104,7 @@
+ If you have a card of the same name, turn this on. Default: off.
+ .TP
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel D�er,
+ Sven Luther
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/i128/i128.man xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/i128/i128.man 2001-01-27 13:20:48.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man 2004-08-02 17:24:09.000000000 -0500
+@@ -34,7 +34,7 @@
+ .B I128-T2R4
+ Ticket 2 Ride IV
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -65,6 +65,6 @@
+ This turns on verbose debug information from the driver.
+ Default: off.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Robin Cutshaw (driver), Galen Brooks (flatpanel support).
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/i740/i740.man xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/i740/i740.man 2001-01-27 13:20:48.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B i740
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/i810/i810.man xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/i810/i810.man 2004-08-02 16:45:57.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,7 +28,7 @@
+ and 865G chipsets.
+
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -135,7 +135,7 @@
+
+
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Keith Whitwell, and also Jonathan Bian, Matthew J Sottek,
+ Jeff Hartmann, Mark Vojkovich, Alan Hourihane, H. J. Lu. 830M and 845G
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/imstt/imstt.man xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/imstt/imstt.man 2001-01-27 13:20:48.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B imstt
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/mga/mga.man xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/mga/mga.man 2004-08-02 16:46:07.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man 2004-08-02 17:24:09.000000000 -0500
+@@ -59,7 +59,7 @@
+ .B G550
+ Millenium G550 and Millenium G550 Dual DVI
+ .SH "CONFIGURATION DETAILS"
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -154,7 +154,7 @@
+ at 16 and 32 bits per pixel.
+ Default: off.
+ .SH "SEE ALSO"
+-XFree86(__mansuffix__), XF86Config(__filemansuffix__),
++XFree86(__mansuffix__), XF86Config-4(__filemansuffix__),
+ xf86config(__mansuffix__), Xserver(__mansuffix__1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Radoslaw Kapitan, Mark Vojkovich, and also David Dawes, Guy
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/neomagic/neomagic.man xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/neomagic/neomagic.man 2003-02-19 22:22:52.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man 2004-08-02 17:24:09.000000000 -0500
+@@ -46,7 +46,7 @@
+ DirectColor visuals are supported in the other depths.
+
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -90,7 +90,7 @@
+ .fi
+
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich,
+ Mark Vojkovich, Alan Hourihane.
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/newport/newport.man xc/programs/Xserver/hw/xfree86/drivers/newport/newport.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/newport/newport.man 2003-02-17 18:06:11.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/newport/newport.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,7 +21,7 @@
+ driver supports the Newport (also called XL) cards found in SGI Indys and Indigo2s.
+ It supports both the 8bit and 24bit versions of the Newport.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -39,7 +39,7 @@
+ .BI "Option \*qBusID\*q \*q"integer \*q
+ Set to 1 for the Indigo2 XL. Default: 0
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors:
+ Guido G�ther \fIagx@sigxcpu.org\fP
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/nsc/nsc.man xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/nsc/nsc.man 2002-12-10 10:12:23.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man 2004-08-02 17:24:09.000000000 -0500
+@@ -24,7 +24,7 @@
+ driver supports GXLV (5530 companion chip), SC1200, SC1400 and
+ GX2 (5535 companion chip).
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -129,6 +129,6 @@
+ hh: Viewable height.
+ Default: no TV.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHOR
+ Author: Sarma V. Kolluru
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/nv/nv.man xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/nv/nv.man 2004-08-02 16:45:58.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man 2004-08-02 17:24:09.000000000 -0500
+@@ -53,7 +53,7 @@
+ .B GeForce FX, QUADRO FX
+ NV30, NV31, NV34
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -113,7 +113,7 @@
+ .BI "Option \*qShadowFB\*q \*q" boolean \*q
+ Enable or disable use of the shadow framebuffer layer. Default: off.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: David McKay, Jarno Paananen, Chas Inman, Dave Schmenk,
+ Mark Vojkovich
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/rendition/rendition.man xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/rendition/rendition.man 2001-01-27 13:20:51.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man 2004-08-02 17:24:09.000000000 -0500
+@@ -32,7 +32,7 @@
+ .B V2200
+ Verite V2200 based cards.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -107,6 +107,6 @@
+ .B "Option \*qMTRR\*q"
+ to let the driver request write-combining of memory access on the video board.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Marc Langenbach, Dejan Ilic
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/s3virge/s3virge.man xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/s3virge/s3virge.man 2003-02-12 22:21:33.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man 2004-08-02 17:24:09.000000000 -0500
+@@ -61,7 +61,7 @@
+ .B Trio 3D/2X
+ 86C362, 86C368
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver. All options names are case and white space insensitive when
+ parsed by the server, for example, "virge vx" and "VIRGEvx" are equivalent.
+@@ -221,7 +221,7 @@
+ Enable or disable a cr3a fix added for ViRGE MX. Default: on.
+
+ .SH SEE ALSO
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+
+ .SH KNOWN BUGS
+ The VideoRam generic driver parameter is presently ignored by the
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/savage/savage.man xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/savage/savage.man 2002-05-14 15:19:51.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man 2004-08-02 17:24:09.000000000 -0500
+@@ -51,7 +51,7 @@
+ .B ProSavage DDR-K
+ (8d04)
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -120,7 +120,7 @@
+ .SH FILES
+ savage_drv.o
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include Tim Roberts (timr@probo.com) and Ani Joshi (ajoshi@unixbox.com)
+ for the 4.0 version, and Tim Roberts and S. Marineau for the 3.3 driver from
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/siliconmotion/siliconmotion.man xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/siliconmotion.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/siliconmotion/siliconmotion.man 2004-08-02 16:46:08.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/siliconmotion.man 2004-08-02 17:24:09.000000000 -0500
+@@ -49,7 +49,7 @@
+ .B Lynx3DM
+ SM720
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver. All options names are case and white space insensitive when
+ parsed by the server, for example, "lynxe" and "LynxE" are equivalent.
+@@ -182,7 +182,7 @@
+ development debug option. Default: off.
+
+ .SH SEE ALSO
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+
+ .SH SUPPORT
+ For assistance with this driver, or XFree86 in general, check the XFree86 web
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/sis/sis.man xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/sis/sis.man 2004-08-02 16:46:04.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man 2004-08-02 17:24:09.000000000 -0500
+@@ -422,7 +422,7 @@
+ #ifdef __xservername__
+ __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+ #else
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ #endif
+ .PP
+ .B "http://www.winischhofer.net/linuxsisvga.shtml";
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/sunbw2/sunbw2.man xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/sunbw2/sunbw2.man 2001-01-27 13:20:53.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B sunbw2
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/suncg14/suncg14.man xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/suncg14/suncg14.man 2001-01-27 13:20:53.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B suncg14
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/suncg3/suncg3.man xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/suncg3/suncg3.man 2001-01-27 13:20:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B suncg3
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/suncg6/suncg6.man xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/suncg6/suncg6.man 2001-01-27 13:20:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B suncg6
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/sunffb/sunffb.man xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/sunffb/sunffb.man 2001-01-27 13:20:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B ffb
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>, David S. Miller <davem@redhat.com>, Michal Rehacek <majkl@iname.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/sunleo/sunleo.man xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/sunleo/sunleo.man 2001-01-27 13:20:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B leo
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/suntcx/suntcx.man xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/suntcx/suntcx.man 2001-01-27 13:20:54.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B suntcx
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Jakub Jelinek <jakub@redhat.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/tdfx/tdfx.man xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/tdfx/tdfx.man 2001-01-27 13:20:55.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B tdfx
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/trident/trident.man xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/trident/trident.man 2003-01-06 05:15:26.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man 2004-08-02 17:24:09.000000000 -0500
+@@ -41,7 +41,7 @@
+ 8900C, 8900D, 9000, 9200CXr, Cyber9320, 9400CXi, 9440AGi
+ These cards have been ported but need furthur testing and may not work.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -120,6 +120,6 @@
+ Default: gamma and brightness control is turned off.
+ Note: This is not supported on all chipsets.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHOR
+ Author: Alan Hourihane
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/tseng/tseng.man xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/tseng/tseng.man 2001-01-27 13:20:55.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man 2004-08-02 17:24:09.000000000 -0500
+@@ -21,10 +21,10 @@
+ .B tseng
+ driver supports...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/v4l/v4l.man xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/v4l/v4l.man 2001-05-29 17:24:06.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man 2004-08-02 17:24:09.000000000 -0500
+@@ -30,10 +30,10 @@
+ bt848/bt878-based TV cards are the most popular hardware these
+ days.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Gerd Knorr <kraxel@bytesex.org>
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/vesa/vesa.man xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/vesa/vesa.man 2001-12-17 15:52:34.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man 2004-08-02 17:24:09.000000000 -0500
+@@ -24,7 +24,7 @@
+ driver supports most VESA-compatible video cards. There are some known
+ exceptions, and those should be listed here.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -47,6 +47,6 @@
+
+ This option is recommended for performance reasons.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86cfg(1), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86cfg(1), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Paulo C�r Pereira de Andrade.
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/vga/vga.man xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/vga/vga.man 2001-12-17 15:52:34.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,7 +28,7 @@
+ driver supports most VGA-compatible video cards. There are some known
+ exceptions, and those should be listed here.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -60,6 +60,6 @@
+ when using those depths in a multi-head configuration where one or more
+ of the other screens is operating at a different depth.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: Marc La France, David Dawes, and Dirk Hohndel.
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/via/via.man xc/programs/Xserver/hw/xfree86/drivers/via/via.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/via/via.man 2004-08-02 16:46:03.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/via/via.man 2004-08-02 17:24:09.000000000 -0500
+@@ -27,7 +27,7 @@
+ then please see the DRI project on sourceforge.net.
+ .PP
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -119,6 +119,6 @@
+ .BI "Option \*qNoDDCValue\*q \*q" boolean \*q
+ Disable the use of DDC to set the horizontal sync and vertical refresh.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include: ...
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/vmware/vmware.man xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.man
+--- xc/programs/Xserver/hw/xfree86~/drivers/vmware/vmware.man 2001-04-06 12:44:58.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.man 2004-08-02 17:24:09.000000000 -0500
+@@ -16,7 +16,7 @@
+ .B vmware
+ is an XFree86 driver for VMware virtual video cards.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details. This section only covers configuration details specific to this
+ driver.
+ .PP
+@@ -32,6 +32,6 @@
+ .BI "Option \*qNoAccel\*q \*q" boolean \*q
+ Disable or enable acceleration. Default: acceleration is enabled.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ .SH AUTHORS
+ Copyright (c) 1999-2001 VMware, Inc.
+diff -urN xc/programs/Xserver/hw/xfree86~/etc/gtf.man xc/programs/Xserver/hw/xfree86/etc/gtf.man
+--- xc/programs/Xserver/hw/xfree86~/etc/gtf.man 2002-11-11 20:31:23.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/etc/gtf.man 2004-08-02 17:24:09.000000000 -0500
+@@ -16,7 +16,7 @@
+ horizontal and vertical resolutions and refresh rate (in Hz), the parameters
+ for a matching VESA GTF mode are printed out. Two output formats are
+ supported: mode lines suitable for the XFree86
+-.B XF86Config(__filemansuffix__)
++.B XF86Config-4(__filemansuffix__)
+ file, and mode parameters suitable for the Linux
+ .B fbset(8)
+ utility.
+@@ -35,7 +35,7 @@
+ Print the mode parameters in a format suitable for
+ .BR fbset(8) .
+ .SH "SEE ALSO"
+-XF86Config(__filemansuffix__)
++XF86Config-4(__filemansuffix__)
+ .SH AUTHOR
+ Andy Ritger.
+ .PP
+diff -urN xc/programs/Xserver/hw/xfree86~/fbdevhw/fbdevhw.man xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man
+--- xc/programs/Xserver/hw/xfree86~/fbdevhw/fbdevhw.man 2001-01-27 13:20:56.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man 2004-08-02 17:24:09.000000000 -0500
+@@ -14,7 +14,7 @@
+ fbdevhw module. fbdevhw can be used by other drivers too, this
+ is usually activated with `Option "UseFBDev"' in the device section.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
+ fbdev(__drivermansuffix__)
+ .SH AUTHORS
+ Authors include: Gerd Knorr, based on the XF68_FBDev Server code
+diff -urN xc/programs/Xserver/hw/xfree86~/input/acecad/acecad.man xc/programs/Xserver/hw/xfree86/input/acecad/acecad.man
+--- xc/programs/Xserver/hw/xfree86~/input/acecad/acecad.man 2001-08-13 14:35:00.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/acecad/acecad.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,13 +28,13 @@
+ .SH SUPPORTED HARDWARE
+ What is supported...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+ Config details...
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+ Edouard TISSERANT
+diff -urN xc/programs/Xserver/hw/xfree86~/input/calcomp/calcomp.man xc/programs/Xserver/hw/xfree86/input/calcomp/calcomp.man
+--- xc/programs/Xserver/hw/xfree86~/input/calcomp/calcomp.man 2001-08-12 17:51:29.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/calcomp/calcomp.man 2004-08-02 17:24:09.000000000 -0500
+@@ -25,7 +25,7 @@
+ This driver supports the Calcomp binary format used by the Drawing Board II
+ and III series.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -77,6 +77,6 @@
+ .TP 4
+ .RE
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Martin Kroeker <mk@daveg.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/input/citron/citron.man xc/programs/Xserver/hw/xfree86/input/citron/citron.man
+--- xc/programs/Xserver/hw/xfree86~/input/citron/citron.man 2001-04-05 12:42:34.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/citron/citron.man 2004-08-02 17:24:09.000000000 -0500
+@@ -45,7 +45,7 @@
+ 15.1 inch Infrared Touch
+
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ For better understanding please read also the
+@@ -652,6 +652,6 @@
+
+
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ 2000-2001 \- written by Citron GmbH (support@citron.de)
+diff -urN xc/programs/Xserver/hw/xfree86~/input/dmc/dmc.man xc/programs/Xserver/hw/xfree86/input/dmc/dmc.man
+--- xc/programs/Xserver/hw/xfree86~/input/dmc/dmc.man 2001-08-17 08:27:55.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/dmc/dmc.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,12 +28,12 @@
+ .SH SUPPORTED HARDWARE
+ What is supported...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+ Config details...
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+diff -urN xc/programs/Xserver/hw/xfree86~/input/dynapro/dynapro.man xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.man
+--- xc/programs/Xserver/hw/xfree86~/input/dynapro/dynapro.man 2001-01-27 13:20:57.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.man 2004-08-02 17:24:09.000000000 -0500
+@@ -25,12 +25,12 @@
+ .SH SUPPORTED HARDWARE
+ What is supported...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+ Config details...
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+diff -urN xc/programs/Xserver/hw/xfree86~/input/elographics/elographics.man xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man
+--- xc/programs/Xserver/hw/xfree86~/input/elographics/elographics.man 2004-08-02 16:46:07.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man 2004-08-02 17:24:09.000000000 -0500
+@@ -29,7 +29,7 @@
+ E281\-2310 and compatible devices are supported with some features
+ unavailable.
+ .SH "CONFIGURATION DETAILS"
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -73,7 +73,7 @@
+ .BI "Option \*qReportDelay\*q \*q" integer \*q
+ Delay between report packets. Default: 1 (10ms).
+ .SH "SEE ALSO"
+-XFree86(___mansuffix__), XF86Config(__filemansuffix__),
++XFree86(___mansuffix__), XF86Config-4(__filemansuffix__),
+ xf86config(__mansuffix__), Xserver(__mansuffix__), X(__miscmansuffix__)
+ .SH AUTHORS
+ Authors include:
+diff -urN xc/programs/Xserver/hw/xfree86~/input/fpit/fpit.man xc/programs/Xserver/hw/xfree86/input/fpit/fpit.man
+--- xc/programs/Xserver/hw/xfree86~/input/fpit/fpit.man 2002-11-21 22:35:12.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/fpit/fpit.man 2004-08-02 17:24:09.000000000 -0500
+@@ -35,7 +35,7 @@
+ .B setserial /dev/ttyS3 IRQ 15 baud_base 115200 port 0xfce8
+
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(5x) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -113,7 +113,7 @@
+
+
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Original FPIT port:
+ Rob Tsuk <rob@tsuk.com> and John Apfelbaum <johnapf@linuxslate.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/input/jamstudio/js_x.man xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man
+--- xc/programs/Xserver/hw/xfree86~/input/jamstudio/js_x.man 2003-02-23 22:24:15.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man 2004-08-02 17:24:09.000000000 -0500
+@@ -31,7 +31,7 @@
+ This driver supports the KB-Gear JamStudio pentablet.
+ This X-Input driver should work on any OS supporting the hiddev raw USB HID driver.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .RS 8
+@@ -62,6 +62,6 @@
+ where X equals the value read from the tablet.
+ .RE
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Brian Goines <bgoines78@comcast.net>
+diff -urN xc/programs/Xserver/hw/xfree86~/input/keyboard/kbd.man xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.man
+--- xc/programs/Xserver/hw/xfree86~/input/keyboard/kbd.man 2002-10-10 20:40:33.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.man 2004-08-02 17:24:09.000000000 -0500
+@@ -26,7 +26,7 @@
+ driver functions as a keyboard input device, and may be used as the
+ X server's core keyboard.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -96,4 +96,4 @@
+ with the ones listed above and are not recommended, so they are not
+ documented here.
+ .SH "SEE ALSO"
+-keyboard(__drivermansuffix__), XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++keyboard(__drivermansuffix__), XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+diff -urN xc/programs/Xserver/hw/xfree86~/input/keyboard/keyboard.man xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man
+--- xc/programs/Xserver/hw/xfree86~/input/keyboard/keyboard.man 2002-10-10 20:40:33.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man 2004-08-02 17:24:09.000000000 -0500
+@@ -24,7 +24,7 @@
+ X server's core keyboard. This driver is currently built-in to the core
+ X server, and multiple instances are not yet supported.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -100,4 +100,4 @@
+ with the ones listed above and are not recommended, so they are not
+ documented here.
+ .SH "SEE ALSO"
+-kbd(__drivermansuffix__), XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++kbd(__drivermansuffix__), XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+diff -urN xc/programs/Xserver/hw/xfree86~/input/magictouch/magictouch.man xc/programs/Xserver/hw/xfree86/input/magictouch/magictouch.man
+--- xc/programs/Xserver/hw/xfree86~/input/magictouch/magictouch.man 2001-07-03 10:13:57.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/magictouch/magictouch.man 2004-08-02 17:24:09.000000000 -0500
+@@ -16,10 +16,10 @@
+ .B magictouch
+ is an XFree86 input driver.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ driver doesn't have any configuration options in addition to those.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86cfg(1), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86cfg(1), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+diff -urN xc/programs/Xserver/hw/xfree86~/input/microtouch/microtouch.man xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.man
+--- xc/programs/Xserver/hw/xfree86~/input/microtouch/microtouch.man 2001-01-27 13:20:58.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.man 2004-08-02 17:24:09.000000000 -0500
+@@ -25,12 +25,12 @@
+ .SH SUPPORTED HARDWARE
+ What is supported...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+ Config details...
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+diff -urN xc/programs/Xserver/hw/xfree86~/input/mouse/mouse.man xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man
+--- xc/programs/Xserver/hw/xfree86~/input/mouse/mouse.man 2002-12-17 15:55:21.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man 2004-08-02 17:24:09.000000000 -0500
+@@ -34,7 +34,7 @@
+ in __projectroot__/lib/X11/doc/, or online at
+ http://www.xfree86.org/current/mouse.html.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -224,5 +224,5 @@
+ for serial port communication, but they are not documented here because
+ the driver sets them correctly for each mouse protocol type.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
+ README.mouse.
+diff -urN xc/programs/Xserver/hw/xfree86~/input/mutouch/mutouch.man xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man
+--- xc/programs/Xserver/hw/xfree86~/input/mutouch/mutouch.man 2001-01-27 13:20:58.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,13 +28,13 @@
+ .SH SUPPORTED HARDWARE
+ What is supported...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+ Config details...
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+ Patrick Lecoanet
+diff -urN xc/programs/Xserver/hw/xfree86~/input/palmax/palmax.man xc/programs/Xserver/hw/xfree86/input/palmax/palmax.man
+--- xc/programs/Xserver/hw/xfree86~/input/palmax/palmax.man 2002-11-21 22:40:22.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/palmax/palmax.man 2004-08-02 17:24:09.000000000 -0500
+@@ -29,7 +29,7 @@
+ Palmax PD1000, Palmax PD1100. In theory also any other system using a
+ TR88L803 wired to a serial port.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -82,7 +82,7 @@
+ XFree86 needs a nice calibration tool.
+ .PP
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+ Alan Cox
+diff -urN xc/programs/Xserver/hw/xfree86~/input/penmount/penmount.man xc/programs/Xserver/hw/xfree86/input/penmount/penmount.man
+--- xc/programs/Xserver/hw/xfree86~/input/penmount/penmount.man 2001-08-17 08:27:57.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/penmount/penmount.man 2004-08-02 17:24:09.000000000 -0500
+@@ -28,12 +28,12 @@
+ .SH SUPPORTED HARDWARE
+ What is supported...
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+ Config details...
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+diff -urN xc/programs/Xserver/hw/xfree86~/input/tek4957/tek4957.man xc/programs/Xserver/hw/xfree86/input/tek4957/tek4957.man
+--- xc/programs/Xserver/hw/xfree86~/input/tek4957/tek4957.man 2002-11-10 20:18:08.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/tek4957/tek4957.man 2004-08-02 17:24:09.000000000 -0500
+@@ -22,7 +22,7 @@
+ driver functions as a pointer input device, and may be used as the
+ X server's core pointer.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .RS 8
+@@ -80,6 +80,6 @@
+ .SH "BUGS / LIMITATIONS"
+ Currently, only "Absolute" mode is supported ( Sorry )
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Olivier DANET <odanet@caramail.com>
+diff -urN xc/programs/Xserver/hw/xfree86~/input/ur98/ur98.man xc/programs/Xserver/hw/xfree86/input/ur98/ur98.man
+--- xc/programs/Xserver/hw/xfree86~/input/ur98/ur98.man 2002-11-21 22:49:15.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/ur98/ur98.man 2004-08-02 17:24:09.000000000 -0500
+@@ -43,7 +43,7 @@
+ Union Reality UR-98. While this is a joystick driver the behaviour is
+ absolute so this driver is not useful for true joystick interfaces.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -125,7 +125,7 @@
+ This driver is currently Linux specific.
+ .PP
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+ Alan Cox
+diff -urN xc/programs/Xserver/hw/xfree86~/input/void/void.man xc/programs/Xserver/hw/xfree86/input/void/void.man
+--- xc/programs/Xserver/hw/xfree86~/input/void/void.man 2001-01-27 13:20:58.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/void/void.man 2004-08-02 17:24:09.000000000 -0500
+@@ -20,10 +20,10 @@
+ pointer and/or core keyboard. It's purpose is to allow the X server
+ to operate without a core pointer and/or core keyboard.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ driver doesn't have any configuration options in addition to those.
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+diff -urN xc/programs/Xserver/hw/xfree86~/input/wacom/wacom.man xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man
+--- xc/programs/Xserver/hw/xfree86~/input/wacom/wacom.man 2001-01-27 13:20:59.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man 2004-08-02 17:24:09.000000000 -0500
+@@ -25,7 +25,7 @@
+ This driver supports the Wacom IV and Wacom V protocols.
+ Preliminary support is available for USB devices on some Linux platforms.
+ .SH CONFIGURATION DETAILS
+-Please refer to XF86Config(__filemansuffix__) for general configuration
++Please refer to XF86Config-4(__filemansuffix__) for general configuration
+ details and for options that can be used with all input drivers. This
+ section only covers configuration details specific to this driver.
+ .PP
+@@ -111,6 +111,6 @@
+ devices for some models of tablets (Intuos and Graphire).
+ .RE
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
++XFree86(1), XF86Config-4(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+ .SH AUTHORS
+ Frederic Lepied <lepied@xfree86.org>
+diff -urN xc/programs/Xserver/hw/xfree86~/xf86config/xf86config.c xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
+--- xc/programs/Xserver/hw/xfree86~/xf86config/xf86config.c 2003-02-19 23:05:15.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c 2004-08-02 17:24:09.000000000 -0500
@@ -172,7 +172,7 @@
#define MODULEPATH TREEROOT "/lib/modules"
@@ -247,3 +1444,15 @@
#endif
#define CONFIGNAME XCONFIGFILE
+diff -urN xc/programs/Xserver/hw/xfree86~/xf86config/xf86config.man xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man
+--- xc/programs/Xserver/hw/xfree86~/xf86config/xf86config.man 2002-10-12 11:06:44.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man 2004-08-02 17:24:09.000000000 -0500
+@@ -16,7 +16,7 @@
+ .I __projectroot__/lib/X11/Cards
+ Video cards database
+ .SH "SEE ALSO"
+-XFree86(1), XF86Config(__filemansuffix__), reconfig(1)
++XFree86(1), XF86Config-4(__filemansuffix__), reconfig(1)
+ .SH AUTHOR
+ Harm Hanemaayer.
+ .\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $
Reply to: