summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:03 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:03 +0000
commit1935b4e30e802f262a83e8f54bbd79495c91105d (patch)
tree552b85c3664769e17f0e0c81a4d3907b3461e195
parent7802f66b7de5f23346db1375e6ed05798090b5c3 (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
-rw-r--r--man/elographics.man8
-rw-r--r--src/xf86Elo.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/man/elographics.man b/man/elographics.man
index 4e78d67..55d9150 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
@@ -18,7 +18,7 @@ elographics \- Elographics input driver
.B EndSection
.SH DESCRIPTION
.B elographics
-is an XFree86 input driver for Elographics devices...
+is an __xservername__ input driver for Elographics devices...
.PP
The
.B elographics
@@ -28,13 +28,13 @@ THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
What is supported...
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
section only covers configuration details specific to this driver.
.PP
Config details...
.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...
Patrick Lecoanet
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 8c57432..6ea52a4 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */
/*
*******************************************************************************
@@ -1772,7 +1772,7 @@ static XF86ModuleVersionInfo version_rec = {
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,