diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-07-27 16:54:57 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-07-27 16:54:57 +0200 |
| commit | bca311cc03895f725125668fc07ab8d6f60cf824 (patch) | |
| tree | f662c9c7e8d915de3eb60521a719b00e06484103 /hw/xfree86/doc | |
| parent | 6d3c2d4ba31f6f4214691ffa227ae035f753ce5d (diff) | |
| parent | c0c73e9236cffece7c8049515b03facb41f12f0e (diff) | |
Merge branch 'server-1.5-branch' of git://anongit.freedesktop.org/git/xorg/xserver into debian-experimental
Diffstat (limited to 'hw/xfree86/doc')
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 9f3980879..74f8cefce 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -696,7 +696,8 @@ 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. +input devices in the config file. Enabled by default if AutoAddDevices and +AutoEnableDevices is enabled, otherwise disabled. .TP 7 .BI "Option \*qAutoAddDevices\*q \*q" boolean \*q If this option is disabled, then no devices will be added from HAL events. |