From d9c32f26400f594df25cb29da0f95186dea5e732 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 2 Apr 2004 21:47:30 +0000 Subject: 70. Merging in the TM branch (Egbert Eich). --- man/kbd.man | 6 +++--- man/keyboard.man | 6 +++--- src/kbd.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/man/kbd.man b/man/kbd.man index e55ace3..231b10e 100644 --- a/man/kbd.man +++ b/man/kbd.man @@ -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__). diff --git a/man/keyboard.man b/man/keyboard.man index 0efd096..02690ca 100644 --- a/man/keyboard.man +++ b/man/keyboard.man @@ -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__). diff --git a/src/kbd.c b/src/kbd.c index 4539a7f..aab2890 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.1.4.2.4.1 2004/03/04 17:48:05 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */ /* @@ -12,6 +11,7 @@ * xf86Events.c and xf86Io.c which are * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.1.4.2.4.1 2004/03/04 17:48:05 eich Exp $ */ #define NEED_EVENTS #include "X.h" @@ -124,7 +124,7 @@ static const OptionInfoRec KeyboardOptions[] = { static const char *kbdDefaults[] = { "Protocol", "standard", "AutoRepeat", "500 30", - "XkbRules", "xfree86", + "XkbRules", __XKBDEFRULES__, "XkbModel", "pc101", "XkbLayout", "us", "Panix106", "off", -- cgit v1.2.1