[PATCH 2/2] Update man-pages for new default font paths

[Alan Coopersmith]

Reviewed-by: Alan Coopersmith <alan.coopersmith at sun.com>

Ingmar Vanhassel wrote:
> ---
>  doc/Xserver.man.pre                  |    4 ++--
>  hw/xfree86/doc/man/Xorg.man.pre      |    2 +-
>  hw/xfree86/doc/man/xorg.conf.man.pre |   12 ++++++------
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
> index 6154191..8144c8a 100644
> --- a/doc/Xserver.man.pre
> +++ b/doc/Xserver.man.pre
> @@ -551,10 +551,10 @@ the following font path:
>  .I /etc/X\fBn\fP.hosts
>  Initial access control list for display number \fBn\fP
>  .TP 30
> -.IR __projectroot__/lib/X11/fonts/misc , __projectroot__/lib/X11/fonts/75dpi , __projectroot__/lib/X11/fonts/100dpi
> +.IR __datadir__/fonts/X11/misc , __datadir__/fonts/X11/75dpi , __datadir__/fonts/X11/100dpi
>  Bitmap font directories
>  .TP 30
> -.IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Type1
> +.IR __datadir__/fonts/X11/TTF , __datadir__/fonts/X11/Type1
>  Outline font directories
>  .TP 30
>  .I /tmp/.X11-unix/X\fBn\fP
> diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
> index 2f9ff98..fe32800 100644
> --- a/hw/xfree86/doc/man/Xorg.man.pre
> +++ b/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/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
> index e3c897b..ace041c 100644
> --- a/hw/xfree86/doc/man/xorg.conf.man.pre
> +++ b/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

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering