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
commit88ebadb49b73f7fc00b6a1d13a393bac238f3b5e (patch)
tree931a3ff539d370bc41de1dbadcbfd332b76f3db2
parentdbc4ab662f67ce0cf1ea877cac01a5e0ea6dab0c (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/suncg3.man6
-rw-r--r--src/cg3_driver.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/suncg3.man b/man/suncg3.man
index cdc4ecc..5182c80 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -14,17 +14,17 @@ suncg3 \- CG3 video driver
.fi
.SH DESCRIPTION
.B suncg3
-is an XFree86 driver for Sun CG3 video cards.
+is an __xservername__ driver for Sun CG3 video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B suncg3
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/cg3_driver.c b/src/cg3_driver.c
index 8bf3815..60f61bf 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_driver.c
@@ -97,7 +97,7 @@ static XF86ModuleVersionInfo suncg3VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,