Index: content/databases/mysql/mysql-config.xml
===================================================================
--- content/databases/mysql/mysql-config.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ content/databases/mysql/mysql-config.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring mysql</title>
+<title>Configuring MySQL</title>
 
 <sect3>
@@ -13,23 +13,25 @@
 
 <para>There are several default configurations file available in
-<filename>/usr/share/mysql</filename> which you can use.</para>
+<filename class="directory">/usr/share/mysql</filename> which you can use.</para>
 
-<screen><userinput>cp /usr/share/mysql/my-medium.cnf /etc/my.cnf</userinput></screen>
+<screen><userinput><command>cp /usr/share/mysql/my-medium.cnf /etc/my.cnf</command>
+</userinput></screen>
 
 <para>We can now install a database and change the ownership to the
 unpriviledged user and group.</para>
 
-<screen><userinput>mysql_install_db
-chown -R mysql:mysql /var/lib/mysql</userinput></screen>
+<screen><userinput><command>mysql_install_db
+chown -R mysql:mysql /var/lib/mysql</command></userinput></screen>
 
 <para>Further configuration requires that the mysql server be running:</para>
 
-<screen><userinput>safe_mysqld 2&gt;&amp;1 &gt;/dev/null &amp;</userinput></screen>
+<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 here we will login and set one.  We strongly suggest changing
+So here we will login and set one. We strongly suggest changing
 'new-password' to your own.</para>
 
-<screen><userinput>mysql -uroot mysql</userinput>
+<screen><userinput><command>mysql -uroot mysql
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 2 to server version: 3.23.51-log
@@ -37,28 +39,28 @@
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
-mysql&gt; <userinput>UPDATE user SET password=password('new-password') WHERE user='root';</userinput>
+mysql&gt; UPDATE user SET password=password('new-password') WHERE user='root';
 Query OK, 2 rows affected (0.00 sec)
 Rows matched: 2  Changed: 2  Warnings: 0
 
-mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
+mysql&gt; FLUSH PRIVILEGES;
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>EXIT;</userinput>
+mysql&gt; EXIT;
 bye
-</screen>
+</command></userinput></screen>
 
 <para>Now that we are done with the configuration of the server, we can
 shut it down.</para>
 
-<screen><userinput>kill `pidof -x safe_mysqld mysqld`</userinput></screen>
+<screen><userinput><command>kill `pidof -x mysqld_safe mysqld`</command></userinput></screen>
 
 
 <sect4>
-<title>mysql init.d script</title>
+<title>MySQL init.d script</title>
 
-<para>To automate the running of mysql, use the following command to create
+<para>To automate the running of MySQL, use the following command to create
 the init.d script:</para>
 
-<screen><userinput>cat &gt; /etc/rc.d/init.d/mysql &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/mysql &lt;&lt; "EOF"
 #!/bin/bash
 # Begin $rc_base/init.d/
@@ -73,5 +75,5 @@
         start)
                 echo "Starting MySQL daemon..."
-                /usr/bin/safe_mysqld 2&gt;&amp;1 &gt;/dev/null &amp;
+                /usr/bin/mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;
                 evaluate_retval
                 ;;
@@ -99,12 +101,12 @@
 
 # End $rc_base/init.d/
-<userinput>EOF
-chmod 755 /etc/rc.d/init.d/mysql</userinput></screen>
+EOF
+chmod 755 /etc/rc.d/init.d/mysql</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant
-<filename>rc.d</filename> directory
+<filename class="directory">rc.d</filename> directory
 with the following commands:</para>
 
-<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/mysql ../rc0.d/K26mysql &amp;&amp;
 ln -sf ../init.d/mysql ../rc1.d/K26mysql &amp;&amp;
@@ -113,5 +115,5 @@
 ln -sf ../init.d/mysql ../rc4.d/S34mysql &amp;&amp;
 ln -sf ../init.d/mysql ../rc5.d/S34mysql &amp;&amp;
-ln -sf ../init.d/mysql ../rc6.d/K26mysql</userinput></screen>
+ln -sf ../init.d/mysql ../rc6.d/K26mysql</command></userinput></screen>
 
 </sect4>
@@ -120,3 +122,2 @@
 
 </sect2>
-
Index: general/sysutils/pciutils/pciutils-desc.xml
===================================================================
--- general/sysutils/pciutils/pciutils-desc.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/sysutils/pciutils/pciutils-desc.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The pciutils package contains <userinput>lspci</userinput> and
-<userinput>setpci</userinput>.</para>
+<para>The pciutils package contains <command>lspci</command>,
+<command>setpci</command> and <command>update-pciids</command>.</para>
 
 </sect2>
@@ -10,9 +10,15 @@
 
 <sect3><title>lspci</title>
-<para>lspci is a utility for displaying information about all PCI 
-buses in the system and all devices connected to them.</para></sect3>
+<para><command>lspci</command> is a utility for displaying information
+about all <acronym>PCI</acronym> buses in the system and all devices 
+connected to them.</para></sect3>
 
 <sect3><title>setpci</title>
-<para>setpci is a utility for querying and configuring PCI devices.</para></sect3>
+<para><command>setpci</command> is a utility for querying and 
+configuring <acronym>PCI</acronym> devices.</para></sect3>
+
+<sect3><title>update-pciids</title>
+<para><command>update-pciids</command> fetches the current version of
+the <acronym>PCI</acronym> ID list.</para></sect3>
 
 </sect2>
Index: general/sysutils/pciutils/pciutils-inst.xml
===================================================================
--- general/sysutils/pciutils/pciutils-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/sysutils/pciutils/pciutils-inst.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -1,9 +1,9 @@
 <sect2>
-<title>Installation of pciutils</title>
+<title>Installation of <application>pciutils</application></title>
 
-<para>Install pciutils by running the following commands:</para>
+<para>Install <application>pciutils</application> by running the following commands:</para>
 
-<para><screen><userinput>make PREFIX=/usr &amp;&amp;
-make PREFIX=/usr install</userinput></screen></para>
+<screen><userinput><command>make PREFIX=/usr &amp;&amp;
+make PREFIX=/usr install</command></userinput></screen>
 
 </sect2>
Index: general/sysutils/pciutils/pciutils-intro.xml
===================================================================
--- general/sysutils/pciutils/pciutils-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/sysutils/pciutils/pciutils-intro.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -1,13 +1,23 @@
 <sect2>
-<title>Introduction to pciutils</title>
+<title>Introduction to <application>pciutils</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&pciutils-download-http;"/>
-Download location (FTP):        <ulink url="&pciutils-download-ftp;"/>
-Version used:                   &pciutils-version;
-Package size:                   &pciutils-size;
-Estimated Disk space required:  &pciutils-buildsize;</screen>
+<para>The <application>pciutils</application> package is a set of programs for listing
+<acronym>PCI</acronym> devices, inspecting their status and setting 
+their configuration registers.</para>
 
-<para>The pciutils package contains lspci and setpci.  These programs are
-useful for PCI bus configuration.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&pciutils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&pciutils-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &pciutils-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &pciutils-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &pciutils-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>pciutils</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="wget"/> or <xref linkend="lynx"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: general/sysutils/pciutils/pciutils.ent
===================================================================
--- general/sysutils/pciutils/pciutils.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/sysutils/pciutils/pciutils.ent	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -5,7 +5,10 @@
 <!ENTITY pciutils-desc SYSTEM "pciutils-desc.xml">
 <!ENTITY pciutils-config SYSTEM "pciutils-config.xml">
-<!ENTITY pciutils-buildsize "638 KB">
-<!ENTITY pciutils-version "2.1.10">
-<!ENTITY pciutils-download-http "http://www.kernel.org/pub/software/utils/pciutils/pciutils-2.1.10.tar.bz2">
-<!ENTITY pciutils-download-ftp "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-2.1.10.tar.bz2">
-<!ENTITY pciutils-size "98 KB">
+<!ENTITY pciutils-buildsize "1.1 MB">
+<!ENTITY pciutils-version "2.1.11">
+<!ENTITY pciutils-download-http
+"http://www.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
+<!ENTITY pciutils-download-ftp
+"ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
+<!ENTITY pciutils-size "107 KB">
+<!ENTITY pciutils-time "0.02 SBU">
Index: index.xml
===================================================================
--- index.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ index.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030906">
-<!ENTITY releasedate "September 6th, 2003">
+<!ENTITY version "20030907">
+<!ENTITY releasedate "September 7th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ introduction/welcome/changelog.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -10,4 +10,8 @@
 
 <itemizedlist>
+
+<listitem><para>September 7th, 2003 [larry]: update to MySQL-4.0.14, nano-1.2.2,
+GTK2+-2.2.5 and pciutils-2.1.11, all submitted by
+Igor.</para></listitem>
 
 <listitem><para>September 6th, 2003 [larry]: gnome: updated to
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ introduction/welcome/credits.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -129,5 +129,5 @@
 Downing</emphasis></para></listitem>
 
-<listitem><para>directFB, libMPEG3, NASM and SVGAlib: <emphasis>Igor
+<listitem><para>directFB, libMPEG3, MySQL-4, NASM and SVGAlib: <emphasis>Igor
 Zivkovic</emphasis></para></listitem>
 
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ postlfs/editors/nano.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -5,4 +5,5 @@
 &nano-intro;
 &nano-inst;
+&nano-config;
 &nano-desc;
 
Index: postlfs/editors/nano/nano-config.xml
===================================================================
--- postlfs/editors/nano/nano-config.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
+++ postlfs/editors/nano/nano-config.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Configuring nano</title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/nanorc</filename>, <filename>~/.nanorc</filename></para>
+</sect3>
+
+</sect2>
Index: postlfs/editors/nano/nano-inst.xml
===================================================================
--- postlfs/editors/nano/nano-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ postlfs/editors/nano/nano-inst.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -4,6 +4,6 @@
 <para>Install <application>nano</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --enable-color \
---enable-multibuffer --enable-nanorc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc \
+--enable-color --enable-multibuffer --enable-nanorc &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: postlfs/editors/nano/nano-intro.xml
===================================================================
--- postlfs/editors/nano/nano-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ postlfs/editors/nano/nano-intro.xml	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -19,4 +19,9 @@
 </sect3>
 
+<sect3><title><application>nano</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="slang"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: postlfs/editors/nano/nano.ent
===================================================================
--- postlfs/editors/nano/nano.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ postlfs/editors/nano/nano.ent	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -3,8 +3,10 @@
 <!ENTITY nano-inst SYSTEM "nano-inst.xml">
 <!ENTITY nano-desc SYSTEM "nano-desc.xml">
-<!ENTITY nano-buildsize "3.8 MB">
-<!ENTITY nano-version "1.2.0">
-<!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
+<!ENTITY nano-config SYSTEM "nano-config.xml">
+<!ENTITY nano-buildsize "5.6 MB">
+<!ENTITY nano-version "1.2.2">
+<!ENTITY nano-download-http
+"http://www.nano-editor.org/dist/v1.2/nano-&nano-version;.tar.gz">
 <!ENTITY nano-download-ftp "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
-<!ENTITY nano-size "880 KB">
-<!ENTITY nano-time "0.06 SBU">
+<!ENTITY nano-size "868 KB">
+<!ENTITY nano-time "0.08 SBU">
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ x/lib/gtk/gtk.ent	(revision 9dcba70576f3fa6c146e41fa6f3915aa42799bd9)
@@ -8,5 +8,5 @@
 <!ENTITY GTK-version "1.2.10">
 <!ENTITY GTK-download-http "">
-<!ENTITY GTK-download-ftp "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.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-time "1.96 SBU">
@@ -18,8 +18,8 @@
 <!ENTITY GTK2-exp SYSTEM "gtk+2-exp.xml">
 <!ENTITY GTK2-config SYSTEM "gtk+2-config.xml">
-<!ENTITY GTK2-buildsize "136 MB">
-<!ENTITY GTK2-version "2.2.3">
+<!ENTITY GTK2-buildsize "187 MB">
+<!ENTITY GTK2-version "2.2.4">
 <!ENTITY GTK2-download-http "">
 <!ENTITY GTK2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-&GTK2-version;.tar.bz2">
 <!ENTITY GTK2-size "6.9 MB">
-<!ENTITY GTK2-time "3.03 SBU">
+<!ENTITY GTK2-time "2.88 SBU">
