diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-09 15:40:24 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-06-29 14:14:52 -0700 |
| commit | 10c06ddeefccc195e70adfed664e9488eeb53804 (patch) | |
| tree | 3f00c8a8248cf8650fa99b75adecdaafab0d40e5 /hw/xfree86/doc/man | |
| parent | 966349f8e068fa120470549b0db9a8fcf88aca5b (diff) | |
xfree86: restore default off for DontZap
Zapping is triggered by xkb these days, so note in the man page that it's the
Terminate_Server action. Since it's XKB, personal preferences towards or
against zapping should be achieved through xkb rulesets.
If Terminate_Server is not in the xkb actions, then we can't zap anyway and we
don't need a default of DontZap "on".
This patch restores the old meaning of DontZap - disallow zapping altogether,
regardless of XKB's current keymap.
Ideally, this patch should be accompanied by b0f64bdab00db652e in
xkeyboard-config.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 737b49199a05299486064e6e762cf2a2f6f95be6)
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xfree86/doc/man')
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index b6288b62b..96ad0160f 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -464,12 +464,11 @@ Default: off. .TP 7 .BI "Option \*qDontZap\*q \*q" boolean \*q This disallows the use of the -.B Ctrl+Alt+Backspace -sequence. -That sequence is normally used to terminate the __xservername__ server. -When this option is enabled (as per default), that key sequence has no -special meaning. -Default: on. +.B Terminate_Server +XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options). +This action is normally used to terminate the __xservername__ server. +When this option is enabled, the action has no effect. +Default: off. .TP 7 .BI "Option \*qDontZoom\*q \*q" boolean \*q This disallows the use of the |