update/correct function prototypes in manpages to match headers

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>

49 files changed, 119 insertions, 104 deletions

diff --git a/man/AllPlanes.man b/man/AllPlanes.man
index 70d837e8..3532bef5 100644
--- a/man/AllPlanes.man
+++ b/man/AllPlanes.man
@@ -63,7 +63,7 @@ Colormap DefaultColormap\^(\^Display *\fIdisplay\fP\^,
 int DefaultDepth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
 .HP
 int *XListDepths\^(\^Display *\fIdisplay\fP, int \fIscreen_number\fP, int
-\fIcount_return\fP\^);
+*\fIcount_return\fP\^);
 .HP
 GC DefaultGC\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
 .HP
@@ -82,9 +82,9 @@ int DisplayPlanes\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
 .HP
 char *DisplayString\^(\^Display *\fIdisplay\fP\^);
 .HP
-long XMaxRequestSize(\^Display *\fIdisplay\fP\^)
+long XMaxRequestSize(\^Display *\fIdisplay\fP\^);
 .HP
-long XExtendedMaxRequestSize(\^Display *\fIdisplay\fP\^)
+long XExtendedMaxRequestSize(\^Display *\fIdisplay\fP\^);
 .HP
 unsigned long LastKnownRequestProcessed\^(\^Display *\fIdisplay\fP\^);
 .HP
@@ -103,9 +103,9 @@ int ScreenCount\^(\^Display *\fIdisplay\fP\^);
 Screen *ScreenOfDisplay\^(\^Display *\fIdisplay\fP, int
 \fIscreen_number\fP\^);
 .HP
-char *ServerVendor\^(\^Display *\fIdisplay\fP\^)
+char *ServerVendor\^(\^Display *\fIdisplay\fP\^);
 .HP
-int VendorRelease\^(\^Display *\fIdisplay\fP\^)
+int VendorRelease\^(\^Display *\fIdisplay\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XAddConnectionWatch.man b/man/XAddConnectionWatch.man
index 7dc66eef..b776092d 100644
--- a/man/XAddConnectionWatch.man
+++ b/man/XAddConnectionWatch.man
@@ -54,10 +54,10 @@ 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
+Status XAddConnectionWatch\^(\^Display *\fIdisplay\fP\^, XConnectionWatchProc
 \fIprocedure\fP\^, XPointer \fIclient_data\fP\^);
 .HP
-Status XRemoveConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc
+void XRemoveConnectionWatch\^(\^Display *\fIdisplay\fP\^, XConnectionWatchProc
 \fIprocedure\fP\^, XPointer \fIclient_data\fP\^);
 .HP
 void XProcessInternalConnection\^(\^Display *\fIdisplay\fP\^, int \fIfd\fP\^);
diff --git a/man/XAddHost.man b/man/XAddHost.man
index 03b9fd4d..bb75aa2d 100644
--- a/man/XAddHost.man
+++ b/man/XAddHost.man
@@ -82,7 +82,7 @@ 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\^);
+Bool *\fIstate_return\fP\^);
 .HP
 int XRemoveHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^);
 .HP
diff --git a/man/XAllocColor.man b/man/XAllocColor.man
index d7ff5e98..aa051ed9 100644
--- a/man/XAllocColor.man
+++ b/man/XAllocColor.man
@@ -56,7 +56,7 @@ 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
+_Xconst char *\fIcolor_name\fP\^, XColor *\fIscreen_def_return\fP\^, XColor
 *\fIexact_def_return\fP\^);
 .HP
 Status XAllocColorCells\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
diff --git a/man/XAllocIconSize.man b/man/XAllocIconSize.man
index ae5162ff..36c09cfc 100644
--- a/man/XAllocIconSize.man
+++ b/man/XAllocIconSize.man
@@ -55,7 +55,7 @@ int XSetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize
 *\fIsize_list\fP, int \fIcount\fP\^);
 .LP
 Status XGetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize
-**\fIsize_list_return\fP, int \fIcount_return\fP\^);
+**\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/XCopyArea.man b/man/XCopyArea.man
index 25f9ed9b..0ac299c4 100644
--- a/man/XCopyArea.man
+++ b/man/XCopyArea.man
@@ -57,7 +57,7 @@ int \fIwidth\fP\^, unsigned \fIheight\fP\^, int \fIdest_x\fP\^, int
 .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\^,
+\fIwidth\fP\^, unsigned \fIheight\fP\^, int \fIdest_x\fP\^, int \fIdest_y\fP\^,
 unsigned long \fIplane\fP\^);
 .SH ARGUMENTS
 .IP \fIdest_x\fP 1i
diff --git a/man/XCreateFontCursor.man b/man/XCreateFontCursor.man
index 587d1cfd..977795ff 100644
--- a/man/XCreateFontCursor.man
+++ b/man/XCreateFontCursor.man
@@ -60,8 +60,8 @@ Cursor XCreatePixmapCursor\^(\^Display *\fIdisplay\fP\^, Pixmap
 .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\^);
+unsigned int \fImask_char\fP\^, XColor _Xconst *\fIforeground_color\fP\^, XColor
+_Xconst *\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 d2111eb3..3b102cfe 100644
--- a/man/XCreateFontSet.man
+++ b/man/XCreateFontSet.man
@@ -50,7 +50,7 @@
 XCreateFontSet, XFreeFontSet \- create and free an international text drawing font set
 .SH SYNTAX
 .HP
-XFontSet XCreateFontSet\^(\^Display *\fIdisplay\fP\^, char
+XFontSet XCreateFontSet\^(\^Display *\fIdisplay\fP\^, _Xconst char
 *\fIbase_font_name_list\fP\^, char ***\fImissing_charset_list_return\fP\^, int
 *\fImissing_charset_count_return\fP\^, char **\fIdef_string_return\fP\^);
 .HP
diff --git a/man/XCreateOC.man b/man/XCreateOC.man
index 8b2644b7..22f484ae 100644
--- a/man/XCreateOC.man
+++ b/man/XCreateOC.man
@@ -50,7 +50,7 @@
 XCreateOC, XDestroyOC, XSetOCValues, XGetOCValues, XOMOfOC \- create output contexts
 .SH SYNTAX
 .HP
-XOC XCreateOC\^(\^XOM \fIom\fP\^);
+XOC XCreateOC\^(\^XOM \fIom\fP\^, ...);
 .HP
 void XDestroyOC\^(\^XOC \fIoc\fP\^);
 .HP
diff --git a/man/XDrawImageString.man b/man/XDrawImageString.man
index 9f2cffca..e98076d1 100644
--- a/man/XDrawImageString.man
+++ b/man/XDrawImageString.man
@@ -51,11 +51,11 @@ XDrawImageString, XDrawImageString16 \- draw image text
 .SH SYNTAX
 .HP
 int XDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, _Xconst 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
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, _Xconst XChar2b *\fIstring\fP\^, int
 \fIlength\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
diff --git a/man/XDrawString.man b/man/XDrawString.man
index 97844ee1..295c1a36 100644
--- a/man/XDrawString.man
+++ b/man/XDrawString.man
@@ -51,11 +51,11 @@ XDrawString, XDrawString16 \- draw text characters
 .SH SYNTAX
 .HP
 int XDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, _Xconst 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
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, _Xconst XChar2b *\fIstring\fP\^, int
 \fIlength\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
diff --git a/man/XGetWindowProperty.man b/man/XGetWindowProperty.man
index 70df3249..b297ffff 100644
--- a/man/XGetWindowProperty.man
+++ b/man/XGetWindowProperty.man
@@ -61,7 +61,7 @@ Atom *XListProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
 .HP
 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\^);
+_Xconst 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\^);
diff --git a/man/XInternAtom.man b/man/XInternAtom.man
index 6cd6374d..c9b96217 100644
--- a/man/XInternAtom.man
+++ b/man/XInternAtom.man
@@ -50,7 +50,7 @@
 XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return atom names
 .SH SYNTAX
 .HP
-Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, char *\fIatom_name\fP\^, Bool
+Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, _Xconst char *\fIatom_name\fP\^, Bool
 \fIonly_if_exists\fP\^);
 .HP
 Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, char **\fInames\fP\^, int
diff --git a/man/XListFonts.man b/man/XListFonts.man
index 6dd1c9e9..ed3213a6 100644
--- a/man/XListFonts.man
+++ b/man/XListFonts.man
@@ -50,12 +50,12 @@
 XListFonts, XFreeFontNames, XListFontsWithInfo, XFreeFontInfo \- obtain or free font names and information
 .SH SYNTAX
 .HP
-char **XListFonts\^(\^Display *\^\fIdisplay\fP\^, char *\^\fIpattern\fP\^, int
+char **XListFonts\^(\^Display *\^\fIdisplay\fP\^, _Xconst 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\^,
+char **XListFontsWithInfo\^(\^Display *\fIdisplay\fP\^, _Xconst char *\fIpattern\fP\^,
 int \fImaxnames\fP\^, int *\fIcount_return\fP\^, XFontStruct
 **\fIinfo_return\fP\^);
 .HP
diff --git a/man/XLoadFont.man b/man/XLoadFont.man
index b4c023ef..4fc237ba 100644
--- a/man/XLoadFont.man
+++ b/man/XLoadFont.man
@@ -60,11 +60,11 @@
 XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures
 .SH SYNTAX
 .HP
-Font XLoadFont\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP\^);
+Font XLoadFont\^(\^Display *\fIdisplay\fP\^, _Xconst char *\fIname\fP\^);
 .HP
 XFontStruct *XQueryFont\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^);
 .HP
-XFontStruct *XLoadQueryFont\^(\^Display *\fIdisplay\fP\^, char
+XFontStruct *XLoadQueryFont\^(\^Display *\fIdisplay\fP\^, _Xconst char
 *\fIname\fP\^);
 .HP
 int XFreeFont\^(\^Display *\fIdisplay\fP\^, XFontStruct *\fIfont_struct\fP\^);
diff --git a/man/XLookupKeysym.man b/man/XLookupKeysym.man
index 2f54a49e..05204b7d 100644
--- a/man/XLookupKeysym.man
+++ b/man/XLookupKeysym.man
@@ -59,7 +59,7 @@ int XLookupString(\^XKeyEvent *\fIevent_struct\fP\^, char
 *\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
+\fIlist\fP\^[\^]\^, int \fImod_count\fP\^, _Xconst unsigned char *\fIstring\fP\^, int
 \fInum_bytes\fP\^);
 .SH ARGUMENTS
 .IP \fIbuffer_return\fP 1i
diff --git a/man/XOpenDisplay.man b/man/XOpenDisplay.man
index 68faefbe..c385057b 100644
--- a/man/XOpenDisplay.man
+++ b/man/XOpenDisplay.man
@@ -50,7 +50,7 @@
 XOpenDisplay, XCloseDisplay \- connect or disconnect to X server
 .SH SYNTAX
 .HP
-Display *XOpenDisplay\^(\^char *\fIdisplay_name\fP\^);
+Display *XOpenDisplay\^(\^_Xconst char *\fIdisplay_name\fP\^);
 .HP
 int XCloseDisplay\^(Display *\fIdisplay\fP\^);
 .SH ARGUMENTS
diff --git a/man/XOpenOM.man b/man/XOpenOM.man
index 275589c9..637b850e 100644
--- a/man/XOpenOM.man
+++ b/man/XOpenOM.man
@@ -56,9 +56,9 @@ XOM XOpenOM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
 .HP
 Status XCloseOM\^(\^XOM \fIom\fP\^);
 .HP
-char *XSetOMValues\^(\^XOM \fIom\fP\^);
+char *XSetOMValues\^(\^XOM \fIom\fP, ...\^);
 .HP
-char *XGetOMValues\^(\^XOM \fIom\fP\^);
+char *XGetOMValues\^(\^XOM \fIom\fP, ...\^);
 .HP
 Display *XDisplayOfOM\^(\^XOM \fIom\fP\^);
 .HP
diff --git a/man/XParseGeometry.man b/man/XParseGeometry.man
index ed4a9070..8fc042db 100644
--- a/man/XParseGeometry.man
+++ b/man/XParseGeometry.man
@@ -50,12 +50,12 @@
 XParseGeometry, XWMGeometry \- parse window geometry
 .SH SYNTAX
 .HP
-int XParseGeometry\^(\^char *\fIparsestring\fP\^, int *\fIx_return\fP\^, int
+int XParseGeometry\^(\^_Xconst 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\^,
+int XWMGeometry\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, _Xconst char
+*\fIuser_geom\fP\^, _Xconst 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\^);
diff --git a/man/XQueryColor.man b/man/XQueryColor.man
index c25dbc57..b5111e7b 100644
--- a/man/XQueryColor.man
+++ b/man/XQueryColor.man
@@ -58,11 +58,11 @@ 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
+_Xconst 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\^);
+_Xconst char *\fIspec\fP\^, XColor *\fIexact_def_return\fP\^);
 .SH ARGUMENTS
 .IP \fIcolormap\fP 1i
 Specifies the colormap.
diff --git a/man/XReadBitmapFile.man b/man/XReadBitmapFile.man
index 4d43ef4f..520be352 100644
--- a/man/XReadBitmapFile.man
+++ b/man/XReadBitmapFile.man
@@ -50,16 +50,16 @@
 XReadBitmapFile, XReadBitmapFileData, XWriteBitmapFile, XCreatePixmapFromBitmapData, XCreateBitmapFromData \- manipulate bitmaps
 .SH SYNTAX
 .HP
-int XReadBitmapFile(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, char
+int XReadBitmapFile(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, _Xconst 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
+int XReadBitmapFileData(\^_Xconst 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\^);
+**\fIdata_return\fP\^, int *\fIx_hot_return\fP, int *\fIy_hot_return\fP\^);
 .HP
-int XWriteBitmapFile(\^Display *\fIdisplay\fP\^, char *\fIfilename\fP\^,
+int XWriteBitmapFile(\^Display *\fIdisplay\fP\^, _Xconst char *\fIfilename\fP\^,
 Pixmap \fIbitmap\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
 int \fIx_hot\fP, int \fIy_hot\fP\^);
 .HP
@@ -69,7 +69,7 @@ Pixmap XCreatePixmapFromBitmapData\^(\^Display *\fIdisplay\fP\^, Drawable
 \fIdepth\fP\^);
 .HP
 Pixmap XCreateBitmapFromData(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
-char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^);
+_Xconst char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^);
 .SH ARGUMENTS
 .IP \fIbitmap\fP 1i
 Specifies the bitmap.
diff --git a/man/XSaveContext.man b/man/XSaveContext.man
index 58782811..99964927 100644
--- a/man/XSaveContext.man
+++ b/man/XSaveContext.man
@@ -51,7 +51,7 @@ XSaveContext, XFindContext, XDeleteContext, XUniqueContext \- associative look-u
 .SH SYNTAX
 .HP
 int XSaveContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext
-\fIcontext\fP\^, XPointer \fIdata\fP\^);
+\fIcontext\fP\^, _Xconst char *\fIdata\fP\^);
 .HP
 int XFindContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext
 \fIcontext\fP\^, XPointer *\fIdata_return\fP\^);
diff --git a/man/XSetErrorHandler.man b/man/XSetErrorHandler.man
index f04b3b49..6ab5ae46 100644
--- a/man/XSetErrorHandler.man
+++ b/man/XSetErrorHandler.man
@@ -56,13 +56,13 @@ int (*XSetErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)\^(Display *, XErrorEvent
 int XGetErrorText\^(\^Display *\fIdisplay\fP\^, int \fIcode\fP\^, char
 *\fIbuffer_return\fP\^, int \fIlength\fP\^);
 .HP
-char *XDisplayName\^(\^char *\fIstring\fP\^);
+char *XDisplayName\^(\^_Xconst 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 XGetErrorDatabaseText\^(\^Display *\fIdisplay\fP\^, _Xconst char *\fIname\fP, _Xconst char
+*\fImessage\fP\^, _Xconst char *\fIdefault_string\fP\^, char *\fIbuffer_return\fP\^,
 int \fIlength\fP\^);
 .SH ARGUMENTS
 .IP \fIbuffer_return\fP 1i
diff --git a/man/XSetLineAttributes.man b/man/XSetLineAttributes.man
index 6a0d4a97..3e34711d 100644
--- a/man/XSetLineAttributes.man
+++ b/man/XSetLineAttributes.man
@@ -55,7 +55,7 @@ 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\^);
+\fIdash_offset\fP\^, _Xconst 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 d52ff308..8cbdf1d2 100644
--- a/man/XSetPointerMapping.man
+++ b/man/XSetPointerMapping.man
@@ -50,7 +50,7 @@
 XSetPointerMapping, XGetPointerMapping \- manipulate pointer settings
 .SH SYNTAX
 .HP
-int XSetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char
+int XSetPointerMapping\^(\^Display *\fIdisplay\fP\^, _Xconst unsigned char
 \fImap\fP\^[]\^, int \fInmap\fP\^);
 .HP
 int XGetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char
diff --git a/man/XSetState.man b/man/XSetState.man
index e8478a8f..aee921c2 100644
--- a/man/XSetState.man
+++ b/man/XSetState.man
@@ -51,7 +51,7 @@ XSetState, XSetFunction, XSetPlaneMask, XSetForeground, XSetBackground \- GC con
 .SH SYNTAX
 .HP
 int XSetState\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
-\fIforeground\fP\^, unsigned int \fIbackground\fP\^, int \fIfunction\fP\^,
+\fIforeground\fP\^, unsigned long \fIbackground\fP\^, int \fIfunction\fP\^,
 unsigned long \fIplane_mask\fP\^);
 .HP
 int XSetFunction\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
diff --git a/man/XSetWMIconName.man b/man/XSetWMIconName.man
index 382b3d1d..738bc30a 100644
--- a/man/XSetWMIconName.man
+++ b/man/XSetWMIconName.man
@@ -56,7 +56,7 @@ XTextProperty *\fItext_prop\fP\^);
 Status XGetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
 XTextProperty *\fItext_prop_return\fP\^);
 .HP
-int XSetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+int XSetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, _Xconst char
 *\fIicon_name\fP\^);
 .HP
 Status XGetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
diff --git a/man/XSetWMName.man b/man/XSetWMName.man
index 064fe159..5e191ce9 100644
--- a/man/XSetWMName.man
+++ b/man/XSetWMName.man
@@ -56,7 +56,7 @@ void XSetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, XTextProperty
 Status XGetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
 XTextProperty *\fItext_prop_return\fP\^);
 .HP
-int XStoreName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+int XStoreName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, _Xconst char
 *\fIwindow_name\fP\^);
 .HP
 Status XFetchName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
diff --git a/man/XSetWMProperties.man b/man/XSetWMProperties.man
index 0587c12a..840bbff3 100644
--- a/man/XSetWMProperties.man
+++ b/man/XSetWMProperties.man
@@ -56,13 +56,13 @@ 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
+void XmbSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, _Xconst char
+*\fIwindow_name\fP\^, _Xconst 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
+void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, _Xconst char
+*\fIwindow_name\fP\^, _Xconst char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
 \fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
 XClassHint *\fIclass_hints\fP\^);
 .SH ARGUMENTS
diff --git a/man/XStoreBytes.man b/man/XStoreBytes.man
index e2dd461f..dc78170f 100644
--- a/man/XStoreBytes.man
+++ b/man/XStoreBytes.man
@@ -50,10 +50,10 @@
 XStoreBytes, XStoreBuffer, XFetchBytes, XFetchBuffer, XRotateBuffers \- manipulate cut and paste buffers
 .SH SYNTAX
 .HP
-int XStoreBytes\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int
+int XStoreBytes\^(\^Display *\fIdisplay\fP\^, _Xconst char *\fIbytes\fP\^, int
 \^\fInbytes\fP\^);
 .HP
-int XStoreBuffer\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int
+int XStoreBuffer\^(\^Display *\fIdisplay\fP\^, _Xconst char *\fIbytes\fP\^, int
 \^\fInbytes\fP\^, int \fIbuffer\fP\^);
 .HP
 char *XFetchBytes\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^);
diff --git a/man/XStoreColors.man b/man/XStoreColors.man
index cd585ee8..e27d9ed7 100644
--- a/man/XStoreColors.man
+++ b/man/XStoreColors.man
@@ -57,7 +57,7 @@ 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\^);
+_Xconst char *\^\fIcolor\fP\^, unsigned long \fIpixel\fP\^, int \fIflags\fP\^);
 .SH ARGUMENTS
 .IP \fIcolor\fP 1i
 Specifies the pixel and RGB values or the color name string (for example, red).
diff --git a/man/XStringToKeysym.man b/man/XStringToKeysym.man
index 14bc0d62..86dcda76 100644
--- a/man/XStringToKeysym.man
+++ b/man/XStringToKeysym.man
@@ -50,7 +50,7 @@
 XStringToKeysym, XKeysymToString, XKeycodeToKeysym, XKeysymToKeycode, XConvertCase \- convert keysyms
 .SH SYNTAX
 .HP
-KeySym XStringToKeysym\^(\^char *\fIstring\fP\^);
+KeySym XStringToKeysym\^(\^_Xconst char *\fIstring\fP\^);
 .HP
 char *XKeysymToString\^(\^KeySym \fIkeysym\fP\^);
 .HP
diff --git a/man/XSupportsLocale.man b/man/XSupportsLocale.man
index 348aa09d..2fe659a6 100644
--- a/man/XSupportsLocale.man
+++ b/man/XSupportsLocale.man
@@ -53,7 +53,7 @@ XSupportsLocale, XSetLocaleModifiers \- determine locale support and configure l
 .HP
 Bool XSupportsLocale\^(void);
 .HP
-char *XSetLocaleModifiers\^(\^char *\fImodifier_list\fP\^);
+char *XSetLocaleModifiers\^(\^_Xconst char *\fImodifier_list\fP\^);
 .SH ARGUMENTS
 .IP \fImodifier_list\fP 1i
 Specifies the modifiers.
diff --git a/man/XTextExtents.man b/man/XTextExtents.man
index 752fa2c5..c5109a6e 100644
--- a/man/XTextExtents.man
+++ b/man/XTextExtents.man
@@ -50,23 +50,23 @@
 XTextExtents, XTextExtents16, XQueryTextExtents, XQueryTextExtents16 \- compute or query text extents
 .SH SYNTAX
 .HP
-int XTextExtents\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,
+int XTextExtents\^(\^XFontStruct *\fIfont_struct\fP\^, _Xconst 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
+int XTextExtents16\^(\^XFontStruct *\fIfont_struct\fP\^, _Xconst 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
+int XQueryTextExtents\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^, _Xconst 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\^,
+_Xconst 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
diff --git a/man/XTextWidth.man b/man/XTextWidth.man
index 5985bcbc..e9aa1ca3 100644
--- a/man/XTextWidth.man
+++ b/man/XTextWidth.man
@@ -50,10 +50,10 @@
 XTextWidth, XTextWidth16 \- compute text width
 .SH SYNTAX
 .HP
-int XTextWidth\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,
+int XTextWidth\^(\^XFontStruct *\fIfont_struct\fP\^, _Xconst char *\fIstring\fP\^,
 int \fIcount\fP\^);
 .HP
-int XTextWidth16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b
+int XTextWidth16\^(\^XFontStruct *\fIfont_struct\fP\^, _Xconst XChar2b
 *\fIstring\fP\^, int \fIcount\fP\^);
 .SH ARGUMENTS
 .IP \fIcount\fP 1i
diff --git a/man/XcmsAllocColor.man b/man/XcmsAllocColor.man
index c8346e32..9ae80fb8 100644
--- a/man/XcmsAllocColor.man
+++ b/man/XcmsAllocColor.man
@@ -54,7 +54,7 @@ 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
+\fIcolormap\fP\^, _Xconst char *\fIcolor_string\fP\^, XcmsColor
 *\fIcolor_screen_return\fP\^, XcmsColor *\fIcolor_exact_return\fP\^, XcmsColorFormat \fIresult_format\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
diff --git a/man/XcmsQueryColor.man b/man/XcmsQueryColor.man
index 6a1099fc..00117ea3 100644
--- a/man/XcmsQueryColor.man
+++ b/man/XcmsQueryColor.man
@@ -58,7 +58,7 @@ Status XcmsQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap
 \fIncolors\fP\^, XcmsColorFormat \fIresult_format\fP\^);
 .HP
 Status XcmsLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap
-\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor
+\fIcolormap\fP\^, _Xconst char *\fIcolor_string\fP\^, XcmsColor
 *\fIcolor_exact_return\fP\^, XcmsColor *\fIcolor_screen_return\fP\^,
 XcmsColorFormat \fIresult_format\fP\^);
 .SH ARGUMENTS
diff --git a/man/XcmsStoreColor.man b/man/XcmsStoreColor.man
index 39cbaca0..c31646c2 100644
--- a/man/XcmsStoreColor.man
+++ b/man/XcmsStoreColor.man
@@ -53,9 +53,11 @@ XcmsStoreColor, XcmsStoreColors \- set colors
 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\^[\^]\^);
+Status XcmsStoreColors\^(\^Display *\fIdisplay\fP\^,
+Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolors\fP\^,
+unsigned \fIncolors\fP\^,
+Bool *\fIcompression_flags_return\fP\^);
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
diff --git a/man/XmbDrawImageString.man b/man/XmbDrawImageString.man
index 406645fd..8a0b7800 100644
--- a/man/XmbDrawImageString.man
+++ b/man/XmbDrawImageString.man
@@ -52,16 +52,16 @@ XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text
 .SH SYNTAX
 .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\^);
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+_Xconst 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\^);
+_Xconst 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\^);
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+_Xconst 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 da48940d..74de253b 100644
--- a/man/XmbDrawString.man
+++ b/man/XmbDrawString.man
@@ -52,16 +52,16 @@ XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font s
 .SH SYNTAX
 .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\^);
+\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+_Xconst 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\^);
+\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+_Xconst 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\^);
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+_Xconst char *\fIstring\fP\^, int \fInum_bytes\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
 Specifies the drawable.
diff --git a/man/XmbTextEscapement.man b/man/XmbTextEscapement.man
index 5391f68b..e9126377 100644
--- a/man/XmbTextEscapement.man
+++ b/man/XmbTextEscapement.man
@@ -51,13 +51,16 @@
 XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text
 .SH SYNTAX
 .HP
-int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst char *\fIstring\fP\^, int
 \fInum_bytes\fP\^);
 .HP
-int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,
+int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst wchar_t *\fIstring\fP\^,
 int \fInum_wchars\fP\^);
 .HP
-int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^,
+int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst char *\fIstring\fP\^,
 int \fInum_bytes\fP\^);
 .SH ARGUMENTS
 .IP \fIfont_set\fP 1i
diff --git a/man/XmbTextExtents.man b/man/XmbTextExtents.man
index 01ae8e58..aaa8643e 100644
--- a/man/XmbTextExtents.man
+++ b/man/XmbTextExtents.man
@@ -51,15 +51,18 @@
 XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents
 .SH SYNTAX
 .HP
-int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst 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
+int XwcTextExtents\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst 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
+int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst char *\fIstring\fP\^, int
 \fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
 *\fIoverall_logical_return\fP\^);
 .SH ARGUMENTS
diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
index e9763659..fabcc00d 100644
--- a/man/XmbTextListToTextProperty.man
+++ b/man/XmbTextListToTextProperty.man
@@ -65,14 +65,17 @@ 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
+int XmbTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^,
+_Xconst XTextProperty
 *\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^);
 .HP
-int XwcTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+int XwcTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^,
+_Xconst XTextProperty
 *\fItext_prop\fP\^, wchar_t ***\fIlist_return\fP\^, int
 *\fIcount_return\fP\^);
 .HP
-int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^,
+_Xconst XTextProperty
 *\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^);
 .HP
 void XwcFreeStringList\^(\^wchar_t **\fIlist\fP\^);
diff --git a/man/XmbTextPerCharExtents.man b/man/XmbTextPerCharExtents.man
index eaa771c1..f4ecb52a 100644
--- a/man/XmbTextPerCharExtents.man
+++ b/man/XmbTextPerCharExtents.man
@@ -51,19 +51,22 @@
 XmbTextPerCharExtents, XwcTextPerCharExtents, Xutf8TextPerCharExtents \- obtain per-character information for a text string
 .SH SYNTAX
 .HP
-Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst 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
+Status XwcTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst 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
+Status Xutf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^,
+_Xconst 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
diff --git a/man/XrmGetFileDatabase.man b/man/XrmGetFileDatabase.man
index 5cbad899..dc26ac77 100644
--- a/man/XrmGetFileDatabase.man
+++ b/man/XrmGetFileDatabase.man
@@ -64,12 +64,12 @@ XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabas
 .HP
 XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^);
 .HP
-void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char
-*\fIstored_db\fP\^);
+void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^,
+_Xconst char *\fIstored_db\fP\^);
 .HP
-XrmDatabase XrmGetStringDatabase\^(\^char *\fIdata\fP\^);
+XrmDatabase XrmGetStringDatabase\^(\^_Xconst char *\fIdata\fP\^);
 .HP
-char *XrmLocaleOfDatabase\^(\^XrmDatabase \fIdatabase\fP\^);
+const char *XrmLocaleOfDatabase\^(\^XrmDatabase \fIdatabase\fP\^);
 .HP
 XrmDatabase XrmGetDatabase\^(\^Display *\fIdisplay\fP\^);
 .HP
diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man
index 683ae650..d674cfef 100644
--- a/man/XrmInitialize.man
+++ b/man/XrmInitialize.man
@@ -55,7 +55,8 @@ XrmInitialize, XrmParseCommand, XrmValue, XrmOptionKind, XrmOptionDescRec \- ini
 void XrmInitialize\^(void\^);
 .HP
 void XrmParseCommand\^(\^XrmDatabase *\fIdatabase\fP\^, XrmOptionDescList
-\fItable\fP\^, int \fItable_count\fP\^, char *\fIname\fP\^, int
+\fItable\fP\^, int \fItable_count\fP\^,
+_Xconst char *\fIname\fP\^, int
 *\fIargc_in_out\fP\^, char **\fIargv_in_out\fP\^);
 .SH ARGUMENTS
 .IP \fIargc_in_out\fP 1i
diff --git a/man/XrmMergeDatabases.man b/man/XrmMergeDatabases.man
index 2a6ada2f..db7442ff 100644
--- a/man/XrmMergeDatabases.man
+++ b/man/XrmMergeDatabases.man
@@ -58,7 +58,7 @@ void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, XrmDatabase
 void XrmCombineDatabase(\^XrmDatabase \fIsource_db\fP, XrmDatabase
 *\fItarget_db\fP, Bool \fIoverride\fP\^);
 .HP
-Status XrmCombineFileDatabase(\^char *\fIfilename\fP, XrmDatabase
+Status XrmCombineFileDatabase(\^_Xconst char *\fIfilename\fP, XrmDatabase
 *\fItarget_db\fP\^, Bool \fIoverride\fP);
 .SH ARGUMENTS
 .IP \fIsource_db\fP 1i
diff --git a/man/XrmPutResource.man b/man/XrmPutResource.man
index 86258f58..caba2316 100644
--- a/man/XrmPutResource.man
+++ b/man/XrmPutResource.man
@@ -59,13 +59,13 @@ 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\^);
+void XrmPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, _Xconst char
+*\fIspecifier\fP\^, _Xconst char *\fIvalue\fP\^);
 .HP
 void XrmQPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList
-\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, char *\fIvalue\fP\^);
+\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, _Xconst char *\fIvalue\fP\^);
 .HP
-void XrmPutLineResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+void XrmPutLineResource\^(\^XrmDatabase *\fIdatabase\fP\^, _Xconst char
 *\fIline\fP\^);
 .SH ARGUMENTS
 .IP \fIbindings\fP 1i
diff --git a/man/XrmUniqueQuark.man b/man/XrmUniqueQuark.man
index 544ffced..0be61ea3 100644
--- a/man/XrmUniqueQuark.man
+++ b/man/XrmUniqueQuark.man
@@ -62,7 +62,7 @@ XrmQuark XrmUniqueQuark\^(void);
 .HP
 int XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^);
 .HP
-XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^);
+XrmQuark XrmPermStringToQuark\^(\^_Xconst char *\fIstring\fP\^);
 .LP
 \&#define XrmStringToName(string) XrmStringToQuark(string)
 .br
@@ -72,7 +72,7 @@ XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^);
 .HP
 XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^);
 .HP
-XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^);
+XrmQuark XrmPermStringToQuark\^(\^_Xconst char *\fIstring\fP\^);
 .LP
 \&#define XrmNameToString(name) XrmQuarkToString(name)
 .br
@@ -90,7 +90,7 @@ char *XrmQuarkToString\^(\^XrmQuark \fIquark\fP\^);
 void XrmStringToQuarkList\^(\^char *\fIstring\fP\^, XrmQuarkList
 \fIquarks_return\fP\^);
 .HP
-XrmStringToBindingQuarkList\^(\^char *\fIstring\fP\^, XrmBindingList
+void XrmStringToBindingQuarkList\^(\^_Xconst char *\fIstring\fP\^, XrmBindingList
 \fIbindings_return\fP\^, XrmQuarkList \fIquarks_return\fP\^);
 .SH ARGUMENTS
 .IP \fIbindings_return\fP 1i