summaryrefslogtreecommitdiff
path: root/hw/xfree86/doc
diff options
context:
space:
mode:
authorDavid Nusinow <dnusinow@debian.org>2007-05-03 22:00:23 -0400
committerDavid Nusinow <dnusinow@debian.org>2007-05-03 22:00:23 -0400
commite91b9ddc7aa95abc2d4d314e8db204860771a099 (patch)
treef16b714021afb2f3e34be439eb9054d275f836c3 /hw/xfree86/doc
parentd2f813f7db157fc83abc4b3726821c36ee7e40b1 (diff)
Improve modules loading defaults
Provide default modules that may be overrided easily. Previously the server would load a set of default modules, but only if none were specified in the xorg.conf, or if you didn't have a xorg.conf at all. This patch provides a default set and you can add only the "Load" instructions to xorg.conf that you want without losing the defaults. Similarly, if you don't want to load a module that's loaded by default, you can add "Disable modulename" to your xorg.conf (see man xorg.conf in this release for details). This allows for a minimal "Modules" section, where the user only need specify what they want to be different. See bug #10541 for more. The list of default modules is taken from the set loaded by default when there was a xorg.conf containing no "Modules" section. A potential problem for some users is that some users disable a module, most notably DRI, by commenting out the "Load" line in their xorg.conf. This needs to be changed to an uncommented "Disable" line, as DRI is loaded by default.
Diffstat (limited to 'hw/xfree86/doc')
-rw-r--r--hw/xfree86/doc/man/xorg.conf.man.pre14
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 19315c024..f96428287 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -639,6 +639,20 @@ Example: the Type 1 font rasteriser can be loaded with the following entry:
.B "Load \*qtype1\*q"
.RE
.RE
+.TP 7
+.BI "Disable \*q" modulename \*q
+This instructs the server to not load the module called
+.IR modulename .
+Some modules are loaded by default in the server, and this overrides that
+default. If a
+.B Load
+instruction is given for the same module, it overrides the
+.B Disable
+instruction and the module is loaded. The module name given should be the
+module's standard name, not the module file name. As with the
+.B Load
+instruction, the standard name is case-sensitive, and does not include the
+"lib" prefix, or the ".a", ".o", or ".so" suffixes.
.PP
The second form of entry is a
.BR SubSection,