summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:36 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:36 +0000
commitbf1308c5e0a2721a6372d1f875a4d2c9768a5ee9 (patch)
tree2e751b91fc6788907cdd5b059206f4c2afaff255
parent11fa48fc4dbcfe4a7f6e8f6414b577604040f687 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/suncg6.man6
-rw-r--r--src/cg6_driver.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/suncg6.man b/man/suncg6.man
index 491b68d..36b7ddb 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -14,17 +14,17 @@ suncg6 \- GX/Turbo GX video driver
.fi
.SH DESCRIPTION
.B suncg6
-is an XFree86 driver for Sun GX and Turbo GX (also known as cgsix) video cards.
+is an __xservername__ driver for Sun GX and Turbo GX (also known as cgsix) video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B suncg6
driver supports...
.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.
.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: Jakub Jelinek <jakub@redhat.com>
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index c0cb0d7..6099c99 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -105,7 +105,7 @@ static XF86ModuleVersionInfo suncg6VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,