Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ introduction/welcome/changelog.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -10,4 +10,13 @@
 
 <itemizedlist>
+
+<listitem><para>September 14th, 2002 [bdubbs]: KDE: Remove objprelink.
+Update to KDE 3.0.3.</para></listitem>
+
+<listitem><para>September 14th, 2002 [bdubbs]: XFree86: Update to 
+use freetype2.</para></listitem>
+
+<listitem><para>September 14th, 2002 [bdubbs]: XFree86: Add 
+freetype2.</para></listitem>
 
 <listitem><para>September 13th, 2002 [larry]: Gnome: Added
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/core/arts.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -1,9 +1,9 @@
 <sect1 id="kde-core-arts">
 <?dbhtml filename="arts.html" dir="kde"?>
-<title>arts-&arts-version;</title>
+<title>aRts-&arts-version;</title>
 
-<para>arts is required in order to install KDE.  The installation
-instructions for arts can be found in <xref linkend="arts"/>.  You must
-have installed arts before proceeding to install KDE.</para>
+<para>aRts is required in order to install KDE.  The installation
+instructions for aRts can be found in <xref linkend="arts"/>.  You must
+have installed aRts before proceeding to install KDE.</para>
 
 </sect1>
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/core/core.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,4 @@
 <title>KDE Core Packages</title>
 
-&objprelink;
 &kde-core-arts;
 &kde-libs;
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-addons.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Addons</title>
 
-<para><screen>Estimated build disk space:  17 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-addons-ftp;"/> 
+Estimated build disk space:  17 MB
 Estimated installed space:    5 MB
 Package size:                &kde-addons-size;
@@ -9,9 +10,9 @@
 
 <para>kdeaddons depends on:
-<screen><xref linkend="kde-base"/>, <xref linkend="kde-multimedia"/>, and <xref linkend="kde-network"/>.</screen></para>
+<screen><xref linkend="kde-multimedia"/> and <xref linkend="kde-network"/>.</screen></para>
 
 <para>Install kdeaddons with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-admin.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Admin</title>
 
-<para><screen>Estimated build disk space:  18 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-admin-ftp;"/> 
+Estimated build disk space:  18 MB
 Estimated installed space:    4 MB
 Package size:                &kde-admin-size;
@@ -14,6 +15,6 @@
 
 <para>Install kdeadmin with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking --with-shadow &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking --with-shadow &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-artwork.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Artwork</title>
 
-<para><screen>Estimated build disk space:  32 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-artwork-ftp;"/> 
+Estimated build disk space:  32 MB
 Estimated installed space:   21 MB
 Package size:                &kde-base-size;
@@ -12,6 +13,6 @@
 
 <para>Install kdeartwork with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-base.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -1,5 +1,6 @@
 <sect1 id="kde-base" xreflabel="kde-base-&kde-version;">
 <title>Installing kdebase</title>
-<para><screen>Estimated build disk space: 132 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-base-ftp;"/>
+Estimated build disk space: 132 MB
 Estimated installed space:   45 MB
 Package size:                &kde-base-size;
@@ -8,6 +9,6 @@
 <para>kdebase can use many optional libraries and programs.  The following are
 recommended:
-<screen><xref linkend="openssl"/>, lesstif, <xref linkend="CDParanoia"/>, <xref linkend="libvorbis"/>,
-shadow, cups, and <xref linkend="objprelink"/>.</screen></para>
+<screen><xref linkend="openssl"/>, <xref linkend="lesstif"/>, <xref linkend="CDParanoia"/>, <xref linkend="libvorbis"/>,
+shadow (in the LFS book), and cups.</screen></para>
 
 <para>Other programs and libraries that can be used by kdebase are:
@@ -18,7 +19,6 @@
 
 <para>Install kdebase with:
-<screen><userinput>./configure --prefix=&kde-dir;  --enable-objprelink \
-     --disable-debug --disable-dependency-tracking --disable-lametest \
-     --with-shadow &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+     --disable-dependency-tracking --disable-lametest --with-shadow &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
@@ -34,4 +34,30 @@
 support.</para>
 </sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in Kde-base include:</para>
+
+<itemizedlist>
+<listitem><para>kdesktop - the program that handles desktop icons, popup menus, and the
+                screensaver system.</para></listitem>
+<listitem><para>kaddressbook - a simple addressbook</para></listitem> 
+<listitem><para>kappfinder - utility to add non-KDE applications to K-menu</para></listitem> 
+<listitem><para>kcontrol - KDE Control Center</para></listitem> 
+<listitem><para>kdeprint - Print job administration</para></listitem> 
+<listitem><para>kdm - KDE Display manager (a replacement for xdm</para></listitem> 
+<listitem><para>kfind - utility to find files</para></listitem> 
+<listitem><para>khelpcenter - kde help tool</para></listitem> 
+<listitem><para>khotkeys - handles hot keys for KDE</para></listitem> 
+<listitem><para>kicker - KDE control panel</para></listitem> 
+<listitem><para>klipper - a clipboard utility</para></listitem> 
+<listitem><para>kmenuedit - utility to reaggange or add to the K-menu</para></listitem> 
+<listitem><para>konqueror - a filesystem and Web browser</para></listitem> 
+<listitem><para>konsole - a highly configurable X terminal emulator</para></listitem> 
+<listitem><para>kscreensaver - program to set up screensavers</para></listitem> 
+<listitem><para>ktip - wizard to provide hints and KDE information</para></listitem> 
+</itemizedlist>
+</sect2>
    
 </sect1>
Index: kde/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-edu.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Edu</title>
 
-<para><screen>Estimated build disk space:  37 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-edu-ftp;"/> 
+Estimated build disk space:  37 MB
 Estimated installed space:   15 MB
 Package size:                &kde-edu-size;
@@ -12,6 +13,6 @@
 
 <para>Install kdeedu with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-games.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Games</title>
 
-<para><screen>Estimated build disk space:  54 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-games-ftp;"/> 
+Estimated build disk space:  54 MB
 Estimated installed space:   20 MB
 Package size:                &kde-games-size;
@@ -12,6 +13,6 @@
 
 <para>Install kdegames with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-graphics.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Graphics</title>
 
-<para><screen>Estimated build disk space:  24 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-graphics-ftp;"/>  
+Estimated build disk space:  24 MB
 Estimated installed space:    7 MB
 Package size:                &kde-graphics-size;
@@ -14,6 +15,6 @@
 
 <para>Install kdegraphics with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-libs.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -2,5 +2,6 @@
 <title>Installing kdelibs</title>
  
-<para><screen>Estimated build disk space: 115 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-libs-ftp;"/>
+Estimated build disk space: 115 MB
 Estimated installed space:   41 MB
 Package size:                &kde-libs-size;
@@ -10,5 +11,5 @@
 recommended:
 <screen><xref linkend="openssl"/>, <xref linkend="alsa"/>, <xref linkend="pcre"/>, <xref linkend="libxml2"/>,
-<xref linkend="libxslt"/>, cups, and <xref linkend="objprelink"/>.</screen></para>
+<xref linkend="libxslt"/>, and cups.</screen></para>
 
 <para>Other programs and libraries that can be used by kdelibs are:
@@ -16,7 +17,6 @@
 
 <para>Install kdelibs with:
-<screen><userinput>./configure --prefix=&kde-dir;  --enable-objprelink \
-     --disable-debug --disable-dependency-tracking --with-alsa  \
-     --enable-fast-malloc=full &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>       
@@ -25,13 +25,4 @@
 <para><userinput>--prefix=&kde-dir;:</userinput> This option tells
 the process to install the package in &kde-dir;.</para>
-
-<warning><para><filename>objprelink</filename> has been known to cause 
-problems on some systems.  If it does not work on your system you will 
-have to rebuild kde without it.  This applies to all KDE 
-packages.</para></warning>
-
-<para><userinput>--enable-objprelink:</userinput> This option enables
-the linking process to optimize executable loading times by prelinking
-many internal references.</para>
 
 <para><userinput>--disable-debug:</userinput> This option causes the
@@ -54,7 +45,6 @@
 
 <sect2><title>Contents</title>
-<para>kde-libs provices:</para>
+<para>kde-libs provides numerous libraries needed by kde programs.</para>
 
-<para>To be done.</para>
 </sect2>
 </sect1>
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-multimedia.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -1,7 +1,8 @@
-<sect1 id="kde-multimedia">
+<sect1 id="kde-multimedia" xreflabel="kde-multimedia-&kde-version;">
 <?dbhtml filename="kde-multimedia.html" dir="kde"?>
 <title>Installation of KDE Multimedia</title>
 
-<para><screen>Estimated build disk space:  69 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-multimedia-ftp;"/> 
+Estimated build disk space:  69 MB
 Estimated installed space:   15 MB
 Package size:                &kde-multimedia-size;
@@ -9,9 +10,9 @@
 
 <para>kdemultimedia depends on:
-<screen><xref linkend="arts"/>, <xref linkend="kde-libs"/>, and <xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/>.</screen></para>
 
 <para>Install kdemultimedia with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking --with-arts-alsa &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking --with-arts-alsa &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-network.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -1,7 +1,8 @@
-<sect1 id="kde-network">
+<sect1 id="kde-network" xreflabel="kde-network-&kde-version;">
 <?dbhtml filename="kde-network.html" dir="kde"?>
 <title>Installation of KDE Network</title>
 
-<para><screen>Estimated build disk space:  52 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-network-ftp;"/>
+Estimated build disk space:  52 MB
 Estimated installed space:   16 MB
 Package size:                &kde-network-size;
@@ -12,6 +13,6 @@
 
 <para>Install kdenetwork with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-pim.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE PIM</title>
 
-<para><screen>Estimated build disk space:  50 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-pim-ftp;"/> 
+Estimated build disk space:  50 MB
 Estimated installed space:    7 MB
 Package size:                &kde-pim-size;
@@ -16,6 +17,6 @@
 
 <para>Install kdepim with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-toys.xml
===================================================================
--- kde/inst/kde-toys.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-toys.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,5 +3,6 @@
 <title>Installation of KDE Toys</title>
 
-<para><screen>Estimated build disk space:  12 MB
+<para><screen>Download location (FTP):    <ulink url="&kde-toys-ftp;"/> 
+Estimated build disk space:  12 MB
 Estimated installed space:    4 MB
 Package size:                &kde-toys-size;
@@ -12,6 +13,6 @@
 
 <para>Install kdetoys with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/inst/kde-utils.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,7 +3,8 @@
 <title>Installation of KDE Utils</title>
 
-<para><screen>Estimated build disk space:  23 MB
-Estimated installed space:    6 MB
-Package size:                &kde-utils-size;
+<para><screen>Download location (FTP):    <ulink url="&kde-utils-ftp;"/> 
+Estimated build disk space:  23 MB
+Estimated installed space:     6 MB
+Package size:                 &kde-utils-size;
 Estimated build time:        13 min (667 MHz)</screen></para>
 
@@ -12,6 +13,6 @@
 
 <para>Install kdeutils with:
-<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/kde-intro.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -1,7 +1,4 @@
 <partintro>
 <title>Introduction to KDE</title>
-
-<screen>Download location:         <ulink url="&kde-download;"/>
-Version used:              &kde-version;</screen>
 
 <para>
@@ -15,8 +12,9 @@
 provides extensive capabilites for customization.</para>
 
-<para>We divide the KDE instructions into three parts.  Firstly, the
-core packages which you need for the rest of KDE to work.  Secondly,
-additional packages which provide functionality in various areas
-(multimedia, graphics etc) and finally, other KDE packages.</para>
+<para>We divide the KDE instructions into three parts.  The first part, the
+core packages, are needed for the rest of KDE to work.  The second part
+presents additional packages which provide functionality in various areas
+(multimedia, graphics etc).  Finally, we describe installation of other 
+miscellaneous KDE packages.</para>
 
 <para>KDE also has many internationalization packages in the form of:
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ kde/kde.ent	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -15,4 +15,5 @@
 <!-- Package entities -->
 
+<!--
 <!ENTITY objprelink SYSTEM "inst/objprelink.xml">
 <!ENTITY objprelink-buildsize "447 KB">
@@ -20,4 +21,5 @@
 <!ENTITY objprelink-download "http://objprelink.sourceforge.net/objprelink-1.c">
 <!ENTITY objprelink-size "427 KB">
+-->
 
 <!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
@@ -41,16 +43,33 @@
 <!ENTITY kdm SYSTEM "inst/kdm.xml">
 
+<!ENTITY kde-version "3.0.3">
+<!ENTITY kde-download "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src">
+<!ENTITY kde-dir "/opt/kde303">
+
+<!ENTITY kde-libs-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
 <!ENTITY kde-libs-size "7.2 MB">
+<!ENTITY kde-base-ftp "&kde-download;/kdebase-&kde-version;.tar.bz2">
 <!ENTITY kde-base-size "12.0 MB">
+<!ENTITY kde-multimedia-ftp "&kde-download;/kdemultimedia-&kde-version;.tar.bz2">
 <!ENTITY kde-multimedia-size "5.5 MB">
+<!ENTITY kde-network-ftp "&kde-download;/kdenetwork-&kde-version;.tar.bz2">
 <!ENTITY kde-network-size "3.7 MB">
+<!ENTITY kde-graphics-ftp "&kde-download;/kdegraphics-&kde-version;.tar.bz2">
 <!ENTITY kde-graphics-size "2.5 MB">
+<!ENTITY kde-pim-ftp "&kde-download;/kdepim-&kde-version;.tar.bz2">
 <!ENTITY kde-pim-size "3.0 MB">
+<!ENTITY kde-admin-ftp "&kde-download;/kdeadmin-&kde-version;.tar.bz2">
 <!ENTITY kde-admin-size "1.2 MB">
+<!ENTITY kde-games-ftp "&kde-download;/kdegames-&kde-version;.tar.bz2">
 <!ENTITY kde-games-size "6.9 MB">
+<!ENTITY kde-utils-ftp "&kde-download;/kdeutils-&kde-version;.tar.bz2">
 <!ENTITY kde-utils-size "1.4 MB">
+<!ENTITY kde-edu-ftp "&kde-download;/kdeedu-&kde-version;.tar.bz2">
 <!ENTITY kde-edu-size   "8.7 MB">
+<!ENTITY kde-artwork-ftp "&kde-download;/kdeartwork-&kde-version;.tar.bz2">
 <!ENTITY kde-artwork-size "10.0 MB">
+<!ENTITY kde-toys-ftp "&kde-download;/kdetoys-&kde-version;.tar.bz2">
 <!ENTITY kde-toys-size "1.3 MB">
+<!ENTITY kde-addons-ftp "&kde-download;/kdeaddons-&kde-version;.tar.bz2">
 <!ENTITY kde-addons-size "899 KB">
 <!ENTITY kdoc-size "??? MB">
@@ -60,5 +79,2 @@
 <!ENTITY kdm-size "??? MB">
 
-<!ENTITY kde-version "3.0.2">
-<!ENTITY kde-download "ftp://ftp.kde.org/pub/kde/stable/3.0.2/src">
-<!ENTITY kde-dir "/opt/kde302">
Index: multimedia/libdriv/arts.xml
===================================================================
--- multimedia/libdriv/arts.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ multimedia/libdriv/arts.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,18 +3,20 @@
 <title>aRts-&arts-version;</title>
 
-<para><screen>Estimated build disk space:  35 MB
-Estimated installed space:  5.7 MB
-Package size:                &arts-size;
-Estimated build time:        11 min (667 MHz)</screen></para>
+<para><screen>Download location (FTP):    <ulink url="&arts-download-ftp;"/>
+Version used:               &arts-version;
+Package size:               &arts-download-size;
+Estimated build disk space: &arts-build-size;
+Estimated installed space:  &arts-install-size;
+Estimated build time:       &arts-build-time;</screen></para>
 
 <para>The Analog Realtime Synthesizer (aRts) provides sound support for KDE.  
 It provides necessary libraries for kdelibs.  It will use the 
 following optional packages, if installed:
-<screen><xref linkend="alsa"/>, <xref linkend="audiofile"/>, <xref linkend="libvorbis"/>, 
-and <xref linkend="objprelink"/>.</screen></para>
+<screen><xref linkend="alsa"/>, <xref linkend="audiofile"/>, and <xref linkend="libvorbis"/>.</screen>
+</para>
 
 <para>
-<screen><userinput>./configure --prefix=&kde-dir;  --enable-objprelink \
-     --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -23,21 +25,11 @@
 <note><para>Another configure option is <userinput>--enable-final</userinput>. 
 This option can speed up the build process, but requires a lot of memory.  If
-you have less than 256MB of RAM, this option will cause swapping and 
-significantly slow compilation. This option applies to all the 
-kde packages.</para></note>
+you have less than 256MB of RAM, this option may cause swapping and 
+significantly slow compilation.</para></note>
 
 <sect2><title>aRts Installation Commmand explanations</title>
 <para><userinput>--prefix=&kde-dir;:</userinput> This option tells the
-process to install the package in &kde-dir;.</para>
-
-<warning><para>
-<filename>objprelink</filename> has been known to cause problems on some 
-systems.  If it does not work on your system you will have to rebuild kde 
-without it.</para></warning>
-
-<para><userinput>--enable-objprelink:</userinput> This option enables
-the linking process to optimize executable loading times by prelinking 
-many internal references.
-</para>
+process to install the package in &kde-dir;.  We put aRts here because this
+package is required before installing KDE.</para>
 
 <para><userinput>--disable-debug:</userinput> This option causes the
Index: x/installing/dri.xml
===================================================================
--- x/installing/dri.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/dri.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -11,102 +11,99 @@
 <note><para>These instructions were developed from the DRI Compilation Guide at 
 <userinput><ulink url="http://www.xfree86.org/4.2.0/DRIcomp.html"/></userinput> 
-and modified for more recent versions of the DRI.
-</para></note>
-
-<para>
-The DRI drivers generally work on systems with Intel or AMD CPUs. However, 
-there is limited support for Alpha and PowerPC support underway.
-</para>
-
-<para>
-DRI support is currently in beta status.  The following video cards are 
+and modified for more recent versions of the DRI.</para></note>
+
+<para>The DRI drivers generally work on systems with Intel or AMD CPUs. 
+However, there is limited support for Alpha and PowerPC support 
+underway.</para>
+
+<para>DRI support is currently in beta status.  The following video cards are 
 presently supported:</para>
+
 <itemizedlist> 
+
  <listitem><para>3dfx (Voodoo 5 5500, Voodoo4 4500, Voodoo3 3500 TV, 
  Voodoo3 3000 {AGP, PCI}, Voodoo3 2000 {AGP, PCI}, Voodoo Banshee, 
- Velocity 100/200)
- </para></listitem>
- <listitem><para>Matrox (G200, G400)
- </para></listitem>
+ Velocity 100/200)</para></listitem>
+ 
+ <listitem><para>Matrox (G200, G400) </para></listitem>
+
  <listitem><para>Intel Motherboard Chipsets (i810, i810-dc100, i810e, i815, 
- i830)
- </para></listitem>
+ i830) </para></listitem>
+ 
  <listitem><para>ATI (Rage {128, Fury, Magnum}, XPERT {2000, 128, 99}, 
- All-in-Wonder 128, Radeon {SDR AGP, DDR AGP, 32MB SDR PCI}
- </para></listitem>
- <listitem><para>3Dlabs (Oxygen 2000) [No longer actively being developed]
- </para></listitem>
+ All-in-Wonder 128, Radeon {SDR AGP, DDR AGP, 32MB SDR PCI} </para></listitem>
+ 
+ <listitem><para>3Dlabs (Oxygen 2000) [No longer actively being 
+ developed] </para></listitem>
+
 </itemizedlist>
 
-<para>
-For 3dfx Voodoo3 hardware, you'll also need Glide3 headers and runtime library.
-These can be obtained from 
-<userinput><ulink url="http://linux.3dfx.com"/></userinput>.
-</para>
+<para>For 3dfx Voodoo3 hardware, you'll also need Glide3 headers and 
+runtime library.  These can be obtained 
+from <userinput><ulink url="http://linux.3dfx.com"/></userinput>.</para>
 
 <sect2><title>Updating the Kernel</title>
-<para>
-In the kernel configuration "Character Devices" section, 
+
+<para>In the kernel configuration "Character Devices" section, 
 if you havn't already done so, <emphasis>enable</emphasis> Direct Rendering 
 Manager. Also select the type of video card(s) that you want to support as 
 a <emphasis>module</emphasis>.  This is necessary to ensure the kernel
-has the proper linkages when the DRI code is compiled.
-</para>
+has the proper linkages when the DRI code is compiled.</para>
+
 <para>If necessary, recompile the kernel with
-<screen>make dep &amp;&amp;
+<screen><userinput>make dep &amp;&amp;
 make bzImage&amp;&amp;
 make modules &amp;&amp;
-make modules_install</screen>
-</para>
-<para>
-Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
+make modules_install</userinput></screen></para>
+
+<para>Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
 <filename>/usr/src/linux/System.map</filename> to 
 <filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
-appropriately and run <userinput>lilo</userinput>.
-</para>
-</sect2>
-
-<sect2>
-<title>Getting the DRI driver source code</title>
-<para>
-Get the DRI sources by
-<screen>cd /usr/src
+appropriately and run <userinput>lilo</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Getting the DRI driver source code</title>
+
+<para>Get the DRI sources by
+<screen><userinput>cd /usr/src
 mkdir DRI-CVS
 cd DRI-CVS
-cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
+cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login</userinput>
     (hit ENTER when prompted for a password)
-cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc</screen>
-</para> 
+<userinput>cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc</userinput></screen></para> 
+
 <note><para>The -z3 flag causes compression to be used in order to reduce the 
 download time.</para></note>
 
 <para>Since, the DRI drivers are beta, you can update the sources by
-<screen>cd /usr/src/DRI-CVS
-cvs -z3 update -dA xc</screen></para>
+<screen><userinput>cd /usr/src/DRI-CVS
+cvs -z3 update -dA xc</userinput></screen></para>
       
 <para>There is no need to download or install the Mesa source files separately.
-The download is about 99Mb and the build size 477Mb.
-</para>
+The download is about 99Mb and the build size 477Mb.</para>
+
 </sect2>
 
 <sect2><title>Building the DRI</title>
+
 <para>DRI drivers will be built in a separate directory from the main XFree86 
 sources.  To access the proper files, link the files to a build directoy:
-<screen>cd /usr/src/DRI-CVS
+<screen><userinput>cd /usr/src/DRI-CVS
 ln -s xc XFree40
 mkdir build
 cd build
-lndir -silent -ignorelinks ../XFree40</screen>
-</para>
+lndir -silent -ignorelinks ../XFree40</userinput></screen></para>
             
 <para>Now update the <filename>host.def</filename> file. The only change 
 necessary is to uncomment the <parameter>BuildXF86DRM</parameter> define.
-Since DRI is still in Beta, changing the optimizations is not recommended.
-</para>
-<para>
-If you do not want to build all the drivers, change 
-<parameter>XF86CardDrivers</parameter> and <parameter>DriDrivers</parameter>
-to eliminate those that you don't want.
-</para>
+Since DRI is still in Beta, changing the optimizations is not 
+recommended.</para>
+
+<para>If you do not want to build all the drivers, 
+change <parameter>XF86CardDrivers</parameter> 
+and <parameter>DriDrivers</parameter> to eliminate those that 
+you don't want.</para>
+
 <para>Ensure the Linux 2.4.x headers are available in 
 <filename>/usr/src/linux/include/linux</filename>.</para>
@@ -118,38 +115,43 @@
 number.</para>
 
-
 <sect3><title>Compiling the DRI</title>
 
-<note><para>
-If you build XFree86 in a chroot environment, make sure the kernel version of the base
-system and the target system are the same. 
-</para></note>
-
-<warning><para>Do not use -j option for <filename>make</filename></para>
-</warning>
-
-<para>Build the system by                    
-<screen>cd xc &amp;&amp;
-make World 2&gt;&amp;1 | tee World.log</screen></para>
-
-<para>Using <userinput>less</userinput> or an editor, examine 
-<filename>World.log</filename>
-for errors by searching for the pattern ***.  Also examine the directory
-<filename>/usr/src/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/</filename>
-for the drivers you built:</para>
+<note><para>If you build XFree86 in a chroot environment, make sure the 
+kernel version of the base system and the target system are 
+the same.</para></note>
+
+<warning><para>Do not use -j option 
+for <filename>make</filename></para></warning>
+
+<para>Build the system using:
+<screen><userinput>cd xc &amp;&amp;
+make World 2&gt;&amp;1 | tee World.log</userinput></screen></para>
+
+<para>Using <userinput>less</userinput> or an editor, 
+examine <filename>World.log</filename> for errors by searching for 
+the pattern ***.  Also examine the 
+directory <filename>/usr/src/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/</filename> for 
+the drivers you built:</para>
+
 <itemizedlist>
-<listitem><para>For the 3dfx Voodoo, you should see <filename>tdfx.o</filename>
-</para></listitem>
-<listitem><para>For the Matrox G200/G400, you should see
-<filename>mga.o</filename>
-</para></listitem>
-<listitem><para>For the ATI Rage 128, you should see <filename>r128.o</filename>
-</para></listitem>
-<listitem><para>For the ATI Radeon, you should see <filename>radeon.o</filename>
-</para></listitem>
-<listitem><para>For the Intel i81x, you should see <filename>i810.o</filename>
-</para></listitem>
-<listitem><para>For the Intel i830, you should see <filename>i830.o</filename>
-</para></listitem>
+
+<listitem><para>For the 3dfx Voodoo, you should 
+see <filename>tdfx.o</filename></para></listitem>
+
+<listitem><para>For the Matrox G200/G400, you should 
+see <filename>mga.o</filename></para></listitem>
+
+<listitem><para>For the ATI Rage 128, you should 
+see <filename>r128.o</filename></para></listitem>
+
+<listitem><para>For the ATI Radeon, you should 
+see <filename>radeon.o</filename></para></listitem>
+
+<listitem><para>For the Intel i81x, you should 
+see <filename>i810.o</filename></para></listitem>
+
+<listitem><para>For the Intel i830, you should 
+see <filename>i830.o</filename></para></listitem>
+
 </itemizedlist>
 
@@ -158,6 +160,7 @@
 
 <sect2><title>Installing the DRI drivers</title>
-<para>Copy the kernel module that for your video card to 
-<filename>/lib/modules/2.4.x/kernel/drivers/char/drm/</filename> 
+
+<para>Copy the kernel module that for your video card 
+to <filename>/lib/modules/2.4.x/kernel/drivers/char/drm/</filename> 
 then run <userinput>modprobe &lt;module name&gt;</userinput>.</para>
  
@@ -167,13 +170,12 @@
 <para>Now install the other portions of the DRI that were built and ensure the
 libraries can be found correctly
-<screen>make install &amp;&amp;
-ldconfig</screen></para>
-
-<para>
-If you use X locale information, do the following
-<screen>cd /usr/src/DRI-CVS/build/xc/nls
+<screen><userinput>make install &amp;&amp;
+ldconfig</userinput></screen></para>
+
+<para>If you use X locale information, do the following
+<screen><userinput>cd /usr/src/DRI-CVS/build/xc/nls
 ../config/util/xmkmf -a
 make
-make install</screen></para>
+make install</userinput></screen></para>
                         
 </sect2>
@@ -181,16 +183,12 @@
 <sect2><title>Configuring XFree86 for the DRI</title>
       
-<para>On the DRI web site, 
-<userinput><ulink url="http://dri.sourceforge.net"/></userinput>, 
-in the resources section, you'll find example 
-<filename>XF86Config</filename> 
+<para>On the DRI web site, <ulink url="http://dri.sourceforge.net"/>,
+in the resources section, you'll find example <filename>XF86Config</filename> 
 files for a number of graphics cards. These configuration files also setup 
-DRI options so it's highly recommended that you look at these examples.
-</para>      
-                                             
+DRI options so it's highly recommended that you look at these examples.</para>      
 <para>Generally you can start with your existing configuration file,
 <filename>/etc/X11/XFConfig-4</filename>, but if you run into trouble
-you may want to start with a new file as in the basic XFree86 installation.
-</para>
+you may want to start with a new file as in the basic XFree86 
+installation.</para>
 
 <para>Edit <filename>XF86Config-4</filename> to ensure
@@ -212,12 +210,11 @@
 
 <para>Make any other changes for font paths, screen modes, etc., as needed 
-and save the configuration file.
-</para>
-
-<note><para>
-DMA-based DRI drivers (that's most DRI drivers) cannot function unless 
-bus mastering is enabled for your graphics card. By default, some systems 
-don't having bus mastering on. You should enable it in your BIOS.
-</para></note>
+and save the configuration file.</para>
+
+<note><para>DMA-based DRI drivers (that's most DRI drivers) cannot function 
+unless bus mastering is enabled for your graphics card. By default, some 
+systems don't having bus mastering on. You should enable it in your 
+BIOS.</para></note>
+
 </sect2>
  
@@ -226,6 +223,5 @@
 <para>Start (or restart) XFree86 with <userinput>startx</userinput>.</para>
 
-<para>
-Check the XFree86 log file, <filename>/var/log/XFree86.0.log</filename>,
+<para>Check the XFree86 log file, <filename>/var/log/XFree86.0.log</filename>,
 for a statements like
 <screen>(II) R128(0): [drm] installed DRM signal handler
@@ -276,6 +272,5 @@
 0x28 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  8  0  0  0  0  0 0 Slow
 0x29 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  0 16 16 16  0  0 0 Slow
-0x2a 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  8 16 16 16  0  0 0 Slow</screen>
-</para>
+0x2a 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  8 16 16 16  0  0 0 Slow</screen></para>
 
 <para>Run <userinput>ldd /usr/X11R6/bin/glxgears</userinput> and look for 
@@ -295,12 +290,11 @@
 <filename>xterm</filename> will display how many frames were drawn every 
 five seconds so this is a reasonable benchmark.  The window is scalable, and 
-the frames drawn per second is highly dependent on the size of the window.
-</para>
-
-<para>
-For troubleshooting problems, check the DRI Users Guide at
-<userinput><ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/></userinput>.
-</para>
-</sect2>
+the frames drawn per second is highly dependent on the size of 
+the window.</para>
+
+<para>For troubleshooting problems, check the DRI Users Guide at
+<userinput><ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/></userinput>.</para>
+
+</sect2>
+
 </sect1>
-
Index: x/installing/truetype.xml
===================================================================
--- x/installing/truetype.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/truetype.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -3,25 +3,27 @@
 <title>Adding TrueType font support to XFree86</title>
 
-<para>
-TrueType font support is now built into XFree86.  The following items need to 
-be completed to make the fonts available.
-</para>
+<para>TrueType font support is now built into XFree86.  The following items need to 
+be completed to make the fonts available.</para>
+
 <itemizedlist>
 
-<listitem><para>Establish a directory for the fonts and move any TrueType fonts
-you want into that directory.
-</para></listitem>
+<listitem><para>Establish a directory for the fonts and move any 
+TrueType fonts you want into that directory.</para></listitem>
+
 <listitem><para>Create the <filename>fonts.scale</filename> and 
-<filename>fonts.dir</filename> files in the TrueType font directory.
-</para></listitem>
+<filename>fonts.dir</filename> files in the TrueType font 
+directory.</para></listitem>
+
 <listitem><para>Ensure the truetype module is loaded in 
-<filename>XF86Config</filename>.
-</para></listitem>
+<filename>XF86Config</filename>.</para></listitem>
+
 <listitem><para>Ensure the <parameter>FontPath</parameter> in 
-<filename>XF86Config</filename> contains the TrueType font directory.
-</para></listitem>
+<filename>XF86Config</filename> contains the TrueType font 
+directory.</para></listitem>
+
 </itemizedlist>
 
 <sect2><title>Establish a TrueType font directory</title>
+
 <para>The build of XFree86 as given above automatically creates a TrueType
 font directory: <filename>/usr/X11R6/lib/X11/fonts/TTF</filename>.  This
@@ -30,9 +32,9 @@
 into that directory.  If not, create a new directory, preferably in
 the <filename>/usr/X11R6/lib/X11/fonts/</filename> directory and put 
-your TrueType fonts there.
-</para></sect2>
+your TrueType fonts there.</para></sect2>
 
 <sect2><title>Create <filename>fonts.scale</filename> and 
 <filename>fonts.dir</filename></title>
+
 <para>To make the <filename>fonts.scale</filename> file, you have to build the
 program <filename>ttmkfdir</filename>. Unfortunately, this program needs 
@@ -40,28 +42,22 @@
 that first.</para>
 
-<screen>Download location: 
-   <ulink url="http://prdownloads.sourceforge.net/freetype/freetype-1.3.1.tar.gz"/></screen>
+<screen>Download location (HTTP):       <ulink url="http://prdownloads.sourceforge.net/freetype/freetype-1.3.1.tar.gz"/></screen>
 
 <para>Unpack the file and build with
-<screen>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-ldconfig</screen>
-</para>
+ldconfig</userinput></screen></para>
 
-<para>
-Now build the <filename>ttmkfdir</filename> utility. 
-
+<para>Now build the <filename>ttmkfdir</filename> utility. 
 <screen>Download location: <ulink url="http://freshmeat.net/projects/ttmkfdir"/></screen> 
 The filename is <filename>ttmkfdir.tar.gz</filename>.
 </para>
 
-<para>
-This is a very short  program that unpacks it is files in the current 
+<para>This is a very short  program that unpacks it is files in the current 
 directory, so its best to make a separate directory.
-<screen>mkdir ttmkfdir &amp;&amp; 
+<screen><userinput>mkdir ttmkfdir &amp;&amp; 
 cd ttmkfdir &amp;&amp; 
-tar zxvf ../ttmkfdir.tar.gz</screen>
-</para>
+tar zxvf ../ttmkfdir.tar.gz</userinput></screen></para>
 
 <para>Edit the <filename>Makefile</filename> to make the following changes:
@@ -72,15 +68,12 @@
 
 <para>Run
-<screen>make &amp;&amp;
-install -m755 ttmkfdir /usr/bin</screen>
-</para>
+<screen><userinput>make &amp;&amp;
+install -m755 ttmkfdir /usr/bin</userinput></screen></para>
 
 <para>Now change to the directory where you have your TrueType fonts and run
 <screen>ttmkfdir -o fonts.scale &amp;&amp;
-mkfontdir</screen></para>
-</sect2>
+mkfontdir</screen></para></sect2>
 
-<sect2><title>Ensure TrueType is loaded in <filename>XF86Config</filename>
-</title> 
+<sect2><title>Ensure TrueType is loaded in <filename>XF86Config</filename></title> 
 <para>The "Module" section should look like:
 <screen>Section "Module"
@@ -88,6 +81,5 @@
         Load  "freetype"
         Load  "speedo"
-EndSection</screen>
-</para></sect2>
+EndSection</screen></para></sect2>
 
 <sect2><title>Ensure the <parameter>FontPath</parameter> in
@@ -97,12 +89,9 @@
         ...
         FontPath     "/usr/X11R6/lib/X11/fonts/TTF/"
-EndSection</screen>
-</para>
+EndSection</screen></para>
 
 <para>XFree86 will now be able to use TrueType fonts when it is restarted.
 You can check to see if the new fonts are available with the
-<userinput>xlsfonts</userinput> program.
-</para>
-</sect2>
+<userinput>xlsfonts</userinput> program.</para></sect2>
 
 </sect1>
Index: x/installing/xfree86/xfree86-config.xml
===================================================================
--- x/installing/xfree86/xfree86-config.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/xfree86/xfree86-config.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -9,68 +9,65 @@
 variable in <filename>.bash_profile</filename>.  The statement should
 look something like <userinput>PATH=$PATH:/usr/X11R6/bin</userinput>
-and be placed before the <userinput>export PATH</userinput> statement.
+and be placed before the <userinput>export PATH</userinput>
+statement.</para>
 
-Run
+<para>Run
 <screen>source ~/.bash_profile</screen></para>
 
-<para>Set up your mouse 
-<screen>cd /dev
-ln -s psaux mouse</screen>
+<para>Set up your mouse:
+<screen><userinput>cd /dev
+ln -s psaux mouse</userinput></screen>
 
 Adjust the symbolic link as necessary for other types of mice.  For instance, 
-a serial mouse on the first serial port would be linked to ttyS1.
-</para>
+a serial mouse on the first serial port would be linked to ttyS1.</para>
 
 <para>Create the XF86Config file with
-<screen>cd ~
-XFree86 -configure</screen>
+<screen><userinput>cd ~
+XFree86 -configure</userinput></screen>
 The screen will go black and you may hear some clicking of the monitor.  This
 command will create a file, <filename>XF86Config.new</filename> in your home
-directory.
-</para>
+directory.</para>
 
-<para>
-Edit <filename>XF86Config.new</filename> to suit your system.  The details 
-of the file are located in the man page <userinput>man XF86Config</userinput>.
-Some things you may want to do are:</para>
+<para>Edit <filename>XF86Config.new</filename> to suit your system.  The 
+details of the file are located in the man 
+page <userinput>man XF86Config</userinput>.  Some things you may want to 
+do are:</para>
+
 <itemizedlist>
+
 <listitem><para>Section "Files". Change the order of the font paths searched. 
-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".  Remove or comment out some of the modules.  The "glx"
-and "dri" sections are not operational until we install DRI below.  Leaving
-modules in does not hurt anything.
-</para></listitem>
-<listitem><para>
-Section "InputDevice".  You may want to change the keyboard autorepeat rate 
-by adding 
-<userinput>Option "Autorepeat" "250 30"</userinput>.
-</para></listitem>
-<listitem><para>
-Section "Screen".  Add a DefaultDepth statement such as:
-<userinput>DefaultDepth 16</userinput>. In the SubSection for your default
-depth, add a modes line such as: 
-<userinput> Modes "1280x1024" "1024x768"</userinput>.
-The first mode listed will normally be the starting resolution.
-</para></listitem>
+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".  Remove or comment out some of the modules.  
+The "glx" and "dri" sections are not operational until we install DRI 
+below.  Leaving modules in does not hurt anything.</para></listitem>
+
+<listitem><para>Section "InputDevice".  You may want to change the keyboard 
+autorepeat rate by 
+adding <userinput>Option "Autorepeat" "250 30"</userinput>.</para></listitem>
+
+<listitem><para>Section "Screen".  Add a DefaultDepth statement such 
+as: <userinput>DefaultDepth 16</userinput>. In the SubSection for your 
+default depth, add a modes line such 
+as: <userinput> Modes "1280x1024" "1024x768"</userinput>.
+The first mode listed will normally be the starting 
+resolution.</para></listitem>
+
 </itemizedlist>
 
-<para>
-Test the system with
-<screen>XFree86 -xf86config ~/XF86Config.new</screen>
+<para>Test the system with
+<screen><userinput>XFree86 -xf86config ~/XF86Config.new</userinput></screen>
 You will only get a grey background with an X-shaped mouse cursor, but it 
 confirms the system is working.  Exit with Control-Alt-Backspace.  If the 
-system does not work, take a look at 
-<filename>/var/log/XFree86.0.log</filename> to see what went wrong.
-</para>
-<para>
-Move the confiuration file to its final location
-<screen>mv ~/XF86Config.new /etc/X11/XF86Config-4</screen>
-</para>
-<para>
-Create <filename>.xinitrc</filename>
+system does not work, take a look 
+at <filename>/var/log/XFree86.0.log</filename> to see what went 
+wrong.</para>
+
+<para>Move the confiuration file to its final location
+<screen><userinput>mv ~/XF86Config.new /etc/X11/XF86Config-4</userinput></screen></para>
+
+<para>Create <filename>.xinitrc</filename>
 <screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
 # Begin .xinitrc file
@@ -81,12 +78,10 @@
 This provides an initial screen with an xterm and a clock that is managed by a 
 simple window manager, Tab Winow Manager.  For details of twm, see the 
-man page.
-</para>
+man page.</para>
 
-<para>
-Start X with 
-<screen>startx</screen>
-to get basic funtional X Windows System.
-</para>
+<para>Start X with 
+<screen><userinput>startx</userinput></screen>
+to get basic funtional X Windows System.</para>
+
 </sect2>
 
Index: x/installing/xfree86/xfree86-desc.xml
===================================================================
--- x/installing/xfree86/xfree86-desc.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/xfree86/xfree86-desc.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -26,59 +26,47 @@
 <sect3><title>xf86config</title>
 <para>An interactive program for generating an XF86Config file for use with 
-XFree86 X servers.
-</para></sect3>
+XFree86 X servers.</para></sect3>
 
 <sect3><title>xf86cfg</title>
 <para>A tool to configure XFree86 that can be used to either write the 
-initial configuration file or make customizations to the current configuration.
-</para></sect3>
+initial configuration file or make customizations to the current 
+configuration.</para></sect3>
 
 <sect3><title>startx</title>
-<para>A script to initialize the X session. It runs xinit.
-</para></sect3>
+<para>A script to initialize the X session. It runs xinit.</para></sect3>
 
 <sect3><title>xinit</title>
-<para>This program is used to start the X Window System server.
-</para></sect3>
+<para>This program is used to start the X Window System server.</para></sect3>
 
 <sect3><title>twm</title>
-<para>A Tab Window Manager for the X Window System.
-</para></sect3>
+<para>A Tab Window Manager for the X Window System.</para></sect3>
 
 <sect3><title>xterm</title>
-<para>A terminal emulator for X.
-</para></sect3>
+<para>A terminal emulator for X.</para></sect3>
 
 <sect3><title>xwininfo</title>
-<para>A window information utility for X.
-</para></sect3>
+<para>A window information utility for X.</para></sect3>
 
 <sect3><title>x11perf</title>
-<para>An X11 server performance test program.
-</para></sect3>
+<para>An X11 server performance test program.</para></sect3>
 
 <sect3><title>xlsfonts</title>
-<para>A program to list fonts available to the X server.
-</para></sect3>
+<para>A program to list fonts available to the X server.</para></sect3>
 
 <sect3><title>xvidtune</title>
-<para>A video mode tuner for XFree86.
-</para></sect3>
+<para>A video mode tuner for XFree86.</para></sect3>
 
 <sect3><title>xload</title>
-<para>A system load average display for X.
-</para></sect3>
+<para>A system load average display for X.</para></sect3>
 
 <sect3><title>xcalc</title>
-<para>A scientific calculator for X.
-</para></sect3>
+<para>A scientific calculator for X.</para></sect3>
 
 <sect3><title>xclock and oclock</title>
-<para>Clock programs for X.
-</para></sect3>
+<para>Clock programs for X.</para></sect3>
 
 <sect3><title>xmodmap</title>
-<para>A utility for modifying keymaps and pointer button mappings in X.
-</para></sect3>
+<para>A utility for modifying keymaps and pointer button mappings 
+in X.</para></sect3>
 
 </sect2>
Index: x/installing/xfree86/xfree86-exp.xml
===================================================================
--- x/installing/xfree86/xfree86-exp.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/xfree86/xfree86-exp.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -2,20 +2,17 @@
 <title>Command explanations</title>
 
-<para>
-<userinput>make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;</userinput>
-: This command runs multiple makefiles to completely rebuild the system.  
+<para><userinput>make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;</userinput>: 
+This command runs multiple makefiles to completely rebuild the system.  
 <userinput>2&gt;&amp;1</userinput> redirects error messages to the same location
-as normal output. The <userinput>tee</userinput>
-command allows viewing of the output while logging the results to a file.</para>
+as normal output. The <userinput>tee</userinput> command allows viewing of 
+the output while logging the results to a file.</para>
 
-<note><para>
-When rebuildng, a separate command that may be used if only minor changes 
-are made to the sources is <userinput>make Everything</userinput>.  This does 
-not automatically remove generated files and only rebuilds those files or 
-programs that are out of date.
-</para></note>
+<note><para>When rebuildng, a separate command that may be used if only minor 
+changes are made to the sources is <userinput>make 
+Everything</userinput>.  This does not automatically remove generated 
+files and only rebuilds those files or programs that are out 
+of date.</para></note>
 
-<para>
-<userinput>ln -sf /usr/X11R6/bin /usr/bin/X11</userinput>,
+<para><userinput>ln -sf /usr/X11R6/bin /usr/bin/X11</userinput>,
 <userinput>ln -sf /usr/X11R6/lib/X11 /usr/lib/X11</userinput>, and
 <userinput>ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput>:
@@ -24,6 +21,4 @@
 says:
 "In general, software must not be installed or managed via the above 
-symbolic links. They are intended for utilization by users only."
-</para>
-</sect2>
+symbolic links. They are intended for utilization by users only."</para></sect2>
 
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/xfree86/xfree86-inst.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -2,9 +2,7 @@
 <title>Installation of XFree86</title>
 
-
 <sect3>
 <title>Kernel Compilation Settings</title>
-<para>
-If you have an Intel P6 (Pentium Pro, Pentium II and later) it is recommneded 
+<para>If you have an Intel P6 (Pentium Pro, Pentium II and later) it is recommneded 
 that you compile MTRR (Memory Type Range Registers) support into the kernel.
 The kernel can map Cyrix and AMD CPUs to the MTRR interface so selecting this
@@ -12,44 +10,37 @@
 This option is found in the 
 "Processor type and features" menu.  It can increase performance of
-image write operations 2.5 times or more on PCI or AGP video cards. 
-</para>
+image write operations 2.5 times or more on PCI or AGP video cards.</para>
 
-<para>
-In the "Character Devices" section, enable AGP Support and select the chipset
+<para>In the "Character Devices" section, enable AGP Support and select the chipset
 support on your motherboard.  If you do not know the chipset, you may select
 all the chip types at the expense of extra kernel size. You can usually 
 determine your motherboard's chipset by doing:
-<screen><userinput>cat /proc/pci</userinput></screen>
-</para>
+<screen><userinput>cat /proc/pci</userinput></screen></para>
 
-<para>
-In the "Character Devices" section, <emphasis>disable</emphasis> Direct 
+<para>In the "Character Devices" section, <emphasis>disable</emphasis> Direct 
 Rendering Manager unless you have a Direct Rendering Infrastructure (DRI) 
 supported video card.  See the DRI section below for a list.  If you do
 enable DRI here, make sure you select the video card(s) you want to support
-as a <emphasis>module</emphasis>.
+as a <emphasis>module</emphasis>.</para>
+
+<para>If you made any changes to the kernel configuration, recompile with
+<screen><userinput>make dep &amp;&amp;
+make bzImage &amp;&amp;
+make modules &amp;&amp;
+make modules_install</userinput></screen>
 </para>
 
-<para>If you made any changes to the kernel configuration, recompile with
-<screen>make dep &amp;&amp;
-make bzImage &amp;&amp;
-make modules &amp;&amp;
-make modules_install</screen>
-</para>
-
-<para>
-Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
+<para>Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
 <filename>/usr/src/linux/System.map</filename> to
 <filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
-appropriately and run <userinput>lilo</userinput>.
-</para>
+appropriately and run <userinput>lilo</userinput>.</para>
 
-<note><para>
-If you build XFree86 in a chroot environment, make sure the kernel version of the base 
-system and the target system are the same.  This is especially important if you
-enabled DRI support as a module as instructed above.
-</para></note>
+<note><para>If you build XFree86 in a chroot environment, make sure the kernel 
+version of the base system and the target system are the same.  This is 
+especially important if you enabled DRI support as a module as 
+instructed above.</para></note>
 
 </sect3>
+
 <sect3><title>Creating <filename>host.def</filename></title>
 
@@ -76,5 +67,5 @@
  
 /* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs */
-/* #define HasMMXSupport        NO         */ /* Any i586 or above */
+/* #define HasMMXSupport        NO  */ /* Any i586 or above */
 /* #define HasKatmaiSupport     NO  */ /* PIII SSE instuctions */
 /* #define Has3DNowSupport      NO  */ /* AMD instructions */
@@ -99,12 +90,15 @@
 /* FONT SERVER AND LIBRARY SETTINGS ****************************************/
 
-
 /* These setting should be set by default, but we are making sure. *********/
 
-#define BuildFontServer                YES  /* Need for GhostScript Print Server */
-#define BuildFreetype2Library          YES  /* For using TrueType Fonts */
-#define SharedLibFont                  YES  /* Needed for Truetype */
-#define CompressAllFonts               YES
-#define GzipFontCompression            YES
+#define BuildFontServer          YES  /* Need for GhostScript Print Server */
+#define SharedLibFont            YES  
+#define CompressAllFonts         YES
+#define GzipFontCompression      YES
+
+/* These setting ensure we use the proper version of freetype **************/
+#define HasFreetype2             YES
+#define BuildFreetype2Library     NO
+#define Freetype2Dir            /usr
 
 /* The font path can be redefined in the XF86Config file *******************/
@@ -172,4 +166,5 @@
 
 <para>Edit the file for your hardware and desires.</para>
+
 </sect3>
 
@@ -179,11 +174,11 @@
 
 
-<para><screen><userinput>patch -Np1 -i ../4.2.0-4.2.1.diff &amp;&amp;</userinput>
-<userinput>make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>make install.man &amp;&amp;</userinput>
-<userinput>ln -sf /usr/X11R6/bin /usr/bin/X11 &amp;&amp;</userinput>
-<userinput>ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &amp;&amp;</userinput>
-<userinput>ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../4.2.0-4.2.1.diff &amp;&amp;
+make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;
+make install &amp;&amp;
+make install.man &amp;&amp;
+ln -sf /usr/X11R6/bin /usr/bin/X11 &amp;&amp;
+ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
+ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput></screen></para>
 
 </sect3>
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/installing/xfree86/xfree86-intro.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -8,5 +8,5 @@
 Estimated build time:           63m (667 MHz)</screen>
 
-<para><screen>XFree86 depends on: LFS base installation</screen></para>
+<para><screen>XFree86 depends on: <xref linkend="freetype2"/></screen></para>
 
 <para>Because XFree86 is such a large package, you may find that 
@@ -18,18 +18,12 @@
 hardware (the mouse, keyboard, and video displays) and the desktop environment 
 while also providing both the windowing infrastructure and a standardized 
-application interface (API).
-</para>
+application interface (API).</para>
 
-<para>
-There are several files that need to be fetched from the download location:
+<para>There are several files that need to be fetched from the download location:
 <screen>X420src-1.tgz 25354 KB 
 X420src-2.tgz 22683 KB   
-X420src-3.tgz  9089 KB   
-</screen>
-</para>
+X420src-3.tgz  9089 KB</screen></para>
 
-<para>
-In addition, the following file will be needed:
-<screen><ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz"/></screen> 
-</para>
+<para>In addition, the following file will be needed:
+<screen><ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz"/></screen></para>
 </sect2>
Index: x/lib/freetype2.xml
===================================================================
--- x/lib/freetype2.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
+++ x/lib/freetype2.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -0,0 +1,11 @@
+<sect1 id="freetype2" xreflabel="freetype-&freetype2-version;">
+<?dbhtml filename="freetype2.html" dir="x"?>
+<title>freetype-&freetype2-version;</title>
+
+&freetype2-intro;
+&freetype2-inst;
+&freetype2-config;
+&freetype2-desc;
+
+</sect1>
+
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/lib/lib.xml	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -4,4 +4,5 @@
 
 &lesstif;
+&freetype2;
 &qt;
 &GTK;
Index: x/x.ent
===================================================================
--- x/x.ent	(revision 07ba0069c251f7eafdc0a8e24a22793b3e243264)
+++ x/x.ent	(revision 19e9cee90d7129c80ce5b00e96925fcf51bf981b)
@@ -10,4 +10,5 @@
 <!-- X Libraries -->
 <!ENTITY x-lib SYSTEM "lib/lib.xml">
+<!ENTITY % freetype SYSTEM "lib/freetype2/freetype2.ent">
 <!ENTITY % lesstif SYSTEM "lib/lesstif/lesstif.ent">
 <!ENTITY % qt SYSTEM "lib/qt/qt.ent">
@@ -16,4 +17,5 @@
 <!ENTITY % pango SYSTEM "lib/pango/pango.ent">
 <!ENTITY % fnlib SYSTEM "lib/fnlib/fnlib.ent">
+%freetype;
 %lesstif;
 %qt;
