Commit 1e7bf6be authored by Egbert Eich's avatar Egbert Eich
Browse files

Merged changes from RELEASE-1 branch

parent 3374ec5c
......@@ -14,7 +14,7 @@ kbd \- Keyboard input driver
.fi
.SH DESCRIPTION
.B kbd
is an XFree86 input driver for keyboards. The driver supports the standard
is an __xservername__ input driver for keyboards. The driver supports the standard
OS-provided keyboard interface, but these are currently only available to
this driver module for Linux and BSD. This driver is experimental, but
will soon replace the built-in
......@@ -26,7 +26,7 @@ The
driver functions as a keyboard input device, and may be used as the
X server's core keyboard.
.SH CONFIGURATION DETAILS
Please refer to XF86Config(__filemansuffix__) for general configuration
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
......@@ -96,4 +96,4 @@ 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"
keyboard(__drivermansuffix__), XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
keyboard(__drivermansuffix__), __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
......@@ -14,7 +14,7 @@ keyboard \- Keyboard input driver
.fi
.SH DESCRIPTION
.B keyboard
is an XFree86 input driver for keyboards. The driver supports the standard
is an __xservername__ input driver for keyboards. The driver supports the standard
OS-provided keyboard interface. This driver is currently built-in to
the core X server.
.PP
......@@ -24,7 +24,7 @@ driver functions as a keyboard input device, and may be used as the
X server's core keyboard. This driver is currently built-in to the core
X server, and multiple instances are not yet supported.
.SH CONFIGURATION DETAILS
Please refer to XF86Config(__filemansuffix__) for general configuration
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
......@@ -100,4 +100,4 @@ 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__), XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
kbd(__drivermansuffix__), __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.9 2003/12/18 21:53:45 dawes Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */
/*
......@@ -12,6 +12,7 @@
* xf86Events.c and xf86Io.c which are
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*/
/* $XdotOrg$ */
#define NEED_EVENTS
#include "X.h"
......@@ -124,7 +125,7 @@ static const OptionInfoRec KeyboardOptions[] = {
static const char *kbdDefaults[] = {
"Protocol", "standard",
"AutoRepeat", "500 30",
"XkbRules", "xfree86",
"XkbRules", __XKBDEFRULES__,
"XkbModel", "pc101",
"XkbLayout", "us",
"Panix106", "off",
......@@ -759,7 +760,7 @@ static XF86ModuleVersionInfo xf86KeyboardVersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment