summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-02-19 13:57:28 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-02-20 16:11:38 -0800
commitab61033700b5383a7a15370dd054eaa80e72e811 (patch)
tree02329d3fb4b7036dc9866532c9d9d6e95245612f
parent372977354c3a09ca77ca13ba0aec00a61046f60d (diff)
Add Extensions section to xorg.conf man page
Extensions section was added in X11R6.8.0 and documented in the release notes: http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3 but never made it into the man page. Also fix a bonus typo. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--hw/xfree86/doc/man/xorg.conf.man.pre29
1 files changed, 28 insertions, 1 deletions
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 934234974..7349def0d 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -112,12 +112,13 @@ The section names are:
.PP
.RS 4
.nf
.BR "Files " "File pathnames"
.BR "ServerFlags " "Server flags"
.BR "Module " "Dynamic module loading"
+.BR "Extensions " "Extension enabling"
.BR "InputDevice " "Input device description"
.BR "Device " "Graphics device description"
.BR "VideoAdaptor " "Xv video adaptor description"
.BR "Monitor " "Monitor description"
.BR "Modes " "Video modes descriptions"
.BR "Screen " "Screen configuration"
@@ -310,13 +311,13 @@ syntax in the symlink name:
.RE
.PP
where
.I <identifier>
is an alphanumeric identifier,
.I [attribute]
-is an attribute wich will be passed to the underlying FPE and
+is an attribute which will be passed to the underlying FPE and
.I <priority>
is a number used to order the fontfile FPEs. Examples:
.PP
.RS 4
.nf
.I 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
@@ -751,12 +752,38 @@ __projectroot__/lib/modules/extensions
The \(lqextmod\(rq, \(lqdbe\(rq, \(lqglx\(rq, and \(lqdri\(rq extension
modules are loaded automatically, unless disabled with \*qDisable\*q entries.
It is recommended
that at very least the \(lqextmod\(rq extension module be loaded.
If it isn't, some commonly used server extensions (like the SHAPE
extension) will not be available.
+.SH "EXTENSIONS SECTION"
+The
+.B Extensions
+section is used to specify which X11 protocol extensions should be enabled
+or disabled.
+The
+.B Extensions
+section is optional, as are all of the entries that may be specified in
+it.
+.PP
+Entries in this section are listed as Option statements with the name of
+the extension as the first argument, and a boolean value as the second.
+The extension name is case\-sensitive, and matches the form shown in the output
+of \*qXorg -extension ?\*q.
+.PP
+.RS 7
+Example: the MIT-SHM extension can be disabled with the following entry:
+.PP
+.RS 4
+.nf
+.B "Section \*qExtensions\*q"
+.B " Option \*qMIT-SHM\*q \*qDisable\*q"
+.B "EndSection"
+.fi
+.RE
+.RE
.SH "INPUTDEVICE SECTION"
The config file may have multiple
.B InputDevice
sections.
There will normally be at least two: one for the core (primary) keyboard,
and one of the core pointer.