Index: appendices/symlinks/rc0.xml
===================================================================
--- appendices/symlinks/rc0.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc0.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K05</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Shut down Gnome display manager Daemon: <xref linkend="gdm"/></entry>
 </row>
 
Index: appendices/symlinks/rc1.xml
===================================================================
--- appendices/symlinks/rc1.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc1.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K05</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Shut down Gnome display manager Daemon: <xref linkend="gdm"/></entry>
 </row>
 
Index: appendices/symlinks/rc2.xml
===================================================================
--- appendices/symlinks/rc2.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc2.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K05</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Shut down Gnome display manager Daemon: <xref linkend="gdm"/></entry>
 </row>
 
Index: appendices/symlinks/rc3.xml
===================================================================
--- appendices/symlinks/rc3.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc3.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K05</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Shut down Gnome display manager Daemon: <xref linkend="gdm"/></entry>
 </row>
 
Index: appendices/symlinks/rc4.xml
===================================================================
--- appendices/symlinks/rc4.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc4.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K05</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Shut down Gnome display manager Daemon: <xref linkend="gdm"/></entry>
 </row>
 
Index: appendices/symlinks/rc5.xml
===================================================================
--- appendices/symlinks/rc5.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc5.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -133,4 +133,11 @@
 </row>
 
+<row>
+<entry>S95</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Start the Gnome display manager Daemon: <xref linkend="gdm"/></entry>
+</row>
+
 </tbody>
 </tgroup>
Index: appendices/symlinks/rc6.xml
===================================================================
--- appendices/symlinks/rc6.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ appendices/symlinks/rc6.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K05</entry>
+<entry>gdm</entry>
+<entry><filename>../init.d/gdm</filename></entry>
+<entry>Shut down Gnome display manager Daemon: <xref linkend="gdm"/></entry>
 </row>
 
Index: content/databases/mysql/mysql-desc.xml
===================================================================
--- content/databases/mysql/mysql-desc.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ content/databases/mysql/mysql-desc.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -2,5 +2,29 @@
 <title>Contents</title>
 
-<para>The mysql package contains <userinput>mysql mysqladmin mysqlcheck mysqlshow mysqldump mysqlimport mysqltest mysqlbinlog replace comp_err perror resolveip my_print_defaults resolve_stack_dump isamchk isamlog pack_isam myisamchk myisamlog myisampack safe_mysqld mysql_install_db msql2mysql mysql_config mysql_fix_privilege_tables mysql_setpermission mysql_zap mysqlacess mysqlbug mysql_convert_table_format mysql_find_rows mysqlhotcopy mysqldumbslow mysqld_multi mysqld</userinput></para>
+<para>The mysql package contains
+<userinput>mysql</userinput>,<userinput>
+mysqladmin</userinput>,<userinput> mysqlcheck</userinput>,<userinput>
+mysqlshow</userinput>,<userinput> mysqldump</userinput>,<userinput>
+mysqlimport</userinput>,<userinput> mysqltest</userinput>,<userinput>
+mysqlbinlog</userinput>,<userinput> replace</userinput>,<userinput>
+comp_err</userinput>,<userinput> perror</userinput>,<userinput>
+resolveip</userinput>,<userinput>
+my_print_defaults</userinput>,<userinput>
+resolve_stack_dump</userinput>,<userinput>
+isamchk</userinput>,<userinput> isamlog</userinput>,<userinput>
+pack_isam</userinput>,<userinput> myisamchk</userinput>,<userinput>
+myisamlog</userinput>,<userinput> myisampack</userinput>,<userinput>
+safe_mysqld</userinput>,<userinput>
+mysql_install_db</userinput>,<userinput>
+msql2mysql</userinput>,<userinput> mysql_config</userinput>,<userinput>
+mysql_fix_privilege_tables</userinput>,<userinput>
+mysql_setpermission</userinput>,<userinput>
+mysql_zap</userinput>,<userinput> mysqlacess</userinput>,<userinput>
+mysqlbug</userinput>,<userinput>
+mysql_convert_table_format</userinput>,<userinput>
+mysql_find_rows</userinput>,<userinput>
+mysqlhotcopy</userinput>,<userinput>
+mysqldumbslow</userinput>,<userinput>
+mysqld_multi</userinput> and<userinput> mysqld</userinput></para>
 
 </sect2>
Index: general/genlib/libfam/libfam-config.xml
===================================================================
--- general/genlib/libfam/libfam-config.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ general/genlib/libfam/libfam-config.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -27,6 +27,5 @@
 </para>
 <para>
-<screen><userinput>
-cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
     # description: FAM - file alteration monitor
     service sgi_fam
@@ -42,6 +41,5 @@
         rpc_number      = 391002
     }
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 </sect3>
Index: general/genlib/popt/popt-intro.xml
===================================================================
--- general/genlib/popt/popt-intro.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ general/genlib/popt/popt-intro.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -2,8 +2,10 @@
 <title>Introduction to popt</title>
 
-<screen>Download location (FTP):        <ulink url="&popt-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&popt-download-http;"/>
+Download location (FTP):        <ulink url="&popt-download-ftp;"/>
 Version used:                   &popt-version;
 Package size:                   &popt-size;
-Estimated Disk space required:  &popt-buildsize;</screen>
+Estimated Disk space required:  &popt-buildsize;
+Estimated build time:           &popt-time;</screen>
 
 <para>The popt package contains the popt libraries which are used by some
Index: general/genlib/popt/popt.ent
===================================================================
--- general/genlib/popt/popt.ent	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ general/genlib/popt/popt.ent	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -7,5 +7,5 @@
 <!ENTITY popt-buildsize "4 MB">
 <!ENTITY popt-version "1.7">
-<!ENTITY popt-download-http "Not currently available">
+<!ENTITY popt-download-http "">
 <!ENTITY popt-download-ftp "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz">
 <!ENTITY popt-size "200 KB">
Index: gnome/other/gdm/gdm-inst.xml
===================================================================
--- gnome/other/gdm/gdm-inst.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ gnome/other/gdm/gdm-inst.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -9,6 +9,5 @@
 --localstatedir=/var/lib --with-pam-prefix=/etc &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: postlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision d1c6f6980d117bc2cbd01d8b93717eef8ff35cb6)
+++ postlfs/config/skel.xml	(revision 5e1c34558d23fd332479857fec473ef1805c8162)
@@ -23,6 +23,5 @@
 parameter.  For example:</para>
 
-<para><screen>[prompt]#<userinput>useradd -m -s/bin/bash
-jwrober</userinput></screen></para>
+<para><screen>[prompt]#<userinput>useradd -m -s/bin/bash jwrober</userinput></screen></para>
 
 <para>The <filename>/usr/sbin/useradd</filename> program uses a
@@ -51,6 +50,5 @@
 by running:</para>
 
-<para><screen><userinput>/usr/sbin/useradd -D
--s/bin/bash</userinput></screen></para>
+<para><screen><userinput>/usr/sbin/useradd -D -s/bin/bash</userinput></screen></para>
 
 <para>This will set the <userinput>SHELL=</userinput> line to
