xserver: Branch 'server-1.5-branch' - 2 commits

[Adam Jackson]

 doc/Xserver.man.pre             |    2 +-
 hw/xfree86/doc/man/Xorg.man.pre |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 62524d9d7648cfd9e2d7d6a3312ff20722d7f6a5
Author: Thomas Bodzar <Thomas.Bodzar at quest.com>
Date:   Sat Aug 30 15:34:29 2008 +0200

    Xorg.man: typo (the the).
    (cherry picked from commit 229e60db8f95232afc8cdcb7cd0572d117c84b90)

diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 405efda..8b48951 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -202,7 +202,7 @@ to the
 __xconfigfile__(__filemansuffix__) file option.
 .TP 8
 .B \-disableVidMode
-Disable the the parts of the VidMode extension (used by the xvidtune
+Disable the parts of the VidMode extension (used by the xvidtune
 client) that can be used to change the video modes.  This is equivalent
 to the
 .B DisableVidModeExtension
commit 57fa9fd4a59be14f4c77c3dac501ef40ff656752
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sat Aug 30 15:35:32 2008 +0200

    Xserver.man: Typo (the the).
    (cherry picked from commit d01c5ca7935a8340a3cd68c325da6dfec005c952)

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index c47a396..8fe3b76 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -507,7 +507,7 @@ by the \fIfont path\fP.
 The default font path is
 __default_font_path__ .
 .LP
-A special kind of directory can be specified using the the \fBcatalogue\fP:
+A special kind of directory can be specified using the \fBcatalogue\fP:
 prefix. Directories specified this way can contain symlinks pointing to the
 real font directories. See the FONTPATH.D section for details.
 .LP