[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/glide glide.man, 1.1.4.1, 1.1.4.2 glide_driver.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glide
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/glide

Modified Files:
      Tag: XORG-CURRENT
	glide.man glide_driver.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: glide.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/glide.man	5 Mar 2004 13:40:22 -0000	1.1.4.1
+++ b/glide.man	15 Apr 2004 10:16:21 -0000	1.1.4.2
@@ -18,7 +18,7 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 .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.

Index: glide_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/glide_driver.c	5 Mar 2004 13:40:22 -0000	1.1.4.1
+++ b/glide_driver.c	15 Apr 2004 10:16:21 -0000	1.1.4.2
@@ -232,7 +232,7 @@
   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,