Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision 7172e4fe763f06d373fe0100743ce91d48e37c6d)
+++ content/databases/mysql.xml	(revision 4b93ac2c25eb2d10d792c9592108de763fee4b80)
@@ -17,8 +17,9 @@
 
 <sect2>
-<title>Introduction to <application>My<acronym>SQL</acronym></application></title>
-
-<para><application>My<acronym>SQL</acronym></application> is a widely used and fast 
-<acronym>SQL</acronym> database server. It is a client/server 
+<title>Introduction to <application>My<acronym>SQL</acronym></application>
+</title>
+
+<para><application>My<acronym>SQL</acronym></application> is a widely used and 
+fast <acronym>SQL</acronym> database server. It is a client/server 
 implementation that consists of a server daemon and many different 
 client programs and libraries.</para>
@@ -33,8 +34,15 @@
 </sect3>
 
-<sect3><title><application>My<acronym>SQL</acronym></application> dependencies</title>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch (for building against NPTL): <ulink
+url="&patch-root;/mysql-&mysql-version;-nptl-1.patch"/></para></listitem>
+</itemizedlist></sect3>
+
+<sect3><title><application>My<acronym>SQL</acronym></application> dependencies
+</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/> and
-<xref linkend="tcpwrappers"/>
+<para><xref linkend="openssl"/>, <xref linkend="tcpwrappers"/>,
+<xref linkend="which"/> and <xref linkend="ORBit"/>
 </para></sect4>
 </sect3>
@@ -43,5 +51,6 @@
 
 <sect2>
-<title>Installation of <application>My<acronym>SQL</acronym></application></title>
+<title>Installation of <application>My<acronym>SQL</acronym></application>
+</title>
 
 <para>For security reasons, running the server as an unprivileged user 
@@ -51,18 +60,56 @@
 useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql</command></userinput></screen>
 
-<para>Build and install <application>My<acronym>SQL</acronym></application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/sbin --localstatedir=/var/lib/mysql \
-    --enable-thread-safe-client --enable-local-infile \
-    --enable-assembler --without-debug --without-bench &amp;&amp;
+<para>Build and install <application>My<acronym>SQL</acronym></application> by 
+running the following commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../mysql-&mysql-version;-nptl-1.patch &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc \
+    --libexecdir=/usr/sbin --localstatedir=/srv/mysql \
+    --enable-thread-safe-client --enable-assembler \
+    --without-readline --without-debug \
+    --enable-local-infile --without-bench &amp;&amp;
 make testdir=/usr/lib/mysql/mysql-test &amp;&amp;
-make testdir=/usr/lib/mysql/mysql-test install</command></userinput></screen>
-
-<para>Packages that depend on <application>MySQL</application> need the shared
-libraries available at run-time:</para>
-
-<screen><userinput><command>cd /usr/lib &amp;&amp;
+make testdir=/usr/lib/mysql/mysql-test install &amp;&amp;
+cd /usr/lib &amp;&amp;
 ln -sf mysql/libmysqlclient{,_r}.so* .</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--libexecdir=/usr/sbin</parameter>: This switch installs the 
+<command>mysqld</command> daemon in an appropriate location.</para>
+
+<para><parameter>--localstatedir=/srv/mysql</parameter>: This switch forces
+<application>My<acronym>SQL</acronym></application> to use 
+<filename class='directory'>/srv/mysql</filename> for database files and other 
+variable data.</para>
+
+<para><parameter>--enable-thread-safe-client</parameter>: This switch compiles a 
+thread-safe <application>My<acronym>SQL</acronym></application> client library.
+</para>
+
+<para><parameter>--enable-assembler</parameter>: This switch allows using 
+assembler versions of some string functions.</para>
+
+<para><parameter>--without-readline</parameter>: This switch forces the build 
+to use the system copy of <application>readline</application> instead of the 
+bundled copy.</para>
+
+<para><option>--enable-local-infile</option>: This switch enables the
+LOAD DATA INFILE <acronym>SQL</acronym> statement.</para>
+
+<para><option>--without-bench</option>: This switch skips building the 
+benchmark suite.</para>
+
+<para><command>make testdir=...</command>: This installs the test suite in 
+<filename class='directory'>/usr/lib/mysql/mysql-test</filename>. 
+<acronym>BLFS</acronym> is currently seeking a method to omit the installation 
+of the test suite altogether.</para>
+
+<para><command>ln -sf mysql/libmysqlclient{,_r}.so* .</command>: This commands 
+makes the <application>My<acronym>SQL</acronym></application> shared libraries 
+available to other packages at run-time.</para>
 
 </sect2>
@@ -92,13 +139,14 @@
 
 <screen><userinput><command>mysql_install_db &amp;&amp;
-chown -R mysql:mysql /var/lib/mysql</command></userinput></screen>
-
-<para>Further configuration requires that the mysql server be running:</para>
+chown -R mysql:mysql /srv/mysql</command></userinput></screen>
+
+<para>Further configuration requires that the 
+<application>My<acronym>SQL</acronym></application> server be running:</para>
 
 <screen><userinput><command>mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</command></userinput></screen>
 
-<para>A default installation does not setup a password for the
-administrator, so use the following command to set one. Replace <replaceable>[new-password]</replaceable>
-with your own.</para>
+<para>A default installation does not setup a password for the administrator, 
+so use the following command to set one. Replace 
+<replaceable>[new-password]</replaceable> with your own.</para>
 
 <!--
@@ -129,6 +177,7 @@
 
 <para>Install the <filename>/etc/rc.d/init.d/mysql</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-mysql</command></userinput></screen>
 
@@ -144,7 +193,9 @@
 isamchk</command>, <command>
 isamlog</command>, <command>
+make_win_binary_distribution</command>, <command>
 make_win_src_distribution</command>, <command>
 msql2mysql</command>, <command>
 my_print_defaults</command>, <command>
+myisam_ftdump</command>, <command>
 myisamchk</command>, <command>
 myisamlog</command>, <command>
@@ -192,4 +243,5 @@
 libmyisammrg</filename>, <filename class="libraryfile">
 libmysqlclient</filename>, <filename class="libraryfile">
+libmysqlclient_r</filename>, <filename class="libraryfile">
 libmystrings</filename>, <filename class="libraryfile">
 libmysys</filename>, <filename class="libraryfile">
@@ -201,9 +253,11 @@
 <sect2><title>Description</title>
 
-<para>A package listing would be several pages long, we suggest
-consulting the <application>My<acronym>SQL</acronym></application> documentation for full details, instead.</para>
-
-<para>Certain <application>My<acronym>SQL</acronym></application>
-support programs may require the <application>Perl</application> DBI modules to be installed to function properly.</para>
+<para>A package listing would be several pages long. Consult the 
+<application>My<acronym>SQL</acronym></application> documentation for full 
+details instead.</para>
+
+<para>Certain <application>My<acronym>SQL</acronym></application> support 
+programs may require the <application>Perl</application> DBI modules to be 
+installed to function properly.</para>
 
 </sect2>
Index: general.ent
===================================================================
--- general.ent	(revision 7172e4fe763f06d373fe0100743ce91d48e37c6d)
+++ general.ent	(revision 4b93ac2c25eb2d10d792c9592108de763fee4b80)
@@ -1,3 +1,3 @@
-<!ENTITY day          "27">
+<!ENTITY day          "28">
 <!ENTITY month        "07">
 <!ENTITY year         "2004">
@@ -7,5 +7,5 @@
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "testing">              <!-- stable|testing|unstable] -->
-<!ENTITY last-commit  "Tue Jul 27 00:16:59 MDT 2004"> <!-- Need to set up auto update for this -->
+<!ENTITY last-commit  "Wed Jul 28 00:45: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 7172e4fe763f06d373fe0100743ce91d48e37c6d)
+++ introduction/welcome/changelog.xml	(revision 4b93ac2c25eb2d10d792c9592108de763fee4b80)
@@ -18,4 +18,8 @@
 
 <itemizedlist>
+
+<listitem><para>July 28th, 2004 [randy]: Fixed MySQL instructions to
+build against NPTL and added optional dependencies and command 
+explanations.</para></listitem>
 
 <listitem><para>July 27th, 2004 [randy]: Added pkgconfig as an optional
