summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:32 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:32 +0000
commit905c4324371444ce300b546a1513a065c57dc89b (patch)
tree49187c3d99fe6289de9f04db1357c87346bb565f
parentb898bcbd0a540b64d73c9fd4db2069ed6a00360f (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/mga.man6
-rw-r--r--src/mga_driver.c2
-rw-r--r--src/mga_halmod.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/man/mga.man b/man/mga.man
index 28b9eed..be09143 100644
--- a/man/mga.man
+++ b/man/mga.man
@@ -14,7 +14,7 @@ mga \- Matrox video driver
.fi
.SH DESCRIPTION
.B mga
-is an XFree86 driver for Matrox video cards. The driver is fully
+is an __xservername__ driver for Matrox video cards. The driver is fully
accelerated, and provides support for the following framebuffer depths:
8, 15, 16, 24, and an 8+24 overlay mode. All
visual types are supported for depth 8, and both TrueColor and DirectColor
@@ -55,7 +55,7 @@ Millennium G200 and Mystique G200
.TP 12
.B G550
.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
@@ -150,7 +150,7 @@ This option is only supported by the G200 and G400, and only in 16 and 32
bits per pixel.
Default: off.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Radoslaw Kapitan, Mark Vojkovich, and also David Dawes, Guy
Desbief, Dirk Hohndel, Doug Merritt, Andrew E. Mileski, Andrew van der Stock,
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 7e45fc4..3bc5ff4 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -413,7 +413,7 @@ static XF86ModuleVersionInfo mgaVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
MGA_MAJOR_VERSION, MGA_MINOR_VERSION, MGA_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
diff --git a/src/mga_halmod.c b/src/mga_halmod.c
index a5bb425..61ef298 100644
--- a/src/mga_halmod.c
+++ b/src/mga_halmod.c
@@ -15,7 +15,7 @@ static XF86ModuleVersionInfo halVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
HAL_MAJOR_VERSION, HAL_MINOR_VERSION, HAL_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,