xserver: Branch 'master' - 2 commits

[Jon TURNEY]

 doc/Xserver.man.pre             |    7 -------
 hw/xfree86/doc/man/Xorg.man.pre |    3 ---
 2 files changed, 10 deletions(-)

New commits:
commit d0dd649035fc3698c5b436f9d9d248116aa106a3
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu Feb 12 16:03:16 2009 +0000

    Remove references to rgb.txt from files section of Xserver and Xorg man pages
    
    The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index f3fb5bf..e9a3b9c 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -557,9 +557,6 @@ Bitmap font directories
 .IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Type1
 Outline font directories
 .TP 30
-.I __projectroot__/share/X11/rgb.txt
-Color database
-.TP 30
 .I /tmp/.X11-unix/X\fBn\fP
 Unix domain socket for display number \fBn\fP
 .TP 30
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 867b349..e0db086 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -537,9 +537,6 @@ Libraries.
 .B __projectroot__/lib/X11/fonts/\(**
 Fonts.
 .TP 30
-.B __projectroot__/share/X11/rgb.txt
-Color names to RGB mapping.
-.TP 30
 .B __projectroot__/share/X11/XErrorDB
 Client error message database.
 .TP 30
commit b0ad9e1ced9619f37acf77764c395c57b86cf463
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu Feb 12 16:02:17 2009 +0000

    Remove long-gone '-co' option from Xserver man page
    
    The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index af02050..f3fb5bf 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -117,10 +117,6 @@ sets key-click volume (allowable range: 0-100).
 sets the visual class for the root window of color screens.
 The class numbers are as specified in the X protocol.
 Not obeyed by all servers.
-.TP 8
-.B \-co \fIfilename\fP
-sets name of RGB color database.  The default is
-.IR __projectroot__/share/X11/rgb .
 .ig
 .TP 8
 .B \-config \fIfilename\fP