xserver: Branch 'master'

[Daniel Stone]

 hw/kdrive/src/kdrive.c               |    2 +-
 hw/xfree86/doc/man/xorg.conf.man.pre |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d80bae2237e555025465d4d761a5cc537cc2bcdd
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Oct 8 02:43:27 2008 +0300

    Update docs to reflect new DontZap default

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 27513a7..97d167e 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -567,7 +567,7 @@ KdUseMsg (void)
     ErrorF("-videoTest       Start the server, pause momentarily and exit\n");
     ErrorF("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");
     ErrorF("-switchCmd       Command to execute on vt switch\n");
-    ErrorF("-nozap           Don't terminate server on Ctrl+Alt+Backspace\n");
+    ErrorF("-zap             Terminate server on Ctrl+Alt+Backspace\n");
     ErrorF("vtxx             Use virtual terminal xx instead of the next available\n");
 #ifdef PSEUDO8
     p8UseMsg ();
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index d284dce..af144b6 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -466,9 +466,9 @@ 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, that key sequence has no special meaning and
-is passed to clients.
-Default: off.
+When this option is enabled (as per default), that key sequence has no
+special meaning.
+Default: on.
 .TP 7
 .BI "Option \*qDontZoom\*q  \*q" boolean \*q
 This disallows the use of the