Index: content/databases/db-3.1.xml
===================================================================
--- content/databases/db-3.1.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ content/databases/db-3.1.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -1,4 +1,4 @@
 <sect1 id="db-3.1" xreflabel="db-&db-3.1-version;">
-<?dbhtml filename="db-&db-3.1-version;.html" dir="gnome"?>
+<?dbhtml filename="db-3.1.html" dir="gnome"?>
 <title>db-&db-3.1-version;</title>
 
Index: content/databases/db-3.3.xml
===================================================================
--- content/databases/db-3.3.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ content/databases/db-3.3.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -1,4 +1,4 @@
 <sect1 id="db-3.3" xreflabel="db-&db-3.3-version;">
-<?dbhtml filename="db-&db-3.3-version;.html" dir="gnome"?>
+<?dbhtml filename="db-3.3.html" dir="gnome"?>
 <title>db-&db-3.3-version;</title>
 
Index: content/databases/db/db-desc.xml
===================================================================
--- content/databases/db/db-desc.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ content/databases/db/db-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -2,7 +2,10 @@
 <title>Contents</title>
 
-<para>The db package contains <userinput>db_archive, db_checkpoint,
-db_deadlock, db_dump, db_load, db_printlog, db_recover, db_stat,
-db_upgrade, db_verify</userinput> and the <userinput>db
+<para>The db package contains <userinput>db_archive</userinput>,
+<userinput>db_checkpoint</userinput>,
+<userinput>db_deadlock</userinput>, <userinput>db_dump</userinput>,
+<userinput>db_load</userinput>, <userinput>db_printlog</userinput>,
+<userinput>db_recover</userinput>, <userinput>db_stat</userinput>,
+<userinput>db_upgrade</userinput>, <userinput>db_verify</userinput> and <userinput>db
 libraries</userinput></para>
 
Index: content/databases/db/db-exp.xml
===================================================================
--- content/databases/db/db-exp.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ content/databases/db/db-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -2,10 +2,10 @@
 <title>Command explanations</title>
 
-<para><userinput>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr --enable-compat185 :</userinput>
+<para><userinput>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr --enable-compat185</userinput> : 
 This replaces the normal ./configure command as db comes with the various 
 build directories for different platforms.</para>
 
 <para><userinput>make docdir=/usr/share/doc/db-&db-version; 
-install :</userinput> This installs db installing the documentation in
+install</userinput> : This installs db installing the documentation in
 the correct place.</para>
 
Index: general/genutils/bc/bc-inst.xml
===================================================================
--- general/genutils/bc/bc-inst.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ general/genutils/bc/bc-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -4,5 +4,5 @@
 <para>Install bc by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --with-readline &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: general/genutils/bc/bc-intro.xml
===================================================================
--- general/genutils/bc/bc-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ general/genutils/bc/bc-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -6,9 +6,11 @@
 Version used:                   &bc-version;
 Package size:                   &bc-size;
-Estimated Disk space required:  &bc-buildsize;</screen>
+Estimated Disk space required:  &bc-buildsize;
+Estimated build time:           &bc-time;</screen>
 
 <para>The bc package contains bc. This is an arbitrary precision numeric
 processing language.</para>
 
-
+<screen>bc depends on:
+<xref linkend="readline"/>
 </sect2>
Index: general/genutils/rep-gtk/rep-gtk-intro.xml
===================================================================
--- general/genutils/rep-gtk/rep-gtk-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ general/genutils/rep-gtk/rep-gtk-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -14,5 +14,5 @@
 
 <screen>rep-gtk depends on:
-<xref linkend="GTK2"/> <xref linkend="libglade"/> and <xref linkend="librep"/>
+<xref linkend="GTK2"/>, <xref linkend="libglade"/> and <xref linkend="librep"/>
 </screen>
 </sect2>
Index: x/installing/xfree86/xfree86-exp.xml
===================================================================
--- x/installing/xfree86/xfree86-exp.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ x/installing/xfree86/xfree86-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log</userinput>: 
+<para><userinput>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log</userinput> : 
 This command runs multiple makefiles to completely rebuild the system. 
 WORLDOPTS="" disables the default setting to continue after encountering an error.
@@ -17,6 +17,5 @@
 <para><userinput>ln -sf /usr/X11R6/bin /usr/bin/X11</userinput>,
 <userinput>ln -sf /usr/X11R6/lib/X11 /usr/lib/X11</userinput>, and
-<userinput>ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput>:
-These commands are present to enable other (broken) packages to build
+<userinput>ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput> : These commands are present to enable other (broken) packages to build
 against XFree86.  We do this even though the Filesystem Hierarchy Standard
 says:
@@ -24,12 +23,12 @@
 symbolic links. They are intended for utilization by users only."</para>
 
-<para><userinput>make -f Makefile.linux</userinput>: This builds the
+<para><userinput>make -f Makefile.linux</userinput> : This builds the
 XFree86 compatible kernel modules.</para>
 
 <para><userinput>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/</userinput>: Put the kernel
+/lib/modules/`uname -r`/kernel/drivers/char/drm/</userinput> : Put the kernel
 modules where the kernel can find them.</para>
 
-<para><userinput>depmod -a</userinput>: Update the modules.dep file for module
+<para><userinput>depmod -a</userinput> : Update the modules.dep file for module
 management.</para>
 
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ x/installing/xfree86/xfree86-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -2,5 +2,6 @@
 <title>Introduction to XFree86</title>
 
-<screen>Download location:              <ulink url="&xfree86-download;"/>
+<screen>Download location (HTTP):       <ulink url="&xfree86-download-http;"/>
+Download location (FTP):        <ulink url="&xfree86-download-ftp;"/>
 Version used:                   &xfree86-version;
 Package size:                   &xfree86-size;
@@ -8,5 +9,5 @@
 Estimated build time:           75m (667 MHz)</screen>
 
-<para><screen>XFree86 depends on: <xref linkend="freetype2"/>, <xref linkend="expat"/>, and <xref linkend="libpng"/>.</screen></para>
+<para><screen>XFree86 depends on: <xref linkend="freetype2"/>, <xref linkend="expat"/> and <xref linkend="libpng"/>.</screen></para>
 
 <para>XFree86 is a freely redistributable open-source implementation of the 
Index: x/installing/xfree86/xfree86.ent
===================================================================
--- x/installing/xfree86/xfree86.ent	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ x/installing/xfree86/xfree86.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -7,5 +7,6 @@
 <!ENTITY xfree86-buildsize "633 MB">
 <!ENTITY xfree86-version "4.3.0">
-<!ENTITY xfree86-download "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/">
+<!ENTITY xfree86-download-http "">
+<!ENTITY xfree86-download-ftp "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/">
 <!ENTITY xfree86-size "137 MB">
 <!ENTITY xfree86-time "56.24 SBU">
Index: x/lib/lesstif/lesstif-exp.xml
===================================================================
--- x/lib/lesstif/lesstif-exp.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ x/lib/lesstif/lesstif-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -2,22 +2,16 @@
 <title>Command explanations</title>
 
-<para><userinput>--enable-build-20 :</userinput>
-Build the Motif 2.0 compatible version of the lesstif libraries.</para> 
+<para><userinput>--enable-build-20</userinput> : Build the Motif 2.0 compatible version of the lesstif libraries.</para> 
 
 <para>
-<userinput>--enable-build-21 :</userinput>
-Also build the Motif 2.1 compatible versions.</para> 
+<userinput>--enable-build-21</userinput> : Also build the Motif 2.1 compatible versions.</para> 
 
-<para><userinput>--disable-debug :</userinput>
-Do not generate debugging information.</para> 
+<para><userinput>--disable-debug</userinput> : Do not generate debugging information.</para> 
 
-<para><userinput>--enable-production :</userinput>
-Build the release version of the lesstif libraries.</para> 
+<para><userinput>--enable-production</userinput> : Build the release version of the lesstif libraries.</para> 
 
-<para><userinput>--disable-build-tests :</userinput>
-Do not build the test/ tree(see testing note below).</para> 
+<para><userinput>--disable-build-tests</userinput> : Do not build the test/ tree(see testing note below).</para> 
 
-<para><userinput>--with-xdnd :</userinput>
-Enable XDND Gnome compatibility support.</para> 
+<para><userinput>--with-xdnd</userinput> : Enable XDND Gnome compatibility support.</para> 
 
 </sect2>
Index: x/lib/qt/qt-exp.xml
===================================================================
--- x/lib/qt/qt-exp.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ x/lib/qt/qt-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -19,9 +19,5 @@
 to support multi-threading.</para>
 
-<para><userinput>if test -L /opt/qt; then rm /opt/qt; fi</userinput> :
-This command eliminates the link if it already exists so our next
-command runs properly.</para> 
-
-<para><userinput>ln -s /opt/qt-&qt-version; /opt/qt</userinput> : This command
+<para><userinput>ln -sfn /opt/qt-&qt-version; /opt/qt</userinput> : This command
 standardizes the location of the qt libraries to the ld.so.conf entry
 described below.</para>
Index: x/lib/qt/qt-intro.xml
===================================================================
--- x/lib/qt/qt-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
+++ x/lib/qt/qt-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
@@ -15,5 +15,5 @@
 <screen>qt depends on:
 <xref linkend="xfree86"/>, <xref linkend="libpng"/>, <xref
-linkend="libmng"/>, and <xref linkend="libjpeg"/></screen>
+linkend="libmng"/> and <xref linkend="libjpeg"/></screen>
 
 </sect2>
