diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:32 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:32 +0000 |
| commit | 4e169517ee85c702859299b1cf884251f9d65ffe (patch) | |
| tree | 94006e717d59ff6184cc8409e7f9ed1ef5108d99 | |
| parent | 6767e128cb7193f9a80aa6fd6084340bd752e11b (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/glide.man | 10 | ||||
| -rw-r--r-- | src/glide_driver.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/man/glide.man b/man/glide.man index 3e5795c..e6a3c5e 100644 --- a/man/glide.man +++ b/man/glide.man @@ -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 52a0eff..9abb180 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -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, |