diff options
author | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-12-08 15:52:37 -0600 |
---|---|---|
committer | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-12-08 15:52:37 -0600 |
commit | d56249a15ead51ad4d2117d5538ada24af05b693 (patch) | |
tree | ddb281b1b8d1a5ae2be291e460f96bd45b65705e /hw/xfree86/doc | |
parent | f1f8df1889ab656bb57596e2f85408f15f42cd5d (diff) | |
parent | ec84f72d077eaf2e7768a1f5398f65a5e1714d08 (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Diffstat (limited to 'hw/xfree86/doc')
-rw-r--r-- | hw/xfree86/doc/man/Xorg.man.pre | 6 | ||||
-rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre index d91b79641..43f0518d2 100644 --- a/hw/xfree86/doc/man/Xorg.man.pre +++ b/hw/xfree86/doc/man/Xorg.man.pre @@ -426,6 +426,12 @@ Print out the server version, patchlevel, release date, the operating system/platform it was built on, and whether it includes module loader support. .TP 8 +.B \-showDefaultModulePath +Print out the default module path the server was compiled with. +.TP 8 +.B \-showDefaultLibPath +Print out the path libraries should be installed to. +.TP 8 .BI \-config " file" Read the server configuration from .IR file . diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index abf31468a..8d52b2bcf 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -311,7 +311,6 @@ font path elements: .I __projectroot__/lib/X11/fonts/misc/ .I __projectroot__/lib/X11/fonts/TTF/ .I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/CID/ .I __projectroot__/lib/X11/fonts/75dpi/ .I __projectroot__/lib/X11/fonts/100dpi/ .fi @@ -326,7 +325,6 @@ The recommended font path contains the following font path elements: .I __projectroot__/lib/X11/fonts/75dpi/:unscaled .I __projectroot__/lib/X11/fonts/100dpi/:unscaled .I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/CID/ .I __projectroot__/lib/X11/fonts/Speedo/ .I __projectroot__/lib/X11/fonts/75dpi/ .I __projectroot__/lib/X11/fonts/100dpi/ |