xserver: Branch 'master'

[Adam Jackson]

 doc/Xserver.man.pre |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 57dbb90f198116dcaf17c8111a7f80644d7ebe7f
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 7 20:36:45 2008 -0400

    Document zap/-retro interaction more.

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 6cf08ce..8897e1a 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -222,7 +222,9 @@ turns on auto-repeat.
 .B -retro
 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().
+until the first time an application calls XDefineCursor().  For the Xorg
+server, this also changes the default for the DontZap option to FALSE.  For
+kdrive servers, this implies -zap.
 .TP 8
 .B \-s \fIminutes\fP
 sets screen-saver timeout time in minutes.