merge latest (4.3.99.16) from XFree86 (vendor) branch

author: Kaleb Keithley <kaleb@freedesktop.org> 2003-11-26 22:48:16 +0000
committer: Kaleb Keithley <kaleb@freedesktop.org> 2003-11-26 22:48:16 +0000
commit: 0642e99ac05afb0c90872a29ff290ffc348c4255 (patch)
tree: 4ca628848e7d3fc10217101970c2db6c49342ec7 /man
parent: 400780e6a7f710b57e92a9cc792bcb4ba530ffb3 (diff)
152 files changed, 1694 insertions, 4331 deletions
diff --git a/man/AllPlanes.man b/man/AllPlanes.man
index e7e2313c..4df0c402 100644
--- a/man/AllPlanes.man
+++ b/man/AllPlanes.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/AllPlanes.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/AllPlanes.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,67 +144,63 @@
 .SH NAME
 AllPlanes, BlackPixel, WhitePixel, ConnectionNumber, DefaultColormap, DefaultDepth, XListDepths, DefaultGC, DefaultRootWindow, DefaultScreenOfDisplay, DefaultScreen, DefaultVisual, DisplayCells, DisplayPlanes, DisplayString, XMaxRequestSize, XExtendedMaxRequestSize, LastKnownRequestProcessed, NextRequest, ProtocolVersion, ProtocolRevision, QLength, RootWindow, ScreenCount, ScreenOfDisplay, ServerVendor, VendorRelease \- Display macros and functions
 .SH SYNTAX
-AllPlanes
-.LP
-BlackPixel\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-WhitePixel\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-ConnectionNumber\^(\^\fIdisplay\fP\^)
-.LP
-DefaultColormap\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DefaultDepth\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-int *XListDepths\^(\^\fIdisplay\fP, \fIscreen_number\fP, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP;
-.br
-      int \fIscreen_number\fP;
-.br
-      int *\fIcount_return\fP;
-.LP
-DefaultGC\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DefaultRootWindow\^(\^\fIdisplay\fP\^)
-.LP
-DefaultScreenOfDisplay\^(\^\fIdisplay\fP\^)
-.LP
-DefaultScreen\^(\^\fIdisplay\fP\^)
-.LP
-DefaultVisual\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DisplayCells\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DisplayPlanes\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DisplayString\^(\^\fIdisplay\fP\^)
-.LP
-long XMaxRequestSize(\^\fIdisplay\fP\^)
-	Display *\fIdisplay\fP\^;
-.LP
-long XExtendedMaxRequestSize(\^\fIdisplay\fP\^)
-	Display *\fIdisplay\fP\^;
-.LP
-LastKnownRequestProcessed\^(\^\fIdisplay\fP\^)
-.LP
-NextRequest\^(\^\fIdisplay\fP\^)
-.LP
-ProtocolVersion\^(\^\fIdisplay\fP\^)
-.LP
-ProtocolRevision\^(\^\fIdisplay\fP\^)
-.LP
-QLength\^(\^\fIdisplay\fP\^)
-.LP
-RootWindow\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-ScreenCount\^(\^\fIdisplay\fP\^)
-.LP
-ScreenOfDisplay\^(\^\fIdisplay\fP, \fIscreen_number\fP\^)
-.LP
-ServerVendor\^(\^\fIdisplay\fP\^)
-.LP
-VendorRelease\^(\^\fIdisplay\fP\^)
+unsigned long AllPlanes; 
+.HP
+unsigned long BlackPixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^);
+.HP
+unsigned long WhitePixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^); 
+.HP
+int ConnectionNumber\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Colormap DefaultColormap\^(\^Display *\fIdisplay\fP\^,
+\^int \fIscreen_number\fP\^); 
+.HP
+int DefaultDepth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+int *XListDepths\^(\^Display *\fIdisplay\fP, int \fIscreen_number\fP, int
+\fIcount_return\fP\^); 
+.HP
+GC DefaultGC\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+Window DefaultRootWindow\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Screen *DefaultScreenOfDisplay\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int DefaultScreen\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Visual *DefaultVisual\^(\^Display *\fIdisplay\fP\^, \^int
+\fIscreen_number\fP\^); 
+.HP
+int DisplayCells\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+int DisplayPlanes\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+char *DisplayString\^(\^Display *\fIdisplay\fP\^);
+.HP
+long XMaxRequestSize(\^Display *\fIdisplay\fP\^)
+.HP
+long XExtendedMaxRequestSize(\^Display *\fIdisplay\fP\^)
+.HP
+unsigned long LastKnownRequestProcessed\^(\^Display *\fIdisplay\fP\^); 
+.HP
+unsigned long NextRequest\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int ProtocolVersion\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int ProtocolRevision\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int QLength\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Window RootWindow\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+int ScreenCount\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Screen *ScreenOfDisplay\^(\^Display *\fIdisplay\fP, int
+\fIscreen_number\fP\^); 
+.HP
+char *ServerVendor\^(\^Display *\fIdisplay\fP\^)
+.HP
+int VendorRelease\^(\^Display *\fIdisplay\fP\^)
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/BlackPixelOfScreen.man b/man/BlackPixelOfScreen.man
index eb23f805..4bbc88ad 100644
--- a/man/BlackPixelOfScreen.man
+++ b/man/BlackPixelOfScreen.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/BlkPScrn.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/BlkPScrn.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,47 +144,46 @@
 .SH NAME
 BlackPixelOfScreen, WhitePixelOfScreen, CellsOfScreen, DefaultColormapOfScreen, DefaultDepthOfScreen, DefaultGCOfScreen, DefaultVisualOfScreen, DoesBackingStore, DoesSaveUnders, DisplayOfScreen, XScreenNumberOfScreen, EventMaskOfScreen, HeightOfScreen, HeightMMOfScreen, MaxCmapsOfScreen, MinCmapsOfScreen, PlanesOfScreen, RootWindowOfScreen, WidthOfScreen, WidthMMOfScreen \- screen information functions and macros
 .SH SYNTAX
-BlackPixelOfScreen\^(\^\fIscreen\fP\^)
-.LP
-WhitePixelOfScreen\^(\^\fIscreen\fP\^)
-.LP
-CellsOfScreen\^(\^\fIscreen\fP\^)
-.LP
-DefaultColormapOfScreen\^(\^\fIscreen\fP\^)
-.LP
-DefaultDepthOfScreen\^(\^\fIscreen\fP\^)
-.LP
-DefaultGCOfScreen\^(\^\fIscreen\fP\^)
-.LP
-DefaultVisualOfScreen\^(\^\fIscreen\fP\^)
-.LP
-DoesBackingStore\^(\^\fIscreen\fP\^)
-.LP
-DoesSaveUnders\^(\^\fIscreen\fP\^)
-.LP
-DisplayOfScreen\^(\^\fIscreen\fP\^)
-.LP
-int XScreenNumberOfScreen\^(\^\fIscreen\fP\^)
-.br
-      Screen *\fIscreen\fP\^;
-.LP
-EventMaskOfScreen\^(\^\fIscreen\fP\^)
-.LP
-HeightOfScreen\^(\^\fIscreen\fP\^)
-.LP
-HeightMMOfScreen\^(\^\fIscreen\fP\^)
-.LP
-MaxCmapsOfScreen\^(\^\fIscreen\fP\^)
-.LP
-MinCmapsOfScreen\^(\^\fIscreen\fP\^)
-.LP
-PlanesOfScreen\^(\^\fIscreen\fP\^)
-.LP
-RootWindowOfScreen\^(\^\fIscreen\fP\^)
-.LP
-WidthOfScreen\^(\^\fIscreen\fP\^)
-.LP
-WidthMMOfScreen\^(\^\fIscreen\fP\^)
+.HP
+unsigned long BlackPixelOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+unsigned long WhitePixelOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int CellsOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+Colormap DefaultColormapOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int DefaultDepthOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+GC DefaultGCOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+Visual *DefaultVisualOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int DoesBackingStore\^(\^Screen *\fIscreen\fP\^);
+.HP
+Bool DoesSaveUnders\^(\^Screen *\fIscreen\fP\^);
+.HP
+Display *DisplayOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int XScreenNumberOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+long EventMaskOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int HeightOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int HeightMMOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int MaxCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int MinCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int PlanesOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+Window RootWindowOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int WidthOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int WidthMMOfScreen\^(\^Screen *\fIscreen\fP\^);
 .SH ARGUMENTS
 .IP \fIscreen\fP 1i
 Specifies the appropriate 
diff --git a/man/DisplayOfCCC.man b/man/DisplayOfCCC.man
index ceb5e127..053a2a31 100644
--- a/man/DisplayOfCCC.man
+++ b/man/DisplayOfCCC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/Dis3C.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/Dis3C.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,16 @@
 .SH NAME
 DisplayOfCCC, VisualOfCCC, ScreenNumberOfCCC, ScreenWhitePointOfCCC, ClientWhitePointOfCCC \- Color Conversion Context macros
 .SH SYNTAX
-DisplayOfCCC\^(\^\fIccc\fP\^)
-.br
-     XcmsCCC \fIccc\fP\^;
-.LP
-VisualOfCCC\^(\^\fIccc\fP\^)
-.br
-     XcmsCCC \fIccc\fP\^;
-.LP
-ScreenNumberOfCCC\^(\^\fIccc\fP\^)
-.br
-     XcmsCCC \fIccc\fP\^;
-.LP
-ScreenWhitePointOfCCC\^(\^\fIccc\fP\^)
-.br
-     XcmsCCC \fIccc\fP\^;
-.LP
-ClientWhitePointOfCCC\^(\^\fIccc\fP\^)
-.br
-     XcmsCCC \fIccc\fP\^;
+.HP
+Display *DisplayOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+Visual *VisualOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+int ScreenNumberOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+XcmsColor *ScreenWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+XcmsColor *ClientWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/ImageByteOrder.man b/man/ImageByteOrder.man
index 9b4ea652..405a11e1 100644
--- a/man/ImageByteOrder.man
+++ b/man/ImageByteOrder.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/ImageOrd.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/ImageOrd.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,24 @@
 .SH NAME
 ImageByteOrder, BitmapBitOrder, BitmapPad, BitmapUnit, DisplayHeight, DisplayHeightMM, DisplayWidth, DisplayWidthMM, XListPixmapFormats, XPixmapFormatValues \- image format functions and macros
 .SH SYNTAX
-XPixmapFormatValues *XListPixmapFormats\^(\^\fIdisplay\fP, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fIcount_return\fP\^;
-.LP
-ImageByteOrder\^(\^\fIdisplay\fP\^)
-.LP
-BitmapBitOrder\^(\^\fIdisplay\fP\^)
-.LP
-BitmapPad\^(\^\fIdisplay\fP\^)
-.LP
-BitmapUnit\^(\^\fIdisplay\fP\^)
-.LP
-DisplayHeight\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DisplayHeightMM\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DisplayWidth\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
-.LP
-DisplayWidthMM\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
+.HP
+XPixmapFormatValues *XListPixmapFormats\^(\^Display *\fIdisplay\fP, int *\fIcount_return\fP\^);
+.HP
+int ImageByteOrder\^(\^Display *\fIdisplay\fP\^);
+.HP
+int BitmapBitOrder\^(\^Display *\fIdisplay\fP\^);
+.HP
+int BitmapPad\^(\^Display *\fIdisplay\fP\^);
+.HP
+int BitmapUnit\^(\^Display *\fIdisplay\fP\^);
+.HP
+int DisplayHeight\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+int DisplayHeightMM\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+int DisplayWidth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+int DisplayWidthMM\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/IsCursorKey.man b/man/IsCursorKey.man
index 81cd04f9..82c9a22f 100644
--- a/man/IsCursorKey.man
+++ b/man/IsCursorKey.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/IsCKey.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/IsCKey.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,19 @@
 .SH NAME
 IsCursorKey, IsFunctionKey, IsKeypadKey, IsMiscFunctionKey, IsModiferKey, IsPFKey, IsPrivateKeypadKey \- keysym classification macros
 .SH SYNTAX
-IsCursorKey\^(\^\fIkeysym\fP\^)
+int IsCursorKey\^(\^KeySym \fIkeysym\fP\^);
 .LP
-IsFunctionKey\^(\^\fIkeysym\fP\^)
+int IsFunctionKey\^(\^KeySym \fIkeysym\fP\^);
 .LP
-IsKeypadKey\^(\^\fIkeysym\fP\^)
+int IsKeypadKey\^(\^KeySym \fIkeysym\fP\^);
 .LP
-IsMiscFunctionKey\^(\^\fIkeysym\fP\^)
+int IsMiscFunctionKey\^(\^KeySym \fIkeysym\fP\^);
 .LP
-IsModifierKey\^(\^\fIkeysym\fP\^)
+int IsModifierKey\^(\^KeySym \fIkeysym\fP\^);
 .LP
-IsPFKey\^(\^\fIkeysym\fP\^)
+int IsPFKey\^(\^KeySym \fIkeysym\fP\^);
 .LP
-IsPrivateKeypadKey\^(\^\fIkeysym\fP\^)
+int IsPrivateKeypadKey\^(\^KeySym \fIkeysym\fP\^);
 .SH ARGUMENTS
 .ds Fn tested
 .IP \fIkeysym\fP 1i
diff --git a/man/XAddConnectionWatch.man b/man/XAddConnectionWatch.man
index dd494dad..ead88b9f 100644
--- a/man/XAddConnectionWatch.man
+++ b/man/XAddConnectionWatch.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XIntConn.man,v 1.3 2001/11/21 22:54:13 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XIntConn.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,47 +144,21 @@
 .SH NAME
 XAddConnectionWatch, XRemoveConnectionWatch, XProcessInternalConnection, XInternalConnectionNumbers \- handle Xlib internal connections
 .SH SYNTAX
-typedef void (*XConnectionWatchProc)\^(\^\fIdisplay\fP, \fIclient_data\fP, \fIfd\fP, \fIopening\fP, \fIwatch_data\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XPointer \fIclient_data\fP\^;
-.br
-      int \fIfd\fP\^;
-.br
-      Bool \fIopening\fP\^;
-.br
-      XPointer *\fIwatch_data\fP\^;
-.LP
-Status XAddConnectionWatch\^(\^\fIdisplay\fP, \fIprocedure\fP\^, \fIclient_data\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XWatchProc \fIprocedure\fP\^;
-.br
-      XPointer \fIclient_data\fP\^;
-.LP
-Status XRemoveConnectionWatch\^(\^\fIdisplay\fP, \fIprocedure\fP\^, \fIclient_data\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XWatchProc \fIprocedure\fP\^;
-.br
-      XPointer \fIclient_data\fP\^;
-.LP
-void XProcessInternalConnection\^(\^\fIdisplay\fP, \fIfd\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIfd\fP\^;
-.LP
-Status XInternalConnectionNumbers\^(\^\fIdisplay\fP, \fIfd_return\fP\^, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int **\fIfd_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
+.HP
+typedef void (*XConnectionWatchProc)\^(\^Display *\fIdisplay\fP\^, XPointer
+\fIclient_data\fP\^, int \fIfd\fP\^, Bool \fIopening\fP\^, XPointer
+*\fIwatch_data\fP\^); 
+.HP
+Status XAddConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc
+\fIprocedure\fP\^, XPointer \fIclient_data\fP\^); 
+.HP
+Status XRemoveConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc
+\fIprocedure\fP\^, XPointer \fIclient_data\fP\^); 
+.HP
+void XProcessInternalConnection\^(\^Display *\fIdisplay\fP\^, int \fIfd\fP\^);
+.HP
+Status XInternalConnectionNumbers\^(\^Display *\fIdisplay\fP\^, int
+**\fIfd_return\fP\^, int *\fIcount_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIclient_data\fP 1i
 Specifies the additional client data.
diff --git a/man/XAddHost.man b/man/XAddHost.man
index e2ffd94c..a4e5b27c 100644
--- a/man/XAddHost.man
+++ b/man/XAddHost.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,55 +144,24 @@
 .SH NAME
 XAddHost, XAddHosts, XListHosts, XRemoveHost, XRemoveHosts, XSetAccessControl, XEnableAccessControl, XDisableAccessControl, XHostAddress \- control host access and host control structure
 .SH SYNTAX
-XAddHost\^(\^\fIdisplay\fP, \fIhost\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XHostAddress *\fIhost\fP\^;	
-.LP
-XAddHosts\^(\^\fIdisplay\fP, \fIhosts\fP, \fInum_hosts\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XHostAddress *\fIhosts\fP\^;
-.br
-      int \fInum_hosts\fP\^;
-.LP
-XHostAddress *XListHosts\^(\^\fIdisplay\fP, \fInhosts_return\fP, \fIstate_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fInhosts_return\fP\^;
-.br
-      Bool *\fIstate_return\fP\^;
-.LP
-XRemoveHost\^(\^\fIdisplay\fP, \fIhost\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XHostAddress *\fIhost\fP\^;
-.LP
-XRemoveHosts\^(\^\fIdisplay\fP, \fIhosts\fP, \fInum_hosts\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XHostAddress *\fIhosts\fP\^;
-.br
-      int \fInum_hosts\fP\^;
-.LP
-XSetAccessControl\^(\^\fIdisplay\fP, \fImode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fImode\fP\^;
-.LP
-XEnableAccessControl\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XDisableAccessControl\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
+.HP
+int XAddHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^); 
+.HP
+int XAddHosts\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhosts\fP, 
+int \fInum_hosts\fP\^);
+.HP
+XHostAddress *XListHosts\^(\^Display *\fIdisplay\fP, int *\fInhosts_return\fP,
+Bool \fIstate_return\fP\^);
+.HP
+int XRemoveHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^);
+.HP
+int XRemoveHosts\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhosts\fP, int \fInum_hosts\fP\^);
+.HP
+int XSetAccessControl\^(\^Display *\fIdisplay\fP, int \fImode\fP\^);
+.HP
+int XEnableAccessControl\^(\^Display *\fIdisplay\fP\^);
+.HP
+int XDisableAccessControl\^(\^Display *\fIdisplay\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XAllocClassHint.man b/man/XAllocClassHint.man
index fc0a173a..63cfffce 100644
--- a/man/XAllocClassHint.man
+++ b/man/XAllocClassHint.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XACHints.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XACHints.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,23 +144,12 @@
 .SH NAME
 XAllocClassHint, XSetClassHint, XGetClassHint, XClassHint \- allocate class hints structure and set or read a window's WM_CLASS property
 .SH SYNTAX
-XClassHint *XAllocClassHint\^(\|)
-.LP
-XSetClassHint\^(\^\fIdisplay\fP, \fIw\fP, \fIclass_hints\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XClassHint *\fIclass_hints\fP\^;
-.LP
-Status XGetClassHint\^(\^\fIdisplay\fP, \fIw\fP, \fIclass_hints_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP;
-.br
-      XClassHint *\fIclass_hints_return\fP\^;
+.HP
+XClassHint *XAllocClassHint\^(void\^);
+.HP
+XSetClassHint\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XClassHint *\fIclass_hints\fP\^);
+.HP
+Status XGetClassHint\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XClassHint *\fIclass_hints_return\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XAllocColor.man b/man/XAllocColor.man
index 96c0e5e7..984f2f94 100644
--- a/man/XAllocColor.man
+++ b/man/XAllocColor.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAllColor.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XAllColor.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,74 +146,27 @@
 .SH NAME
 XAllocColor, XAllocNamedColor, XAllocColorCells, XAllocColorPlanes, XFreeColors \- allocate and free colors
 .SH SYNTAX
-Status XAllocColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIscreen_in_out\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XColor *\fIscreen_in_out\fP\^;
-.LP
-Status XAllocNamedColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^,
-\fIcolor_name\fP\^, \fIscreen_def_return\fP\^, \fIexact_def_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      char *\fIcolor_name\fP\^;
-.br
-      XColor *\fIscreen_def_return\fP\^, *\fIexact_def_return\fP\^;
-.LP
-Status XAllocColorCells\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcontig\fP\^,
-\fIplane_masks_return\fP\^, \fInplanes\fP\^, 
-.br
-                          \fIpixels_return\fP\^, \fInpixels\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      Bool \fIcontig\fP\^;
-.br
-      unsigned long \fIplane_masks_return\fP[\^]\^;
-.br
-      unsigned int \fInplanes\fP\^;
-.br
-      unsigned long \fIpixels_return\fP[\^]\^;
-.br
-      unsigned int \fInpixels\fP\^;
-.LP
-Status XAllocColorPlanes\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcontig\fP\^, \fIpixels_return\fP\^, \fIncolors\fP\^, \fInreds\fP\^, \fIngreens\fP\^, 
-.br
-                           \fInblues\fP\^, \fIrmask_return\fP\^, \fIgmask_return\fP\^, \fIbmask_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      Bool \fIcontig\fP\^;
-.br
-      unsigned long \fIpixels_return\fP[\^]\^;
-.br
-      int \fIncolors\fP\^;
-.br
-      int \fInreds\fP\^, \fIngreens\fP\^, \fInblues\fP\^;
-.br
-      unsigned long *\fIrmask_return\fP\^, *\fIgmask_return\fP\^, *\fIbmask_return\fP\^;
-.LP
-XFreeColors\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIpixels\fP\^, \fInpixels\fP\^, \fIplanes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      unsigned long \fIpixels\fP\^[\^];
-.br
-      int \fInpixels\fP\^;
-.br
-      unsigned long \fIplanes\fP\^;
-.SH ARGUMENTS
+.HP
+Status XAllocColor\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
+XColor *\fIscreen_in_out\fP\^);
+.HP
+Status XAllocNamedColor\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
+char *\fIcolor_name\fP\^, XColor *\fIscreen_def_return\fP\^, XColor
+*\fIexact_def_return\fP\^);
+.HP
+Status XAllocColorCells\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
+Bool \fIcontig\fP\^, unsigned long\fIplane_masks_return\fP[\^]\^, unsigned int
+\fInplanes\fP\^, unsigned long \fIpixels_return\fP[\^]\^, unsigned int
+\fInpixels\fP\^);
+.HP
+Status XAllocColorPlanes\^(\^Display *\fIdisplay\fP, Colormap
+\fIcolormap\fP\^, Bool \fIcontig\fP\^, unsigned long
+\fIpixels_return\fP[\^]\^, int \fIncolors\fP\^, int \fInreds\fP\^, int
+\fIngreens\fP\^, int \fInblues\fP\^, unsigned long *\fIrmask_return\fP\^,
+unsigned long *\fIgmask_return\fP\^, unsigned long *\fIbmask_return\fP\^);
+.HP
+int XFreeColors\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^, unsigned
+long \fIpixels\fP\^[\^], int \fInpixels\fP\^, unsigned long \fIplanes\fP\^);
 .IP \fIcolor_name\fP 1i
 Specifies the color name string (for example, red) whose color 
 definition structure you want returned.
diff --git a/man/XAllocIconSize.man b/man/XAllocIconSize.man
index a9d38a53..cabd70b8 100644
--- a/man/XAllocIconSize.man
+++ b/man/XAllocIconSize.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAIcSize.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XAIcSize.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,13 @@
 .SH NAME
 XAllocIconSize, XSetIconSizes, XGetIconSizes, XIconSize \- allocate icon size structure and set or read a window's WM_ICON_SIZES property
 .SH SYNTAX
-XIconSize *XAllocIconSize\^(\|)
+XIconSize *XAllocIconSize\^(void\^);
 .LP
-XSetIconSizes\^(\^\fIdisplay\fP, \fIw\fP, \fIsize_list\fP, \fIcount\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XIconSize *\fIsize_list\fP\^;
-.br
-      int \fIcount\fP\^;
+int XSetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize
+*\fIsize_list\fP, int \fIcount\fP\^);
 .LP
-Status XGetIconSizes\^(\^\fIdisplay\fP, \fIw\fP, \fIsize_list_return\fP, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XIconSize **\fIsize_list_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
+Status XGetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize
+**\fIsize_list_return\fP, int \fIcount_return\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XAllocSizeHints.man b/man/XAllocSizeHints.man
index 5d6198d4..64049e40 100644
--- a/man/XAllocSizeHints.man
+++ b/man/XAllocSizeHints.man
@@ -41,11 +41,11 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XASHints.man,v 1.4 2001/02/09 03:47:44 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XASHints.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
-.ds xL Xlib \- C Language X Interface
+.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, 
 .ds xC Inter-Client Communication Conventions Manual
 .na
 .de Ds
@@ -146,49 +146,19 @@
 .SH NAME
 XAllocSizeHints, XSetWMNormalHints, XGetWMNormalHints, XSetWMSizeHints, XGetWMSizeHints, XSizeHints \- allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
 .SH SYNTAX
-XSizeHints *XAllocSizeHints\^(\|)
-.LP
-void XSetWMNormalHints\^(\^\fIdisplay\fP, \fIw\fP, \fIhints\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XSizeHints *\fIhints\fP\^;
-.LP
-Status XGetWMNormalHints\^(\^\fIdisplay\fP, \fIw\fP, \fIhints_return\fP,
-\fIsupplied_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XSizeHints *\fIhints_return\fP\^;
-.br
-      long *\fIsupplied_return\fP\^;
-.LP
-void XSetWMSizeHints\^(\^\fIdisplay\fP, \fIw\fP, \fIhints\fP, \fIproperty\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XSizeHints *\fIhints\fP\^;
-.br
-      Atom \fIproperty\fP\^;
-.LP
-Status XGetWMSizeHints\^(\^\fIdisplay\fP, \fIw\fP, \fIhints_return\fP,
-\fIsupplied_return\fP, \fIproperty\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XSizeHints *\fIhints_return\fP\^;
-.br
-      long *\fIsupplied_return\fP\^;
-.br
-      Atom \fIproperty\fP\^;
+.HP
+XSizeHints *XAllocSizeHints\^(void\^);
+.HP
+void XSetWMNormalHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints *\fIhints\fP\^);
+.HP
+Status XGetWMNormalHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP,
+XSizeHints *\fIhints_return\fP, long *\fIsupplied_return\fP\^);
+.HP
+void XSetWMSizeHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints
+*\fIhints\fP, Atom \fIproperty\fP\^);
+.HP
+Status XGetWMSizeHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints
+*\fIhints_return\fP, long *\fIsupplied_return\fP, Atom \fIproperty\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
@@ -325,7 +295,7 @@ the supplied_return argument will contain the following bits:
 .LP
 .Ds
 (USPosition|USSize|PPosition|PSize|PMinSize|
- PMaxSize|PResizeInc|PAspect)
+ PMaxSize|PResizeInc|PAspect);
 .De
 .LP
 If the property is large enough to contain the base size 
diff --git a/man/XAllocStandardColormap.man b/man/XAllocStandardColormap.man
index 685de492..f71fc5b1 100644
--- a/man/XAllocStandardColormap.man
+++ b/man/XAllocStandardColormap.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XASCmap.man,v 1.4 2001/02/09 03:47:44 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XASCmap.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,33 +146,16 @@
 .SH NAME
 XAllocStandardColormap, XSetRGBColormaps, XGetRGBColormaps, XStandardColormap \- allocate, set, or read a standard colormap structure
 .SH SYNTAX
-XStandardColormap *XAllocStandardColormap\^(\|)
-.LP
-void XSetRGBColormaps\^(\^\fIdisplay\fP, \fIw\fP, \fIstd_colormap\fP,
-\fIcount\fP, \fIproperty\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XStandardColormap *\fIstd_colormap\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      Atom \fIproperty\fP\^;
-.LP
-Status XGetRGBColormaps\^(\^\fIdisplay\fP, \fIw\fP, \fIstd_colormap_return\fP,
-\fIcount_return\fP, \fIproperty\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XStandardColormap **\fIstd_colormap_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
-.br
-      Atom \fIproperty\fP\^;
+.HP
+XStandardColormap *XAllocStandardColormap\^(void\^);
+.HP
+void XSetRGBColormaps\^(\^Display *\fIdisplay\fP, Window \fIw\fP,
+XStandardColormap *\fIstd_colormap\fP,
+int \fIcount\fP, Atom \fIproperty\fP\^);
+.HP
+Status XGetRGBColormaps\^(\^Display *\fIdisplay\fP, Window \fIw\fP,
+XStandardColormap **\fIstd_colormap_return\fP, int *\fIcount_return\fP,
+Atom \fIproperty\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
@@ -308,7 +291,7 @@ T{
 T}	T{
 .ZN ReleaseByFreeingColormap
 T}	T{
-( (XID) 1L)
+( (XID) 1L);
 T}
 .TE
 /* Values */
@@ -346,7 +329,7 @@ green_max = 5, and blue_max = 5.
 .LP
 The red_mult, green_mult, and blue_mult members give the
 scale factors used to compose a full pixel value. 
-(See the discussion of the base_pixel members for further information.)
+(See the discussion of the base_pixel members for further information.);
 For a 3/3/2 allocation, red_mult might be 32,
 green_mult might be 4, and blue_mult might be 1.  
 For a 6-colors-each allocation, red_mult might be 36, 
@@ -398,7 +381,7 @@ the cells held by this standard colormap are to be released
 by freeing the colormap ID or by calling the
 .ZN XKillClient
 function on the indicated resource.
-(Note that this method is necessary for allocating out of an existing colormap.)
+(Note that this method is necessary for allocating out of an existing colormap.);
 .LP
 The properties containing the 
 .ZN XStandardColormap 
diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man
index 816f014e..e024c703 100644
--- a/man/XAllocWMHints.man
+++ b/man/XAllocWMHints.man
@@ -41,11 +41,12 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAWMHints.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XAWMHints.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
-.ds xL Xlib \- C Language X Interface
+.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol,
+1991. 
 .ds xC Inter-Client Communication Conventions Manual
 .na
 .de Ds
@@ -146,22 +147,12 @@
 .SH NAME
 XAllocWMHints, XSetWMHints, XGetWMHints, XWMHints \- allocate window manager hints structure and set or read a window's WM_HINTS property
 .SH SYNTAX
-XWMHints *XAllocWMHints\^(\|)
-.LP
-XSetWMHints\^(\^\fIdisplay\fP, \fIw\fP, \fIwmhints\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XWMHints *\fIwmhints\fP\^;
-
-.LP
-XWMHints *XGetWMHints\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+XWMHints *XAllocWMHints\^(void\^); 
+.HP
+int XSetWMHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XWMHints *\fIwmhints\fP\^);
+.HP
+XWMHints *XGetWMHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
@@ -234,56 +225,56 @@ T{
 T}	T{
 .ZN InputHint
 T}	T{
-(1L << 0)
+(1L << 0);
 T}
 T{
 \&#define
 T}	T{
 .ZN StateHint
 T}	T{
-(1L << 1)
+(1L << 1);
 T}
 T{
 \&#define
 T}	T{
 .ZN IconPixmapHint
 T}	T{
-(1L << 2)
+(1L << 2);
 T}
 T{
 \&#define
 T}	T{
 .ZN IconWindowHint
 T}	T{
-(1L << 3)
+(1L << 3);
 T}
 T{
 \&#define
 T}	T{
 .ZN IconPositionHint
 T}	T{
-(1L << 4)
+(1L << 4);
 T}
 T{
 \&#define
 T}	T{
 .ZN IconMaskHint
 T}	T{
-(1L << 5)
+(1L << 5);
 T}
 T{
 \&#define
 T}	T{
 .ZN WindowGroupHint
 T}	T{
-(1L << 6)
+(1L << 6);
 T}
 T{
 \&#define
 T}	T{
 .ZN UrgencyHint
 T}	T{
-(1L << 8)
+(1L << 8);
 T}
 T{
 \&#define
@@ -294,7 +285,7 @@ T}	T{
 .br
 IconWindowHint|IconPositionHint|
 .br
-IconMaskHint|WindowGroupHint)
+IconMaskHint|WindowGroupHint);
 T}
 .TE
 .IN "XWMHints" "" "@DEF@"
@@ -399,7 +390,7 @@ contents to be urgent, requiring the timely response of the user.  The
 window manager will make some effort to draw the user's attention to this
 window while this flag is set.  The client must provide some means by which the
 user can cause the urgency flag to be cleared (either mitigating
-the condition that made the window urgent or merely shutting off the alarm)
+the condition that made the window urgent or merely shutting off the alarm);
 or the window to be withdrawn.
 .SH DIAGNOSTICS
 .TP 1i
diff --git a/man/XAllowEvents.man b/man/XAllowEvents.man
index e2e77da3..ba298640 100644
--- a/man/XAllowEvents.man
+++ b/man/XAllowEvents.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAllEvnt.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XAllEvnt.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,9 @@
 .SH NAME
 XAllowEvents \- release queued events
 .SH SYNTAX
-XAllowEvents\^(\^\fIdisplay\fP, \fIevent_mode\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIevent_mode\fP\^; 
-.br
-      Time \fItime\fP\^; 
+.HP
+int XAllowEvents\^(\^Display *\fIdisplay\fP, int \fIevent_mode\fP\^,
+Time \fItime\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man
index bf1e9e80..37935d7b 100644
--- a/man/XChangeKeyboardControl.man
+++ b/man/XChangeKeyboardControl.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCKCntrl.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XCKCntrl.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,39 +146,20 @@
 .SH NAME
 XChangeKeyboardControl, XGetKeyboardControl, XAutoRepeatOn, XAutoRepeatOff, XBell, XQueryKeymap, XKeyboardControl \- manipulate keyboard settings and keyboard control structure
 .SH SYNTAX
-XChangeKeyboardControl\^(\^\fIdisplay\fP, \fIvalue_mask\fP\^, \fIvalues\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned long \fIvalue_mask\fP\^;
-.br
-      XKeyboardControl *\fIvalues\fP\^;
-.LP
-XGetKeyboardControl\^(\^\fIdisplay\fP, \fIvalues_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XKeyboardState *\fIvalues_return\fP\^;
-.LP
-XAutoRepeatOn\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XAutoRepeatOff\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XBell\^(\^\fIdisplay\fP, \fIpercent\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIpercent\fP\^;
-.LP
-XQueryKeymap\^(\^\fIdisplay\fP, \fIkeys_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char \fIkeys_return\fP[32]\^;
+.HP
+int XChangeKeyboardControl\^(\^Display *\fIdisplay\fP, unsigned long
+\fIvalue_mask\fP\^, XKeyBoardControl *\fIvalues\fP\^); 
+.HP
+int XGetKeyboardControl\^(\^Display *\fIdisplay\fP, XKeyBoardState
+*\fIvalues_return\fP\^); 
+.HP
+int XAutoRepeatOn\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XAutoRepeatOff\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XBell\^(\^Display *\fIdisplay\fP, int \fIpercent\fP\^); 
+.HP
+int XQueryKeymap\^(\^Display *\fIdisplay\fP, char \fIkeys_return\fP[32]\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man
index c4fcdbdb..7773e674 100644
--- a/man/XChangeKeyboardMapping.man
+++ b/man/XChangeKeyboardMapping.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCKMping.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XCKMping.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,73 +144,31 @@
 .SH NAME
 XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifierMap XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure
 .SH SYNTAX
-XChangeKeyboardMapping(\^\fIdisplay\fP, \fIfirst_keycode\fP, \fIkeysyms_per_keycode\fP, \fIkeysyms\fP, \fInum_codes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIfirst_keycode\fP\^;
-.br
-      int \fIkeysyms_per_keycode\fP\^;
-.br
-      KeySym *\fIkeysyms\fP\^;
-.br
-      int \fInum_codes\fP\^;
-.LP
-KeySym *XGetKeyboardMapping(\^\fIdisplay\fP, \fIfirst_keycode\fP, \fIkeycode_count\fP, 
-.br
-                            \fIkeysyms_per_keycode_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      KeyCode \fIfirst_keycode\fP\^;
-.br
-      int \fIkeycode_count\fP\^;
-.br
-      int *\fIkeysyms_per_keycode_return\fP\^;
-.LP
-XDisplayKeycodes\^(\^\fIdisplay\fP\^, \fImin_keycodes_return\fP\^,
-\fImax_keycodes_return\fP\^)
-.br
-        Display *\^\fIdisplay\fP\^;
-.br
-        int *\^\fImin_keycodes_return\fP\^, *\^\fImax_keycodes_return\fP\^;
-.LP
-int XSetModifierMapping(\^\fIdisplay\fP, \fImodmap\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        XModifierKeymap *\fImodmap\fP\^;
-.LP
-XModifierKeymap *XGetModifierMapping(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-
-.LP
-XModifierKeymap *XNewModifiermap(\^\fImax_keys_per_mod\fP\^)
-.br
-        int \fImax_keys_per_mod\fP\^;
-.LP
-XModifierKeymap *XInsertModifiermapEntry\^(\^\fImodmap\fP,
-\fIkeycode_entry\fP, \fImodifier\fP\^)
-.br
-     XModifierKeymap *\fImodmap\fP\^;
-.br
-     KeyCode \fIkeycode_entry\fP\^;
-.br
-     int \fImodifier\fP\^;
-.LP
-XModifierKeymap *XDeleteModifiermapEntry\^(\^\fImodmap\fP,
-\fIkeycode_entry\fP, \fImodifier\fP\^)
-.br
-     XModifierKeymap *\fImodmap\fP\^;
-.br
-     KeyCode \fIkeycode_entry\fP\^;
-.br
-     int \fImodifier\fP\^;
-.LP
-XFreeModifiermap(\^\fImodmap\fP\^)
-.br
-        XModifierKeymap *\fImodmap\fP;
+.HP
+int XChangeKeyboardMapping(\^Display *\fIdisplay\fP, int \fIfirst_keycode\fP,
+int \fIkeysyms_per_keycode\fP, KeySym *\fIkeysyms\fP, int \fInum_codes\fP\^); 
+.HP
+KeySym *XGetKeyboardMapping(\^Display *\fIdisplay\fP, KeyCode
+\fIfirst_keycode\fP, int \fIkeycode_count\fP, int
+*\fIkeysyms_per_keycode_return\fP\^); 
+.HP
+int XDisplayKeycodes\^(\^Display *\fIdisplay\fP\^, int
+*\fImin_keycodes_return\fP\^, int *\fImax_keycodes_return\fP\^); 
+.HP
+int XSetModifierMapping(\^Display *\fIdisplay\fP, XModifierKeymap
+*\fImodmap\fP\^); 
+.HP
+XModifierKeymap *XGetModifierMapping(\^Display *\fIdisplay\fP\^); 
+.HP
+XModifierKeymap *XNewModifiermap(\^int \fImax_keys_per_mod\fP\^); 
+.HP
+XModifierKeymap *XInsertModifiermapEntry\^(\^XModifierKeymap *\fImodmap\fP,
+KeyCode \fIkeycode_entry\fP, int \fImodifier\fP\^); 
+.HP
+XModifierKeymap *XDeleteModifiermapEntry\^(\^XModifierKeymap *\fImodmap\fP,
+KeyCode \fIkeycode_entry\fP, int \fImodifier\fP\^); 
+.HP
+int XFreeModifiermap(\^XModifierKeymap *\fImodmap\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XChangePointerControl.man b/man/XChangePointerControl.man
index 4cfa5028..996a073b 100644
--- a/man/XChangePointerControl.man
+++ b/man/XChangePointerControl.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCPCntrl.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCPCntrl.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,14 @@
 .SH NAME
 XChangePointerControl, XGetPointerControl \- control pointer 
 .SH SYNTAX
-XChangePointerControl\^(\^\fIdisplay\fP, \fIdo_accel\fP\^, \fIdo_threshold\fP\^, \fIaccel_numerator\fP\^, 
-.br
-                        \fIaccel_denominator\fP\^, \fIthreshold\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Bool \fIdo_accel\fP\^, \fIdo_threshold\fP\^;
-.br
-      int \fIaccel_numerator\fP\^, \fIaccel_denominator\fP\^;
-.br
-      int \fIthreshold\fP\^;
-.LP
-XGetPointerControl\^(\^\fIdisplay\fP, \fIaccel_numerator_return\fP\^, \fIaccel_denominator_return\fP\^, 
-.br
-                       \fIthreshold_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fIaccel_numerator_return\fP\^, *\fIaccel_denominator_return\fP\^;
-.br
-      int *\fIthreshold_return\fP\^;
+.HP
+int XChangePointerControl\^(\^Display *\fIdisplay\fP\^, Bool \fIdo_accel\fP\^,
+Bool \fIdo_threshold\fP\^, int \fIaccel_numerator\fP\^, int
+\fIaccel_denominator\fP\^, int \fIthreshold\fP\^);
+.HP
+int XGetPointerControl\^(\^Display *\fIdisplay\fP\^, int
+*\fIaccel_numerator_return\fP\^, int *\fIaccel_denominator_return\fP\^, int
+*\fIthreshold_return\fP\^);
 .SH ARGUMENTS
 .IP \fIaccel_denominator\fP 1i
 Specifies the denominator for the acceleration multiplier.
diff --git a/man/XChangeSaveSet.man b/man/XChangeSaveSet.man
index df04b9f5..4c734e21 100644
--- a/man/XChangeSaveSet.man
+++ b/man/XChangeSaveSet.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCSSet.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCSSet.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,12 @@
 .SH NAME
 XChangeSaveSet, XAddToSaveSet, XRemoveFromSaveSet \- change a client's save set
 .SH SYNTAX
-XChangeSaveSet\^(\^\fIdisplay\fP, \fIw\fP\^, \fIchange_mode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIchange_mode\fP\^;
-.LP
-XAddToSaveSet\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XRemoveFromSaveSet\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+int XChangeSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIchange_mode\fP\^);
+.HP
+int XAddToSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.HP
+int XRemoveFromSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
 .SH ARGUMENTS
 .IP \fIchange_mode\fP 1i
 Specifies the mode.
diff --git a/man/XChangeWindowAttributes.man b/man/XChangeWindowAttributes.man
index d62816ea..887246c4 100644
--- a/man/XChangeWindowAttributes.man
+++ b/man/XChangeWindowAttributes.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCWAttrib.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCWAttrib.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,55 +144,19 @@
 .SH NAME
 XChangeWindowAttributes, XSetWindowBackground, XSetWindowBackgroundPixmap, XSetWindowBorder, XSetWindowBorderPixmap, XSetWindowColormap \- change window attributes
 .SH SYNTAX
-XChangeWindowAttributes\^(\^\fIdisplay\fP, \fIw\fP\^, \fIvaluemask\fP\^, \fIattributes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      unsigned long \fIvaluemask\fP\^;
-.br
-      XSetWindowAttributes *\fIattributes\fP\^;
-.LP
-XSetWindowBackground\^(\^\fIdisplay\fP, \fIw\fP\^, \fIbackground_pixel\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      unsigned long \fIbackground_pixel\fP\^;
-.LP
-XSetWindowBackgroundPixmap\^(\^\fIdisplay\fP, \fIw\fP\^, \fIbackground_pixmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Pixmap \fIbackground_pixmap\fP\^;
-.LP 
-XSetWindowBorder\^(\^\fIdisplay\fP, \fIw\fP\^, \fIborder_pixel\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      unsigned long \fIborder_pixel\fP\^;
-.LP
-XSetWindowBorderPixmap\^(\^\fIdisplay\fP, \fIw\fP\^, \fIborder_pixmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Pixmap \fIborder_pixmap\fP\^;
-.LP
-XSetWindowColormap\^(\^\fIdisplay\fP, \fIw\fP\^, \fIcolormap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
+.HP
+int XChangeWindowAttributes\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIvaluemask\fP\^, XSetWindowAttributes *\fIattributes\fP\^);
+.HP
+int XSetWindowBackground\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIbackground_pixel\fP\^);
+.HP
+int XSetWindowBackgroundPixmap\^(\^Display *\fIdisplay\fP\^, Window
+\fIw\fP\^, Pixmap \fIbackground_pixmap\fP\^);
+.HP 
+int XSetWindowBorder\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIborder_pixel\fP\^);
+.HP
+int XSetWindowBorderPixmap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Pixmap \fIborder_pixmap\fP\^);
+.HP
+int XSetWindowColormap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Colormap \fIcolormap\fP\^);
 .SH ARGUMENTS
 .IP \fIattributes\fP 1i
 Specifies the structure from which the values (as specified by the value mask)
diff --git a/man/XClearArea.man b/man/XClearArea.man
index 5adfda8f..6107540d 100644
--- a/man/XClearArea.man
+++ b/man/XClearArea.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XClrArea.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XClrArea.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,23 +144,12 @@
 .SH NAME
 XClearArea, XClearWindow \- clear area or window
 .SH SYNTAX
-XClearArea\^(\^\fIdisplay\fP, \fIw\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIexposures\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      Bool \fIexposures\fP\^;
-.LP
-XClearWindow\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+int XClearArea\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIx\fP\^,
+int \fIy\fP\^, unsigned \fIwidth\fP\^, unsigned \fIheight\fP\^,
+Bool \fIexposures\fP\^);
+.HP
+int XClearWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XConfigureWindow.man b/man/XConfigureWindow.man
index db253ff9..e3855462 100644
--- a/man/XConfigureWindow.man
+++ b/man/XConfigureWindow.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XConfWin.man,v 1.4 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XConfWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,49 +146,19 @@
 .SH NAME
 XConfigureWindow, XMoveWindow, XResizeWindow, XMoveResizeWindow, XSetWindowBorderWidth, XWindowChanges \- configure windows and window changes structure
 .SH SYNTAX
-XConfigureWindow\^(\^\fIdisplay\fP, \fIw\fP\^, \fIvalue_mask\fP\^, \fIvalues\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      unsigned int \fIvalue_mask\fP\^;
-.br
-      XWindowChanges *\fIvalues\fP\^;
-.LP
-XMoveWindow\^(\^\fIdisplay\fP, \fIw\fP\^, \fIx\fP\^, \fIy\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.LP
-XResizeWindow\^(\^\fIdisplay\fP, \fIw\fP\^, \fIwidth\fP\^, \fIheight\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.LP
-XMoveResizeWindow\^(\^\fIdisplay\fP, \fIw\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.LP
-XSetWindowBorderWidth\^(\^\fIdisplay\fP, \fIw\fP, \fIwidth\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      unsigned int \fIwidth\fP\^;
+.HP
+int XConfigureWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned \fIvalue_mask\fP\^);
+.HP
+int XMoveWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIx\fP\^, \fIy\fP\^);
+.HP
+int XResizeWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned
+\fIwidth\fP\^, unsigned \fIheight\fP\^);
+.HP
+int XMoveResizeWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIx\fP\^, int \fIy\fP\^, unsigned \fIwidth\fP\^, unsigned \fIheight\fP\^); 
+.HP
+int XSetWindowBorderWidth\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+unsigned \fIwidth\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XCopyArea.man b/man/XCopyArea.man
index 19cf637e..20408f18 100644
--- a/man/XCopyArea.man
+++ b/man/XCopyArea.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCopyArea.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XCopyArea.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,35 +144,16 @@
 .SH NAME
 XCopyArea, XCopyPlane \- copy areas
 .SH SYNTAX
-XCopyArea\^(\^\fIdisplay\fP, \fIsrc\fP\^, \fIdest\fP\^, \fIgc\fP\^, \fIsrc_x\fP\^, \fIsrc_y\fP\^, \fIwidth\fP\^, \fIheight\fP\^,  \fIdest_x\fP\^, \fIdest_y\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fIsrc\fP\^, \fIdest\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIsrc_x\fP\^, \fIsrc_y\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      int \fIdest_x\fP\^, \fIdest_y\fP\^;
-.LP
-XCopyPlane\^(\^\fIdisplay\fP, \fIsrc\fP\^, \fIdest\fP\^, \fIgc\fP\^, \fIsrc_x\fP\^, \fIsrc_y\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIdest_x\fP\^, \fIdest_y\fP\^, \fIplane\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fIsrc\fP\^, \fIdest\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIsrc_x\fP\^, \fIsrc_y\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      int \fIdest_x\fP\^, \fIdest_y\fP\^;
-.br
-      unsigned long \fIplane\fP\^;
+.HP
+int XCopyArea\^(\^Display *\fIdisplay\fP\^, Drawable \fIsrc\fP\^, Drawable
+\fIdest\fP\^, GC \fIgc\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned
+int \fIwidth\fP\^, unsigned \fIheight\fP\^, int \fIdest_x\fP\^, int
+\fIdest_y\fP\^);
+.HP
+int XCopyPlane\^(\^Display *\fIdisplay\fP\^, Drawable \fIsrc\fP\^, Drawable
+\fIdest\fP\^, GC \fIgc\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned
+\fIwidth\fP\^, int \fIheight\fP\^, int \fIdest_x\fP\^, int \fIdest_y\fP\^,
+unsigned long \fIplane\fP\^); 
 .SH ARGUMENTS
 .ds Dx , which are relative to the origin of the destination rectangle
 and specify its upper-left corner
diff --git a/man/XCreateColormap.man b/man/XCreateColormap.man
index e4eed2e9..789ea90a 100644
--- a/man/XCreateColormap.man
+++ b/man/XCreateColormap.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreCmap.man,v 1.3 2001/07/23 20:47:17 paulo Exp $
+.\" $XFree86: xc/doc/man/X11/XCreCmap.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,14 @@
 .SH NAME
 XCreateColormap, XCopyColormapAndFree, XFreeColormap, XColor \- create, copy, or destroy colormaps and color structure
 .SH SYNTAX
-Colormap XCreateColormap\^(\^\fIdisplay\fP, \fIw\fP\^, \fIvisual\fP\^, \fIalloc\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Visual *\fIvisual\fP\^;
-.br
-      int \fIalloc\fP\^;
-.LP
-Colormap XCopyColormapAndFree\^(\^\fIdisplay\fP, \fIcolormap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.LP
-XFreeColormap\^(\^\fIdisplay\fP, \fIcolormap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
+.HP
+Colormap XCreateColormap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Visual *\fIvisual\fP\^, int \fIalloc\fP\^,); 
+.HP
+Colormap XCopyColormapAndFree\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^); 
+.HP
+int XFreeColormap\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^); 
 .SH ARGUMENTS
 .IP \fIalloc\fP 1i
 Specifies the colormap entries to be allocated.
diff --git a/man/XCreateFontCursor.man b/man/XCreateFontCursor.man
index f4b713cd..38e96500 100644
--- a/man/XCreateFontCursor.man
+++ b/man/XCreateFontCursor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreFCur.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XCreFCur.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,40 +145,18 @@
 XCreateFontCursor, XCreatePixmapCursor, XCreateGlyphCursor \- create cursors
 .SH SYNTAX
 \&#include <X11/cursorfont.h>
-.sp 6p
-Cursor XCreateFontCursor\^(\^\fIdisplay\fP, \fIshape\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned int \fIshape\fP\^;
-.LP
-Cursor XCreatePixmapCursor\^(\^\fIdisplay\fP, \fIsource\fP\^, \fImask\fP\^, \fIforeground_color\fP\^, \fIbackground_color\fP\^, \fIx\fP\^, \fIy\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Pixmap \fIsource\fP\^;
-.br
-      Pixmap \fImask\fP\^;
-.br
-      XColor *\fIforeground_color\fP\^;
-.br
-      XColor *\fIbackground_color\fP\^;
-.br
-      unsigned int \fIx\fP\^, \fIy\fP\^;
-.LP
-Cursor XCreateGlyphCursor\^(\^\fIdisplay\fP, \fIsource_font\fP\^, \fImask_font\fP\^, \fIsource_char\fP\^, \fImask_char\fP\^,
-.br
-                           \fIforeground_color\fP\^, \fIbackground_color\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Font \fIsource_font\fP\^, \fImask_font\fP\^;
-.br
-      unsigned int \fIsource_char\fP\^, \fImask_char\fP\^;
-.br
-      XColor *\fIforeground_color\fP\^;
-.br
-      XColor *\fIbackground_color\fP\^;
+.HP
+Cursor XCreateFontCursor\^(\^Display *\fIdisplay\fP\^, unsigned int
+\fIshape\fP\^); 
+.HP
+Cursor XCreatePixmapCursor\^(\^Display *\fIdisplay\fP\^, Pixmap
+\fIsource\fP\^, Pixmap \fImask\fP\^, XColor *\fIforeground_color\fP\^, XColor
+*\fIbackground_color\fP\^, unsigned int \fIx\fP\^, \fIy\fP\^); 
+.HP
+Cursor XCreateGlyphCursor\^(\^Display *\fIdisplay\fP\^, Font
+\fIsource_font\fP\^, Font \fImask_font\fP\^, unsigned int \fIsource_char\fP\^,
+unsigned int \fImask_char\fP\^, XColor *\fIforeground_color\fP\^, XColor
+*\fIbackground_color\fP\^); 
 .SH ARGUMENTS
 .IP \fIbackground_color\fP 1i
 Specifies the RGB values for the background of the source.
diff --git a/man/XCreateFontSet.man b/man/XCreateFontSet.man
index 35406dc1..e63c0c58 100644
--- a/man/XCreateFontSet.man
+++ b/man/XCreateFontSet.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreFSet.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCreFSet.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,12 @@
 .SH NAME
 XCreateFontSet, XFreeFontSet \- create and free an international text drawing font set
 .SH SYNTAX
-XFontSet XCreateFontSet\^(\^\fIdisplay\fP\^, \fIbase_font_name_list\fP\^, \fImissing_charset_list_return\fP\^,
-.br
-               \fImissing_charset_count_return\fP\^, \fIdef_string_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIbase_font_name_list\fP\^;
-.br
-      char ***\fImissing_charset_list_return\fP\^;
-.br
-      int *\fImissing_charset_count_return\fP\^;
-.br
-      char **\fIdef_string_return\fP\^;
-.LP
-void XFreeFontSet\^(\^\fIdisplay\fP\^, \fIfont_set\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
+.HP
+XFontSet XCreateFontSet\^(\^Display *\fIdisplay\fP\^, char
+*\fIbase_font_name_list\fP\^, char ***\fImissing_charset_list_return\fP\^, int
+*\fImissing_charset_count_return\fP\^, char **\fIdef_string_return\fP\^);
+.HP
+void XFreeFontSet\^(\^Display *\fIdisplay\fP\^, XFontSet \fIfont_set\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XCreateGC.man b/man/XCreateGC.man
index 4189eb8d..08bf3649 100644
--- a/man/XCreateGC.man
+++ b/man/XCreateGC.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreGC.man,v 1.5 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XCreGC.man,v 1.6 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,54 +146,22 @@
 .SH NAME
 XCreateGC, XCopyGC, XChangeGC, XGetGCValues, XFreeGC, XGContextFromGC, XGCValues \- create or free graphics contexts and graphics context structure
 .SH SYNTAX
-GC XCreateGC\^(\^\fIdisplay\fP, \fId\fP\^, \fIvaluemask\fP\^, \fIvalues\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      unsigned long \fIvaluemask\fP\^;
-.br
-      XGCValues *\^\fIvalues\fP\^;
-.LP
-XCopyGC\^(\^\fIdisplay\fP, \fIsrc\fP\^, \fIvaluemask\fP\^, \fIdest\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIsrc\fP\^, \fIdest\fP\^;
-.br
-      unsigned long \fIvaluemask\fP\^;
-.LP
-XChangeGC\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIvaluemask\fP\^, \fIvalues\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned long \fIvaluemask\fP\^;
-.br
-      XGCValues *\^\fIvalues\fP\^;
-.LP
-Status XGetGCValues\^(\^\fIdisplay\fP, \fIgc\fP, \fIvaluemask\fP,
-\fIvalues_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned long \fIvaluemask\fP\^;
-.br
-      XGCValues *\fIvalues_return\fP\^;
-.LP
-XFreeGC\^(\^\fIdisplay\fP, \fIgc\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.LP
-GContext XGContextFromGC\^(\^\fIgc\fP\^)
-.br
-      GC \fIgc\fP\^;
+.HP
+GC XCreateGC\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, unsigned long
+\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 
+.HP
+int XCopyGC\^(\^Display *\fIdisplay\fP\^, GC \fIsrc\fP\^, GC \fIdest\fP\^,
+unsigned long \fIvaluemask\fP\^); 
+.HP
+int XChangeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 
+.HP
+Status XGetGCValues\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIvaluemask\fP\^, XGCValues *\fIvalues_return\fP\^); 
+.HP
+int XFreeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^); 
+.HP
+GContext XGContextFromGC\^(\^GC \fIgc\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XCreateIC.man b/man/XCreateIC.man
index 6cf7bb34..62bde463 100644
--- a/man/XCreateIC.man
+++ b/man/XCreateIC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreIC.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCreIC.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,17 +144,12 @@
 .SH NAME
 XCreateIC, XDestroyIC, XIMOfIC \- create, destroy, and obtain the input method of an input context
 .SH SYNTAX
-XIC XCreateIC\^(\^\fIim\fP\^, ...)
-.br
-      XIM \fIim\fP\^;
-.LP
-void XDestroyIC\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^;
-.LP
-XIM XIMOfIC\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^; 
+.HP
+XIC XCreateIC\^(\^XIM \fIim\fP\^, ...\^); 
+.HP
+void XDestroyIC\^(\^XIC \fIic\fP\^); 
+.HP
+XIM XIMOfIC\^(\^XIC \fIic\fP\^);
 .SH ARGUMENTS
 .IP \fIic\fP 1i
 Specifies the input context.
diff --git a/man/XCreateOC.man b/man/XCreateOC.man
index 001ba758..74f610e2 100644
--- a/man/XCreateOC.man
+++ b/man/XCreateOC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreOC.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCreOC.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,16 @@
 .SH NAME
 XCreateOC, XDestroyOC, XSetOCValues, XGetOCValues, XOMOfOC \- create output contexts
 .SH SYNTAX
-XOC XCreateOC\^(\^\fIom\fP\^, ...)
-.br
-      XOM \fIom\fP\^;
-.LP
-void XDestroyOC\^(\^\fIoc\fP\^)
-.br
-      XOC \fIoc\fP\^;
-.LP
-char * XSetOCValues\^(\^\fIoc\fP\^, ...)
-.br
-      XOC \fIoc\fP\^;
-.LP
-char * XGetOCValues\^(\^\fIoc\fP\^, ...)
-.br
-      XOC \fIoc\fP\^;
-.LP
-XOM XOMOfOC\^(\^\fIoc\fP\^)
-.br
-      XOC \fIoc\fP\^; 
+.HP
+XOC XCreateOC\^(\^XOM \fIom\fP\^); 
+.HP
+void XDestroyOC\^(\^XOC \fIoc\fP\^); 
+.HP
+char * XSetOCValues\^(\^XOC \fIoc\fP\^, ...); 
+.HP
+char * XGetOCValues\^(\^XOC \fIoc\fP\^, ...); 
+.HP
+XOM XOMOfOC\^(\^XOC \fIoc\fP\^); 
 .SH ARGUMENTS
 .IP \fIoc\fP 1i
 Specifies the output context.
diff --git a/man/XCreatePixmap.man b/man/XCreatePixmap.man
index d7ac1bf1..3aeacdc4 100644
--- a/man/XCreatePixmap.man
+++ b/man/XCreatePixmap.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCrePmap.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCrePmap.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,12 @@
 .SH NAME
 XCreatePixmap, XFreePixmap \- create or destroy pixmaps
 .SH SYNTAX
-Pixmap XCreatePixmap\^(\^\fIdisplay\fP, \fId\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIdepth\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned int \fIdepth\fP\^;
-.LP
-XFreePixmap\^(\^\fIdisplay\fP, \fIpixmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Pixmap \fIpixmap\fP\^;
+.HP
+Pixmap XCreatePixmap\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int
+\fIdepth\fP\^); 
+.HP
+int XFreePixmap\^(\^Display *\fIdisplay\fP\^, Pixmap \fIpixmap\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies which screen the pixmap is created on. 
diff --git a/man/XCreateRegion.man b/man/XCreateRegion.man
index 58a0039c..8018872b 100644
--- a/man/XCreateRegion.man
+++ b/man/XCreateRegion.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreReg.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCreReg.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,12 @@
 .SH NAME
 XCreateRegion, XSetRegion, XDestroyRegion \- create or destroy regions
 .SH SYNTAX
-Region XCreateRegion\^()
-.LP
-XSetRegion\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIr\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      Region \fIr\fP\^;
-.LP
-XDestroyRegion\^(\^\fIr\fP\^)
-.br
-      Region \fIr\fP\^;
+.HP
+Region XCreateRegion\^(void\^); 
+.HP
+int XSetRegion\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Region \fIr\fP\^);
+.HP
+int XDestroyRegion\^(\^Region \fIr\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man
index 258aaa22..f9cd6b4b 100644
--- a/man/XCreateWindow.man
+++ b/man/XCreateWindow.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.4 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,47 +146,10 @@
 .SH NAME
 XCreateWindow, XCreateSimpleWindow, XSetWindowAttributes \- create windows and window attributes structure
 .SH SYNTAX
-Window XCreateWindow\^(\^\fIdisplay\fP, \fIparent\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIborder_width\fP\^, \fIdepth\fP\^, 
-.br
-                       \fIclass\fP\^, \fIvisual\fP\^, \fIvaluemask\fP\^, \fIattributes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIparent\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^; 
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned int \fIborder_width\fP\^;
-.br
-      int \fIdepth\fP\^;
-.br
-      unsigned int \fIclass\fP\^;
-.br
-      Visual *\fIvisual\fP\^
-.br
-      unsigned long \fIvaluemask\fP\^;
-.br
-      XSetWindowAttributes *\fIattributes\fP\^;
-.LP
-Window XCreateSimpleWindow\^(\^\fIdisplay\fP, \fIparent\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIborder_width\fP\^, 
-.br
-                             \fIborder\fP\^, \fIbackground\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIparent\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned int \fIborder_width\fP\^;
-.br
-      unsigned long \fIborder\fP\^;
-.br
-      unsigned long \fIbackground\fP\^;
+.HP
+Window XCreateWindow\^(\^Display *\fIdisplay\fP\^, Window \fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int \fIborder_width\fP\^, int \fIdepth\fP\^, unsigned int \fIclass\fP\^, Visual *\fIvisual\fP\^, unsigned long \fIvaluemask\fP\^, XSetWindowAttributes *\fIattributes\fP\^); 
+.HP
+Window XCreateSimpleWindow\^(\^Display *\fIdisplay\fP\^, Window \fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int \fIborder_width\fP\^, unsigned long \fIborder\fP\^, unsigned long \fIbackground\fP\^); 
 .SH ARGUMENTS
 .IP \fIattributes\fP 1i
 Specifies the structure from which the values (as specified by the value mask)
diff --git a/man/XDefineCursor.man b/man/XDefineCursor.man
index b260d0c3..a6790b1c 100644
--- a/man/XDefineCursor.man
+++ b/man/XDefineCursor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDefCur.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XDefCur.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,11 @@
 .SH NAME
 XDefineCursor, XUndefineCursor \- define cursors
 .SH SYNTAX
-XDefineCursor\^(\^\fIdisplay\fP, \fIw\fP\^, \fIcursor\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Cursor \fIcursor\fP\^;
-.LP
-XUndefineCursor\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+int XDefineCursor\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Cursor
+\fIcursor\fP\^);
+.HP
+int XUndefineCursor\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
 .SH ARGUMENTS
 .IP \fIcursor\fP 1i
 Specifies the cursor that is to be displayed or
diff --git a/man/XDestroyWindow.man b/man/XDestroyWindow.man
index c96bb281..98632261 100644
--- a/man/XDestroyWindow.man
+++ b/man/XDestroyWindow.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDesWin.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XDesWin.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,17 +144,10 @@
 .SH NAME
 XDestroyWindow, XDestroySubwindows \- destroy windows
 .SH SYNTAX
-XDestroyWindow\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XDestroySubwindows\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+int XDestroyWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XDestroySubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XDrawArc.man b/man/XDrawArc.man
index fe1fae67..e26c4697 100644
--- a/man/XDrawArc.man
+++ b/man/XDrawArc.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrArc.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XDrArc.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,31 +146,13 @@
 .SH NAME
 XDrawArc, XDrawArcs, XArc \- draw arcs and arc structure
 .SH SYNTAX
-XDrawArc\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIangle1\fP\^, \fIangle2\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      int \fIangle1\fP\^, \fIangle2\fP\^;
-.LP
-XDrawArcs\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIarcs\fP\^, \fInarcs\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XArc *\fIarcs\fP\^;
-.br
-      int \fInarcs\fP\^;
+.HP
+int XDrawArc\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, int \fIangle1\fP\^, int \fIangle2\fP\^); 
+.HP
+int XDrawArcs\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+XArc *\fIarcs\fP\^, int \fInarcs\fP\^); 
 .SH ARGUMENTS
 .IP \fIangle1\fP 1i
 Specifies the start of the arc relative to the three-o'clock position
diff --git a/man/XDrawImageString.man b/man/XDrawImageString.man
index 0b471be1..309b509a 100644
--- a/man/XDrawImageString.man
+++ b/man/XDrawImageString.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrIStr.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XDrIStr.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,33 +144,14 @@
 .SH NAME
 XDrawImageString, XDrawImageString16 \- draw image text
 .SH SYNTAX
-XDrawImageString\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fIlength\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fIlength\fP\^; 
-.LP
-XDrawImageString16\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fIlength\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XChar2b *\fIstring\fP\^;
-.br
-      int \fIlength\fP\^; 
+.HP
+int XDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int
+\fIlength\fP\^); 
+.HP
+int XDrawImageString16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XChar2b *\fIstring\fP\^, int
+\fIlength\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XDrawLine.man b/man/XDrawLine.man
index 5a4fd336..b911f437 100644
--- a/man/XDrawLine.man
+++ b/man/XDrawLine.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrLine.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XDrLine.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,41 +144,15 @@
 .SH NAME
 XDrawLine, XDrawLines, XDrawSegments, XSegment \- draw lines, polygons, and line structure
 .SH SYNTAX
-XDrawLine\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx1\fP\^, \fIy1\fP\^, \fIx2\fP\^, \fIy2\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx1\fP\^, \fIy1\fP\^, \fIx2\fP\^, \fIy2\fP\^;
-.LP
-XDrawLines\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIpoints\fP\^, \fInpoints\fP\^, \fImode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XPoint *\fIpoints\fP\^;
-.br
-      int \fInpoints\fP\^;
-.br
-      int \fImode\fP\^; 
-.LP
-XDrawSegments\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIsegments\fP\^, \fInsegments\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XSegment *\fIsegments\fP\^;
-.br
-      int \fInsegments\fP\^;
+.HP
+int XDrawLine\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+int \fIx1\fP\^, int \fIy1\fP\^, int \fIx2\fP\^, int \fIy2\fP\^); 
+.HP 
+int XDrawLines\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fImode\fP\^); 
+.HP 
+int XDrawSegments\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XSegment *\fIsegments\fP\^, int \fInsegments\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XDrawPoint.man b/man/XDrawPoint.man
index 82a34b6c..df0c0f4e 100644
--- a/man/XDrawPoint.man
+++ b/man/XDrawPoint.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrPoint.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XDrPoint.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,29 +144,12 @@
 .SH NAME
 XDrawPoint, XDrawPoints, XPoint \- draw points and points structure
 .SH SYNTAX
-XDrawPoint\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.LP
-XDrawPoints\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIpoints\fP\^, \fInpoints\fP\^, \fImode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XPoint *\fIpoints\fP\^;
-.br
-      int \fInpoints\fP\^;
-.br
-      int \fImode\fP\^; 
+.HP
+int XDrawPoint\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^); 
+.HP
+int XDrawPoints\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fImode\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XDrawRectangle.man b/man/XDrawRectangle.man
index a2671d01..701f5676 100644
--- a/man/XDrawRectangle.man
+++ b/man/XDrawRectangle.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrRect.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XDrRect.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,29 +144,13 @@
 .SH NAME
 XDrawRectangle, XDrawRectangles, XRectangle \- draw rectangles and rectangles structure
 .SH SYNTAX
-XDrawRectangle\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.LP
-XDrawRectangles\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIrectangles\fP\^, \fInrectangles\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XRectangle \fIrectangles\fP\^[\^]\^;
-.br
-      int \fInrectangles\fP\^;
+.HP
+int XDrawRectangle\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned
+int \fIheight\fP\^); 
+.HP
+int XDrawRectangles\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XRectangle \fIrectangles\fP\^[\^]\^, int \fInrectangles\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XDrawString.man b/man/XDrawString.man
index 5e250972..6d052332 100644
--- a/man/XDrawString.man
+++ b/man/XDrawString.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrString.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XDrString.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,33 +144,14 @@
 .SH NAME
 XDrawString, XDrawString16 \- draw text characters
 .SH SYNTAX
-XDrawString\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fIlength\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fIlength\fP\^; 
-.LP
-XDrawString16\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fIlength\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XChar2b *\fIstring\fP\^;
-.br
-      int \fIlength\fP\^; 
+.HP
+int XDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int
+\fIlength\fP\^); 
+.HP
+int XDrawString16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XChar2b *\fIstring\fP\^, int
+\fIlength\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XDrawText.man b/man/XDrawText.man
index 6a48ee0b..ad6b05b4 100644
--- a/man/XDrawText.man
+++ b/man/XDrawText.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrText.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XDrText.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,33 +144,13 @@
 .SH NAME
 XDrawText, XDrawText16, XTextItem, XTextItem16 \- draw polytext text and text drawing structures
 .SH SYNTAX
-XDrawText\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XTextItem *\fIitems\fP\^;
-.br
-      int \fInitems\fP\^;
-.LP
-XDrawText16\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XTextItem16 *\fIitems\fP\^;
-.br
-      int \fInitems\fP\^;
+.HP
+int XDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+int \fIx\fP\^, int \fIy\fP\^, XTextItem *\fIitems\fP\^, int \fInitems\fP\^); 
+.HP
+int XDrawText16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XTextItem16 *\fIitems\fP\^, int
+\fInitems\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XEmptyRegion.man b/man/XEmptyRegion.man
index fc815f6b..9ef0d472 100644
--- a/man/XEmptyRegion.man
+++ b/man/XEmptyRegion.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XERegion.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XERegion.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,15 @@
 .SH NAME
 XEmptyRegion, XEqualRegion, XPointInRegion, XRectInRegion \- determine if regions are empty or equal
 .SH SYNTAX
-Bool XEmptyRegion\^(\^\fIr\fP\^)
-.br
-      Region \fIr\fP\^;
-.LP
-Bool XEqualRegion\^(\^\fIr1\fP\^, \fIr2\fP\^)
-.br
-      Region \fIr1\fP\^, \fIr2\fP\^;
-.LP
-Bool XPointInRegion\^(\^\fIr\fP\^, \fIx\fP\^, \fIy\fP\^)
-.br
-      Region \fIr\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.LP
-int XRectInRegion\^(\^\fIr\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^)
-.br
-      Region \fIr\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^; 
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
+.HP
+Bool XEmptyRegion\^(\^Region \fIr\fP\^); 
+.HP
+Bool XEqualRegion\^(\^Region \fIr1\fP\^, Region \fIr2\fP\^); 
+.HP
+Bool XPointInRegion\^(\^Region \fIr\fP\^, int \fIx\fP\^, int \fIy\fP\^); 
+.HP
+int XRectInRegion\^(\^Region \fIr\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned
+int \fIwidth\fP\^, unsigned int \fIheight\fP\^); 
 .SH ARGUMENTS
 .IP \fIr\fP 1i
 Specifies the region.
diff --git a/man/XExtentsOfFontSet.man b/man/XExtentsOfFontSet.man
index 3873b243..aea606b0 100644
--- a/man/XExtentsOfFontSet.man
+++ b/man/XExtentsOfFontSet.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XEofFSet.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XEofFSet.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,9 +144,8 @@
 .SH NAME
 XExtentsOfFontSet \- obtain the maximum extents structure for a font set
 .SH SYNTAX
-XFontSetExtents *XExtentsOfFontSet\^(\^\fIfont_set\fP\^)
-.br
-       XFontSet \fIfont_set\fP\^;
+.HP
+XFontSetExtents *XExtentsOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 
 .SH ARGUMENTS
 .IP \fIfont_set\fP 1i
 Specifies the font set.
diff --git a/man/XFillRectangle.man b/man/XFillRectangle.man
index 6cf034a3..1b57732e 100644
--- a/man/XFillRectangle.man
+++ b/man/XFillRectangle.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFillRect.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XFillRect.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,71 +144,24 @@
 .SH NAME
 XFillRectangle, XFillRectangles, XFillPolygon, XFillArc, XFillArcs \- fill rectangles, polygons, or arcs
 .SH SYNTAX
-XFillRectangle\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.LP
-XFillRectangles\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIrectangles\fP\^, \fInrectangles\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XRectangle *\fIrectangles\fP\^;
-.br
-      int \fInrectangles\fP\^;
-.LP
-XFillPolygon\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIpoints\fP\^, \fInpoints\fP\^, \fIshape\fP\^, \fImode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XPoint *\fIpoints\fP\^;
-.br
-      int \fInpoints\fP\^;
-.br
-      int \fIshape\fP\^; 
-.br
-      int \fImode\fP\^; 
-.LP
-XFillArc\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^,  \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIangle1\fP\^, \fIangle2\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      int \fIangle1\fP\^, \fIangle2\fP\^;
-.LP
-XFillArcs\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIarcs\fP\^, \fInarcs\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      XArc *\fIarcs\fP\^;
-.br
-      int \fInarcs\fP\^;
+.HP
+int XFillRectangle\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned
+int \fIheight\fP\^); 
+.HP
+int XFillRectangles\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XRectangle *\fIrectangles\fP\^, int \fInrectangles\fP\^); 
+.HP
+int XFillPolygon\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fIshape\fP\^,
+int \fImode\fP\^);
+.HP
+int XFillArc\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^, 
+int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, int \fIangle1\fP\^, int \fIangle2\fP\^); 
+.HP
+int XFillArcs\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+XArc *\fIarcs\fP\^, int \fInarcs\fP\^); 
 .SH ARGUMENTS
 .IP \fIangle1\fP 1i
 Specifies the start of the arc relative to the three-o'clock position
diff --git a/man/XFilterEvent.man b/man/XFilterEvent.man
index a6aa3e9a..478c4884 100644
--- a/man/XFilterEvent.man
+++ b/man/XFilterEvent.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XFEvent.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,11 +144,8 @@
 .SH NAME
 XFilterEvent \- filter X events for an input method
 .SH SYNTAX
-Bool XFilterEvent\^(\^\fIevent\fP\^, \fIw\fP\^)
-.br
-      XEvent *\fIevent\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+Bool XFilterEvent\^(\^XEvent *\fIevent\fP\^, Window \fIw\fP\^); 
 .SH ARGUMENTS
 .ds Ev event to filter
 .IP \fIevent\fP 1i
diff --git a/man/XFlush.man b/man/XFlush.man
index 74723183..b4e7db0f 100644
--- a/man/XFlush.man
+++ b/man/XFlush.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFlush.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XFlush.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,14 @@
 .SH NAME
 XFlush, XSync, XEventsQueued, XPending \- handle output buffer or event queue
 .SH SYNTAX
-XFlush\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XSync\^(\^\fIdisplay\fP, \fIdiscard\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Bool \fIdiscard\fP\^;
-.LP
-int XEventsQueued\^(\^\fIdisplay\fP, \fImode\fP\^)
-.br
-     Display *\fIdisplay\fP\^;
-.br
-     int \fImode\fP\^;
-.LP
-int XPending\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
+.HP
+int XFlush\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XSync\^(\^Display *\fIdisplay\fP\^, Bool \fIdiscard\fP\^); 
+.HP
+int XEventsQueued\^(\^Display *\fIdisplay\fP\^, int \fImode\fP\^); 
+.HP
+int XPending\^(\^Display *\fIdisplay\fP\^); 
 .SH ARGUMENTS
 .IP \fIdiscard\fP 1i
 Specifies a Boolean value that indicates whether 
diff --git a/man/XFontsOfFontSet.man b/man/XFontsOfFontSet.man
index 070ed988..46e93139 100644
--- a/man/XFontsOfFontSet.man
+++ b/man/XFontsOfFontSet.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFofFSet.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XFofFSet.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,33 +144,19 @@
 .SH NAME
 XFontsOfFontSet, XBaseFontNameListOfFontSet, XLocaleOfFontSet, XContextDependentDrawing, XContextualDrawing, XDirectionalDependentDrawing \- obtain fontset information
 .SH SYNTAX
-int XFontsOfFontSet\^(\^\fIfont_set\fP\^, \fIfont_struct_list_return\fP\^, \fIfont_name_list_return\fP\^)
-.br
-       XFontSet \fIfont_set\fP\^;
-.br
-       XFontStruct ***\fIfont_struct_list_return\fP\^;
-.br
-       char ***\fIfont_name_list_return\fP\^;
-.LP
-char *XBaseFontNameListOfFontSet\^(\^\fIfont_set\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.LP
-char *XLocaleOfFontSet\^(\^\fIfont_set\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.LP
-Bool XContextDependentDrawing\^(\^\fIfont_set\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.LP
-Bool XContextualDrawing\^(\^\fIfont_set\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.LP
-Bool XDirectionalDependentDrawing\^(\^\fIfont_set\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
+.HP
+int XFontsOfFontSet\^(\^XFontSet \fIfont_set\fP\^, XFontStruct
+***\fIfont_struct_list_return\fP\^, char ***\fIfont_name_list_return\fP\^); 
+.HP
+char *XBaseFontNameListOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+char *XLocaleOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+Bool XContextDependentDrawing\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+Bool XContextualDrawing\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+Bool XDirectionalDependentDrawing\^(\^XFontSet \fIfont_set\fP\^); 
 .SH ARGUMENTS
 .IP \fIfont_set\fP 1i
 Specifies the font set.
diff --git a/man/XFree.man b/man/XFree.man
index 821187f8..1c082f9d 100644
--- a/man/XFree.man
+++ b/man/XFree.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFree.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XFree.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,12 +144,10 @@
 .SH NAME
 XFree \- free client data
 .SH SYNTAX
-XFree\^(\^\fIdata\fP\^)
-.br
-     void *\fIdata\fP\^; 
+int XFree\^(\^void *\fIdata\fP\^); 
 .SH ARGUMENTS
 .IP \fIdata\fP 1i
-Specifies the data that is to be freed.
+Specifies the data that are to be freed.
 .SH DESCRIPTION
 The
 .ZN XFree
diff --git a/man/XGetVisualInfo.man b/man/XGetVisualInfo.man
index bfc2a745..f65861cd 100644
--- a/man/XGetVisualInfo.man
+++ b/man/XGetVisualInfo.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGetVInfo.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XGetVInfo.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,31 +146,15 @@
 .SH NAME
 XGetVisualInfo, XMatchVisualInfo, XVisualIDFromVisual, XVisualInfo \- obtain visual information and visual structure
 .SH SYNTAX
-XVisualInfo *XGetVisualInfo\^(\^\fIdisplay\fP, \fIvinfo_mask\fP, \fIvinfo_template\fP, \fInitems_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      long \fIvinfo_mask\fP\^;
-.br
-      XVisualInfo *\fIvinfo_template\fP\^;
-.br
-      int *\fInitems_return\fP\^;
-.LP
-Status XMatchVisualInfo\^(\^\fIdisplay\fP, \fIscreen\fP, \fIdepth\fP, \fIclass\fP, \fIvinfo_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIscreen\fP\^;
-.br
-      int \fIdepth\fP\^;
-.br
-      int \fIclass\fP\^;
-.br
-      XVisualInfo *\fIvinfo_return\fP\^;
-.LP
-VisualID XVisualIDFromVisual\^(\^\fIvisual\fP\^)
-.br
-       Visual *\^\fIvisual\fP\^;
+.HP
+XVisualInfo *XGetVisualInfo\^(\^Display *\fIdisplay\fP\^, long
+\fIvinfo_mask\fP\^, XVisualInfo *\fIvinfo_template\fP\^, int
+*\fInitems_return\fP\^); 
+.HP
+Status XMatchVisualInfo\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, int
+\fIdepth\fP\^, int \fIclass\fP\^, XVisualInfo *\fIvinfo_return\fP\^); 
+.HP
+VisualID XVisualIDFromVisual\^(\^Visual *\^\fIvisual\fP\^); 
 .SH ARGUMENTS
 .IP \fIclass\fP 1i
 Specifies the class of the screen.
diff --git a/man/XGetWindowAttributes.man b/man/XGetWindowAttributes.man
index 498697e6..9a5067d8 100644
--- a/man/XGetWindowAttributes.man
+++ b/man/XGetWindowAttributes.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGetWAttr.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGetWAttr.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,31 +146,14 @@
 .SH NAME
 XGetWindowAttributes, XGetGeometry, XWindowAttributes \- get current window attribute or geometry and current window attributes structure
 .SH SYNTAX
-Status XGetWindowAttributes\^(\^\fIdisplay\fP, \fIw\fP\^, \fIwindow_attributes_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XWindowAttributes *\fIwindow_attributes_return\fP\^;
-.LP
-Status XGetGeometry\^(\^\fIdisplay\fP, \fId\fP\^, \^\fIroot_return\fP\^, \fIx_return\fP\^, \fIy_return\fP\^, \fIwidth_return\fP\^, 
-.br
-                      \fIheight_return\fP\^, \fIborder_width_return\fP\^, \fIdepth_return\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        Drawable \fId\fP\^;
-.br
-        Window *\fIroot_return\fP\^;
-.br
-        int *\fIx_return\fP\^, *\fIy_return\fP\^;
-.br
-        unsigned int *\fIwidth_return\fP\^, *\fIheight_return\fP\^;
-.br
-        unsigned int *\fIborder_width_return\fP\^;
-.br
-        unsigned int *\fIdepth_return\fP\^;
+.HP
+Status XGetWindowAttributes\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XWindowAttributes *\fIwindow_attributes_return\fP\^); 
+.HP
+Status XGetGeometry\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, Window
+*\fIroot_return\fP\^, int *\fIx_return\fP\^, int *\fIy_return\fP\^, unsigned
+int *\fIwidth_return\fP\^, unsigned int *\fIheight_return\fP\^, unsigned int
+*\fIborder_width_return\fP\^, unsigned int *\fIdepth_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIborder_width_return\fP 1i
 Returns the border width in pixels. 
diff --git a/man/XGetWindowProperty.man b/man/XGetWindowProperty.man
index 5c608864..e0a8f94e 100644
--- a/man/XGetWindowProperty.man
+++ b/man/XGetWindowProperty.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGetWProp.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGetWProp.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,77 +144,24 @@
 .SH NAME
 XGetWindowProperty, XListProperties, XChangeProperty, XRotateWindowProperties, XDeleteProperty \- obtain and change window properties
 .SH SYNTAX
-int XGetWindowProperty\^(\^\fIdisplay\fP, \fIw\fP\^, \fIproperty\fP\^, \fIlong_offset\fP\^, \fIlong_length\fP\^, \fIdelete\fP\^, \fIreq_type\fP\^, 
-.br
-                        \fIactual_type_return\fP\^, \fIactual_format_return\fP\^, \fInitems_return\fP\^, \fIbytes_after_return\fP\^, 
-.br
-                        \fIprop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Atom \fIproperty\fP\^;
-.br
-      long \fIlong_offset\fP\^, \fIlong_length\fP\^;
-.br
-      Bool \fIdelete\fP\^;
-.br
-      Atom \fIreq_type\fP\^; 
-.br
-      Atom *\fIactual_type_return\fP\^;
-.br
-      int *\fIactual_format_return\fP\^;
-.br
-      unsigned long *\fInitems_return\fP\^;
-.br
-      unsigned long *\fIbytes_after_return\fP\^;
-.br
-      unsigned char **\fIprop_return\fP\^;
-.LP
-Atom *XListProperties\^(\^\fIdisplay\fP, \fIw\fP\^, \fInum_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int *\fInum_prop_return\fP\^; 
-.LP
-XChangeProperty\^(\^\fIdisplay\fP, \fIw\fP\^, \fIproperty\fP\^, \fItype\fP\^, \fIformat\fP\^, \fImode\fP\^, \fIdata\fP\^, \fInelements\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Atom \fIproperty\fP\^, \fItype\fP\^;
-.br
-      int \fIformat\fP\^;
-.br
-      int \fImode\fP\^;
-.br
-      unsigned char *\fIdata\fP\^;
-.br
-      int \fInelements\fP\^;
-.LP
-XRotateWindowProperties\^(\^\fIdisplay\fP, \fIw\fP, \fIproperties\fP, \fInum_prop\fP, \fInpositions\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Atom \fIproperties\fP\^[]\^;
-.br
-      int \fInum_prop\fP\^;
-.br
-      int \fInpositions\fP\^;
-.LP
-XDeleteProperty\^(\^\fIdisplay\fP, \fIw\fP\^, \fIproperty\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Atom \fIproperty\fP\^;
+.HP
+int XGetWindowProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+\fIproperty\fP\^, long \fIlong_offset\fP\^, long \fIlong_length\fP\^, Bool
+\fIdelete\fP\^, Atom \fIreq_type\fP\^, Atom *\fIactual_type_return\fP\^, int
+*\fIactual_format_return\fP\^, unsigned long *\fInitems_return\fP\^, unsigned
+long *\fIbytes_after_return\fP\^, unsigned char **\fIprop_return\fP\^); 
+.HP
+Atom *XListProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+*\fInum_prop_return\fP\^); 
+int XChangeProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+\fIproperty\fP\^, Atom \fItype\fP\^, int \fIformat\fP\^, int \fImode\fP\^,
+unsigned char *\fIdata\fP\^, int \fInelements\fP\^); 
+.HP
+int XRotateWindowProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Atom \fIproperties\fP\^[]\^, int \fInum_prop\fP\^, int \fInpositions\fP\^); 
+.HP
+int XDeleteProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+\fIproperty\fP\^); 
 .SH ARGUMENTS
 .IP \fIactual_format_return\fP 1i
 Returns the actual format of the property.
diff --git a/man/XGrabButton.man b/man/XGrabButton.man
index 82d15b11..2a751a31 100644
--- a/man/XGrabButton.man
+++ b/man/XGrabButton.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGrButton.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGrButton.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,37 +144,15 @@
 .SH NAME
 XGrabButton, XUngrabButton \- grab pointer buttons
 .SH SYNTAX
-XGrabButton\^(\^\fIdisplay\fP, \fIbutton\fP\^, \fImodifiers\fP\^, \fIgrab_window\fP\^, \fIowner_events\fP\^, \fIevent_mask\fP\^, 
-.br
-                \fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, \fIconfine_to\fP\^, \fIcursor\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned int \fIbutton\fP\^;
-.br
-      unsigned int \fImodifiers\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
-.br
-      Bool \fIowner_events\fP\^;
-.br
-      unsigned int \fIevent_mask\fP\^;	
-.br
-      int \fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^;
-.br
-      Window \fIconfine_to\fP\^; 
-.br
-      Cursor \fIcursor\fP\^; 
-.LP
-XUngrabButton\^(\^\fIdisplay\fP, \fIbutton\fP\^, \fImodifiers\fP\^, \fIgrab_window\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned int \fIbutton\fP\^;
-.br
-      unsigned int \fImodifiers\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
+.HP 
+int XGrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,
+unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^, Bool
+\fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int
+\fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^, Cursor
+\fIcursor\fP\^); 
+.HP
+int XUngrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,
+unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^); 
 .SH ARGUMENTS
 .ds Bu grabbed or released
 .IP \fIbutton\fP 1i
diff --git a/man/XGrabKey.man b/man/XGrabKey.man
index 3ef65422..a0f85774 100644
--- a/man/XGrabKey.man
+++ b/man/XGrabKey.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGrKey.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGrKey.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,31 +144,13 @@
 .SH NAME
 XGrabKey, XUngrabKey \- grab keyboard keys
 .SH SYNTAX
-XGrabKey\^(\^\fIdisplay\fP, \fIkeycode\fP\^, \fImodifiers\fP\^, \fIgrab_window\fP\^, \fIowner_events\fP\^, \fIpointer_mode\fP\^, 
-.br
-             \fIkeyboard_mode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIkeycode\fP\^;
-.br
-      unsigned int \fImodifiers\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
-.br
-      Bool \fIowner_events\fP\^;
-.br
-      int \fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^;
-.LP
-XUngrabKey\^(\^\fIdisplay\fP, \fIkeycode\fP\^, \fImodifiers\fP\^, \fIgrab_window\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIkeycode\fP\^;
-.br
-      unsigned int \fImodifiers\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
+.HP
+int XGrabKey\^(\^Display *\fIdisplay\fP\^, int \fIkeycode\fP\^, unsigned int
+\fImodifiers\fP\^, Window \fIgrab_window\fP\^, Bool \fIowner_events\fP\^, int
+\fIpointer_mode\fP\^, int \fIkeyboard_mode\fP\^); 
+.HP
+int XUngrabKey\^(\^Display *\fIdisplay\fP\^, int \fIkeycode\fP\^, unsigned int
+\fImodifiers\fP\^, Window \fIgrab_window\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XGrabKeyboard.man b/man/XGrabKeyboard.man
index f359962d..6be00889 100644
--- a/man/XGrabKeyboard.man
+++ b/man/XGrabKeyboard.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGrKeybrd.man,v 1.2 2001/01/27 18:20:00 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGrKeybrd.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,23 +144,12 @@
 .SH NAME
 XGrabKeyboard, XUngrabKeyboard \- grab the keyboard
 .SH SYNTAX
-int XGrabKeyboard\^(\^\fIdisplay\fP, \fIgrab_window\fP\^, \fIowner_events\fP\^, \fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
-.br
-      Bool \fIowner_events\fP\^;
-.br
-      int \fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^;
-.br
-      Time \fItime\fP\^;
-.LP
-XUngrabKeyboard\^(\^\fIdisplay\fP, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Time \fItime\fP\^;
+.HP
+int XGrabKeyboard\^(\^Display *\fIdisplay\fP\^, Window \fIgrab_window\fP\^,
+Bool \fIowner_events\fP\^, int \fIpointer_mode\fP\^, int
+\fIkeyboard_mode\fP\^, Time \fItime\fP\^); 
+.HP
+int XUngrabKeyboard\^(\^Display *\fIdisplay\fP\^, Time \fItime\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XGrabPointer.man b/man/XGrabPointer.man
index 0b2853fe..1f42f403 100644
--- a/man/XGrabPointer.man
+++ b/man/XGrabPointer.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGrPntr.man,v 1.2 2001/01/27 18:20:00 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGrPntr.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,40 +144,16 @@
 .SH NAME
 XGrabPointer, XUngrabPointer, XChangeActivePointerGrab \- grab the pointer
 .SH SYNTAX
-int XGrabPointer\^(\^\fIdisplay\fP, \fIgrab_window\fP\^, \fIowner_events\fP\^, \fIevent_mask\fP\^, \fIpointer_mode\fP\^,
-               \fIkeyboard_mode\fP\^, \fIconfine_to\fP\^, \fIcursor\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
-.br
-      Bool \fIowner_events\fP\^;
-.br
-      unsigned int \fIevent_mask\fP\^;	
-.br
-      int \fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^; 
-.br
-      Window \fIconfine_to\fP\^; 
-.br
-      Cursor \fIcursor\fP\^; 
-.br
-      Time \fItime\fP\^; 
-.LP
-XUngrabPointer\^(\^\fIdisplay\fP, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Time \fItime\fP\^;
-.LP
-XChangeActivePointerGrab\^(\^\fIdisplay\fP, \fIevent_mask\fP\^, \fIcursor\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned int \fIevent_mask\fP\^;
-.br
-      Cursor \fIcursor\fP\^;
-.br
-      Time \fItime\fP\^;
+.HP
+int XGrabPointer\^(\^Display *\fIdisplay\fP\^, Window \fIgrab_window\fP\^,
+Bool \fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int
+\fIpointer_mode\fP\^, int \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^,
+Cursor \fIcursor\fP\^, Time \fItime\fP\^); 
+.HP
+int XUngrabPointer\^(\^Display *\fIdisplay\fP\^, Time \fItime\fP\^); 
+.HP
+int XChangeActivePointerGrab\^(\^Display *\fIdisplay\fP\^, unsigned int
+\fIevent_mask\fP\^, Cursor \fIcursor\fP\^, Time \fItime\fP\^); 
 .SH ARGUMENTS
 .IP \fIconfine_to\fP 1i
 Specifies the window to confine the pointer in or
diff --git a/man/XGrabServer.man b/man/XGrabServer.man
index c93db208..229b09fc 100644
--- a/man/XGrabServer.man
+++ b/man/XGrabServer.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGrServer.man,v 1.2 2001/01/27 18:20:00 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGrServer.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,10 @@
 .SH NAME
 XGrabServer, XUngrabServer \- grab the server
 .SH SYNTAX
-XGrabServer\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XUngrabServer\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
+.HP
+int XGrabServer\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XUngrabServer\^(\^Display *\fIdisplay\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XIconifyWindow.man b/man/XIconifyWindow.man
index 27e82f74..20643e50 100644
--- a/man/XIconifyWindow.man
+++ b/man/XIconifyWindow.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XIcWin.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XIcWin.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,34 +144,16 @@
 .SH NAME
 XIconifyWindow, XWithdrawWindow, XReconfigureWMWindow \- manipulate top-level windows
 .SH SYNTAX
-Status XIconifyWindow\^(\^\fIdisplay\fP, \fIw\fP, \fIscreen_number\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP;
-.br
-      int \fIscreen_number\fP\^;
-.LP
-Status XWithdrawWindow\^(\^\fIdisplay\fP, \fIw\fP, \fIscreen_number\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIscreen_number\fP\^;
-.LP
-Status XReconfigureWMWindow\^(\^\fIdisplay\fP, \fIw\fP, \fIscreen_number\fP,
-\fIvalue_mask\fP, \fIvalues\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIscreen_number\fP\^;
-.br
-      unsigned int \fIvalue_mask\fP\^;
-.br
-      XWindowChanges *\fIvalues\fP;
+.HP
+Status XIconifyWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP, int
+\fIscreen_number\fP\^); 
+.HP
+Status XWithdrawWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIscreen_number\fP\^); 
+.HP
+Status XReconfigureWMWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+int \fIscreen_number\fP\^, unsigned int \fIvalue_mask\fP\^, XWindowChanges
+*\fIvalues\fP); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XIfEvent.man b/man/XIfEvent.man
index ef9eb219..e467b775 100644
--- a/man/XIfEvent.man
+++ b/man/XIfEvent.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XIfEvent.man,v 1.2 2001/01/27 18:20:00 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XIfEvent.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,35 +144,15 @@
 .SH NAME
 XIfEvent, XCheckIfEvent, XPeekIfEvent \- check the event queue with a predicate procedure
 .SH SYNTAX
-XIfEvent\^(\^\fIdisplay\fP, \fIevent_return\fP, \fIpredicate\fP, \fIarg\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.br
-      Bool (\^*\fIpredicate\fP\^)\^(\^)\^;
-.br
-      XPointer \fIarg\fP\^;
-.LP
-Bool XCheckIfEvent\^(\^\fIdisplay\fP, \fIevent_return\fP, \fIpredicate\fP, \fIarg\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.br
-      Bool (\^*\fIpredicate\fP\^)\^(\^)\^;
-.br
-      XPointer \fIarg\fP\^;
-.LP
-XPeekIfEvent\^(\^\fIdisplay\fP, \fIevent_return\fP, \fIpredicate\fP, \fIarg\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.br
-      Bool (\^*\fIpredicate\fP\^)\^(\^)\^;
-.br
-      XPointer \fIarg\fP\^;
+.HP
+int XIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^, Bool
+(\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
+.HP
+Bool XCheckIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^,
+Bool (\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
+.HP
+int XPeekIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^,
+Bool (\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
 .SH ARGUMENTS
 .IP \fIarg\fP 1i
 Specifies the user-supplied argument that will be passed to the predicate procedure.
diff --git a/man/XInitImage.man b/man/XInitImage.man
index 7b021f73..771b1037 100644
--- a/man/XInitImage.man
+++ b/man/XInitImage.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreImage.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCreImage.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,73 +144,26 @@
 .SH NAME
 XInitImage, XCreateImage, XGetPixel, XPutPixel, XSubImage, XAddPixel, XDestroyImage \- image utilities
 .SH SYNTAX
-Status XInitImage\^(\^\fIimage\fP\^)
-.br
-      XImage *\fIimage\fP\^;
-.LP
-XImage *XCreateImage\^(\^\fIdisplay\fP, \fIvisual\fP, \fIdepth\fP, \fIformat\fP, \fIoffset\fP, \fIdata\fP, \fIwidth\fP, \fIheight\fP\^, \fIbitmap_pad\fP, 
-.br
-                        \fIbytes_per_line\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Visual *\fIvisual\fP\^;
-.br
-      unsigned int \fIdepth\fP\^;
-.br
-      int \fIformat\fP\^;
-.br
-      int \fIoffset\fP\^;
-.br
-      char *\fIdata\fP\^;
-.br
-      unsigned int \fIwidth\fP\^;
-.br
-      unsigned int \fIheight\fP\^;
-.br
-      int \fIbitmap_pad\fP\^;
-.br
-      int \fIbytes_per_line\fP\^;
-.LP
-unsigned long XGetPixel\^(\^\fIximage\fP, \fIx\fP, \fIy\fP\^)
-.br
-      XImage *\fIximage\fP\^;
-.br
-      int \fIx\fP\^;
-.br
-      int \fIy\fP\^;
-.LP
-XPutPixel\^(\^\fIximage\fP, \fIx\fP, \fIy\fP, \fIpixel\fP\^)
-.br
-      XImage *\fIximage\fP\^;
-.br
-      int \fIx\fP\^;
-.br
-      int \fIy\fP\^;
-.br
-      unsigned long \fIpixel\fP\^;
-.LP
-XImage *XSubImage\^(\^\fIximage\fP, \fIx\fP, \fIy\fP, \fIsubimage_width\fP, \fIsubimage_height\fP\^)
-.br
-      XImage *\fIximage\fP\^;
-.br
-      int \fIx\fP\^;
-.br
-      int \fIy\fP\^;
-.br
-      unsigned int \fIsubimage_width\fP\^;
-.br
-      unsigned int \fIsubimage_height\fP\^;
-.LP
-XAddPixel\^(\^\fIximage\fP, \fIvalue\fP\^)
-.br
-      XImage *\fIximage\fP\^;
-.br
-      long \fIvalue\fP\^;
-.LP
-XDestroyImage\^(\^\fIximage\fP\^)
-.br
-        XImage *\^\fIximage\fP\^; 
+.HP
+Status XInitImage\^(\^XImage *\fIimage\fP\^); 
+.HP
+XImage *XCreateImage\^(\^Display *\fIdisplay\fP\^, Visual *\fIvisual\fP\^,
+unsigned int \fIdepth\fP\^, int \fIformat\fP\^, int \fIoffset\fP\^, char
+*\fIdata\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, int
+\fIbitmap_pad\fP\^, int \fIbytes_per_line\fP\^); 
+.HP
+unsigned long XGetPixel\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int
+\fIy\fP\^); 
+.HP
+int XPutPixel\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+unsigned long \fIpixel\fP\^); 
+.HP
+XImage *XSubImage\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+unsigned int \fIsubimage_width\fP\^, unsigned int \fIsubimage_height\fP\^); 
+.HP
+int XAddPixel\^(\^XImage *\fIximage\fP\^, long \fIvalue\fP\^); 
+.HP
+int XDestroyImage\^(\^XImage *\^\fIximage\fP\^); 
 .SH ARGUMENTS
 .IP \fIbitmap_pad\fP 1i
 Specifies the quantum of a scanline (8, 16, or 32).
diff --git a/man/XInitThreads.man b/man/XInitThreads.man
index 241d275c..d6749883 100644
--- a/man/XInitThreads.man
+++ b/man/XInitThreads.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XThreads.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XThreads.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,15 +144,12 @@
 .SH NAME
 XInitThreads, XLockDisplay, XUnlockDisplay \- multi-threading support
 .SH SYNTAX
-Status XInitThreads\^(\|);
-.LP
-void XLockDisplay\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-void XUnlockDisplay\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
+.HP
+Status XInitThreads\^(void);
+.HP
+void XLockDisplay\^(\^Display *\fIdisplay\fP\^); 
+.HP
+void XUnlockDisplay\^(\^Display *\fIdisplay\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XInstallColormap.man b/man/XInstallColormap.man
index 793576d6..00958259 100644
--- a/man/XInstallColormap.man
+++ b/man/XInstallColormap.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XInstCmap.man,v 1.3 2001/07/23 20:47:17 paulo Exp $
+.\" $XFree86: xc/doc/man/X11/XInstCmap.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,14 @@
 .SH NAME
 XInstallColormap, XUninstallColormap, XListInstalledColormaps \- control colormaps
 .SH SYNTAX
-XInstallColormap\^(\^\fIdisplay\fP, \fIcolormap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.LP
-XUninstallColormap\^(\^\fIdisplay\fP, \fIcolormap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.LP
-Colormap *XListInstalledColormaps\^(\^\fIdisplay\fP, \fIw\fP, \fInum_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int *\fInum_return\fP\^;
+.HP
+int XInstallColormap\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^);
+.HP
+int XUninstallColormap\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^); 
+.HP
+Colormap *XListInstalledColormaps\^(\^Display *\fIdisplay\fP\^, Window
+\fIw\fP\^, int *\fInum_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIcolormap\fP 1i
 Specifies the colormap.
diff --git a/man/XInternAtom.man b/man/XInternAtom.man
index fa16f5d6..0c80455f 100644
--- a/man/XInternAtom.man
+++ b/man/XInternAtom.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XInternA.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XInternA.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,41 +144,17 @@
 .SH NAME
 XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return atom names
 .SH SYNTAX
-Atom XInternAtom\^(\^\fIdisplay\fP, \fIatom_name\fP\^, \fIonly_if_exists\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIatom_name\fP\^;
-.br
-      Bool \fIonly_if_exists\fP\^;
-.LP
-Status XInternAtoms\^(\^\fIdisplay\fP, \fInames\fP\^, \fIcount\fP\^, \fIonly_if_exists\fP, \fIatoms_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char **\fInames\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      Bool \fIonly_if_exists\fP\^;
-.br
-      Atom *\fIatoms_return\fP\^;
-.LP
-char *XGetAtomName\^(\^\fIdisplay\fP, \fIatom\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Atom \fIatom\fP\^;
-.LP
-Status XGetAtomNames\^(\^\fIdisplay\fP, \fIatoms\fP, \fIcount\fP\^, \fInames_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Atom *\fIatoms\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      char **\fInames_return\fP\^;
+.HP
+Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, char *\fIatom_name\fP\^, Bool
+\fIonly_if_exists\fP\^); 
+.HP
+Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, char **\fInames\fP\^, int
+\fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^); 
+.HP
+char *XGetAtomName\^(\^Display *\fIdisplay\fP\^, Atom \fIatom\fP\^); 
+.HP
+Status XGetAtomNames\^(\^Display *\fIdisplay\fP\^, Atom *\fIatoms\fP\^, int
+\fIcount\fP\^, char **\fInames_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIatom\fP 1i
 Specifies the atom for the property name you want returned.
diff --git a/man/XIntersectRegion.man b/man/XIntersectRegion.man
index 6a0ee0da..f62b6225 100644
--- a/man/XIntersectRegion.man
+++ b/man/XIntersectRegion.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XInterReg.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XInterReg.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,42 +144,25 @@
 .SH NAME
 XIntersectRegion, XUnionRegion, XUnionRectWithRegion, XSubtractRegion, XXorRegion, XOffsetRegion, XShrinkRegion \- region arithmetic
 .SH SYNTAX
-XIntersectRegion\^(\^\fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^)
-.br
-      Region \fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^;
-.LP
-XUnionRegion\^(\^\fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^)
-.br
-      Region \fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^;
-.LP
-XUnionRectWithRegion\^(\^\fIrectangle\fP, \fIsrc_region\fP,
-\fIdest_region_return\fP\^)
-.br
-     XRectangle *\fIrectangle\fP\^;
-.br
-     Region \fIsrc_region\fP\^;
-.br
-     Region \fIdest_region_return\fP\^;
-.LP
-XSubtractRegion\^(\^\fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^)
-.br
-      Region \fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^;
-.LP
-XXorRegion\^(\^\fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^)
-.br
-      Region \fIsra\fP\^, \fIsrb\fP\^, \fIdr_return\fP\^;
-.LP
-XOffsetRegion\^(\^\fIr\fP\^, \fIdx\fP\^, \fIdy\fP\^)
-.br
-      Region \fIr\fP\^;
-.br
-      int \fIdx\fP\^, \fIdy\fP\^;
-.LP
-XShrinkRegion\^(\^\fIr\fP\^, \fIdx\fP\^, \fIdy\fP\^)
-.br
-      Region \fIr\fP\^;
-.br
-      int \fIdx\fP\^, \fIdy\fP\^;
+.HP
+int XIntersectRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XUnionRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XUnionRectWithRegion\^(\^XRectangle *\fIrectangle\fP\^, Region
+\fIsrc_region\fP\^, Region \fIdest_region_return\fP\^); 
+.HP
+int XSubtractRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XXorRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XOffsetRegion\^(\^Region \fIr\fP\^, int \fIdx\fP\^, int \fIdy\fP\^); 
+.HP
+int XShrinkRegion\^(\^Region \fIr\fP\^, int \fIdx\fP\^, int \fIdy\fP\^); 
 .SH ARGUMENTS
 .IP \fIdest_region_return\fP 1i
 Returns the destination region.
diff --git a/man/XListFonts.man b/man/XListFonts.man
index 07d1073f..5674b93c 100644
--- a/man/XListFonts.man
+++ b/man/XListFonts.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XListFont.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XListFont.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,39 +144,18 @@
 .SH NAME
 XListFonts, XFreeFontNames, XListFontsWithInfo, XFreeFontInfo \- obtain or free font names and information
 .SH SYNTAX
-char **XListFonts\^(\^\fIdisplay\fP, \fIpattern\fP\^, \fImaxnames\fP, \fIactual_count_return\fP\^)
-.br
-      Display *\^\fIdisplay\fP\^;
-.br
-      char *\^\fIpattern\fP\^;
-.br
-      int \fImaxnames\fP\^;
-.br
-      int *\^\fIactual_count_return\fP\^;
-.LP
-XFreeFontNames\^(\^\fIlist\fP\^)
-.br
-      char *\fIlist\fP\^[\^]\^;
-.LP
-char **XListFontsWithInfo\^(\^\fIdisplay\fP, \fIpattern\fP, \fImaxnames\fP, \fIcount_return\fP, \fIinfo_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIpattern\fP\^;
-.br
-      int \fImaxnames\fP\^;
-.br
-      int *\fIcount_return\fP\^;
-.br
-      XFontStruct **\fIinfo_return\fP\^;
-.LP
-XFreeFontInfo(\^\fInames\fP, \fIfree_info\fP, \fIactual_count\fP\^)
-.br
-      char **\fInames\fP\^;
-.br
-      XFontStruct *\fIfree_info\fP;
-.br
-      int \fIactual_count\fP\^;
+.HP
+char **XListFonts\^(\^Display *\^\fIdisplay\fP\^, char *\^\fIpattern\fP\^, int
+\fImaxnames\fP\^, int *\^\fIactual_count_return\fP\^); 
+.HP
+int XFreeFontNames\^(\^char *\fIlist\fP\^[\^]\^); 
+.HP
+char **XListFontsWithInfo\^(\^Display *\fIdisplay\fP\^, char *\fIpattern\fP\^,
+int \fImaxnames\fP\^, int *\fIcount_return\fP\^, XFontStruct
+**\fIinfo_return\fP\^); 
+.HP
+int XFreeFontInfo(\^char **\fInames\fP\^, XFontStruct *\fIfree_info\fP, int
+\fIactual_count\fP\^); 
 .SH ARGUMENTS
 .IP \fIactual_count\fP 1i
 Specifies the actual number of font names.
diff --git a/man/XLoadFont.man b/man/XLoadFont.man
index 571549c4..52affe75 100644
--- a/man/XLoadFont.man
+++ b/man/XLoadFont.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,43 +144,20 @@
 .SH NAME
 XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures
 .SH SYNTAX
-Font XLoadFont\^(\^\fIdisplay\fP, \fIname\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIname\fP\^;
-.LP
-XFontStruct *XQueryFont\^(\^\fIdisplay\fP, \fIfont_ID\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIfont_ID\fP\^;
-.LP
-XFontStruct *XLoadQueryFont\^(\^\fIdisplay\fP, \fIname\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIname\fP\^;
-.LP
-XFreeFont\^(\^\fIdisplay\fP, \fIfont_struct\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.LP
-Bool XGetFontProperty\^(\^\fIfont_struct\fP\^, \^\fIatom\fP\^, \^\fIvalue_return\fP\^)
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.br
-      Atom \fIatom\fP\^;
-.br
-      unsigned long *\fIvalue_return\fP\^;
-.LP
-XUnloadFont\^(\^\fIdisplay\fP, \fIfont\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Font \fIfont\fP\^;
+.HP
+Font XLoadFont\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP\^); 
+.HP
+XFontStruct *XQueryFont\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^); 
+.HP
+XFontStruct *XLoadQueryFont\^(\^Display *\fIdisplay\fP\^, char
+*\fIname\fP\^); 
+.HP
+int XFreeFont\^(\^Display *\fIdisplay\fP\^, XFontStruct *\fIfont_struct\fP\^);
+.HP
+Bool XGetFontProperty\^(\^XFontStruct *\fIfont_struct\fP\^, Atom \fIatom\fP\^,
+unsigned long *\fIvalue_return\fP\^); 
+.HP
+int XUnloadFont\^(\^Display *\fIdisplay\fP\^, Font \fIfont\fP\^); 
 .SH ARGUMENTS
 .IP \fIatom\fP 1i
 Specifies the atom for the property name you want returned.
diff --git a/man/XLookupKeysym.man b/man/XLookupKeysym.man
index 434d6c94..9041f75a 100644
--- a/man/XLookupKeysym.man
+++ b/man/XLookupKeysym.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XLookKsym.man,v 1.4 2003/02/15 17:48:39 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XLookKsym.man,v 1.5 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,42 +144,18 @@
 .SH NAME
 XLookupKeysym, XRefreshKeyboardMapping, XLookupString, XRebindKeysym \- handle keyboard input events in Latin-1
 .SH SYNTAX
-KeySym XLookupKeysym(\^\fIkey_event\fP, \fIindex\fP\^)
-.br
-      XKeyEvent *\fIkey_event\fP\^;
-.br
-      int \fIindex\fP\^;
-.LP
-XRefreshKeyboardMapping(\^\fIevent_map\fP\^)
-.br
-      XMappingEvent *\fIevent_map\fP\^;
-.LP
-int XLookupString(\^\fIevent_struct\fP, \fIbuffer_return\fP,
- \fIbytes_buffer\fP, \fIkeysym_return\fP, \fIstatus_in_out\fP\^)
-.br
-      XKeyEvent *\fIevent_struct\fP\^;
-.br
-      char *\fIbuffer_return\fP\^;
-.br
-      int \fIbytes_buffer\fP\^;
-.br
-      KeySym *\fIkeysym_return\fP\^;
-.br
-      XComposeStatus *\fIstatus_in_out\fP\^;
-.LP
-XRebindKeysym(\^\fIdisplay\fP, \fIkeysym\fP, \fIlist\fP, \fImod_count\fP, \fIstring\fP, \fInum_bytes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      KeySym \fIkeysym\fP\^;
-.br
-      KeySym \fIlist\fP\^[\^]\^;
-.br
-      int \fImod_count\fP\^;
-.br
-      unsigned char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
+.HP
+KeySym XLookupKeysym(\^XKeyEvent *\fIkey_event\fP\^, int \fIindex\fP\^); 
+.HP
+int XRefreshKeyboardMapping(\^XMappingEvent *\fIevent_map\fP\^); 
+.HP
+int XLookupString(\^XKeyEvent *\fIevent_struct\fP\^, char
+*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, XComposeStatus *\fIstatus_in_out\fP\^); 
+.HP
+int XRebindKeysym(\^Display *\fIdisplay\fP\^, KeySym \fIkeysym\fP\^, KeySym
+\fIlist\fP\^[\^]\^, int \fImod_count\fP\^, unsigned char *\fIstring\fP\^, int
+\fInum_bytes\fP\^); 
 .SH ARGUMENTS
 .IP \fIbuffer_return\fP 1i
 Returns the translated characters.
diff --git a/man/XMapWindow.man b/man/XMapWindow.man
index 164ab663..af20ed94 100644
--- a/man/XMapWindow.man
+++ b/man/XMapWindow.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XMapWin.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XMapWin.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,23 +144,12 @@
 .SH NAME
 XMapWindow, XMapRaised, XMapSubwindows \- map windows
 .SH SYNTAX
-XMapWindow\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XMapRaised\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XMapSubwindows\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+int XMapWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XMapRaised\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XMapSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XNextEvent.man b/man/XNextEvent.man
index 62114689..a7eecb45 100644
--- a/man/XNextEvent.man
+++ b/man/XNextEvent.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XNEvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XNEvent.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,71 +144,28 @@
 .SH NAME
 XNextEvent, XPeekEvent, XWindowEvent, XCheckWindowEvent, XMaskEvent, XCheckMaskEvent, XCheckTypedEvent, XCheckTypedWindowEvent \- select events by type
 .SH SYNTAX
-XNextEvent\^(\^\fIdisplay\fP, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-XPeekEvent\^(\^\fIdisplay\fP, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-XWindowEvent\^(\^\fIdisplay\fP, \fIw\fP\^, \fIevent_mask\fP\^, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      long \fIevent_mask\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-Bool XCheckWindowEvent\^(\^\fIdisplay\fP, \fIw\fP\^, \fIevent_mask\fP\^, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      long \fIevent_mask\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-XMaskEvent\^(\^\fIdisplay\fP, \fIevent_mask\fP\^, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      long \fIevent_mask\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-Bool XCheckMaskEvent\^(\^\fIdisplay\fP, \fIevent_mask\fP\^, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      long \fIevent_mask\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-Bool XCheckTypedEvent\^(\^\fIdisplay\fP, \fIevent_type\fP\^, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIevent_type\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
-.LP
-Bool XCheckTypedWindowEvent\^(\^\fIdisplay\fP, \fIw\fP\^, \fIevent_type\fP\^, \fIevent_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIevent_type\fP\^;
-.br
-      XEvent *\fIevent_return\fP\^;
+.HP
+int XNextEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+int XPeekEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+int XWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long
+\fIevent_mask\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+Bool XCheckWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long
+\fIevent_mask\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+int XMaskEvent\^(\^Display *\fIdisplay\fP\^, long \fIevent_mask\fP\^, XEvent
+*\fIevent_return\fP\^); 
+.HP
+Bool XCheckMaskEvent\^(\^Display *\fIdisplay\fP\^, long \fIevent_mask\fP\^,
+XEvent *\fIevent_return\fP\^); 
+.HP
+Bool XCheckTypedEvent\^(\^Display *\fIdisplay\fP\^, int \fIevent_type\fP\^,
+XEvent *\fIevent_return\fP\^); 
+.HP
+Bool XCheckTypedWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+int \fIevent_type\fP\^, XEvent *\fIevent_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XNoOp.man b/man/XNoOp.man
index c0013661..a3ba2fa0 100644
--- a/man/XNoOp.man
+++ b/man/XNoOp.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XNoOp.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XNoOp.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,9 +144,7 @@
 .SH NAME
 XNoOp \- No Operation
 .SH SYNTAX
-XNoOp\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
+int XNoOp\^(\^Display *\fIdisplay\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XOpenDisplay.man b/man/XOpenDisplay.man
index 3be2113d..7134afee 100644
--- a/man/XOpenDisplay.man
+++ b/man/XOpenDisplay.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XOpDsply.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XOpDsply.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,10 @@
 .SH NAME
 XOpenDisplay, XCloseDisplay \- connect or disconnect to X server
 .SH SYNTAX
-Display *XOpenDisplay\^(\^\fIdisplay_name\fP\^)
-.br
-      char *\fIdisplay_name\fP\^;
-.LP
-XCloseDisplay\^(\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
+.HP
+Display *XOpenDisplay\^(\^char *\fIdisplay_name\fP\^); 
+.HP
+int XCloseDisplay\^(Display *\fIdisplay\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XOpenIM.man b/man/XOpenIM.man
index ae1274eb..fcf12e9f 100644
--- a/man/XOpenIM.man
+++ b/man/XOpenIM.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XOpenIM.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XOpenIM.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,63 +144,27 @@
 .SH NAME
 XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and otain input method information
 .SH SYNTAX
-XIM XOpenIM\^(\^\fIdisplay\fP\^, \fIdb\fP\^, \fIres_name\fP\^, \fIres_class\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XrmDatabase \fIdb\fP\^;
-.br
-      char *\fIres_name\fP\^;
-.br
-      char *\fIres_class\fP\^;
-.LP
-Status XCloseIM\^(\^\fIim\fP\^)
-.br
-      XIM \fIim\fP\^;
-.LP
-char * XSetIMValues\^(\^\fIim\fP\^, ...)
-.br
-      XIM \fIim\fP\^; 
-.LP
-char * XGetIMValues\^(\^\fIim\fP\^, ...)
-.br
-      XIM \fIim\fP\^; 
-.LP
-Display * XDisplayOfIM\^(\^\fIim\fP\^)
-.br
-	XIM \fIim\fP\^;
-.LP
-char * XLocaleOfIM\^(\^\fIim\fP\^)
-.br
-      XIM \fIim\fP\^; 
-.LP
-Bool XRegisterIMInstantiateCallback\^(\^\fIdisplay\fP\^, \fIdb\fP\^, \fIres_name\fP\^, \fIres_class\fP\^, \fIcallback\fP\^, \fIclient_data\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XrmDatabase \fIdb\fP\^;
-.br
-      char *\fIres_name\fP\^;
-.br
-      char *\fIres_class\fP\^;
-.br
-      XIMProc  \fIcallback\fP\^;
-.br
-      XPointer *\fIclient_data\fP\^;
-.LP
-Bool XUnregisterIMInstantiateCallback\^(\^\fIdisplay\fP\^, \fIdb\fP\^, \fIres_name\fP\^, \fIres_class\fP\^, \fIcallback\fP\^, \fIclient_data\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XrmDatabase \fIdb\fP\^;
-.br
-      char *\fIres_name\fP\^;
-.br
-      char *\fIres_class\fP\^;
-.br
-      XIMProc  \fIcallback\fP\^;
-.br
-      XPointer *\fIclient_data\fP\^;
+.HP
+XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
+*\fIres_name\fP\^, char *\fIres_class\fP\^); 
+.HP
+Status XCloseIM\^(\^XIM \fIim\fP\^); 
+.HP
+char *XSetIMValues\^(\^XIM \fIim\fP\^, ...); 
+.HP
+char *XGetIMValues\^(\^XIM \fIim\fP\^, ...); 
+.HP
+Display *XDisplayOfIM\^(\^XIM \fIim\fP\^); 
+.HP
+char *XLocaleOfIM\^(\^XIM \fIim\fP\^); 
+.HP
+Bool XRegisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^, XrmDatabase
+\fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^, XIMProc
+\fIcallback\fP\^, XPointer *\fIclient_data\fP\^); 
+.HP
+Bool XUnregisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^,
+XrmDatabase \fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^,
+XIMProc  \fIcallback\fP\^, XPointer *\fIclient_data\fP\^); 
 .LP
 .SH ARGUMENTS
 .IP \fIcallback\fP 1i
diff --git a/man/XOpenOM.man b/man/XOpenOM.man
index 6a45ad33..89285ece 100644
--- a/man/XOpenOM.man
+++ b/man/XOpenOM.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XOpenOM.man,v 1.4 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XOpenOM.man,v 1.5 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,35 +145,19 @@
 .SH NAME
 XOpenOM, XCloseOM, XSetOMValues, XGetOMValues, XDisplayOfOM, XLocaleOfOM \- open output methods
 .SH SYNTAX
-XOM XOpenOM\^(\^\fIdisplay\fP\^, \fIdb\fP\^, \fIres_name\fP\^, \fIres_class\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XrmDatabase \fIdb\fP\^;
-.br
-      char *\fIres_name\fP\^;
-.br
-      char *\fIres_class\fP\^;
-.LP
-Status XCloseOM\^(\^\fIom\fP\^)
-.br
-      XOM \fIom\fP\^;
-.LP
-char * XSetOMValues\^(\^\fIom\fP\^, ...)
-.br
-      XOM \fIom\fP\^; 
-.LP
-char * XGetOMValues\^(\^\fIom\fP\^, ...)
-.br
-      XOM \fIom\fP\^; 
-.LP
-Display * XDisplayOfOM\^(\^\fIom\fP\^)
-.br
-	XOM \fIom\fP\^;
-.LP
-char * XLocaleOfOM\^(\^\fIom\fP\^)
-.br
-      XOM \fIom\fP\^; 
+.HP
+XOM XOpenOM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
+*\fIres_name\fP\^, char *\fIres_class\fP\^); 
+.HP
+Status XCloseOM\^(\^XOM \fIom\fP\^); 
+.HP
+char *XSetOMValues\^(\^XOM \fIom\fP\^); 
+.HP
+char *XGetOMValues\^(\^XOM \fIom\fP\^); 
+.HP
+Display *XDisplayOfOM\^(\^XOM \fIom\fP\^); 
+.HP
+char *XLocaleOfOM\^(\^XOM \fIom\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XParseGeometry.man b/man/XParseGeometry.man
index ae82e75f..feb87715 100644
--- a/man/XParseGeometry.man
+++ b/man/XParseGeometry.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XParGeom.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XParGeom.man,v 1.4 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,38 +144,16 @@
 .SH NAME
 XParseGeometry, XWMGeometry \- parse window geometry
 .SH SYNTAX
-int XParseGeometry\^(\^\fIparsestring\fP\^, \fIx_return\fP\^, \fIy_return\fP\^, \fIwidth_return\fP\^, \fIheight_return\fP\^)
-.br
-      char *\fIparsestring\fP\^;
-.br
-      int *\fIx_return\fP\^, *\fIy_return\fP\^; 
-.br
-      unsigned int *\fIwidth_return\fP\^, *\fIheight_return\fP\^;
-.LP
-int XWMGeometry\^(\^\fIdisplay\fP, \fIscreen\fP, \fIuser_geom\fP,
-\fIdef_geom\fP, \fIbwidth\fP, \fIhints\fP, \fIx_return\fP, \fIy_return\fP,
-.br
-                \fIwidth_return\fP, \fIheight_return\fP, \fIgravity_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIscreen\fP\^;
-.br
-      char *\fIuser_geom\fP\^;
-.br
-      char *\fIdef_geom\fP\^;
-.br
-      unsigned int \fIbwidth\fP\^;
-.br
-      XSizeHints *\fIhints\fP\^;
-.br
-      int *\fIx_return\fP, *\fIy_return\fP\^; 
-.br
-      int *\fIwidth_return\fP\^;
-.br
-      int *\fIheight_return\fP\^;
-.br
-      int *\fIgravity_return\fP\^;
+.HP
+int XParseGeometry\^(\^char *\fIparsestring\fP\^, int *\fIx_return\fP\^, int
+*\fIy_return\fP\^, unsigned int *\fIwidth_return\fP\^, unsigned int
+*\fIheight_return\fP\^); 
+.HP
+int XWMGeometry\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, char
+*\fIuser_geom\fP\^, char *\fIdef_geom\fP\^, unsigned int \fIbwidth\fP\^,
+XSizeHints *\fIhints\fP\^, int *\fIx_return\fP, int *\fIy_return\fP\^, int
+*\fIwidth_return\fP\^, int *\fIheight_return\fP\^, int
+*\fIgravity_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIposition\fP 1i
 .br
diff --git a/man/XPolygonRegion.man b/man/XPolygonRegion.man
index 994513dc..b5c86544 100644
--- a/man/XPolygonRegion.man
+++ b/man/XPolygonRegion.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XPolyReg.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XPolyReg.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,11 @@
 .SH NAME
 XPolygonRegion, XClipBox \- generate regions
 .SH SYNTAX
-Region XPolygonRegion\^(\^\fIpoints\fP\^, \fIn\fP\^, \fIfill_rule\fP\^)
-.br
-      XPoint \fIpoints[]\fP\^;
-.br
-      int \fIn\fP\^;
-.br
-      int \fIfill_rule\fP\^;	
-.LP
-XClipBox\^(\^\fIr\fP\^, \fIrect_return\fP\^)
-.br
-      Region \fIr\fP\^;
-.br
-      XRectangle *\fIrect_return\fP\^;
+.HP
+Region XPolygonRegion\^(\^XPoint \fIpoints\fP[]\^, int \fIn\fP\^, int
+\fIfill_rule\fP\^); 
+.HP
+int XClipBox\^(\^Region \fIr\fP\^, XRectangle *\fIrect_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIfill_rule\fP 1i
 Specifies the fill-rule you want to set for the specified GC.
diff --git a/man/XPutBackEvent.man b/man/XPutBackEvent.man
index d2a337e7..b69ee4d5 100644
--- a/man/XPutBackEvent.man
+++ b/man/XPutBackEvent.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XPutBEvnt.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XPutBEvnt.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,11 +144,8 @@
 .SH NAME
 XPutBackEvent \- put events back on the queue
 .SH SYNTAX
-XPutBackEvent\^(\^\fIdisplay\fP, \fIevent\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XEvent *\fIevent\fP\^;
+.HP
+XPutBackEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XPutImage.man b/man/XPutImage.man
index c49445c7..8a54a019 100644
--- a/man/XPutImage.man
+++ b/man/XPutImage.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XPutImage.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XPutImage.man,v 1.4 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,55 +144,20 @@
 .SH NAME
 XPutImage, XGetImage, XGetSubImage \- transfer images
 .SH SYNTAX
-XPutImage\^(\^\fIdisplay\fP, \fId\fP\^, \fIgc\fP\^, \fIimage\fP\^, \fIsrc_x\fP, \fIsrc_y\fP, \fIdest_x\fP\^, \fIdest_y\fP\^, \fIwidth\fP\^, \fIheight\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        Drawable \fId\fP\^;
-.br
-        GC \fIgc\fP\^;
-.br
-        XImage *\fIimage\fP\^;
-.br
-        int \fIsrc_x\fP\^, \fIsrc_y\fP\^;
-.br
-        int \fIdest_x\fP\^, \fIdest_y\fP\^;
-.br
-        unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.LP
-XImage *XGetImage\^(\^\fIdisplay\fP, \fId\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIplane_mask\fP, \fIformat\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        Drawable \fId\fP\^;
-.br
-        int \fIx\fP\^, \fIy\fP\^;
-.br
-        unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-        unsigned long \fIplane_mask\fP\^;
-.br
-        int \fIformat\fP\^;
-.LP
-XImage *XGetSubImage\^(\^\fIdisplay\fP, \fId\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIplane_mask\fP, \fIformat\fP\^, \fIdest_image\fP\^, \fIdest_x\fP\^, 
-.br
-                     \fIdest_y\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned long \fIplane_mask\fP\^;
-.br
-      int \fIformat\fP\^;
-.br
-      XImage *\fIdest_image\fP\^;
-.br
-      int \fIdest_x\fP\^, \fIdest_y\fP\^;
+.HP
+int XPutImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+XImage *\fIimage\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, int
+\fIdest_x\fP\^, int \fIdest_y\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^); 
+.HP
+XImage *XGetImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, int
+\fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, unsigned long \fIplane_mask\fP\^, int \fIformat\fP\^); 
+.HP
+XImage *XGetSubImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, int
+\fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, unsigned long \fIplane_mask\fP\^, int \fIformat\fP\^, XImage
+*\fIdest_image\fP\^, int \fIdest_x\fP\^, \fIdest_y\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XQueryBestSize.man b/man/XQueryBestSize.man
index cbb02aa0..40c507b7 100644
--- a/man/XQueryBestSize.man
+++ b/man/XQueryBestSize.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XQBSize.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XQBSize.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,37 +144,19 @@
 .SH NAME
 XQueryBestSize, XQueryBestTile, XQueryBestStipple \- determine efficient sizes
 .SH SYNTAX
-Status XQueryBestSize\^(\^\fIdisplay\fP, \fIclass\fP, \fIwhich_screen\fP, \fIwidth\fP, \fIheight\fP, \fIwidth_return\fP, \fIheight_return\fP\^) 
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIclass\fP\^;
-.br
-      Drawable \fIwhich_screen\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
-.LP
-Status XQueryBestTile\^(\^\fIdisplay\fP, \fIwhich_screen\fP, \fIwidth\fP, \fIheight\fP, \fIwidth_return\fP, \fIheight_return\fP\^) 
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fIwhich_screen\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
-.LP
-Status XQueryBestStipple\^(\^\fIdisplay\fP, \fIwhich_screen\fP, \fIwidth\fP, \fIheight\fP, \fIwidth_return\fP, \fIheight_return\fP\^) 
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fIwhich_screen\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
+.HP
+Status XQueryBestSize\^(\^Display *\fIdisplay\fP\^, int \fIclass\fP\^,
+Drawable \fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int
+\fIheight\fP\^, unsigned int *\fIwidth_return\fP, unsigned int
+*\fIheight_return\fP\^); 
+.HP
+Status XQueryBestTile\^(\^Display *\fIdisplay\fP\^, Drawable
+\fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+unsigned int *\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^);
+.HP
+Status XQueryBestStipple\^(\^Display *\fIdisplay\fP\^, Drawable
+\fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+unsigned int *\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIclass\fP 1i
 Specifies the class that you are interested in.
diff --git a/man/XQueryColor.man b/man/XQueryColor.man
index cac6b054..9d37479b 100644
--- a/man/XQueryColor.man
+++ b/man/XQueryColor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XQColor.man,v 1.4 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XQColor.man,v 1.5 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,44 +144,19 @@
 .SH NAME
 XQueryColor, XQueryColors, XLookupColor, XParseColor \- obtain color values
 .SH SYNTAX
-XQueryColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIdef_in_out\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XColor *\fIdef_in_out\fP\^;
-.LP
-XQueryColors\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIdefs_in_out\fP\^, \fIncolors\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XColor \fIdefs_in_out\fP[\^]\^;
-.br
-      int \fIncolors\fP\^;
-.LP
-Status XLookupColor\^(\^\fIdisplay\fP, \fIcolormap\fP, \fIcolor_name\fP,
-\fIexact_def_return\fP\^, \fIscreen_def_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      char *\fIcolor_name\fP\^;
-.br
-      XColor *\fIexact_def_return\fP\^, *\fIscreen_def_return\fP\^;
-.LP
-Status XParseColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \^\fIspec\fP\^, \fIexact_def_return\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        Colormap \fIcolormap\fP\^;
-.br
-        char *\fIspec\fP\^;
-.br
-        XColor *\fIexact_def_return\fP\^;
+.HP
+int XQueryColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^, XColor
+*\fIdef_in_out\fP\^); 
+.HP
+int XQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XColor \fIdefs_in_out\fP[\^]\^, int \fIncolors\fP\^); 
+.HP
+Status XLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+char *\fIcolor_name\fP\^, XColor *\fIexact_def_return\fP\^, XColor
+*\fIscreen_def_return\fP\^); 
+.HP
+Status XParseColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+char *\fIspec\fP\^, XColor *\fIexact_def_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIcolormap\fP 1i
 Specifies the colormap.
diff --git a/man/XQueryPointer.man b/man/XQueryPointer.man
index 1bae0815..8fa2e2a6 100644
--- a/man/XQueryPointer.man
+++ b/man/XQueryPointer.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XQPointer.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XQPointer.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,11 @@
 .SH NAME
 XQueryPointer \- get pointer coordinates
 .SH SYNTAX
-Bool XQueryPointer\^(\^\fIdisplay\fP, \fIw\fP\^, \fIroot_return\fP\^, \fIchild_return\fP\^, \fIroot_x_return\fP\^, \fIroot_y_return\fP\^, 
-.br
-                     \fIwin_x_return\fP\^, \fIwin_y_return\fP\^, \fImask_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window *\fIroot_return\fP\^, *\fIchild_return\fP\^;
-.br
-      int *\fIroot_x_return\fP\^, *\fIroot_y_return\fP\^;
-.br
-      int *\fIwin_x_return\fP\^, *\fIwin_y_return\fP\^;
-.br
-      unsigned int *\fImask_return\fP\^;
+.HP
+Bool XQueryPointer\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window
+*\fIroot_return\fP\^, Window *\fIchild_return\fP\^, int
+*\fIroot_x_return\fP\^, int *\fIroot_y_return\fP\^, int *\fIwin_x_return\fP\^,
+int *\fIwin_y_return\fP\^, unsigned int *\fImask_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIchild_return\fP 1i
 Returns the child window that the pointer is located in, if any.
diff --git a/man/XQueryTree.man b/man/XQueryTree.man
index 13b52cb6..f6898976 100644
--- a/man/XQueryTree.man
+++ b/man/XQueryTree.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XQTree.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XQTree.man,v 1.4 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,10 @@
 .SH NAME
 XQueryTree \- query window tree information
 .SH SYNTAX
-Status XQueryTree\^(\^\fIdisplay\fP, \fIw\fP\^, \fIroot_return\fP\^, \fIparent_return\fP\^, \fIchildren_return\fP\^, \fInchildren_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window *\fIroot_return\fP\^;
-.br
-      Window *\fIparent_return\fP\^;
-.br
-      Window **\fIchildren_return\fP\^;
-.br
-      unsigned int *\fInchildren_return\fP\^;
+.HP
+Status XQueryTree\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window
+*\fIroot_return\fP\^, Window *\fIparent_return\fP\^, Window
+**\fIchildren_return\fP\^, unsigned int *\fInchildren_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIchildren_return\fP 1i
 Returns the list of children.
diff --git a/man/XRaiseWindow.man b/man/XRaiseWindow.man
index c31c0c21..a62a0f90 100644
--- a/man/XRaiseWindow.man
+++ b/man/XRaiseWindow.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XRaiseWin.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XRaiseWin.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,45 +144,20 @@
 .SH NAME
 XRaiseWindow, XLowerWindow, XCirculateSubwindows, XCirculateSubwindowsUp, XCirculateSubwindowsDown, XRestackWindows \- change window stacking order
 .SH SYNTAX
-XRaiseWindow\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XLowerWindow\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XCirculateSubwindows\^(\^\fIdisplay\fP, \fIw\fP\^, \fIdirection\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      int \fIdirection\fP\^;
-.LP
-XCirculateSubwindowsUp\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XCirculateSubwindowsDown\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XRestackWindows\^(\^\fIdisplay\fP, \fIwindows\fP\^, \^\fInwindows\fP\^);
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIwindows\fP\^[];
-.br
-      int \fInwindows\fP\^;
+.HP
+int XRaiseWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XLowerWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XCirculateSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIdirection\fP\^); 
+.HP
+int XCirculateSubwindowsUp\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XCirculateSubwindowsDown\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XRestackWindows\^(\^Display *\fIdisplay\fP\^, Window \fIwindows\fP\^[], int
+\fInwindows\fP\^); 
 .SH ARGUMENTS
 .IP \fIdirection\fP 1i
 Specifies the direction (up or down) that you want to circulate
diff --git a/man/XReadBitmapFile.man b/man/XReadBitmapFile.man
index ade48a58..f35eb4dd 100644
--- a/man/XReadBitmapFile.man
+++ b/man/XReadBitmapFile.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XReadBF.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XReadBF.man,v 1.4 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,67 +144,27 @@
 .SH NAME
 XReadBitmapFile, XReadBitmapFileData, XWriteBitmapFile, XCreatePixmapFromBitmapData, XCreateBitmapFromData \- manipulate bitmaps
 .SH SYNTAX
-int XReadBitmapFile(\^\fIdisplay\fP, \fId\fP, \fIfilename\fP, \fIwidth_return\fP, \fIheight_return\fP, \fIbitmap_return\fP, \fIx_hot_return\fP, 
-.br
-                       \fIy_hot_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      char *\fIfilename\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
-.br
-      Pixmap *\fIbitmap_return\fP\^;
-.br
-      int *\fIx_hot_return\fP, *\fIy_hot_return\fP\^;	
-.LP
-int XReadBitmapFileData(\^\fIfilename\fP, \fIwidth_return\fP, \fIheight_return\fP, \fIdata_return\fP, \fIx_hot_return\fP, \fIy_hot_return\fP\^)
-.br
-      char *\fIfilename\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
-.br
-      unsigned char *\fIdata_return\fP\^;
-.br
-      int *\fIx_hot_return\fP, *\fIy_hot_return\fP\^;	
-.LP
-int XWriteBitmapFile(\^\fIdisplay\fP, \fIfilename\fP, \fIbitmap\fP, \fIwidth\fP, \fIheight\fP, \fIx_hot\fP, \fIy_hot\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIfilename\fP\^;
-.br
-      Pixmap \fIbitmap\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-      int \fIx_hot\fP, \fIy_hot\fP\^;
-.LP
-Pixmap XCreatePixmapFromBitmapData\^(\^\fIdisplay\fP, \fId\fP, \fIdata\fP, \fIwidth\fP, \fIheight\fP, \fIfg\fP, \fIbg\fP, \fIdepth\fP\^)
-.br
-     Display *\fIdisplay\fP\^;
-.br
-     Drawable \fId\fP\^;
-.br
-     char *\fIdata\fP\^;
-.br
-     unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-     unsigned long \fIfg\fP, \fIbg\fP\^;
-.br
-     unsigned int \fIdepth\fP\^;
-.LP
-Pixmap XCreateBitmapFromData(\^\fIdisplay\fP, \fId\fP, \fIdata\fP, \fIwidth\fP, \fIheight\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      char *\fIdata\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
+.HP
+int XReadBitmapFile(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, char
+*\fIfilename\fP\^, unsigned int *\fIwidth_return\fP, unsigned int
+*\fIheight_return\fP\^, Pixmap *\fIbitmap_return\fP\^, int
+*\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 
+.HP
+int XReadBitmapFileData(\^char *\fIfilename\fP\^, unsigned int
+*\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^, unsigned char
+*\fIdata_return\fP\^, int *\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 
+.HP
+int XWriteBitmapFile(\^Display *\fIdisplay\fP\^, char *\fIfilename\fP\^,
+Pixmap \fIbitmap\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+int \fIx_hot\fP, int \fIy_hot\fP\^); 
+.HP
+Pixmap XCreatePixmapFromBitmapData\^(\^Display *\fIdisplay\fP\^, Drawable
+\fId\fP\^, char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int
+\fIheight\fP\^, unsigned long \fIfg\fP, unsigned int \fIbg\fP\^, unsigned int
+\fIdepth\fP\^); 
+.HP
+Pixmap XCreateBitmapFromData(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^); 
 .SH ARGUMENTS
 .IP \fIbitmap\fP 1i
 Specifies the bitmap.
diff --git a/man/XRecolorCursor.man b/man/XRecolorCursor.man
index ad8a8f15..70e50ece 100644
--- a/man/XRecolorCursor.man
+++ b/man/XRecolorCursor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XRecCur.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XRecCur.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,29 +144,15 @@
 .SH NAME
 XRecolorCursor, XFreeCursor, XQueryBestCursor \- manipulate cursors
 .SH SYNTAX
-XRecolorCursor\^(\^\fIdisplay\fP, \fIcursor\fP\^, \fIforeground_color\fP\^, \fIbackground_color\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Cursor \fIcursor\fP\^;
-.br
-      XColor *\fIforeground_color\fP\^, *\fIbackground_color\fP\^;
-.LP
-XFreeCursor\^(\^\fIdisplay\fP, \fIcursor\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Cursor \fIcursor\fP\^;
-.LP
-Status XQueryBestCursor\^(\^\fIdisplay\fP, \fId\fP, \fIwidth\fP\^, \fIheight\fP\^, \fIwidth_return\fP\^, \fIheight_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP\^, *\fIheight_return\fP\^;
+.HP
+int XRecolorCursor\^(\^Display *\fIdisplay\fP\^, Cursor \fIcursor\fP\^, XColor
+*\fIforeground_color\fP\^, XColor *\fIbackground_color\fP\^); 
+.HP
+int XFreeCursor\^(\^Display *\fIdisplay\fP\^, Cursor \fIcursor\fP\^); 
+.HP
+Status XQueryBestCursor\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int
+*\fIwidth_return\fP\^, unsigned int *\fIheight_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIbackground_color\fP 1i
 Specifies the RGB values for the background of the source.
diff --git a/man/XReparentWindow.man b/man/XReparentWindow.man
index 730c8c8e..1fa09220 100644
--- a/man/XReparentWindow.man
+++ b/man/XReparentWindow.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XReparWin.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XReparWin.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,15 +144,9 @@
 .SH NAME
 XReparentWindow \- reparent windows
 .SH SYNTAX
-XReparentWindow\^(\^\fIdisplay\fP, \fIw\fP\^, \fIparent\fP\^, \fIx\fP\^, \fIy\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window \fIparent\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
+.HP
+int XReparentWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window
+\fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XResourceManagerString.man b/man/XResourceManagerString.man
index 27340c7b..699c3887 100644
--- a/man/XResourceManagerString.man
+++ b/man/XResourceManagerString.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XRMStr.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XRMStr.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,10 @@
 .SH NAME
 XResourceManagerString, XScreenResourceString \- obtain server resource properties
 .SH SYNTAX
-char *XResourceManagerString\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-char *XScreenResourceString\^(\^\fIscreen\fP\^)
-.br
-      Screen *\fIscreen\fP\^;
+.HP
+char *XResourceManagerString\^(\^Display *\fIdisplay\fP\^); 
+.HP
+char *XScreenResourceString\^(\^Screen *\fIscreen\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSaveContext.man b/man/XSaveContext.man
index 1972a22a..62f9b2f0 100644
--- a/man/XSaveContext.man
+++ b/man/XSaveContext.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSContext.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSContext.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,38 +144,20 @@
 .SH NAME
 XSaveContext, XFindContext, XDeleteContext, XUniqueContext \- associative look-up routines
 .SH SYNTAX
-int XSaveContext(\^\fIdisplay\fP, \fIrid\fP, \fIcontext\fP, \fIdata\fP\^)
-.br
-      Display *\fIdisplay\fP\^;	
-.br
-      XID \fIrid\fP\^;
-.br
-      XContext \fIcontext\fP\^;
-.br
-      XPointer \fIdata\fP\^;
+.HP
+int XSaveContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext
+\fIcontext\fP\^, XPointer \fIdata\fP\^); 
+.HP
+int XFindContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext
+\fIcontext\fP\^, XPointer *\fIdata_return\fP\^); 
+.HP
+int XDeleteContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP, XContext
+\fIcontext\fP); 
 .LP
-int XFindContext(\^\fIdisplay\fP, \fIrid\fP, \fIcontext\fP, \fIdata_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIrid\fP\^;
-.br
-      XContext \fIcontext\fP\^;
-.br
-      XPointer *\fIdata_return\fP\^;	
-.LP
-int XDeleteContext(\^\fIdisplay\fP, \fIrid\fP, \fIcontext\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIrid\fP;
-.br
-      XContext \fIcontext\fP;
-.LP
-XContext XUniqueContext(\^)
+XContext XUniqueContext(void); 
 .SH ARGUMENTS
 .IP \fIcontext\fP 1i
-Specifies the context type to which the data belongs.
+Specifies the context type to which the data belongs. 
 .IP \fIdata\fP 1i
 Specifies the data to be associated with the window and type.
 .IP \fIdata_return\fP 1i
diff --git a/man/XSelectInput.man b/man/XSelectInput.man
index b0b2fb50..1c81fb71 100644
--- a/man/XSelectInput.man
+++ b/man/XSelectInput.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSInput.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSInput.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,9 @@
 .SH NAME
 XSelectInput \- select input events
 .SH SYNTAX
-XSelectInput\^(\^\fIdisplay\fP, \fIw\fP\^, \fIevent_mask\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      long \fIevent_mask\fP\^;
+.HP
+int XSelectInput\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long
+\fIevent_mask\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSendEvent.man b/man/XSendEvent.man
index f1dcc611..2df8959e 100644
--- a/man/XSendEvent.man
+++ b/man/XSendEvent.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeEvent.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSeEvent.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,31 +144,14 @@
 .SH NAME
 XSendEvent, XDisplayMotionBufferSize, XGetMotionEvents, XTimeCoord \- send events and pointer motion history structure
 .SH SYNTAX
-Status XSendEvent\^(\^\fIdisplay\fP, \fIw\fP\^, \fIpropagate\fP\^, \fIevent_mask\fP\^, \fIevent_send\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Bool \fIpropagate\fP\^;
-.br
-      long \fIevent_mask\fP\^;
-.br
-      XEvent *\fIevent_send\fP\^;
-.LP
-unsigned long XDisplayMotionBufferSize\^(\^\fIdisplay\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.LP
-XTimeCoord *XGetMotionEvents\^(\^\fIdisplay\fP, \fIw\fP\^, \fIstart\fP\^, \fIstop\fP\^, \fInevents_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Time \fIstart\fP\^, \fIstop\fP\^;	
-.br
-      int *\fInevents_return\fP\^;
+.HP
+Status XSendEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Bool
+\fIpropagate\fP\^, long \fIevent_mask\fP\^, XEvent *\fIevent_send\fP\^); 
+.HP
+unsigned long XDisplayMotionBufferSize\^(\^Display *\fIdisplay\fP\^); 
+.HP
+XTimeCoord *XGetMotionEvents\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Time \fIstart\fP\^, Time \fIstop\fP\^, int *\fInevents_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetArcMode.man b/man/XSetArcMode.man
index 808f6694..7f856c51 100644
--- a/man/XSetArcMode.man
+++ b/man/XSetArcMode.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeArcMod.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeArcMod.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,29 +144,15 @@
 .SH NAME
 XSetArcMode, XSetSubwindowMode, XSetGraphicsExposure \- GC convenience routines
 .SH SYNTAX
-XSetArcMode\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIarc_mode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIarc_mode\fP\^;
-.LP
-XSetSubwindowMode\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIsubwindow_mode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIsubwindow_mode\fP\^;
-.LP
-XSetGraphicsExposures\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIgraphics_exposures\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      Bool \fIgraphics_exposures\fP\^;
+.HP
+int XSetArcMode\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIarc_mode\fP\^); 
+.HP
+int XSetSubwindowMode\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIsubwindow_mode\fP\^); 
+.HP
+int XSetGraphicsExposures\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Bool
+\fIgraphics_exposures\fP\^); 
 .SH ARGUMENTS
 .IP \fIarc_mode\fP 1i
 Specifies the arc mode.
diff --git a/man/XSetClipOrigin.man b/man/XSetClipOrigin.man
index 1cbfc56a..63fcc074 100644
--- a/man/XSetClipOrigin.man
+++ b/man/XSetClipOrigin.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeClipO.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeClipO.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,35 +144,16 @@
 .SH NAME
 XSetClipOrigin, XSetClipMask, XSetClipRectangles \- GC convenience routines
 .SH SYNTAX
-XSetClipOrigin\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIclip_x_origin\fP\^, \fIclip_y_origin\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIclip_x_origin\fP\^, \fIclip_y_origin\fP\^;
-.LP
-XSetClipMask\^(\^\fIdisplay\fP, \fIgc\fP, \fIpixmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      Pixmap \fIpixmap\fP\^;
-.LP
-XSetClipRectangles\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIclip_x_origin\fP\^, \fIclip_y_origin\fP\^, \fIrectangles\fP\^, \fIn\fP\^, \fIordering\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIclip_x_origin\fP\^, \fIclip_y_origin\fP\^;
-.br
-      XRectangle \fIrectangles\fP[]\^;
-.br
-      int \fIn\fP\^;
-.br
-      int \fIordering\fP\^;
+.HP
+int XSetClipOrigin\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIclip_x_origin\fP\^, int \fIclip_y_origin\fP\^); 
+.HP
+int XSetClipMask\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap
+\fIpixmap\fP\^); 
+.HP
+int XSetClipRectangles\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIclip_x_origin\fP\^, int \fIclip_y_origin\fP\^, XRectangle
+\fIrectangles\fP[]\^, int \fIn\fP\^, int \fIordering\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetCloseDownMode.man b/man/XSetCloseDownMode.man
index 7d1a5106..fa6bd253 100644
--- a/man/XSetCloseDownMode.man
+++ b/man/XSetCloseDownMode.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeClosDM.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeClosDM.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,17 +144,10 @@
 .SH NAME
 XSetCloseDownMode, XKillClient \- control clients
 .SH SYNTAX
-XSetCloseDownMode\^(\^\fIdisplay\fP, \fIclose_mode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIclose_mode\fP\^;	
-.LP
-XKillClient\^(\^\fIdisplay\fP, \fIresource\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIresource\fP\^;
+.HP
+int XSetCloseDownMode\^(\^Display *\fIdisplay\fP\^, int \fIclose_mode\fP\^); 
+.HP
+int XKillClient\^(\^Display *\fIdisplay\fP\^, XID \fIresource\fP\^); 
 .SH ARGUMENTS
 .IP \fIclose_mode\fP 1i
 Specifies the client close-down mode.
diff --git a/man/XSetCommand.man b/man/XSetCommand.man
index f9cd97be..78dd5b21 100644
--- a/man/XSetCommand.man
+++ b/man/XSetCommand.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeCmd.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSeCmd.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,26 +144,12 @@
 .SH NAME
 XSetCommand, XGetCommand \- set or read a window's WM_COMMAND property
 .SH SYNTAX
-XSetCommand\^(\^\fIdisplay\fP, \fIw\fP, \fIargv\fP, \fIargc\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char **\fIargv\fP\^;
-.br
-      int \fIargc\fP\^;
-.LP
-Status XGetCommand\^(\^\fIdisplay\fP, \fIw\fP, \fIargv_return\fP,
-\fIargc_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char ***\fIargv_return\fP\^;
-.br
-      int *\fIargc_return\fP\^;
+.HP
+int XSetCommand\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+**\fIargv\fP\^, int \fIargc\fP\^); 
+.HP
+Status XGetCommand\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+***\fIargv_return\fP\^, int *\fIargc_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIargc\fP 1i
 Specifies the number of arguments.
diff --git a/man/XSetErrorHandler.man b/man/XSetErrorHandler.man
index a752eabc..9e856de8 100644
--- a/man/XSetErrorHandler.man
+++ b/man/XSetErrorHandler.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeErrHan.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeErrHan.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,39 +144,21 @@
 .SH NAME
 XSetErrorHandler, XGetErrorText, XDisplayName, XSetIOErrorHandler, XGetErrorDatabaseText \- default error handlers
 .SH SYNTAX
-int (*XSetErrorHandler\^(\^\fIhandler\fP\^)\^)\^(\^)
-.br
-      int (\^*\^\fIhandler\fP\^)\^(Display *, XErrorEvent *)
-.LP
-XGetErrorText\^(\^\fIdisplay\fP, \fIcode\fP, \fIbuffer_return\fP, \fIlength\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIcode\fP\^;
-.br
-      char *\fIbuffer_return\fP\^;
-.br
-      int \fIlength\fP\^;
-.LP
-char *XDisplayName\^(\^\fIstring\fP\^)
-.br
-      char *\fIstring\fP\^;
-.LP
-int (*XSetIOErrorHandler\^(\^\fIhandler\fP\^)\^)\^(\^)
-.br
-      int (\^*\^\fIhandler\fP\^)(Display *);
-.LP
-XGetErrorDatabaseText\^(\^\fIdisplay\fP, \fIname\fP, \fImessage\fP, \fIdefault_string\fP, \fIbuffer_return\fP, \fIlength\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIname\fP, *\fImessage\fP\^;
-.br
-      char *\fIdefault_string\fP\^;
-.br
-      char *\fIbuffer_return\fP\^;
-.br
-      int \fIlength\fP\^;
+.HP
+int (*XSetErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)\^(Display *, XErrorEvent
+*)\^)\^)\^(\^); 
+.HP
+int XGetErrorText\^(\^Display *\fIdisplay\fP\^, int \fIcode\fP\^, char
+*\fIbuffer_return\fP\^, int \fIlength\fP\^); 
+.HP
+char *XDisplayName\^(\^char *\fIstring\fP\^); 
+.HP
+int (*XSetIOErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)(Display
+*)\^)\^)\^(\^); 
+.HP
+int XGetErrorDatabaseText\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP, char
+*\fImessage\fP\^, char *\fIdefault_string\fP\^, char *\fIbuffer_return\fP\^,
+int \fIlength\fP\^); 
 .SH ARGUMENTS
 .IP \fIbuffer_return\fP 1i
 Returns the error description.
diff --git a/man/XSetFillStyle.man b/man/XSetFillStyle.man
index 2f121986..9593af71 100644
--- a/man/XSetFillStyle.man
+++ b/man/XSetFillStyle.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeFillS.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeFillS.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,12 @@
 .SH NAME
 XSetFillStyle, XSetFillRule \- GC convenience routines
 .SH SYNTAX
-XSetFillStyle\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIfill_style\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIfill_style\fP\^;
-.LP
-XSetFillRule\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIfill_rule\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIfill_rule\fP\^;
+.HP
+int XSetFillStyle\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIfill_style\fP\^); 
+.HP
+int XSetFillRule\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIfill_rule\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetFont.man b/man/XSetFont.man
index 41e0c34f..1597ce5c 100644
--- a/man/XSetFont.man
+++ b/man/XSetFont.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeFont.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeFont.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,8 @@
 .SH NAME
 XSetFont \- GC convenience routines
 .SH SYNTAX
-XSetFont\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIfont\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      Font \fIfont\fP\^;
+.HP
+int XSetFont\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Font \fIfont\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetFontPath.man b/man/XSetFontPath.man
index c8ff4097..78420d2f 100644
--- a/man/XSetFontPath.man
+++ b/man/XSetFontPath.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeFontP.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeFontP.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,12 @@
 .SH NAME
 XSetFontPath, XGetFontPath, XFreeFontPath \- set, get, or free the font search path
 .SH SYNTAX
-XSetFontPath\^(\^\fIdisplay\fP, \fIdirectories\fP\^, \fIndirs\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char **\fIdirectories\fP\^;
-.br
-      int \fIndirs\fP\^;
-.LP
-char **XGetFontPath\^(\^\fIdisplay\fP, \fInpaths_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fInpaths_return\fP\^;
-
-.LP
-XFreeFontPath\^(\^\fIlist\fP\^)
-.br
-      char **\fIlist\fP\^;
-
+int XSetFontPath\^(\^Display *\fIdisplay\fP\^, char **\fIdirectories\fP\^, int
+\fIndirs\fP\^); 
+.HP
+char **XGetFontPath\^(\^Display *\fIdisplay\fP\^, int *\fInpaths_return\fP\^);
+.HP
+int XFreeFontPath\^(\^char **\fIlist\fP\^); 
 .SH ARGUMENTS
 .IP \fIdirectories\fP 1i
 Specifies the directory path used to look for a font.
diff --git a/man/XSetICFocus.man b/man/XSetICFocus.man
index b68d0e8e..67296b18 100644
--- a/man/XSetICFocus.man
+++ b/man/XSetICFocus.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSICFoc.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSICFoc.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,10 @@
 .SH NAME
 XSetICFocus, XUnsetICFocus \- set and unset input context focus
 .SH SYNTAX
-void XSetICFocus\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^; 
-.LP
-void XUnsetICFocus\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^;
+.HP
+void XSetICFocus\^(\^XIC \fIic\fP\^); 
+.HP
+void XUnsetICFocus\^(\^XIC \fIic\fP\^); 
 .SH ARGUMENTS
 .IP \fIic\fP 1i
 Specifies the input context.
diff --git a/man/XSetICValues.man b/man/XSetICValues.man
index 3cc14416..5fe7adcb 100644
--- a/man/XSetICValues.man
+++ b/man/XSetICValues.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSICVals.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSICVals.man,v 1.3 2003/04/28 22:17:56 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,13 +144,10 @@
 .SH NAME
 XSetICValues, XGetICValues \- set and obtain XIC values
 .SH SYNTAX
-char * XSetICValues\^(\^\fIic\fP\^, ...)
-.br
-      XIC \fIic\fP\^;
-.LP
-char * XGetICValues\^(\^\fIic\fP\^, ...)
-.br
-      XIC \fIic\fP\^;
+.HP
+char * XSetICValues\^(\^XIC \fIic\fP, ...\^); 
+.HP
+char * XGetICValues\^(\^XIC \fIic\fP, ...\^); 
 .SH ARGUMENTS
 .IP \fIic\fP 1i
 Specifies the input context.
diff --git a/man/XSetInputFocus.man b/man/XSetInputFocus.man
index 9fc671ba..e22c7d57 100644
--- a/man/XSetInputFocus.man
+++ b/man/XSetInputFocus.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeInFoc.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeInFoc.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,23 +144,12 @@
 .SH NAME
 XSetInputFocus, XGetInputFocus \- control input focus
 .SH SYNTAX
-XSetInputFocus\^(\^\fIdisplay\fP, \fIfocus\fP\^, \fIrevert_to\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIfocus\fP\^;
-.br
-      int \fIrevert_to\fP\^; 
-.br
-      Time \fItime\fP\^; 
-.LP
-XGetInputFocus\^(\^\fIdisplay\fP, \fIfocus_return\fP\^, \fIrevert_to_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window *\fIfocus_return\fP\^;
-.br
-      int *\fIrevert_to_return\fP\^;
+.HP
+int XSetInputFocus\^(\^Display *\fIdisplay\fP\^, Window \fIfocus\fP\^, int
+\fIrevert_to\fP\^, Time \fItime\fP\^); 
+.HP
+int XGetInputFocus\^(\^Display *\fIdisplay\fP\^, Window *\fIfocus_return\fP\^,
+int *\fIrevert_to_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetLineAttributes.man b/man/XSetLineAttributes.man
index cf2d0b7b..bf933585 100644
--- a/man/XSetLineAttributes.man
+++ b/man/XSetLineAttributes.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeLAttr.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeLAttr.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,31 +144,13 @@
 .SH NAME
 XSetLineAttributes, XSetDashes \- GC convenience routines
 .SH SYNTAX
-XSetLineAttributes\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIline_width\fP\^, \fIline_style\fP\^, \fIcap_style\fP\^, \fIjoin_style\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned int \fIline_width\fP\^;
-.br
-      int \fIline_style\fP\^;
-.br
-      int \fIcap_style\fP\^;
-.br
-      int \fIjoin_style\fP\^;
-.LP
-XSetDashes\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIdash_offset\fP\^, \fIdash_list\fP\^, \fIn\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        GC \fIgc\fP\^;
-.br
-        int \fIdash_offset\fP\^;
-.br
-        char \fIdash_list\fP[]\^;
-.br
-        int \fIn\fP\^;
+.HP
+int XSetLineAttributes\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned
+int \fIline_width\fP\^, int \fIline_style\fP\^, int \fIcap_style\fP\^, int
+\fIjoin_style\fP\^); 
+.HP
+int XSetDashes\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIdash_offset\fP\^, char \fIdash_list\fP[]\^, int \fIn\fP\^); 
 .SH ARGUMENTS
 .IP \fIcap_style\fP 1i
 Specifies the line-style and cap-style you want to set for the specified GC.
diff --git a/man/XSetPointerMapping.man b/man/XSetPointerMapping.man
index b8308feb..eb2e5991 100644
--- a/man/XSetPointerMapping.man
+++ b/man/XSetPointerMapping.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSePMap.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSePMap.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,12 @@
 .SH NAME
 XSetPointerMapping, XGetPointerMapping \- manipulate pointer settings
 .SH SYNTAX
-int XSetPointerMapping\^(\^\fIdisplay\fP, \fImap\fP, \fInmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned char \fImap\fP\^[]\^;
-.br
-      int \fInmap\fP\^;
-.LP
-int XGetPointerMapping\^(\^\fIdisplay\fP, \fImap_return\fP, \fInmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      unsigned char \fImap_return\fP\^[]\^;
-.br
-      int \fInmap\fP\^;
+.HP
+int XSetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char
+\fImap\fP\^[]\^, int \fInmap\fP\^); 
+.HP
+int XGetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char
+\fImap_return\fP\^[]\^, int \fInmap\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetScreenSaver.man b/man/XSetScreenSaver.man
index e68a5d9f..86333589 100644
--- a/man/XSetScreenSaver.man
+++ b/man/XSetScreenSaver.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeScSav.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeScSav.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,41 +144,20 @@
 .SH NAME
 XSetScreenSaver, XForceScreenSaver, XActivateScreenSaver, XResetScreenSaver, XGetScreenSaver \- manipulate the screen saver
 .SH SYNTAX
-XSetScreenSaver\^(\^\fIdisplay\fP, \fItimeout\fP\^, \fIinterval\fP\^, \fIprefer_blanking\fP\^, \fIallow_exposures\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fItimeout\fP\^, \fIinterval\fP\^;
-.br
-      int \fIprefer_blanking\fP\^; 
-.br
-      int \fIallow_exposures\fP\^;
-.LP
-XForceScreenSaver\^(\^\fIdisplay\fP\^, \fImode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fImode\fP\^;
-.LP
-XActivateScreenSaver\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XResetScreenSaver\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-XGetScreenSaver\^(\^\fIdisplay\fP, \fItimeout_return\fP\^, \fIinterval_return\fP\^, \fIprefer_blanking_return\fP\^, 
-.br
-                  \fIallow_exposures_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fItimeout_return\fP\^, *\fIinterval_return\fP\^;
-.br
-      int *\fIprefer_blanking_return\fP\^;
-.br
-      int *\fIallow_exposures_return\fP\^;
+.HP
+int XSetScreenSaver\^(\^Display *\fIdisplay\fP\^, int \fItimeout\fP\^,
+int \fIinterval\fP\^, int \fIprefer_blanking\fP\^, int
+\fIallow_exposures\fP\^); 
+.HP
+int XForceScreenSaver\^(\^Display *\fIdisplay\fP\^, int \fImode\fP\^); 
+.HP
+int XActivateScreenSaver\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XResetScreenSaver\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XGetScreenSaver\^(\^Display *\fIdisplay\fP\^, int *\fItimeout_return\fP\^,
+int *\fIinterval_return\fP\^, int *\fIprefer_blanking_return\fP\^, int
+*\fIallow_exposures_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIallow_exposures\fP 1i
 Specifies the screen save control values.
diff --git a/man/XSetSelectionOwner.man b/man/XSetSelectionOwner.man
index 255b8240..16e89e2f 100644
--- a/man/XSetSelectionOwner.man
+++ b/man/XSetSelectionOwner.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeSelOwn.man,v 1.2 2001/01/27 18:20:04 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeSelOwn.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,33 +144,16 @@
 .SH NAME
 XSetSelectionOwner, XGetSelectionOwner, XConvertSelection \- manipulate window selection
 .SH SYNTAX
-XSetSelectionOwner\^(\^\fIdisplay\fP, \fIselection\fP\^, \fIowner\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Atom \fIselection\fP\^;
-.br
-      Window \fIowner\fP\^; 
-.br
-      Time \fItime\fP\^;
-.LP
-Window XGetSelectionOwner\^(\^\fIdisplay\fP, \fIselection\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Atom \fIselection\fP\^;
-.LP
-XConvertSelection\^(\^\fIdisplay\fP, \fIselection\fP\^, \fItarget\fP\^, \fIproperty\fP\^, \fIrequestor\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Atom \fIselection\fP\^, \fItarget\fP\^;
-.br
-      Atom \fIproperty\fP\^;
-.br
-      Window \fIrequestor\fP\^;
-.br
-      Time \fItime\fP\^;
+.HP
+int XSetSelectionOwner\^(\^Display *\fIdisplay\fP\^, Atom \fIselection\fP\^,
+Window \fIowner\fP\^, Time \fItime\fP\^); 
+.HP
+Window XGetSelectionOwner\^(\^Display *\fIdisplay\fP\^, Atom
+\fIselection\fP\^); 
+.HP
+int XConvertSelection\^(\^Display *\fIdisplay\fP\^, Atom \fIselection\fP\^,
+Atom \fItarget\fP\^, Atom \fIproperty\fP\^, Window \fIrequestor\fP\^, Time
+\fItime\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetState.man b/man/XSetState.man
index b8dd4d2a..b5a992a6 100644
--- a/man/XSetState.man
+++ b/man/XSetState.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeState.man,v 1.3 2001/12/17 03:04:40 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeState.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,49 +144,22 @@
 .SH NAME
 XSetState, XSetFunction, XSetPlaneMask, XSetForeground, XSetBackground \- GC convenience routines
 .SH SYNTAX
-XSetState\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIforeground\fP\^, \fIbackground\fP\^, \fIfunction\fP\^, \fIplane_mask\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned long \fIforeground\fP\^, \fIbackground\fP\^;
-.br
-      int \fIfunction\fP\^;
-.br
-      unsigned long \fIplane_mask\fP\^;
-.LP
-XSetFunction\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIfunction\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIfunction\fP\^;
-.LP
-XSetPlaneMask\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIplane_mask\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned long \fIplane_mask\fP\^;
-.LP
-XSetForeground\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIforeground\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned long \fIforeground\fP\^;
-.LP
-XSetBackground\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIbackground\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      unsigned long \fIbackground\fP\^;
+.HP
+int XSetState\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIforeground\fP\^, unsigned int \fIbackground\fP\^, int \fIfunction\fP\^,
+unsigned long \fIplane_mask\fP\^); 
+.HP
+int XSetFunction\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIfunction\fP\^); 
+.HP
+int XSetPlaneMask\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIplane_mask\fP\^); 
+.HP
+int XSetForeground\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIforeground\fP\^); 
+.HP
+int XSetBackground\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIbackground\fP\^); 
 .SH ARGUMENTS
 .IP \fIbackground\fP 1i
 Specifies the background you want to set for the specified GC.
diff --git a/man/XSetTextProperty.man b/man/XSetTextProperty.man
index 924b047b..409b54f7 100644
--- a/man/XSetTextProperty.man
+++ b/man/XSetTextProperty.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeTProp.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSeTProp.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,12 @@
 .SH NAME
 XSetTextProperty, XGetTextProperty \- set and read text properties
 .SH SYNTAX
-void XSetTextProperty\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop\fP,
-\fIproperty\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.br
-      Atom \fIproperty\fP\^;
-.LP
-Status XGetTextProperty\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop_return\fP,
-\fIproperty\fP\^)
-.br
-       Display *\fIdisplay\fP\^;
-.br
-       Window \fIw\fP\^;
-.br
-       XTextProperty *\fItext_prop_return\fP\^;
-.br
-       Atom \fIproperty\fP\^;
+.HP
+void XSetTextProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop\fP\^, Atom \fIproperty\fP\^); 
+.HP
+Status XGetTextProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^, Atom \fIproperty\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetTile.man b/man/XSetTile.man
index f1d413f4..63446a72 100644
--- a/man/XSetTile.man
+++ b/man/XSetTile.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeTile.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeTile.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,29 +144,15 @@
 .SH NAME
 XSetTile, XSetStipple, XSetTSOrigin \- GC convenience routines
 .SH SYNTAX
-XSetTile\^(\^\fIdisplay\fP, \fIgc\fP\^, \fItile\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      Pixmap \fItile\fP\^;
-.LP
-XSetStipple\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIstipple\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      Pixmap \fIstipple\fP\^;
-.LP
-XSetTSOrigin\^(\^\fIdisplay\fP, \fIgc\fP\^, \fIts_x_origin\fP\^, \fIts_y_origin\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIts_x_origin\fP\^, \fIts_y_origin\fP\^;
+.HP
+int XSetTile\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap
+\fItile\fP\^); 
+.HP
+int XSetStipple\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap
+\fIstipple\fP\^); 
+.HP
+int XSetTSOrigin\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIts_x_origin\fP\^, int \fIts_y_origin\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetTransientForHint.man b/man/XSetTransientForHint.man
index 83eff925..a937d805 100644
--- a/man/XSetTransientForHint.man
+++ b/man/XSetTransientForHint.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeTFHint.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeTFHint.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,12 @@
 .SH NAME
 XSetTransientForHint, XGetTransientForHint \- set or read a window's WM_TRANSIENT_FOR property
 .SH SYNTAX
-XSetTransientForHint\^(\^\fIdisplay\fP, \fIw\fP, \fIprop_window\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window \fIprop_window\fP\^;
-.LP
-Status XGetTransientForHint\^(\^\fIdisplay\fP, \fIw\fP, \fIprop_window_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window *\fIprop_window_return\fP\^;
+.HP
+int XSetTransientForHint\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window \fIprop_window\fP\^); 
+.HP
+Status XGetTransientForHint\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window *\fIprop_window_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetWMClientMachine.man b/man/XSetWMClientMachine.man
index 75563184..b9d9673c 100644
--- a/man/XSetWMClientMachine.man
+++ b/man/XSetWMClientMachine.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeWMCMac.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeWMCMac.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,12 @@
 .SH NAME
 XSetWMClientMachine, XGetWMClientMachine \- set or read a window's WM_CLIENT_MACHINE property
 .SH SYNTAX
-void XSetWMClientMachine\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.LP
-Status XGetWMClientMachine\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
+.HP
+void XSetWMClientMachine\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop\fP\^); 
+.HP
+Status XGetWMClientMachine\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetWMColormapWindows.man b/man/XSetWMColormapWindows.man
index 0386b052..a392ed7c 100644
--- a/man/XSetWMColormapWindows.man
+++ b/man/XSetWMColormapWindows.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeWMCWin.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSeWMCWin.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,27 +144,12 @@
 .SH NAME
 XSetWMColormapWindows, XGetWMColormapWindows \- set or read a window's WM_COLORMAP_WINDOWS property
 .SH SYNTAX
-Status XSetWMColormapWindows\^(\^\fIdisplay\fP, \fIw\fP,
-\fIcolormap_windows\fP, \fIcount\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window *\fIcolormap_windows\fP\^;
-.br
-      int \fIcount\fP\^;
-.LP
-Status XGetWMColormapWindows\^(\^\fIdisplay\fP, \fIw\fP,
-\fIcolormap_windows_return\fP, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Window **\fIcolormap_windows_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
+.HP
+Status XSetWMColormapWindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window *\fIcolormap_windows\fP\^, int \fIcount\fP\^); 
+.HP
+Status XGetWMColormapWindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window **\fIcolormap_windows_return\fP\^, int *\fIcount_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetWMIconName.man b/man/XSetWMIconName.man
index e91dc0b2..24ba8704 100644
--- a/man/XSetWMIconName.man
+++ b/man/XSetWMIconName.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeWMINam.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeWMINam.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,37 +144,18 @@
 .SH NAME
 XSetWMIconName, XGetWMIconName, XSetIconName, XGetIconName \- set or read a window's WM_ICON_NAME property
 .SH SYNTAX
-void XSetWMIconName\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.LP
-Status XGetWMIconName\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
-.LP
-XSetIconName\^(\^\fIdisplay\fP, \fIw\fP\^, \fIicon_name\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char *\fIicon_name\fP\^;
-.LP
-Status XGetIconName\^(\^\fIdisplay\fP, \fIw\fP\^, \fIicon_name_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char **\fIicon_name_return\fP\^;
+.HP
+void XSetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop\fP\^); 
+.HP
+Status XGetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XSetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIicon_name\fP\^); 
+.HP
+Status XGetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+**\fIicon_name_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetWMName.man b/man/XSetWMName.man
index 1d81344e..0192d738 100644
--- a/man/XSetWMName.man
+++ b/man/XSetWMName.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeWMName.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSeWMName.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,37 +144,18 @@
 .SH NAME
 XSetWMName, XGetWMName, XStoreName, XFetchName \- set or read a window's WM_NAME property
 .SH SYNTAX
-void XSetWMName\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.LP
-Status XGetWMName\^(\^\fIdisplay\fP, \fIw\fP, \fItext_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
-.LP
-XStoreName\^(\^\fIdisplay\fP, \fIw\fP\^, \fIwindow_name\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char *\fIwindow_name\fP\^;
-.LP
-Status XFetchName\^(\^\fIdisplay\fP, \fIw\fP\^, \fIwindow_name_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char **\fIwindow_name_return\fP\^;
+.HP
+void XSetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, XTextProperty
+*\fItext_prop\fP\^); 
+.HP
+Status XGetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XStoreName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIwindow_name\fP\^); 
+.HP
+Status XFetchName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+**\fIwindow_name_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSetWMProperties.man b/man/XSetWMProperties.man
index 1e18da7a..743586e5 100644
--- a/man/XSetWMProperties.man
+++ b/man/XSetWMProperties.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XSeWMProp.man,v 1.4 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSeWMProp.man,v 1.5 2003/04/28 22:17:57 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,71 +145,21 @@
 .SH NAME
 XSetWMProperties, XmbSetWMProperties, Xutf8SetWMProperties \- set standard window properties
 .SH SYNTAX
-void XSetWMProperties\^(\^\fIdisplay\fP, \fIw\fP, \fIwindow_name\fP,
-\fIicon_name\fP, \fIargv\fP, \fIargc\fP, \fInormal_hints\fP, \fIwm_hints\fP,
-\fIclass_hints\fP\^)
-.br
-      Display *\fIdisplay\fP\^; 
-.br
-      Window \fIw\fP\^;
-.br
-      XTextProperty *\fIwindow_name\fP\^;
-.br
-      XTextProperty *\fIicon_name\fP\^;
-.br
-      char **\fIargv\fP\^;
-.br
-      int \fIargc\fP\^;
-.br
-      XSizeHints *\fInormal_hints\fP\^;
-.br
-      XWMHints *\fIwm_hints\fP\^;
-.br
-      XClassHint *\fIclass_hints\fP\^;
-.LP
-void XmbSetWMProperties\^(\^\fIdisplay\fP\^, \fIw\fP\^, \fIwindow_name\fP\^, \fIicon_name\fP\^, \fIargv\fP\^, \fIargc\fP\^,
-.br
-                      \fInormal_hints\fP\^, \fIwm_hints\fP\^, \fIclass_hints\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char *\fIwindow_name\fP\^;
-.br
-      char *\fIicon_name\fP\^;
-.br
-      char *\fIargv\fP\^[];
-.br
-      int \fIargc\fP\^;
-.br
-      XSizeHints *\fInormal_hints\fP\^;
-.br
-      XWMHints *\fIwm_hints\fP\^;
-.br
-      XClassHint *\fIclass_hints\fP\^;
-.LP
-void Xutf8SetWMProperties\^(\^\fIdisplay\fP\^, \fIw\fP\^, \fIwindow_name\fP\^, \fIicon_name\fP\^, \fIargv\fP\^, \fIargc\fP\^,
-.br
-                      \fInormal_hints\fP\^, \fIwm_hints\fP\^, \fIclass_hints\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      char *\fIwindow_name\fP\^;
-.br
-      char *\fIicon_name\fP\^;
-.br
-      char *\fIargv\fP\^[];
-.br
-      int \fIargc\fP\^;
-.br
-      XSizeHints *\fInormal_hints\fP\^;
-.br
-      XWMHints *\fIwm_hints\fP\^;
-.br
-      XClassHint *\fIclass_hints\fP\^;
+.HP
+void XSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fIwindow_name\fP\^, XTextProperty *\fIicon_name\fP\^, char
+**\fIargv\fP\^, int \fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints
+*\fIwm_hints\fP\^, XClassHint *\fIclass_hints\fP\^); 
+.HP
+void XmbSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
+\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
+XClassHint *\fIclass_hints\fP\^); 
+.HP
+void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
+\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
+XClassHint *\fIclass_hints\fP\^); 
 .SH ARGUMENTS
 .IP \fIargc\fP 1i
 Specifies the number of arguments.
diff --git a/man/XSetWMProtocols.man b/man/XSetWMProtocols.man
index f04661c6..7d2a2c02 100644
--- a/man/XSetWMProtocols.man
+++ b/man/XSetWMProtocols.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSeWMProt.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSeWMProt.man,v 1.5 2003/07/16 00:38:42 dawes Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -142,29 +142,14 @@
 .ny0
 .TH XSetWMProtocols 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XSetWMProtocols, XGetWMProtocols \- set or read a window's WM__PROTOCOLS property
+XSetWMProtocols, XGetWMProtocols \- set or read a window's WM_PROTOCOLS property
 .SH SYNTAX
-Status XSetWMProtocols\^(\^\fIdisplay\fP, \fIw\fP, \fIprotocols\fP,
-\fIcount\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Atom *\fIprotocols\fP\^;
-.br
-      int \fIcount\fP\^;
-.LP
-Status XGetWMProtocols\^(\^\fIdisplay\fP, \fIw\fP, \fIprotocols_return\fP,
-\fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.br
-      Atom **\fIprotocols_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
+.HP
+Status XSetWMProtocols\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+*\fIprotocols\fP\^, int \fIcount\fP\^); 
+.HP
+Status XGetWMProtocols\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+**\fIprotocols_return\fP\^, int *\fIcount_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XStoreBytes.man b/man/XStoreBytes.man
index f1880bf3..9507f0b7 100644
--- a/man/XStoreBytes.man
+++ b/man/XStoreBytes.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XStBytes.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XStBytes.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,44 +144,19 @@
 .SH NAME
 XStoreBytes, XStoreBuffer, XFetchBytes, XFetchBuffer, XRotateBuffers \- manipulate cut and paste buffers
 .SH SYNTAX
-XStoreBytes\^(\^\fIdisplay\fP, \fIbytes\fP\^, \fInbytes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIbytes\fP\^;
-.br
-      int \^\fInbytes\fP\^;
-.br
-.LP
-XStoreBuffer\^(\^\fIdisplay\fP, \fIbytes\fP\^, \fInbytes\fP\^, \fIbuffer\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIbytes\fP\^;
-.br
-      int \^\fInbytes\fP\^;
-.br
-      int \fIbuffer\fP\^;
-.LP
-char *XFetchBytes\^(\^\fIdisplay\fP, \fInbytes_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fInbytes_return\fP\^;
-.LP
-char *XFetchBuffer\^(\^\fIdisplay\fP, \fInbytes_return\fP\^, \fIbuffer\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fInbytes_return\fP\^;
-.br
-      int \fIbuffer\fP\^;
-.LP
-XRotateBuffers\^(\^\fIdisplay\fP, \fIrotate\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIrotate\fP\^;
+.HP
+int XStoreBytes\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int
+\^\fInbytes\fP\^); 
+.HP
+int XStoreBuffer\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int
+\^\fInbytes\fP\^, int \fIbuffer\fP\^); 
+.HP
+char *XFetchBytes\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^); 
+.HP
+char *XFetchBuffer\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^,
+int \fIbuffer\fP\^); 
+.HP
+int XRotateBuffers\^(\^Display *\fIdisplay\fP\^, int \fIrotate\fP\^); 
 .SH ARGUMENTS
 .ds Fn in which you want to store the bytes
 or from which you want the stored data returned
diff --git a/man/XStoreColors.man b/man/XStoreColors.man
index c98f0516..a40fe652 100644
--- a/man/XStoreColors.man
+++ b/man/XStoreColors.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XStColors.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XStColors.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,35 +144,15 @@
 .SH NAME
 XStoreColors, XStoreColor, XStoreNamedColor \- set colors
 .SH SYNTAX
-XStoreColors\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolor\fP\^, \fIncolors\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XColor \fIcolor\fP\^[\^]\^;
-.br
-      int \fIncolors\fP\^;
-.LP
-XStoreColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolor\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XColor *\fIcolor\fP\^;
-.LP
-XStoreNamedColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolor\fP\^, \fIpixel\fP\^, \fIflags\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      char *\^\fIcolor\fP\^;
-.br
-      unsigned long \fIpixel\fP\^;
-.br
-      int \fIflags\fP\^;
+.HP
+int XStoreColors\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XColor \fIcolor\fP\^[\^]\^, int \fIncolors\fP\^); 
+.HP
+int XStoreColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XColor *\fIcolor\fP\^); 
+.HP
+int XStoreNamedColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+char *\^\fIcolor\fP\^, unsigned long \fIpixel\fP\^, int \fIflags\fP\^);
 .SH ARGUMENTS
 .ds Co pixel and RGB values or the color name string (for example, red)
 .IP \fIcolor\fP 1i
diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man
index 880bd658..185fa8d7 100644
--- a/man/XStringListToTextProperty.man
+++ b/man/XStringListToTextProperty.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.4 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.5 2003/04/28 22:17:56 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,27 +145,14 @@
 .SH NAME
 XStringListToTextProperty, XTextPropertyToStringList, XFreeStringList, XTextProperty \- convert string lists and text property structure
 .SH SYNTAX
-Status XStringListToTextProperty\^(\^\fIlist\fP, \fIcount\fP,
-\fItext_prop_return\fP\^)
-.br
-      char **\fIlist\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
-.LP
-Status XTextPropertyToStringList\^(\^\fItext_prop\fP, \fIlist_return\fP,
-\fIcount_return\fP\^)
-.br
-       XTextProperty *\fItext_prop\fP\^;
-.br
-       char ***\fIlist_return\fP\^;
-.br
-       int *\fIcount_return\fP\^;
-.LP
-void XFreeStringList\^(\^\fIlist\fP\^)
-.br
-      char **\fIlist\fP\^;
+.HP
+Status XStringListToTextProperty\^(\^char **\fIlist\fP\^, int \fIcount\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+Status XTextPropertyToStringList\^(\^XTextProperty *\fItext_prop\fP\^, char
+***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
+.HP
+void XFreeStringList\^(\^char **\fIlist\fP\^); 
 .SH ARGUMENTS
 .ds Cn strings
 .IP \fIcount\fP 1i
diff --git a/man/XStringToKeysym.man b/man/XStringToKeysym.man
index ce512906..78a18ddd 100644
--- a/man/XStringToKeysym.man
+++ b/man/XStringToKeysym.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XStTKsym.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XStTKsym.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,35 +144,18 @@
 .SH NAME
 XStringToKeysym, XKeysymToString, XKeycodeToKeysym, XKeysymToKeycode, XConvertCase \- convert keysyms
 .SH SYNTAX
-KeySym XStringToKeysym\^(\^\fIstring\fP\^)
-.br
-      char *\fIstring\fP\^;
-.LP
-char *XKeysymToString\^(\^\fIkeysym\fP\^)
-.br
-      KeySym \fIkeysym\fP\^;
-.LP
-KeySym XKeycodeToKeysym\^(\^\fIdisplay\fP, \fIkeycode\fP, \fIindex\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      KeyCode \fIkeycode\fP\^;
-.br
-      int \fIindex\fP\^;
-.LP
-KeyCode XKeysymToKeycode\^(\^\fIdisplay\fP, \fIkeysym\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      KeySym \fIkeysym\fP\^;
-.LP
-void XConvertCase(\^\fIkeysym\fP, \fIlower_return\fP, \fIupper_return\fP\^)
-.br
-      KeySym \fIkeysym\fP\^;
-.br
-      KeySym *\fIlower_return\fP\^;
-.br
-      KeySym *\fIupper_return\fP\^;
+.HP
+KeySym XStringToKeysym\^(\^char *\fIstring\fP\^); 
+.HP
+char *XKeysymToString\^(\^KeySym \fIkeysym\fP\^); 
+.HP
+KeySym XKeycodeToKeysym\^(\^Display *\fIdisplay\fP\^, KeyCode \fIkeycode\fP\^,
+int \fIindex\fP\^); 
+.HP
+KeyCode XKeysymToKeycode\^(\^Display *\fIdisplay\fP\^, KeySym \fIkeysym\fP\^);
+.HP
+void XConvertCase(\^KeySym \fIkeysym\fP\^, KeySym *\fIlower_return\fP\^,
+KeySym *\fIupper_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XSupportsLocale.man b/man/XSupportsLocale.man
index 8fdfcfaf..1fead30b 100644
--- a/man/XSupportsLocale.man
+++ b/man/XSupportsLocale.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSupLoc.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSupLoc.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,11 +144,10 @@
 .SH NAME
 XSupportsLocale, XSetLocaleModifiers \- determine locale support and configure locale modifiers
 .SH SYNTAX
-Bool XSupportsLocale\^(\|)
-.LP
-char *XSetLocaleModifiers\^(\^\fImodifier_list\fP\^)
-.br
-      char *\fImodifier_list\fP\^;
+.HP
+Bool XSupportsLocale\^(void); 
+.HP
+char *XSetLocaleModifiers\^(\^char *\fImodifier_list\fP\^); 
 .SH ARGUMENTS
 .IP \fImodifier_list\fP 1i
 Specifies the modifiers.
diff --git a/man/XSynchronize.man b/man/XSynchronize.man
index cca18fd1..8e0a4f44 100644
--- a/man/XSynchronize.man
+++ b/man/XSynchronize.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSync.man,v 1.2 2001/01/27 18:20:05 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSync.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,17 +144,11 @@
 .SH NAME
 XSynchronize, XSetAfterFunction \- enable or disable synchronization 
 .SH SYNTAX
-int (*XSynchronize\^(\^\fIdisplay\fP, \fIonoff\fP\^)\^)()
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Bool \fIonoff\fP\^;
-.LP
-int (*XSetAfterFunction\^(\^\fIdisplay\fP, \fIprocedure\fP\^))()
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int (\^*\^\fIprocedure\fP\^)\^();
+.HP
+int (*XSynchronize\^(\^Display *\fIdisplay\fP\^, Bool \fIonoff\fP\^))(); 
+.HP
+int (*XSetAfterFunction\^(\^Display *\fIdisplay\fP\^, int
+(\^*\^\fIprocedure\fP\^)\^()))(); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XTextExtents.man b/man/XTextExtents.man
index 15f30967..93552191 100644
--- a/man/XTextExtents.man
+++ b/man/XTextExtents.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XTextExt.man,v 1.3 2001/02/09 03:47:47 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XTextExt.man,v 1.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,79 +144,26 @@
 .SH NAME
 XTextExtents, XTextExtents16, XQueryTextExtents, XQueryTextExtents16 \- compute or query text extents
 .SH SYNTAX
-XTextExtents\^(\^\fIfont_struct\fP\^, \fIstring\fP\^, \fInchars\fP\^,
-\fIdirection_return\fP, \fIfont_ascent_return\fP,
-.br
-              \fIfont_descent_return\fP, \fIoverall_return\fP\^)
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInchars\fP\^;
-.br
-      int *\fIdirection_return\fP\^;
-.br
-      int *\fIfont_ascent_return\fP, *\fIfont_descent_return\fP\^;
-.br
-      XCharStruct *\fIoverall_return\fP\^;
-
-.LP
-XTextExtents16\^(\^\fIfont_struct\fP\^, \fIstring\fP\^, \fInchars\fP\^,
-\fIdirection_return\fP, \fIfont_ascent_return\fP, 
-.br
-                \fIfont_descent_return\fP, \fIoverall_return\fP\^)
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.br
-      XChar2b *\fIstring\fP\^;
-.br
-      int \fInchars\fP\^;
-.br
-      int *\fIdirection_return\fP\^;
-.br
-      int *\fIfont_ascent_return\fP, *\fIfont_descent_return\fP\^;
-.br
-      XCharStruct *\fIoverall_return\fP\^;
-
-.LP
-XQueryTextExtents\^(\^\fIdisplay\fP, \fIfont_ID\fP, \fIstring\fP,
-\fInchars\fP, \fIdirection_return\fP, \fIfont_ascent_return\fP, 
-.br
-                    \fIfont_descent_return\fP, \fIoverall_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIfont_ID\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInchars\fP\^;
-.br
-      int *\fIdirection_return\fP\^;
-.br
-      int *\fIfont_ascent_return\fP, *\fIfont_descent_return\fP\^;
-.br
-      XCharStruct *\fIoverall_return\fP\^;
-.LP
-XQueryTextExtents16\^(\^\fIdisplay\fP, \fIfont_ID\fP, \fIstring\fP,
-\fInchars\fP, \fIdirection_return\fP, \fIfont_ascent_return\fP, 
-.br
-                        \fIfont_descent_return\fP, \fIoverall_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIfont_ID\fP\^;
-.br
-      XChar2b *\fIstring\fP\^;
-.br
-      int \fInchars\fP\^;
-.br
-      int *\fIdirection_return\fP\^;
-.br
-      int *\fIfont_ascent_return\fP, *\fIfont_descent_return\fP\^;
-.br
-      XCharStruct *\fIoverall_return\fP\^;
+.HP
+int XTextExtents\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,
+int \fInchars\fP\^, int *\fIdirection_return\fP\^, int
+*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^); 
+.HP
+int XTextExtents16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b
+*\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^, int
+*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^); 
+.HP
+int XQueryTextExtents\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^, char
+*\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^, int
+*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^);
+.HP
+int XQueryTextExtents16\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^,
+XChar2b *\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^,
+int *\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIdirection_return\fP 1i
 Returns the value of the direction hint
diff --git a/man/XTextWidth.man b/man/XTextWidth.man
index 07167075..33a0f6cd 100644
--- a/man/XTextWidth.man
+++ b/man/XTextWidth.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XTextWid.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XTextWid.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,21 +144,12 @@
 .SH NAME
 XTextWidth, XTextWidth16 \- compute text width
 .SH SYNTAX
-int XTextWidth\^(\^\fIfont_struct\fP\^, \fIstring\fP, \fIcount\fP\^)
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fIcount\fP\^;
-.LP
-int XTextWidth16\^(\^\fIfont_struct\fP\^, \fIstring\fP, \fIcount\fP\^)
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.br
-      XChar2b *\fIstring\fP\^;
-.br
-      int \fIcount\fP\^;
+.HP
+int XTextWidth\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,
+int \fIcount\fP\^); 
+.HP
+int XTextWidth16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b
+*\fIstring\fP\^, int \fIcount\fP\^); 
 .SH ARGUMENTS
 .IP \fIcount\fP 1i
 Specifies the character count in the specified string.
diff --git a/man/XTranslateCoordinates.man b/man/XTranslateCoordinates.man
index a6cd6d96..3ff8bb91 100644
--- a/man/XTranslateCoordinates.man
+++ b/man/XTranslateCoordinates.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XTranWCo.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XTranWCo.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,11 @@
 .SH NAME
 XTranslateCoordinates \- translate window coordinates
 .SH SYNTAX
-Bool XTranslateCoordinates\^(\^\fIdisplay\fP, \fIsrc_w\fP\^, \fIdest_w\fP\^, \fIsrc_x\fP\^, \fIsrc_y\fP\^, \fIdest_x_return\fP\^, 
-.br
-                            \fIdest_y_return\fP\^, \fIchild_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIsrc_w\fP\^, \fIdest_w\fP\^;
-.br
-      int \fIsrc_x\fP\^, \fIsrc_y\fP\^;
-.br
-      int *\fIdest_x_return\fP\^, *\fIdest_y_return\fP\^;
-.br
-      Window *\fIchild_return\fP\^;
+.HP
+Bool XTranslateCoordinates\^(\^Display *\fIdisplay\fP\^, Window \fIsrc_w\fP\^,
+\fIdest_w\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, int
+*\fIdest_x_return\fP\^, int *\fIdest_y_return\fP\^, Window
+*\fIchild_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIchild_return\fP 1i
 Returns the child if the coordinates are contained in a mapped child of the
diff --git a/man/XUnmapWindow.man b/man/XUnmapWindow.man
index 33d58e06..6ce9fc2a 100644
--- a/man/XUnmapWindow.man
+++ b/man/XUnmapWindow.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XUnmapWin.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XUnmapWin.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,17 +144,10 @@
 .SH NAME
 XUnmapWindow, XUnmapSubwindows \- unmap windows
 .SH SYNTAX
-XUnmapWindow\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
-.LP
-XUnmapSubwindows\^(\^\fIdisplay\fP, \fIw\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIw\fP\^;
+.HP
+int XUnmapWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XUnmapSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XVaCreateNestedList.man b/man/XVaCreateNestedList.man
index c979a296..10dc96ed 100644
--- a/man/XVaCreateNestedList.man
+++ b/man/XVaCreateNestedList.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XVCNList.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XVCNList.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,10 +145,8 @@
 XVaCreateNestedList \- allocate a nested variable argument list
 .SH SYNTAX
 typedef void * XVaNestedList;
-
-XVaNestedList XVaCreateNestedList\^(\^\fIdummy\fP\^, ...)
-.br
-      int \fIdummy\fP\^; 
+.HP
+XVaNestedList XVaCreateNestedList\^(\^int \fIdummy\fP\^, ...\^); 
 .SH ARGUMENTS
 .IP \fIdummy\fP 1i
 Specifies an unused argument (required by ANSI C).
diff --git a/man/XWarpPointer.man b/man/XWarpPointer.man
index 5ce6499e..d9724e20 100644
--- a/man/XWarpPointer.man
+++ b/man/XWarpPointer.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XWarpPntr.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XWarpPntr.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,11 @@
 .SH NAME
 XWarpPointer \- move pointer
 .SH SYNTAX
-XWarpPointer\^(\^\fIdisplay\fP, \fIsrc_w\fP\^, \fIdest_w\fP\^, \fIsrc_x\fP\^, \fIsrc_y\fP\^, \fIsrc_width\fP\^, \fIsrc_height\fP\^, \fIdest_x\fP\^, 
-.br
-                \fIdest_y\fP\^)
-.br
-        Display *\fIdisplay\fP\^;
-.br
-        Window \fIsrc_w\fP\^, \fIdest_w\fP\^;
-.br
-        int \fIsrc_x\fP\^, \fIsrc_y\fP\^;
-.br
-        unsigned int \fIsrc_width\fP\^, \fIsrc_height\fP\^;
-.br
-        int \fIdest_x\fP\^, \fIdest_y\fP\^;
+.HP
+int XWarpPointer\^(\^Display *\fIdisplay\fP\^, Window \fIsrc_w\fP\^, Window
+\fIdest_w\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned int
+\fIsrc_width\fP\^, unsigned int \fIsrc_height\fP\^, int \fIdest_x\fP\^, int
+\fIdest_y\fP\^); 
 .SH ARGUMENTS
 .IP \fIdest_w\fP 1i
 Specifies the destination window or
diff --git a/man/XcmsAllocColor.man b/man/XcmsAllocColor.man
index 25b4f5f7..668e01e1 100644
--- a/man/XcmsAllocColor.man
+++ b/man/XcmsAllocColor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsAClr.man,v 3.3 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsAClr.man,v 3.4 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,31 +144,13 @@
 .SH NAME
 XcmsAllocColor, XcmsAllocNamedColor \- allocate colors
 .SH SYNTAX
-Status XcmsAllocColor\^(\^\fIdisplay\fP\^, \fIcolormap\fP\^, \fIcolor_in_out\fP\^, \fIresult_format\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XcmsColor *\fIcolor_in_out\fP\^;
-.br
-      XcmsColorFormat \fIresult_format\fP\^;
-.LP
-Status XcmsAllocNamedColor\^(\^\fIdisplay\fP\^, \fIcolormap\fP\^, \fIcolor_string\fP\^, \fIcolor_screen_return\fP\^, \fIcolor_exact_return\fP\^,
-.br
-                            \fIresult_format\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      char *\fIcolor_string\fP\^;
-.br
-      XcmsColor *\fIcolor_screen_return\fP\^;
-.br
-      XcmsColor *\fIcolor_exact_return\fP\^;
-.br
-      XcmsColorFormat \fIresult_format\fP\^;
+.HP
+Status XcmsAllocColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolor_in_out\fP\^, XcmsColorFormat \fIresult_format\fP\^); 
+.HP
+Status XcmsAllocNamedColor\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor
+*\fIcolor_screen_return\fP\^, XcmsColor *\fIcolor_exact_return\fP\^, XcmsColorFormat \fIresult_format\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XcmsCCCOfColormap.man b/man/XcmsCCCOfColormap.man
index ebd4198b..d572ab52 100644
--- a/man/XcmsCCCOfColormap.man
+++ b/man/XcmsCCCOfColormap.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/Xcms3CoC.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/Xcms3CoC.man,v 1.3 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,12 @@
 .SH NAME
 XcmsCCCOfColormap, XcmsSetCCCOfColormap \- query and modify CCC of a colormap
 .SH SYNTAX
-XcmsCCC XcmsCCCOfColormap\^(\^\fIdisplay\fP, \fIcolormap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.LP
-XcmsCCC XcmsSetCCCOfColormap\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIccc\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XcmsCCC \fIccc\fP\^;
+.HP
+XcmsCCC XcmsCCCOfColormap\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^);
+.HP
+XcmsCCC XcmsSetCCCOfColormap\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, XcmsCCC \fIccc\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XcmsCIELabQueryMaxC.man b/man/XcmsCIELabQueryMaxC.man
index 6f7de989..fadadfe1 100644
--- a/man/XcmsCIELabQueryMaxC.man
+++ b/man/XcmsCIELabQueryMaxC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsLaQMC.man,v 1.3 2001/02/09 03:47:47 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsLaQMC.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,43 +144,18 @@
 .SH NAME
 XcmsCIELabQueryMaxC, XcmsCIELabQueryMaxL, XcmsCIELabQueryMaxLC, XcmsCIELabQueryMinL \- obtain the CIE L*a*b* coordinates
 .SH SYNTAX
-Status XcmsCIELabQueryMaxC\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIL_star\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsFloat \fIL_star\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsCIELabQueryMaxL\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIchroma\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsFloat \fIchroma\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsCIELabQueryMaxLC\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsCIELabQueryMinL\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIchroma\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsFloat \fIchroma\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
+.HP
+Status XcmsCIELabQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIL_star\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELabQueryMaxL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELabQueryMaxLC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsCIELabQueryMinL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/XcmsCIELuvQueryMaxC.man b/man/XcmsCIELuvQueryMaxC.man
index f813d77d..1ace3c2e 100644
--- a/man/XcmsCIELuvQueryMaxC.man
+++ b/man/XcmsCIELuvQueryMaxC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsLuQMC.man,v 1.3 2001/02/09 03:47:47 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsLuQMC.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,43 +144,18 @@
 .SH NAME
 XcmsCIELuvQueryMaxC, XcmsCIELuvQueryMaxL, XcmsCIELuvQueryMaxLC, XcmsCIELuvQueryMinL \- obtain the CIE L*u*v* coordinates
 .SH SYNTAX
-Status XcmsCIELuvQueryMaxC\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIL_star\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsFloat \fIL_star\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsCIELuvQueryMaxL\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIchroma\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsFloat \fIchroma\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsCIELuvQueryMaxLC\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsCIELuvQueryMinL\^(\^\fIccc\fP\^, \fIhue_angle\fP\^, \fIchroma\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue_angle\fP\^;
-.br
-      XcmsFloat \fIchroma\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
+.HP
+Status XcmsCIELuvQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIL_star\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELuvQueryMaxL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELuvQueryMaxLC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsCIELuvQueryMinL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/XcmsConvertColors.man b/man/XcmsConvertColors.man
index 1b5f833f..763db5c8 100644
--- a/man/XcmsConvertColors.man
+++ b/man/XcmsConvertColors.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsCClrs.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsCClrs.man,v 1.3 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,17 +144,10 @@
 .SH NAME
 XcmsConvertColors \- convert CCC color specifications
 .SH SYNTAX
-Status XcmsConvertColors\^(\^\fIccc\fP\^, \fIcolors_in_out\fP\^, \fIncolors\fP\^, \fItarget_format\fP\^, \fIcompression_flags_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColor \fIcolors_in_out\fP\^[\^]\^;
-.br
-      unsigned int \fIncolors\fP\^;
-.br
-      XcmsColorFormat \fItarget_format\fP\^;
-.br
-      Bool \fIcompression_flags_return\fP\^[\^]\^;
+.HP
+Status XcmsConvertColors\^(\^XcmsCCC \fIccc\fP\^, XcmsColor
+\fIcolors_in_out\fP\^[\^]\^, unsigned int \fIncolors\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, Bool \fIcompression_flags_return\fP\^[\^]\^); 
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/XcmsCreateCCC.man b/man/XcmsCreateCCC.man
index 7af3c39f..ebe70015 100644
--- a/man/XcmsCreateCCC.man
+++ b/man/XcmsCreateCCC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsCre3C.man,v 1.2 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsCre3C.man,v 1.3 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,29 +144,14 @@
 .SH NAME
 XcmsCreateCCC, XcmsFreeCCC \- creating and destroying CCCs
 .SH SYNTAX
-XcmsCCC XcmsCreateCCC\^(\^\fIdisplay\fP, \fIscreen_number\fP\^, \fIvisual\fP\^, \fIclient_white_point\fP\^, \fIcompression_proc\fP\^,
-.br
-                    \fIcompression_client_data\fP\^, \fIwhite_adjust_proc\fP\^, \fIwhite_adjust_client_data\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIscreen_number\fP\^;
-.br
-      Visual *\fIvisual\fP\^;
-.br
-      XcmsColor *\fIclient_white_point\fP\^;
-.br
-      XcmsCompressionProc \fIcompression_proc\fP\^;
-.br
-      XPointer \fIcompression_client_data\fP\^;
-.br
-      XcmsWhiteAdjustProc \fIwhite_adjust_proc\fP\^;
-.br
-      XPointer \fIwhite_adjust_client_data\fP\^;
+.HP
+XcmsCCC XcmsCreateCCC\^(\^Display *\fIdisplay\fP\^, int \fIscreen_number\fP\^,
+Visual *\fIvisual\fP\^, XcmsColor *\fIclient_white_point\fP\^,
+XcmsCompressionProc \fIcompression_proc\fP\^, XPointer
+\fIcompression_client_data\fP\^, XcmsWhiteAdjustProc
+\fIwhite_adjust_proc\fP\^, XPointer \fIwhite_adjust_client_data\fP\^); 
 .LP
-void XcmsFreeCCC\^(\^\fIccc\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
+void XcmsFreeCCC\^(\^XcmsCCC \fIccc\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XcmsDefaultCCC.man b/man/XcmsDefaultCCC.man
index 413e5346..578ae80d 100644
--- a/man/XcmsDefaultCCC.man
+++ b/man/XcmsDefaultCCC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsD3C.man,v 1.2 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsD3C.man,v 1.3 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,11 +144,9 @@
 .SH NAME
 XcmsDefaultCCC \- obtain the default CCC for a screen
 .SH SYNTAX
-XcmsCCC XcmsDefaultCCC\^(\^\fIdisplay\fP, \fIscreen_number\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int \fIscreen_number\fP\^;
+.HP
+XcmsCCC XcmsDefaultCCC\^(\^Display *\fIdisplay\fP\^, int
+\fIscreen_number\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XcmsQueryBlack.man b/man/XcmsQueryBlack.man
index e9269f7c..4ae7bd19 100644
--- a/man/XcmsQueryBlack.man
+++ b/man/XcmsQueryBlack.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsQBlk.man,v 1.2 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsQBlk.man,v 1.3 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,45 +144,21 @@
 .SH NAME
 XcmsQueryBlack, XcmsQueryBlue, XcmsQueryGreen, XcmsQueryRed, XcmsQueryWhite \- obtain black, blue, green, red, and white CCC color specifications
 .SH SYNTAX
-Status XcmsQueryBlack\^(\^\fIccc\fP\^, \fItarget_format\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColorFormat \fItarget_format\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsQueryBlue\^(\^\fIccc\fP\^, \fItarget_format\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColorFormat \fItarget_format\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsQueryGreen\^(\^\fIccc\fP\^, \fItarget_format\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColorFormat \fItarget_format\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsQueryRed\^(\^\fIccc\fP\^, \fItarget_format\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColorFormat \fItarget_format\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsQueryWhite\^(\^\fIccc\fP\^, \fItarget_format\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColorFormat \fItarget_format\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
+.HP
+Status XcmsQueryBlack\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryBlue\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryGreen\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryRed\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryWhite\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/XcmsQueryColor.man b/man/XcmsQueryColor.man
index c5108756..28f7342e 100644
--- a/man/XcmsQueryColor.man
+++ b/man/XcmsQueryColor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsQClr.man,v 3.3 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsQClr.man,v 3.4 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,41 +144,18 @@
 .SH NAME
 XcmsQueryColor, XcmsQueryColors, XcmsLookupColor \- obtain color values
 .SH SYNTAX
-Status XcmsQueryColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolor_in_out\fP\^, \fIresult_format\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XcmsColor *\fIcolor_in_out\fP\^;
-.br
-      XcmsColorFormat \fIresult_format\fP\^;
-.LP
-Status XcmsQueryColors\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolors_in_out\fP\^, \fIncolors\fP\^, \fIresult_format\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XcmsColor \fIcolors_in_out\fP\^[\^]\^;
-.br
-      unsigned int \fIncolors\fP\^;
-.br
-      XcmsColorFormat \fIresult_format\fP\^;
-.LP
-Status XcmsLookupColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolor_string\fP\^, \fIcolor_exact_return\fP\^, \fIcolor_screen_return\fP\^,
-.br
-			 \fIresult_format\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      char *\fIcolor_string\fP\^;
-.br
-      XcmsColor *\fIcolor_exact_return\fP\^, *\fIcolor_screen_return\fP\^;
-.br
-      XcmsColorFormat \fIresult_format\fP\^;
+.HP
+Status XcmsQueryColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolor_in_out\fP\^, XcmsColorFormat \fIresult_format\fP\^); 
+.HP
+Status XcmsQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, XcmsColor \fIcolors_in_out\fP\^[\^]\^, unsigned int
+\fIncolors\fP\^, XcmsColorFormat \fIresult_format\fP\^); 
+.HP
+Status XcmsLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor
+*\fIcolor_exact_return\fP\^, XcmsColor *\fIcolor_screen_return\fP\^,
+XcmsColorFormat \fIresult_format\fP\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XcmsSetWhitePoint.man b/man/XcmsSetWhitePoint.man
index bbb35d4c..88121ca7 100644
--- a/man/XcmsSetWhitePoint.man
+++ b/man/XcmsSetWhitePoint.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsSWP.man,v 1.2 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsSWP.man,v 1.3 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,19 +144,11 @@
 .SH NAME
 XcmsSetWhitePoint, XcmsSetWhiteAdjustProc \- modifying CCC attributes
 .SH SYNTAX
-Status XcmsSetWhitePoint\^(\^\fIccc\fP\^, \fIcolor\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsColor *\fIcolor\fP\^;
-.LP
-XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc\^(\^\fIccc\fP\^, \fIwhite_adjust_proc\fP\^, \fIclient_data\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsWhiteAdjustProc \fIwhite_adjust_proc\fP\^;
-.br
-      XPointer \fIclient_data\fP\^;
+.HP
+Status XcmsSetWhitePoint\^(\^XcmsCCC \fIccc\fP\^, XcmsColor *\fIcolor\fP\^); 
+.HP
+XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc\^(\^XcmsCCC \fIccc\fP\^,
+XcmsWhiteAdjustProc \fIwhite_adjust_proc\fP\^, XPointer \fIclient_data\fP\^); 
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/XcmsStoreColor.man b/man/XcmsStoreColor.man
index f231ff07..bef466a5 100644
--- a/man/XcmsStoreColor.man
+++ b/man/XcmsStoreColor.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsSClr.man,v 1.2 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsSClr.man,v 1.3 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,25 +144,13 @@
 .SH NAME
 XcmsStoreColor, XcmsStoreColors \- set colors
 .SH SYNTAX
-Status XcmsStoreColor\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolor\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XcmsColor *\fIcolor\fP\^;
-.LP
-Status XcmsStoreColors\^(\^\fIdisplay\fP, \fIcolormap\fP\^, \fIcolors\fP\^, \fIncolors\fP\^, \fIcompression_flags_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Colormap \fIcolormap\fP\^;
-.br
-      XcmsColor \fIcolors\fP\^[\^]\^;
-.br
-      int \fIncolors\fP\^;
-.br
-      Bool \fIcompression_flags_return\fP\^[\^]\^;
+.HP
+Status XcmsStoreColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolor\fP\^); 
+.HP
+Status XcmsStoreColors\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, XcmsColor \fIcolors\fP\^[\^]\^, int \fIncolors\fP\^, Bool
+\fIcompression_flags_return\fP\^[\^]\^); 
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XcmsTekHVCQueryMaxC.man b/man/XcmsTekHVCQueryMaxC.man
index cdd84b9f..d3f2eec7 100644
--- a/man/XcmsTekHVCQueryMaxC.man
+++ b/man/XcmsTekHVCQueryMaxC.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsTQMC.man,v 1.3 2001/02/09 03:47:47 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsTQMC.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,53 +144,22 @@
 .SH NAME
 XcmsTekHVCQueryMaxC, XcmsTekHVCQueryMaxV, XcmsTekHVCQueryMaxVC, XcmsTekHVCQueryMaxVSamples, XcmsTekHVCQueryMinV \- obtain the TekHVC coordinates
 .SH SYNTAX
-Status XcmsTekHVCQueryMaxC\^(\^\fIccc\fP\^, \fIhue\fP\^, \fIvalue\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue\fP\^;
-.br
-      XcmsFloat \fIvalue\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsTekHVCQueryMaxV\^(\^\fIccc\fP\^, \fIhue\fP\^, \fIchroma\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue\fP\^;
-.br
-      XcmsFloat \fIchroma\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsTekHVCQueryMaxVC\^(\^\fIccc\fP\^, \fIhue\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
-.LP
-Status XcmsTekHVCQueryMaxVSamples\^(\^\fIccc\fP\^, \fIhue\fP\^, \fIcolors_return\fP\^, \fInsamples\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue\fP\^;
-.br
-      XcmsColor \fIcolors_return[]\fP\^;
-.br
-      unsigned int \fInsamples\fP\^;
-.LP
-Status XcmsTekHVCQueryMinV\^(\^\fIccc\fP\^, \fIhue\fP\^, \fIchroma\fP\^, \fIcolor_return\fP\^)
-.br
-      XcmsCCC \fIccc\fP\^;
-.br
-      XcmsFloat \fIhue\fP\^;
-.br
-      XcmsFloat \fIchroma\fP\^;
-.br
-      XcmsColor *\fIcolor_return\fP\^;
+.HP
+Status XcmsTekHVCQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsFloat \fIvalue\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsTekHVCQueryMaxV\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsTekHVCQueryMaxVC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsTekHVCQueryMaxVSamples\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue\fP\^, XcmsColor \fIcolors_return[]\fP\^, unsigned int
+\fInsamples\fP\^); 
+.HP
+Status XcmsTekHVCQueryMinV\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIccc\fP 1i
 Specifies the CCC.
diff --git a/man/XmbDrawImageString.man b/man/XmbDrawImageString.man
index 997c7036..80725e97 100644
--- a/man/XmbDrawImageString.man
+++ b/man/XmbDrawImageString.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbDIStr.man,v 1.3 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbDIStr.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,53 +145,18 @@
 .SH NAME
 XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text using a single font set
 .SH SYNTAX
-void XmbDrawImageString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.LP
-void XwcDrawImageString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      wchar_t *\fIstring\fP\^;
-.br
-      int \fInum_wchars\fP\^;
-.LP
-void Xutf8DrawImageString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
+.HP
+void XmbDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^); 
+.HP
+void XwcDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+wchar_t *\fIstring\fP\^, int \fInum_wchars\fP\^); 
+.HP
+void Xutf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^); 
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XmbDrawString.man b/man/XmbDrawString.man
index c02047ba..f3e52634 100644
--- a/man/XmbDrawString.man
+++ b/man/XmbDrawString.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbDStr.man,v 1.4 2002/04/30 16:45:02 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XmbDStr.man,v 1.5 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,53 +145,18 @@
 .SH NAME
 XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font set
 .SH SYNTAX
-void XmbDrawString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.LP
-void XwcDrawString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      wchar_t *\fIstring\fP\^;
-.br
-      int \fInum_wchars\fP\^;
-.LP
-void Xutf8DrawString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
+.HP
+void XmbDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
+\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^); 
+.HP
+void XwcDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
+\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, wchar_t
+*\fIstring\fP\^, int \fInum_wchars\fP\^); 
+.HP
+void Xutf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man
index 3eef7c01..eaeb8f06 100644
--- a/man/XmbDrawText.man
+++ b/man/XmbDrawText.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbDTxt.man,v 1.3 2001/01/27 18:20:07 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbDTxt.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,47 +145,17 @@
 .SH NAME
 XmbDrawText, XwcDrawText, Xutf8DrawText \- draw text using multiple font sets 
 .SH SYNTAX
-void XmbDrawText\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XmbTextItem *\fIitems\fP\^;
-.br
-      int \fInitems\fP\^;
-.LP
-void XwcDrawText\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XwcTextItem *\fIitems\fP\^;
-.br
-      int \fInitems\fP\^;
-.LP
-void Xutf8DrawText\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      GC \fIgc\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      XmbTextItem *\fIitems\fP\^;
-.br
-      int \fInitems\fP\^;
+.HP
+void XmbDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int
+\fInitems\fP\^); 
+.HP
+void XwcDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XwcTextItem *\fIitems\fP\^, int
+\fInitems\fP\^); 
+.HP
+void Xutf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int \fInitems\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable. 
diff --git a/man/XmbLookupString.man b/man/XmbLookupString.man
index 13beedda..32b09186 100644
--- a/man/XmbLookupString.man
+++ b/man/XmbLookupString.man
@@ -42,7 +42,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbLStr.man,v 1.3 2001/01/27 18:20:08 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbLStr.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -147,47 +147,18 @@
 .SH NAME
 XmbLookupString, XwcLookupString, Xutf8LookupString \- obtain composed input from an input method
 .SH SYNTAX
-int XmbLookupString\^(\^\fIic\fP\^, \fIevent\fP\^, \fIbuffer_return\fP\^, \fIbytes_buffer\fP\^, \fIkeysym_return\fP\^, \fIstatus_return\fP\^)
-.br
-      XIC \fIic\fP\^;
-.br
-      XKeyPressedEvent *\fIevent\fP;
-.br
-      char *\fIbuffer_return\fP\^;
-.br
-      int \fIbytes_buffer\fP\^;
-.br
-      KeySym *\fIkeysym_return\fP\^;
-.br
-      Status *\fIstatus_return\fP\^;
-.LP
-int XwcLookupString\^(\^\fIic\fP\^, \fIevent\fP\^, \fIbuffer_return\fP\^, \fIbytes_buffer\fP\^, \fIkeysym_return\fP\^, \fIstatus_return\fP\^)
-.br
-      XIC \fIic\fP\^;
-.br
-      XKeyPressedEvent *\fIevent\fP\^;
-.br
-      wchar_t *\fIbuffer_return\fP\^;
-.br
-      int \fIwchars_buffer\fP\^;
-.br
-      KeySym *\fIkeysym_return\fP\^;
-.br
-      Status *\fIstatus_return\fP\^;
-.LP
-int Xutf8LookupString\^(\^\fIic\fP\^, \fIevent\fP\^, \fIbuffer_return\fP\^, \fIbytes_buffer\fP\^, \fIkeysym_return\fP\^, \fIstatus_return\fP\^)
-.br
-      XIC \fIic\fP\^;
-.br
-      XKeyPressedEvent *\fIevent\fP;
-.br
-      char *\fIbuffer_return\fP\^;
-.br
-      int \fIbytes_buffer\fP\^;
-.br
-      KeySym *\fIkeysym_return\fP\^;
-.br
-      Status *\fIstatus_return\fP\^;
+.HP
+int XmbLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
+*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
+.HP
+int XwcLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP\^,
+wchar_t *\fIbuffer_return\fP\^, int \fIwchars_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
+.HP
+int Xutf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
+*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIbuffer_return\fP 1i
 Returns a multibyte string or wide character string (if any)
diff --git a/man/XmbResetIC.man b/man/XmbResetIC.man
index 71912fb0..cb249e16 100644
--- a/man/XmbResetIC.man
+++ b/man/XmbResetIC.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbRIC.man,v 1.3 2001/01/27 18:20:08 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbRIC.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,17 +145,12 @@
 .SH NAME
 XmbResetIC, XwcResetIC, Xutf8ResetIC \- reset the state of an input context
 .SH SYNTAX
-char * XmbResetIC\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^;
-.LP
-wchar_t * XwcResetIC\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^; 
-.LP
-char * Xutf8ResetIC\^(\^\fIic\fP\^)
-.br
-      XIC \fIic\fP\^;
+.HP
+char *XmbResetIC\^(\^XIC \fIic\fP\^); 
+.HP
+wchar_t *XwcResetIC\^(\^XIC \fIic\fP\^); 
+.HP
+char *Xutf8ResetIC\^(\^XIC \fIic\fP\^); 
 .SH ARGUMENTS
 .IP \fIic\fP 1i
 Specifies the input context.
diff --git a/man/XmbTextEscapement.man b/man/XmbTextEscapement.man
index cb0adca1..61d1256e 100644
--- a/man/XmbTextEscapement.man
+++ b/man/XmbTextEscapement.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbTEsc.man,v 1.3 2001/01/27 18:20:08 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbTEsc.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,29 +145,15 @@
 .SH NAME
 XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text
 .SH SYNTAX
-int XmbTextEscapement\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.LP
-int XwcTextEscapement\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      wchar_t *\fIstring\fP\^;
-.br
-      int \fInum_wchars\fP\^;
-.LP
-int Xutf8TextEscapement\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
+.HP
+int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+\fInum_bytes\fP\^); 
+.HP
+int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,
+int \fInum_wchars\fP\^); 
+.HP
+int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, 
+int \fInum_bytes\fP\^); 
 .SH ARGUMENTS
 .IP \fIfont_set\fP 1i
 Specifies the font set.
diff --git a/man/XmbTextExtents.man b/man/XmbTextExtents.man
index b30067f5..d329148b 100644
--- a/man/XmbTextExtents.man
+++ b/man/XmbTextExtents.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbTExt.man,v 1.4 2001/01/27 18:20:08 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbTExt.man,v 1.5 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,41 +145,18 @@
 .SH NAME
 XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents
 .SH SYNTAX
-int XmbTextExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIoverall_ink_return\fP\^, \fIoverall_logical_return\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.br
-      XRectangle *\fIoverall_ink_return\fP\^;
-.br
-      XRectangle *\fIoverall_logical_return\fP\^;
-.LP
-int XwcTextExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^, \fIoverall_ink_return\fP\^, \fIoverall_logical_return\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      wchar_t *\fIstring\fP\^;
-.br
-      int \fInum_wchars\fP\^;
-.br
-      XRectangle *\fIoverall_ink_return\fP\^;
-.br
-      XRectangle *\fIoverall_logical_return\fP\^;
-.LP
-int Xutf8TextExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIoverall_ink_return\fP\^, \fIoverall_logical_return\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.br
-      XRectangle *\fIoverall_ink_return\fP\^;
-.br
-      XRectangle *\fIoverall_logical_return\fP\^;
+.HP
+int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^); 
+.HP
+int XwcTextExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^, int
+\fInum_wchars\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^); 
+.HP
+int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^);
 .SH ARGUMENTS
 .IP \fIfont_set\fP 1i
 Specifies the font set.
diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
index c16edd0b..8959ca61 100644
--- a/man/XmbTextListToTextProperty.man
+++ b/man/XmbTextListToTextProperty.man
@@ -42,7 +42,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XTLTTProp.man,v 1.5 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XTLTTProp.man,v 1.6 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -147,77 +147,32 @@
 .SH NAME
 XmbTextListToTextProperty, XwcTextListToTextProperty, Xutf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, Xutf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures
 .SH SYNTAX
-int XmbTextListToTextProperty\^(\^\fIdisplay\fP\^, \fIlist\fP\^, \fIcount\fP\^, \fIstyle\fP\^, \fItext_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char **\fIlist\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      XICCEncodingStyle \fIstyle\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
-.LP
-int XwcTextListToTextProperty\^(\^\fIdisplay\fP\^, \fIlist\fP\^, \fIcount\fP\^, \fIstyle\fP\^, \fItext_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      wchar_t **\fIlist\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      XICCEncodingStyle \fIstyle\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
-.LP
-int Xutf8TextListToTextProperty\^(\^\fIdisplay\fP\^, \fIlist\fP\^, \fIcount\fP\^, \fIstyle\fP\^, \fItext_prop_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char **\fIlist\fP\^;
-.br
-      int \fIcount\fP\^;
-.br
-      XICCEncodingStyle \fIstyle\fP\^;
-.br
-      XTextProperty *\fItext_prop_return\fP\^;
-.LP
-int XmbTextPropertyToTextList\^(\^\fIdisplay\fP\^, \fItext_prop\fP\^, \fIlist_return\fP\^, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.br
-      char ***\fIlist_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
-.LP
-int XwcTextPropertyToTextList\^(\^\fIdisplay\fP\^, \fItext_prop\fP\^, \fIlist_return\fP\^, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.br
-      wchar_t ***\fIlist_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
-.LP
-int Xutf8TextPropertyToTextList\^(\^\fIdisplay\fP\^, \fItext_prop\fP\^, \fIlist_return\fP\^, \fIcount_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XTextProperty *\fItext_prop\fP\^;
-.br
-      char ***\fIlist_return\fP\^;
-.br
-      int *\fIcount_return\fP\^;
-.LP
-void XwcFreeStringList\^(\^\fIlist\fP\^)
-.br
-      wchar_t **\fIlist\fP\^;
-.LP
-char *XDefaultString\^(\|)
+.HP
+int XmbTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
+**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XwcTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, wchar_t
+**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int Xutf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
+**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XmbTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
+.HP
+int XwcTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+*\fItext_prop\fP\^, wchar_t ***\fIlist_return\fP\^, int
+*\fIcount_return\fP\^); 
+.HP
+int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
+.HP
+void XwcFreeStringList\^(\^wchar_t **\fIlist\fP\^); 
+.HP
+char *XDefaultString\^(void)
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XmbTextPerCharExtents.man b/man/XmbTextPerCharExtents.man
index acb23547..084da3ea 100644
--- a/man/XmbTextPerCharExtents.man
+++ b/man/XmbTextPerCharExtents.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XmbTPCEx.man,v 1.4 2001/01/27 18:20:08 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XmbTPCEx.man,v 1.5 2003/04/28 22:17:58 herrb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -145,71 +145,24 @@
 .SH NAME
 XmbTextPerCharExtents, XwcTextPerCharExtents, Xutf8TextPerCharExtents \- obtain per-character information for a text string
 .SH SYNTAX
-Status XmbTextPerCharExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIink_array_return\fP\^,
-.br
-           \fIlogical_array_return\fP\^, \fIarray_size\fP\^, \fInum_chars_return\fP\^, \fIoverall_ink_return\fP\^,  \fIoverall_logical_return\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.br
-      XRectangle *\fIink_array_return\fP\^;
-.br
-      XRectangle *\fIlogical_array_return\fP\^;
-.br
-      int \fIarray_size\fP\^;
-.br
-      int *\fInum_chars_return\fP\^;
-.br
-      XRectangle *\fIoverall_ink_return\fP\^;
-.br
-      XRectangle *\fIoverall_logical_return\fP\^;
-.LP
-Status XwcTextPerCharExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^, \fIink_array_return\fP\^,
-.br
-          \fIlogical_array_return\fP\^, \fIarray_size\fP\^, \fInum_chars_return\fP\^, \fIoverall_ink_return\fP\^,  \fIoverall_logical_return\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      wchar_t *\fIstring\fP\^;
-.br
-      int \fInum_wchars\fP\^;
-.br
-      XRectangle *\fIink_array_return\fP\^;
-.br
-      XRectangle *\fIlogical_array_return\fP;
-.br
-      int \fIarray_size\fP\^;
-.br
-      int *\fInum_chars_return\fP\^;
-.br
-      XRectangle *\fIoverall_ink_return\fP\^;
-.br
-      XRectangle *\fIoverall_logical_return\fP\^;
-.LP
-Status Xutf8TextPerCharExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIink_array_return\fP\^,
-.br
-           \fIlogical_array_return\fP\^, \fIarray_size\fP\^, \fInum_chars_return\fP\^, \fIoverall_ink_return\fP\^,  \fIoverall_logical_return\fP\^)
-.br
-      XFontSet \fIfont_set\fP\^;
-.br
-      char *\fIstring\fP\^;
-.br
-      int \fInum_bytes\fP\^;
-.br
-      XRectangle *\fIink_array_return\fP\^;
-.br
-      XRectangle *\fIlogical_array_return\fP\^;
-.br
-      int \fIarray_size\fP\^;
-.br
-      int *\fInum_chars_return\fP\^;
-.br
-      XRectangle *\fIoverall_ink_return\fP\^;
-.br
-      XRectangle *\fIoverall_logical_return\fP\^;
+.HP
+Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,
+XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int
+*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^); 
+.HP
+Status XwcTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t
+*\fIstring\fP\^, int \fInum_wchars\fP\^, XRectangle
+*\fIink_array_return\fP\^, XRectangle *\fIlogical_array_return\fP, int
+\fIarray_size\fP\^, int *\fInum_chars_return\fP\^, XRectangle
+*\fIoverall_ink_return\fP\^, XRectangle *\fIoverall_logical_return\fP\^); 
+.HP
+Status Xutf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,
+XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int
+*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^);
 .SH ARGUMENTS
 .IP \fIarray_size\fP 1i
 Specifies the size of ink_array_return and logical_array_return.
diff --git a/man/XrmEnumerateDatabase.man b/man/XrmEnumerateDatabase.man
index 24e17bae..c72014cd 100644
--- a/man/XrmEnumerateDatabase.man
+++ b/man/XrmEnumerateDatabase.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XEnumDB.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XEnumDB.man,v 1.5 2003/05/29 21:48:04 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -163,20 +163,10 @@ T}	T{
 1
 T}
 .TE
-.FD 0
-Bool XrmEnumerateDatabase\^(\^\fIdatabase\fP, \fIname_prefix\fP, \fIclass_prefix\fP, \fImode\fP, \fIproc\fP, \fIarg\fP\^)
-.br
-      XrmDatabase \fIdatabase\fP\^;
-.br
-      XrmNameList \fIname_prefix\fP\^;
-.br
-      XrmClassList \fIclass_prefix\fP\^;
-.br
-      int \fImode\fP\^;
-.br
-      Bool (\^*\fIproc\fP\^)\^(\^)\^;
-.br
-      XPointer \fIarg\fP\^;
+.HP
+Bool XrmEnumerateDatabase\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList
+\fIname_prefix\fP\^, XrmClassList \fIclass_prefix\fP\^, int \fImode\fP\^, Bool
+(\^*\fIproc\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
 .SH ARGUMENTS
 .IP \fIdatabase\fP 1i
 Specifies the resource database.
@@ -233,7 +223,7 @@ The bindings and quarks lists are terminated by
 Note that pointers
 to the database and type are passed, but these values should not be modified.
 .LP
-The procedure must not modifiy the database.
+The procedure must not modify the database.
 If Xlib has been initialized for threads, the procedure is called with
 the database locked and the result of a call by the procedure to any
 Xlib function using the same database is not defined.
diff --git a/man/XrmGetFileDatabase.man b/man/XrmGetFileDatabase.man
index 7b0c6545..197f9e67 100644
--- a/man/XrmGetFileDatabase.man
+++ b/man/XrmGetFileDatabase.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGFDBase.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGFDBase.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,37 +144,22 @@
 .SH NAME
 XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases
 .SH SYNTAX
-XrmDatabase XrmGetFileDatabase\^(\^\fIfilename\fP\^)
-.br
-     char *\fIfilename\fP\^;
-.LP
-void XrmPutFileDatabase\^(\^\fIdatabase\fP, \fIstored_db\fP\^)
-.br
-     XrmDatabase \fIdatabase\fP\^;
-.br
-     char *\fIstored_db\fP\^;
-.LP
-XrmDatabase XrmGetStringDatabase\^(\^\fIdata\fP\^)
-.br
-     char *\fIdata\fP\^;
-.LP
-char *XrmLocaleOfDatabase\^(\^\fIdatabase\fP\^)
-.br
-      XrmDatabase \fIdatabase\fP\^;
-.LP
-XrmDatabase XrmGetDatabase\^(\^\fIdisplay\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.LP
-void XrmSetDatabase\^(\^\fIdisplay\fP\^, \fIdatabase\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XrmDatabase \fIdatabase\fP\^;
-.LP
-void XrmDestroyDatabase\^(\^\fIdatabase\fP\^)
-.br
-      XrmDatabase \fIdatabase\fP\^;
+.HP
+XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^); 
+.HP
+void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char
+*\fIstored_db\fP\^); 
+.HP
+XrmDatabase XrmGetStringDatabase\^(\^char *\fIdata\fP\^, 
+.HP
+char *XrmLocaleOfDatabase\^(\^XrmDatabase \fIdatabase\fP\^); 
+.HP
+XrmDatabase XrmGetDatabase\^(\^Display *\fIdisplay\fP\^); 
+.HP
+void XrmSetDatabase\^(\^Display *\fIdisplay\fP\^, XrmDatabase
+\fIdatabase\fP\^); 
+.HP
+void XrmDestroyDatabase\^(\^XrmDatabase \fIdatabase\fP\^); 
 .SH ARGUMENTS
 .IP \fIfilename\fP 1i
 Specifies the resource database file name.
diff --git a/man/XrmGetResource.man b/man/XrmGetResource.man
index c4e5f453..e6816921 100644
--- a/man/XrmGetResource.man
+++ b/man/XrmGetResource.man
@@ -41,7 +41,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGetRes.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XGetRes.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,59 +146,24 @@
 .SH NAME
 XrmGetResource, XrmQGetResource, XrmQGetSearchList, XrmQGetSearchResource \- retrieve database resources and search lists
 .SH SYNTAX
-Bool XrmGetResource\^(\^\fIdatabase\fP, \fIstr_name\fP, \fIstr_class\fP,
-\fIstr_type_return\fP, \fIvalue_return\fP\^)
-.br
-     XrmDatabase \fIdatabase\fP\^;
-.br
-     char *\fIstr_name\fP\^;
-.br
-     char *\fIstr_class\fP\^;
-.br
-     char **\fIstr_type_return\fP\^;
-.br
-     XrmValue *\fIvalue_return\fP\^; 
-.LP
-Bool XrmQGetResource\^(\^\fIdatabase\fP, \fIquark_name\fP, \fIquark_class\fP,
-\fIquark_type_return\fP, \fIvalue_return\fP\^)
-.br
-     XrmDatabase \fIdatabase\fP\^;
-.br
-     XrmNameList \fIquark_name\fP\^;
-.br
-     XrmClassList \fIquark_class\fP\^;
-.br
-     XrmRepresentation *\fIquark_type_return\fP\^;
-.br
-     XrmValue *\fIvalue_return\fP\^; 
-.LP
+.HP
+Bool XrmGetResource\^(\^XrmDatabase \fIdatabase\fP\^, char *\fIstr_name\fP\^,
+char *\fIstr_class\fP\^, char **\fIstr_type_return\fP\^, XrmValue
+*\fIvalue_return\fP\^); 
+.HP
+Bool XrmQGetResource\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList
+\fIquark_name\fP\^, XrmClassList \fIquark_class\fP\^, XrmRepresentation
+*\fIquark_type_return\fP\^, XrmValue *\fIvalue_return\fP\^); 
+.HP
 typedef XrmHashTable *XrmSearchList;
 .sp
-Bool XrmQGetSearchList\^(\^\fIdatabase\fP, \fInames\fP, \fIclasses\fP,
-\fIlist_return\fP, \fIlist_length\fP\^)
-.br
-     XrmDatabase \fIdatabase\fP\^;
-.br
-     XrmNameList \fInames\fP\^;
-.br
-     XrmClassList \fIclasses\fP\^;
-.br
-     XrmSearchList \fIlist_return\fP\^;
-.br
-     int \fIlist_length\fP\^;
-.LP
-Bool XrmQGetSearchResource\^(\^\fIlist\fP, \fIname\fP, \fIclass\fP,
-\fItype_return\fP, \fIvalue_return\fP\^)
-.br
-     XrmSearchList \fIlist\fP\^;
-.br
-     XrmName \fIname\fP\^;
-.br
-     XrmClass \fIclass\fP\^;
-.br
-     XrmRepresentation *\fItype_return\fP\^;
-.br
-     XrmValue *\fIvalue_return\fP\^;
+Bool XrmQGetSearchList\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList
+\fInames\fP\^, XrmClassList \fIclasses\fP\^, XrmSearchList
+\fIlist_return\fP\^, int \fIlist_length\fP\^); 
+.HP
+Bool XrmQGetSearchResource\^(\^XrmSearchList \fIlist\fP\^, XrmName
+\fIname\fP\^, XrmClass \fIclass\fP\^, XrmRepresentation *\fItype_return\fP\^, 
+XrmValue *\fIvalue_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIclass\fP 1i
 Specifies the resource class.
diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man
index ba59fc2f..d5b79b67 100644
--- a/man/XrmInitialize.man
+++ b/man/XrmInitialize.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XInitial.man,v 1.3 2001/02/09 03:47:45 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XInitial.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,22 +144,12 @@
 .SH NAME
 XrmInitialize, XrmParseCommand, XrmValue, XrmOptionKind, XrmOptionDescRec \- initialize the Resource Manager, Resource Manager structures, and parse the command line
 .SH SYNTAX
-void XrmInitialize\^(\|);
-.LP
-void XrmParseCommand\^(\^\fIdatabase\fP\^, \^\fItable\fP\^, \^\fItable_count\fP\^,
-\^\fIname\fP\^, \^\fIargc_in_out\fP\^, \^\fIargv_in_out\fP\^)
-.br
-      XrmDatabase *\fIdatabase\fP\^;
-.br
-      XrmOptionDescList \fItable\fP\^;
-.br
-      int \fItable_count\fP\^;
-.br
-      char *\fIname\fP\^;
-.br
-      int *\fIargc_in_out\fP\^;
-.br
-      char **\fIargv_in_out\fP\^;
+.HP
+void XrmInitialize\^(void\^);
+.HP
+void XrmParseCommand\^(\^XrmDatabase *\fIdatabase\fP\^, XrmOptionDescList
+\fItable\fP\^, int \fItable_count\fP\^, char *\fIname\fP\^, int
+*\fIargc_in_out\fP\^, char **\fIargv_in_out\fP\^); 
 .SH ARGUMENTS
 .IP \fIargc_in_out\fP 1i
 Specifies the number of arguments and returns the number of remaining arguments.
diff --git a/man/XrmMergeDatabases.man b/man/XrmMergeDatabases.man
index 8538e620..72965f0c 100644
--- a/man/XrmMergeDatabases.man
+++ b/man/XrmMergeDatabases.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XMDBases.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XMDBases.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,23 +144,14 @@
 .SH NAME
 XrmMergeDatabases, XrmCombineDatabase, XrmCombineFileDatabase \- merge resource databases
 .SH SYNTAX
-void XrmMergeDatabases(\^\fIsource_db\fP, \fItarget_db\fP\^)
-.br
-      XrmDatabase \fIsource_db\fP, *\fItarget_db\fP\^;
-.LP
-void XrmCombineDatabase(\^\fIsource_db\fP, \fItarget_db\fP, \fIoverride\fP\^)
-.br
-      XrmDatabase \fIsource_db\fP, *\fItarget_db\fP\^;
-.br
-      Bool \fIoverride\fP;
-.LP
-Status XrmCombineFileDatabase(\^\fIfilename\fP, \fItarget_db\fP, \fIoverride\fP\^)
-.br
-      char *\fIfilename\fP;
-.br
-      XrmDatabase *\fItarget_db\fP\^;
-.br
-      Bool \fIoverride\fP;
+.HP
+void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, *\fItarget_db\fP\^); 
+.HP
+void XrmCombineDatabase(\^XrmDatabase \fIsource_db\fP, XrmDatabase
+*\fItarget_db\fP\^); 
+.HP
+Status XrmCombineFileDatabase(\^char *\fIfilename\fP, XrmDatabase
+*\fItarget_db\fP\^, Bool \fIoverride\fP); 
 .SH ARGUMENTS
 .IP \fIsource_db\fP 1i
 Specifies the resource database that is to be merged into the target database.
diff --git a/man/XrmPutResource.man b/man/XrmPutResource.man
index 28d92301..80bdbb51 100644
--- a/man/XrmPutResource.man
+++ b/man/XrmPutResource.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XPutRes.man,v 1.3 2001/02/09 03:47:46 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XPutRes.man,v 1.5 2003/08/04 10:32:20 eich Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,53 +144,22 @@
 .SH NAME
 XrmPutResource, XrmQPutResource, XrmPutStringResource, XrmQPutStringResource, XrmPutLineResource \- store database resources
 .SH SYNTAX
-void XrmPutResource\^(\^\fIdatabase\fP, \fIspecifier\fP, \fItype\fP, \fIvalue\fP\^)
-.br
-     XrmDatabase *\fIdatabase\fP\^;
-.br
-     char *\fIspecifier\fP\^;
-.br
-     char *\fItype\fP\^;
-.br
-     XrmValue *\fIvalue\fP\^;
-.LP
-void XrmQPutResource\^(\^\fIdatabase\fP, \fIbindings\fP, \fIquarks\fP,
-\fItype\fP, \fIvalue\fP\^)
-.br
-     XrmDatabase *\fIdatabase\fP\^;
-.br
-     XrmBindingList \fIbindings\fP\^;
-.br
-     XrmQuarkList \fIquarks\fP\^;
-.br
-     XrmRepresentation \fItype\fP\^;
-.br
-     XrmValue *\fIvalue\fP\^;
-.LP
-void XrmPutStringResource\^(\^\fIdatabase\fP, \fIspecifier\fP, \fIvalue\fP\^)
-.br
-     XrmDatabase *\fIdatabase\fP\^;
-.br
-     char *\fIspecifier\fP\^;
-.br
-     char *\fIvalue\fP\^;
-.LP
-void XrmQPutStringResource\^(\^\fIdatabase\fP, \fIbindings\fP, \fIquarks\fP,
-\fIvalue\fP\^)
-.br
-     XrmDatabase *\fIdatabase\fP\^;
-.br
-     XrmBindingList \fIbindings\fP\^;
-.br
-     XrmQuarkList \fIquarks\fP\^;
-.br
-     char *\fIvalue\fP\^;
-.LP
-void XrmPutLineResource\^(\^\fIdatabase\fP, \fIline\fP\^)
-.br
-     XrmDatabase *\fIdatabase\fP\^;
-.br
-     char *\fIline\fP\^;
+.HP
+void XrmPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+*\fIspecifier\fP\^, char *\fItype\fP\^, XrmValue *\fIvalue\fP\^); 
+.HP
+void XrmQPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList
+\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, XrmRepresentation \fItype\fP\^,
+XrmValue *\fIvalue\fP\^); 
+.HP
+void XrmPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+*\fIspecifier\fP\^, char *\fIvalue\fP\^); 
+.HP
+void XrmQPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList
+\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, char *\fIvalue\fP\^); 
+.HP
+void XrmPutLineResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+*\fIline\fP\^); 
 .SH ARGUMENTS
 .IP \fIbindings\fP 1i
 Specifies a list of bindings.
@@ -218,6 +187,7 @@ followed by:
 .Ds
 XrmQPutResource(database, bindings, quarks, XrmStringToQuark(type), value)
 .De
+.LP
 If the specifier and type are not in the Host Portable Character Encoding,
 the result is implementation-dependent.
 The value is stored in the database without modification.
diff --git a/man/XrmUniqueQuark.man b/man/XrmUniqueQuark.man
index 736193d7..b627651d 100644
--- a/man/XrmUniqueQuark.man
+++ b/man/XrmUniqueQuark.man
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XUQuark.man,v 1.4 2001/02/09 03:47:47 tsi Exp $
+.\" $XFree86: xc/doc/man/X11/XUQuark.man,v 1.5 2003/04/28 22:17:57 herrb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,57 +144,47 @@
 .SH NAME
 XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks
 .SH SYNTAX
-XrmQuark XrmUniqueQuark\^(\|)
+.HP
+XrmQuark XrmUniqueQuark\^(void); 
 .LP
 \&#define XrmStringToName(string) XrmStringToQuark(string)
-\&#define XrmStringToClass(string) XrmStringToQuark(string)
-\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)
-.sp
-XrmQuark XrmStringToQuark\^(\^\fIstring\fP\^)
 .br
-     char *\fIstring\fP\^;
-.sp
-XrmQuark XrmPermStringToQuark\^(\^\fIstring\fP\^)
+\&#define XrmStringToClass(string) XrmStringToQuark(string)
 .br
-     char *\fIstring\fP\^;
+\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)
+.HP
+int XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); 
+.HP
+XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); 
 .LP
 \&#define XrmStringToName(string) XrmStringToQuark(string)
-\&#define XrmStringToClass(string) XrmStringToQuark(string)
-\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)
-.sp
-XrmQuark XrmStringToQuark\^(\^\fIstring\fP\^)
 .br
-     char *\fIstring\fP\^;
-.sp
-XrmQuark XrmPermStringToQuark\^(\^\fIstring\fP\^)
+\&#define XrmStringToClass(string) XrmStringToQuark(string)
 .br
-     char *\fIstring\fP\^;
+\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)
+.HP
+XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); 
+.HP
+XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); 
 .LP
 \&#define XrmNameToString(name) XrmQuarkToString(name)
+.br
 \&#define XrmClassToString(class) XrmQuarkToString(class)
-\&#define XrmRepresentationToString(type) XrmQuarkToString(type)
-.sp
-char *XrmQuarkToString\^(\^\fIquark\fP\^)
 .br
-     XrmQuark \fIquark\fP\^;
+\&#define XrmRepresentationToString(type) XrmQuarkToString(type)
+.HP
+char *XrmQuarkToString\^(\^XrmQuark \fIquark\fP\^); 
 .LP
 \&#define XrmStringToNameList(str, name)  XrmStringToQuarkList((str), (name))
+.br
 \&#define XrmStringToClassList(str,class) XrmStringToQuarkList((str), (class))
 .sp
-void XrmStringToQuarkList\^(\^\fIstring\fP, \fIquarks_return\fP\^)
-.br
-     char *\fIstring\fP\^;
-.br
-     XrmQuarkList \fIquarks_return\fP\^;
-.LP
-XrmStringToBindingQuarkList\^(\^\fIstring\fP, \fIbindings_return\fP,
-\fIquarks_return\fP\^)
-.br
-     char *\fIstring\fP\^;
-.br
-     XrmBindingList \fIbindings_return\fP\^;
-.br
-     XrmQuarkList \fIquarks_return\fP\^;
+.HP
+void XrmStringToQuarkList\^(\^char *\fIstring\fP\^, XrmQuarkList
+\fIquarks_return\fP\^); 
+.HP
+XrmStringToBindingQuarkList\^(\^char *\fIstring\fP\^, XrmBindingList
+\fIbindings_return\fP\^, XrmQuarkList \fIquarks_return\fP\^); 
 .SH ARGUMENTS
 .IP \fIbindings_return\fP 1i
 Returns the binding list.
author	Kaleb Keithley <kaleb@freedesktop.org>	2003-11-26 22:48:16 +0000
committer	Kaleb Keithley <kaleb@freedesktop.org>	2003-11-26 22:48:16 +0000
commit	0642e99ac05afb0c90872a29ff290ffc348c4255 (patch)
tree	4ca628848e7d3fc10217101970c2db6c49342ec7 /man
parent	400780e6a7f710b57e92a9cc792bcb4ba530ffb3 (diff)