summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:31 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:31 +0000
commit380819176c1bf6b7eda5afb3575c38f9b6c2c7f6 (patch)
tree53358da098ae7b730a408df9f20bd3aa63b02c01
parent7bf8e9d736765001111e3245da36817a5a42dd12 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/cirrus.man6
-rw-r--r--src/alp_driver.c2
-rw-r--r--src/cir_driver.c2
-rw-r--r--src/lg_driver.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/man/cirrus.man b/man/cirrus.man
index 476bd80..ef0f43b 100644
--- a/man/cirrus.man
+++ b/man/cirrus.man
@@ -14,17 +14,17 @@ cirrus \- Cirrus Logic video driver
.fi
.SH DESCRIPTION
.B cirrus
-is an XFree86 driver for Cirrus Logic video chips.
+is an __xservername__ driver for Cirrus Logic video chips.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B cirrus
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: ...
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 547c983..d20507e 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -238,7 +238,7 @@ static XF86ModuleVersionInfo alpVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
ALP_MAJOR_VERSION, ALP_MINOR_VERSION, ALP_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
diff --git a/src/cir_driver.c b/src/cir_driver.c
index e8a80e5..239ac01 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -143,7 +143,7 @@ static XF86ModuleVersionInfo cirVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CIR_MAJOR_VERSION, CIR_MINOR_VERSION, CIR_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 507f5d1..da6d208 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -246,7 +246,7 @@ static XF86ModuleVersionInfo lgVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
LG_MAJOR_VERSION, LG_MINOR_VERSION, LG_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,