xserver: Branch 'master'

[David Nusinow]

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

New commits:
diff-tree f54b71b772a1f587394ae3968782b611e52f0e2d (from 39169fd373b97f34923f6494d697d9429d0b8aa3)
Author: David Nusinow <david at nee.(none)>
Date:   Sun Aug 6 18:11:00 2006 +0000

    Document enable/disable flag for AIGLX in xorg.conf manpage.

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 77d4856..3340af0 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -602,6 +602,9 @@ the keymap for a mapping to the
 .B Terminate
 action and, if found, use XKEYBOARD for processing actions, otherwise
 the builtin handler will be used.
+.TP 7
+.BI "Option \*qAIGLX\*q \*q" boolean \*q
+enable or disable AIGLX. AIGLX is enabled by default.
 .SH MODULE SECTION
 The
 .B Module