xserver: Branch 'master'

[Drew Parsons]

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

New commits:
diff-tree 948a97b97e93cee05a23f1f1ae699c5e181bc8ce (from 04554a3adcddc32de5fdb0b3122da0bcdd4c24a9)
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Oct 21 23:09:22 2006 +1000

    Minor typo fix to xorg.conf man page.

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index e94804c..abf3146 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1081,7 +1081,7 @@ Include the set of modes listed in the
 .B Modes
 section called
 .IR modesection-id.
-This make all of the modes defined in that section available for use by
+This makes all of the modes defined in that section available for use by
 this monitor.
 .TP 7
 .BI "Mode  \*q" name \*q