From 5d87ec762acd1c0b44f148dd74cd418a338f208f Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Tue, 4 May 2004 19:43:46 +0000 Subject: Merge the new release from HEAD --- man/elographics.man | 6 +++--- src/xf86Elo.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/elographics.man b/man/elographics.man index d219a08..55d9150 100644 --- a/man/elographics.man +++ b/man/elographics.man @@ -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 004b8b4..6ea52a4 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -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, -- cgit v1.2.3