xserver: Branch 'server-1.2-branch'

[Alan Coopersmith]

 hw/xfree86/doc/man/xorg.conf.man.pre |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree f4ef99e8168fd2931961aa0d42f0547c89d21c1f (from 198560a081eaedfb9872c0926a94c0298b9dcab8)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 19 16:38:34 2006 -0800

    xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
    (cherry picked from e437f357b6850a6c87ca6696870b3abd40e5b8ed commit)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index e44b551..f05ada6 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -649,7 +649,7 @@ being
 that are passed to the module when it is loaded.
 .PP
 Example: the extmod module (which contains a miscellaneous group of
-server extensions) can be loaded, with the __xservername__-DGA extension
+server extensions) can be loaded, with the XFree86-DGA extension
 disabled by using the following entry:
 .PP
 .RS 4