Index: general.ent
===================================================================
--- general.ent	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ general.ent	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,8 +1,8 @@
-<!ENTITY version      "cvs-20040612">
-<!ENTITY releasedate  "June 12th, 2004">
-<!ENTITY pubdate      "2004-06-12">       <!-- metadata req. by TLDP -->
+<!ENTITY version      "cvs-20040613">
+<!ENTITY releasedate  "June 13th, 2004">
+<!ENTITY pubdate      "2004-06-13">       <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">              <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "stable">           <!-- stable|testing|unstable] -->
-<!ENTITY last-commit  "Sun Jun 06 10:08:20 CDT 2004">
+<!ENTITY last-commit  "Sun Jun 13 10:08:20 CDT 2004">
 
 <!ENTITY maintainer-fullname  "Bruce Dubbs">
@@ -17,211 +17,230 @@
 
 
-<!ENTITY blfs-bootscripts-version  "2004-05-22"> 
-<!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
-
-<!-- Part II -->
-<!-- Chapter 4 -->
-<!ENTITY cracklib-version          "2.7">   
-<!ENTITY Linux_PAM-version         "0.77">  
-<!ENTITY shadow-version            "4.0.4.1">  
-<!ENTITY iptables-version          "1.2.9"> 
-<!ENTITY gnupg-version             "1.2.4">  
-<!ENTITY tripwire-version          "2.3.1-2">   
-<!ENTITY heimdal-version           "0.6.2">   
-<!ENTITY mitkrb-version            "1.3.3"> 
+<!ENTITY blfs-bootscripts-version     "2004-05-22"> 
+<!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
+                                     
+<!-- Part II -->                     
+<!-- Chapter 4 -->                   
+<!ENTITY cracklib-version             "2.7">   
+<!ENTITY Linux_PAM-version            "0.77">  
+<!ENTITY shadow-version               "4.0.4.1">  
+<!ENTITY iptables-version             "1.2.9"> 
+<!ENTITY gnupg-version                "1.2.4">  
+<!ENTITY tripwire-version             "2.3.1-2">   
+<!ENTITY heimdal-version              "0.6.2">   
+<!ENTITY mitkrb-version               "1.3.3"> 
                                   
 <!-- Chapter 5 -->                
-<!ENTITY reiser-version            "3.6.14"> 
-<!ENTITY xfsprogs-version          "2.6.13">
+<!ENTITY reiser-version               "3.6.14"> 
+<!ENTITY xfsprogs-version             "2.6.13">
                                   
 <!-- Chapter 6 -->                
-<!ENTITY vim-version               "6.2">  
-<!ENTITY emacs-version             "21.3">  
-<!ENTITY nano-version              "1.2.3">  
-<!ENTITY joe-version               "3.0"> 
+<!ENTITY vim-version                  "6.2">  
+<!ENTITY emacs-version                "21.3">  
+<!ENTITY nano-version                 "1.2.3">  
+<!ENTITY joe-version                  "3.0"> 
                                   
 <!-- Chapter 7 -->                
-<!ENTITY ash-version               "0.4.0"> 
-<!ENTITY tcsh-version              "6.13.00">  
-<!ENTITY zsh-version               "4.2.0">        
-                            
-<!-- Part III -->           
-<!-- Chapter 8 -->
-<!ENTITY openssl-version           "0.9.7d">
-<!ENTITY pcre-version              "4.5">
-<!ENTITY popt-version              "1.7">
-<!ENTITY slang-version             "1.4.9">
-<!ENTITY fam-version               "2.7.0">
-<!ENTITY libxml-version            "1.8.17">
-<!ENTITY libxml2-version           "2.6.9">
-<!ENTITY libxslt-version           "1.1.6">
-<!ENTITY readline-version          "4.3">
-<!ENTITY gmp-version               "4.1.3">
-<!ENTITY gdbm-version              "1.8.3">
-<!ENTITY GLib-version              "1.2.10">
-<!ENTITY GLib2-version             "2.4.1">
-<!ENTITY expat-version             "1.95.7">
-<!ENTITY libesmtp-version          "1.0.2">
-<!ENTITY aspell-version            "0.50.5">
-<!ENTITY ispell-version            "3.2.06.epa7">
-<!ENTITY guile-version             "1.6.4">
-<!ENTITY slib-version              "2d6">
-<!ENTITY gwrap-version             "1.3.4">
-<!ENTITY LZO-version               "1.08">
-<!ENTITY libpcap-version           "0.8.3">
-<!ENTITY libusb-version            "0.1.8">
-
-<!-- Chapter 9 -->
-<!ENTITY libjpeg-version           "6b">
-<!ENTITY libpng-version            "1.2.5">
-<!ENTITY libtiff-version           "3.6.1">
-<!ENTITY libungif-version          "4.1.0b1">
-<!ENTITY libmng-version            "1.0.7">
-<!ENTITY lcms-version              "1.12">
-<!ENTITY freetype2-version         "2.1.7">
-<!ENTITY fontconfig-version        "2.2.2">
-<!ENTITY imlib-version             "1.9.14">
-<!ENTITY aalib-version             "1.4rc5">
-<!ENTITY SVGAlib-version           "1.4.3">
-<!ENTITY DirectFB-version          "0.9.20">
-<!ENTITY imlib2-version            "1.1.0">
-                                                                                   
-<!-- Chapter 10 -->
-<!ENTITY bc-version                "1.06">
-<!ENTITY rep-gtk-version           "0.18">
-<!ENTITY compface-version          "1.4">
-<!ENTITY imagemagick-version       "5.5.7">
-<!ENTITY hd2u-version              "0.9.0">
-                                                                                   
-<!-- Chapter 11 -->
-<!ENTITY gpm-version               "1.20.1">
-<!ENTITY fcron-version             "2.9.4">
-<!ENTITY hdparm-version            "5.5">
-<!ENTITY which-version             "2.16">
-<!ENTITY unzip-version             "5.51">
-<!ENTITY zip-version               "2.3">
-<!ENTITY pciutils-version          "2.1.11">
-<!ENTITY pkgconfig-version         "0.15.0">
-<!ENTITY cpio-version              "2.5">
-<!ENTITY mc-version                "4.6.0">
-
-<!-- Chapter 12 -->
-<!ENTITY Python-version            "2.3.3">
-<!ENTITY Gtk-Perl-version          "0.7009">
-<!ENTITY PDL-version               "2.4.0">
-<!ENTITY XML-Parser-version        "2.34">
-<!ENTITY XML-Writer-version        "0.4.1">
-<!ENTITY Astro-FITS-Header-version "2.8.1">
-<!ENTITY Parse-RecDescent-version  "1.94">
-<!ENTITY librep-version            "0.17">
-<!ENTITY j2sdk-bin-version         "1.4.2_03">
-<!ENTITY j2sdk-src-version         "1.4.2">
-<!ENTITY ruby-version              "1.8.1">
-<!ENTITY gcc-version               "3.3.3">
-<!ENTITY tcl-version               "8.4.6">
-<!ENTITY tk-version                "8.4.6">
-<!ENTITY gcc2-version              "2.95.3">
-<!ENTITY NASM-version              "0.98.38">
-                            
-<!-- Part IV -->            
-                            
-<!-- Chapter 13 -->         
-<!ENTITY ppp-version               "2.4.2"> 
-<!ENTITY wvdial-version            "1.53"> 
+<!ENTITY ash-version                  "0.4.0"> 
+<!ENTITY tcsh-version                 "6.13.00">  
+<!ENTITY zsh-version                  "4.2.0">        
+                                     
+<!-- Part III -->                    
+<!-- Chapter 8 -->                   
+<!ENTITY openssl-version              "0.9.7d">
+<!ENTITY pcre-version                 "4.5">
+<!ENTITY popt-version                 "1.7">
+<!ENTITY slang-version                "1.4.9">
+<!ENTITY fam-version                  "2.7.0">
+<!ENTITY libxml-version               "1.8.17">
+<!ENTITY libxml2-version              "2.6.9">
+<!ENTITY libxslt-version              "1.1.6">
+<!ENTITY readline-version             "4.3">
+<!ENTITY gmp-version                  "4.1.3">
+<!ENTITY gdbm-version                 "1.8.3">
+<!ENTITY GLib-version                 "1.2.10">
+<!ENTITY GLib2-version                "2.4.1">
+<!ENTITY expat-version                "1.95.7">
+<!ENTITY libesmtp-version             "1.0.2">
+<!ENTITY aspell-version               "0.50.5">
+<!ENTITY ispell-version               "3.2.06.epa7">
+<!ENTITY guile-version                "1.6.4">
+<!ENTITY slib-version                 "2d6">
+<!ENTITY gwrap-version                "1.3.4">
+<!ENTITY LZO-version                  "1.08">
+<!ENTITY libpcap-version              "0.8.3">
+<!ENTITY libusb-version               "0.1.8">
+                                     
+<!-- Chapter 9 -->                   
+<!ENTITY libjpeg-version              "6b">
+<!ENTITY libpng-version               "1.2.5">
+<!ENTITY libtiff-version              "3.6.1">
+<!ENTITY libungif-version             "4.1.0b1">
+<!ENTITY libmng-version               "1.0.7">
+<!ENTITY lcms-version                 "1.12">
+<!ENTITY freetype2-version            "2.1.7">
+<!ENTITY fontconfig-version           "2.2.2">
+<!ENTITY imlib-version                "1.9.14">
+<!ENTITY aalib-version                "1.4rc5">
+<!ENTITY SVGAlib-version              "1.4.3">
+<!ENTITY DirectFB-version             "0.9.20">
+<!ENTITY imlib2-version               "1.1.0">
+                                                                                      
+<!-- Chapter 10 -->                  
+<!ENTITY bc-version                   "1.06">
+<!ENTITY rep-gtk-version              "0.18">
+<!ENTITY compface-version             "1.4">
+<!ENTITY imagemagick-version          "5.5.7">
+<!ENTITY hd2u-version                 "0.9.0">
+                                                                                      
+<!-- Chapter 11 -->                  
+<!ENTITY gpm-version                  "1.20.1">
+<!ENTITY fcron-version                "2.9.4">
+<!ENTITY hdparm-version               "5.5">
+<!ENTITY which-version                "2.16">
+<!ENTITY unzip-version                "5.51">
+<!ENTITY zip-version                  "2.3">
+<!ENTITY pciutils-version             "2.1.11">
+<!ENTITY pkgconfig-version            "0.15.0">
+<!ENTITY cpio-version                 "2.5">
+<!ENTITY mc-version                   "4.6.0">
+                                     
+<!-- Chapter 12 -->                  
+<!ENTITY Python-version               "2.3.3">
+<!ENTITY Gtk-Perl-version             "0.7009">
+<!ENTITY PDL-version                  "2.4.0">
+<!ENTITY XML-Parser-version           "2.34">
+<!ENTITY XML-Writer-version           "0.4.1">
+<!ENTITY Astro-FITS-Header-version    "2.8.1">
+<!ENTITY Parse-RecDescent-version     "1.94">
+<!ENTITY librep-version               "0.17">
+<!ENTITY j2sdk-bin-version            "1.4.2_03">
+<!ENTITY j2sdk-src-version            "1.4.2">
+<!ENTITY ruby-version                 "1.8.1">
+<!ENTITY gcc-version                  "3.3.3">
+<!ENTITY tcl-version                  "8.4.6">
+<!ENTITY tk-version                   "8.4.6">
+<!ENTITY gcc2-version                 "2.95.3">
+<!ENTITY NASM-version                 "0.98.38">
+                                     
+<!-- Part IV -->                     
+                                     
+<!-- Chapter 13 -->                  
+<!ENTITY ppp-version                  "2.4.2"> 
+<!ENTITY wvdial-version               "1.53"> 
                                   
 <!-- Chapter 14 -->               
-<!ENTITY dhcp-version              "3.0pl2"> 
-<!ENTITY dhcpcd-version            "1.3.22-pl4">   
+<!ENTITY dhcp-version                 "3.0pl2"> 
+<!ENTITY dhcpcd-version               "1.3.22-pl4">   
                                   
 <!-- Chapter 15 -->               
-<!ENTITY pppoe-version             "3.5"> 
+<!ENTITY pppoe-version                "3.5"> 
                                   
 <!-- Chapter 16 -->               
-<!ENTITY curl-version              "7.11.2"> 
-<!ENTITY wvstreams-version         "3.70">  
-<!ENTITY gnet-version              "2.0.5">   
-<!ENTITY libsoup-version           "1.99.28"> 
+<!ENTITY curl-version                 "7.11.2"> 
+<!ENTITY wvstreams-version            "3.70">  
+<!ENTITY gnet-version                 "2.0.5">   
+<!ENTITY libsoup-version              "1.99.28"> 
                                   
 <!-- Chapter 17 -->               
-<!ENTITY Links-version             "2.1pre14">  
-<!ENTITY lynx-version              "2.8.5">
-<!ENTITY w3m-version               "0.4.2"> 
+<!ENTITY Links-version                "2.1pre14">  
+<!ENTITY lynx-version                 "2.8.5">
+<!ENTITY w3m-version                  "0.4.2"> 
                                   
 <!-- Chapter 18 -->               
-<!ENTITY ncftp-version             "3.1.7"> 
-<!ENTITY openssh-version           "3.8.1p1"> 
-<!ENTITY rsync-version             "2.6.2"> 
-<!ENTITY cvs-version               "1.11.16">  
-<!ENTITY wget-version              "1.9.1">  
-<!ENTITY tcpwrappers-version       "7.6">  
-<!ENTITY portmap-version           "5beta">    
-<!ENTITY inetutils-version         "1.4.2">  
-<!ENTITY nfs-utils-version         "1.0.6">   
-<!ENTITY ncpfs-version             "2.2.4"> 
-<!ENTITY ntp-version               "4.2.0">  
+<!ENTITY ncftp-version                "3.1.7"> 
+<!ENTITY openssh-version              "3.8.1p1"> 
+<!ENTITY rsync-version                "2.6.2"> 
+<!ENTITY cvs-version                  "1.11.16">  
+<!ENTITY wget-version                 "1.9.1">  
+<!ENTITY tcpwrappers-version          "7.6">  
+<!ENTITY portmap-version              "5beta">    
+<!ENTITY inetutils-version            "1.4.2">  
+<!ENTITY nfs-utils-version            "1.0.6">   
+<!ENTITY ncpfs-version                "2.2.4"> 
+<!ENTITY ntp-version                  "4.2.0">  
                                   
 <!-- Chapter 19 -->               
-<!ENTITY traceroute-version        "1.4a12"> 
-<!ENTITY nmap-version              "3.50">  
-<!ENTITY whois-version             "4.6.14">
-<!ENTITY bind-version              "9.2.3"> 
+<!ENTITY traceroute-version           "1.4a12"> 
+<!ENTITY nmap-version                 "3.50">  
+<!ENTITY whois-version                "4.6.14">
+<!ENTITY bind-version                 "9.2.3"> 
                                   
 <!-- Chapter 20 -->               
-<!ENTITY nail-version              "10.7"> 
-<!ENTITY procmail-version          "3.22">  
-<!ENTITY fetchmail-version         "6.2.5">  
-<!ENTITY mutt-version              "1.4.2.1i"> 
-<!ENTITY pine-version              "4.60">  
-<!ENTITY slrn-version              "0.9.8.0"> 
-                                  
-<!-- Part VI -->            
-<!-- Chapter 21 -->
-<!ENTITY postfix-version "2.1.1">
-<!ENTITY sendmail-version "8.12.10">
-<!ENTITY exim-version "4.24">
-<!ENTITY qpopper-version "4.0.5">
-<!ENTITY courier-version "0.45.5">
-
-<!-- Chapter 22 -->
-<!-- bind (chapter 19) -->
-<!-- cvs (chapter 18) -->
-<!-- dhcp (chapter 14) -->
-<!ENTITY leafnode-version "1.9.43">
-<!-- openssh (chapter 18) -->
-<!-- rsync (chaptet 18) -->
-<!ENTITY openldap-version "2.1.30">
-<!ENTITY samba3-version "3.0.4">
-<!ENTITY xinetd-version "2.3.13">
-
-<!-- Part VII -->            
-<!-- Chapter 23 -->
-<!ENTITY db-version                "4.2.52.2">  
-<!ENTITY db-3.3-version            "3.3.11">  
-<!ENTITY mysql-version             "4.0.20">   
-<!ENTITY postgresql-version        "7.4.2"> 
-
-<!-- Chapter 24 -->
-<!ENTITY apache-version            "2.0.49">  
-<!ENTITY php-version               "4.3.6">  
-<!ENTITY proftpd-version           "1.2.9">  
-
-<!--   Part VIII -->            
-<!-- Chapter 25 -->
-<!-- Chapter 26 -->
+<!ENTITY nail-version                 "10.7"> 
+<!ENTITY procmail-version             "3.22">  
+<!ENTITY fetchmail-version            "6.2.5">  
+<!ENTITY mutt-version                 "1.4.2.1i"> 
+<!ENTITY pine-version                 "4.60">  
+<!ENTITY slrn-version                 "0.9.8.0"> 
+                                  
+<!-- Part VI -->                     
+<!-- Chapter 21 -->                  
+<!ENTITY postfix-version              "2.1.1">
+<!ENTITY sendmail-version             "8.12.10">
+<!ENTITY exim-version                 "4.24">
+<!ENTITY qpopper-version              "4.0.5">
+<!ENTITY courier-version              "0.45.5">
+                                     
+<!-- Chapter 22 -->                  
+<!-- bind (chapter 19) -->           
+<!-- cvs (chapter 18) -->            
+<!-- dhcp (chapter 14) -->           
+<!ENTITY leafnode-version             "1.9.43">
+<!-- openssh (chapter 18) -->        
+<!-- rsync (chaptet 18) -->          
+<!ENTITY openldap-version             "2.1.30">
+<!ENTITY samba3-version               "3.0.4">
+<!ENTITY xinetd-version               "2.3.13">
+                                     
+<!-- Part VII -->                    
+<!-- Chapter 23 -->                  
+<!ENTITY db-version                   "4.2.52.2">  
+<!ENTITY db-3.3-version               "3.3.11">  
+<!ENTITY mysql-version                "4.0.20">   
+<!ENTITY postgresql-version           "7.4.2"> 
+                                     
+<!-- Chapter 24 -->                  
+<!ENTITY apache-version               "2.0.49">  
+<!ENTITY php-version                  "4.3.6">  
+<!ENTITY proftpd-version              "1.2.9">  
+                                     
+<!--   Part VIII -->                 
+<!-- Chapter 25 -->                  
+<!ENTITY xorg-version                 "6.7.0"> 
+<!ENTITY xfree86-version              "4.4.0">   
+                                     
+<!-- Chapter 26 -->                  
+<!ENTITY qt-version                   "3.3.2"> 
+<!ENTITY GTK-version                  "1.2.10"> 
+<!ENTITY Pango-version                "1.4.0">   
+<!ENTITY ATK-version                  "1.6.1"> 
+<!ENTITY GTK2-version                 "2.4.1"> 
+<!ENTITY lesstif-version              "0.93.94">   
+<!ENTITY startup-notification-version "0.6">   
+<!ENTITY shared-mime-info-version     "0.14">   
+<!ENTITY hicolor-icon-theme-version   "0.5"> 
+<!ENTITY libxklavier-version          "1.02">  
+
+<!-- Chapter 27 -->
+<!ENTITY sawfish-version              "1.3">  
+<!ENTITY fluxbox-version              "0.1.14"> 
+<!ENTITY metacity-version             "2.8.0">  
+<!ENTITY xfce-version                 "4.0.4">  
 
 <!-- Part IX -->
 <!-- Chapter 28 -->
-<!ENTITY kde-version "3.2.2">
-<!ENTITY arts-version "1.2.2">
-<!ENTITY kde-dldir "&kde-version;">
-<!ENTITY kde-download-http "http://mirrors.isc.org/pub/kde/stable/&kde-dldir;/src">
-<!ENTITY kde-download-ftp "ftp://ftp.kde.org/pub/kde/stable/&kde-dldir;/src">
-<!ENTITY kde-dir "$KDE_PREFIX">
-
-<!-- Chapter 29 -->
-<!ENTITY kdevelop-version "3.0.3">
-
-
-<!ENTITY gnome-version     "2.6">
-<!ENTITY docbook-dsssl-version "1.78">
-
+<!ENTITY kde-version                  "3.2.2">
+<!ENTITY arts-version                 "1.2.2">
+<!ENTITY kde-dldir                    "&kde-version;">
+<!ENTITY kde-download-http            "http://mirrors.isc.org/pub/kde/stable/&kde-dldir;/src">
+<!ENTITY kde-download-ftp             "ftp://ftp.kde.org/pub/kde/stable/&kde-dldir;/src">
+<!ENTITY kde-dir                      "$KDE_PREFIX">
+                                   
+<!-- Chapter 29 -->                
+<!ENTITY kdevelop-version             "3.0.3">
+                                   
+                                   
+<!ENTITY gnome-version                "2.6">
+<!ENTITY docbook-dsssl-version        "1.78">
+
Index: index.xml
===================================================================
--- index.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ index.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -2,10 +2,11 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
 	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general SYSTEM "general/general.ent">
 
-<!ENTITY version "cvs-20040612">
-<!ENTITY releasedate "June 12th, 2004">
-<!ENTITY pubdate "2004-06-12">
+<!ENTITY version "cvs-20040613">
+<!ENTITY releasedate "June 13th, 2004">
+<!ENTITY pubdate "2004-06-13">
 <!ENTITY blfs-version "cvs">
-<!ENTITY last-commit "Sun Jun 06 10:08:20 CDT 2004">
+<!ENTITY last-commit "Sun Jun 13 10:08:20 CDT 2004">
 
 <!ENTITY % book SYSTEM "book/book.ent">
@@ -13,5 +14,4 @@
 <!ENTITY % introduction SYSTEM "introduction/introduction.ent">
 <!ENTITY % postlfs SYSTEM "postlfs/postlfs.ent">
-<!ENTITY % general SYSTEM "general/general.ent">
 <!ENTITY % connect SYSTEM "connect/connect.ent">
 <!ENTITY % basicnet SYSTEM "basicnet/basicnet.ent">
@@ -31,9 +31,11 @@
 %postlfs; -->
 %general;
-<!-- %connect;
+<!-- %connect;  -->
 %basicnet;
 %server;
-%content; -->
-%x;
+<!-- %content; -->
+<!-- %x; -->
+<!-- %content; -->
+<!-- %x; -->
 %kde;
 %gnome;
@@ -60,7 +62,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/basicnet.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="server/server.xml"/>
-<!-- &server; -->
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="content/content.xml"/>
-&x;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x/x.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kde/kde.xml"/>
 &gnome;
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/installing/installing.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <chapter id="x-installing">
 <?dbhtml filename="installing.html" ?>
@@ -5,7 +12,7 @@
 <para>This chapter contains a graphical user environment.</para>
 
-&xorg;
-&xfree86;
-&x-setup;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-setup.xml"/> 
 
 </chapter>
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
+++ x/installing/x-setup.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="x-setup">
+<?dbhtml filename="xfree86-setup.html"?>
+<title>X Window Components</title>
+
+<sect2>
+<title>Checking Direct Rendering Infrastructure (<acronym>DRI</acronym>) Installation</title>
+<para><acronym>DRI</acronym> is a framework for allowing software to access graphics hardware
+in a safe and efficient manner.  It is installed in
+<application>X</application> by default if 
+you have a supported video card.  To check if <acronym>DRI</acronym> is installed properly, 
+check the log file <filename>/var/log/XFree86.0.log</filename> or
+<filename>/var/log/Xorg.0.log</filename> for statements like:</para>
+
+<screen>(II) R128(0): Direct rendering enabled</screen>
+
+<para>From an <command>xterm</command>, run <command>glxinfo</command> and look for the phrase:</para> 
+<screen>direct rendering: Yes</screen>
+
+<para>You can also run the test program <command>glxgears</command>.
+This program brings up a window with three gears turning.  The
+<command>xterm</command> 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 <acronym>DRI</acronym> Users Guide at
+<ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/>.
+</para>
+</sect2>
+
+<!-- ================================================== -->
+
+<sect2>
+<title>Adding <application>TrueType</application> fonts to
+<application>X</application></title>
+
+<para><application>TrueType</application> font support is built into
+<application>X</application>.  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 
+<application>TrueType</application> fonts you want into that directory.</para></listitem>
+
+<listitem><para>Create the <filename>fonts.scale</filename> and 
+<filename>fonts.dir</filename> files in the
+<application>TrueType</application> font 
+directory.</para></listitem>
+
+<listitem><para>Ensure the <application>TrueType</application> module is loaded in the
+<filename>XF86Config</filename> or <filename>xorg.conf</filename>.</para></listitem>
+
+<listitem><para>Ensure the <parameter>FontPath</parameter> in 
+<filename>XF86Config</filename> or <filename>Xorg.conf</filename> contains the
+<application>TrueType</application> font directory.</para></listitem>
+
+</itemizedlist>
+
+<sect3><title>Establish a <application>TrueType</application> font directory</title>
+
+<para>The build of <application>X</application> as given above
+automatically creates a <application>TrueType</application>
+font directory: <filename class="directory">/usr/X11R6/lib/X11/fonts/TTF</filename>.  This
+directory already has some <application>TrueType</application> fonts and is set up correctly.
+If this directory is satisfactory, copy any other
+<application>TrueType</application> fonts you want
+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>Create <filename>fonts.scale</filename> and 
+<filename>fonts.dir</filename></title>
+
+<para>Now change to the directory where you have your
+<application>TrueType</application> fonts and run:
+<screen><userinput><command>mkfontscale &amp;&amp;
+mkfontdir</command></userinput></screen></para></sect3>
+
+<sect3><title>Ensure <application>TrueType</application> is loaded in 
+<filename>XF86Config</filename> or <filename>xorg.conf</filename></title> 
+<para>The "Module" section should look like:
+<screen>Section "Module"
+        ...
+        Load  "freetype"
+        ...
+EndSection</screen></para></sect3>
+
+<sect3><title>Ensure the <parameter>FontPath</parameter> in
+<filename>XF86Config</filename> points to the
+<application>TrueType</application> font directory</title>
+<para>The "Files" section should look like:
+<screen>Section "Files"
+        ...
+        FontPath "/usr/X11R6/lib/X11/fonts/<replaceable>[TrueTypeDir]</replaceable>/"
+        ...
+EndSection</screen></para>
+</sect3>
+
+<sect3><title>Update the font cache files</title> 
+<para>Finally, to update all the font
+cache files specified in <filename>/etc/fonts/fonts.conf</filename>, run</para>
+<screen><userinput><command>fc-cache</command></userinput></screen>
+
+<para><application>X</application> will now be able to use
+<application>TrueType</application> fonts when it is restarted.
+You can check to see if the new fonts are available with the
+<command>xlsfonts</command>  or <command>xfontsel</command> 
+program.</para>
+
+<note><para>You should rerun <command>mkfontscale</command> and  
+<command>mkfontdir</command> any time you add or delete
+<application>TrueType</application> fonts.
+You should also rerun <command>fc-cache</command> each time
+you add or remove any fonts.</para></note>
+
+</sect3>
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Setting up keyboards</title>
+<para>In this version of <application>X</application>, it has been reported that non-Latin
+keyboard layouts do not include Latin configurations as was previous
+practice. To set up a keyboard for Latin and non-Latin input, 
+change the XkbLayout keyboard driver option in the InputDevice section
+of the <filename>XF86Config</filename> or <filename>xorg.conf</filename> file.  For example:</para>
+
+<screen>   Section "InputDevice"
+     Identifier          "Keyboard0"
+     Driver              "Keyboard"
+     Option "XkbModel"   "pc105"
+     Option "XkbLayout"  "en_US,ru"
+     Option "XkbOptions" "grp:switch,grp:alt_shift_toggle,grp_led:scroll"
+   EndSection</screen>
+
+<para>In this example, you can use the Alt-Shift combination to switch
+between keyboard layouts and use the Scroll Lock <acronym>LED</acronym> to indicate when
+the second layout is active.</para>
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Setting up XDM</title>
+<para><command>xdm</command> provides a graphical logon capability and is
+normally set up in <filename>/etc/inittab</filename>.  Most of the information 
+you need to customize <command>xdm</command> is found in its man page.  To 
+execute <command>xdm</command> during bootup, change the initdefault level to 5 
+and add the following lines to <filename>/etc/inittab</filename>:</para>
+
+<para><screen><userinput># Run xdm as a separate service
+x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</userinput></screen></para>
+
+<para>If Linux-PAM is installed on your system, you should 
+create a PAM entry for xdm by duplicating the login entry
+using the following command:</para>
+
+<para><screen><userinput>cp /etc/pam.d/login /etc/pam.d/xdm</userinput></screen></para>
+
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Using <application>X</application> Resources</title>
+<para>There are many options that can be set in
+<application>X</application> and <application>X</application> clients via
+resources.  Typically resources are set in the <filename>~/.Xresources</filename>
+file.</para>
+
+<para>The layout of the <filename>~/.Xresources</filename> file consists
+of a list of specifications in the form of</para>
+
+<screen>object.subobject[.subobject...].attribute: value</screen>
+
+<para>Components of a resource specification are linked together 
+by either <emphasis>tight</emphasis>, represented by a dot (.),
+or <emphasis>loose</emphasis>, represented by an asterisk (*),  bindings.
+A tight binding indicates that the components on either side of the dot must
+be directly next to each other as defined in a specific implementation.  An
+asterisk is a wildcard character that means that any number of levels in
+a defined hierarchy can be between the components. 
+For example, X offers two special cursors: redglass and whiteglass.  To
+use one of these resources, you need to add the following line:</para>
+
+<screen>Xcursor.theme: whiteglass</screen>
+
+<para>However, you can specify the background for all clients with:</para>
+
+<screen>*background: blue</screen>
+
+<para>More specific resource variables will override less specific names. </para>
+
+<para>Resource definitions can be found in the man pages for each
+respective client.</para>
+
+<para>In order to load your resources, the <command>xrdb</command> 
+program must be
+called with the appropriate parameters.  Typically, the first time 
+resources are loaded, you use:</para>
+
+<screen><userinput><command>xrdb -load &lt;filename&gt;</command></userinput></screen>
+
+<para>To add resources to <application>X</application>'s database in memory, use:</para>
+<screen><userinput><command>xrdb -merge &lt;filename&gt;</command></userinput></screen>
+
+<para>The <command>xrdb</command> instruction is usually placed in 
+<filename>~/.xinitrc</filename> or <filename>~/.xsession</filename>.
+To get more information, see the xrdb man page.</para>
+</sect2>
+
+</sect1>
+
Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/installing/xfree86.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,599 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xfree86-download-http "http://gnu.kookel.org/ftp/XFree86/4.4.0/source/">
+  <!ENTITY xfree86-download-ftp  "ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/">
+  <!ENTITY xfree86-size          "52 MB">
+  <!ENTITY xfree86-buildsize     "636 MB">
+  <!ENTITY xfree86-time          "14.3 SBU">
+]>
+
 <sect1 id="xfree86" xreflabel="XFree86-&xfree86-version;">
 <?dbhtml filename="xfree86.html" ?>
 <title>XFree86-&xfree86-version;</title>
 
-&xfree86-intro;
-&xfree86-inst;
-&xfree86-exp;
-&xfree86-config;
-&xfree86-desc;
+<sect2>
+<title>Introduction to <application>XFree86</application></title>
+
+<para><application>XFree86</application> is a freely redistributable
+open-source implementation of the <application>X</application> Window System.
+<application>XFree86</application> provides a client/server interface between
+display hardware (the mouse, keyboard, and video displays) and the desktop
+environment, while also providing both the windowing infrastructure and a
+standardized application interface (<acronym>API</acronym>).</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&xfree86-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&xfree86-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &xfree86-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &xfree86-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &xfree86-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+<sect3><title><application>XFree86</application> dependencies</title>
+
+<sect4><title>Required</title>
+<para><xref linkend="libpng"/></para>
+</sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="Linux_PAM"/> and the following packages are included in the <application>XFree86</application> package, 
+however they
+are updated more often than the <application>XFree86</application> package and are highly recommended:
+<xref linkend="expat"/>, <xref linkend="freetype2"/>, <xref linkend="fontconfig"/>.</para>
+
+<note><para>If you choose not to install <application>expat</application>, 
+<application>freetype2</application>, and <application>fontconfig</application>, the
+<filename>host.def</filename> file below will have to be modified to
+instruct <application>XFree86</application> to build them.</para></note>
+</sect4>
+
+</sect3>
+
+
+<sect3><title>Download Instructions</title>
+
+<para>There are several files that need to be fetched from the download location:</para>
+<itemizedlist spacing='compact'> 
+<listitem><para><filename>XFree86-4.4.0-src-1.tgz</filename></para></listitem> 
+<listitem><para><filename>XFree86-4.4.0-src-2.tgz</filename></para></listitem> 
+<listitem><para><filename>XFree86-4.4.0-src-3.tgz</filename></para></listitem> 
+<listitem><para><filename>XFree86-4.4.0-src-4.tgz</filename></para></listitem> 
+<listitem><para><filename>XFree86-4.4.0-src-5.tgz</filename></para></listitem> 
+<listitem><para><filename>XFree86-4.4.0-src-6.tgz</filename></para></listitem> 
+<listitem><para><filename>XFree86-4.4.0-src-7.tgz</filename></para></listitem> 
+</itemizedlist> 
+
+<!--
+<para>You should also download the patch files:</para>
+<itemizedlist spacing='compact'> 
+<listitem><para>
+  <ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/4.3.0-4.3.0.1.diff.gz" />
+  </para></listitem>
+<listitem><para>
+  <ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/fontfile.diff" />
+  </para></listitem>
+</itemizedlist>
+-->
+
+<para>The first three packages are the <application>XFree86</application> programs, 
+the fourth and fifth are fonts, the sixth is normal documentation, and the seventh 
+is hardcopy documentation. There are also two packages 
+<filename>doctools-1.3.1.tgz</filename>,  which contain programs to regenerate hardcopy 
+documentation, and <filename>utils-1.1.0.tgz</filename>, which contain
+<application><acronym>GNU</acronym> <acronym>TAR</acronym></application>
+and <application>zlib</application> which are already installed on an
+<acronym>LFS</acronym> system.</para>
+
+<para>To check your downloads for integrity, download the <filename>SUMS.md5sum</filename>
+file.  Then:</para>
+
+<screen><userinput><command>md5sum -c SUMS.md5sum</command></userinput></screen>
+
+<para>The only errors you should see are for <filename>README</filename>, 
+<filename>doctools-1.3.1.tgz</filename>, and
+<filename>utils-1.1.0.tgz</filename> files if you did not download them.</para>
+
+<!--
+<para>The fixes subdirectory also has a <filename>SUMS.md5sum</filename>.  Note that
+this is the same filename as the sums for the main sources, so you need to rename the
+file if you download it.  Otherwise, you can just look at it and use it to 
+check against the patch files:</para>
+<screen><userinput><command>md5sum 4.3.0-4.3.0.1.diff.gz</command></userinput>
+<userinput><command>md5sum fontfile.diff</command></userinput></screen>
+
+<para>After unpacking the <filename>X430src-?.tgz</filename> files and uncompressing the 
+diff file, change to the <filename class="directory">xc</filename> directory and run:</para>
+
+<screen><userinput><command>patch -Np1 -i ../4.3.0-4.3.0.1.diff</command></userinput>
+<userinput><command>pushd  lib/font/fontfile/</command></userinput>
+<userinput><command>patch -N -i ../../../../fontfile.diff</command></userinput>
+<userinput><command>popd</command></userinput></screen>
+-->
+
+</sect3>
+</sect2>
+
+<sect2>
+<title>Installation of <application>XFree86</application></title>
+
+<sect3> 
+<title>Kernel Compilation Settings</title> 
+
+<para>If you have an Intel P6 (Pentium Pro, Pentium II and later), it is
+recommended that you compile <acronym>MTRR</acronym> (Memory Type Range
+Registers) support into the kernel.  The kernel can map Cyrix and AMD
+<acronym>CPU</acronym>s to the <acronym>MTRR</acronym> interface, so selecting
+this option is useful for those processors also.  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 <acronym>PCI</acronym> or
+<acronym>AGP</acronym> video cards.</para>
+
+<para>In the "Character Devices" section, enable <acronym>AGP</acronym> 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:</para>
+<screen><userinput><command>cat /proc/pci</command></userinput></screen>
+
+<para>In the "Character Devices" section, <emphasis>disable</emphasis> Direct 
+Rendering Manager unless you have a Direct Rendering Infrastructure
+(<acronym>DRI</acronym>) 
+supported video card.  A complete list of <acronym>DRI</acronym> supported video cards can
+be found at <ulink url="http://dri.sourceforge.net" /> in the Status section.  
+Currently,
+supported cards include those from 3dfx (Voodoo, Banshee), 3Dlabs, 
+ATI (Rage Pro, Rage 128,
+Radeon 7X00, Radeon 2), Intel (i810, i815), and Matrox (G200, G400, G450). 
+If you do enable <acronym>DRI</acronym> here, make sure you select the video card(s) you want 
+to support as a <emphasis>module</emphasis>.</para>
+
+<para>Additionally NVidia provides their own closed source binary drivers,
+which do not make use of <acronym>DRI</acronym>. If you intend to use these drivers,
+do not enable <acronym>DRI</acronym>.</para>
+
+<para>If you made any changes to the kernel configuration, recompile the kernel.</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 <filename>lilo</filename>. If you use 
+<filename>grub</filename>, edit <filename>/boot/grub/grub.conf</filename> 
+and add the new kernel to the boot menu.
+</para>
+
+<note><para>If you build <application>XFree86</application> 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 <acronym>DRI</acronym> support as a module as 
+instructed above.</para></note>
+
+</sect3>
+
+<sect3><title>Creating <filename>host.def</filename></title>
+
+<para>Although <application>XFree86</application> will compile without a
+<filename>host.def</filename> file, the following file 
+is recommended for customizing the installation. Start from 
+the <filename class="directory">xc</filename> directory.</para>
+
+<note><para>The <filename>host.def</filename> file is a
+<application>C</application> file, not the 
+usual configuration file.  If you make any changes, be sure the comment characters
+(<userinput>/*</userinput> and <userinput>*/</userinput>) 
+are balanced.  Most of the entries in the file below are
+commented out with the default settings shown.
+</para></note>
+
+<screen><userinput><command>cat &gt; config/cf/host.def &lt;&lt; "EOF"</command>
+/* Begin XFree86 host.def file */
+
+/* System Related Information.  If you read and configure only one
+ * section then it should be this one.  The Intel architecture defaults are 
+ * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is  
+ * for the Power PC.  Note that there have been reports that the Ppc 
+ * optimization line causes segmentation faults during build.  If that 
+ * happens, try building without the DefaultGcc2PpcOpt line.  **************/
+
+/* #define DefaultGcc2i386Opt  -O2 -fomit-frame-pointer -march=i686 */
+/* #define DefaultGcc2AxpOpt   -O2 -mcpu=ev6 */
+/* #define DefaultGcc2PpcOpt   -O2 -mcpu=750 */
+
+/* The following definitions are normally set properly by XFree86's scripts.
+ * You can uncomment them if you want to make sure. ************************/
+ 
+/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
+/* #define HasMMXSupport        NO  */ /* Any i586 or above */
+/* #define HasKatmaiSupport     NO  */ /* PIII SSE instructions */
+/* #define Has3DNowSupport      NO  */ /* AMD instructions */
+
+
+/* This setting reduces compile time a little by omitting rarely used input 
+ * devices.  You can find the complete list in config/cf/xfree86.cf ********/
+ 
+#define XInputDrivers                 mouse void
+
+/* VIDEO DRIVERS ***********************************************************/
+
+/* If you are sure you only want the drivers for one or a few video cards,
+ * you can delete the drivers you do not want. *****************************/ 
+
+
+#define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
+                         neomagic i740 tdfx savage \
+                         cirrus vmware tseng trident chips apm \
+                         GlideDriver fbdev i128 nsc \
+                         ati i810 AgpGartDrivers DevelDrivers ark \
+                         cyrix siliconmotion \
+                         vesa vga \
+                         dummy XF86OSCardDrivers XF86ExtraCardDrivers
+
+
+/* USER AND SYSTEM DEFAULT PATHS *******************************************/
+
+/* These settings set the PATH variables used by xdm. See README for *******/
+/* detailed description and modify the following as per your need. *********/
+
+/* #define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
+/* #define DefaultUserPath /usr/bin:/bin:/usr/X11R6/bin */
+
+/* FONT SERVER AND LIBRARY SETTINGS ****************************************/
+
+/* These settings are the defaults   ***************************************/
+
+/* #define BuildFontServer          YES  */ /* For Ghostscript Print Server*/
+/* #define SharedLibFont            YES  */
+/* #define CompressAllFonts         YES  */
+/* #define GzipFontCompression      YES  */
+
+/* These settings ensure we use our libraries ******************************/
+#define HasFreetype2             YES
+#define HasFontconfig            YES
+#define HasExpat                 YES
+#define HasLibpng                YES
+#define HasZlib                  YES
+
+/* The font path can be redefined in the XF86Config file *******************/
+
+/*
+#define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
+$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
+$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
+*/
+
+
+/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
+ * the defaults. ***********************************************************/
+
+/* #define BuildCyrillicFonts            NO  */
+/* #define BuildArabicFonts              NO  */
+/* #define BuildISO8859_6Fonts           NO  */
+/* #define BuildGreekFonts               NO  */
+/* #define BuildISO8859_7Fonts           NO  */
+/* #define BuildHebrewFonts              NO  */
+/* #define BuildISO8859_8Fonts           NO  */
+/* #define BuildKOI8_RFonts              NO  */
+/* #define BuildJapaneseFonts            NO  */
+/* #define BuildJISX0201Fonts            NO  */
+/* #define BuildKoreanFonts              NO  */
+/* #define BuildChineseFonts             NO  */
+
+/* DOCUMENTATION SETTINGS **************************************************/
+
+/* These setting are the defaults. *****************************************/
+
+/* #define BuildLinuxDocHtml             NO  */  /* X Docs in Html format */
+/* #define BuildLinuxDocPS               NO  */  /* PostScript format */
+/* #define BuildAllSpecsDocs             NO  */  /* Various docs */
+/* #define BuildHtmlManPages             NO  */
+
+/* GENERAL SETTINGS: You generally want to leave these alone when
+ * building X on an LFS system *********************************************/
+
+#define GccWarningOptions         -pipe /* Speed up compiles */
+#define TermcapLibrary            -lncurses
+#define XprtServer                YES /* Needed by realplayer */
+#define XnestServer               YES
+#define XAppLoadDir               EtcX11Directory/app-defaults
+#define VarLibDir                 /var/lib
+#define XFree86Devel               NO
+#define FSUseSyslog               YES
+#define ThreadedX                 YES
+#define HasPam                     NO        
+#define SystemManDirectory        /usr/share/man  /* Instead of /usr/man */
+#define HasLibCrypt               YES
+#define InstallXinitConfig        YES
+#define InstallXdmConfig          YES
+#define ForceNormalLib            YES
+#define BuildSpecsDocs             NO
+
+/* End XFree86 host.def file */
+<command>EOF</command></userinput></screen>
+
+<para>Edit the file for your hardware and desires.</para>
+
+</sect3>
+
+<sect3>
+<title>Build Commands</title>
+<para>Install <application>XFree86</application> by running the following commands:</para>
+
+
+<screen><userinput><command>( make WORLDOPTS="" World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS ) &amp;&amp;
+make install &amp;&amp;
+make install.man &amp;&amp;
+ln -sf ../X11R6/bin /usr/bin/X11 &amp;&amp;
+ln -sf ../X11R6/lib/{X11,libGL.so{,.1}} /usr/lib &amp;&amp;
+ln -sf ../X11R6/include/{X11,GL} /usr/include</command></userinput></screen>
+
+</sect3>
+
+<sect3>
+<title>Updating Direct Rendering Infrastructure (<acronym>DRI</acronym>)</title>
+<para>If you have one of the supported <acronym>DRI</acronym> cards and
+have enabled <acronym>DRI</acronym> kernel modules as explained
+above, you now need to update the kernel modules to ensure they are compatible with the
+current version of <application>XFree86</application>.  To do this, perform the following:</para>
+
+<screen><userinput><command>cd programs/Xserver/hw/xfree86/os-support/linux/drm/kernel &amp;&amp; 
+make  CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux  &amp;&amp; 
+mkdir -p /lib/modules/`uname -r`/kernel/drivers/char/drm/  &amp;&amp; 
+cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o \
+    /lib/modules/`uname -r`/kernel/drivers/char/drm/  &amp;&amp; 
+depmod -a</command></userinput></screen>
+
+<warning><para>If you recompile or upgrade your kernel, you will need to re-copy the 
+appropriate driver module(s)
+to the kernel module library and rerun <command>depmod -a</command>.</para></warning>
+
+<note><para>If you created <acronym>AGP</acronym> support as a module when compiling the kernel, you may
+have to add a line to <filename>/etc/modules.conf</filename> to ensure
+the agpgart module is loaded.  For instance, the <acronym>AGP</acronym> version of the Radeon video card
+will use the <filename>radeon.o</filename> driver.  It will
+need to have the line <screen>below radeon agpgart</screen> in 
+<filename>/etc/modules.conf</filename> to enable <acronym>DRI</acronym> support.</para></note>
+
+</sect3>
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>( make WORLDOPTS="" World 2&gt;&amp;1 | tee xfree-compile.log 
+   &amp;&amp; exit $PIPESTATUS )</command>: 
+This command runs multiple makefiles to completely rebuild the system. 
+<envar>WORLDOPTS</envar>="" disables the default setting to continue after 
+encountering an error. <parameter>2&gt;&amp;1</parameter> redirects error messages 
+to the same location as standard output. The <command>tee</command> command 
+allows viewing of the output while logging the results to a file. The parentheses 
+around the command runs the entire comand in a subshell and finally the 
+<command>exit $PIPESTATUS</command> ensures the result of the <command>make</command>
+is returned as the result and not the result of the <command>tee</command> command.</para>
+
+<note><para>When rebuilding <application>XFree86</application>, a separate command that may be used if only minor 
+changes are made to the sources is <command>make 
+Everything</command>.  This does not automatically remove generated 
+files and only rebuilds those files or programs that are out 
+of date.</para></note>
+
+<para><screen><command>ln -sf ../X11R6/bin /usr/bin/X11
+ln -sf ../X11R6/lib/{X11,libGL.so{,.1}} /usr/lib
+ln -sf ../X11R6/include/{X11,GL} /usr/include</command></screen>
+These commands are present to enable other (broken) packages to build
+against <application>XFree86</application>.  We do this even though the Filesystem Hierarchy Standard
+says:
+"In general, software must not be installed or managed via the above 
+symbolic links. They are intended for utilization by users only."</para>
+
+<para><command>make  CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux</command>: This builds the
+<application>XFree86</application> compatible kernel modules using the same compiler used to compile
+the kernel.</para>
+
+<para><command>cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o
+/lib/modules/`uname -r`/kernel/drivers/char/drm/</command>: Put the kernel
+module(s) where the kernel can find them. You only need to copy the driver you 
+need to support your video card.</para>
+
+<para><command>depmod -a</command>: Update the modules.dep file for module
+management.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>XFree86</application></title>
+
+<para>Edit <filename>/etc/ld.so.conf</filename> and add 
+<filename class="directory">/usr/X11R6/lib</filename>.
+Run</para> <screen><userinput><command>ldconfig</command></userinput></screen>
+
+<para>Ensure <filename class='directory'>/usr/X11R6/bin</filename> is added to your
+<envar>PATH</envar> environment variable. Instructions for doing this are described
+in the section "<xref linkend='postlfs-config-profile'/>."</para>
+ 
+<para>Expand the <envar>PKG_CONFIG_PATH</envar> so that other packages
+can find <application>X</application> libraries. Procedures for this are also
+described in the section "<xref linkend='postlfs-config-profile'/>."</para>
+
+<para>Run:</para>
+<screen><userinput><command>source ~/.bash_profile</command></userinput></screen>
+
+<para>Set up your mouse:
+<screen><userinput><command>ln -s psaux /dev/mouse</command></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>
+
+<para>Create the <filename>XF86Config</filename> file with:
+<screen><userinput><command>cd ~
+XFree86 -configure</command></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>
+
+<para>Edit <filename>XF86Config.new</filename> to suit your system.  The 
+details of the file are located in the man 
+page <command>man XF86Config</command>.  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 "Monitor".  Specify the <parameter>VertRefresh</parameter>
+and <parameter>HorizSync</parameter> values if the system does not automatically 
+detect the monitor and its values.</para></listitem>
+
+<listitem><para>Section "InputDevice".  You may want to change the keyboard 
+autorepeat rate by 
+adding <parameter>Option "Autorepeat" "250 30"</parameter>.</para></listitem>
+
+<listitem><para>Section "Device".  You may want to set some of the options 
+available for your selected video driver.  A description of the driver
+parameters is in the man page for your driver.</para></listitem>
+
+<listitem><para>Section "Screen".  Add a DefaultDepth statement such 
+as: <parameter>DefaultDepth 16</parameter>. In the SubSection for your 
+default depth, add a modes line such 
+as: <parameter> Modes "1280x1024" "1024x768"</parameter>.
+The first mode listed will normally be the starting 
+resolution.</para></listitem>
+
+</itemizedlist>
+
+<para>Test the system with:
+<screen><userinput><command>XFree86 -xf86config ~/XF86Config.new</command></userinput></screen>
+You will only get a gray 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 configuration file to its final location:</para>
+<screen><userinput><command>mv ~/XF86Config.new /etc/X11/XF86Config</command></userinput></screen>
+
+<para>Create <filename>.xinitrc</filename>:
+<screen><userinput><command>cat &gt; ~/.xinitrc &lt;&lt; "EOF"</command>
+# Begin .xinitrc file
+xterm  -g 80x40+0+0   &amp;
+xclock -g 100x100-0+0 &amp;
+twm
+<command>EOF</command></userinput></screen>
+This provides an initial screen with an xterm and a clock that is managed by a 
+simple window manager, Tab Window Manager.  For details of twm, see the 
+man page.</para>
+
+<note>
+
+<para>When needed, <application>XFree86</application> creates the directory
+<filename>/tmp/.ICE-unix</filename> if it does not exist. If this directory is
+not owned by root, <application>XFree86</application> delays startup by a few seconds
+and also appends a warning to the logfile. This also affects startup of other
+applications. To improve performance, it is advisable to manually create the directory
+before XFree86 uses it. Add the file creation to <filename>/etc/sysconfig/createfiles</filename>
+that is sourced by the
+<filename>/etc/rc.d/init.d/cleanfs</filename> startup script.</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"</command>
+/tmp/.ICE-unix dir 1777 root root
+<command>EOF</command></userinput></screen>
+
+</note>
+
+<para>Start <application>X</application> with: 
+<screen><userinput><command>startx</command></userinput></screen>
+to get a basic functional <application>X</application> Window System.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>XFree86</application> package contains the
+<application>X</application> Window System for Linux 
+(and other operating systems).  It includes
+the <application>X</application> server, fonts, xterm, a simple window manager (twm), 
+various utilities, video output drivers, 
+and various input drivers including the mouse and keyboard.</para>
+
+<para><application>XFree86</application> also contains libraries and header files for development of
+the <application>X</application> Window System programs.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<note><para>The following list of programs is not comprehensive. The
+full list is in <filename class="directory">/usr/X11R6/bin</filename>.  For additional
+information about these programs, see the respective man page.</para></note>
+
+<sect3>
+<title>XFree86</title>
+<para><application>XFree86</application> is the X11R6 implementation of
+the <application>X</application> Window System server.
+</para></sect3>
+
+<sect3><title>xf86config</title>
+<para><command>xf86config</command> is an interactive program for
+generating an <filename>XF86Config</filename> file for use with 
+<application>XFree86</application> <application>X</application> servers.</para></sect3>
+
+<sect3><title>xf86cfg</title>
+<para><command>xf86cfg</command> is a tool to configure
+<application>XFree86</application> that can be used to either write the 
+initial configuration file or make customizations to the current 
+configuration.</para></sect3>
+
+<sect3><title>startx</title>
+<para><command>startx</command> is a script to initialize the
+<application>X</application> session. It runs <command>xinit</command>.</para></sect3>
+
+<sect3><title>xinit</title>
+<para><command>xinit</command> is used to start the
+<application>X</application> Window System server.</para></sect3>
+
+<sect3><title>twm</title>
+<para><command>twm</command> (Tab Window Manager) is a window manager included with the 
+<application>X</application> Window System.</para></sect3>
+
+<sect3><title>xterm</title>
+<para><command>xterm</command> is a terminal emulator for
+<application>X</application>.</para></sect3>
+
+<sect3><title>xwininfo</title>
+<para><command>xwininfo</command> is a window information utility for
+<application>X</application>.</para></sect3>
+
+<sect3><title>x11perf</title>
+<para><command>x11perf</command> is an <application>X</application>11 server performance test program.</para></sect3>
+
+<sect3><title>xlsfonts</title>
+<para><command>xlsfonts</command> is a program to list fonts available
+to the <application>X</application> server.</para></sect3>
+
+<sect3><title>xvidtune</title>
+<para><command>xvidtune</command> is a video mode tuner for
+<application>XFree86</application>.</para></sect3>
+
+<sect3><title>xload</title>
+<para><command>xload</command> is a system load average display for
+<application>X</application>.</para></sect3>
+
+<sect3><title>xcalc</title>
+<para><command>xcalc</command> is a scientific calculator for
+<application>X</application>.</para></sect3>
+
+<sect3><title>xclock and oclock</title>
+<para>Clock programs for <application>X</application>.</para></sect3>
+
+<sect3><title>xmodmap</title>
+<para><command>xmodmap</command> is a utility for modifying keymaps and pointer button mappings 
+in <application>X</application>.</para></sect3>
+
+</sect2>
 </sect1>
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
+++ x/installing/xorg.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xorg-download-http "http://freedesktop.org/~xorg/X11R6.7.0/src/">
+  <!ENTITY xorg-download-ftp  " ">
+  <!ENTITY xorg-size          "70.3 MB">
+  <!ENTITY xorg-buildsize     "645 MB">
+  <!ENTITY xorg-time          "17.1 SBU">
+]>
+
+<sect1 id="xorg" xreflabel="X.org-&xorg-version;">
+<?dbhtml filename="xorg.html"?>
+<title>Xorg-&xorg-version;</title>
+
+
+<sect2>
+<title>Introduction to <application>Xorg</application></title>
+
+<note><para>There are two packages in BLFS that implement the <application>X</application> 
+Window System: <application>Xorg</application> and <application>XFree86</application>.  
+These packages are quite similar.  In fact, the base system of <application>Xorg</application>
+is <application>XFree86</application>-RC2.  The primary difference as of this writing is 
+the license provisions of the packages.  For someone building a package for their own use,
+these issues are not significant.  Most large commercial distributions have decided
+to use the  <application>Xorg</application> package, but several still use 
+<application>XFree86</application>.</para>
+
+<para>A second reason for the forking of X packages is the stated goals of the 
+developers.  Some developers were unhappy with the administration and progress of 
+<application>XFree86</application>.  Xorg's future plans include significant 
+improvements to the internals of the system and more frequent releases.</para>
+
+<para><application>XFree86</application> continues to be a solid, conservative 
+application with excellent driver support.</para>
+
+<para>Both <application>Xorg</application> and <application>XFree86</application>
+can be installed in the same way, but this section will provide a slightly
+different and more current variation for installation.</para>
+</note>
+
+
+<para><application>Xorg</application> is a freely redistributable open-source
+implementation of the <application>X</application> Window System. 
+This application  provides a client/server interface between display
+hardware (the mouse, keyboard, and video displays) and the desktop environment,
+while also providing both the windowing infrastructure and a standardized
+application interface (<acronym>API</acronym>).</para>
+ 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&xorg-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&xorg-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &xorg-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &xorg-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &xorg-time;</para></listitem></itemizedlist>
+</sect3>
+ 
+ 
+<sect3><title><application>Xorg</application> Dependencies</title>
+ 
+<sect4><title>Required</title>
+<para><xref linkend="libpng"/>, <xref linkend="expat"/>, <xref linkend="freetype2"/> and
+<xref linkend="fontconfig"/>.</para>
+</sect4>
+
+<sect4><title>Optional</title> 
+<para><xref linkend="Linux_PAM"/>.</para>
+</sect4>
+
+</sect3>
+ 
+ 
+<sect3><title>Download Instructions</title>
+ 
+<para>There are several files that need to be fetched from the download location:</para>
+<itemizedlist spacing='compact'>
+<listitem><para><filename>X11R6.7.0-src1.tar.gz</filename></para></listitem>
+<listitem><para><filename>X11R6.7.0-src2.tar.gz</filename></para></listitem>
+<listitem><para><filename>X11R6.7.0-src3.tar.gz</filename></para></listitem>
+<listitem><para><filename>X11R6.7.0-src4.tar.gz</filename></para></listitem>
+<listitem><para><filename>X11R6.7.0-src5.tar.gz</filename></para></listitem>
+<listitem><para><filename>X11R6.7.0-src6.tar.gz</filename></para></listitem>
+<listitem><para><filename>X11R6.7.0-src7.tar.gz</filename></para></listitem>
+</itemizedlist>
+
+<para>The first package contains the <application>Xorg</application> libraries and 
+support programs,  the second contains standard X programs, the third contains the 
+X server, the fourth and fifth are fonts, the sixth is normal documentation, and the seventh
+is hardcopy documentation.</para> 
+ 
+<para>To check your downloads for integrity, download the <filename>md5sums</filename>
+file.  Then:</para>
+ 
+<screen><userinput><command>md5sum -c md5sums</command></userinput></screen>
+ 
+<para>All seven packages should give an OK status.</para>
+</sect3>
+</sect2>
+
+<sect2>
+<title>Installation of <application>Xorg</application></title>
+
+
+<sect3>
+<title>Kernel Compilation Settings</title>
+<para>If you have an Intel P6 (Pentium Pro, Pentium II and later), it is recommended
+that you compile <acronym>MTRR</acronym> (Memory Type Range Registers) support into the kernel.
+The kernel can map Cyrix and AMD <acronym>CPU</acronym>s to the
+<acronym>MTRR</acronym> interface, so selecting this
+option is useful for those processors also. 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 <acronym>PCI</acronym> or
+<acronym>AGP</acronym> video cards.</para>
+ 
+<para>In the "Character Devices" section, enable <acronym>AGP</acronym> 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:</para>
+<screen><userinput><command>cat /proc/pci</command></userinput></screen>
+ 
+<para>In the "Character Devices" section, <emphasis>disable</emphasis> Direct
+Rendering Manager unless you have a Direct Rendering Infrastructure
+(<acronym>DRI</acronym>)
+supported video card.  A complete list of <acronym>DRI</acronym> supported video cards can
+be found at <ulink url="http://dri.sourceforge.net" /> in the Status section.
+Currently, supported cards include those from 3dfx (Voodoo, Banshee), 3Dlabs,
+ATI (Rage Pro, Rage 128,
+Radeon 7X00, Radeon 2), Intel (i810, i815), and Matrox (G200, G400, G450).
+If you do enable <acronym>DRI</acronym> here, make sure you select the video card(s) you want
+to support as a <emphasis>module</emphasis>.</para>
+ 
+<para>Additionally NVidia provides their own closed source binary drivers,
+which do not make use of <acronym>DRI</acronym>. If you intend to use these drivers,
+do not enable <acronym>DRI</acronym>.</para>
+ 
+<para>If you made any changes to the kernel configuration, recompile the kernel.</para>
+ 
+<para>Copy the <filename>arch/i386/boot/bzImage</filename> and <filename>System.map</filename> 
+from the kernel build directory to <filename class='directory'>/boot</filename>.
+Edit <filename>/boot/grub/grub.conf</filename> and add the new kernel to the
+boot menu.
+(If you use lilo, edit <filename>/etc/lilo.conf</filename> and run <filename>lilo</filename>.)
+</para>
+ 
+<note><para>If you build <application>Xorg</application> 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 <acronym>DRI</acronym> support as a module as
+instructed above.</para></note>
+</sect3>
+
+<sect3><title>Setting Up a Shadow Directory</title>  
+<para>When building <application>Xorg</application>, you should create
+a shadow directory of symbolic links for the compiled code.  To do that, we first
+make the <application>lndir</application>.  Starting from the 
+<filename class='directory'>xc</filename> directory:</para>
+
+<screen><userinput><command>pushd config/util &amp;&amp;
+make -f Makefile.ini lndir &amp;&amp;
+cp lndir /usr/bin/ &amp;&amp;
+popd</command></userinput></screen>
+
+<para>Now create the shadow tree:</para>
+
+<screen><userinput><command>mkdir ../xcbuild &amp;&amp;
+cd ../xcbuild &amp;&amp;
+lndir ../xc</command></userinput></screen>
+</sect3>
+
+<sect3><title>Creating <filename>host.def</filename></title>  
+<para>The next step is to create the <filename>config/cf/host.def</filename> file.
+The documentation for <application>Xorg</application> indicates that the 
+application will build without a <filename>host.def</filename> file, but
+the included libraries for <application>fontconfig</application> and 
+<application>freetype2</application> do not build properly on a base LFS system. 
+Therefore, you must specify that these libraries, as well as others, should be
+imported from the system.</para>
+
+<note><para><filename>config/cf/host.def</filename> is a C file, not a shell 
+script.  Ensure the comments delimited by /* ... */ are
+balanced when modifying the file. </para></note>
+
+
+<screen><userinput><command>cat &gt; config/cf/host.def &lt;&lt; "EOF"</command>
+/* Begin Xorg host.def file */
+ 
+/* System Related Information.  If you read and configure only one
+ * section then it should be this one.  The Intel architecture defaults are
+ * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
+ * for the Power PC.  AMD64 is for the Opteron processor. Note that there have 
+ * been reports that the Ppc optimization line causes segmentation faults during 
+ * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
+ 
+/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
+/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
+/* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
+/* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
+
+#define HasFreetype2             YES
+#define HasFontconfig            YES
+#define HasExpat                 YES
+#define HasLibpng                YES
+#define HasZlib                  YES
+
+/*
+ * Which drivers to build.  When building a static server, each of these
+ * will be included in it.  When building the loadable server each of these
+ * modules will be built.
+ *
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx savage \
+                                cirrus vmware tseng trident chips apm \
+                                GlideDriver fbdev i128 \
+                                ati AgpGartDrivers DevelDrivers ark cyrix \
+                                siliconmotion \
+                                vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+*/
+
+/*
+ * Select the XInput devices you want by uncommenting this.
+ *
+#define XInputDrivers           mouse keyboard acecad calcomp citron \
+                                digitaledge dmc dynapro elographics \
+                                microtouch mutouch penmount spaceorb summa \
+                                wacom void magictouch aiptek
+ */
+
+/* Most installs will only need this */
+
+#define XInputDrivers           mouse keyboard
+
+
+/* End Xorg host.def file */
+<command>EOF</command></userinput></screen>
+
+<para>There are several other options that you may want to consider.  A well documented
+example file is <filename>config/cf/xorgsite.cf</filename>.</para>
+</sect3>
+
+<sect3>
+<title>Build Commands</title>
+<para>Install <application>Xorg</application> by running the following commands:</para>
+ 
+ 
+<screen><userinput><command>( make World 2&gt;&amp;1 | tee xorg-compile.log &amp;&amp; exit $PIPESTATUS ) &amp;&amp;
+make install &amp;&amp;
+make install.man &amp;&amp;
+ln -sf ../X11R6/bin /usr/bin/X11 &amp;&amp;
+ln -sf ../X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
+ln -sf ../X11R6/include/X11 /usr/include/X11</command></userinput></screen>
+ 
+</sect3>
+
+<sect3>
+<title>Updating Direct Rendering Infrastructure (<acronym>DRI</acronym>)</title>
+<para>If you have one of the supported <acronym>DRI</acronym> cards and
+have enabled <acronym>DRI</acronym> kernel modules as explained
+above, you now need to update the kernel modules to ensure they are compatible with the
+current version of <application>Xorg</application>.  To do this, perform the following:</para>
+ 
+<screen><userinput><command>cd programs/Xserver/hw/xfree86/os-support/linux/drm/kernel &amp;&amp;
+make  CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux  &amp;&amp;
+mkdir -p /lib/modules/`uname -r`/kernel/drivers/char/drm/  &amp;&amp;
+cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o \
+    /lib/modules/`uname -r`/kernel/drivers/char/drm/  &amp;&amp;
+depmod -a</command></userinput></screen>
+ 
+<warning><para>If you recompile or upgrade your kernel, you will need to re-copy the
+appropriate driver module(s)
+to the kernel module library and rerun the <command>depmod -a</command> command.</para></warning>
+ 
+<note><para>If you created <acronym>AGP</acronym> support as a module when compiling 
+the kernel, you may have to add a line to <filename>/etc/modules.conf</filename> to ensure
+the agpgart module is loaded.  For instance, the <acronym>AGP</acronym> version of the 
+Radeon video card will use the <filename>radeon.o</filename> driver.  It will
+need to have the line <screen>below radeon agpgart</screen> in
+<filename>/etc/modules.conf</filename> to enable <acronym>DRI</acronym> support.</para></note>
+</sect3>
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+ 
+<para><command>( make World 2&gt;&amp;1 | tee xorg-compile.log
+   &amp;&amp; exit $PIPESTATUS )</command>:
+This command runs multiple makefiles to completely rebuild the system.
+<parameter>2&gt;&amp;1</parameter> redirects error messages
+to the same location as standard output. The <command>tee</command> command
+allows viewing of the output while logging the results to a file. The parentheses
+around the command runs the entire comand in a subshell and finally the
+<command>exit $PIPESTATUS</command> ensures the result of the <command>make</command>
+is returned as the result and not the result of the <command>tee</command> command.</para>
+ 
+<note><para>When rebuilding <application>Xorg</application>, a separate command that may 
+be used if only minor changes are made to the sources is <command>make
+Everything</command>.  This does not automatically remove generated
+files and only rebuilds those files or programs that are out
+of date.</para></note>
+ 
+<para><screen><command>ln -sf ../X11R6/bin /usr/bin/X11
+ln -sf ../X11R6/lib/X11 /usr/lib/X11
+ln -sf ../X11R6/include/X11 /usr/include/X11</command></screen>
+These commands are present to enable other (broken) packages to build
+against <application>Xorg</application>.  We do this even though the 
+Filesystem Hierarchy Standard says:
+"In general, software must not be installed or managed via the above
+symbolic links. They are intended for utilization by users only."</para>
+ 
+<para><command>make  CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux</command>: This builds the
+<application>Xorg</application> compatible kernel modules using the same compiler used to compile
+the kernel.</para>
+ 
+<para><command>cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o
+/lib/modules/`uname -r`/kernel/drivers/char/drm/</command>: Put the kernel
+module(s) where the kernel can find them. You only need to copy the driver you
+need to support your video card.</para>
+ 
+<para><command>depmod -a</command>: Update the modules.dep file for module
+management.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring Xorg</title>
+
+<para>Edit <filename>/etc/ld.so.conf</filename> and add
+<filename class="directory">/usr/X11R6/lib</filename>.
+Run:</para> <screen><userinput><command>ldconfig</command></userinput></screen>
+ 
+<para>Ensure <filename class='directory'>/usr/X11R6/bin</filename> is added to your
+<envar>PATH</envar> environment variable. Instructions for doing this are described
+in the section "<xref linkend='postlfs-config-profile'/>."</para>
+ 
+<para>Expand the <envar>PKG_CONFIG_PATH</envar> so that other packages
+can find <application>X</application> libraries. Procedures for this are also
+described in the section "<xref linkend='postlfs-config-profile'/>."</para>
+
+<para>Set up your mouse:
+<screen><userinput><command>ln -s psaux /dev/mouse</command></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>
+ 
+<para>Create the <filename>xorg.conf</filename> file with:
+<screen><userinput><command>cd ~
+Xorg -configure</command></userinput></screen>
+The screen will go black and you may hear some clicking of the monitor.  This
+command will create a file, <filename>xorg.conf.new</filename> in your home
+directory.</para>
+ 
+<para>Edit <filename>xorg.conf.new</filename> to suit your system.  The
+details of the file are located in the man
+page <command>man xorg.conf</command>.  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 "Monitor".  Specify the <parameter>VertRefresh</parameter>
+and <parameter>HorizSync</parameter> values if the system does not automatically
+detect the monitor and its values.</para></listitem>
+ 
+<listitem><para>Section "InputDevice".  You may want to change the keyboard
+autorepeat rate by
+adding <parameter>Option "Autorepeat" "250 30"</parameter>.</para></listitem>
+ 
+<listitem><para>Section "Device".  You may want to set some of the options
+available for your selected video driver.  A description of the driver
+parameters is in the man page for your driver.</para></listitem>
+ 
+<listitem><para>Section "Screen".  Add a DefaultDepth statement such
+as: <parameter>DefaultDepth 16</parameter>. In the SubSection for your
+default depth, add a modes line such
+as: <parameter> Modes "1280x1024" "1024x768"</parameter>.
+The first mode listed will normally be the starting
+resolution.</para></listitem>
+ 
+</itemizedlist>
+<para>Test the system with:
+<screen><userinput><command>X -xf86config ~/xorg.conf.new</command></userinput></screen>
+You will only get a gray 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/Xorg.0.log</filename> to see what went
+wrong.</para>
+ 
+<para>Move the configuration file to its final location:</para>
+<screen><userinput><command>mv ~/xorg.conf.new /etc/X11/xorg.conf</command></userinput></screen>
+ 
+<para>Create <filename>.xinitrc</filename>:
+<screen><userinput><command>cat &gt; ~/.xinitrc &lt;&lt; "EOF"</command>
+# Begin .xinitrc file
+xterm  -g 80x40+0+0   &amp;
+xclock -g 100x100-0+0 &amp;
+twm
+<command>EOF</command></userinput></screen>
+This provides an initial screen with an xterm and a clock that is managed by a
+simple window manager, Tab Window Manager.  For details of twm, see the
+man page.</para>
+ 
+<note>
+ 
+<para>When needed, <application>Xorg</application> creates the directory
+<filename>/tmp/.ICE-unix</filename> if it does not exist. If this directory is
+not owned by root, <application>Xorg</application> delays startup by a few seconds
+and also appends a warning to the logfile. This also affects startup of other
+applications. To improve performance, it is advisable to manually create the directory
+before Xorg uses it. Add the file creation to <filename>/etc/sysconfig/createfiles</filename>
+that is sourced by the
+<filename>/etc/rc.d/init.d/cleanfs</filename> startup script.</para>
+ 
+<screen><userinput><command>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"</command>
+/tmp/.ICE-unix dir 1777 root root
+<command>EOF</command></userinput></screen>
+ 
+</note>
+ 
+<para>Start <application>X</application> with:
+<screen><userinput><command>startx</command></userinput></screen>
+to get a basic functional <application>X</application> Window System.</para>
+
+<para>At this point, you should check out the X Window Components at 
+<xref linkend='x-setup'/>.</para>
+
+</sect2>
+</sect1>
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/atk.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY ATK-download-http "http://ftp.gnome.org/pub/GNOME/sources/atk/1.6/atk-&ATK-version;.tar.bz2">
+  <!ENTITY ATK-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.6/atk-&ATK-version;.tar.bz2">
+  <!ENTITY ATK-size          "482 KB">
+  <!ENTITY ATK-buildsize     "7.9 MB">
+  <!ENTITY ATK-time          "0.13 SBU">
+]>
+
 <sect1 id="ATK" xreflabel="ATK-&ATK-version;">
 <?dbhtml filename="atk.html" ?>
 <title>ATK-&ATK-version;</title>
 
-&ATK-intro;
-&ATK-inst;
-&ATK-exp;
-&ATK-desc;
+<sect2>
+<title>Introduction to <application><acronym>ATK</acronym></application></title>
+
+<para>The <application><acronym>ATK</acronym></application> package contains the
+<application><acronym>ATK</acronym></application> libraries. They are useful for
+allowing accessibility solutions to be available for all
+<application><acronym>GTK</acronym>2</application>
+applications.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&ATK-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&ATK-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ATK-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &ATK-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &ATK-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>ATK</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib2"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>ATK</acronym></application></title>
+
+<para>Install <application><acronym>ATK</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--enable-gtk-doc</option>: This switch will rebuild
+the <acronym>API</acronym> documentation during the
+<command>make</command> command.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>ATK</acronym></application> package contains <filename
+class="libraryfile">libatk</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ATK Libraries</title>
+<para><application><acronym>ATK</acronym></application> libraries contain the <acronym>API</acronym> used by assistive technologies in order to 
+interact with the desktop and applications.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/lib/gtk+.xml
===================================================================
--- x/lib/gtk+.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/gtk+.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY GTK-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v1.2/gtk+-&GTK-version;.tar.gz">
+  <!ENTITY GTK-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-&GTK-version;.tar.gz">
+  <!ENTITY GTK-size          "2.7 MB">
+  <!ENTITY GTK-buildsize     "54 MB">
+  <!ENTITY GTK-time          "1.96 SBU">
+]>
 <sect1 id="GTK" xreflabel="GTK+-&GTK-version;">
 <?dbhtml filename="gtk.html" ?>
 <title>GTK+-&GTK-version;</title>
 
-&GTK-intro;
-&GTK-inst;
-&GTK-exp;
-&GTK-desc;
+<sect2>
+<title>Introduction to <application>GTK+</application></title>
+
+<para>The <application>GTK+</application> package contains
+<application>GTK+</application> Libraries. This is useful for
+creating graphical user interfaces for applications.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&GTK-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&GTK-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GTK-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &GTK-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &GTK-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GTK+</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib"/>, <xref
+linkend="libtiff"/>, <xref linkend="libjpeg"/>
+and X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GTK</acronym>+</application></title>
+
+<para>Install <application><acronym>GTK</acronym>+</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--sysconfdir=/etc</option>: This installs the
+configuration files into <filename class="directory">/etc</filename>
+instead of <filename class="directory">/usr/etc</filename>.</para>
+
+<para><parameter>--with-xinput=xfree</parameter>: This configuration
+flag is necessary to utilize alternative input devices.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GTK+</application> package contains <filename
+class="libraryfile">libgtk-1.2</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GTK+ Libraries</title>
+<para><application>GTK+</application> Libraries provide the
+<acronym>API</acronym> to implement graphical user
+interfaces.</para></sect3>
+
+
+</sect2>
 
 </sect1>
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/gtk+2.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY GTK2-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v2.4/gtk+-&GTK2-version;.tar.bz2">
+  <!ENTITY GTK2-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-&GTK2-version;.tar.bz2">
+  <!ENTITY GTK2-size          "8.5 MB">
+  <!ENTITY GTK2-buildsize     "193 MB">
+  <!ENTITY GTK2-time          "2.88 SBU">
+]>
+
 <sect1 id="GTK2" xreflabel="GTK+-&GTK2-version;">
 <?dbhtml filename="gtk2.html" ?>
 <title>GTK+-&GTK2-version;</title>
 
-&GTK2-intro;
-&GTK2-inst;
-&GTK2-exp;
-&GTK2-desc;
+<sect2>
+<title>Introduction to <application>GTK+</application></title>
+
+<para>The <application>GTK+</application> package contains
+<application>GTK+</application> Libraries. This is useful for
+creating graphical user interfaces for applications.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&GTK2-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&GTK2-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GTK2-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &GTK2-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &GTK2-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GTK+</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
+<xref linkend="Pango"/> and
+<xref linkend="ATK"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libtiff"/>,
+<xref linkend="libjpeg"/>,
+<xref linkend="gtk-doc"/> and
+<ulink url="http://sources.redhat.com/docbook-tools/">docbook-utils</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GTK</acronym>+</application></title>
+
+<para>Install <application><acronym>GTK</acronym>+</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--sysconfdir=/etc</parameter>: This switch installs the
+configuration files into <filename class="directory">/etc</filename>
+instead of <filename class="directory">/usr/etc</filename>.</para>
+
+<para><option>--enable-gtk-doc</option>: This switch will rebuild
+the <acronym>API</acronym> documentation during the
+<command>make</command> command.</para>
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GTK+</application> package contains
+<filename class="libraryfile">libgdk_pixbuf-2.0</filename>,
+<filename class="libraryfile">libgdk-x11-2.0</filename>,
+<filename class="libraryfile">libgtk-x11-2.0</filename> and
+<filename class="libraryfile">libgdk_pixbuf_xlib-2.0</filename>
+libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GTK+ Libraries</title>
+<para><application>GTK+</application> Libraries provide the <acronym>API</acronym> to implement graphical user
+interfaces.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/lib/hicolor-icon-theme.xml
===================================================================
--- x/lib/hicolor-icon-theme.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/hicolor-icon-theme.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,9 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY hicolor-icon-theme-download-http "http://freedesktop.org/Software/icon-theme/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
+  <!ENTITY hicolor-icon-theme-download-ftp  " ">
+  <!ENTITY hicolor-icon-theme-buildsize     "157 KB">
+  <!ENTITY hicolor-icon-theme-size          "32 KB">
+  <!ENTITY hicolor-icon-theme-time          "0.01 SBU">
+]>
+
 <sect1 id="hicolor-icon-theme" xreflabel="hicolor-icon-theme-&hicolor-icon-theme-version;">
 <?dbhtml filename="hicolor-icon-theme.html" ?>
 <title>hicolor-icon-theme-&hicolor-icon-theme-version;</title>
 
-&hicolor-icon-theme-intro;
-&hicolor-icon-theme-inst;
-&hicolor-icon-theme-desc;
+<sect2>
+<title>Introduction to <application>hicolor-icon-theme</application></title>
+
+<para>The <application>hicolor-icon-theme</application> package contains
+a default fallback theme for implementations of the icon theme
+specification.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&hicolor-icon-theme-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&hicolor-icon-theme-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &hicolor-icon-theme-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &hicolor-icon-theme-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &hicolor-icon-theme-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>hicolor-icon-theme</application></title>
+
+<para>Install <application>hicolor-icon-theme</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>hicolor-icon-theme</application> package contains
+<filename>/usr/share/icons/hicolor/*</filename>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>HiColor Icons</title>
+<para><filename>/usr/share/icons/hicolor/*</filename> contains icon definitions 
+used as defaults.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/lesstif.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,11 +1,130 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY lesstif-download-http "http://prdownloads.sourceforge.net/lesstif/lesstif-&lesstif-version;.tar.bz2">
+  <!ENTITY lesstif-size          "3.4 MB">
+  <!ENTITY lesstif-buildsize     "40 MB">
+  <!ENTITY lesstif-time          "2.73 SBU">
+]>
+
 <sect1 id="lesstif" xreflabel="LessTif-&lesstif-version;">
 <?dbhtml filename="lesstif.html" ?>
 <title>LessTif-&lesstif-version;</title>
 
-&lesstif-intro;
-&lesstif-inst;
-&lesstif-exp;
-&lesstif-config;
-&lesstif-desc;
+<sect2>
+<title>Introduction to <application>LessTif</application></title>
+
+<para>The <application>LessTif</application> package contains an Open
+Source version of <application>OSF/Motif(R)</application>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&lesstif-download-http;"/></para></listitem>
+<listitem><para>Download size: &lesstif-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &lesstif-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &lesstif-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>LessTif</application> dependencies</title>
+<sect4><title>Required</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>LessTif</application></title>
+
+<para>Install <application>LessTif</application> by running the following commands:</para>
+
+<screen><userinput><command>find -name Makefile.in | \
+    xargs sed -i 's@$(prefix)/LessTif@$(prefix)/share/LessTif@g' &amp;&amp;
+./configure --prefix=/usr \
+    --enable-build-20 \
+    --enable-build-21 \
+    --disable-debug \
+    --enable-production \
+    --disable-build-tests \
+    --with-xdnd &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>sed -i 's@$(prefix)/LessTif@$(prefix)/share/LessTif@g'</option>:
+This moves the location of the non-FHS compliant <filename class="directory">/usr/LessTif</filename>
+directory to <filename class="directory">/usr/share/LessTif</filename>.</para>
+
+<para><option>--enable-build-20</option>: Build the
+<application>Motif</application> 2.0 compatible version of the
+<application>LessTif</application> libraries.</para> 
+
+<para>
+<option>--enable-build-21</option>: Also build the
+<application>Motif</application> 2.1 compatible versions.</para> 
+
+<para><option>--disable-debug</option>: Do not generate debugging information.</para> 
+
+<para><option>--enable-production</option>: Build the release version
+of the <application>LessTif</application> libraries.</para> 
+
+<para><option>--disable-build-tests</option>: Do not build the
+<filename class="directory">test/</filename> tree (see Testing
+<application>LessTif</application>).</para> 
+
+<para><option>--with-xdnd</option>: Enable <acronym>XDND</acronym>
+GNOME compatibility support.</para> 
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>LessTif</application></title>
+
+<sect3><title>Configuration Information</title>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>
+
+</sect3>
+
+</sect2>
+
+<sect2><title>Testing <application>LessTif</application></title>
+<para>It is advisable to test the installation of
+<application>LessTif</application> with the
+test suite located in
+<filename class="directory">lesstif-&lesstif-version;/test</filename>.  It is not
+required to install any of the resulting binaries to validate the
+installation. The following commands executed from the source
+directory will suffice:</para>
+
+<screen><userinput><command>cd test &amp;&amp;
+./configure &amp;&amp;
+make</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>LessTif</application> package contains
+<application>LessTif</application> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>lesstif libraries</title>
+<para><application>LessTif</application> libraries are an
+<application>OSF/Motif(R)</application> source code compatible
+library for the <application>X</application> Window System.</para></sect3>
+
+
+</sect2>
 
 </sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/lib.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <chapter id="x-lib">
 <?dbhtml filename="lib.html" ?>
@@ -12,14 +19,14 @@
 programmers by supplying common elements.</para> 
 
-&qt;
-&GTK;
-&Pango;
-&ATK;
-&GTK2;
-&lesstif;
-&startup-notification;
-&shared-mime-info;
-&hicolor-icon-theme;
-&libxklavier;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="qt.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk+.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pango.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="atk.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk+2.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lesstif.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="startup-notification.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shared-mime-info.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hicolor-icon-theme.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxklavier.xml"/> 
 
 </chapter>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/libxklavier.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,9 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libxklavier-download-http "http://prdownloads.sourceforge.net/gswitchit/libxklavier-&libxklavier-version;.tar.gz">
+  <!ENTITY libxklavier-download-ftp  " ">
+  <!ENTITY libxklavier-size          "400 KB">
+  <!ENTITY libxklavier-buildsize     "6.3 MB">
+  <!ENTITY libxklavier-time          "0.01 SBU">
+]>
+
 <sect1 id="libxklavier" xreflabel="libxklavier-&libxklavier-version;">
 <?dbhtml filename="libxklavier.html" ?>
 <title>libxklavier-&libxklavier-version;</title>
 
-&libxklavier-intro;
-&libxklavier-inst;
-&libxklavier-desc;
+<sect2>
+<title>Introduction to <application>libxklavier</application></title>
+
+<para>The <application>libxklavier</application> package contains a
+utility library for X keyboard.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&libxklavier-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&libxklavier-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libxklavier-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &libxklavier-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &libxklavier-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libxklavier</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+<xref linkend="pkgconfig"/> and
+<xref linkend="libxml2"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libxklavier</application></title>
+
+<para>Install <application>libxklavier</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libxklavier</application> package contains
+<filename>libxklavier</filename> libraries.</para>
+
+
+</sect2>
 
 </sect1>
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/pango.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,97 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY Pango-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v2.4/pango-&Pango-version;.tar.gz">
+  <!ENTITY Pango-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v2.4/pango-&Pango-version;.tar.gz">
+  <!ENTITY Pango-size          "1.4 MB">
+  <!ENTITY Pango-buildsize     "22.8 MB">
+  <!ENTITY Pango-time          "0.49 SBU">
+]>
+
 <sect1 id="Pango" xreflabel="Pango-&Pango-version;">
 <?dbhtml filename="pango.html" ?>
 <title>Pango-&Pango-version;</title>
 
-&Pango-intro;
-&Pango-inst;
-&Pango-exp;
-&Pango-desc;
+<sect2>
+<title>Introduction to <application>Pango</application></title>
+
+<para>The <application>Pango</application> package contains the
+<filename class="libraryfile">libpango</filename> library. This is useful for
+the layout and rendering of text.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&Pango-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&Pango-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &Pango-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &Pango-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &Pango-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Pango</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib2"/></para></sect4>
+<sect4><title>Optional</title>
+<para>
+<ulink url="http://freedesktop.org/~fontconfig/release/">Xft</ulink> (included in <xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+<xref linkend="freetype2"/>,
+<xref linkend="fontconfig"/> and
+<xref linkend="gtk-doc"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Pango</application></title>
+
+<para>In order for <application>Pango</application> to find
+<application>Xft</application>, the <envar>PKG_CONFIG_PATH</envar> must 
+include <filename class="directory">/usr/X11R6/lib/pkgconfig</filename>.
+This is a good time to
+add it if you haven't already. You can utilize the example for
+<filename>X.sh</filename> to create a script for modifying this
+variable located in the section <xref linkend="postlfs-config-profile"/>.</para>
+
+<para>Install <application>Pango</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--sysconfdir=/etc</parameter>: This switch installs the
+configuration files into <filename class="directory">/etc</filename>
+instead of <filename class="directory">/usr/etc</filename>.</para>
+
+<para><option>--enable-gtk-doc</option>: This switch will rebuild
+the <acronym>API</acronym> documentation during the
+<command>make</command> command.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Pango</application> package contains <filename
+class="libraryfile">libpango</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>Pango libraries</title>
+<para><application>Pango</application> libraries contain low level layout rendering routines, a
+high level driver for laying out entire blocks of text, and routines to
+assist in editing internationalized text.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/qt.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,2 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY qt-download-http "http://sunsite.rediris.es/mirror/Qt/source/qt-x11-free-&qt-version;.tar.bz2">
+  <!ENTITY qt-download-ftp  "ftp://ftp.trolltech.com/qt/source/qt-x11-free-&qt-version;.tar.bz2">
+  <!ENTITY qt-md5sum        "903cad618274ad84d7d13fd0027a6c3c">
+  <!ENTITY qt-size          "14 MB">
+  <!ENTITY qt-buildsize     "165 MB">
+  <!ENTITY qt-time          "21.2 SBU (full), 13.4 SBU (sub-tools)">
+]>
+
 <sect1 id="qt" xreflabel="Qt-&qt-version;">
 <?dbhtml filename="qt.html" ?>
Index: x/lib/shared-mime-info.xml
===================================================================
--- x/lib/shared-mime-info.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/shared-mime-info.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,9 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY shared-mime-info-download-http "http://freedesktop.org/Software/shared-mime-info/shared-mime-info-&shared-mime-info-version;.tar.gz">
+  <!ENTITY shared-mime-info-download-ftp  " ">
+  <!ENTITY shared-mime-info-buildsize     "2.2 MB">
+  <!ENTITY shared-mime-info-size          "348 KB">
+  <!ENTITY shared-mime-info-time          "0.01 SBU">
+]>
+
 <sect1 id="shared-mime-info" xreflabel="shared-mime-info-&shared-mime-info-version;">
 <?dbhtml filename="shared-mime-info.html" ?>
 <title>shared-mime-info-&shared-mime-info-version;</title>
 
-&shared-mime-info-intro;
-&shared-mime-info-inst;
-&shared-mime-info-desc;
+<sect2>
+<title>Introduction to <application>shared-mime-info</application></title>
+
+<para>The <application>shared-mime-info</application> package contains a
+<acronym>MIME</acronym> database. This allows central updates of
+<acronym>MIME</acronym> information for all supporting applications.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&shared-mime-info-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&shared-mime-info-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &shared-mime-info-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &shared-mime-info-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &shared-mime-info-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>shared-mime-info</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="GLib2"/>, <xref linkend="libxml2"/> and <xref
+linkend="perl-modules"/>: XML-Parser
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>shared-mime-info</application></title>
+
+<para>Install <application>shared-mime-info</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>shared-mime-info</application> package contains <command>
+update-mime-database</command> and <filename>/usr/share/mime/*</filename>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>update-mime-database</title>
+<para><command>update-mime-database</command> assists in adding
+<acronym>MIME</acronym> data to the database.</para></sect3>
+
+<sect3><title>MIME Database</title>
+<para><filename>/usr/share/mime/*</filename> contains the centralized
+<acronym>MIME</acronym> database.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/lib/startup-notification.xml
===================================================================
--- x/lib/startup-notification.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/lib/startup-notification.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,9 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY startup-notification-download-http "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-&startup-notification-version;.tar.gz">
+  <!ENTITY startup-notification-download-ftp  "ftp://ftp.linux.org.uk/pub/linux/GNOME/sources/startup-notification/&startup-notification-version;/startup-notification-&startup-notification-version;.tar.bz2">
+  <!ENTITY startup-notification-size          "303 KB">
+  <!ENTITY startup-notification-buildsize     "3.9 MB">
+  <!ENTITY startup-notification-time          "0.09 SBU">
+]>
+
 <sect1 id="startup-notification" xreflabel="startup-notification-&startup-notification-version;">
 <?dbhtml filename="startup-notification.html" ?>
 <title>startup-notification-&startup-notification-version;</title>
 
-&startup-notification-intro;
-&startup-notification-inst;
-&startup-notification-desc;
+<sect2>
+<title>Introduction to <application>startup-notification</application></title>
+
+<para>The <application>startup-notification</application> package
+contains <filename class="libraryfile">startup-notification</filename>
+libraries. These are useful for building a consistent manner to notify
+the user through the cursor that the application is loading.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&startup-notification-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&startup-notification-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &startup-notification-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &startup-notification-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &startup-notification-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>startup-notification</application> dependencies</title>
+<sect4><title>Required</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>startup-notification</application></title>
+
+<para>Install <application>startup-notification</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>startup-notification</application> package contains
+<filename class="libraryfile">libstartup-notification</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>startup-notification libraries</title>
+<para><filename class="libraryfile">startup-notification</filename> libraries provide the functions to assist
+applications in communicating with the cursor system to provide
+feedback to the user that the application is loading.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/wm/fluxbox.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,11 +1,136 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY fluxbox-download-http "http://prdownloads.sourceforge.net/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
+  <!ENTITY fluxbox-download-ftp  " ">
+  <!ENTITY fluxbox-size          "372 KB">
+  <!ENTITY fluxbox-buildsize     "53.9 MB">
+  <!ENTITY fluxbox-time          "1.28 SBU">
+]>
 <sect1 id="fluxbox" xreflabel="Fluxbox-&fluxbox-version;">
 <?dbhtml filename="fluxbox.html" ?>
 <title>Fluxbox-&fluxbox-version;</title>
 
-&fluxbox-intro;
-&fluxbox-inst;
-&fluxbox-exp;
-&fluxbox-config;
-&fluxbox-desc;
+<sect2>
+<title>Introduction to <application>Fluxbox</application></title>
+
+<para>The <application>Fluxbox</application> package contains a window manager.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&fluxbox-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&fluxbox-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &fluxbox-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&fluxbox-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&fluxbox-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch (HTTP): <ulink
+url="&patch-root;/fluxbox-0.1.14-gcc33.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title><application>Fluxbox</application> dependencies</title>
+<sect4><title>Required</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para></sect4>
+</sect3>
+
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Fluxbox</application></title>
+
+<para>Install <application>Fluxbox</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../fluxbox-0.1.14-gcc33.patch &amp;&amp;
+./configure --prefix=/usr --enable-kde --enable-gnome &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--enable-kde</option>: This command activates
+<application>Fluxbox</application>'s ability to allow
+<application><acronym>KDE</acronym></application>
+tray icons to be placed in the slit.</para>
+
+<para><option>--disable-nls</option>: This command disables
+<application>Fluxbox</application>'s ability to support
+international languages. This is an optional switch to work
+around a compile problem if you did not install all locales.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Fluxbox</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.fluxbox/init</filename>,
+<filename>~/.fluxbox/keys</filename>,
+<filename>~/.fluxbox/menu</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Be sure to backup your current <filename>.xinitrc</filename> before
+proceeding.</para>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
+exec fluxbox
+<command>EOF</command></userinput></screen>
+
+<screen><userinput><command>mkdir ~/.fluxbox &amp;&amp;
+cp /usr/share/fluxbox/init ~/.fluxbox/init &amp;&amp;
+cp /usr/share/fluxbox/keys ~/.fluxbox/keys &amp;&amp;
+cp /usr/share/fluxbox/menu ~/.fluxbox/menu </command></userinput></screen>
+
+<para>Menu Items are added by editing <filename>~/.fluxbox/menu</filename>. The 
+syntax is explained on the fluxbox man page.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Fluxbox</application> package contains 
+<command>fluxbox</command>, <command>bsetbg</command> and 
+<command>bsetroot</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fluxbox</title>
+<para><command>fluxbox</command> is a window manager for <application>X11
+</application> based on <application>Blackbox</application> 0.61.0.</para>
+</sect3>
+
+<sect3><title>bsetbg</title>
+<para><command>bsetbg</command> is a utility that sets the background image.  
+It needs <command>display</command>, <command>Esetroot</command>,
+<command>wmsetbg</command>, <command>xv</command>,
+<command>qiv</command> or <command>xsri</command> to be used.</para></sect3>
+
+<sect3><title>bsetroot</title>
+<para><command>bsetroot</command> is a <application>Blackbox</application> 
+utility to change root window appearance.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/wm/metacity.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY metacity-download-http "http://ftp.gnome.org/pub/GNOME/sources/metacity/2.8/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/metacity/2.8/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-size          "1.9 MB">
+  <!ENTITY metacity-buildsize     "39.8 MB">
+  <!ENTITY metacity-time          "0.49 SBU">
+]>
+
 <sect1 id="metacity" xreflabel="Metacity-&metacity-version;">
 <?dbhtml filename="metacity.html" ?>
 <title>Metacity-&metacity-version;</title>
 
-&metacity-intro;
-&metacity-inst;
-&metacity-config;
-&metacity-desc;
+<sect2>
+<title>Introduction to <application>Metacity</application></title>
+
+<para>The <application>Metacity</application> package contains a window 
+manager. This is useful for organizing and displaying windows.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&metacity-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&metacity-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &metacity-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&metacity-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&metacity-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Metacity</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="intltool"/> and <xref linkend="GTK2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="startup-notification"/>,
+<xref linkend="GConf"/>,
+<ulink url="http://freedesktop.org/Software/xlibs">libXcomposite</ulink>,
+<ulink url="http://freedesktop.org/Software/xlibs">xrender</ulink> and
+<ulink url="http://freedesktop.org/Software/xlibs">libXdamage</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Metacity</application></title>
+
+<para>Install <application>Metacity</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Metacity</application></title>
+
+<sect3><title>Configuration Information</title>
+
+<para>Be sure to backup your current <filename>.xinitrc</filename>
+before proceeding.</para>
+
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
+xterm &amp;
+exec metacity
+<command>EOF</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Metacity</application> package contains
+<command>metacity</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>metacity</title>
+<para><command>metacity</command> is a window manager used mainly by GNOME.
+</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/wm/sawfish.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,11 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY sawfish-download-http "http://prdownloads.sourceforge.net/sawmill/sawfish-&sawfish-version;.tar.gz">
+<!ENTITY sawfish-download-ftp  " ">
+<!ENTITY sawfish-size          "1.5 MB">
+<!ENTITY sawfish-buildsize     "17.5 MB">
+<!ENTITY sawfish-time          "0.26 SBU">
+]>
+
 <sect1 id="sawfish" xreflabel="sawfish-&sawfish-version;">
 <?dbhtml filename="sawfish.html" ?>
 <title>sawfish-&sawfish-version;</title>
 
-&sawfish-intro;
-&sawfish-inst;
-&sawfish-exp;
-&sawfish-config;
-&sawfish-desc;
+<sect2>
+<title>Introduction to <application>sawfish</application></title>
+
+<para>The <application>sawfish</application> package contains a window manager. 
+This is useful for organizing and displaying windows where all window 
+decorations are configurable and all user-interface policy is controlled 
+through the extension language.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&sawfish-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&sawfish-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &sawfish-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&sawfish-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&sawfish-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>sawfish</application> dependencies</title>
+<sect4><title>Required</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), <xref linkend="librep"/>, <xref
+linkend="rep-gtk"/>, <xref linkend="esound"/> and <xref linkend="GTK2"/></para>
+</sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libglade"/></para></sect4>
+</sect3>
+
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>sawfish</application></title>
+
+<para>Install <application>sawfish</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info \
+  --with-gnome-prefix=/opt/gnome-&gnome-version; &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--with-audiofile</option>: This command directs
+<application>sawfish</application> to use <filename class="libraryfile">libaudiofile</filename> 
+for sound manipulation.</para>
+
+<para><option>--with-esd</option>: This command directs <application>
+sawfish</application> to use the Enlightened Sound Daemon.</para>
+
+<para><option>--with-gnome-prefix=/opt/gnome-&gnome-version;</option>: This
+command directs <application>sawfish</application> to
+<application><acronym>GNOME</acronym></application>'s directory.</para> 
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>sawfish</application></title>
+
+<sect3><title>Configuration Information</title>
+
+<para>Be sure to backup your current <filename>.xinitrc</filename>
+before proceeding.</para>
+
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
+exec sawfish
+<command>EOF</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>sawfish</application> package contains <command>
+sawfish</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>sawfish</title>
+<para><command>sawfish</command> is the extensible window manager using a 
+<application>Lisp</application>-based scripting language.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/wm/wm.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <chapter id="x-wm">
 <?dbhtml filename="wm.html" ?>
@@ -38,8 +45,8 @@
 </sect1>
 
-&sawfish;
-&fluxbox;
-&metacity;
-&xfce;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sawfish.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fluxbox.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="metacity.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfce.xml"/>  
 
 </chapter>
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/wm/xfce.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,10 +1,255 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xfce-download-http "http://prdownloads.sourceforge.net/xfce/xfce-&xfce-version;-src.tar.bz2">
+  <!ENTITY xfce-download-ftp  " ">
+  <!ENTITY xfce-size          "18 MB">
+  <!ENTITY xfce-buildsize     "224 MB">
+  <!ENTITY xfce-time          "3.35 SBU">
+]>
+
 <sect1 id="xfce" xreflabel="XFce-&xfce-version;">
 <?dbhtml filename="xfce.html" ?>
 <title>XFce-&xfce-version;</title>
 
-&xfce-intro;
-&xfce-inst;
-&xfce-config;
-&xfce-desc;
+<sect2>
+<title>Introduction to <application>XFce</application></title>
+
+<para>The <application>XFce</application> package contains a lightweight desktop environment.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&xfce-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&xfce-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &xfce-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&xfce-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&xfce-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>XFce</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GTK2"/> and <xref
+linkend="libxml2"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libgtkhtml"/> and <xref
+linkend="startup-notification"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>XFce</application></title>
+
+<para><application>XFce</application> now distributes as a
+<acronym>TAR</acronym> ball of
+base packages and module packages. These instructions will only cover
+the bare minimum to run the application.  The remaining modules would
+all follow the same pattern which will soon become obvious.</para>
+<para>Install <application>XFce</application> by running the following commands:</para>
+
+<screen><userinput><command>cd src &amp;&amp;
+tar xzvf libxfce4util-&xfce-version;.tar.gz &amp;&amp;
+cd libxfce4util-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf libxfcegui4-&xfce-version;.tar.gz &amp;&amp;
+cd libxfcegui4-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf libxfce4mcs-&xfce-version;.tar.gz &amp;&amp;
+cd libxfce4mcs-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf xfce-mcs-manager-&xfce-version;.tar.gz &amp;&amp;
+cd xfce-mcs-manager-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf xfwm4-&xfce-version;.tar.gz &amp;&amp;
+cd xfwm4-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf xfdesktop-&xfce-version;.tar.gz &amp;&amp;
+cd xfdesktop-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf xfce4-panel-&xfce-version;.tar.gz &amp;&amp;
+cd xfce4-panel-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar xzvf xfce-utils-&xfce-version;.tar.gz &amp;&amp;
+cd xfce-utils-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<para>Modules not installed above are: dbh-1.0.15 (required for xffm),
+gtk-xfce-engine-2.1.9, xfcalendar-0.1.6, xfce-mcs-plugins, xfce4-iconbox, xfce4-mixer,
+xfce4-systray, xfce4-themes, xfce4-toys, xfce4-trigger-launcher, xffm,
+xffm-icons, xfprint and xfwm4-themes.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>XFce</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.xinitrc</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Be sure to backup your current <filename>.xinitrc</filename>
+before
+proceeding.</para>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
+xfce-mcs-manager
+xfwm4 --daemon
+xftaskbar4 &amp;
+xfdesktop &amp;
+exec xfce4-panel
+<command>EOF</command></userinput></screen>
+
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>XFce</application> package contains 
+<command>fgr</command>,
+<command>scramble</command>,
+<command>startxfce4</command>,
+<command>xfapps</command>,
+<command>xfapps4</command>,
+<command>xfbook</command>,
+<command>xfbook4</command>,
+<command>xfcalendar</command>,
+<command>xfce-mcs-manager</command>,
+<command>xfce-setting-show</command>,
+<command>xfce4-about</command>,
+<command>xfce4-iconbox</command>,
+<command>xfce4-panel</command>,
+<command>xfce4-tips</command>,
+<command>xfdesktop</command>,
+<command>xfdiff4</command>,
+<command>xffm</command>,
+<command>xffstab</command>,
+<command>xffstab4</command>,
+<command>xfglob4</command>,
+<command>xfhelp4</command>,
+<command>xflock4</command>,
+<command>xfmountdev4</command>,
+<command>xfprint-manager</command>,
+<command>xfprint4</command>,
+<command>xfrun4</command>,
+<command>xfsamba4</command>,
+<command>xftaskbar4</command>,
+<command>xfterm4</command>,
+<command>xftrash4</command>, 
+<command>xftree4</command>,
+<command>xfwm4</command> and
+<filename class="libraryfile">libdbh</filename>,
+<filename class="libraryfile">libxfce4mcs</filename>,
+<filename class="libraryfile">libxfce4util</filename>,
+<filename class="libraryfile">libxfcegui4</filename>,
+<filename class="libraryfile">libxffm</filename> and
+<filename class="libraryfile">libxfprint</filename> libraries.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fgr</title>
+<para><command>fgr</command> is a file content search engine for
+<command>xffm</command>.</para></sect3>
+
+<sect3><title>xfce-mce-manager</title>
+<para><command>xfce-mce-manager</command> is the settings manager for 
+<application>XFce</application>.</para></sect3>
+
+<sect3><title>xfce4-about</title>
+<para><command>xfce4-about</command> displays the about box.</para></sect3>
+
+<sect3><title>xfce-setting-show</title>
+<para><command>xfce_setting-show</command> displays the settings for
+<application>XFce</application>.</para></sect3>
+
+<sect3><title>xfce4-panel</title>
+<para><command>xfce4-panel</command> is the panel manager for
+<application>XFce</application>. It contains the launcher, clock, mail
+check, desktop switcher and separator programs.</para></sect3>
+
+<sect3><title>xfdesktop</title>
+<para><command>xfdesktop </command> is the desktop manager
+for <application>XFce</application>.</para></sect3>
+
+<sect3><title>xfhelp4</title>
+<para><command>xfhelp4</command> is script that launches a
+<acronym>HTML</acronym> browser to display online documentation.</para></sect3>
+
+<sect3><title>xflock4</title>
+<para><command>xflock4</command> is a script used to lock the current screen 
+during drag and drop actions.</para></sect3>
+
+<sect3><title>xfmountdev4</title>
+<para><command>xfmountdev4</command> mounts a device on the specified mount 
+point and launches <command>xftree4</command>, then unmounts the device
+when <command>xftree4</command> finishes.</para></sect3>
+
+<sect3><title>xfrun4</title>
+<para><command>xfrun4</command> is the program launcher for
+<application>XFce</application>.</para></sect3>
+
+<sect3><title>xfsamba4</title>
+<para><command>xfsamba4</command> is <application>Samba</application> front end 
+for <application>XFce</application>.</para></sect3>
+
+<sect3><title>xftaskbar4</title>
+<para><command>xftaskbar4</command> is the taskbar manager for
+<application>XFce</application>.</para></sect3>
+
+<sect3><title>xfterm4</title>
+<para><command>xfterm4</command> is a small terminal wrapper to be used as a 
+drag and drop action for the <application>XFce</application> front panel.
+</para></sect3>
+
+<sect3><title>xftrash4</title>
+<para><command>xftrash4</command> is a small script to be used as a drag and 
+drop action for the <application>XFce</application> front panel.</para></sect3>
+
+<sect3><title>xftree4</title>
+<para><command>xftree4</command> is the file manager for
+<application>XFce</application>.</para></sect3>
+
+<sect3><title>xfwm4</title>
+<para><command>xfwm4</command> is a window manager for
+<application>X11</application>.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: x/x.xml
===================================================================
--- x/x.xml	(revision 60384c6880c2d67b81093f9a291dc8cc76c30a69)
+++ x/x.xml	(revision feeb99a61a70598f4c193131bdd96b5030c13a4f)
@@ -1,9 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
 <part id="x" xreflabel="X and Window Managers">
 <?dbhtml filename="x.html" dir="x"?>
 <title>X + Window Managers</title>
 
-&x-installing;
-&x-lib;
-&x-wm;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="installing/installing.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lib/lib.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wm/wm.xml"/> 
 
 </part>
