Update to libX11 1.3.5

15 files changed, 66 insertions, 223 deletions

diff --git a/lib/libX11/man/Compose.man b/lib/libX11/man/Compose.man
index db48cc4f4..85220512e 100644
--- a/lib/libX11/man/Compose.man
+++ b/lib/libX11/man/Compose.man
@@ -133,7 +133,7 @@ File to use for compose sequences.
 Directory to use for caching compiled compose files.
 .SH FILES
 .TP
-.I $HOME/.Xcompose
+.I $HOME/.XCompose
 User default compose file if XCOMPOSEFILE is not set.
 .TP
 .I __xlocaledir__/compose.dir
diff --git a/lib/libX11/man/Makefile.am b/lib/libX11/man/Makefile.am
index af83903fd..831067b90 100644
--- a/lib/libX11/man/Makefile.am
+++ b/lib/libX11/man/Makefile.am
@@ -196,6 +196,7 @@ libman_PRE = \
 
 filemandir = $(FILE_MAN_DIR)
 fileman_PRE = Compose.man
+FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)
 
 # What we actually install 
 
@@ -203,7 +204,7 @@ if MANPAGES
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
 	      $(all_shadows:=.@LIB_MAN_SUFFIX@)
 
-fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@)
+fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \
 	       $(file_shadows:=.@FILE_MAN_SUFFIX@)
 endif
 
diff --git a/lib/libX11/man/Makefile.in b/lib/libX11/man/Makefile.in
index 28f274ed0..acf03748d 100644
--- a/lib/libX11/man/Makefile.in
+++ b/lib/libX11/man/Makefile.in
@@ -47,8 +47,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/cpprules.in
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
+	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -93,15 +93,15 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
-BUILD_SPECS_FALSE = @BUILD_SPECS_FALSE@
-BUILD_SPECS_TRUE = @BUILD_SPECS_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -119,6 +119,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@
+ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -126,6 +128,15 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
 GROFF = @GROFF@
+GS_PATH = @GS_PATH@
+HAVE_GROFF_FALSE = @HAVE_GROFF_FALSE@
+HAVE_GROFF_HTML_FALSE = @HAVE_GROFF_HTML_FALSE@
+HAVE_GROFF_HTML_TRUE = @HAVE_GROFF_HTML_TRUE@
+HAVE_GROFF_MM_FALSE = @HAVE_GROFF_MM_FALSE@
+HAVE_GROFF_MM_TRUE = @HAVE_GROFF_MM_TRUE@
+HAVE_GROFF_MS_FALSE = @HAVE_GROFF_MS_FALSE@
+HAVE_GROFF_MS_TRUE = @HAVE_GROFF_MS_TRUE@
+HAVE_GROFF_TRUE = @HAVE_GROFF_TRUE@
 HAVE_PERL_FALSE = @HAVE_PERL_FALSE@
 HAVE_PERL_TRUE = @HAVE_PERL_TRUE@
 HAVE_PS2PDF_FALSE = @HAVE_PS2PDF_FALSE@
@@ -139,6 +150,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -162,6 +174,7 @@ MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -177,7 +190,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PNMTOPNG_PATH = @PNMTOPNG_PATH@
 PS2PDF = @PS2PDF@
+PSSELECT_PATH = @PSSELECT_PATH@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -218,6 +233,7 @@ XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@
 XLOCALE_TRUE = @XLOCALE_TRUE@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -460,12 +476,15 @@ libman_PRE = \
 
 filemandir = $(FILE_MAN_DIR)
 fileman_PRE = Compose.man
+FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)
 
 # What we actually install 
 @MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
 @MANPAGES_TRUE@	      $(all_shadows:=.@LIB_MAN_SUFFIX@)
 
-@MANPAGES_TRUE@fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@)
+@MANPAGES_TRUE@fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \
+@MANPAGES_TRUE@	       $(file_shadows:=.@FILE_MAN_SUFFIX@)
+
 EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
 CLEANFILES = $(libman_DATA) $(fileman_DATA)
 SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
@@ -1857,7 +1876,6 @@ uninstall-info: uninstall-info-recursive
 	uninstall uninstall-am uninstall-filemanDATA uninstall-info-am \
 	uninstall-libmanDATA
 
-@MANPAGES_TRUE@	       $(file_shadows:=.@FILE_MAN_SUFFIX@)
 
 .pre:
 	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/lib/libX11/man/XRaiseWindow.man b/lib/libX11/man/XRaiseWindow.man
index 8d7446606..3926b1688 100644
--- a/lib/libX11/man/XRaiseWindow.man
+++ b/lib/libX11/man/XRaiseWindow.man
@@ -305,7 +305,7 @@ The stacking order of the first window in the windows array is unaffected,
 but the other windows in the array are stacked underneath the first window,
 in the order of the array.
 The stacking order of the other windows is not affected.
-For each window in the window array that is not a child of the specified window,
+For each window in the window array that is not a sibling of the first window,
 a
 .ZN BadMatch
 error results.
diff --git a/lib/libX11/man/XStringToKeysym.man b/lib/libX11/man/XStringToKeysym.man
index 62212dbaa..067765b35 100644
--- a/lib/libX11/man/XStringToKeysym.man
+++ b/lib/libX11/man/XStringToKeysym.man
@@ -202,6 +202,10 @@ If no symbol is defined,
 .ZN XKeycodeToKeysym
 returns
 .ZN NoSymbol .
+.ZN XKeycodeToKeysym
+predates the XKB extension. If you want to lookup a KeySym while
+using XKB you have to use
+.ZN XkbKeycodeToKeysym .
 .LP
 If the specified KeySym is not defined for any KeyCode,
 .ZN XKeysymToKeycode
diff --git a/lib/libX11/man/xkb/Makefile.am b/lib/libX11/man/xkb/Makefile.am
index a4eaa6bd1..d5186e7e2 100644
--- a/lib/libX11/man/xkb/Makefile.am
+++ b/lib/libX11/man/xkb/Makefile.am
@@ -96,7 +96,7 @@ libman_PRE = \
 	XkbGetCompatMap.man                     \
 	XkbGetControls.man                      \
 	XkbGetControlsChanges.man               \
-	XkbGetDetectableAutorepeat.man          \
+	XkbGetDetectableAutoRepeat.man          \
 	XkbGetDeviceButtonActions.man           \
 	XkbGetDeviceInfo.man                    \
 	XkbGetDeviceInfoChanges.man             \
@@ -189,7 +189,7 @@ libman_PRE = \
 	XkbSetCompatMap.man                     \
 	XkbSetControls.man                      \
 	XkbSetDebuggingFlags.man                \
-	XkbSetDetectableAutorepeat.man          \
+	XkbSetDetectableAutoRepeat.man          \
 	XkbSetDeviceButtonActions.man           \
 	XkbSetDeviceInfo.man                    \
 	XkbSetIgnoreLockMods.man                \
diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in
index 04b9dbcab..455f3bb78 100644
--- a/lib/libX11/man/xkb/Makefile.in
+++ b/lib/libX11/man/xkb/Makefile.in
@@ -47,8 +47,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/cpprules.in
 subdir = man/xkb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
+	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -83,15 +83,15 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
-BUILD_SPECS_FALSE = @BUILD_SPECS_FALSE@
-BUILD_SPECS_TRUE = @BUILD_SPECS_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -109,6 +109,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@
+ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -116,6 +118,15 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
 GROFF = @GROFF@
+GS_PATH = @GS_PATH@
+HAVE_GROFF_FALSE = @HAVE_GROFF_FALSE@
+HAVE_GROFF_HTML_FALSE = @HAVE_GROFF_HTML_FALSE@
+HAVE_GROFF_HTML_TRUE = @HAVE_GROFF_HTML_TRUE@
+HAVE_GROFF_MM_FALSE = @HAVE_GROFF_MM_FALSE@
+HAVE_GROFF_MM_TRUE = @HAVE_GROFF_MM_TRUE@
+HAVE_GROFF_MS_FALSE = @HAVE_GROFF_MS_FALSE@
+HAVE_GROFF_MS_TRUE = @HAVE_GROFF_MS_TRUE@
+HAVE_GROFF_TRUE = @HAVE_GROFF_TRUE@
 HAVE_PERL_FALSE = @HAVE_PERL_FALSE@
 HAVE_PERL_TRUE = @HAVE_PERL_TRUE@
 HAVE_PS2PDF_FALSE = @HAVE_PS2PDF_FALSE@
@@ -129,6 +140,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -152,6 +164,7 @@ MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -167,7 +180,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PNMTOPNG_PATH = @PNMTOPNG_PATH@
 PS2PDF = @PS2PDF@
+PSSELECT_PATH = @PSSELECT_PATH@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -208,6 +223,7 @@ XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@
 XLOCALE_TRUE = @XLOCALE_TRUE@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -351,7 +367,7 @@ libman_PRE = \
 	XkbGetCompatMap.man                     \
 	XkbGetControls.man                      \
 	XkbGetControlsChanges.man               \
-	XkbGetDetectableAutorepeat.man          \
+	XkbGetDetectableAutoRepeat.man          \
 	XkbGetDeviceButtonActions.man           \
 	XkbGetDeviceInfo.man                    \
 	XkbGetDeviceInfoChanges.man             \
@@ -444,7 +460,7 @@ libman_PRE = \
 	XkbSetCompatMap.man                     \
 	XkbSetControls.man                      \
 	XkbSetDebuggingFlags.man                \
-	XkbSetDetectableAutorepeat.man          \
+	XkbSetDetectableAutoRepeat.man          \
 	XkbSetDeviceButtonActions.man           \
 	XkbSetDeviceInfo.man                    \
 	XkbSetIgnoreLockMods.man                \
diff --git a/lib/libX11/man/xkb/XkbFreeGeometry.man b/lib/libX11/man/xkb/XkbFreeGeometry.man
index 6ce7986a3..28e7560e5 100644
--- a/lib/libX11/man/xkb/XkbFreeGeometry.man
+++ b/lib/libX11/man/xkb/XkbFreeGeometry.man
@@ -71,7 +71,8 @@ are:
     #define   XkbGeomShapesMask          (1<<2)
     #define   XkbGeomSectionsMask        (1<<3)
     #define   XkbGeomDoodadsMask         (1<<4)
-    #define   XkbGeomAllMask             (0x1f)
+    #define   XkbGeomKeyAliasesMask      (1<<5)
+    #define   XkbGeomAllMask             (0x3f)
     
 .fi    
 If 
diff --git a/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man b/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man
index be1b19d53..46a1532d9 100644
--- a/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man
+++ b/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man
@@ -143,7 +143,7 @@ T}
 XkbAXN_AXKWarningMask	(1<<6)	T{
 AccessX warning notification wanted
 T}
-XkbAXN_AllEventsMask	(0x7f)	T{
+XkbAllAccessXEventsMask	(0x7f)	T{
 All AccessX features notifications wanted
 T}
 .TE
diff --git a/lib/libX11/man/xkb/XkbGetDetectableAutorepeat.man b/lib/libX11/man/xkb/XkbGetDetectableAutorepeat.man
deleted file mode 100644
index 8e5e7784a..000000000
--- a/lib/libX11/man/xkb/XkbGetDetectableAutorepeat.man
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) shall be included in all copies or substantial portions of the
-.\" Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.\"
-.TH XkbGetDetectableAutorepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbGetDetectableAutorepeat \- Determines whether or not the server supports 
-DetectableAutorepeat
-.SH SYNOPSIS
-.HP
-.B Bool XkbGetDetectableAutorepeat
-.BI "(\^Display *" "display" "\^,"
-.BI "Bool *" "supported_rtrn" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- display
-connection to X server
-.TP
-.I \- supported_rtrn
-backfilled True if DetectableAutorepeat supported
-.SH DESCRIPTION
-.LP
-Auto-repeat is the generation of multiple key events by a keyboard when the user 
-presses a key and holds it down. Keyboard hardware and device-dependent X server 
-software often implement auto-repeat by generating multiple KeyPress events with no 
-intervening KeyRelease event. The standard behavior of the X server is to generate 
-a KeyRelease event for every KeyPress event. If the keyboard hardware and 
-device-dependent software of the X server implement auto-repeat by generating 
-multiple KeyPress events, the device-independent part of the X server by default 
-synthetically generates a KeyRelease event after each KeyPress event. This provides 
-predictable behavior for X clients, but does not allow those clients to detect the 
-fact that a key is auto-repeating.
-
-Xkb allows clients to request 
-.I detectable auto-repeat. 
-If a client requests and the server supports DetectableAutorepeat, Xkb generates 
-KeyRelease events only when the key is physically released. If DetectableAutorepeat 
-is not supported or has not been requested, the server synthesizes a KeyRelease 
-event for each repeating KeyPress event it generates.
-
-DetectableAutorepeat, unlike other controls, is not contained in the XkbControlsRec 
-structure, nor can it be enabled or disabled via the EnabledControls control. 
-Instead, query and set DetectableAutorepeat using 
-.I XkbGetDetectableAutorepeat 
-and 
-.I XkbSetDetectableAutorepeat.
-
-DetectableAutorepeat is a condition that applies to all keyboard devices for a 
-client's connection to a given X server; it cannot be selectively set for some 
-devices and not for others. For this reason, none of the Xkb library functions 
-involving DetectableAutorepeat involve a device specifier.
-
-.I XkbGetDetectableAutorepeat 
-queries the server for the current state of DetectableAutorepeat and waits for a 
-reply. If 
-.I supported_rtrn 
-is not NULL, it backfills 
-.I supported_rtrn 
-with True if the server supports DetectableAutorepeat, and False otherwise.
-.I XkbGetDetectableAutorepeat 
-returns the current state of DetectableAutorepeat for the requesting client: 
-True if DetectableAutorepeat is set, and False otherwise.
-.SH "RETURN VALUES"
-.TP 15
-True
-The 
-.I XkbGetDetectableAutorepeat 
-function returns True if the server supports DetectableAutorepeat.
-.TP 15
-False
-The 
-.I XkbGetDetectableAutorepeat 
-function returns False if the server does not support DetectableAutorepeat.
diff --git a/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man b/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man
index 74c52d17e..f81a3c3bf 100644
--- a/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man
+++ b/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man
@@ -163,7 +163,7 @@ T}
 XkbAXN_AXKWarningMask	(1<<6)	T{
 AccessX warning notification wanted
 T}
-XkbAXN_AllEventsMask	(0x7f)	T{
+XkbAllAccessXEventsMask	(0x7f)	T{
 All AccessX features notifications wanted
 T}
 .TE
diff --git a/lib/libX11/man/xkb/XkbGetState.man b/lib/libX11/man/xkb/XkbGetState.man
index d591b1e0a..42222e095 100644
--- a/lib/libX11/man/xkb/XkbGetState.man
+++ b/lib/libX11/man/xkb/XkbGetState.man
@@ -24,7 +24,7 @@
 XkbGetState \-  Obtains the keyboard state 
 .SH SYNOPSIS
 .HP
-.B Bool XkbGetState
+.B Status XkbGetState
 .BI "(\^Display *" "display" "\^,"
 .BI "unsigned int " "device_spec" "\^,"
 .BI "XkbStatePtr " "state_return" "\^);"
diff --git a/lib/libX11/man/xkb/XkbKeyActionEntry.man b/lib/libX11/man/xkb/XkbKeyActionEntry.man
index 5acc7e837..c62cc2fd9 100644
--- a/lib/libX11/man/xkb/XkbKeyActionEntry.man
+++ b/lib/libX11/man/xkb/XkbKeyActionEntry.man
@@ -21,13 +21,13 @@
 .\"
 .TH XkbKeyActionEntry __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
 .SH NAME
-XkbKeyActionEntry \- Returns the key action corresponding to group grp and shift 
-level lvl from the 
-two-dimensional table of key actions associated with the key corresponding to 
+XkbKeyActionEntry \- Returns a pointer to the key action corresponding to
+group grp and shift level lvl from the two-dimensional table of key actions
+associated with the key corresponding to
 keycode
 .SH SYNOPSIS
 .HP
-.B XkbAction XkbKeyActionEntry
+.B XkbAction * XkbKeyActionEntry
 .BI "(\^XkbDescPtr " "xkb" "\^,"
 .BI "KeyCode " "keycode" "\^,"
 .BI "int " "shift" "\^,"
diff --git a/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man b/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man
index 98cd1d5dd..c8991332b 100644
--- a/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man
+++ b/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man
@@ -141,7 +141,7 @@ T}
 XkbAXN_AXKWarningMask	(1<<6)	T{
 AccessX warning notification wanted
 T}
-XkbAXN_AllEventsMask	(0x7f)	T{
+XkbAllAccessXEventsMask	(0x7f)	T{
 All AccessX features notifications wanted
 T}
 .TE
diff --git a/lib/libX11/man/xkb/XkbSetDetectableAutorepeat.man b/lib/libX11/man/xkb/XkbSetDetectableAutorepeat.man
deleted file mode 100644
index 7666b2ba8..000000000
--- a/lib/libX11/man/xkb/XkbSetDetectableAutorepeat.man
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) shall be included in all copies or substantial portions of the
-.\" Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.\"
-.TH XkbSetDetectableAutorepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbSetDetectableAutorepeat \- Sets DetectableAutorepeat
-.SH SYNTAX
-.HP
-.B Bool XkbSetDetectableAutorepeat
-.BI "(\^Display *" "display" "\^,"
-.BI "Bool " "detectable" "\^,"
-.BI "Bool *" "supported_rtrn" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- display
-connection to X server
-.TP
-.I \- detectable
-True => set DetectableAutorepeat
-.TP
-.I \- supported_rtrn
-backfilled True if DetectableAutorepeat supported
-.SH DESCRIPTION
-.LP
-Auto-repeat is the generation of multiple key events by a keyboard when the user 
-presses a key and holds it down. Keyboard hardware and device-dependent X server 
-software often implement auto-repeat by generating multiple KeyPress events with 
-no intervening KeyRelease event. The standard behavior of the X server is to 
-generate a KeyRelease event for every KeyPress event. If the keyboard hardware 
-and device-dependent software of the X server implement auto-repeat by 
-generating multiple KeyPress events, the device-independent part of the X server 
-by default synthetically generates a KeyRelease event after each KeyPress event. 
-This provides predictable behavior for X clients, but does not allow those 
-clients to detect the fact that a key is auto-repeating.
-
-Xkb allows clients to request 
-.I detectable auto-repeat. 
-If a client requests and the server supports DetectableAutorepeat, Xkb generates 
-KeyRelease events only when the key is physically released. If 
-DetectableAutorepeat is not supported or has not been requested, the server 
-synthesizes a KeyRelease event for each repeating KeyPress event it generates.
-
-DetectableAutorepeat, unlike other controls, is not contained in the 
-XkbControlsRec structure, nor can it be enabled or disabled via the 
-EnabledControls control. Instead, query and set DetectableAutorepeat using 
-.I XkbGetDetectableAutorepeat 
-and 
-.I XkbSetDetectableAutorepeat.
-
-DetectableAutorepeat is a condition that applies to all keyboard devices for a 
-client's connection to a given X server; it cannot be selectively set for some 
-devices and not for others. For this reason, none of the Xkb library functions 
-involving DetectableAutorepeat involve a device specifier.
-
-This request affects all keyboard activity for the requesting client only; other 
-clients still see the expected nondetectable auto-repeat behavior, unless they 
-have requested otherwise.
-
-.I XkbSetDetectableAutorepeat 
-sends a request to the server to set DetectableAutorepeat on for the current 
-client if 
-.I detectable 
-is True, and off if 
-.I detectable 
-is False; it then waits for a reply. If 
-.I supported_rtrn 
-is not NULL, 
-.I XkbSetDetectableAutorepeat 
-backfills 
-.I supported_rtrn 
-with True if the server supports DetectableAutorepeat, and False if it does not.
-.I XkbSetDetectableAutorepeat 
-returns the current state of DetectableAutorepeat for the requesting client: 
-True if DetectableAutorepeat is set, and False otherwise.
-.SH "RETURN VALUES"
-.TP 15
-True
-The 
-.I XkbSetDetectableAutorepeat 
-function returns True if DetectableAutorepeat is set.
-.TP 15
-False
-The 
-.I XkbSetDetectableAutorepeat 
-function returns False if DetectableAutorepeat is not set.