merge xf86-input-keyboard 1.2.2

3 files changed, 14 insertions, 113 deletions

diff --git a/driver/xf86-input-keyboard/man/Makefile.am b/driver/xf86-input-keyboard/man/Makefile.am
index 37abc069b..f0eb29b85 100644
--- a/driver/xf86-input-keyboard/man/Makefile.am
+++ b/driver/xf86-input-keyboard/man/Makefile.am
@@ -26,11 +26,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
 
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
+EXTRA_DIST = @DRIVER_NAME@.man
 
 CLEANFILES = $(driverman_DATA)
 
diff --git a/driver/xf86-input-keyboard/man/Makefile.in b/driver/xf86-input-keyboard/man/Makefile.in
index 9baf101cc..3915abb57 100644
--- a/driver/xf86-input-keyboard/man/Makefile.in
+++ b/driver/xf86-input-keyboard/man/Makefile.in
@@ -96,10 +96,11 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -122,6 +123,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+HURD_FALSE = @HURD_FALSE@
+HURD_TRUE = @HURD_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -132,6 +135,8 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -150,8 +155,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SCO_FALSE = @SCO_FALSE@
+SCO_TRUE = @SCO_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOLARIS_FALSE = @SOLARIS_FALSE@
+SOLARIS_TRUE = @SOLARIS_TRUE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
@@ -202,9 +211,9 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
+EXTRA_DIST = @DRIVER_NAME@.man
 CLEANFILES = $(driverman_DATA)
 SED = sed
 
diff --git a/driver/xf86-input-keyboard/man/keyboard.man b/driver/xf86-input-keyboard/man/keyboard.man
deleted file mode 100644
index 4c0154fad..000000000
--- a/driver/xf86-input-keyboard/man/keyboard.man
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" $XdotOrg: $
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ 
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH KEYBOARD __drivermansuffix__ __vendorversion__
-.SH NAME
-keyboard \- Keyboard input driver
-.SH SYNOPSIS
-.nf
-.B "Section \*qInputDevice\*q"
-.BI "  Identifier \*q" idevname \*q
-.B  "  Driver \*qkeyboard\*q"
-\ \ ...
-.B EndSection
-.fi
-.SH DESCRIPTION
-.B keyboard 
-is an __xservername__ input driver for keyboards.  The driver supports the standard
-OS-provided keyboard interface. 
-.PP
-The
-.B keyboard
-driver functions as a keyboard input device, and may be used as the
-X server's core keyboard.  
-.PP
-This driver is built-in to the core X server, and multiple instances are not 
-supported.   A loadable driver,
-.BR kbd ,
-is available, and is planned to replace the
-.B keyboard
-driver in a future release of the __xservername__ server.
-.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-details and for options that can be used with all input drivers.  This
-section only covers configuration details specific to this driver.
-.PP
-The following driver
-.B Options
-are supported:
-.TP 7
-.BI "Option \*qProtocol\*q \*q" string \*q
-Specify the keyboard protocol.  Valid protocol types include:
-.PP
-.RS 12
-Standard, Xqueue.
-.RE
-.PP
-.RS 7
-Not all protocols are supported on all platforms.  Default: "Standard".
-.RE
-.TP 7
-.BI "Option \*qAutoRepeat\*q \*q" "delay rate" \*q
-sets the auto repeat behaviour for the keyboard.  This is not implemented
-on all platforms.
-.I delay
-is the time in milliseconds before a key starts repeating.
-.I rate
-is the number of times a key repeats per second.  Default: "500 30".
-.TP 7
-.BI "Option \*qXLeds\*q \*q" ledlist \*q
-makes the keyboard LEDs specified in
-.I ledlist
-available for client use instead of their traditional function
-(Scroll Lock, Caps Lock and Num Lock).  The numbers in the list are
-in the range 1 to 3.  Default: empty list.
-.TP 7
-.BI "Option \*qXkbDisable\*q \*q" boolean \*q
-disable/enable the XKEYBOARD extension.  The \-kb command line
-option overrides this config file option.  Default: XKB is enabled.
-.PP
-.RS 7
-NOTE: This option should be specified in the
-.B ServerFlags
-section rather than here.  It's use here is deprecated.
-.RE
-.TP 7
-.BI "Option \*qXkbRules\*q \*q" rules \*q
-specifies which XKB rules file to use for interpreting the
-.BR XkbModel ,
-.BR XkbLayout ,
-.BR XkbVariant ,
-and
-.B XkbOptions
-settings.  Default: "xorg" for most platforms, but "xfree98" for the
-Japanese PC-98 platforms.
-.TP 7
-.BI "Option \*qXkbModel\*q \*q" modelname \*q
-specifies the XKB keyboard model name.  Default: "pc105" for most platforms,
-but "pc98" for the Japanese PC-98 platforms.
-.TP 7
-.BI "Option \*qXkbLayout\*q \*q" layoutname \*q
-specifies the XKB keyboard layout name.  This is usually the country or
-language type of the keyboard.  Default: "us" for most platforms, but
-"nec/jp" for the Japanese PC-98 platforms.
-.TP 7
-.BI "Option \*qXkbVariant\*q \*q" variants \*q
-specifies the XKB keyboard variant components.  These can be used to
-enhance the keyboard layout details.  Default: not set.
-.TP 7
-.BI "Option \*qXkbOptions\*q \*q" options \*q
-specifies the XKB keyboard option components.  These can be used to
-enhance the keyboard behaviour.  Default: not set.
-.PP
-Some other XKB-related options are available, but they are incompatible
-with the ones listed above and are not recommended, so they are not
-documented here.
-.SH "SEE ALSO"
-kbd(__drivermansuffix__), __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).