summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-04-09 15:40:24 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-04-28 16:17:16 +1000
commit737b49199a05299486064e6e762cf2a2f6f95be6 (patch)
treee173f15692b55ec0cb8436a396033f5491692b8b /doc
parentdc2767d1c5db60385867c76ba2de507fe0cb8a90 (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>
Diffstat (limited to 'doc')
-rw-r--r--doc/Xserver.man.pre2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index e9a3b9c7d..e2673f7be 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