Index: basicnet/mailnews/fetchmail/fetchmail-config.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -20,5 +20,5 @@
 can add as many users and servers as you need using the same syntax.</para>
 
-<para><userinput>man fetchmail :</userinput> Look for the section near the bottom named <userinput>CONFIGURATION EXAMPLES</userinput> it gives some quick 
+<para><userinput>man fetchmail</userinput> : Look for the section near the bottom named <userinput>CONFIGURATION EXAMPLES</userinput> it gives some quick 
 examples too. There are countless other config options once you get used to 
 it.</para>
Index: basicnet/mailnews/fetchmail/fetchmail-intro.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,4 +3,5 @@
 
 <screen>Download location (HTTP):       <ulink url="&fetchmail-download-http;"/>
+Download location (FTP):        <ulink url="&fetchmail-download-ftp;"/>
 Version used:                   &fetchmail-version;
 Package size:                   &fetchmail-size;
Index: basicnet/mailnews/mutt/mutt-config.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/mutt/mutt-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,7 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/Muttrc, ~/.muttrc, /etc/mime.types, ~/.mime.types</userinput></para>
+<para><userinput>/etc/Muttrc</userinput>,
+<userinput>~/.muttrc</userinput>,
+<userinput>/etc/mime.types</userinput>, <userinput>~/.mime.types</userinput></para>
 </sect3>
 
Index: basicnet/mailnews/pine/pine-intro.xml
===================================================================
--- basicnet/mailnews/pine/pine-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/pine/pine-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -7,8 +7,6 @@
 Package size:                   &pine-size;
 Estimated Disk space required:  &pine-buildsize;</screen>
-</sect2>
-
-<sect2><title>Required patches</title>
 <screen>
+Required patches:
 Download location (FTP):       <ulink url="&blfs-patch-dir;/pine-4.44-fhs.patch.bz2"/></screen>
 
Index: basicnet/mailnews/procmail/procmail-config.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/procmail/procmail-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/procmailrc, ~/.procmailrc</userinput></para>
+<para><userinput>/etc/procmailrc</userinput>, <userinput>~/.procmailrc</userinput></para>
 </sect3>
 
Index: basicnet/mailnews/slrn/slrn-config.xml
===================================================================
--- basicnet/mailnews/slrn/slrn-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/slrn/slrn-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,6 @@
 
 <sect3><title>Config files</title>
-<para><userinput>$HOME/.jnewsrc, $HOME/.jnewsrc.time, $HOME/.slrnrc</userinput></para>
+<para><userinput>$HOME/.jnewsrc</userinput>,
+<userinput>$HOME/.jnewsrc.time</userinput>, <userinput>$HOME/.slrnrc</userinput></para>
 </sect3>
 
Index: basicnet/mailnews/slrn/slrn-intro.xml
===================================================================
--- basicnet/mailnews/slrn/slrn-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/mailnews/slrn/slrn-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -13,7 +13,7 @@
 the slrn distribution.</para>
 
-<para>slrn depends on:
+<screen>slrn depends on:
 <xref linkend="slang"/> and an MTA, found in <xref
-linkend="server-mail"/>.</para>
+linkend="server-mail"/>.</screen>
 
 
Index: basicnet/netprogs/cvs/cvs-config.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/cvs/cvs-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>~/.cvsrc ~/.cvswrappers</userinput></para>
+<para><userinput>~/.cvsrc</userinput>, <userinput>~/.cvswrappers</userinput></para>
 </sect3>
 
Index: basicnet/netprogs/cvs/cvs-desc.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/cvs/cvs-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,5 @@
 
 <para>The cvs package contains <userinput>cvs, cvsbug</userinput> and
-<userinput>rcs2log</userinput></para>
+<userinput>rcs2log</userinput>.</para>
 
 </sect2>
@@ -11,12 +11,12 @@
 <sect3><title>cvs</title>
 <para>This is the main program file for the concurrent versioning 
-system</para></sect3>
+system.</para></sect3>
 
 <sect3><title>cvsbug</title>
 <para>This is used to send problem reports about CVS to a central
-support site</para></sect3>
+support site.</para></sect3>
 
 <sect3><title>rcs2log</title>
-<para>RCS to ChangeLog generator</para></sect3>
+<para>RCS to ChangeLog generator.</para></sect3>
 
 </sect2>
Index: basicnet/netprogs/inetutils/inetutils-desc.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/inetutils/inetutils-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -9,62 +9,62 @@
 
 <sect3><title>ftp</title>
-<para>ARPANET file transfer program</para></sect3>
+<para>ARPANET file transfer program.</para></sect3>
 
 <sect3><title>logger</title>
-<para>make entries in the system log</para></sect3>
+<para>make entries in the system log.</para></sect3>
 
 <sect3><title>ping</title>
-<para>send ICMP ECHO_REQUEST packets to network hosts</para></sect3>
+<para>send ICMP ECHO_REQUEST packets to network hosts.</para></sect3>
 
 <sect3><title>rcp</title>
-<para>remote file copy</para></sect3>
+<para>remote file copy.</para></sect3>
 
 <sect3><title>rlogin</title>
-<para>remote login</para></sect3>
+<para>remote login.</para></sect3>
 
 <sect3><title>rsh</title>
-<para>remote shell</para></sect3>
+<para>remote shell.</para></sect3>
 
 <sect3><title>syslogd</title>
-<para>log systems messages</para></sect3>
+<para>log systems messages.</para></sect3>
 
 <sect3><title>talk</title>
-<para>talk to another user</para></sect3>
+<para>talk to another user.</para></sect3>
 
 <sect3><title>telnet</title>
-<para>user interface to the TELNET protocol</para></sect3>
+<para>user interface to the TELNET protocol.</para></sect3>
 
 <sect3><title>tftp</title>
-<para>trivial file transfer program</para></sect3>
+<para>trivial file transfer program.</para></sect3>
 
 <sect3><title>whois</title>
-<para>UNKNOWN</para></sect3>
+<para>client for whois directory service.</para></sect3>
 
 <sect3><title>ftpd</title>
-<para>DARPA Internet File Transfer Protocol server</para></sect3>
+<para>DARPA Internet File Transfer Protocol server.</para></sect3>
 
 <sect3><title>inetd</title>
-<para>internet super-server</para></sect3>
+<para>internet super-server.</para></sect3>
 
 <sect3><title>rexecd</title>
-<para>remote execution server</para></sect3>
+<para>remote execution server.</para></sect3>
 
 <sect3><title>rlogind</title>
-<para>remote login server</para></sect3>
+<para>remote login server.</para></sect3>
 
 <sect3><title>rshd</title>
-<para>remote shell server</para></sect3>
+<para>remote shell server.</para></sect3>
 
 <sect3><title>talkd</title>
-<para>remote user communication server</para></sect3>
+<para>remote user communication server.</para></sect3>
 
 <sect3><title>telnetd</title>
-<para>DARPA TELNET protocol server</para></sect3>
+<para>DARPA TELNET protocol server.</para></sect3>
 
 <sect3><title>tftpd</title>
-<para>Internet Trivial File Transfer Protocol server</para></sect3>
+<para>Internet Trivial File Transfer Protocol server.</para></sect3>
 
 <sect3><title>uucpd</title>
-<para>UNKNOWN</para></sect3>
+<para>No description available.</para></sect3>
 
 </sect2>
Index: basicnet/netprogs/ncftp/ncftp-config.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/ncftp/ncftp-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -14,5 +14,5 @@
 alter in there, including:</para>
 
-<para><userinput>yes-i-know-about-NcFTPd=yes</userinput>: This disables
+<para><userinput>yes-i-know-about-NcFTPd=yes</userinput> : This disables
 the splash screen advertising the NcFTPd server.</para>
 
Index: basicnet/netprogs/ncftp/ncftp-desc.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/ncftp/ncftp-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -10,23 +10,23 @@
 
 <sect3><title>ncftp</title>
-<para>A browser program for File Transfer Protocol</para></sect3>
+<para>A browser program for File Transfer Protocol.</para></sect3>
 
 <sect3><title>ncftpbatch</title>
-<para>Individual batch FTP job processor</para></sect3>
+<para>Individual batch FTP job processor.</para></sect3>
 
 <sect3><title>ncftpbookmarks</title>
-<para>NcFTP Bookmark Editor (NCurses-based)</para></sect3>
+<para>NcFTP Bookmark Editor (NCurses-based).</para></sect3>
 
 <sect3><title>ncftpget</title>
-<para>Internet file transfer program for scripts</para></sect3>
+<para>Internet file transfer program for scripts.</para></sect3>
 
 <sect3><title>ncftpls</title>
-<para>Internet file transfer program for scripts</para></sect3>
+<para>Internet file transfer program for scripts.</para></sect3>
 
 <sect3><title>ncftpput</title>
-<para>Internet file transfer program for scripts</para></sect3>
+<para>Internet file transfer program for scripts.</para></sect3>
 
 <sect3><title>ncftpspooler</title>
-<para>Global batch FTP job processor daemon</para></sect3>
+<para>Global batch FTP job processor daemon.</para></sect3>
 
 </sect2>
Index: basicnet/netprogs/portmap/portmap-config.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/portmap/portmap-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -8,6 +8,5 @@
 <sect3><title>Create the portmap boot script</title>
 
-<para><screen><userinput>
-cat &gt; /etc/rc.d/init.d/portmap &lt;&lt; "EOF"</userinput>
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/portmap &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/rc.d/init.d/portmap
Index: basicnet/netprogs/portmap/portmap-intro.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/portmap/portmap-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,15 +2,13 @@
 <title>Introduction to portmap</title>
 
-<screen>
-Download location (HTTP):       <ulink url="&portmap-download-http;"/>
+<screen>Download location (HTTP):       <ulink url="&portmap-download-http;"/>
+Download location (FTP):        <ulink url="&portmap-download-ftp;"/>
 Version used:                   &portmap-version;
 Package size:                   &portmap-size;
-Estimated Disk space required:  &portmap-buildsize;</screen>
-
-<para>Required patch</para>
-
+Estimated Disk space required:  &portmap-buildsize;
+Estimated build time:           &portmap-time;</screen>
 <screen>
-Download location (HTTP):        <ulink url="&portmap-patch-http;"/>
-</screen>
+Required patch:
+Download location (HTTP):        <ulink url="&portmap-patch-http;"/></screen>
 
 <para>The portmap package is a more secure replacement for the
Index: basicnet/netprogs/portmap/portmap.ent
===================================================================
--- basicnet/netprogs/portmap/portmap.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/portmap/portmap.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -7,7 +7,6 @@
 <!ENTITY portmap-buildsize "250 KB">
 <!ENTITY portmap-version "5">
-
-<!ENTITY portmap-download-http
-"http://files.ichilton.co.uk/nfs/portmap_5.orig.tar.gz">
+<!ENTITY portmap-download-http "http://files.ichilton.co.uk/nfs/portmap_5.orig.tar.gz">
+<!ENTITY portmap-download-ftp "">
 <!ENTITY portmap-patch-http "http://files.ichilton.co.uk/nfs/portmap_5-1.diff.gz">
 <!ENTITY portmap-size "20 KB">
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,6 +3,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/hosts.allow, /etc/hosts.deny,
-</userinput></para>
+<para><userinput>/etc/hosts.allow</userinput>, <userinput>/etc/hosts.deny</userinput></para>
 
 <para>File protections: the wrapper, all files used by the wrapper,
@@ -14,11 +13,7 @@
 Then perform the following edits on the
 <filename>/etc/inetd.conf</filename> configuration file :
-<screen><userinput>
-finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd
-</userinput></screen>
+<screen><userinput>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</userinput></screen>
 becomes:
-<screen><userinput>
-finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd
-</userinput></screen></para>
+<screen><userinput>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</userinput></screen></para>
 <note><para>The finger server is used as an example here.</para></note>
 <para>Similar changes must be made if xinetd is used, with the
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-inst.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -1,6 +1,4 @@
 <sect2>
 <title>Installation of tcpwrappers</title>
-
-<para>.</para>
 
 <para>Install tcpwrappers with the following commands:</para>
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,15 +2,13 @@
 <title>Introduction to tcpwrappers</title>
 
-<screen>
-Download location (HTTP):       <ulink url="&tcpwrappers-download-http;"/>
+<screen>Download location (HTTP):       <ulink url="&tcpwrappers-download-http;"/>
+Download loacation (FTP):       <ulink url="&tcpwrappers-download-ftp;"/>
 Version used:                   &tcpwrappers-version;
 Package size:                   &tcpwrappers-size;
-Estimated Disk space required:  &tcpwrappers-buildsize;</screen>
-
-<para>Required patch</para>
-
+Estimated Disk space required:  &tcpwrappers-buildsize;
+Estimated build time:           &tcpwrappers-time;</screen>
 <screen>
-Download location (HTTP):        <ulink url="&tcpwrappers-patch-http;"/>
-</screen>
+Required patch:
+Download location (HTTP):        <ulink url="&tcpwrappers-patch-http;"/></screen>
 
 <para>The tcpwrappers package provides daemon wrapper programs that
Index: basicnet/netprogs/tcpwrappers/tcpwrappers.ent
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -7,6 +7,6 @@
 <!ENTITY tcpwrappers-buildsize "720 KB">
 <!ENTITY tcpwrappers-version "7.6">
-
 <!ENTITY tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_7.6.tar.gz">
+<!ENTITY tcpwrappers-download-ftp "">
 <!ENTITY tcpwrappers-patch-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_7.6.diff.gz">
 <!ENTITY tcpwrappers-size "100 KB">
Index: basicnet/netprogs/wget/wget-config.xml
===================================================================
--- basicnet/netprogs/wget/wget-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netprogs/wget/wget-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/wgetrc, ~/.wgetrc</userinput></para>
+<para><userinput>/etc/wgetrc</userinput>, <userinput>~/.wgetrc</userinput></para>
 
 <para>There are no required changes in these files.</para>
Index: basicnet/netutils/traceroute/traceroute-desc.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netutils/traceroute/traceroute-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The traceroute package contains <userinput>traceroute</userinput></para>
+<para>The traceroute package contains <userinput>traceroute</userinput>.</para>
 
 </sect2>
Index: basicnet/netutils/traceroute/traceroute-exp.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/netutils/traceroute/traceroute-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,12 +2,12 @@
 <title>Command explanations</title>
 
-<para><screen><userinput>sed 's/-o bin/-o root/' :</userinput></screen>
+<para><screen><userinput>sed 's/-o bin/-o root/'...</userinput></screen>
 Adjusts the Makefile so that the program is installed with user root instead
 of user bin (which doesn't exist on a default LFS system).</para>
 
-<para><userinput>make install: </userinput> Installs traceroute setuid root 
+<para><userinput>make install</userinput> : Installs traceroute setuid root 
 in the /usr/sbin directory. This makes it possible for all users to execute 
 traceroute. For absolute security, turn off the setuid bit in traceroute's 
-file permissions with the command 
+file permissions with the command: 
 <screen><userinput>chmod 0755 /usr/sbin/traceroute</userinput></screen></para>
 
Index: basicnet/textweb/links/links-desc.xml
===================================================================
--- basicnet/textweb/links/links-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/links/links-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The links package contains <userinput>links</userinput></para>
+<para>The links package contains <userinput>links</userinput>.</para>
 
 </sect2>
@@ -9,5 +9,5 @@
 
 <sect3><title>links</title>
-<para>links is a lynx-like alternative character mode WWW browser</para></sect3>
+<para>links is a lynx-like alternative character mode WWW browser.</para></sect3>
 
 </sect2>
Index: basicnet/textweb/links/links-intro.xml
===================================================================
--- basicnet/textweb/links/links-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/links/links-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -10,7 +10,6 @@
 <para>Links is a text-based, frame friendly,  WWW browser.</para>
 
-<screen>Links can use <xref linkend="openssl"></xref> and <xref linkend="gpm"></xref>.
-OpenSSL is needed in order to access HTTPS (i.e. secure) websites and so it is highly recommended that it is used.
-GPM provides console mouse support to links.</screen>
+<screen>Links will utilize:
+<xref linkend="openssl"></xref> and <xref linkend="gpm"></xref></screen>
 
 </sect2>
Index: basicnet/textweb/lynx/lynx-config.xml
===================================================================
--- basicnet/textweb/lynx/lynx-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/lynx/lynx-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -9,5 +9,5 @@
 
 <para>Various settings such as proxies can be set in the system-wide
-lynx.cfg file found in /etc</para>
+lynx.cfg file found in /etc.</para>
 </sect3>
 
Index: basicnet/textweb/lynx/lynx-desc.xml
===================================================================
--- basicnet/textweb/lynx/lynx-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/lynx/lynx-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The lynx package contains <userinput>lynx</userinput></para>
+<para>The lynx package contains <userinput>lynx</userinput>.</para>
 
 </sect2>
Index: basicnet/textweb/lynx/lynx-exp.xml
===================================================================
--- basicnet/textweb/lynx/lynx-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/lynx/lynx-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,20 +2,20 @@
 <title>Command explanations</title>
 
-<para><userinput>--libdir=/etc :</userinput> For some reason, the
+<para><userinput>--libdir=/etc</userinput> : For some reason, the
 configure and make routine for lynx uses libdir as the prefix for the
 configuration file.  We set this to /etc so that the system wide
 configuration file is <userinput>/etc/lynx.cfg</userinput>.</para>
 
-<para><userinput>--with-ssl :</userinput> This enables support for
+<para><userinput>--with-ssl</userinput> : This enables support for
 linking SSL into lynx.</para>
 
-<para><userinput>--with-zlib :</userinput> This enables support for
+<para><userinput>--with-zlib</userinput> : This enables support for
 linking zlib into lynx.</para>
 
-<para><userinput>DOCDIR=... HELPDIR=... :</userinput> We set these
+<para><userinput>DOCDIR=... HELPDIR=...</userinput> : We set these
 variables to avoid getting the help and documentation files installed
 under /etc.</para>
 
-<para><userinput>sed... mv /etc/lynx.bak /etc/lynx.cfg :</userinput> This 
+<para><userinput>sed... mv /etc/lynx.bak /etc/lynx.cfg</userinput> : This 
 sed command changes the /etc/lynx.cfg file so it looks for the help
 files in the correct place.</para>
Index: basicnet/textweb/lynx/lynx-intro.xml
===================================================================
--- basicnet/textweb/lynx/lynx-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/lynx/lynx-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -10,7 +10,6 @@
 <para>Lynx is a text based web browser.</para>
 
-<screen>lynx can use <xref linkend="openssl"></xref>.  
-OpenSSL is needed in order to access HTTPS (i.e. secure) websites and so it 
-is highly recommended that it is used.</screen>
+<screen>lynx depends on:
+<xref linkend="openssl"></xref></screen>
 
 </sect2>
Index: basicnet/textweb/w3m/w3m-exp.xml
===================================================================
--- basicnet/textweb/w3m/w3m-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ basicnet/textweb/w3m/w3m-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>./configure -yes :</userinput> Set all parameters to
+<para><userinput>./configure -yes</userinput> : Set all parameters to
 their default values.</para>
 
-<para><userinput>-lang=en :</userinput> Set the default language to
+<para><userinput>-lang=en</userinput> : Set the default language to
 English.</para>
 
-<para><userinput>-model=monster :</userinput> This sets the build model
+<para><userinput>-model=monster</userinput> : This sets the build model
 to monster. Alternative build models are discussed above.</para>
 
Index: connect/dhcp/bootscripts.xml
===================================================================
--- connect/dhcp/bootscripts.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ connect/dhcp/bootscripts.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,8 +4,8 @@
 
 <sect2><title>Config files</title>
-<para><userinput>/etc/sysconfig/network, 
-/etc/sysconfig/network-devices/ifup-eth0,
-/etc/sysconfig/network-devices/ifdown-eth0,
-/etc/sysconfig/network-devices/ifconfig.eth0</userinput></para>
+<para><userinput>/etc/sysconfig/network</userinput>,
+<userinput>/etc/sysconfig/network-devices/ifup-eth0</userinput>,
+<userinput>/etc/sysconfig/network-devices/ifdown-eth0</userinput>,
+<userinput>/etc/sysconfig/network-devices/ifconfig.eth0</userinput></para>
 </sect2>
 
Index: connect/dialup/wvdial/wvdial-config.xml
===================================================================
--- connect/dialup/wvdial/wvdial-config.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ connect/dialup/wvdial/wvdial-config.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -8,11 +8,12 @@
 <sect3><title>Configuration Information</title>
 
-<para><userinput>wvdialconf /etc/wvdial.conf</userinput></para>
-<para>wvdialconf will test that you have a working modem, try and determine 
+<para><screen><userinput>wvdialconf /etc/wvdial.conf</userinput></screen>
+wvdialconf will test that you have a working modem, try and determine 
 it's exact setup and then ask you some questions regarding your ISPs phone 
 number etc.  You will then need to enter that information into the
 <filename>/etc/wvdial.conf</filename> file.</para>
 
-<para>You then start wvdial with: <userinput>wvdial</userinput>.</para>
+<para>You then start wvdial with:
+<screen><userinput>wvdial</userinput>.</screen></para>
 
 <para>For more information examine the
Index: connect/dialup/wvdial/wvdial-desc.xml
===================================================================
--- connect/dialup/wvdial/wvdial-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ connect/dialup/wvdial/wvdial-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -13,5 +13,5 @@
 
 <sect3><title>wvdialconf</title>
-<para>Automates the configuration of wvdial</para></sect3>
+<para>Automates the configuration of wvdial.</para></sect3>
 
 </sect2>
Index: connect/dialup/wvdial/wvdial-intro.xml
===================================================================
--- connect/dialup/wvdial/wvdial-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ connect/dialup/wvdial/wvdial-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -12,6 +12,6 @@
 without the fuss and hassle of chat issues, then you'll want this.</para>
 
-<screen>wvdial needs <xref linkend="wvstreams"/> to compile and run and <xref
-linkend="ppp"/> to run.</screen>
+<screen>wvdial depends on:
+<xref linkend="wvstreams"/> and <xref linkend="ppp"/></screen>
 
 </sect2>
Index: general/genutils/bc/bc-intro.xml
===================================================================
--- general/genutils/bc/bc-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/genutils/bc/bc-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -13,4 +13,4 @@
 
 <screen>bc depends on:
-<xref linkend="readline"/>
+<xref linkend="readline"/></screen>
 </sect2>
Index: general/prog/gcc/gnat-intro.xml
===================================================================
--- general/prog/gcc/gnat-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/gcc/gnat-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,6 @@
 <title>Introduction to gnat (binary version)</title>
 
-<screen>Download location (FTP):        <ulink url="&gnat-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&gnat-download-http;"/>
+Download location (FTP):        <ulink url="&gnat-download-ftp;"/>
 Version used:                   &gnat-version;
 Package size:                   &gnat-size;
Index: general/prog/gcc2/gcc2.ent
===================================================================
--- general/prog/gcc2/gcc2.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/gcc2/gcc2.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -7,5 +7,4 @@
 <!ENTITY gcc2-version "2.95.3">
 <!ENTITY gcc2-download-ftp "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc2-version;.tar.gz">
-
-
+<!ENTITY gcc2-download-http "http://ftp.gnu.org/gnu/gcc/gcc-&gcc2-version;.tar.gz">
 <!ENTITY gcc2-size "7 MB">
Index: general/prog/jdk/j2sdk-exp.xml
===================================================================
--- general/prog/jdk/j2sdk-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/jdk/j2sdk-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,56 +2,51 @@
 <title>Command explanations</title>
 
-<para><userinput>T=`grep...:</userinput> Determines the part where the tarfile begins in the self extracting archive.</para>
+<para><userinput>T=`grep...</userinput> : Determines the part where the tarfile begins in the self extracting archive.</para>
 
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch:</userinput>
-Patch to fix duplicate messages in the intl files.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch:</userinput>
-Patch to add missing libs to fix unresolved symbols.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch:</userinput>
-The build wants the binaries in specific locations, this patch modifies this to use the current PATH environment to find binaries.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch:</userinput>
-Patch to fix syntax for gcc3.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch:</userinput>
-Patch to rename the internal motif library to avoid conflicts with an incompatible system installed version.</para>
+<para><userinput>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</userinput> : Patch to fix duplicate messages in the intl files.</para>
+<para><userinput>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</userinput> : Patch to add missing libs to fix unresolved symbols.</para>
+<para><userinput>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch</userinput> : The build wants the binaries in specific locations, this patch modifies this to use the current PATH environment to find binaries.</para>
+<para><userinput>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</userinput> : Patch to fix syntax for gcc3.</para>
+<para><userinput>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch</userinput> : Patch to rename the internal motif library to avoid conflicts with an incompatible system installed version.</para>
 
-<para><userinput>export ALT_BOOTDIR="$JAVA_HOME" :</userinput> This
+<para><userinput>export ALT_BOOTDIR="$JAVA_HOME"</userinput> : This
 var sets location of the bootstrap JDK.
 </para>
 
-<para><userinput>export ALT_MOZILLA_PATH=$PWD :</userinput> This sets the
+<para><userinput>export ALT_MOZILLA_PATH=$PWD</userinput> : This sets the
 variable that points to where you unzipped the mozilla headers.</para>
 
-<para><userinput>export ALT_DEVTOOLS_PATH="/usr/bin" :</userinput> This
+<para><userinput>export ALT_DEVTOOLS_PATH="/usr/bin"</userinput> : This
 changes the location where the build finds the needed executables.
 </para>
 
-<para><userinput>export BUILD_NUMBER="blfs-`date +%s`" :</userinput> This will
+<para><userinput>export BUILD_NUMBER="blfs-`date +%s`"</userinput> : This will
 help you identify this compiled version of the runtime environment and
 virtual machine by appending this information to the version in the
 output to "java -version".</para>
 
-<para><userinput>export DEV_ONLY=true :</userinput> This command
+<para><userinput>export DEV_ONLY=true</userinput> : This command
 eliminates compiling the documentation and eliminates a dependency for
 rpm. </para>
 
-<para><userinput>unset JAVA_HOME :</userinput> This clears the JAVA_HOME
+<para><userinput>unset JAVA_HOME</userinput> : This clears the JAVA_HOME
 variable and prevents misdirection during compile.</para>
 
-<para><userinput>unset CLASSPATH :</userinput> This clears the CLASSPATH
+<para><userinput>unset CLASSPATH</userinput> : This clears the CLASSPATH
 variable and prevents misdirection during compile.</para>
 
-<para><userinput>unset CFLAGS... :</userinput> These flags cause miscompilation
+<para><userinput>unset CFLAGS...</userinput> : These flags cause miscompilation
 of the build. Never set these.
 </para>
 
-<para><userinput>export INSANE=true:</userinput> Unless you specify that you
+<para><userinput>export INSANE=true</userinput> : Unless you specify that you
 are insane the build will not proceed. The certified platform for the build is
 Redhat 6.1. The above variable ensures that all the errors related to
 compiling on a non-certified platform will be converted to warnings.</para>
 
-<para><userinput>export MAKE_VERBOSE=true:</userinput> Allows the current
+<para><userinput>export MAKE_VERBOSE=true</userinput> : Allows the current
 compilation command to be displayed on the console.</para>
 
-<para><userinput>export ALT_CACERTS_FILE...: </userinput> Specifies the certificate
+<para><userinput>export ALT_CACERTS_FILE...</userinput> : Specifies the certificate
 file to use.</para>
 
Index: general/prog/jdk/j2sdk-intro.xml
===================================================================
--- general/prog/jdk/j2sdk-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/jdk/j2sdk-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,4 +3,5 @@
 
 <screen>Download location (HTTP):       <ulink url="&j2sdk-download-http;"/>
+Download location (FTP):        <ulink url="&j2sdk-download-ftp;"/>
 Version used (binary):          &j2sdk-bin-version;
 Version used (source):          &j2sdk-src-version;
@@ -44,5 +45,6 @@
 
 <screen>j2sdk depends on:
-<xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="cpio"/>, <xref linkend="tcsh"/>, <xref linkend="gcc2"/></screen>
+<xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref linkend="unzip"/>, 
+<xref linkend="cpio"/>, <xref linkend="tcsh"/> and <xref linkend="gcc2"/></screen>
 
 </sect2>
Index: general/prog/jdk/j2sdk.ent
===================================================================
--- general/prog/jdk/j2sdk.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/jdk/j2sdk.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -11,4 +11,5 @@
 <!ENTITY j2sdk-src-version "1.4.1">
 <!ENTITY j2sdk-download-http "http://freshmeat.net/projects/sunjdk">
+<!ENTITY j2sdk-download-ftp "">
 <!ENTITY j2sdk-time "169.12 SBU">
 
Index: general/prog/librep/librep-exp.xml
===================================================================
--- general/prog/librep/librep-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/librep/librep-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--libexec=/usr/lib :</userinput> This command installs
+<para><userinput>--libexec=/usr/lib</userinput> : This command installs
 files to <filename>/usr/lib/rep</filename> instead of
 <filename>/user/libexec/rep</filename>.</para>
Index: general/prog/python/python-intro.xml
===================================================================
--- general/prog/python/python-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/prog/python/python-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -13,5 +13,6 @@
 prototyping large programs or developing them entirely.</para>
 
-<screen>Python will utilize: <xref linkend="expat"/>.</screen>
+<screen>Python will utilize:
+<xref linkend="expat"/></screen>
 
 </sect2>
Index: general/sysutils/cpio/cpio-exp.xml
===================================================================
--- general/sysutils/cpio/cpio-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/sysutils/cpio/cpio-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>--libexec=/usr/bin :</userinput> This command installs
+<para><userinput>--libexec=/usr/bin</userinput> : This command installs
 rmt to <filename>/usr/sbin</filename> instead of
 <filename>/usr/libexec</filename>.</para>
 
-<para><userinput>--bindir=/bin :</userinput> This command installs
+<para><userinput>--bindir=/bin</userinput> : This command installs
 cpio to <filename>/bin</filename> instead of
 <filename>/usr/bin</filename> as per FHS guidelines.</para>
Index: general/sysutils/fcron/fcron-exp.xml
===================================================================
--- general/sysutils/fcron/fcron-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ general/sysutils/fcron/fcron-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,5 +3,5 @@
 
 <para><userinput>--with-dsssl-dir=/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;
-:</userinput> Can be added IF you have installed openjade and dsssl-stylesheets.</para>
+</userinput> : Can be added IF you have installed openjade and dsssl-stylesheets.</para>
 
 <!--
Index: gnome/lib/gtk-doc/gtk-doc-intro.xml
===================================================================
--- gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -21,5 +21,5 @@
 
 <screen>gtk-doc depends on:
-<xref linkend="openjade"/>, <xref linkend="libxslt"/>, <xref linkend="DocBook"/>, <xref linkend="sgml-dtd-3"/>, and <xref linkend="sgml-dtd"/></screen>
+<xref linkend="openjade"/>, <xref linkend="libxslt"/>, <xref linkend="DocBook"/>, <xref linkend="sgml-dtd-3"/> and <xref linkend="sgml-dtd"/></screen>
 
 </sect2>
Index: gnome/otherlibs/bonobo-conf/bonobo-conf-exp.xml
===================================================================
--- gnome/otherlibs/bonobo-conf/bonobo-conf-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/bonobo-conf/bonobo-conf-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install bonobo-conf in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install bonobo-conf in the Gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/bonobo-conf/bonobo-conf-inst.xml
===================================================================
--- gnome/otherlibs/bonobo-conf/bonobo-conf-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/bonobo-conf/bonobo-conf-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install bonobo-conf by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome &amp;&amp;
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/gal/gal-exp.xml
===================================================================
--- gnome/otherlibs/gal/gal-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/gal/gal-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install gal in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install gal in the Gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/gnome-print/gnome-print-exp.xml
===================================================================
--- gnome/otherlibs/gnome-print/gnome-print-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/gnome-print/gnome-print-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--with-zlib=/usr :</userinput> Configure gnome-print
+<para><userinput>--with-zlib=/usr</userinput> : Configure gnome-print
 to usr the system installed zlib.
 </para>
Index: gnome/otherlibs/gnome-print/gnome-print-inst.xml
===================================================================
--- gnome/otherlibs/gnome-print/gnome-print-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/gnome-print/gnome-print-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install gnome-print by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome --with-zlib=/usr &amp;&amp;
-    make &amp;&amp;
-    make install
-</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/opt/gnome --with-zlib=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml-exp.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/gtkhtml/gtkhtml-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install gtkhtml in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install gtkhtml in the Gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml-inst.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/gtkhtml/gtkhtml-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install gtkhtml by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome &amp;&amp;
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml-intro.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/gtkhtml/gtkhtml-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to gtkhtml-&gtkhtml-version;(Gnome 1.4)</title>
+<title>Introduction to gtkhtml-&gtkhtml-version;</title>
 
 <screen>Download location (HTTP):       <ulink url="&gtkhtml-download-http;"/>
@@ -11,7 +11,6 @@
 rendering/printing/editing engine.</para>
 
-<para>gtkhtml depends on <xref linkend="gal"></xref>,
-<xref linkend ="libglade"></xref> and
-<xref linkend="libcapplet"></xref>.</para>
+<screen>gtkhtml depends on:
+<xref linkend="gal"></xref>, <xref linkend ="libglade"></xref> and <xref linkend="libcapplet"></xref>.</screen>
 
 </sect2>
Index: gnome/otherlibs/guppi/guppi-exp.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/guppi/guppi-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install Guppi in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install Guppi in the Gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/guppi/guppi-inst.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/guppi/guppi-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install Guppi by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome &amp;&amp;
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/libcapplet/libcapplet-desc.xml
===================================================================
--- gnome/otherlibs/libcapplet/libcapplet-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libcapplet/libcapplet-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libcapplet package contains a control panel applet library</para>
+<para>The libcapplet package contains a control panel applet library.</para>
 
 </sect2>
Index: gnome/otherlibs/libcapplet/libcapplet-exp.xml
===================================================================
--- gnome/otherlibs/libcapplet/libcapplet-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libcapplet/libcapplet-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install libcapplet in the gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install libcapplet in the gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/libcapplet/libcapplet-inst.xml
===================================================================
--- gnome/otherlibs/libcapplet/libcapplet-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libcapplet/libcapplet-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install libcapplet by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome &amp;&amp;
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install 
-</userinput></screen></para>
+make install </userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/libghttp/libghttp-exp.xml
===================================================================
--- gnome/otherlibs/libghttp/libghttp-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libghttp/libghttp-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install libghttp in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install libghttp in the Gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/libghttp/libghttp-inst.xml
===================================================================
--- gnome/otherlibs/libghttp/libghttp-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libghttp/libghttp-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install libghttp by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome &amp;&amp;
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/libglade14/libglade14-exp.xml
===================================================================
--- gnome/otherlibs/libglade14/libglade14-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libglade14/libglade14-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,9 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>--enable-bonobo:</userinput>
-Enable bonobo support.</para>
+<para><userinput>--enable-bonobo</userinput> : Enable bonobo support.</para>
 
-<para><userinput>--enable-gnomedb:</userinput>
-Enable gnomedb support.</para>
+<para><userinput>--enable-gnomedb</userinput> : Enable gnomedb support.</para>
 
 </sect2>
Index: gnome/otherlibs/libglade14/libglade14-inst.xml
===================================================================
--- gnome/otherlibs/libglade14/libglade14-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/libglade14/libglade14-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install libglade by running the following commands:</para>
 
-<para><screen><userinput>
-./configure  --prefix=/opt/gnome --enable-bonobo --enable-gnomedb &amp;&amp;
+<para><screen><userinput>./configure  --prefix=/opt/gnome --enable-bonobo --enable-gnomedb &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: gnome/otherlibs/soup/soup-exp.xml
===================================================================
--- gnome/otherlibs/soup/soup-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/soup/soup-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install Soup in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install Soup in the Gnome 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/soup/soup-inst.xml
===================================================================
--- gnome/otherlibs/soup/soup-inst.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ gnome/otherlibs/soup/soup-inst.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,9 +4,7 @@
 <para>Install Soup by running the following commands:</para>
 
-<para><screen><userinput>
-./configure --prefix=/opt/gnome &amp;&amp;
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: index.xml
===================================================================
--- index.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ index.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030405">
-<!ENTITY releasedate "April 5th, 2003">
+<!ENTITY version "20030406">
+<!ENTITY releasedate "April 6th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: xsoft/graphweb/mozilla/mozilla-intro.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/graphweb/mozilla/mozilla-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Introduction to mozilla</title>
 
-<screen>
-Download location (HTTP):       <ulink url="&mozilla-download-http;"/>
+<screen>Download location (HTTP):       <ulink url="&mozilla-download-http;"/>
 Download location (FTP):        <ulink url="&mozilla-download-ftp;"/>
 Version used:                   &mozilla-version;
@@ -17,15 +16,8 @@
 
 <screen>mozilla depends on:
-	<xref linkend="freetype2"/>,
-	<xref linkend="xfree86"/>,
-	<xref linkend="zip"/>,
-	<xref linkend="GLib2"/>,
-	<xref linkend="GTK2"/>,
-	<xref linkend="libIDL"/>,
-	<xref linkend="lcms"/>,
-	<xref linkend="libjpeg"/>,
-	<xref linkend="libmng"/>,
-	<xref linkend="libpng"/>. 
-	<xref linkend="which"/></screen>
+<xref linkend="freetype2"/>, <xref linkend="xfree86"/>,	<xref linkend="zip"/>,
+<xref linkend="GLib2"/>, <xref linkend="GTK2"/>, <xref linkend="libIDL"/>,
+<xref linkend="lcms"/>, <xref linkend="libjpeg"/>, <xref linkend="libmng"/>,
+<xref linkend="libpng"/> and <xref linkend="which"/></screen>
 
 <para>Download the patch for various fixes to the build from
Index: xsoft/office/evolution/evolution-exp.xml
===================================================================
--- xsoft/office/evolution/evolution-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/office/evolution/evolution-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,9 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Install Evolution in the Gnome 1.4 area.</para>
+<para><userinput>--prefix=/opt/gnome</userinput> : Install Evolution in the Gnome 1.4 area.</para>
 
-<para><userinput>--with-db3=/tmp/db-3.1:</userinput>
-db-&db-3.1-version; must be installed prior to building Evolution, but should
+<para><userinput>--with-db3=/tmp/db-3.1</userinput> : db-&db-3.1-version; must be installed prior to building Evolution, but should
 not overwrite an existing installation of the Berkely Database.
 Installing db-&db-3.1-version; in a temporary directory is all that is needed
Index: xsoft/office/evolution/evolution-intro.xml
===================================================================
--- xsoft/office/evolution/evolution-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/office/evolution/evolution-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -12,10 +12,6 @@
 
 <screen>evolution depends on:
-<xref linkend="db-3.1"></xref>
-<xref linkend="bonobo14"></xref>
-<xref linkend="bonobo-conf"></xref>
-<xref linkend="gal"></xref>
-<xref linkend="libcapplet"></xref>
-<xref linkend="gtkhtml"></xref>
+<xref linkend="db-3.1"></xref>, <xref linkend="bonobo14"></xref>, <xref linkend="bonobo-conf"></xref>,
+<xref linkend="gal"></xref>, <xref linkend="libcapplet"></xref>, <xref linkend="gtkhtml"></xref> and 
 <xref linkend="soup"></xref>
 
Index: xsoft/office/gimp/gimp-desc.xml
===================================================================
--- xsoft/office/gimp/gimp-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/office/gimp/gimp-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -4,5 +4,5 @@
 <para>The gimp package contains <userinput>gimp</userinput>,
 <userinput>escputil</userinput>, <userinput>gimp-config</userinput>
-and <userinput>gimp-remote</userinput></para>
+and <userinput>gimp-remote</userinput>.</para>
 
 </sect2>
Index: xsoft/office/gnucash/gnucash-exp.xml
===================================================================
--- xsoft/office/gnucash/gnucash-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/office/gnucash/gnucash-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,14 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome:</userinput>
-Version &gnucash-version; of GnuCash is a gnome 1.4 application.
+<para><userinput>--prefix=/opt/gnome</userinput> : Version &gnucash-version; of GnuCash is a gnome 1.4 application.
 </para>
 
-<para><userinput>
-sed 's/^GTKHTML_LIBS.*$/GTKHTML_LIBS=\`pkg-config --libs gtkhtml-1.1\`/' \configure | \
+<para><screen><userinput>sed 's/^GTKHTML_LIBS.*$/GTKHTML_LIBS=\`pkg-config --libs gtkhtml-1.1\`/' \configure | \
 sed 's/^GTKHTML_CFLAGS.*$/GTKHTML_CFLAGS=\`pkg-config --cflags gtkhtml-1.1\`/' > configure.new &amp;&amp;
 cp configure.new configure &amp;&amp;
-</userinput></para>
-<para>
+</userinput></screen>
 The configure script for GnuCash 1.6.8 is expecting to find
 gtkhtml-1.0.4, which we are not installing.  gtkhtml-1.1.7 will work
Index: xsoft/office/gnucash/gnucash-intro.xml
===================================================================
--- xsoft/office/gnucash/gnucash-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/office/gnucash/gnucash-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -11,17 +11,8 @@
 <para>
 <screen>gnucash depends on:
-<xref linkend="gnome-print"></xref>
-<xref linkend="libglade14"></xref>
-<xref linkend="db-3.3"></xref>
-<xref linkend="gal"></xref>
-<xref linkend="libcapplet"></xref>
-<xref linkend="gtkhtml"></xref>
-<xref linkend="libghttp"></xref>
-<xref linkend="bonobo14"></xref>
-<xref linkend="guppi"></xref>
-<xref linkend="guile"></xref>
-<xref linkend="slib"></xref>
-<xref linkend="gwrap"></xref>
-</screen>
+<xref linkend="gnome-print"></xref>, <xref linkend="libglade14"></xref>, <xref linkend="db-3.3"></xref>,
+<xref linkend="gal"></xref>, <xref linkend="libcapplet"></xref>, <xref linkend="gtkhtml"></xref>,
+<xref linkend="libghttp"></xref>, <xref linkend="bonobo14"></xref>, <xref linkend="guppi"></xref>,
+<xref linkend="guile"></xref>, <xref linkend="slib"></xref> and <xref linkend="gwrap"></xref></screen>
 </para>
 </sect2>
Index: xsoft/other/balsa/balsa-desc.xml
===================================================================
--- xsoft/other/balsa/balsa-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/other/balsa/balsa-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The Balsa package contains <userinput>balsa</userinput></para>
+<para>The Balsa package contains <userinput>balsa</userinput>.</para>
 
 </sect2>
Index: xsoft/other/balsa/balsa-exp.xml
===================================================================
--- xsoft/other/balsa/balsa-exp.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/other/balsa/balsa-exp.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--with-ssl:</userinput>
-Change the Balsa default of no ssl support.</para>
+<para><userinput>--with-ssl</userinput> : Change the Balsa default of no ssl support.</para>
 
 </sect2>
Index: xsoft/other/balsa/balsa-intro.xml
===================================================================
--- xsoft/other/balsa/balsa-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/other/balsa/balsa-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -11,9 +11,7 @@
 
 <screen>Balsa depends on:
-<xref linkend="libgtkhtml"/>, <xref linkend="libgnome"/>, <xref
-linkend="openssl"/>, <xref linkend="aspell"/> and <xref linkend="libesmtp"/>. 
-</screen>
-
-<screen>Balsa will utilize:
+<xref linkend="libgtkhtml"/>, <xref linkend="libgnome"/>, <xref linkend="openssl"/>, 
+<xref linkend="aspell"/> and <xref linkend="libesmtp"/>
+Balsa will utilize:
 <xref linkend="pcre"/>.
 </screen>
Index: xsoft/other/balsa/balsa.ent
===================================================================
--- xsoft/other/balsa/balsa.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/other/balsa/balsa.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -8,4 +8,4 @@
 <!ENTITY balsa-version "2.0.7">
 <!ENTITY balsa-download-http "http://balsa.gnome.org/balsa-&balsa-version;.tar.bz2">
-<!ENTITY balsa-download-ftp "N/A">
+<!ENTITY balsa-download-ftp "">
 <!ENTITY balsa-size "2.4MB">
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/suites/koffice.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -12,5 +12,6 @@
 Installed space:        35 MB</screen></para>
 
-<para><screen>KOffice depends on: <xref linkend="kde-base"/>.</screen></para>
+<screen>KOffice depends on:
+<xref linkend="kde-base"/>.</screen>
 
 <para>KOffice also has many internationalization packages in the form of:
Index: xsoft/suites/openoffice/openoffice-desc.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-desc.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/suites/openoffice/openoffice-desc.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -2,5 +2,7 @@
 <title>Contents</title>
 
-<para>The openoffice package contains <userinput>swriter</userinput>, <userinput>simpress</userinput>, <userinput>scalc</userinput>, <userinput>sdraw</userinput>, <userinput>smath</userinput>.</para>
+<para>The openoffice package contains <userinput>swriter</userinput>,
+<userinput>simpress</userinput>, <userinput>scalc</userinput>,
+<userinput>sdraw</userinput> and <userinput>smath</userinput>.</para>
 
 </sect2>
Index: xsoft/suites/openoffice/openoffice-intro.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-intro.xml	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/suites/openoffice/openoffice-intro.xml	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -3,4 +3,5 @@
 
 <screen>Download location (HTTP):       <ulink url="&openoffice-download-http;"/>
+Download location (FTP):        <ulink url="&openoffice-download-ftp;"/>
 Version used:                   &openoffice-version;
 Package size:                   &openoffice-size;
@@ -13,16 +14,10 @@
 
 <screen>openoffice depends on:
-   <xref linkend="freetype2"/>
-   <xref linkend="xfree86"/>
-   <xref linkend="j2sdk"/>
-   <xref linkend="zip"/>
-   <xref linkend="unzip"/>
-   <xref linkend="tcsh"/>
-   <xref linkend="db"/>
-   <xref linkend="STLport"/>
-   <xref linkend="which"/>
-   mktemp
+<xref linkend="freetype2"/>, <xref linkend="xfree86"/>, <xref linkend="j2sdk"/>,
+<xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="tcsh"/>,
+<xref linkend="db"/>, <xref linkend="STLport"/>, <xref linkend="which"/>
+and mktemp
 openoffice will utilize:
-   ant
+ant
 </screen>
 
Index: xsoft/suites/openoffice/openoffice.ent
===================================================================
--- xsoft/suites/openoffice/openoffice.ent	(revision d10f793de0e2d08064a70d9dab42d36eb3b9174d)
+++ xsoft/suites/openoffice/openoffice.ent	(revision 03cbf552d535a97841bc07b62e35b8b0302b39ba)
@@ -7,4 +7,5 @@
 <!ENTITY openoffice-version "1.0.2">
 <!ENTITY openoffice-download-http "http://sf1.mirror.openoffice.org/stable/&openoffice-version;/OOo_&openoffice-version;_source.tar.bz2">
+<!ENTITY openoffice-download-ftp "">
 <!ENTITY openoffice-buildtime "14 Hrs (850 MHz)">
 <!ENTITY openoffice-installsize "203 MB">
