8 files changed, 1508 insertions, 1508 deletions
diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index ce3d25fab..2ce356d15 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -792,7 +792,7 @@ typedef int (*FreeModmapType) (
  */
 typedef struct _XFreeFuncs {
     FreeFuncType atoms;		/* _XFreeAtomTable */
-    FreeModmapType modifiermap;	/* XFreeModifierMap */
+    FreeModmapType modifiermap;	/* XFreeModifiermap */
     FreeFuncType key_bindings;	/* _XFreeKeyBindings */
     FreeFuncType context_db;	/* _XFreeContextDB */
     FreeFuncType defaultCCCs;	/* _XcmsFreeDefaultCCCs */
diff --git a/libX11/man/DisplayOfCCC.man b/libX11/man/DisplayOfCCC.man
index 8f2aad6ab..160eeb57f 100644
--- a/libX11/man/DisplayOfCCC.man
+++ b/libX11/man/DisplayOfCCC.man
@@ -175,7 +175,7 @@ macro returns the screen white point of the screen associated with
 the specified CCC.
 .LP
 The
-.ZN ClientWhitePointOfCC
+.ZN ClientWhitePointOfCCC
 macro returns the client white point of the screen associated with
 the specified CCC.
 .SH "SEE ALSO"
diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index 2b4bedadb..ef1a7453f 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -1,1081 +1,1081 @@
-SUBDIRS = xkb
-
-libmandir = $(LIB_MAN_DIR)
-
-libman_PRE = \
-	$(all_shadows:=.man) \
-	$(file_shadows:=.man) \
-	AllPlanes.man \
-	BlackPixelOfScreen.man \
-	DisplayOfCCC.man \
-	ImageByteOrder.man \
-	IsCursorKey.man \
-	XAddConnectionWatch.man \
-	XAddHost.man \
-	XAllocClassHint.man \
-	XAllocColor.man \
-	XAllocIconSize.man \
-	XAllocSizeHints.man \
-	XAllocStandardColormap.man \
-	XAllocWMHints.man \
-	XAllowEvents.man \
-	XAnyEvent.man \
-	XButtonEvent.man \
-	XChangeKeyboardControl.man \
-	XChangeKeyboardMapping.man \
-	XChangePointerControl.man \
-	XChangeSaveSet.man \
-	XChangeWindowAttributes.man \
-	XCirculateEvent.man \
-	XCirculateRequestEvent.man \
-	XClearArea.man \
-	XClientMessageEvent.man \
-	XcmsAllocColor.man \
-	XcmsCCCOfColormap.man \
-	XcmsCIELabQueryMaxC.man \
-	XcmsCIELuvQueryMaxC.man \
-	XcmsColor.man \
-	XcmsConvertColors.man \
-	XcmsCreateCCC.man \
-	XcmsDefaultCCC.man \
-	XcmsQueryBlack.man \
-	XcmsQueryColor.man \
-	XcmsSetWhitePoint.man \
-	XcmsStoreColor.man \
-	XcmsTekHVCQueryMaxC.man \
-	XColormapEvent.man \
-	XConfigureEvent.man \
-	XConfigureRequestEvent.man \
-	XConfigureWindow.man \
-	XCopyArea.man \
-	XCreateColormap.man \
-	XCreateFontCursor.man \
-	XCreateFontSet.man \
-	XCreateGC.man \
-	XCreateIC.man \
-	XCreateOC.man \
-	XCreatePixmap.man \
-	XCreateRegion.man \
-	XCreateWindowEvent.man \
-	XCreateWindow.man \
-	XCrossingEvent.man \
-	XDefineCursor.man \
-	XDestroyWindowEvent.man \
-	XDestroyWindow.man \
-	XDrawArc.man \
-	XDrawImageString.man \
-	XDrawLine.man \
-	XDrawPoint.man \
-	XDrawRectangle.man \
-	XDrawString.man \
-	XDrawText.man \
-	XEmptyRegion.man \
-	XErrorEvent.man \
-	XExposeEvent.man \
-	XExtentsOfFontSet.man \
-	XFillRectangle.man \
-	XFilterEvent.man \
-	XFlush.man \
-	XFocusChangeEvent.man \
-	XFontSetExtents.man \
-	XFontsOfFontSet.man \
-	XFree.man \
-	XGetEventData.man \
-	XGetVisualInfo.man \
-	XGetWindowAttributes.man \
-	XGetWindowProperty.man \
-	XGetXCBConnection.man \
-	XGrabButton.man \
-	XGrabKeyboard.man \
-	XGrabKey.man \
-	XGrabPointer.man \
-	XGrabServer.man \
-	XGraphicsExposeEvent.man \
-	XGravityEvent.man \
-	XIconifyWindow.man \
-	XIfEvent.man \
-	XInitImage.man \
-	XInitThreads.man \
-	XInstallColormap.man \
-	XInternAtom.man \
-	XIntersectRegion.man \
-	XKeymapEvent.man \
-	XListFonts.man \
-	XLoadFont.man \
-	XLookupKeysym.man \
-	XMapEvent.man \
-	XMapRequestEvent.man \
-	XMapWindow.man \
-	XmbDrawImageString.man \
-	XmbDrawString.man \
-	XmbDrawText.man \
-	XmbLookupString.man \
-	XmbResetIC.man \
-	XmbTextEscapement.man \
-	XmbTextExtents.man \
-	XmbTextListToTextProperty.man \
-	XmbTextPerCharExtents.man \
-	XNextEvent.man \
-	XNoOp.man \
-	XOpenDisplay.man \
-	XOpenIM.man \
-	XOpenOM.man \
-	XParseGeometry.man \
-	XPolygonRegion.man \
-	XPropertyEvent.man \
-	XPutBackEvent.man \
-	XPutImage.man \
-	XQueryBestSize.man \
-	XQueryColor.man \
-	XQueryExtension.man \
-	XQueryPointer.man \
-	XQueryTree.man \
-	XRaiseWindow.man \
-	XReadBitmapFile.man \
-	XRecolorCursor.man \
-	XReparentEvent.man \
-	XReparentWindow.man \
-	XResizeRequestEvent.man \
-	XResourceManagerString.man \
-	XrmEnumerateDatabase.man \
-	XrmGetFileDatabase.man \
-	XrmGetResource.man \
-	XrmInitialize.man \
-	XrmMergeDatabases.man \
-	XrmPutResource.man \
-	XrmUniqueQuark.man \
-	XSaveContext.man \
-	XSelectInput.man \
-	XSelectionClearEvent.man \
-	XSelectionEvent.man \
-	XSelectionRequestEvent.man \
-	XSendEvent.man \
-	XSetArcMode.man \
-	XSetClipOrigin.man \
-	XSetCloseDownMode.man \
-	XSetCommand.man \
-	XSetErrorHandler.man \
-	XSetEventQueueOwner.man \
-	XSetFillStyle.man \
-	XSetFont.man \
-	XSetFontPath.man \
-	XSetICFocus.man \
-	XSetICValues.man \
-	XSetInputFocus.man \
-	XSetLineAttributes.man \
-	XSetPointerMapping.man \
-	XSetScreenSaver.man \
-	XSetSelectionOwner.man \
-	XSetState.man \
-	XSetTextProperty.man \
-	XSetTile.man \
-	XSetTransientForHint.man \
-	XSetWMClientMachine.man \
-	XSetWMColormapWindows.man \
-	XSetWMIconName.man \
-	XSetWMName.man \
-	XSetWMProperties.man \
-	XSetWMProtocols.man \
-	XStoreBytes.man \
-	XStoreColors.man \
-	XStringListToTextProperty.man \
-	XStringToKeysym.man \
-	XSupportsLocale.man \
-	XSynchronize.man \
-	XTextExtents.man \
-	XTextWidth.man \
-	XTranslateCoordinates.man \
-	XUnmapEvent.man \
-	XUnmapWindow.man \
-	XVaCreateNestedList.man \
-	XVisibilityEvent.man \
-	XWarpPointer.man
-
-filemandir = $(FILE_MAN_DIR)
-fileman_PRE = Compose.man
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(all_shadows:=.@LIB_MAN_SUFFIX@)
-
-fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \
-	       $(file_shadows:=.@FILE_MAN_SUFFIX@)
-
-EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
-
-CLEANFILES = $(libman_DATA) $(fileman_DATA)
-
-SUFFIXES = .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
-
-MAN_SUBSTS += -e 's|__xlocaledir__|$(X11_LOCALEDATADIR)|g'
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-all_shadows =                                \
-    $(AllPlanes_shadows)                     \
-    $(BlackPixelOfScreen_shadows)            \
-    $(DisplayOfCCC_shadows)                  \
-    $(ImageByteOrder_shadows)                \
-    $(IsCursorKey_shadows)                   \
-    $(XAllocClassHint_shadows)               \
-    $(XAllocIconSize_shadows)                \
-    $(XAllocStandardColormap_shadows)        \
-    $(XAllocSizeHints_shadows)               \
-    $(XAllocWMHints_shadows)                 \
-    $(XAddHost_shadows)                      \
-    $(XAllocColor_shadows)                   \
-    $(XAnyEvent_shadows)                     \
-    $(XButtonEvent_shadows)                  \
-    $(XChangeKeyboardControl_shadows)        \
-    $(XChangeKeyboardMapping_shadows)        \
-    $(XChangePointerControl_shadows)         \
-    $(XChangeSaveSet_shadows)                \
-    $(XChangeWindowAttributes_shadows)       \
-    $(XClearArea_shadows)                    \
-    $(XConfigureWindow_shadows)              \
-    $(XCopyArea_shadows)                     \
-    $(XCreateColormap_shadows)               \
-    $(XCreateFontCursor_shadows)             \
-    $(XCreateFontSet_shadows)                \
-    $(XCreateGC_shadows)                     \
-    $(XCreateIC_shadows)                     \
-    $(XInitImage_shadows)                    \
-    $(XCreateOC_shadows)                     \
-    $(XCreatePixmap_shadows)                 \
-    $(XCreateRegion_shadows)                 \
-    $(XCreateWindow_shadows)                 \
-    $(XDefineCursor_shadows)                 \
-    $(XDestroyWindow_shadows)                \
-    $(XDrawArc_shadows)                      \
-    $(XDrawImageString_shadows)              \
-    $(XDrawLine_shadows)                     \
-    $(XDrawPoint_shadows)                    \
-    $(XDrawRectangle_shadows)                \
-    $(XDrawString_shadows)                   \
-    $(XDrawText_shadows)                     \
-    $(XEmptyRegion_shadows)                  \
-    $(XFillRectangle_shadows)                \
-    $(XFlush_shadows)                        \
-    $(XFontsOfFontSet_shadows)               \
-    $(XGraphicsExposeEvent_shadows)          \
-    $(XrmGetFileDatabase_shadows)            \
-    $(XrmGetResource_shadows)                \
-    $(XGetEventData_shadows)                 \
-    $(XGetVisualInfo_shadows)                \
-    $(XGetWindowAttributes_shadows)          \
-    $(XGetWindowProperty_shadows)            \
-    $(XGrabButton_shadows)                   \
-    $(XGrabKey_shadows)                      \
-    $(XGrabKeyboard_shadows)                 \
-    $(XGrabPointer_shadows)                  \
-    $(XGrabServer_shadows)                   \
-    $(XIconifyWindow_shadows)                \
-    $(XIfEvent_shadows)                      \
-    $(XrmInitialize_shadows)                 \
-    $(XInstallColormap_shadows)              \
-    $(XAddConnectionWatch_shadows)           \
-    $(XIntersectRegion_shadows)              \
-    $(XInternAtom_shadows)                   \
-    $(XListFonts_shadows)                    \
-    $(XLoadFont_shadows)                     \
-    $(XLookupKeysym_shadows)                 \
-    $(XrmMergeDatabases_shadows)             \
-    $(XMapEvent_shadows)                     \
-    $(XMapWindow_shadows)                    \
-    $(XNextEvent_shadows)                    \
-    $(XOpenDisplay_shadows)                  \
-    $(XOpenIM_shadows)                       \
-    $(XOpenOM_shadows)                       \
-    $(XParseGeometry_shadows)                \
-    $(XPolygonRegion_shadows)                \
-    $(XPutImage_shadows)                     \
-    $(XrmPutResource_shadows)                \
-    $(XQueryBestSize_shadows)                \
-    $(XQueryColor_shadows)                   \
-    $(XQueryExtension_shadows)               \
-    $(XResourceManagerString_shadows)        \
-    $(XRaiseWindow_shadows)                  \
-    $(XReadBitmapFile_shadows)               \
-    $(XRecolorCursor_shadows)                \
-    $(XSaveContext_shadows)                  \
-    $(XSetICFocus_shadows)                   \
-    $(XSetICValues_shadows)                  \
-    $(XStringListToTextProperty_shadows)     \
-    $(XSetArcMode_shadows)                   \
-    $(XSetClipOrigin_shadows)                \
-    $(XSetCloseDownMode_shadows)             \
-    $(XSetCommand_shadows)                   \
-    $(XSetErrorHandler_shadows)              \
-    $(XSendEvent_shadows)                    \
-    $(XSetFillStyle_shadows)                 \
-    $(XSetFontPath_shadows)                  \
-    $(XSetInputFocus_shadows)                \
-    $(XSetLineAttributes_shadows)            \
-    $(XSetPointerMapping_shadows)            \
-    $(XSetScreenSaver_shadows)               \
-    $(XSetSelectionOwner_shadows)            \
-    $(XSetState_shadows)                     \
-    $(XSetTransientForHint_shadows)          \
-    $(XSetTextProperty_shadows)              \
-    $(XSetTile_shadows)                      \
-    $(XSetWMClientMachine_shadows)           \
-    $(XSetWMColormapWindows_shadows)         \
-    $(XSetWMIconName_shadows)                \
-    $(XSetWMName_shadows)                    \
-    $(XSetWMProperties_shadows)              \
-    $(XSetWMProtocols_shadows)               \
-    $(XStoreBytes_shadows)                   \
-    $(XStoreColors_shadows)                  \
-    $(XStringToKeysym_shadows)               \
-    $(XSupportsLocale_shadows)               \
-    $(XSynchronize_shadows)                  \
-    $(XmbTextListToTextProperty_shadows)     \
-    $(XTextExtents_shadows)                  \
-    $(XTextWidth_shadows)                    \
-    $(XInitThreads_shadows)                  \
-    $(XrmUniqueQuark_shadows)                \
-    $(XUnmapWindow_shadows)                  \
-    $(XcmsCCCOfColormap_shadows)             \
-    $(XcmsAllocColor_shadows)                \
-    $(XcmsColor_shadows)                     \
-    $(XcmsCreateCCC_shadows)                 \
-    $(XcmsCIELabQueryMaxC_shadows)           \
-    $(XcmsCIELuvQueryMaxC_shadows)           \
-    $(XcmsQueryBlack_shadows)                \
-    $(XcmsQueryColor_shadows)                \
-    $(XcmsStoreColor_shadows)                \
-    $(XcmsSetWhitePoint_shadows)             \
-    $(XcmsTekHVCQueryMaxC_shadows)           \
-    $(XmbDrawImageString_shadows)            \
-    $(XmbDrawString_shadows)                 \
-    $(XmbDrawText_shadows)                   \
-    $(XmbLookupString_shadows)               \
-    $(XmbResetIC_shadows)                    \
-    $(XmbTextEscapement_shadows)             \
-    $(XmbTextExtents_shadows)                \
-    $(XmbTextPerCharExtents_shadows)
-
-
-AllPlanes_shadows =                         \
-    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
-
-BlackPixelOfScreen_shadows =                \
-    WhitePixelOfScreen                      \
-    CellsOfScreen                           \
-    DefaultColormapOfScreen                 \
-    DefaultDepthOfScreen                    \
-    DefaultGCOfScreen                       \
-    DefaultVisualOfScreen                   \
-    DoesBackingStore                        \
-    DoesSaveUnders                          \
-    DisplayOfScreen                         \
-    XScreenNumberOfScreen                   \
-    EventMaskOfScreen                       \
-    HeightOfScreen                          \
-    HeightMMOfScreen                        \
-    MaxCmapsOfScreen                        \
-    MinCmapsOfScreen                        \
-    PlanesOfScreen                          \
-    RootWindowOfScreen                      \
-    WidthOfScreen                           \
-    WidthMMOfScreen
-
-DisplayOfCCC_shadows =                      \
-    VisualOfCCC                             \
-    ScreenNumberOfCCC                       \
-    ScreenWhitePointOfCCC                   \
-    ClientWhitePointOfCCC
-
-ImageByteOrder_shadows =                    \
-    BitmapBitOrder                          \
-    BitmapPad                               \
-    BitmapUnit                              \
-    DisplayHeight                           \
-    DisplayHeightMM                         \
-    DisplayWidth                            \
-    DisplayWidthMM                          \
-    XListPixmapFormats                      \
-    XPixmapFormatValues
-
-IsCursorKey_shadows =                       \
-    IsFunctionKey                           \
-    IsKeypadKey                             \
-    IsMiscFunctionKey                       \
-    IsModifierKey                           \
-    IsPFKey                                 \
-    IsPrivateKeypadKey
-
-XAllocClassHint_shadows =                   \
-    XSetClassHint                           \
-    XGetClassHint                           \
-    XClassHint
-
-XAllocIconSize_shadows =                    \
-    XSetIconSizes                           \
-    XGetIconSizes                           \
-    XIconSize
-
-XAllocStandardColormap_shadows =            \
-    XSetRGBColormaps                        \
-    XGetRGBColormaps                        \
-    XStandardColormap
-
-XAllocSizeHints_shadows =                   \
-    XSetWMNormalHints                       \
-    XGetWMNormalHints                       \
-    XSetWMSizeHints                         \
-    XGetWMSizeHints                         \
-    XSizeHints
-
-XAllocWMHints_shadows =                     \
-    XSetWMHints                             \
-    XGetWMHints                             \
-    XWMHints
-
-XAddHost_shadows =                          \
-    XAddHosts                               \
-    XListHosts                              \
-    XRemoveHost                             \
-    XRemoveHosts                            \
-    XSetAccessControl                       \
-    XEnableAccessControl                    \
-    XDisableAccessControl                   \
-    XHostAddress
-
-XAllocColor_shadows =                       \
-    XAllocNamedColor                        \
-    XAllocColorCells                        \
-    XAllocColorPlanes                       \
-    XFreeColors
-
-XAnyEvent_shadows =                         \
-    XEvent
-
-XButtonEvent_shadows =                      \
-    XKeyEvent                               \
-    XMotionEvent
-
-XChangeKeyboardControl_shadows =            \
-    XGetKeyboardControl                     \
-    XAutoRepeatOn                           \
-    XAutoRepeatOff                          \
-    XBell                                   \
-    XQueryKeymap                            \
-    XKeyboardControl
-
-XChangeKeyboardMapping_shadows =            \
-    XGetKeyboardMapping                     \
-    XDisplayKeycodes                        \
-    XSetModifierMapping                     \
-    XGetModifierMapping                     \
-    XNewModifiermap                         \
-    XInsertModifiermapEntry                 \
-    XDeleteModifiermapEntry                 \
-    XFreeModifierMap                        \
-    XModifierKeymap
-
-XChangePointerControl_shadows =             \
-    XGetPointerControl
-
-XChangeSaveSet_shadows =                    \
-    XAddToSaveSet                           \
-    XRemoveFromSaveSet
-
-XChangeWindowAttributes_shadows =           \
-    XSetWindowBackground                    \
-    XSetWindowBackgroundPixmap              \
-    XSetWindowBorder                        \
-    XSetWindowBorderPixmap                  \
-    XSetWindowColormap
-
-XClearArea_shadows =                        \
-    XClearWindow
-
-XConfigureWindow_shadows =                  \
-    XMoveWindow                             \
-    XResizeWindow                           \
-    XMoveResizeWindow                       \
-    XSetWindowBorderWidth                   \
-    XWindowChanges
-
-XCopyArea_shadows =                         \
-    XCopyPlane
-
-XCreateColormap_shadows =                   \
-    XCopyColormapAndFree                    \
-    XFreeColormap                           \
-    XColor
-
-XCreateFontCursor_shadows =                 \
-    XCreatePixmapCursor                     \
-    XCreateGlyphCursor
-
-XCreateFontSet_shadows =                    \
-    XFreeFontSet
-
-XCreateGC_shadows =                         \
-    XCopyGC                                 \
-    XChangeGC                               \
-    XGetGCValues                            \
-    XFreeGC                                 \
-    XGContextFromGC                         \
-    XGCValues
-
-XCreateIC_shadows =                         \
-    XDestroyIC                              \
-    XIMOfIC
-
-XInitImage_shadows =                        \
-    XCreateImage                            \
-    XGetPixel                               \
-    XPutPixel                               \
-    XSubImage                               \
-    XAddPixel                               \
-    XDestroyImage
-
-XCreateOC_shadows =                         \
-    XDestroyOC                              \
-    XSetOCValues                            \
-    XGetOCValues                            \
-    XOMOfOC
-
-XCreatePixmap_shadows =                     \
-    XFreePixmap
-
-XCreateRegion_shadows =                     \
-    XSetRegion                              \
-    XDestroyRegion
-
-XCreateWindow_shadows =                     \
-    XCreateSimpleWindow                     \
-    XSetWindowAttributes
-
-XDefineCursor_shadows =                     \
-    XUndefineCursor
-
-XDestroyWindow_shadows =                    \
-    XDestroySubwindows
-
-XDrawArc_shadows =                          \
-    XDrawArcs                               \
-    XArc
-
-XDrawImageString_shadows =                  \
-    XDrawImageString16
-
-XDrawLine_shadows =                         \
-    XDrawLines                              \
-    XDrawSegments                           \
-    XSegment
-
-XDrawPoint_shadows =                        \
-    XDrawPoints                             \
-    XPoint
-
-XDrawRectangle_shadows =                    \
-    XDrawRectangles                         \
-    XRectangle
-
-XDrawString_shadows =                       \
-    XDrawString16
-
-XDrawText_shadows =                         \
-    XDrawText16                             \
-    XTextItem                               \
-    XTextItem16
-
-XEmptyRegion_shadows =                      \
-    XEqualRegion                            \
-    XPointInRegion                          \
-    XRectInRegion
-
-XFillRectangle_shadows =                    \
-    XFillRectangles                         \
-    XFillPolygon                            \
-    XFillArc                                \
-    XFillArcs
-
-XFlush_shadows =                            \
-    XSync                                   \
-    XEventsQueued                           \
-    XPending
-
-XFontsOfFontSet_shadows =                   \
-    XBaseFontNameListOfFontSet              \
-    XLocaleOfFontSet                        \
-    XContextDependentDrawing                \
-    XContextualDrawing                      \
-    XDirectionalDependentDrawing
-
-XGraphicsExposeEvent_shadows =              \
-    XNoExposeEvent
-
-XrmGetFileDatabase_shadows =                \
-    XrmPutFileDatabase                      \
-    XrmGetStringDatabase                    \
-    XrmLocaleOfDatabase                     \
-    XrmGetDatabase                          \
-    XrmSetDatabase                          \
-    XrmDestroyDatabase
-
-XrmGetResource_shadows =                    \
-    XrmQGetResource                         \
-    XrmQGetSearchList                       \
-    XrmQGetSearchResource
-
-XGetEventData_shadows =                     \
-    XFreeEventData                          \
-    XGenericEventCookie
-
-XGetVisualInfo_shadows =                    \
-    XMatchVisualInfo                        \
-    XVisualIDFromVisual                     \
-    XVisualInfo
-
-XGetWindowAttributes_shadows =              \
-    XGetGeometry                            \
-    XWindowAttributes
-
-XGetWindowProperty_shadows =                \
-    XListProperties                         \
-    XChangeProperty                         \
-    XRotateWindowProperties                 \
-    XDeleteProperty
-
-XGrabButton_shadows =                       \
-    XUngrabButton
-
-XGrabKey_shadows =                          \
-    XUngrabKey
-
-XGrabKeyboard_shadows =                     \
-    XUngrabKeyboard
-
-XGrabPointer_shadows =                      \
-    XUngrabPointer                          \
-    XChangeActivePointerGrab
-
-XGrabServer_shadows =                       \
-    XUngrabServer
-
-XIconifyWindow_shadows =                    \
-    XWithdrawWindow                         \
-    XReconfigureWMWindow
-
-XIfEvent_shadows =                          \
-    XCheckIfEvent                           \
-    XPeekIfEvent
-
-XrmInitialize_shadows =                     \
-    XrmParseCommand                         \
-    XrmValue                                \
-    XrmOptionKind                           \
-    XrmOptionDescRec
-
-XInstallColormap_shadows =                  \
-    XUninstallColormap                      \
-    XListInstalledColormaps
-
-XAddConnectionWatch_shadows =               \
-    XRemoveConnectionWatch                  \
-    XProcessInternalConnection              \
-    XInternalConnectionNumbers
-
-XIntersectRegion_shadows =                  \
-    XUnionRegion                            \
-    XUnionRectWithRegion                    \
-    XSubtractRegion                         \
-    XXorRegion                              \
-    XOffsetRegion                           \
-    XShrinkRegion
-
-XInternAtom_shadows =                       \
-    XInternAtoms                            \
-    XGetAtomName                            \
-    XGetAtomNames
-
-XListFonts_shadows =                        \
-    XFreeFontNames                          \
-    XListFontsWithInfo                      \
-    XFreeFontInfo
-
-XLoadFont_shadows =                         \
-    XQueryFont                              \
-    XLoadQueryFont                          \
-    XFreeFont                               \
-    XGetFontProperty                        \
-    XUnloadFont                             \
-    XCharStruct                             \
-    XFontProp                               \
-    XChar2b                                 \
-    XFontStruct
-
-XLookupKeysym_shadows =                     \
-    XRefreshKeyboardMapping                 \
-    XLookupString                           \
-    XRebindKeysym
-
-XrmMergeDatabases_shadows =                 \
-    XrmCombineDatabase                      \
-    XrmCombineFileDatabase
-
-XMapEvent_shadows =                         \
-    XMappingEvent
-
-XMapWindow_shadows =                        \
-    XMapRaised                              \
-    XMapSubwindows
-
-XNextEvent_shadows =                        \
-    XPeekEvent                              \
-    XWindowEvent                            \
-    XCheckWindowEvent                       \
-    XMaskEvent                              \
-    XCheckMaskEvent                         \
-    XCheckTypedEvent                        \
-    XCheckTypedWindowEvent
-
-XOpenDisplay_shadows =                      \
-    XCloseDisplay
-
-XOpenIM_shadows =                           \
-    XCloseIM                                \
-    XSetIMValues                            \
-    XGetIMValues                            \
-    XDisplayOfIM                            \
-    XLocaleOfIM                             \
-    XRegisterIMInstantiateCallback          \
-    XUnregisterIMInstantiateCallback
-
-XOpenOM_shadows =                           \
-    XCloseOM                                \
-    XSetOMValues                            \
-    XGetOMValues                            \
-    XDisplayOfOM                            \
-    XLocaleOfOM
-
-XParseGeometry_shadows =                    \
-    XWMGeometry
-
-XPolygonRegion_shadows =                    \
-    XClipBox
-
-XPutImage_shadows =                         \
-    XGetImage                               \
-    XGetSubImage
-
-XrmPutResource_shadows =                    \
-    XrmQPutResource                         \
-    XrmPutStringResource                    \
-    XrmQPutStringResource                   \
-    XrmPutLineResource
-
-XQueryBestSize_shadows =                    \
-    XQueryBestTile                          \
-    XQueryBestStipple
-
-XQueryColor_shadows =                       \
-    XQueryColors                            \
-    XLookupColor                            \
-    XParseColor
-
-XQueryExtension_shadows =                   \
-    XListExtensions                         \
-    XFreeExtensionList
-
-XResourceManagerString_shadows =            \
-    XScreenResourceString
-
-XRaiseWindow_shadows =                      \
-    XLowerWindow                            \
-    XCirculateSubwindows                    \
-    XCirculateSubwindowsUp                  \
-    XCirculateSubwindowsDown                \
-    XRestackWindows
-
-XReadBitmapFile_shadows =                   \
-    XReadBitmapFileData                     \
-    XWriteBitmapFile                        \
-    XCreatePixmapFromBitmapData             \
-    XCreateBitmapFromData
-
-XRecolorCursor_shadows =                    \
-    XFreeCursor                             \
-    XQueryBestCursor
-
-XSaveContext_shadows =                      \
-    XFindContext                            \
-    XDeleteContext                          \
-    XUniqueContext
-
-XSetICFocus_shadows =                       \
-    XUnsetICFocus
-
-XSetICValues_shadows =                      \
-    XGetICValues
-
-XStringListToTextProperty_shadows =         \
-    XTextPropertyToStringList               \
-    XFreeStringList                         \
-    XTextProperty
-
-XSetArcMode_shadows =                       \
-    XSetSubwindowMode                       \
-    XSetGraphicsExposure
-
-XSetClipOrigin_shadows =                    \
-    XSetClipMask                            \
-    XSetClipRectangles
-
-XSetCloseDownMode_shadows =                 \
-    XKillClient
-
-XSetCommand_shadows =                       \
-    XGetCommand
-
-XSetErrorHandler_shadows =                  \
-    XGetErrorText                           \
-    XDisplayName                            \
-    XSetIOErrorHandler                      \
-    XGetErrorDatabaseText
-
-XSendEvent_shadows =                        \
-    XDisplayMotionBufferSize                \
-    XGetMotionEvents                        \
-    XTimeCoord
-
-XSetFillStyle_shadows =                     \
-    XSetFillRule
-
-XSetFontPath_shadows =                      \
-    XGetFontPath                            \
-    XFreeFontPath
-
-XSetInputFocus_shadows =                    \
-    XGetInputFocus
-
-XSetLineAttributes_shadows =                \
-    XSetDashes
-
-XSetPointerMapping_shadows =                \
-    XGetPointerMapping
-
-XSetScreenSaver_shadows =                   \
-    XForceScreenSaver                       \
-    XActivateScreenSaver                    \
-    XResetScreenSaver                       \
-    XGetScreenSaver
-
-XSetSelectionOwner_shadows =                \
-    XGetSelectionOwner                      \
-    XConvertSelection
-
-XSetState_shadows =                         \
-    XSetFunction                            \
-    XSetPlaneMask                           \
-    XSetForeground                          \
-    XSetBackground
-
-XSetTransientForHint_shadows =              \
-    XGetTransientForHint
-
-XSetTextProperty_shadows =                  \
-    XGetTextProperty
-
-XSetTile_shadows =                          \
-    XSetStipple                             \
-    XSetTSOrigin
-
-XSetWMClientMachine_shadows =               \
-    XGetWMClientMachine
-
-XSetWMColormapWindows_shadows =             \
-    XGetWMColormapWindows
-
-XSetWMIconName_shadows =                    \
-    XGetWMIconName                          \
-    XSetIconName                            \
-    XGetIconName
-
-XSetWMName_shadows =                        \
-    XGetWMName                              \
-    XStoreName                              \
-    XFetchName
-
-XSetWMProperties_shadows =                  \
-    XmbSetWMProperties                      \
-    Xutf8SetWMProperties
-
-XSetWMProtocols_shadows =                   \
-    XGetWMProtocols
-
-XStoreBytes_shadows =                       \
-    XStoreBuffer                            \
-    XFetchBytes                             \
-    XFetchBuffer                            \
-    XRotateBuffers
-
-XStoreColors_shadows =                      \
-    XStoreColor                             \
-    XStoreNamedColor
-
-XStringToKeysym_shadows =                   \
-    XKeysymToString                         \
-    XKeycodeToKeysym                        \
-    XKeysymToKeycode                        \
-    XConvertCase
-
-XSupportsLocale_shadows =                   \
-    XSetLocaleModifiers
-
-XSynchronize_shadows =                      \
-    XSetAfterFunction
-
-XmbTextListToTextProperty_shadows =         \
-    XwcTextListToTextProperty               \
-    Xutf8TextListToTextProperty             \
-    XmbTextPropertyToTextList               \
-    XwcTextPropertyToTextList               \
-    Xutf8TextPropertyToTextList             \
-    XwcFreeStringList                       \
-    XDefaultString
-
-XTextExtents_shadows =                      \
-    XTextExtents16                          \
-    XQueryTextExtents                       \
-    XQueryTextExtents16
-
-XTextWidth_shadows =                        \
-    XTextWidth16
-
-XInitThreads_shadows =                      \
-    XLockDisplay                            \
-    XUnlockDisplay
-
-XrmUniqueQuark_shadows =                    \
-    XrmStringToQuark                        \
-    XrmPermStringToQuark                    \
-    XrmQuarkToString                        \
-    XrmStringToQuarkList                    \
-    XrmStringToBindingQuarkList
-
-XUnmapWindow_shadows =                      \
-    XUnmapSubwindows
-
-XcmsCCCOfColormap_shadows =                 \
-    XcmsSetCCCOfColormap
-
-XcmsAllocColor_shadows =                    \
-    XcmsAllocNamedColor
-
-XcmsColor_shadows =                         \
-    XcmsRGB                                 \
-    XcmsRGBi                                \
-    XcmsCIEXYZ                              \
-    XcmsCIEuvY                              \
-    XcmsCIExyY                              \
-    XcmsCIELab                              \
-    XcmsCIELuv                              \
-    XcmsTekHVC                              \
-    XcmsPad
-
-XcmsCreateCCC_shadows =                     \
-    XcmsFreeCCC
-
-XcmsCIELabQueryMaxC_shadows =               \
-    XcmsCIELabQueryMaxL                     \
-    XcmsCIELabQueryMaxLC                    \
-    XcmsCIELabQueryMinL
-
-XcmsCIELuvQueryMaxC_shadows =               \
-    XcmsCIELuvQueryMaxL                     \
-    XcmsCIELuvQueryMaxLC                    \
-    XcmsCIELuvQueryMinL
-
-XcmsQueryBlack_shadows =                    \
-    XcmsQueryBlue                           \
-    XcmsQueryGreen                          \
-    XcmsQueryRed                            \
-    XcmsQueryWhite
-
-XcmsQueryColor_shadows =                    \
-    XcmsQueryColors                         \
-    XcmsLookupColor
-
-XcmsStoreColor_shadows =                    \
-    XcmsStoreColors
-
-XcmsSetWhitePoint_shadows =                 \
-    XcmsSetWhiteAdjustProc
-
-XcmsTekHVCQueryMaxC_shadows =               \
-    XcmsTekHVCQueryMaxV                     \
-    XcmsTekHVCQueryMaxVC                    \
-    XcmsTekHVCQueryMaxVSamples              \
-    XcmsTekHVCQueryMinV
-
-XmbDrawImageString_shadows =                \
-    XwcDrawImageString                      \
-    Xutf8DrawImageString
-
-XmbDrawString_shadows =                     \
-    XwcDrawString                           \
-    Xutf8DrawString
-
-XmbDrawText_shadows =                       \
-    XwcDrawText                             \
-    Xutf8DrawText
-
-XmbLookupString_shadows =                   \
-    XwcLookupString                         \
-    Xutf8LookupString
-
-XmbResetIC_shadows =                        \
-    XwcResetIC                              \
-    Xutf8ResetIC
-
-XmbTextEscapement_shadows =                 \
-    XwcTextEscapement                       \
-    Xutf8TextEscapement
-
-XmbTextExtents_shadows =                    \
-    XwcTextExtents                          \
-    Xutf8TextExtents
-
-XmbTextPerCharExtents_shadows =             \
-    XwcTextPerCharExtents                   \
-    Xutf8TextPerCharExtents
-
-file_shadows =			            \
-    $(Compose_shadows)
-
-Compose_shadows =			    \
-    XCompose
-
+SUBDIRS = xkb
+
+libmandir = $(LIB_MAN_DIR)
+
+libman_PRE = \
+	$(all_shadows:=.man) \
+	$(file_shadows:=.man) \
+	AllPlanes.man \
+	BlackPixelOfScreen.man \
+	DisplayOfCCC.man \
+	ImageByteOrder.man \
+	IsCursorKey.man \
+	XAddConnectionWatch.man \
+	XAddHost.man \
+	XAllocClassHint.man \
+	XAllocColor.man \
+	XAllocIconSize.man \
+	XAllocSizeHints.man \
+	XAllocStandardColormap.man \
+	XAllocWMHints.man \
+	XAllowEvents.man \
+	XAnyEvent.man \
+	XButtonEvent.man \
+	XChangeKeyboardControl.man \
+	XChangeKeyboardMapping.man \
+	XChangePointerControl.man \
+	XChangeSaveSet.man \
+	XChangeWindowAttributes.man \
+	XCirculateEvent.man \
+	XCirculateRequestEvent.man \
+	XClearArea.man \
+	XClientMessageEvent.man \
+	XcmsAllocColor.man \
+	XcmsCCCOfColormap.man \
+	XcmsCIELabQueryMaxC.man \
+	XcmsCIELuvQueryMaxC.man \
+	XcmsColor.man \
+	XcmsConvertColors.man \
+	XcmsCreateCCC.man \
+	XcmsDefaultCCC.man \
+	XcmsQueryBlack.man \
+	XcmsQueryColor.man \
+	XcmsSetWhitePoint.man \
+	XcmsStoreColor.man \
+	XcmsTekHVCQueryMaxC.man \
+	XColormapEvent.man \
+	XConfigureEvent.man \
+	XConfigureRequestEvent.man \
+	XConfigureWindow.man \
+	XCopyArea.man \
+	XCreateColormap.man \
+	XCreateFontCursor.man \
+	XCreateFontSet.man \
+	XCreateGC.man \
+	XCreateIC.man \
+	XCreateOC.man \
+	XCreatePixmap.man \
+	XCreateRegion.man \
+	XCreateWindowEvent.man \
+	XCreateWindow.man \
+	XCrossingEvent.man \
+	XDefineCursor.man \
+	XDestroyWindowEvent.man \
+	XDestroyWindow.man \
+	XDrawArc.man \
+	XDrawImageString.man \
+	XDrawLine.man \
+	XDrawPoint.man \
+	XDrawRectangle.man \
+	XDrawString.man \
+	XDrawText.man \
+	XEmptyRegion.man \
+	XErrorEvent.man \
+	XExposeEvent.man \
+	XExtentsOfFontSet.man \
+	XFillRectangle.man \
+	XFilterEvent.man \
+	XFlush.man \
+	XFocusChangeEvent.man \
+	XFontSetExtents.man \
+	XFontsOfFontSet.man \
+	XFree.man \
+	XGetEventData.man \
+	XGetVisualInfo.man \
+	XGetWindowAttributes.man \
+	XGetWindowProperty.man \
+	XGetXCBConnection.man \
+	XGrabButton.man \
+	XGrabKeyboard.man \
+	XGrabKey.man \
+	XGrabPointer.man \
+	XGrabServer.man \
+	XGraphicsExposeEvent.man \
+	XGravityEvent.man \
+	XIconifyWindow.man \
+	XIfEvent.man \
+	XInitImage.man \
+	XInitThreads.man \
+	XInstallColormap.man \
+	XInternAtom.man \
+	XIntersectRegion.man \
+	XKeymapEvent.man \
+	XListFonts.man \
+	XLoadFont.man \
+	XLookupKeysym.man \
+	XMapEvent.man \
+	XMapRequestEvent.man \
+	XMapWindow.man \
+	XmbDrawImageString.man \
+	XmbDrawString.man \
+	XmbDrawText.man \
+	XmbLookupString.man \
+	XmbResetIC.man \
+	XmbTextEscapement.man \
+	XmbTextExtents.man \
+	XmbTextListToTextProperty.man \
+	XmbTextPerCharExtents.man \
+	XNextEvent.man \
+	XNoOp.man \
+	XOpenDisplay.man \
+	XOpenIM.man \
+	XOpenOM.man \
+	XParseGeometry.man \
+	XPolygonRegion.man \
+	XPropertyEvent.man \
+	XPutBackEvent.man \
+	XPutImage.man \
+	XQueryBestSize.man \
+	XQueryColor.man \
+	XQueryExtension.man \
+	XQueryPointer.man \
+	XQueryTree.man \
+	XRaiseWindow.man \
+	XReadBitmapFile.man \
+	XRecolorCursor.man \
+	XReparentEvent.man \
+	XReparentWindow.man \
+	XResizeRequestEvent.man \
+	XResourceManagerString.man \
+	XrmEnumerateDatabase.man \
+	XrmGetFileDatabase.man \
+	XrmGetResource.man \
+	XrmInitialize.man \
+	XrmMergeDatabases.man \
+	XrmPutResource.man \
+	XrmUniqueQuark.man \
+	XSaveContext.man \
+	XSelectInput.man \
+	XSelectionClearEvent.man \
+	XSelectionEvent.man \
+	XSelectionRequestEvent.man \
+	XSendEvent.man \
+	XSetArcMode.man \
+	XSetClipOrigin.man \
+	XSetCloseDownMode.man \
+	XSetCommand.man \
+	XSetErrorHandler.man \
+	XSetEventQueueOwner.man \
+	XSetFillStyle.man \
+	XSetFont.man \
+	XSetFontPath.man \
+	XSetICFocus.man \
+	XSetICValues.man \
+	XSetInputFocus.man \
+	XSetLineAttributes.man \
+	XSetPointerMapping.man \
+	XSetScreenSaver.man \
+	XSetSelectionOwner.man \
+	XSetState.man \
+	XSetTextProperty.man \
+	XSetTile.man \
+	XSetTransientForHint.man \
+	XSetWMClientMachine.man \
+	XSetWMColormapWindows.man \
+	XSetWMIconName.man \
+	XSetWMName.man \
+	XSetWMProperties.man \
+	XSetWMProtocols.man \
+	XStoreBytes.man \
+	XStoreColors.man \
+	XStringListToTextProperty.man \
+	XStringToKeysym.man \
+	XSupportsLocale.man \
+	XSynchronize.man \
+	XTextExtents.man \
+	XTextWidth.man \
+	XTranslateCoordinates.man \
+	XUnmapEvent.man \
+	XUnmapWindow.man \
+	XVaCreateNestedList.man \
+	XVisibilityEvent.man \
+	XWarpPointer.man
+
+filemandir = $(FILE_MAN_DIR)
+fileman_PRE = Compose.man
+
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
+	      $(all_shadows:=.@LIB_MAN_SUFFIX@)
+
+fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \
+	       $(file_shadows:=.@FILE_MAN_SUFFIX@)
+
+EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
+
+CLEANFILES = $(libman_DATA) $(fileman_DATA)
+
+SUFFIXES = .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
+
+MAN_SUBSTS += -e 's|__xlocaledir__|$(X11_LOCALEDATADIR)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
+all_shadows =                                \
+    $(AllPlanes_shadows)                     \
+    $(BlackPixelOfScreen_shadows)            \
+    $(DisplayOfCCC_shadows)                  \
+    $(ImageByteOrder_shadows)                \
+    $(IsCursorKey_shadows)                   \
+    $(XAllocClassHint_shadows)               \
+    $(XAllocIconSize_shadows)                \
+    $(XAllocStandardColormap_shadows)        \
+    $(XAllocSizeHints_shadows)               \
+    $(XAllocWMHints_shadows)                 \
+    $(XAddHost_shadows)                      \
+    $(XAllocColor_shadows)                   \
+    $(XAnyEvent_shadows)                     \
+    $(XButtonEvent_shadows)                  \
+    $(XChangeKeyboardControl_shadows)        \
+    $(XChangeKeyboardMapping_shadows)        \
+    $(XChangePointerControl_shadows)         \
+    $(XChangeSaveSet_shadows)                \
+    $(XChangeWindowAttributes_shadows)       \
+    $(XClearArea_shadows)                    \
+    $(XConfigureWindow_shadows)              \
+    $(XCopyArea_shadows)                     \
+    $(XCreateColormap_shadows)               \
+    $(XCreateFontCursor_shadows)             \
+    $(XCreateFontSet_shadows)                \
+    $(XCreateGC_shadows)                     \
+    $(XCreateIC_shadows)                     \
+    $(XInitImage_shadows)                    \
+    $(XCreateOC_shadows)                     \
+    $(XCreatePixmap_shadows)                 \
+    $(XCreateRegion_shadows)                 \
+    $(XCreateWindow_shadows)                 \
+    $(XDefineCursor_shadows)                 \
+    $(XDestroyWindow_shadows)                \
+    $(XDrawArc_shadows)                      \
+    $(XDrawImageString_shadows)              \
+    $(XDrawLine_shadows)                     \
+    $(XDrawPoint_shadows)                    \
+    $(XDrawRectangle_shadows)                \
+    $(XDrawString_shadows)                   \
+    $(XDrawText_shadows)                     \
+    $(XEmptyRegion_shadows)                  \
+    $(XFillRectangle_shadows)                \
+    $(XFlush_shadows)                        \
+    $(XFontsOfFontSet_shadows)               \
+    $(XGraphicsExposeEvent_shadows)          \
+    $(XrmGetFileDatabase_shadows)            \
+    $(XrmGetResource_shadows)                \
+    $(XGetEventData_shadows)                 \
+    $(XGetVisualInfo_shadows)                \
+    $(XGetWindowAttributes_shadows)          \
+    $(XGetWindowProperty_shadows)            \
+    $(XGrabButton_shadows)                   \
+    $(XGrabKey_shadows)                      \
+    $(XGrabKeyboard_shadows)                 \
+    $(XGrabPointer_shadows)                  \
+    $(XGrabServer_shadows)                   \
+    $(XIconifyWindow_shadows)                \
+    $(XIfEvent_shadows)                      \
+    $(XrmInitialize_shadows)                 \
+    $(XInstallColormap_shadows)              \
+    $(XAddConnectionWatch_shadows)           \
+    $(XIntersectRegion_shadows)              \
+    $(XInternAtom_shadows)                   \
+    $(XListFonts_shadows)                    \
+    $(XLoadFont_shadows)                     \
+    $(XLookupKeysym_shadows)                 \
+    $(XrmMergeDatabases_shadows)             \
+    $(XMapEvent_shadows)                     \
+    $(XMapWindow_shadows)                    \
+    $(XNextEvent_shadows)                    \
+    $(XOpenDisplay_shadows)                  \
+    $(XOpenIM_shadows)                       \
+    $(XOpenOM_shadows)                       \
+    $(XParseGeometry_shadows)                \
+    $(XPolygonRegion_shadows)                \
+    $(XPutImage_shadows)                     \
+    $(XrmPutResource_shadows)                \
+    $(XQueryBestSize_shadows)                \
+    $(XQueryColor_shadows)                   \
+    $(XQueryExtension_shadows)               \
+    $(XResourceManagerString_shadows)        \
+    $(XRaiseWindow_shadows)                  \
+    $(XReadBitmapFile_shadows)               \
+    $(XRecolorCursor_shadows)                \
+    $(XSaveContext_shadows)                  \
+    $(XSetICFocus_shadows)                   \
+    $(XSetICValues_shadows)                  \
+    $(XStringListToTextProperty_shadows)     \
+    $(XSetArcMode_shadows)                   \
+    $(XSetClipOrigin_shadows)                \
+    $(XSetCloseDownMode_shadows)             \
+    $(XSetCommand_shadows)                   \
+    $(XSetErrorHandler_shadows)              \
+    $(XSendEvent_shadows)                    \
+    $(XSetFillStyle_shadows)                 \
+    $(XSetFontPath_shadows)                  \
+    $(XSetInputFocus_shadows)                \
+    $(XSetLineAttributes_shadows)            \
+    $(XSetPointerMapping_shadows)            \
+    $(XSetScreenSaver_shadows)               \
+    $(XSetSelectionOwner_shadows)            \
+    $(XSetState_shadows)                     \
+    $(XSetTransientForHint_shadows)          \
+    $(XSetTextProperty_shadows)              \
+    $(XSetTile_shadows)                      \
+    $(XSetWMClientMachine_shadows)           \
+    $(XSetWMColormapWindows_shadows)         \
+    $(XSetWMIconName_shadows)                \
+    $(XSetWMName_shadows)                    \
+    $(XSetWMProperties_shadows)              \
+    $(XSetWMProtocols_shadows)               \
+    $(XStoreBytes_shadows)                   \
+    $(XStoreColors_shadows)                  \
+    $(XStringToKeysym_shadows)               \
+    $(XSupportsLocale_shadows)               \
+    $(XSynchronize_shadows)                  \
+    $(XmbTextListToTextProperty_shadows)     \
+    $(XTextExtents_shadows)                  \
+    $(XTextWidth_shadows)                    \
+    $(XInitThreads_shadows)                  \
+    $(XrmUniqueQuark_shadows)                \
+    $(XUnmapWindow_shadows)                  \
+    $(XcmsCCCOfColormap_shadows)             \
+    $(XcmsAllocColor_shadows)                \
+    $(XcmsColor_shadows)                     \
+    $(XcmsCreateCCC_shadows)                 \
+    $(XcmsCIELabQueryMaxC_shadows)           \
+    $(XcmsCIELuvQueryMaxC_shadows)           \
+    $(XcmsQueryBlack_shadows)                \
+    $(XcmsQueryColor_shadows)                \
+    $(XcmsStoreColor_shadows)                \
+    $(XcmsSetWhitePoint_shadows)             \
+    $(XcmsTekHVCQueryMaxC_shadows)           \
+    $(XmbDrawImageString_shadows)            \
+    $(XmbDrawString_shadows)                 \
+    $(XmbDrawText_shadows)                   \
+    $(XmbLookupString_shadows)               \
+    $(XmbResetIC_shadows)                    \
+    $(XmbTextEscapement_shadows)             \
+    $(XmbTextExtents_shadows)                \
+    $(XmbTextPerCharExtents_shadows)
+
+
+AllPlanes_shadows =                         \
+    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
+
+BlackPixelOfScreen_shadows =                \
+    WhitePixelOfScreen                      \
+    CellsOfScreen                           \
+    DefaultColormapOfScreen                 \
+    DefaultDepthOfScreen                    \
+    DefaultGCOfScreen                       \
+    DefaultVisualOfScreen                   \
+    DoesBackingStore                        \
+    DoesSaveUnders                          \
+    DisplayOfScreen                         \
+    XScreenNumberOfScreen                   \
+    EventMaskOfScreen                       \
+    HeightOfScreen                          \
+    HeightMMOfScreen                        \
+    MaxCmapsOfScreen                        \
+    MinCmapsOfScreen                        \
+    PlanesOfScreen                          \
+    RootWindowOfScreen                      \
+    WidthOfScreen                           \
+    WidthMMOfScreen
+
+DisplayOfCCC_shadows =                      \
+    VisualOfCCC                             \
+    ScreenNumberOfCCC                       \
+    ScreenWhitePointOfCCC                   \
+    ClientWhitePointOfCCC
+
+ImageByteOrder_shadows =                    \
+    BitmapBitOrder                          \
+    BitmapPad                               \
+    BitmapUnit                              \
+    DisplayHeight                           \
+    DisplayHeightMM                         \
+    DisplayWidth                            \
+    DisplayWidthMM                          \
+    XListPixmapFormats                      \
+    XPixmapFormatValues
+
+IsCursorKey_shadows =                       \
+    IsFunctionKey                           \
+    IsKeypadKey                             \
+    IsMiscFunctionKey                       \
+    IsModifierKey                           \
+    IsPFKey                                 \
+    IsPrivateKeypadKey
+
+XAllocClassHint_shadows =                   \
+    XSetClassHint                           \
+    XGetClassHint                           \
+    XClassHint
+
+XAllocIconSize_shadows =                    \
+    XSetIconSizes                           \
+    XGetIconSizes                           \
+    XIconSize
+
+XAllocStandardColormap_shadows =            \
+    XSetRGBColormaps                        \
+    XGetRGBColormaps                        \
+    XStandardColormap
+
+XAllocSizeHints_shadows =                   \
+    XSetWMNormalHints                       \
+    XGetWMNormalHints                       \
+    XSetWMSizeHints                         \
+    XGetWMSizeHints                         \
+    XSizeHints
+
+XAllocWMHints_shadows =                     \
+    XSetWMHints                             \
+    XGetWMHints                             \
+    XWMHints
+
+XAddHost_shadows =                          \
+    XAddHosts                               \
+    XListHosts                              \
+    XRemoveHost                             \
+    XRemoveHosts                            \
+    XSetAccessControl                       \
+    XEnableAccessControl                    \
+    XDisableAccessControl                   \
+    XHostAddress
+
+XAllocColor_shadows =                       \
+    XAllocNamedColor                        \
+    XAllocColorCells                        \
+    XAllocColorPlanes                       \
+    XFreeColors
+
+XAnyEvent_shadows =                         \
+    XEvent
+
+XButtonEvent_shadows =                      \
+    XKeyEvent                               \
+    XMotionEvent
+
+XChangeKeyboardControl_shadows =            \
+    XGetKeyboardControl                     \
+    XAutoRepeatOn                           \
+    XAutoRepeatOff                          \
+    XBell                                   \
+    XQueryKeymap                            \
+    XKeyboardControl
+
+XChangeKeyboardMapping_shadows =            \
+    XGetKeyboardMapping                     \
+    XDisplayKeycodes                        \
+    XSetModifierMapping                     \
+    XGetModifierMapping                     \
+    XNewModifiermap                         \
+    XInsertModifiermapEntry                 \
+    XDeleteModifiermapEntry                 \
+    XFreeModifiermap                        \
+    XModifierKeymap
+
+XChangePointerControl_shadows =             \
+    XGetPointerControl
+
+XChangeSaveSet_shadows =                    \
+    XAddToSaveSet                           \
+    XRemoveFromSaveSet
+
+XChangeWindowAttributes_shadows =           \
+    XSetWindowBackground                    \
+    XSetWindowBackgroundPixmap              \
+    XSetWindowBorder                        \
+    XSetWindowBorderPixmap                  \
+    XSetWindowColormap
+
+XClearArea_shadows =                        \
+    XClearWindow
+
+XConfigureWindow_shadows =                  \
+    XMoveWindow                             \
+    XResizeWindow                           \
+    XMoveResizeWindow                       \
+    XSetWindowBorderWidth                   \
+    XWindowChanges
+
+XCopyArea_shadows =                         \
+    XCopyPlane
+
+XCreateColormap_shadows =                   \
+    XCopyColormapAndFree                    \
+    XFreeColormap                           \
+    XColor
+
+XCreateFontCursor_shadows =                 \
+    XCreatePixmapCursor                     \
+    XCreateGlyphCursor
+
+XCreateFontSet_shadows =                    \
+    XFreeFontSet
+
+XCreateGC_shadows =                         \
+    XCopyGC                                 \
+    XChangeGC                               \
+    XGetGCValues                            \
+    XFreeGC                                 \
+    XGContextFromGC                         \
+    XGCValues
+
+XCreateIC_shadows =                         \
+    XDestroyIC                              \
+    XIMOfIC
+
+XInitImage_shadows =                        \
+    XCreateImage                            \
+    XGetPixel                               \
+    XPutPixel                               \
+    XSubImage                               \
+    XAddPixel                               \
+    XDestroyImage
+
+XCreateOC_shadows =                         \
+    XDestroyOC                              \
+    XSetOCValues                            \
+    XGetOCValues                            \
+    XOMOfOC
+
+XCreatePixmap_shadows =                     \
+    XFreePixmap
+
+XCreateRegion_shadows =                     \
+    XSetRegion                              \
+    XDestroyRegion
+
+XCreateWindow_shadows =                     \
+    XCreateSimpleWindow                     \
+    XSetWindowAttributes
+
+XDefineCursor_shadows =                     \
+    XUndefineCursor
+
+XDestroyWindow_shadows =                    \
+    XDestroySubwindows
+
+XDrawArc_shadows =                          \
+    XDrawArcs                               \
+    XArc
+
+XDrawImageString_shadows =                  \
+    XDrawImageString16
+
+XDrawLine_shadows =                         \
+    XDrawLines                              \
+    XDrawSegments                           \
+    XSegment
+
+XDrawPoint_shadows =                        \
+    XDrawPoints                             \
+    XPoint
+
+XDrawRectangle_shadows =                    \
+    XDrawRectangles                         \
+    XRectangle
+
+XDrawString_shadows =                       \
+    XDrawString16
+
+XDrawText_shadows =                         \
+    XDrawText16                             \
+    XTextItem                               \
+    XTextItem16
+
+XEmptyRegion_shadows =                      \
+    XEqualRegion                            \
+    XPointInRegion                          \
+    XRectInRegion
+
+XFillRectangle_shadows =                    \
+    XFillRectangles                         \
+    XFillPolygon                            \
+    XFillArc                                \
+    XFillArcs
+
+XFlush_shadows =                            \
+    XSync                                   \
+    XEventsQueued                           \
+    XPending
+
+XFontsOfFontSet_shadows =                   \
+    XBaseFontNameListOfFontSet              \
+    XLocaleOfFontSet                        \
+    XContextDependentDrawing                \
+    XContextualDrawing                      \
+    XDirectionalDependentDrawing
+
+XGraphicsExposeEvent_shadows =              \
+    XNoExposeEvent
+
+XrmGetFileDatabase_shadows =                \
+    XrmPutFileDatabase                      \
+    XrmGetStringDatabase                    \
+    XrmLocaleOfDatabase                     \
+    XrmGetDatabase                          \
+    XrmSetDatabase                          \
+    XrmDestroyDatabase
+
+XrmGetResource_shadows =                    \
+    XrmQGetResource                         \
+    XrmQGetSearchList                       \
+    XrmQGetSearchResource
+
+XGetEventData_shadows =                     \
+    XFreeEventData                          \
+    XGenericEventCookie
+
+XGetVisualInfo_shadows =                    \
+    XMatchVisualInfo                        \
+    XVisualIDFromVisual                     \
+    XVisualInfo
+
+XGetWindowAttributes_shadows =              \
+    XGetGeometry                            \
+    XWindowAttributes
+
+XGetWindowProperty_shadows =                \
+    XListProperties                         \
+    XChangeProperty                         \
+    XRotateWindowProperties                 \
+    XDeleteProperty
+
+XGrabButton_shadows =                       \
+    XUngrabButton
+
+XGrabKey_shadows =                          \
+    XUngrabKey
+
+XGrabKeyboard_shadows =                     \
+    XUngrabKeyboard
+
+XGrabPointer_shadows =                      \
+    XUngrabPointer                          \
+    XChangeActivePointerGrab
+
+XGrabServer_shadows =                       \
+    XUngrabServer
+
+XIconifyWindow_shadows =                    \
+    XWithdrawWindow                         \
+    XReconfigureWMWindow
+
+XIfEvent_shadows =                          \
+    XCheckIfEvent                           \
+    XPeekIfEvent
+
+XrmInitialize_shadows =                     \
+    XrmParseCommand                         \
+    XrmValue                                \
+    XrmOptionKind                           \
+    XrmOptionDescRec
+
+XInstallColormap_shadows =                  \
+    XUninstallColormap                      \
+    XListInstalledColormaps
+
+XAddConnectionWatch_shadows =               \
+    XRemoveConnectionWatch                  \
+    XProcessInternalConnection              \
+    XInternalConnectionNumbers
+
+XIntersectRegion_shadows =                  \
+    XUnionRegion                            \
+    XUnionRectWithRegion                    \
+    XSubtractRegion                         \
+    XXorRegion                              \
+    XOffsetRegion                           \
+    XShrinkRegion
+
+XInternAtom_shadows =                       \
+    XInternAtoms                            \
+    XGetAtomName                            \
+    XGetAtomNames
+
+XListFonts_shadows =                        \
+    XFreeFontNames                          \
+    XListFontsWithInfo                      \
+    XFreeFontInfo
+
+XLoadFont_shadows =                         \
+    XQueryFont                              \
+    XLoadQueryFont                          \
+    XFreeFont                               \
+    XGetFontProperty                        \
+    XUnloadFont                             \
+    XCharStruct                             \
+    XFontProp                               \
+    XChar2b                                 \
+    XFontStruct
+
+XLookupKeysym_shadows =                     \
+    XRefreshKeyboardMapping                 \
+    XLookupString                           \
+    XRebindKeysym
+
+XrmMergeDatabases_shadows =                 \
+    XrmCombineDatabase                      \
+    XrmCombineFileDatabase
+
+XMapEvent_shadows =                         \
+    XMappingEvent
+
+XMapWindow_shadows =                        \
+    XMapRaised                              \
+    XMapSubwindows
+
+XNextEvent_shadows =                        \
+    XPeekEvent                              \
+    XWindowEvent                            \
+    XCheckWindowEvent                       \
+    XMaskEvent                              \
+    XCheckMaskEvent                         \
+    XCheckTypedEvent                        \
+    XCheckTypedWindowEvent
+
+XOpenDisplay_shadows =                      \
+    XCloseDisplay
+
+XOpenIM_shadows =                           \
+    XCloseIM                                \
+    XSetIMValues                            \
+    XGetIMValues                            \
+    XDisplayOfIM                            \
+    XLocaleOfIM                             \
+    XRegisterIMInstantiateCallback          \
+    XUnregisterIMInstantiateCallback
+
+XOpenOM_shadows =                           \
+    XCloseOM                                \
+    XSetOMValues                            \
+    XGetOMValues                            \
+    XDisplayOfOM                            \
+    XLocaleOfOM
+
+XParseGeometry_shadows =                    \
+    XWMGeometry
+
+XPolygonRegion_shadows =                    \
+    XClipBox
+
+XPutImage_shadows =                         \
+    XGetImage                               \
+    XGetSubImage
+
+XrmPutResource_shadows =                    \
+    XrmQPutResource                         \
+    XrmPutStringResource                    \
+    XrmQPutStringResource                   \
+    XrmPutLineResource
+
+XQueryBestSize_shadows =                    \
+    XQueryBestTile                          \
+    XQueryBestStipple
+
+XQueryColor_shadows =                       \
+    XQueryColors                            \
+    XLookupColor                            \
+    XParseColor
+
+XQueryExtension_shadows =                   \
+    XListExtensions                         \
+    XFreeExtensionList
+
+XResourceManagerString_shadows =            \
+    XScreenResourceString
+
+XRaiseWindow_shadows =                      \
+    XLowerWindow                            \
+    XCirculateSubwindows                    \
+    XCirculateSubwindowsUp                  \
+    XCirculateSubwindowsDown                \
+    XRestackWindows
+
+XReadBitmapFile_shadows =                   \
+    XReadBitmapFileData                     \
+    XWriteBitmapFile                        \
+    XCreatePixmapFromBitmapData             \
+    XCreateBitmapFromData
+
+XRecolorCursor_shadows =                    \
+    XFreeCursor                             \
+    XQueryBestCursor
+
+XSaveContext_shadows =                      \
+    XFindContext                            \
+    XDeleteContext                          \
+    XUniqueContext
+
+XSetICFocus_shadows =                       \
+    XUnsetICFocus
+
+XSetICValues_shadows =                      \
+    XGetICValues
+
+XStringListToTextProperty_shadows =         \
+    XTextPropertyToStringList               \
+    XFreeStringList                         \
+    XTextProperty
+
+XSetArcMode_shadows =                       \
+    XSetSubwindowMode                       \
+    XSetGraphicsExposure
+
+XSetClipOrigin_shadows =                    \
+    XSetClipMask                            \
+    XSetClipRectangles
+
+XSetCloseDownMode_shadows =                 \
+    XKillClient
+
+XSetCommand_shadows =                       \
+    XGetCommand
+
+XSetErrorHandler_shadows =                  \
+    XGetErrorText                           \
+    XDisplayName                            \
+    XSetIOErrorHandler                      \
+    XGetErrorDatabaseText
+
+XSendEvent_shadows =                        \
+    XDisplayMotionBufferSize                \
+    XGetMotionEvents                        \
+    XTimeCoord
+
+XSetFillStyle_shadows =                     \
+    XSetFillRule
+
+XSetFontPath_shadows =                      \
+    XGetFontPath                            \
+    XFreeFontPath
+
+XSetInputFocus_shadows =                    \
+    XGetInputFocus
+
+XSetLineAttributes_shadows =                \
+    XSetDashes
+
+XSetPointerMapping_shadows =                \
+    XGetPointerMapping
+
+XSetScreenSaver_shadows =                   \
+    XForceScreenSaver                       \
+    XActivateScreenSaver                    \
+    XResetScreenSaver                       \
+    XGetScreenSaver
+
+XSetSelectionOwner_shadows =                \
+    XGetSelectionOwner                      \
+    XConvertSelection
+
+XSetState_shadows =                         \
+    XSetFunction                            \
+    XSetPlaneMask                           \
+    XSetForeground                          \
+    XSetBackground
+
+XSetTransientForHint_shadows =              \
+    XGetTransientForHint
+
+XSetTextProperty_shadows =                  \
+    XGetTextProperty
+
+XSetTile_shadows =                          \
+    XSetStipple                             \
+    XSetTSOrigin
+
+XSetWMClientMachine_shadows =               \
+    XGetWMClientMachine
+
+XSetWMColormapWindows_shadows =             \
+    XGetWMColormapWindows
+
+XSetWMIconName_shadows =                    \
+    XGetWMIconName                          \
+    XSetIconName                            \
+    XGetIconName
+
+XSetWMName_shadows =                        \
+    XGetWMName                              \
+    XStoreName                              \
+    XFetchName
+
+XSetWMProperties_shadows =                  \
+    XmbSetWMProperties                      \
+    Xutf8SetWMProperties
+
+XSetWMProtocols_shadows =                   \
+    XGetWMProtocols
+
+XStoreBytes_shadows =                       \
+    XStoreBuffer                            \
+    XFetchBytes                             \
+    XFetchBuffer                            \
+    XRotateBuffers
+
+XStoreColors_shadows =                      \
+    XStoreColor                             \
+    XStoreNamedColor
+
+XStringToKeysym_shadows =                   \
+    XKeysymToString                         \
+    XKeycodeToKeysym                        \
+    XKeysymToKeycode                        \
+    XConvertCase
+
+XSupportsLocale_shadows =                   \
+    XSetLocaleModifiers
+
+XSynchronize_shadows =                      \
+    XSetAfterFunction
+
+XmbTextListToTextProperty_shadows =         \
+    XwcTextListToTextProperty               \
+    Xutf8TextListToTextProperty             \
+    XmbTextPropertyToTextList               \
+    XwcTextPropertyToTextList               \
+    Xutf8TextPropertyToTextList             \
+    XwcFreeStringList                       \
+    XDefaultString
+
+XTextExtents_shadows =                      \
+    XTextExtents16                          \
+    XQueryTextExtents                       \
+    XQueryTextExtents16
+
+XTextWidth_shadows =                        \
+    XTextWidth16
+
+XInitThreads_shadows =                      \
+    XLockDisplay                            \
+    XUnlockDisplay
+
+XrmUniqueQuark_shadows =                    \
+    XrmStringToQuark                        \
+    XrmPermStringToQuark                    \
+    XrmQuarkToString                        \
+    XrmStringToQuarkList                    \
+    XrmStringToBindingQuarkList
+
+XUnmapWindow_shadows =                      \
+    XUnmapSubwindows
+
+XcmsCCCOfColormap_shadows =                 \
+    XcmsSetCCCOfColormap
+
+XcmsAllocColor_shadows =                    \
+    XcmsAllocNamedColor
+
+XcmsColor_shadows =                         \
+    XcmsRGB                                 \
+    XcmsRGBi                                \
+    XcmsCIEXYZ                              \
+    XcmsCIEuvY                              \
+    XcmsCIExyY                              \
+    XcmsCIELab                              \
+    XcmsCIELuv                              \
+    XcmsTekHVC                              \
+    XcmsPad
+
+XcmsCreateCCC_shadows =                     \
+    XcmsFreeCCC
+
+XcmsCIELabQueryMaxC_shadows =               \
+    XcmsCIELabQueryMaxL                     \
+    XcmsCIELabQueryMaxLC                    \
+    XcmsCIELabQueryMinL
+
+XcmsCIELuvQueryMaxC_shadows =               \
+    XcmsCIELuvQueryMaxL                     \
+    XcmsCIELuvQueryMaxLC                    \
+    XcmsCIELuvQueryMinL
+
+XcmsQueryBlack_shadows =                    \
+    XcmsQueryBlue                           \
+    XcmsQueryGreen                          \
+    XcmsQueryRed                            \
+    XcmsQueryWhite
+
+XcmsQueryColor_shadows =                    \
+    XcmsQueryColors                         \
+    XcmsLookupColor
+
+XcmsStoreColor_shadows =                    \
+    XcmsStoreColors
+
+XcmsSetWhitePoint_shadows =                 \
+    XcmsSetWhiteAdjustProc
+
+XcmsTekHVCQueryMaxC_shadows =               \
+    XcmsTekHVCQueryMaxV                     \
+    XcmsTekHVCQueryMaxVC                    \
+    XcmsTekHVCQueryMaxVSamples              \
+    XcmsTekHVCQueryMinV
+
+XmbDrawImageString_shadows =                \
+    XwcDrawImageString                      \
+    Xutf8DrawImageString
+
+XmbDrawString_shadows =                     \
+    XwcDrawString                           \
+    Xutf8DrawString
+
+XmbDrawText_shadows =                       \
+    XwcDrawText                             \
+    Xutf8DrawText
+
+XmbLookupString_shadows =                   \
+    XwcLookupString                         \
+    Xutf8LookupString
+
+XmbResetIC_shadows =                        \
+    XwcResetIC                              \
+    Xutf8ResetIC
+
+XmbTextEscapement_shadows =                 \
+    XwcTextEscapement                       \
+    Xutf8TextEscapement
+
+XmbTextExtents_shadows =                    \
+    XwcTextExtents                          \
+    Xutf8TextExtents
+
+XmbTextPerCharExtents_shadows =             \
+    XwcTextPerCharExtents                   \
+    Xutf8TextPerCharExtents
+
+file_shadows =			            \
+    $(Compose_shadows)
+
+Compose_shadows =			    \
+    XCompose
+
diff --git a/libX11/man/XChangeKeyboardMapping.man b/libX11/man/XChangeKeyboardMapping.man
index d4bb9a02f..71b7a9142 100644
--- a/libX11/man/XChangeKeyboardMapping.man
+++ b/libX11/man/XChangeKeyboardMapping.man
@@ -141,7 +141,7 @@
 .ny0
 .TH XChangeKeyboardMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifierMap XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure
+XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifiermap, XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure
 .SH SYNTAX
 .HP
 int XChangeKeyboardMapping(\^Display *\fIdisplay\fP, int \fIfirst_keycode\fP,
diff --git a/libX11/man/xkb/XkbPtrActionX.man b/libX11/man/xkb/XkbPtrActionX.man
index fcb353001..7116185c4 100644
--- a/libX11/man/xkb/XkbPtrActionX.man
+++ b/libX11/man/xkb/XkbPtrActionX.man
@@ -1,104 +1,104 @@
-'\" t
-.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbPtrActionX __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbPtrActionX \- Returns the high_XXX and low_XXX fields of act converted to a 
-signed int
-.SH SYNOPSIS
-.HP
-.B int XkbPtrActionX
-.BI "(\^XkbPtrAction " "act" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- act
-action from which to extract X
-.SH DESCRIPTION
-.LP
-Actions associated with the XkbPtrAction structure move the pointer when keys 
-are pressed and released.
-
-If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
-treated as though the action is XkbSA_NoAction.
-
-If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
-instructs the server to generate core pointer MotionNotify events rather than 
-the usual KeyPress event, and the corresponding KeyRelease event disables any 
-mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
-action.
-
-The 
-.I type 
-field of the XkbPtrAction structure is always XkbSA_MovePtr.
-
-The 
-.I flags 
-field is a bitwise inclusive OR of the masks shown in Table 1.
-
-.TS
-c s
-l l
-l lw(4i).
-Table 1 Pointer Action Types
-_
-Action Type	Meaning
-_
-XkbSA_NoAcceleration	T{
-If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
-mouse keys timer for this key; every time the timer expires, the cursor moves.
-T}
-XkbSA_MoveAbsoluteX	T{
-If set, the X portion of the structure specifies the new pointer X coordinate. 
-Otherwise, the X portion is added to the current pointer X coordinate to 
-determine the new pointer X coordinate.
-T}
-XkbSA_MoveAbsoluteY	T{
-If set, the Y portion of the structure specifies the new pointer Y coordinate. 
-Otherwise, the Y portion is added to the current pointer Y coordinate to 
-determine the new pointer Y coordinate.
-T}
-.TE
-
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
-two signed 16-bit values, that is, the X coordinate is composed of 
-.I high_XXX 
-and 
-.I low_XXX, 
-and similarly for the Y coordinate. Xkb provides the following macros, to 
-convert between a signed integer and two signed 16-bit values in XkbPtrAction 
-structures.
-.SH STRUCTURES
-.LP
-.nf
-
-    typedef struct _XkbPtrAction {
-        unsigned char    type;         /\(** XkbSA_MovePtr */
-        unsigned char    flags;        /\(** determines type of pointer motion */
-        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
-        unsigned char    low_XXX;      /\(** y coordinate, low bits */
-        unsigned char    high_YYY;     /\(** x coordinate, high bits */
-        unsigned char    low_YYY;      /\(** y coordinate, low bits */
-    } XkbPtrAction;
-
-.fi    
+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbPtrActionX __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbPtrActionX \- Returns the high_XXX and low_XXX fields of act converted to a 
+signed int
+.SH SYNOPSIS
+.HP
+.B int XkbPtrActionX
+.BI "(\^XkbPtrAction " "act" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- act
+action from which to extract X
+.SH DESCRIPTION
+.LP
+Actions associated with the XkbPtrAction structure move the pointer when keys 
+are pressed and released.
+
+If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
+treated as though the action is XkbSA_NoAction.
+
+If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
+instructs the server to generate core pointer MotionNotify events rather than 
+the usual KeyPress event, and the corresponding KeyRelease event disables any 
+mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
+action.
+
+The 
+.I type 
+field of the XkbPtrAction structure is always XkbSA_MovePtr.
+
+The 
+.I flags 
+field is a bitwise inclusive OR of the masks shown in Table 1.
+
+.TS
+c s
+l l
+l lw(4i).
+Table 1 Pointer Action Types
+_
+Action Type	Meaning
+_
+XkbSA_NoAcceleration	T{
+If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
+mouse keys timer for this key; every time the timer expires, the cursor moves.
+T}
+XkbSA_MoveAbsoluteX	T{
+If set, the X portion of the structure specifies the new pointer X coordinate. 
+Otherwise, the X portion is added to the current pointer X coordinate to 
+determine the new pointer X coordinate.
+T}
+XkbSA_MoveAbsoluteY	T{
+If set, the Y portion of the structure specifies the new pointer Y coordinate. 
+Otherwise, the Y portion is added to the current pointer Y coordinate to 
+determine the new pointer Y coordinate.
+T}
+.TE
+
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
+two signed 16-bit values, that is, the X coordinate is composed of 
+.I high_XXX 
+and 
+.I low_XXX, 
+and similarly for the Y coordinate. Xkb provides the following macros, to 
+convert between a signed integer and two signed 16-bit values in XkbPtrAction 
+structures.
+.SH STRUCTURES
+.LP
+.nf
+
+    typedef struct _XkbPtrAction {
+        unsigned char    type;         /\(** XkbSA_MovePtr */
+        unsigned char    flags;        /\(** determines type of pointer motion */
+        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
+        unsigned char    low_XXX;      /\(** y coordinate, low bits */
+        unsigned char    high_YYY;     /\(** x coordinate, high bits */
+        unsigned char    low_YYY;      /\(** y coordinate, low bits */
+    } XkbPtrAction;
+
+.fi    
diff --git a/libX11/man/xkb/XkbPtrActionY.man b/libX11/man/xkb/XkbPtrActionY.man
index 844277d88..ad10214ea 100644
--- a/libX11/man/xkb/XkbPtrActionY.man
+++ b/libX11/man/xkb/XkbPtrActionY.man
@@ -1,104 +1,104 @@
-'\" t
-.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbPtrActionY __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbPtrActionY \- Returns the high_YYY and low_YYY fields of act converted to a 
-signed int
-.SH SYNOPSIS
-.HP
-.B int XkbPtrActionY
-.BI "(\^XkbPtrAction " "act" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- act
-action from which to extract Y
-.SH DESCRIPTION
-.LP
-Actions associated with the XkbPtrAction structure move the pointer when keys 
-are pressed and released.
-
-If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
-treated as though the action is XkbSA_NoAction.
-
-If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
-instructs the server to generate core pointer MotionNotify events rather than 
-the usual KeyPress event, and the corresponding KeyRelease event disables any 
-mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
-action.
-
-The 
-.I type 
-field of the XkbPtrAction structure is always XkbSA_MovePtr.
-
-The 
-.I flags 
-field is a bitwise inclusive OR of the masks shown in Table 1.
-
-.TS
-c s
-l l
-l lw(4i).
-Table 1 Pointer Action Types
-_
-Action Type	Meaning
-_
-XkbSA_NoAcceleration	T{
-If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
-mouse keys timer for this key; every time the timer expires, the cursor moves.
-T}
-XkbSA_MoveAbsoluteX	T{
-If set, the X portion of the structure specifies the new pointer X coordinate. 
-Otherwise, the X portion is added to the current pointer X coordinate to 
-determine the new pointer X coordinate.
-T}
-XkbSA_MoveAbsoluteY	T{
-If set, the Y portion of the structure specifies the new pointer Y coordinate. 
-Otherwise, the Y portion is added to the current pointer Y coordinate to 
-determine the new pointer Y coordinate.
-T}
-.TE
-
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
-two signed 16-bit values, that is, the X coordinate is composed of 
-.I high_XXX 
-and 
-.I low_XXX, 
-and similarly for the Y coordinate. Xkb provides the following macros, to 
-convert between a signed integer and two signed 16-bit values in XkbPtrAction 
-structures.
-.SH STRUCTURES
-.LP
-.nf
-
-    typedef struct _XkbPtrAction {
-        unsigned char    type;         /\(** XkbSA_MovePtr */
-        unsigned char    flags;        /\(** determines type of pointer motion */
-        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
-        unsigned char    low_XXX;      /\(** y coordinate, low bits */
-        unsigned char    high_YYY;     /\(** x coordinate, high bits */
-        unsigned char    low_YYY;      /\(** y coordinate, low bits */
-    } XkbPtrAction;
-
-.fi    
+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbPtrActionY __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbPtrActionY \- Returns the high_YYY and low_YYY fields of act converted to a 
+signed int
+.SH SYNOPSIS
+.HP
+.B int XkbPtrActionY
+.BI "(\^XkbPtrAction " "act" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- act
+action from which to extract Y
+.SH DESCRIPTION
+.LP
+Actions associated with the XkbPtrAction structure move the pointer when keys 
+are pressed and released.
+
+If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
+treated as though the action is XkbSA_NoAction.
+
+If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
+instructs the server to generate core pointer MotionNotify events rather than 
+the usual KeyPress event, and the corresponding KeyRelease event disables any 
+mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
+action.
+
+The 
+.I type 
+field of the XkbPtrAction structure is always XkbSA_MovePtr.
+
+The 
+.I flags 
+field is a bitwise inclusive OR of the masks shown in Table 1.
+
+.TS
+c s
+l l
+l lw(4i).
+Table 1 Pointer Action Types
+_
+Action Type	Meaning
+_
+XkbSA_NoAcceleration	T{
+If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
+mouse keys timer for this key; every time the timer expires, the cursor moves.
+T}
+XkbSA_MoveAbsoluteX	T{
+If set, the X portion of the structure specifies the new pointer X coordinate. 
+Otherwise, the X portion is added to the current pointer X coordinate to 
+determine the new pointer X coordinate.
+T}
+XkbSA_MoveAbsoluteY	T{
+If set, the Y portion of the structure specifies the new pointer Y coordinate. 
+Otherwise, the Y portion is added to the current pointer Y coordinate to 
+determine the new pointer Y coordinate.
+T}
+.TE
+
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
+two signed 16-bit values, that is, the X coordinate is composed of 
+.I high_XXX 
+and 
+.I low_XXX, 
+and similarly for the Y coordinate. Xkb provides the following macros, to 
+convert between a signed integer and two signed 16-bit values in XkbPtrAction 
+structures.
+.SH STRUCTURES
+.LP
+.nf
+
+    typedef struct _XkbPtrAction {
+        unsigned char    type;         /\(** XkbSA_MovePtr */
+        unsigned char    flags;        /\(** determines type of pointer motion */
+        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
+        unsigned char    low_XXX;      /\(** y coordinate, low bits */
+        unsigned char    high_YYY;     /\(** x coordinate, high bits */
+        unsigned char    low_YYY;      /\(** y coordinate, low bits */
+    } XkbPtrAction;
+
+.fi    
diff --git a/libX11/man/xkb/XkbSetPtrActionX.man b/libX11/man/xkb/XkbSetPtrActionX.man
index 5888d46dc..2bd56b255 100644
--- a/libX11/man/xkb/XkbSetPtrActionX.man
+++ b/libX11/man/xkb/XkbSetPtrActionX.man
@@ -1,108 +1,108 @@
-'\" t
-.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbSetPtrActionX __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbSetPtrActionX \- Sets the high_XXX and low_XXX fields of act from the signed 
-integer value x
-.SH SYNOPSIS
-.HP
-.B void XkbSetPtrActionX
-.BI "(\^XkbPtrAction " "act" "\^,"
-.BI "int " "x" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- act
-action in which to set X
-.TP
-.I \- x
-new value to set
-.SH DESCRIPTION
-.LP
-Actions associated with the XkbPtrAction structure move the pointer when keys 
-are pressed and released.
-
-If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
-treated as though the action is XkbSA_NoAction.
-
-If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
-instructs the server to generate core pointer MotionNotify events rather than 
-the usual KeyPress event, and the corresponding KeyRelease event disables any 
-mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
-action.
-
-The 
-.I type 
-field of the XkbPtrAction structure is always XkbSA_MovePtr.
-
-The 
-.I flags 
-field is a bitwise inclusive OR of the masks shown in Table 1.
-
-.TS
-c s
-l l
-l lw(4i).
-Table 1 Pointer Action Types
-_
-Action Type	Meaning
-_
-XkbSA_NoAcceleration	T{
-If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
-mouse keys timer for this key; every time the timer expires, the cursor moves.
-T}
-XkbSA_MoveAbsoluteX	T{
-If set, the X portion of the structure specifies the new pointer X coordinate. 
-Otherwise, the X portion is added to the current pointer X coordinate to 
-determine the new pointer X coordinate.
-T}
-XkbSA_MoveAbsoluteY	T{
-If set, the Y portion of the structure specifies the new pointer Y coordinate. 
-Otherwise, the Y portion is added to the current pointer Y coordinate to 
-determine the new pointer Y coordinate.
-T}
-.TE
-
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
-two signed 16-bit values, that is, the X coordinate is composed of 
-.I high_XXX 
-and 
-.I low_XXX, 
-and similarly for the Y coordinate. Xkb provides the following macros, to 
-convert between a signed integer and two signed 16-bit values in XkbPtrAction 
-structures.
-.SH STRUCTURES
-.LP
-.nf
-
-    typedef struct _XkbPtrAction {
-        unsigned char    type;         /\(** XkbSA_MovePtr */
-        unsigned char    flags;        /\(** determines type of pointer motion */
-        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
-        unsigned char    low_XXX;      /\(** y coordinate, low bits */
-        unsigned char    high_YYY;     /\(** x coordinate, high bits */
-        unsigned char    low_YYY;      /\(** y coordinate, low bits */
-    } XkbPtrAction;
-
-.fi    
+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbSetPtrActionX __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSetPtrActionX \- Sets the high_XXX and low_XXX fields of act from the signed 
+integer value x
+.SH SYNOPSIS
+.HP
+.B void XkbSetPtrActionX
+.BI "(\^XkbPtrAction " "act" "\^,"
+.BI "int " "x" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- act
+action in which to set X
+.TP
+.I \- x
+new value to set
+.SH DESCRIPTION
+.LP
+Actions associated with the XkbPtrAction structure move the pointer when keys 
+are pressed and released.
+
+If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
+treated as though the action is XkbSA_NoAction.
+
+If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
+instructs the server to generate core pointer MotionNotify events rather than 
+the usual KeyPress event, and the corresponding KeyRelease event disables any 
+mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
+action.
+
+The 
+.I type 
+field of the XkbPtrAction structure is always XkbSA_MovePtr.
+
+The 
+.I flags 
+field is a bitwise inclusive OR of the masks shown in Table 1.
+
+.TS
+c s
+l l
+l lw(4i).
+Table 1 Pointer Action Types
+_
+Action Type	Meaning
+_
+XkbSA_NoAcceleration	T{
+If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
+mouse keys timer for this key; every time the timer expires, the cursor moves.
+T}
+XkbSA_MoveAbsoluteX	T{
+If set, the X portion of the structure specifies the new pointer X coordinate. 
+Otherwise, the X portion is added to the current pointer X coordinate to 
+determine the new pointer X coordinate.
+T}
+XkbSA_MoveAbsoluteY	T{
+If set, the Y portion of the structure specifies the new pointer Y coordinate. 
+Otherwise, the Y portion is added to the current pointer Y coordinate to 
+determine the new pointer Y coordinate.
+T}
+.TE
+
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
+two signed 16-bit values, that is, the X coordinate is composed of 
+.I high_XXX 
+and 
+.I low_XXX, 
+and similarly for the Y coordinate. Xkb provides the following macros, to 
+convert between a signed integer and two signed 16-bit values in XkbPtrAction 
+structures.
+.SH STRUCTURES
+.LP
+.nf
+
+    typedef struct _XkbPtrAction {
+        unsigned char    type;         /\(** XkbSA_MovePtr */
+        unsigned char    flags;        /\(** determines type of pointer motion */
+        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
+        unsigned char    low_XXX;      /\(** y coordinate, low bits */
+        unsigned char    high_YYY;     /\(** x coordinate, high bits */
+        unsigned char    low_YYY;      /\(** y coordinate, low bits */
+    } XkbPtrAction;
+
+.fi    
diff --git a/libX11/man/xkb/XkbSetPtrActionY.man b/libX11/man/xkb/XkbSetPtrActionY.man
index 895454ea7..d8da0f20f 100644
--- a/libX11/man/xkb/XkbSetPtrActionY.man
+++ b/libX11/man/xkb/XkbSetPtrActionY.man
@@ -1,108 +1,108 @@
-'\" t
-.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbSetPtrActionY __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbSetPtrActionY \- Sets the high_YYY and low_YYY fields of act from the signed 
-integer value y
-.SH SYNOPSIS
-.HP
-.B void XkbSetPtrActionY
-.BI "(\^XkbPtrAction " "act" "\^,"
-.BI "int " "y" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- act
-action in which to set Y
-.TP
-.I \- y
-new value to set
-.SH DESCRIPTION
-.LP
-Actions associated with the XkbPtrAction structure move the pointer when keys 
-are pressed and released.
-
-If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
-treated as though the action is XkbSA_NoAction.
-
-If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
-instructs the server to generate core pointer MotionNotify events rather than 
-the usual KeyPress event, and the corresponding KeyRelease event disables any 
-mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
-action.
-
-The 
-.I type 
-field of the XkbPtrAction structure is always XkbSA_MovePtr.
-
-The 
-.I flags 
-field is a bitwise inclusive OR of the masks shown in Table 1.
-
-.TS
-c s
-l l
-l lw(4i).
-Table 1 Pointer Action Types
-_
-Action Type	Meaning
-_
-XkbSA_NoAcceleration	T{
-If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
-mouse keys timer for this key; every time the timer expires, the cursor moves.
-T}
-XkbSA_MoveAbsoluteX	T{
-If set, the X portion of the structure specifies the new pointer X coordinate. 
-Otherwise, the X portion is added to the current pointer X coordinate to 
-determine the new pointer X coordinate.
-T}
-XkbSA_MoveAbsoluteY	T{
-If set, the Y portion of the structure specifies the new pointer Y coordinate. 
-Otherwise, the Y portion is added to the current pointer Y coordinate to 
-determine the new pointer Y coordinate.
-T}
-.TE
-
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
-two signed 16-bit values, that is, the X coordinate is composed of 
-.I high_XXX 
-and 
-.I low_XXX, 
-and similarly for the Y coordinate. Xkb provides the following macros, to 
-convert between a signed integer and two signed 16-bit values in XkbPtrAction 
-structures.
-.SH STRUCTURES
-.LP
-.nf
-
-    typedef struct _XkbPtrAction {
-        unsigned char    type;         /\(** XkbSA_MovePtr */
-        unsigned char    flags;        /\(** determines type of pointer motion */
-        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
-        unsigned char    low_XXX;      /\(** y coordinate, low bits */
-        unsigned char    high_YYY;     /\(** x coordinate, high bits */
-        unsigned char    low_YYY;      /\(** y coordinate, low bits */
-    } XkbPtrAction;
-
-.fi    
+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 XkbSetPtrActionY __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSetPtrActionY \- Sets the high_YYY and low_YYY fields of act from the signed 
+integer value y
+.SH SYNOPSIS
+.HP
+.B void XkbSetPtrActionY
+.BI "(\^XkbPtrAction " "act" "\^,"
+.BI "int " "y" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- act
+action in which to set Y
+.TP
+.I \- y
+new value to set
+.SH DESCRIPTION
+.LP
+Actions associated with the XkbPtrAction structure move the pointer when keys 
+are pressed and released.
+
+If the MouseKeys control is not enabled, KeyPress and KeyRelease events are 
+treated as though the action is XkbSA_NoAction.
+
+If the MouseKeys control is enabled, a server action of type XkbSA_MovePtr 
+instructs the server to generate core pointer MotionNotify events rather than 
+the usual KeyPress event, and the corresponding KeyRelease event disables any 
+mouse keys timers that were created as a result of handling the XkbSA_MovePtr 
+action.
+
+The 
+.I type 
+field of the XkbPtrAction structure is always XkbSA_MovePtr.
+
+The 
+.I flags 
+field is a bitwise inclusive OR of the masks shown in Table 1.
+
+.TS
+c s
+l l
+l lw(4i).
+Table 1 Pointer Action Types
+_
+Action Type	Meaning
+_
+XkbSA_NoAcceleration	T{
+If not set, and the MouseKeysAccel control is enabled, the KeyPress initiates a 
+mouse keys timer for this key; every time the timer expires, the cursor moves.
+T}
+XkbSA_MoveAbsoluteX	T{
+If set, the X portion of the structure specifies the new pointer X coordinate. 
+Otherwise, the X portion is added to the current pointer X coordinate to 
+determine the new pointer X coordinate.
+T}
+XkbSA_MoveAbsoluteY	T{
+If set, the Y portion of the structure specifies the new pointer Y coordinate. 
+Otherwise, the Y portion is added to the current pointer Y coordinate to 
+determine the new pointer Y coordinate.
+T}
+.TE
+
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
+two signed 16-bit values, that is, the X coordinate is composed of 
+.I high_XXX 
+and 
+.I low_XXX, 
+and similarly for the Y coordinate. Xkb provides the following macros, to 
+convert between a signed integer and two signed 16-bit values in XkbPtrAction 
+structures.
+.SH STRUCTURES
+.LP
+.nf
+
+    typedef struct _XkbPtrAction {
+        unsigned char    type;         /\(** XkbSA_MovePtr */
+        unsigned char    flags;        /\(** determines type of pointer motion */
+        unsigned char    high_XXX;     /\(** x coordinate, high bits*/
+        unsigned char    low_XXX;      /\(** y coordinate, low bits */
+        unsigned char    high_YYY;     /\(** x coordinate, high bits */
+        unsigned char    low_YYY;      /\(** y coordinate, low bits */
+    } XkbPtrAction;
+
+.fi