xserver: Branch 'master'

[Julien Cristau]

 hw/xfree86/doc/man/xorg.conf.man.pre |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 59df687835c68eda147de47edfe9bc415c0efb4f
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jan 6 16:57:45 2008 +0100

    Document the AllowEmptyInput, AutoAddDevices and AutoEnableDevices flags
    
    Add documentation for the new AllowEmptyInput, AutoAddDevices and
    AutoEnableDevices server flags in the xorg.conf manpage.

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 77439a5..9a08111 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -704,6 +704,20 @@ default.
 .BI "Option \*qIgnoreABI\*q \*q" boolean \*q
 Allow modules built for a different, potentially incompatible version of
 the X server to load. Disabled by default.
+.TP 7
+.BI "Option \*qAllowEmptyInput\*q \*q" boolean \*q
+If enabled, don't add the standard keyboard and mouse drivers, if there are no
+input devices in the config file.  Disabled by default.
+.TP 7
+.BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
+If this option is disabled, then no devices will be added from HAL events.
+Enabled by default.
+.TP 7
+.BI "Option \*qAutoEnableDevices\*q \*q" boolean \*q
+If this option is disabled, then the devices will be added (and the
+DevicePresenceNotify event sent), but not enabled, thus leaving policy up
+to the client.
+Enabled by default.
 .SH "MODULE SECTION"
 The
 .B Module