diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-10 07:43:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-10 07:43:34 +0000 |
| commit | 0540eb5a1f795c0f5265d244ec979b8ddfcf3acb (patch) | |
| tree | 06c5c3f4394f2d6d48c95ed1bfbab3a44e9996cc /xorg-server/hw/xfree86/doc/man | |
| parent | 5c72c54bc068bf12007dc15b353b1b2795e9aaf5 (diff) | |
| parent | 75d2bbcf0f39b9c85bc270728343f61dabebce2d (diff) | |
| download | vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.gz vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.bz2 vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.zip | |
svn merge ^/trunk .
Diffstat (limited to 'xorg-server/hw/xfree86/doc/man')
| -rw-r--r-- | xorg-server/hw/xfree86/doc/man/Xorg.man.pre | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/doc/man/Xorg.man.pre b/xorg-server/hw/xfree86/doc/man/Xorg.man.pre index 2f9ff98c7..fe3280038 100644 --- a/xorg-server/hw/xfree86/doc/man/Xorg.man.pre +++ b/xorg-server/hw/xfree86/doc/man/Xorg.man.pre @@ -525,7 +525,7 @@ Header files. .B __projectroot__/lib/\(** Libraries. .TP 30 -.B __projectroot__/lib/X11/fonts/\(** +.B __datadir__/fonts/X11/\(** Fonts. .TP 30 .B __projectroot__/share/X11/XErrorDB 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 e3cbcf586..ace041c92 100644 --- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre @@ -356,12 +356,12 @@ font path elements (which can be set inside a catalogue directory): .PP .RS 4 .nf -.I __projectroot__/lib/X11/fonts/misc/ -.I __projectroot__/lib/X11/fonts/TTF/ -.I __projectroot__/lib/X11/fonts/OTF/ -.I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/100dpi/ -.I __projectroot__/lib/X11/fonts/75dpi/ +.I __datadir__/fonts/X11/misc/ +.I __datadir__/fonts/X11/TTF/ +.I __datadir__/fonts/X11/OTF/ +.I __datadir__/fonts/X11/Type1/ +.I __datadir__/fonts/X11/100dpi/ +.I __datadir__/fonts/X11/75dpi/ .fi .RE .PP @@ -1378,7 +1378,7 @@ monitors do not require it. The default is off. .BI "Option " "\*qPrimary\*q " \*qbool\*q This optional entry specifies that the monitor should be treated as the primary monitor. (RandR 1.2-supporting drivers only) -.TP7 +.TP 7 .BI "Option " "\*qPreferredMode\*q " \*qstring\*q This optional entry specifies a mode to be marked as the preferred initial mode of the monitor. |