diff options
author | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
commit | be10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch) | |
tree | 0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xfree86/doc/man | |
parent | 2197318e5fc026ee57325ce953113d1963e7dc82 (diff) | |
parent | 6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff) | |
download | vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2 vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/doc/man')
-rw-r--r-- | xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre index 1bec1bf27..8d09862b3 100644 --- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre @@ -39,14 +39,11 @@ server is started as a normal user: .IR __projectroot__/etc/X11/ <cmdline>
.IB /etc/X11/ $XORGCONFIG
.IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__\-4
.I /etc/X11/__xconfigfile__
.I /etc/__xconfigfile__
.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__\-4
.I __projectroot__/etc/X11/__xconfigfile__
.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__\-4
.I __projectroot__/lib/X11/__xconfigfile__
.fi
.RE
@@ -74,14 +71,11 @@ search locations are as follows: .B $XORGCONFIG
.IB /etc/X11/ $XORGCONFIG
.IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__\-4
.I /etc/X11/__xconfigfile__
.I /etc/__xconfigfile__
.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__\-4
.I __projectroot__/etc/X11/__xconfigfile__
.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__\-4
.I __projectroot__/lib/X11/__xconfigfile__
.fi
.RE
|