Index: basicnet/djb/daemontools/daemontools-man-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ basicnet/djb/daemontools/daemontools-man-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,6 +2,6 @@
 <title>Command explanations</title>
 
-<para><userinput>gzip -9 *.8</userinput> : You can compress the manpages
-to save space, but it isn't needed for the manpages to work.</para>
+<para><userinput>gzip -9 *.8</userinput> : You can compress the man pages
+to save space, but it isn't needed for the man pages to work.</para>
 
 <para><userinput>package/compile</userinput> : This command actually 
Index: basicnet/djb/daemontools/daemontools-man-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ basicnet/djb/daemontools/daemontools-man-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -8,5 +8,5 @@
 Estimated Disk space required:  &daemontools-man-buildsize;</screen>
 
-<para>The Daemontools package does not come with manpages, so install
+<para>The Daemontools package does not come with man pages, so install
 this package if you want online help with the daemontools programs.</para>
 
Index: basicnet/mailnews/mutt/mutt-config.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ basicnet/mailnews/mutt/mutt-config.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -11,5 +11,5 @@
 
 <para>No changes in these files are necessary to begin using mutt.  When
-your ready to make changes, the manpage for muttrc is a good starting
+your ready to make changes, the man page for muttrc is a good starting
 place.</para>
 </sect3>
Index: content/databases/db/db-desc.xml
===================================================================
--- content/databases/db/db-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ content/databases/db/db-desc.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,11 +2,17 @@
 <title>Contents</title>
 
-<para>The db package contains <userinput>db_archive</userinput>,
+<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>
+<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> and
+<userinput>db_verify</userinput>.
+
+</para>
 
 </sect2>
@@ -15,36 +21,42 @@
 
 <sect3><title>db_archive</title>
-<para>No description available</para></sect3>
+<para>db_archive prints the pathnames of log files that are no longer
+in use.</para></sect3>
+
 
 <sect3><title>db_checkpoint</title>
-<para>No description available</para></sect3>
+<para>db_checkpoint is a daemon process used to monitor and checkpoint
+database logs.</para></sect3>
 
 <sect3><title>db_deadlock</title>
-<para>No description available</para></sect3>
+<para>db_deadlock is used to abort lock requests when deadlocks are
+detected.</para></sect3>
 
 <sect3><title>db_dump</title>
-<para>No description available</para></sect3>
+<para>db_dump converts database files to a flat file format readable
+by db_load.</para></sect3>
 
 <sect3><title>db_load</title>
-<para>No description available</para></sect3>
+<para>db_load is used to create database files from flat files created
+with db_dump.</para></sect3>
 
 <sect3><title>db_printlog</title>
-<para>No description available</para></sect3>
+<para>db_printlog converts database log files to human readable
+text.</para></sect3>
+
 
 <sect3><title>db_recover</title>
-<para>No description available</para></sect3>
+<para>db_recover is used to restore a database to a consistent state
+after a failure.</para></sect3>
 
 <sect3><title>db_stat</title>
-<para>No description available</para></sect3>
+<para>db_stat displays database environment statistics.</para></sect3>
 
 <sect3><title>db_upgrade</title>
-<para>No description available</para></sect3>
+<para>db_upgrade is used to upgrade database files to a newer version
+of Berkeley DB.</para></sect3>
 
 <sect3><title>db_verify</title>
-<para>No description available</para></sect3>
-
-<sect3><title>db libraries</title>
-<para>These are used by many other programs to perform db linked
-functions.</para></sect3>
+<para>db_verify is used to run consistency checks on database files.</para></sect3>
 
 </sect2>
Index: gnome/core/desktop/gnome-desktop-intro.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ gnome/core/desktop/gnome-desktop-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -10,5 +10,5 @@
 
 <para>The gnome-desktop package contains GNOME's .desktop files, the
-gnome-about program, manpages and GNOME's core graphics files and icons.</para>
+gnome-about program, man pages and GNOME's core graphics files and icons.</para>
 
 <screen>gnome-desktop depends on:
Index: multimedia/audioutils/cdparanoia/CDParanoia-config.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/audioutils/cdparanoia/CDParanoia-config.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -7,6 +7,4 @@
 found from the man page.</para>
 
-<para>For the libcdda library, the usual rules apply:</para>
-
 &library-config;
 
Index: multimedia/audioutils/mpg123/mpg123-intro.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/audioutils/mpg123/mpg123-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -11,6 +11,6 @@
 be the fastest mp3-decoder for unix.</para>
 
-<screen>mpg123 depends on: <xref linkend="alsa"/> with 
-oss-compatibility.</screen>
+<screen>mpg123 depends on:
+<xref linkend="alsa"/> with oss-compatibility.</screen>
 
 </sect2>
Index: multimedia/audioutils/xmms/XMMS-config.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/audioutils/xmms/XMMS-config.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -10,5 +10,5 @@
 <para>When you start XMMS for the first time, you can configure it with 
 <userinput>CTRL+P</userinput> Note that you can extend XMMS' functionality
-with plugins and skins. You can find these at http://xmms.org. 
+with plugins and skins. You can find these at <ulink url="http://xmms.org"/>. 
 </para>
 </sect3>
Index: multimedia/audioutils/xmms/XMMS-desc.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/audioutils/xmms/XMMS-desc.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The xmms package contains <userinput>xmms, xmms-config, gnomexmss, 
-wmxmms.</userinput></para>
+<para>The xmms package contains <userinput>xmms</userinput>, <userinput>xmms-config</userinput>, <userinput>gnomexmss</userinput> and <userinput>wmxmms.</userinput></para>
 
 </sect2>
Index: multimedia/audioutils/xmms/XMMS-intro.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/audioutils/xmms/XMMS-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -12,5 +12,6 @@
 <screen>XMMS depends on:
 a working soundcard, <xref linkend="xfree86"/>, <xref linkend="GTK"/> and <xref linkend="GLib"/>
-XMMS will utilize <xref linkend="esound"/>, <xref linkend="gnome-libs"/>, gnome-applets, libmikmod, <xref linkend="libogg"/>, <xref linkend="libvorbis"/> and <xref linkend="libxml"/> if
-installed prior to XMMS.</screen>
+XMMS will utilize:
+<xref linkend="esound"/>, <xref linkend="gnome-libs"/>, gnome-applets, libmikmod, 
+<xref linkend="libogg"/>, <xref linkend="libvorbis"/> and <xref linkend="libxml"/></screen>
 </sect2>
Index: multimedia/cdwriteutils/kernel.xml
===================================================================
--- multimedia/cdwriteutils/kernel.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/cdwriteutils/kernel.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -7,6 +7,5 @@
 
 <para>SCSI CD-writer:</para>
-<screen>
-SCSI support menu
+<screen>SCSI support menu
   SCSI support:           Y or M
   SCSI CD-ROM support:    Y or M
@@ -18,6 +17,5 @@
 
 <para>IDE CD-writer:</para>
-<screen>
-ATA/IDE/MFM/RLL support menu
+<screen>ATA/IDE/MFM/RLL support menu
   IDE/ATAPI CDROM support:     N
   SCSI emulation support: Y or M
Index: multimedia/libdriv/esound/esound-exp.xml
===================================================================
--- multimedia/libdriv/esound/esound-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/esound/esound-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfdir=/etc :</userinput> This command put
+<para><userinput>--sysconfdir=/etc</userinput> : This command put
 esounds configuration files in <filename>/etc</filename> instead of
 <filename>/use/etc</filename>.</para>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/libao.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -5,5 +5,4 @@
 &libao-intro;
 &libao-inst;
-&libao-exp;
 &libao-desc;
 
Index: multimedia/libdriv/libao/libao-inst.xml
===================================================================
--- multimedia/libdriv/libao/libao-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/libao/libao-inst.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -5,5 +5,5 @@
 
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make CC="gcc $CFLAGS" &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
Index: multimedia/libdriv/nas/nas-desc.xml
===================================================================
--- multimedia/libdriv/nas/nas-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/nas/nas-desc.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The nas package contains <userinput>nas utils, headers and
-libraries</userinput>.</para>
+<para>The nas package contains <userinput>nas utils</userinput>,
+<userinput>headers</userinput> and <userinput>libraries</userinput>.</para>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-exp.xml
===================================================================
--- multimedia/libdriv/nas/nas-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/nas/nas-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><userinput>xmkmf...:</userinput> Compile using the standard way
+<para><userinput>xmkmf...</userinput> : Compile using the standard way
 for compiling X based apps.</para>
 
-<para><userinput>make INCROOT=...:</userinput> Install with /usr prefix
+<para><userinput>make INCROOT=...</userinput> : Install with /usr prefix
 instead of the default /usr/X11R6. Also install man pages.</para>
 
Index: multimedia/libdriv/nas/nas-intro.xml
===================================================================
--- multimedia/libdriv/nas/nas-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/nas/nas-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -3,4 +3,5 @@
 
 <screen>Download location (HTTP):       <ulink url="&nas-download-http;"/>
+Download location (FTP):        <ulink url="&nas-download-ftp;"/>
 Version used:                   &nas-version;
 Package size:                   &nas-size;
Index: multimedia/libdriv/nas/nas.ent
===================================================================
--- multimedia/libdriv/nas/nas.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/nas/nas.ent	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -8,3 +8,4 @@
 <!ENTITY nas-version "1.6">
 <!ENTITY nas-download-http "http://radscan.com/nas/nas-&nas-version;.src.tar.gz">
+<!ENTITY nas-download-ftp "">
 <!ENTITY nas-size "2 MB">
Index: multimedia/libdriv/sdl/SDL-desc.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/sdl/SDL-desc.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -3,5 +3,5 @@
 
 <para>The SDL package contains the <userinput>Simple DirectMedia 
-Layer</userinput></para>
+Layer</userinput>.</para>
 
 </sect2>
Index: multimedia/libdriv/sdl/SDL-intro.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/libdriv/sdl/SDL-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -13,5 +13,6 @@
 
 <screen>SDL will utilize:
-oss, <xref linkend="alsa"/>, <xref linkend="esound"/>, <xref linkend="arts"/>, nas, nasm, <xref linkend="xfree86"/>,  <xref linkend="aalib"/> and directfb</screen>
+oss, <xref linkend="alsa"/>, <xref linkend="esound"/>, <xref linkend="arts"/>, nas, nasm, 
+<xref linkend="xfree86"/>,  <xref linkend="aalib"/> and directfb</screen>
 
 </sect2>
Index: multimedia/videoutils/ffmpeg/ffmpeg-intro.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ multimedia/videoutils/ffmpeg/ffmpeg-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -13,5 +13,5 @@
 
 <screen>ffmpeg will utilize:
-<xref linkend="libvorbis"/>, <xref linkend="lame"/>, and Imlib2</screen>
+<xref linkend="libvorbis"/>, <xref linkend="lame"/> and Imlib2</screen>
 
 </sect2>
Index: postlfs/security/pam/linux_pam-config.xml
===================================================================
--- postlfs/security/pam/linux_pam-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ postlfs/security/pam/linux_pam-config.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -32,5 +32,5 @@
 # End /etc/pam.conf</screen>
 
-<para>The pam manpage provides a good starting point for descriptions of
+<para>The pam man page provides a good starting point for descriptions of
 fields and allowable entries.  The <ulink
 url="http://www.kernel.org/pub/linux/libs/pam/Linux-PAM-html/pam.html">Linux-PAM
Index: pst/printing/cups/cups-config.xml
===================================================================
--- pst/printing/cups/cups-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/printing/cups/cups-config.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -4,5 +4,5 @@
 <para>Configuration of CUPS is dependent on the type of printer and can be complex.  
 Generally, postscript printers are easier.  For detailed instructions on 
-configuration and use of CUPS, see <ulink url="http://www.cups.org/documentation.html"/>.
+configuration and use of CUPS, see <ulink url="http://www.cups.org/documentation.php"/>.
 The Software Administrators Manual and Software Users Manual are particularly
 useful.</para>
Index: pst/printing/cups/cups-exp.xml
===================================================================
--- pst/printing/cups/cups-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/printing/cups/cups-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -3,5 +3,7 @@
 
 <para>The basic default behavior of the installation is appropriate for LFS systems.  
-CUPS files are placed in /usr/bin, /usr/sbin, /var, and /etc/cups.</para>
+CUPS files are placed in <filename>/usr/bin</filename>,
+<filename>/usr/sbin</filename>, <filename>/var</filename> and
+<filename>/etc/cups</filename>.</para>
 
 </sect2>
Index: pst/printing/cups/cups-intro.xml
===================================================================
--- pst/printing/cups/cups-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/printing/cups/cups-intro.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -11,5 +11,5 @@
 <xref linkend="espgs"/> (for non-postscript printers)
 CUPS will utilize:
-<xref linkend="libjpeg"/>, <xref linkend="libpng"/>, and <xref linkend="libtiff"/></screen>
+<xref linkend="libjpeg"/>, <xref linkend="libpng"/> and <xref linkend="libtiff"/></screen>
 
 
Index: pst/printing/gs/gs-exp.xml
===================================================================
--- pst/printing/gs/gs-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/printing/gs/gs-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,9 +2,9 @@
 <title>Installation command explanations</title>
 
-<para><userinput>--libexecdir=/usr/lib/gs :</userinput> executable
+<para><userinput>--libexecdir=/usr/lib/gs</userinput> : executable
 libraries of Ghostscript will be installed to
 <userinput>/usr/lib/gs</userinput>.</para>
 
-<para><userinput>--sysconfdir=/etc/gs :</userinput> Configuration data
+<para><userinput>--sysconfdir=/etc/gs</userinput> : Configuration data
 goes to <userinput>/etc/gs</userinput> instead of 
 <userinput>/usr/etc</userinput>.</para>
Index: pst/printing/lprng/lprng-desc.xml
===================================================================
--- pst/printing/lprng/lprng-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/printing/lprng/lprng-desc.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -5,5 +5,5 @@
 <userinput>lpq</userinput>, <userinput>lpr</userinput>,
 <userinput>lprm</userinput>, <userinput>lpstat</userinput>,
-<userinput>lpc</userinput> and <userinput>lpd</userinput></para>
+<userinput>lpc</userinput> and <userinput>lpd</userinput>.</para>
 
 </sect2>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/printing/printing.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -3,5 +3,4 @@
 <title>Printing</title>
 
-<para>Table of Contents</para>
 &cups;
 &gs;
Index: pst/scanning/sane/sane-desc.xml
===================================================================
--- pst/scanning/sane/sane-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/scanning/sane/sane-desc.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -8,9 +8,9 @@
 
 <sect3><title>Frontends:</title>
-<para><userinput>scanimage :</userinput> Command line interface for 
+<para><userinput>scanimage</userinput> : Command line interface for 
 scanning.</para>
-<para><userinput>xscanimage :</userinput> Graphical user interface for
+<para><userinput>xscanimage</userinput> : Graphical user interface for
 scanning.</para>
-<para><userinput>gimp-plugin :</userinput> xscanimage as Gimp-plugin.</para>
+<para><userinput>gimp-plugin</userinput> : xscanimage as Gimp-plugin.</para>
 </sect3>
 
Index: pst/scanning/sane/sane-exp.xml
===================================================================
--- pst/scanning/sane/sane-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/scanning/sane/sane-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,5 +2,5 @@
 <title>Installation command explanations</title>
 
-<para><userinput>--prefix=/usr :</userinput> All software is going to
+<para><userinput>--prefix=/usr</userinput> : All software is going to
 be installed in directories relative to<filename>/usr</filename>.</para>
 
Index: pst/scanning/xsane/xsane-exp.xml
===================================================================
--- pst/scanning/xsane/xsane-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
+++ pst/scanning/xsane/xsane-exp.xml	(revision d306467b745ed58f4b8e9a2167c4b26db8075974)
@@ -2,5 +2,5 @@
 <title>Installation command explanations</title>
 
-<para><userinput>--prefix=/usr :</userinput> All software is going to
+<para><userinput>--prefix=/usr</userinput> : All software is going to
 be installed in directories relative to<filename>/usr</filename>.</para>
 
