xserver: Branch 'master'

[Alan Coopersmith]

 doc/Xserver.man.pre |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

New commits:
diff-tree 0d6d373af95d0004d33b987d14ad7e04dd5d2003 (from 14d6a9b327381a6bb2dac59c62728e5fd0f0bcfb)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Jan 19 14:52:23 2007 -0800

    Update Xserver man page to match commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
    
        Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to
        -ardelay and -arinterval, respectively.

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 7cf3c26..aa931a8 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -397,20 +397,14 @@ base directory for keyboard layout files
 for setuid X servers (i.e., when the X server's real and effective uids
 are different).
 .TP 8
-.B \-ar1 \fImilliseconds\fP
+.B \-ardelay \fImilliseconds\fP
 sets the autorepeat delay (length of time in milliseconds that a key must
 be depressed before autorepeat starts).
 .TP 8
-.B \-ar2 \fImilliseconds\fP
+.B \-arinterval \fImilliseconds\fP
 sets the autorepeat interval (length of time in milliseconds that should
 elapse between autorepeat-generated keystrokes).
 .TP 8
-.B \-noloadxkb
-disables loading of an XKB keymap description on server startup.
-.TP 8
-.B \-xkbdb \fIfilename\fP
-uses \fIfilename\fP for default keyboard keymaps.
-.TP 8
 .B \-xkbmap \fIfilename\fP
 loads keyboard description in \fIfilename\fP on server startup.
 .SH SECURITY EXTENSION OPTIONS