xserver: Branch 'master'

[Adam Jackson]

 doc/Xserver.man.pre |    3 ---
 xkb/xkbInit.c       |    2 --
 2 files changed, 5 deletions(-)

New commits:
commit 0bad0552bfd4d10529ab51d618af8d08c5aeea71
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 4 17:20:24 2009 -0500

    XKB: Remove -kb and +kb from -help text and man page.

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 8897e1a..af02050 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -393,9 +393,6 @@ located in the XKB base directory or a subdirectory, and specified as the
 relative path from the XKB base directory.  The default XKB base directory is
 .IR __projectroot__/lib/X11/xkb .
 .TP 8
-.B [+-]kb
-enables(+) or disables(-) the XKEYBOARD extension.
-.TP 8
 .BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
 enables(+) or disables(-) AccessX key sequences.
 .TP 8
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index bc2b41e..e9b9d65 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -688,8 +688,6 @@ XkbProcessArguments(int argc,char *argv[],int i)
 void
 XkbUseMsg(void)
 {
-    ErrorF("-kb                    disable the X Keyboard Extension\n");
-    ErrorF("+kb                    enable the X Keyboard Extension\n");
     ErrorF("[+-]accessx [ timeout [ timeout_mask [ feedback [ options_mask] ] ] ]\n");
     ErrorF("                       enable/disable accessx key sequences\n");
     ErrorF("-ardelay               set XKB autorepeat delay\n");