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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/Xserver.man.pre | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index cd5bdbd25..edb95f1c3 100644 --- a/doc/Xserver.man.pre +++ b/doc/Xserver.man.pre @@ -219,7 +219,7 @@ turns on auto-repeat. starts the stipple with the classic stipple and cursor visible. The default is to start with a black root window, and to suppress display of the cursor until the first time an application calls XDefineCursor(). For the Xorg -server, this also changes the default for the DontZap option to FALSE. For +server, this also sets the default for the DontZap option to FALSE. For kdrive servers, this implies -zap. .TP 8 .B \-s \fIminutes\fP |