summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-12-14 08:43:19 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-12-18 10:53:26 +1000
commit801bc8075aee664bd4c6b6ff842ab737c143a1de (patch)
tree328ede5c409e23949701cbb5ccf050ffac41d421
parent753310837cd3812882d8de67f063bb61813db675 (diff)
xfree86: update man page for special keys handling.
SpecialKeyHandling was removed from the kbd driver with version 1.4.0. Since this is the only version that will build against server 1.7+ it's not reasonable to mention it in the man page. Reword, point to XKB instead and make clear that some key combinations _may_ not be available in any given config. Reported-by: Derek Fawcus Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--hw/xfree86/doc/man/Xorg.man.pre16
1 files changed, 5 insertions, 11 deletions
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 98a959069..bb5a14fb9 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -421,18 +421,12 @@ The
.B __xservername__
server is normally configured to recognize various special combinations
of key presses that instruct the server to perform some action, rather
-than just sending the key press event to a client application. The
-default XKEYBOARD keymap defines the key combinations listed below.
-The kbd (__drivermansuffix__) driver also has these key combinations
-builtin to its event handler
-for cases where the XKEYBOARD extension is not being used. When using
-the XKEYBOARD extension, which key combinations perform which actions
-is completely configurable.
+than just sending the key press event to a client application. These actions
+depend on the XKB keymap loaded by a particular keyboard device and may or
+may not be available on a given configuration.
.PP
-The special combinations of key presses recognized directly
-by
-.B __xservername__
-are:
+The following key combinations are commonly part of the default XKEYBOARD
+keymap.
.TP 8
.B Ctrl+Alt+Backspace
Immediately kills the server -- no questions asked. It can be disabled by