summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:37 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:37 +0000
commit2236c35b0c4b70141f4f19d80f7ed1faf245da53 (patch)
treef7e3220f4182a4332df4a8257d322ef817d20e00
parent3a36059c0db40b81f73f6e86d7849066ee77e35e (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/vesa.man8
-rw-r--r--src/vesa.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/man/vesa.man b/man/vesa.man
index 1a4bbef..4ae43bb 100644
--- a/man/vesa.man
+++ b/man/vesa.man
@@ -14,7 +14,7 @@ vesa \- Generic VESA video driver
.fi
.SH DESCRIPTION
.B vesa
-is an XFree86 driver for generic VESA video cards. It can drive most
+is an __xservername__ driver for generic VESA video cards. It can drive most
VESA-compatible video cards, but only makes use of the basic standard
VESA core that is common to these cards. The driver supports depths 8, 15
16 and 24.
@@ -24,7 +24,7 @@ The
driver supports most VESA-compatible video cards. There are some known
exceptions, and those should be listed here.
.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
@@ -47,6 +47,6 @@ Enable or disable use of the shadow framebuffer layer. Default: on.
This option is recommended for performance reasons.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86cfg(1), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgcfg(__appmansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
-Authors include: Paulo César Pereira de Andrade.
+Authors include: Paulo Ce\'sar Pereira de Andrade.
diff --git a/src/vesa.c b/src/vesa.c
index f37318b..298391e 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -212,7 +212,7 @@ static XF86ModuleVersionInfo vesaVersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VESA_MAJOR_VERSION, VESA_MINOR_VERSION, VESA_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,