From c3af16e542a1a74d3603b7e0bccfcc2af72cbe4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Mon, 11 Oct 2004 03:02:30 +0000
Subject: [PATCH] Added download locations for TrueType fonts and a note about
 editing font.alias file for i18n users, contributed by Alexander E. Patrakov.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@2786 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 ++++
 x/installing/x-setup.xml           | 21 +++++++++++++++++++++
 x/installing/xorg.xml              |  3 +++
 3 files changed, 28 insertions(+)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 145c568309..f5bf2781c6 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,6 +22,10 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>October 10th, 2004 [igor]: Added download locations for
+TrueType fonts and a note about editing font.alias file for i18n users,
+contributed by Alexander E. Patrakov.</para></listitem>
+
 <listitem><para>October 10th, 2004 [igor]: Updated to
 Xorg-6.8.1.</para></listitem>
 
diff --git a/x/installing/x-setup.xml b/x/installing/x-setup.xml
index 1563a2a892..1d62057a9a 100644
--- a/x/installing/x-setup.xml
+++ b/x/installing/x-setup.xml
@@ -54,6 +54,8 @@ be completed to make the fonts available.</para>
 <listitem><para>Establish a directory for the fonts and move any 
 <application>TrueType</application> fonts you want into that directory.</para></listitem>
 
+<listitem><para>Download the fonts.</para></listitem>
+
 <listitem><para>Create the <filename>fonts.scale</filename> and 
 <filename>fonts.dir</filename> files in the
 <application>TrueType</application> font 
@@ -82,6 +84,16 @@ into that directory.  If not, create a new directory, preferably in
 the <filename class="directory">/usr/X11R6/lib/X11/fonts/</filename> directory and put 
 your <application>TrueType</application> fonts there.</para></sect3>
 
+<sect3><title>Download the fonts</title>
+
+<para>There are two known high quality free font resources:
+<ulink url="http://www.nongnu.org/freefont/"/> and <ulink
+url="http://corefonts.sourceforge.net/"/>. Copy the fonts (files with
+the <filename>.ttf</filename> suffix) to the directory you've just
+created.</para>
+    
+</sect3>
+
 <sect3><title>Create <filename>fonts.scale</filename> and 
 <filename>fonts.dir</filename></title>
 
@@ -164,6 +176,15 @@ between keyboard layouts and use the Scroll Lock <acronym>LED</acronym> to indic
 the second layout is active.</para>
 </sect2>
 
+<!-- ================================================== -->
+<sect2>
+<title>Setting up fonts</title>
+<para>For users not using the <acronym>ISO</acronym>-8859-1 locale, the 
+<filename>/usr/X11R6/lib/X11/fonts/misc/fonts.alias</filename> file must
+be edited to ensure the fonts with the correct encoding are used for
+"fixed", "variable", "10x20" and similar aliases.</para>
+</sect2>
+
 <!-- ================================================== -->
 <sect2>
 <title>Setting up XDM</title>
diff --git a/x/installing/xorg.xml b/x/installing/xorg.xml
index 67931dc272..7d3b203537 100644
--- a/x/installing/xorg.xml
+++ b/x/installing/xorg.xml
@@ -333,6 +333,9 @@ things you may want to do are:</para>
 You may want to put 100dpi fonts ahead of 75dpi fonts if your system normally
 comes up closer to 100 dots per inch.  You may want to remove some font
 directories completely.</para></listitem>
+
+<listitem><para>Section "Module". If you are going to install NVidia
+drivers remove the "dri" line.</para></listitem>
  
 <listitem><para>Sections "InputDevice". Specify the
 <parameter>Device</parameter> parameter to "/dev/input/mice" and