xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/doc/man/xorg.conf.man.pre |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7721d3e9217b41aab3a0ee5eaa52f5b53cbb07db
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Dec 18 19:14:26 2007 -0500

    Reference cvt and gtf in the 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 3c657d0..77439a5 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -2144,7 +2144,9 @@ The data therein is not used in this release.
 General:
 .BR X (__miscmansuffix__),
 .BR Xserver (__appmansuffix__),
-.BR __xservername__ (__appmansuffix__).
+.BR __xservername__ (__appmansuffix__),
+.BR cvt (__appmansuffix__),
+.BR gtf (__appmansuffix__).
 .PP
 .B Not all modules or interfaces are available on all platforms.
 .PP