From 08ad8a93ee169525543da9aa044939024122e67f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:02 +0000
Subject: [PATCH] Merging XORG-CURRENT into trunk

---
 man/acecad.man | 7 +++----
 src/acecad.c   | 4 ++--
 src/acecad.h   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/man/acecad.man b/man/acecad.man
index 0f89967..a9cb68c 100644
--- a/man/acecad.man
+++ b/man/acecad.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.man,v 1.1 2001/08/13 19:35:00 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH ACECAD __drivermansuffix__ __vendorversion__
@@ -18,7 +17,7 @@ acecad \- Acecad Flair input driver
 .B EndSection
 .SH DESCRIPTION
 .B acecad 
-is an XFree86 input driver for Acecad Flair devices...
+is an __xservername__ input driver for Acecad Flair devices...
 .PP
 The
 .B acecad
@@ -28,13 +27,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...
 Edouard TISSERANT
diff --git a/src/acecad.c b/src/acecad.c
index f0e3e2d..49e09e8 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -23,7 +23,7 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c,v 1.5 2003/11/05 20:56:29 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c,v 1.4 2003/10/30 00:40:45 dawes Exp $ */
 
 #define _ACECAD_C_
 /*****************************************************************************
@@ -90,7 +90,7 @@ static XF86ModuleVersionInfo VersionRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,
diff --git a/src/acecad.h b/src/acecad.h
index ef4431b..efb7bfb 100644
--- a/src/acecad.h
+++ b/src/acecad.h
@@ -23,7 +23,7 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.3 2003/11/06 18:38:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.2tsi Exp $ */
 
 #ifndef	_ACECAD_H_
 #define _ACECAD_H_
-- 
2.32.0.93.g670b81a890