xserver: Branch 'server-1.2-branch' - 2 commits

[Alan Coopersmith]

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

New commits:
diff-tree 4f9de386b0552f675b4380c0f2606c3568469ee3 (from 9ddaea25bde60bbe8b0cce029b0c331ce6dd1327)
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.
    (cherry picked from 0d6d373af95d0004d33b987d14ad7e04dd5d2003 commit)

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
diff-tree 9ddaea25bde60bbe8b0cce029b0c331ce6dd1327 (from 1dac07bf52c6b2c959a7f954556d8fa26427d360)
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Oct 21 22:06:43 2006 +1000

    Minor typos in Xserver man page.
    (cherry picked from 04554a3adcddc32de5fdb0b3122da0bcdd4c24a9 commit)

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index b7ed327..7cf3c26 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -184,7 +184,7 @@ prints a usage message.
 causes all remaining command line arguments to be ignored.
 .TP 8
 .B \-maxbigreqsize \fIsize\fP
-sets the maxmium big request to
+sets the maximum big request to
 .I size
 MB.
 .TP 8
@@ -456,7 +456,7 @@ the text after the /; it is used to dist
 
 <action> ::= a | i | e
 
-<string> ::= <dbl quoted string> | <single quoted string> | <unqouted string>
+<string> ::= <dbl quoted string> | <single quoted string> | <unquoted string>
 
 <dbl quoted string> ::= <space> " <not dqoute>* " <space>