Index: libxi/man/XSelectExtensionEvent.man
===================================================================
--- libxi.orig/man/XSelectExtensionEvent.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XSelectExtensionEvent.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSelExtEv.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSelectExtensionEvent 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSelectExtensionEvent __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSelectExtensionEvent, XGetSelectedExtensionEvents \- select extension events, get the list of currently selected extension events
 .SH SYNTAX
Index: libxi/man/XSetDeviceMode.man
===================================================================
--- libxi.orig/man/XSetDeviceMode.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XSetDeviceMode.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSetMode.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSetDeviceMode 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceMode __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceMode \- change the mode of a device
 .SH SYNTAX
Index: libxi/man/XGrabDeviceButton.man
===================================================================
--- libxi.orig/man/XGrabDeviceButton.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGrabDeviceButton.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGrDvBut.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGrabDeviceButton 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGrabDeviceButton __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGrabDeviceButton, XUngrabDeviceButton \- grab/ungrab extension input device buttons
 .SH SYNTAX
@@ -202,10 +202,10 @@
 \fIBadWindow\fP
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowDeviceEvents(3X),
+XAllowDeviceEvents(3),
 .br
-XGrabDevice(3X),
+XGrabDevice(3),
 .br
-XGrabDeviceKey(3X),
+XGrabDeviceKey(3),
 .br
 \fI\*(xL\fP
Index: libxi/man/XSetDeviceButtonMapping.man
===================================================================
--- libxi.orig/man/XSetDeviceButtonMapping.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XSetDeviceButtonMapping.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSeBMap.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XSetDeviceButtonMapping 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceButtonMapping __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceButtonMapping, XGetDeviceButtonMapping \- query or change device button mappings
 .SH SYNTAX
@@ -92,11 +92,11 @@
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XChangeDeviceKeyboardControl(3X),
+XChangeDeviceKeyboardControl(3),
 .br
-XChangeDeviceKeyMapping(3X)
+XChangeDeviceKeyMapping(3)
 .br
-XChangeDeviceModifierMapping(3X)
+XChangeDeviceModifierMapping(3)
 .br
 .br
 \fI\*(xL\fP
Index: libxi/man/XGetFeedbackControl.man
===================================================================
--- libxi.orig/man/XGetFeedbackControl.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGetFeedbackControl.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChFCtl.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetFeedbackControl 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetFeedbackControl __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetFeedbackControl, XChangeFeedbackControl \- query and change input device feedbacks
 .SH SYNTAX
Index: libxi/man/XGrabDeviceKey.man
===================================================================
--- libxi.orig/man/XGrabDeviceKey.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGrabDeviceKey.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGrDvKey.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XGrabDeviceKey 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGrabDeviceKey __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGrabDeviceKey, XUngrabDeviceKey \- grab/ungrab extension input device Keys
 .SH SYNTAX
@@ -196,11 +196,11 @@
 \fIBadWindow\fP
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowDeviceEvents(3X),
+XAllowDeviceEvents(3),
 .br
-XGrabDevice(3X),
+XGrabDevice(3),
 .br
-XGrabDeviceButton(3X),
+XGrabDeviceButton(3),
 .br
 .br
 \fI\*(xL\fP
Index: libxi/man/XSendExtensionEvent.man
===================================================================
--- libxi.orig/man/XSendExtensionEvent.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XSendExtensionEvent.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSExEvnt.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSendExtensionEvent 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSendExtensionEvent __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSendExtensionEvent \- send input extension events to a client
 .SH SYNTAX
@@ -56,7 +56,7 @@
 and ignores any active grabs.
 This request requires you to pass an event class list.
 For a discussion of the valid event class names,
-see \fIXOpenDevice(3X11)\fP.
+see \fIXOpenDevice(3)\fP.
 This request uses the w argument to identify the destination window as follows:
 .IP \(bu 5
 If w is
Index: libxi/man/XListInputDevices.man
===================================================================
--- libxi.orig/man/XListInputDevices.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XListInputDevices.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XListDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XListInputDevices 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XListInputDevices __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XListInputDevices, XFreeDeviceList \- list available input devices
 .SH SYNTAX
Index: libxi/man/XOpenDevice.man
===================================================================
--- libxi.orig/man/XOpenDevice.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XOpenDevice.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XOpenDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XOpenDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XOpenDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XOpenDevice, XCloseDevice \- open or close an extension input device
 .SH SYNTAX
Index: libxi/man/XChangeKeyboardDevice.man
===================================================================
--- libxi.orig/man/XChangeKeyboardDevice.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XChangeKeyboardDevice.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChgKbd.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XChangeKeyboardDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XChangeKeyboardDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XChangeKeyboardDevice \- change which device is used as the X keyboard
 .SH SYNTAX
Index: libxi/man/XGetDeviceControl.man
===================================================================
--- libxi.orig/man/XGetDeviceControl.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGetDeviceControl.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChDCtl.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetDeviceControl 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetDeviceControl __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetDeviceControl, XChangeDeviceControl \- query and change input device controls
 .SH SYNTAX
Index: libxi/man/XGetExtensionVersion.man
===================================================================
--- libxi.orig/man/XGetExtensionVersion.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGetExtensionVersion.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGetExtV.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetExtensionVersion 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetExtensionVersion __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetExtensionVersion \- query the version of the input extension.
 .SH SYNTAX
Index: libxi/man/XAllowDeviceEvents.man
===================================================================
--- libxi.orig/man/XAllowDeviceEvents.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XAllowDeviceEvents.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XAllDvEv.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XAllowDeviceEvents 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XAllowDeviceEvents __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XAllowDeviceEvents \- release queued events
 .SH SYNTAX
@@ -141,6 +141,6 @@
 \fIBadValue\fP
 An invalid mode was specified on the request.
 .SH "SEE ALSO"
-XGrabDevice(3X11)
+XGrabDevice(3)
 .br
 \fI\*(xL\fP
Index: libxi/man/XGetDeviceModifierMapping.man
===================================================================
--- libxi.orig/man/XGetDeviceModifierMapping.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGetDeviceModifierMapping.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChMMap.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetDeviceModifierMapping 3X11 __xorgversion__  "X FUNCTIONS"
+.TH XGetDeviceModifierMapping __LIB_MAN_SUFFIX__ __xorgversion__  "X FUNCTIONS"
 .SH NAME
 XGetDeviceModifierMapping, XSetDeviceModifierMapping \- query or change device modifier mappings
 .SH SYNTAX
@@ -138,8 +138,8 @@
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XSetDeviceKeyMapping(3X11) 
+XSetDeviceKeyMapping(3) 
 .br
-XSetDeviceButtonMapping(3X11) 
+XSetDeviceButtonMapping(3) 
 .br
 \fI\*(xL\fP
Index: libxi/man/XGetDeviceKeyMapping.man
===================================================================
--- libxi.orig/man/XGetDeviceKeyMapping.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGetDeviceKeyMapping.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChKMap.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XGetDeviceKeyMapping 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetDeviceKeyMapping __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetDeviceKeyMapping, XChangeDeviceKeyMapping \- query or change device key mappings
 .SH SYNTAX
@@ -173,8 +173,8 @@
 \fIBadAlloc\fP
 The server failed to allocate the requested resource or server memory.
 .SH "SEE ALSO"
-XSetDeviceButtonMapping(3X11) 
+XSetDeviceButtonMapping(3) 
 .br
-XSetDeviceModifierMapping(3X11) 
+XSetDeviceModifierMapping(3) 
 .br
 \fI\*(xL\fP
Index: libxi/man/XSetDeviceFocus.man
===================================================================
--- libxi.orig/man/XSetDeviceFocus.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XSetDeviceFocus.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSeDvFoc.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSetDeviceFocus 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceFocus __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceFocus, XGetDeviceFocus \- control extension input device focus
 .SH SYNTAX
Index: libxi/man/XChangeDeviceDontPropagateList.man
===================================================================
--- libxi.orig/man/XChangeDeviceDontPropagateList.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XChangeDeviceDontPropagateList.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChProp.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XChangeDeviceDontPropagateList 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XChangeDeviceDontPropagateList __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XChangeDeviceDontPropagateList, XGetDeviceDontPropagateList \- query or change the dont-propagate-list for extension devices
 .SH SYNTAX
Index: libxi/man/XChangePointerDevice.man
===================================================================
--- libxi.orig/man/XChangePointerDevice.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XChangePointerDevice.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChgPtr.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XChangePointerDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XChangePointerDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XChangePointerDevice \- change which device is the X pointer
 .SH SYNTAX
Index: libxi/man/XGrabDevice.man
===================================================================
--- libxi.orig/man/XGrabDevice.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGrabDevice.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGrabDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGrabDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGrabDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGrabDevice, XUngrabDevice \- grab/release the specified extension device
 .SH SYNTAX
@@ -196,8 +196,8 @@
 \fIBadWindow\fP
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowDeviceEvents(3X),
-XGrabDeviceButton(3X),
-XGrabDeviceKey(3X),
+XAllowDeviceEvents(3),
+XGrabDeviceButton(3),
+XGrabDeviceKey(3),
 .br
 \fI\*(xL\fP
Index: libxi/man/XGetDeviceMotionEvents.man
===================================================================
--- libxi.orig/man/XGetDeviceMotionEvents.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XGetDeviceMotionEvents.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGetDvMo.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XGetDeviceMotionEvents 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetDeviceMotionEvents __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetDeviceMotionEvents, XDeviceTimeCoord \- get device motion history 
 .SH SYNTAX
Index: libxi/man/XSetDeviceValuators.man
===================================================================
--- libxi.orig/man/XSetDeviceValuators.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XSetDeviceValuators.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSetDVal.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSetDeviceValuators 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceValuators __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceValuators \- initialize the valuators on an extension input device
 .SH SYNTAX
Index: libxi/man/XDeviceBell.man
===================================================================
--- libxi.orig/man/XDeviceBell.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XDeviceBell.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XDevBell.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XDeviceBell 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XDeviceBell __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XDeviceBell \- ring a bell on a device supported through the input extension
 .SH SYNTAX
@@ -71,7 +71,7 @@
 \fIBadValue\fP
 An invalid feedbackclass, feedbackid, or percent value was specified.
 .SH "SEE ALSO"
-XChangeFeedbackControl(3X),
-XBell(3X)
+XChangeFeedbackControl(3),
+XBell(3)
 .br
 \fI\*(xL\fP
Index: libxi/man/XQueryDeviceState.man
===================================================================
--- libxi.orig/man/XQueryDeviceState.man	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/XQueryDeviceState.man	2006-08-11 15:09:44.000000000 +1000
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XQueryDv.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XQueryDeviceState 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XQueryDeviceState __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XQueryDeviceState \- query the state of an extension input device.
 .SH SYNTAX
Index: libxi/man/Makefile.am
===================================================================
--- libxi.orig/man/Makefile.am	2006-08-11 15:01:25.000000000 +1000
+++ libxi/man/Makefile.am	2006-08-11 15:10:10.000000000 +1000
@@ -72,7 +72,7 @@
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' < $< > $@
+	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/;  s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/' < $< > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)