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
commit4f275b75b552647ac5d0428aa53960791cd58e75 (patch)
treef4738a621a986eca68fb52f29f57c15132c85efa
parente2a0166150d0cf61e7dc73acfc5f2073515bc4d4 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/sunbw2.man6
-rw-r--r--src/bw2_driver.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/sunbw2.man b/man/sunbw2.man
index 8a50cd5..7520e17 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -14,17 +14,17 @@ sunbw2 \- BW2 video driver
.fi
.SH DESCRIPTION
.B sunbw2
-is an XFree86 driver for Sun BW2 video cards.
+is an __xservername__ driver for Sun BW2 video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B sunbw2
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/bw2_driver.c b/src/bw2_driver.c
index 00dc62b..e6bd2a9 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_driver.c
@@ -96,7 +96,7 @@ static XF86ModuleVersionInfo sunbw2VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,