xserver: Branch 'master'

[Julien Cristau]

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

New commits:
commit 7e7622165940934e56ae96ae785a8f88eec1a5cf
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jan 6 18:23:09 2008 +0100

    Fix the name of the XFree86-Misc extension in the xorg.conf manpage.

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 9a08111..7eaf5d5 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -493,7 +493,7 @@ extension) to connect from another host.
 Default: off.
 .TP 7
 .BI "Option \*qDisableModInDev\*q  \*q" boolean \*q
-This disables the parts of the __xservername__\-Misc extension that can be used to
+This disables the parts of the XFree86\-Misc extension that can be used to
 modify the input device settings dynamically.
 Default: that functionality is enabled.
 .TP 7