Index: content/databases/postgresql.xml
===================================================================
--- content/databases/postgresql.xml	(revision 95c3dc234657a23379ddf63226498dbf49beb09d)
+++ content/databases/postgresql.xml	(revision 78d0e3c542463007b08d64d52929d07d8f6a9a90)
@@ -8,5 +8,5 @@
   <!ENTITY postgresql-download-ftp  "ftp://ftp.fr.postgresql.org/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
   <!ENTITY postgresql-size          "9.7 MB">
-  <!ENTITY postgresql-buildsize     "80 MB">
+  <!ENTITY postgresql-buildsize     "197 MB">
   <!ENTITY postgresql-time          "1.21 SBU">
 ]>
@@ -17,9 +17,10 @@
 
 <sect2>
-<title>Introduction to <application>Postgre<acronym>SQL</acronym></application></title>
-
-<para><application>Postgre<acronym>SQL</acronym></application> is an advanced object-relational
-database management system (<acronym>ORDBMS</acronym>), derived from the 
-Berkeley Postgres database management system.</para>
+<title>Introduction to <application>Postgre<acronym>SQL</acronym></application>
+</title>
+
+<para><application>Postgre<acronym>SQL</acronym></application> is an advanced 
+object-relational database management system (<acronym>ORDBMS</acronym>), 
+derived from the Berkeley Postgres database management system.</para>
 
 <sect3><title>Package information</title>
@@ -32,5 +33,6 @@
 </sect3>
 
-<sect3><title><application>Postgre<acronym>SQL</acronym></application> dependencies</title>
+<sect3><title><application>Postgre<acronym>SQL</acronym></application> 
+dependencies</title>
 <sect4><title>Optional</title>
 <para>
@@ -40,4 +42,7 @@
 <xref linkend="openssl"/>,
 <xref linkend="Linux_PAM"/>,
+<xref linkend="opensp"/>,
+<xref linkend="openjade"/>,
+<xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version;, 
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
@@ -50,7 +55,9 @@
 
 <sect2>
-<title>Installation of <application>Postgre<acronym>SQL</acronym></application></title>
-
-<para>Install <application>Postgre<acronym>SQL</acronym></application> with the following commands: </para>
+<title>Installation of <application>Postgre<acronym>SQL</acronym></application>
+</title>
+
+<para>Install <application>Postgre<acronym>SQL</acronym></application> with the 
+following commands: </para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
@@ -105,7 +112,7 @@
 <para><command>useradd -d /srv/pgsql/data postgres</command>: Add an unprivileged user to run the database server.</para>
 
-<para><command>createdb test, create table t1 , insert into t1 values..., select *
-from t1</command>: Create a database, add a table to it, insert some rows into the table
-and select them to verify that the installation is working
+<para><command>createdb test, create table t1 , insert into t1 values..., 
+select * from t1</command>: Create a database, add a table to it, insert some 
+rows into the table and select them to verify that the installation is working
 properly.</para>
 
@@ -113,13 +120,16 @@
 
 <sect2>
-<title>Configuring <application>Postgre<acronym>SQL</acronym></application></title>
+<title>Configuring <application>Postgre<acronym>SQL</acronym></application>
+</title>
 
 <sect3>
 <title>Config files</title>
 
-<para><filename>$PGDATA/pg_ident.con</filename>, <filename>$PGDATA/pg_hba.conf</filename>, <filename>$PGDATA/postgresql.conf</filename></para>
-
-<para>The <envar>PGDATA</envar> environment variable is used to distinguish database
-clusters from one another by setting it to the value of the directory
+<para><filename>$PGDATA/pg_ident.con</filename>, 
+<filename>$PGDATA/pg_hba.conf</filename> and 
+<filename>$PGDATA/postgresql.conf</filename></para>
+
+<para>The <envar>PGDATA</envar> environment variable is used to distinguish 
+database clusters from one another by setting it to the value of the directory
 which contains the cluster desired. The three configuration files
 exist in every <filename class="directory">PGDATA/</filename> directory. 
@@ -129,6 +139,7 @@
 
 <para>Install the <filename>/etc/rc.d/init.d/postgresql</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                                                                
+init script included in the <xref linkend="intro-important-bootscripts"/> 
+package.</para>
+
 <screen><userinput><command>make install-postgresql</command></userinput></screen>
 
@@ -140,6 +151,6 @@
 <title>Contents</title>
 
-<para>The <application>Postgre<acronym>SQL</acronym></application> package contains
-<command>clusterdb</command>,
+<para>The <application>Postgre<acronym>SQL</acronym></application> package 
+contains <command>clusterdb</command>,
 <command>createdb</command>,
 <command>createlang</command>,
@@ -187,5 +198,6 @@
 <sect3><title>createdb</title>
 <para><command>createdb</command> creates a new
-<application>Postgre<acronym>SQL</acronym></application> database.</para></sect3>
+<application>Postgre<acronym>SQL</acronym></application> database.</para>
+</sect3>
 
 <sect3><title>createlang</title>
@@ -196,9 +208,11 @@
 <sect3><title>createuser</title>
 <para><command>createuser</command> defines a new
-<application>Postgre<acronym>SQL</acronym></application> user account.</para></sect3>
+<application>Postgre<acronym>SQL</acronym></application> user account.</para>
+</sect3>
 
 <sect3><title>dropdb</title>
 <para><command>dropdb</command> removes a
-<application>Postgre<acronym>SQL</acronym></application> database.</para></sect3>
+<application>Postgre<acronym>SQL</acronym></application> database.</para>
+</sect3>
 
 <sect3><title>droplang</title>
@@ -209,8 +223,10 @@
 <sect3><title>dropuser</title>
 <para><command>dropuser</command> removes a
-<application>Postgre<acronym>SQL</acronym></application> user account.</para></sect3>
+<application>Postgre<acronym>SQL</acronym></application> user account.</para>
+</sect3>
 
 <sect3><title>ecpg</title>
-<para><command>ecpg</command> is the embedded <acronym>SQL</acronym> preprocessor.</para></sect3>
+<para><command>ecpg</command> is the embedded <acronym>SQL</acronym> 
+preprocessor.</para></sect3>
 
 <sect3><title>initdb</title>
@@ -222,6 +238,6 @@
 
 <sect3><title>ipcclean</title>
-<para><command>ipcclean</command> removes shared memory and semaphores left over by an
-aborted database server.</para></sect3>
+<para><command>ipcclean</command> removes shared memory and semaphores left 
+over by an aborted database server.</para></sect3>
 
 <sect3><title>pg_config</title>
@@ -240,6 +256,6 @@
 
 <sect3><title>pg_dump</title>
-<para><command>pg_dump</command> dumps database data and metadata into scripts which are
-used to recreate the database.</para></sect3>
+<para><command>pg_dump</command> dumps database data and metadata into scripts 
+which are used to recreate the database.</para></sect3>
 
 <sect3><title>pg_dumpall</title>
@@ -249,6 +265,6 @@
 
 <sect3><title>pg_resetxlog</title>
-<para><command>pg_resetxlog</command> clears the write-ahead log and optionally resets some
-fields in the <filename>pg_control</filename> file.</para></sect3>
+<para><command>pg_resetxlog</command> clears the write-ahead log and optionally 
+resets some fields in the <filename>pg_control</filename> file.</para></sect3>
 
 <sect3><title>pg_restore</title>
@@ -270,9 +286,10 @@
 
 <sect3><title>postgres</title>
-<para><command>postgres</command> is a single user database server, generally used for
-debugging.</para></sect3>
+<para><command>postgres</command> is a single user database server, generally 
+used for debugging.</para></sect3>
 
 <sect3><title>postmaster</title>
-<para><command>postmaster</command> is the multi-user database daemon.</para></sect3>
+<para><command>postmaster</command> is the multi-user database daemon.</para>
+</sect3>
 
 <sect3><title>psql</title>
@@ -280,6 +297,6 @@
 
 <sect3><title>vacuumdb</title>
-<para><command>vacuumdb</command> compacts databases and generates statistics for the
-query analyzer.</para></sect3>
+<para><command>vacuumdb</command> compacts databases and generates statistics 
+for the query analyzer.</para></sect3>
 
 </sect2>
Index: general.ent
===================================================================
--- general.ent	(revision 95c3dc234657a23379ddf63226498dbf49beb09d)
+++ general.ent	(revision 78d0e3c542463007b08d64d52929d07d8f6a9a90)
@@ -1,11 +1,11 @@
-<!ENTITY day          "03">
+<!ENTITY day          "04">
 <!ENTITY month        "08">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "August &day;rd, &year;">
+<!ENTITY releasedate  "August &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "testing">              <!-- stable|testing|unstable] -->
-<!ENTITY last-commit  "Tue Aug 03 23:28:00 MDT 2004"> <!-- Need to set up auto update for this -->
+<!ENTITY last-commit  "Wed Aug 04 00:40:00 MDT 2004"> <!-- Need to set up auto update for this -->
 
 <!ENTITY maintainer-fullname  "Bruce Dubbs">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 95c3dc234657a23379ddf63226498dbf49beb09d)
+++ introduction/welcome/changelog.xml	(revision 78d0e3c542463007b08d64d52929d07d8f6a9a90)
@@ -19,4 +19,8 @@
 <itemizedlist>
 
+<listitem><para>August 4th, 2004 [randy]: Added optional dependencies to 
+PostgreSQL and Qt; added additional configuration information to Qt.</para>
+</listitem>
+
 <listitem><para>August 3rd, 2004 [dj]: Gramar cleanups in svnserver and
 added note about running svnserve if unneeded. Also fixed lfs-root
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 95c3dc234657a23379ddf63226498dbf49beb09d)
+++ x/lib/qt.xml	(revision 78d0e3c542463007b08d64d52929d07d8f6a9a90)
@@ -9,5 +9,5 @@
   <!ENTITY qt-md5sum        "903cad618274ad84d7d13fd0027a6c3c">
   <!ENTITY qt-size          "14 MB">
-  <!ENTITY qt-buildsize     "165 MB">
+  <!ENTITY qt-buildsize     "250 MB">
   <!ENTITY qt-time          "21.2 SBU (full), 13.4 SBU (sub-tools)">
 ]>
@@ -24,5 +24,6 @@
 for creating graphical applications or executing graphical applications that
 are dynamically linked to the <application>Qt</application> library. One of the
-major users of <application>Qt</application> is <application>KDE</application>.</para>
+major users of <application>Qt</application> is <application>KDE</application>.
+</para>
 
 <sect3><title>Package information</title>
@@ -46,5 +47,6 @@
 <sect4><title>Optional</title>
 <para><xref linkend="nas"/>, <xref linkend="cups"/>, <xref linkend="mysql"/>,
-<xref linkend="postgresql"/>, <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>, 
+<xref linkend="postgresql"/>, <ulink url="http://sqlite.org/">SQLite</ulink>, 
+<ulink url="http://firebird.sourceforge.net/">Firebird</ulink> 
 and <ulink url="http://www.unixodbc.org/">unixODBC</ulink>.</para>
 </sect4>
@@ -55,21 +57,25 @@
 <title>Installation of <application>Qt</application></title>
 
-<para>There are several ways to install a complicated package such as <application>Qt</application>.
-The files are not completely position independent.  Installation procedures execute the 
-program <filename>pkg-config</filename> to determine the location of package executables, libraries,
-headers, and other files.  For <application>Qt</application>, <filename>pkg-config</filename> will
-look for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be modified if relocating the 
-package.  This file is set up correctly by the build process.</para>
-
-<para>The default installation places the files in <filename class='directory'>/usr/local/qt/</filename>.
-Many commercial distributions place the files in the system's 
-<filename class='directory'>/usr</filename> hierarchy.  The package can also be installed 
-in an arbitrary directory.</para>
+<para>There are several ways to install a complicated package such as 
+<application>Qt</application>. The files are not completely position 
+independent. Installation procedures execute the program 
+<command>pkg-config</command> to determine the location of package executables, 
+libraries, headers, and other files. For <application>Qt</application>, 
+<command>pkg-config</command> will look for the file 
+<filename>lib/pkgconfig/qt-mt.pc</filename> which must be modified if 
+relocating the package. This file is set up correctly by the build process.
+</para>
+
+<para>The default installation places the files in 
+<filename class='directory'>/usr/local/qt/</filename>. Many commercial 
+distributions place the files in the system's 
+<filename class='directory'>/usr</filename> hierarchy. The package can also be 
+installed in an arbitrary directory.</para>
 
 <para>This section will demonstrate two different methods.</para>
 
-
-<note><para>The build time for <application>Qt</application> is quite long.  If you want to 
-save some time and don't want the tutorials and examples, change the first make line to:</para>
+<note><para>The build time for <application>Qt</application> is quite long. If 
+you want to save some time and don't want the tutorials and examples, change 
+the first make line to:</para>
 
 <para><userinput><command>make sub-tools</command></userinput></para>
@@ -77,12 +83,13 @@
 
 <sect3>
-<title>Method 1 - Installing in the <filename class='directory'>/usr</filename> hierarchy</title>
+<title>Method 1 - Installing in the 
+<filename class='directory'>/usr</filename> hierarchy</title>
  
-<para>The advantage of this method is that no updates to the <filename>/etc/ld.so.conf</filename>
-or <filename>/etc/man.conf</filename> files are required. The package files
-are distributed within several subdirectories of the <filename class='directory'>/usr</filename>
-hierarchy.  This is the method that most commercial distributions use.</para>
-
- 
+<para>The advantage of this method is that no updates to the 
+<filename>/etc/ld.so.conf</filename> or <filename>/etc/man.conf</filename> 
+files are required. The package files are distributed within several 
+subdirectories of the <filename class='directory'>/usr</filename> hierarchy. 
+This is the method that most commercial distributions use.</para>
+
 <screen><userinput><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf &amp;&amp;
 bash
@@ -107,15 +114,14 @@
 <title>Method 2 - Installing in  <filename class='directory'>/opt</filename></title>
 
-<para>This is the method recommended by the <application>Qt</application> developers.  It
-has the advantage of keeping all the package files consolidated in a dedicated directory
-hierarchy.  By using this method, an update can be made without overwriting a previous 
-installation and users can easily revert to a previous version by changing one symbolic
-link.</para>
+<para>This is the method recommended by the <application>Qt</application> 
+developers. It has the advantage of keeping all the package files consolidated 
+in a dedicated directory hierarchy. By using this method, an update can be made 
+without overwriting a previous installation and users can easily revert to a 
+previous version by changing one symbolic link.</para>
 
 <para>The <application>Qt</application> developers use a default location of 
-<filename class='directory'>/usr/local/qt/</filename>, however this procedure puts the files
-in <filename class='directory'>/opt/qt-&qt-version;/</filename> and then creates a
-symbolic link to <filename>/opt/qt/</filename>.</para>
-
+<filename class='directory'>/usr/local/qt/</filename>, however this procedure 
+puts the files in <filename class='directory'>/opt/qt-&qt-version;/</filename> 
+and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
 
 <screen><userinput><command>bash
@@ -134,10 +140,79 @@
 exit</command></userinput></screen>
 
-<sect4>
-<title>Configuration</title>
-
-<para>For Method 2 only, update the <filename>/etc/ld.so.conf</filename> and  
-<filename>/etc/man.conf</filename> files.</para>
-
+<note><para>If you're building <application>Qt</application> on top of 
+<acronym>LFS</acronym> &gt;=6.0, the build will fail if you pass the 
+<option>--plugin-sql-<replaceable>[driver]</replaceable></option> switch to the 
+<command>configure</command> command.</para></note>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf</command>:
+<command>install</command> is safer than <command>cp</command> when
+libraries are in use.</para>
+
+<para><command>bash</command>: This command enters a sub-shell to isolate 
+environment changes.</para>
+
+<para><command>export QTDIR=$PWD</command>: This command defines where the root 
+of the <application>Qt</application> directory is located.</para>
+
+<para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>: This 
+command allows the not yet installed <application>Qt</application> libraries to 
+be used by the not yet installed <application>Qt</application> programs.</para>
+
+<para><command>export PATH=$PWD/bin:$PATH</command>: This command 
+allows the build process to find supporting executables.</para>
+
+<para><parameter>-qt-gif</parameter>: This switch adds support for 
+<filename>gif</filename> files to the libraries.</para>
+
+<para><parameter>-system-zlib -system-libpng</parameter>: This switch
+forces the build instructions to use the shared libraries that are on your 
+system instead of creating a custom set of support libraries for these
+functions.</para>
+
+<para><parameter>-no-exceptions</parameter>: This switch disables
+the exceptions coding generated by the <application>C++</application> compiler.
+</para>
+
+<para><parameter>-thread</parameter>: This switch adds
+support for multi-threading.</para>
+
+<para><command>find -type f -name Makefile | xargs sed -i
+"s@-Wl,-rpath,/usr/lib@@g"</command>: This command removes hardcoded run-time
+paths. Otherwise, <command>uic</command> always tries to run with 
+<application>Qt</application> libraries in <filename>/usr/lib</filename>.</para>
+
+<para><command>ln -s libqt-mt.so /usr/lib/libqt.so</command>: This command 
+allows <command>configure</command> scripts to find a working 
+<application>Qt</application> installation.</para>
+
+<para><command>cp -r doc/man /usr/share (or /opt/qt/doc)</command>: This command
+installs the man pages which are missed by <command>make install</command>.
+</para>
+
+<para><command>cp -r examples /usr/share/doc/qt (or /opt/qt/doc)</command>: 
+This command installs the examples which are missed by 
+<command>make install</command>.</para>
+
+<para><command>exit</command>: This command returns to the parent shell
+and eliminates environment variables set earlier.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Qt</application></title>
+
+<sect3><title>Configuration Information</title>
+<para>If you installed <application>Qt</application> using Method 2, you need
+to update some configuration files so that <application>Qt</application> is
+correctly found by other packages and system processes.</para>
+
+<para>Update the <filename>/etc/ld.so.conf</filename> and
+<filename>/etc/man.conf</filename> files:</para>
 
 <screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
@@ -158,73 +233,23 @@
 EOF</command></userinput></screen>
 
-<para>Also, the <envar>QTDIR</envar> environment variable needs to be set when
-building packages that depend on Qt.  Add the following to the
-<filename>.bash_profile</filename> initialization script for each user that
-builds packages using the <application>Qt</application> libraries.
-Alternatively, the variable can be set in the system wide
+<para>Update the <envar>PKG_CONFIG_PATH</envar> environment variable in your
+<filename>~/.bash_profile</filename> or <filename>/etc/profile</filename> with
+the following:</para>
+
+<screen><userinput>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</userinput></screen>
+
+<para>The <envar>QTDIR</envar> environment variable needs to be set when
+building packages that depend on <application>Qt</application>. Add the
+following to the <filename>.bash_profile</filename> initialization script for
+each user that builds packages using the <application>Qt</application>
+libraries. Alternatively, the variable can be set in the system wide
 <filename>/etc/profile</filename> file.</para>
 
 <screen><userinput>export QTDIR=/opt/qt</userinput></screen>
 
-</sect4>
-</sect3>
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf</command>:
-<command>install</command> is safer than <command>cp</command> when
-libraries are in use.</para>
-
-<para><command>bash</command>: This command enters a sub-shell to isolate 
-environment changes.</para>
-
-<para><command>export QTDIR=$PWD</command>: This command 
-defines where the root of the Qt directory is located.</para>
-
-<para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>: This command 
-allows the not yet installed qt libraries to be used by the not yet installed qt programs.</para>
-
-<para><command>export PATH=$PWD/bin:$PATH</command>: This command 
-allows the build process to find supporting executables.</para>
-
-<para><parameter>-qt-gif</parameter>: This switch adds support for gif
-files to the libraries.</para>
-
-<para><parameter>-system-zlib -system-libpng</parameter>: This switch
-forces the build instructions to use the shared libraries that are on your system
-instead of creating a custom set of support libraries for these
-functions.</para>
-
-<para><parameter>-no-exceptions</parameter>: This switch disables
-the exceptions coding generated by the <application>C++</application> compiler.</para>
-
-<para><parameter>-thread</parameter>: This switch adds
-support for multi-threading.</para>
-
-<para><command>find -type f -name Makefile | xargs sed -i
-"s@-Wl,-rpath,/usr/lib@@g"</command>: This command removes hardcoded run-time
-paths. Otherwise, <command>uic</command> always tries to run with Qt libraries
-in <filename>/usr/lib</filename>.</para>
-
-<para><command>ln -s libqt-mt.so /usr/lib/libqt.so</command>: This
-command allows configure scripts
-to find a working <application>Qt</application> installation.</para>
-
-<para><command>cp -r doc/man /usr/share (or /opt/qt/doc)</command>: This command
-installs the man pages which are missed by <command>make install</command>.</para>
-
-<para><command>cp -r examples /usr/share/doc/qt (or /opt/qt/doc)</command>: This command
-installs the examples which are missed by <command>make install</command>.</para>
-
-<para><command>exit</command>: This command returns to the parent shell
-and eliminates environment variables set earlier.</para>
-
-</sect2>
-<sect2>
-<title>Configuring <application>Qt</application></title>
-
-<sect3><title>Configuration Information</title>
+<para>If you want the <application>Qt</application> executables in your shell
+search path, update the <envar>PATH</envar> environment variable in your
+<filename>~/.bash_profile</filename> or <filename>/etc/profile</filename> to
+include <filename class='directory'>/opt/qt/bin</filename>.</para>
 
 <para>As with most libraries, there is no explicit configuration to do. After
@@ -236,4 +261,5 @@
 
 </sect2>
+
 <sect2>
 <title>Contents</title>
@@ -241,5 +267,6 @@
 <para>The <application>Qt</application>/<application>X11</application>
 library contains <acronym>API</acronym>s necessary to use
-programs based on the Qt <acronym>GUI</acronym> toolkit.</para>
+programs based on the <application>Qt</application> <acronym>GUI</acronym> 
+toolkit.</para>
 
 <para>The <application>Qt</application> package contains 
