Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

2 files changed, 8 insertions, 8 deletions

diff --git a/man/glide.man b/man/glide.man
index bf3e78f..e6a3c5e 100644
--- a/man/glide.man
+++ b/man/glide.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man,v 1.3 2001/02/07 22:51:56 tsi Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man,v 1.2 2001/01/27 18:20:47 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH GLIDE __drivermansuffix__ __vendorversion__
@@ -18,7 +18,7 @@ before it will work: You need Glide installed and you need to make a link for th
 file. Read the second paragraph in the description below to find out how.
 .SH DESCRIPTION
 .B glide 
-is an XFree86 driver for Glide capable video boards (such as 3Dfx
+is an __xservername__ driver for Glide capable video boards (such as 3Dfx
 Voodoo boards). This driver is mainly for Voodoo 1 and Voodoo 2 boards, later
 boards from 3Dfx have 2D built-in and you should preferably use a driver separate for
 those boards or the fbdev(__drivermansuffix__) driver.
@@ -36,7 +36,7 @@ framebuffer is in cached RAM.
 This driver requires that you have installed Glide. (Which can, at the
 time of this writing, be found at
 http://glide.xxedgexx.com/3DfxRPMS.html). Also, you need to tell
-XFree86 where the libglide2x.so file is placed by making a soft link
+__xservername__ where the libglide2x.so file is placed by making a soft link
 in the /usr/X11R6/lib/modules directory that points to the libglide2x.so
 file. For example (if your libglide2x.so file is in /usr/lib):
 .PP
@@ -121,7 +121,7 @@ The
 .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 __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -141,7 +141,7 @@ The value should be 0 for the first board, 1 for the second and so on.
 If it is not present, the first Voodoo board found will be selected.
 Put this option in the Device section.
 .SH "EXAMPLE"
-Here is an example of a part of an XF86Config file that uses a multihead
+Here is an example of a part of an __xconfigfile__ file that uses a multihead
 configuration with two monitors. The first monitor is driven by the
 fbdev video driver and the second monitor is driven by the glide
 driver.
@@ -293,6 +293,6 @@ Xinerama extension can be done for example like this:
 .PP
 $ xinit -- +xinerama
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Author: Henrik Harmsen.
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 230c34c..9abb180 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -45,7 +45,7 @@
    * Support static loading.  
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.28 2002/01/04 21:22:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.27 2001/08/07 07:04:46 keithp Exp $ */
 
 #include "xaa.h"
 #include "xf86Cursor.h"
@@ -232,7 +232,7 @@ static XF86ModuleVersionInfo glideVersRec =
   MODULEVENDORSTRING,
   MODINFOSTRING1,
   MODINFOSTRING2,
-  XF86_VERSION_CURRENT,
+  XORG_VERSION_CURRENT,
   GLIDE_MAJOR_VERSION, GLIDE_MINOR_VERSION, GLIDE_PATCHLEVEL,
   ABI_CLASS_VIDEODRV,			/* This is a video driver */
   ABI_VIDEODRV_VERSION,