Index: general/genlib/aspell/aspell-intro.xml
===================================================================
--- general/genlib/aspell/aspell-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/aspell/aspell-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -2,5 +2,6 @@
 <title>Introduction to aspell-&aspell-version;</title>
 
-<screen>Download location (FTP):       <ulink url="&aspell-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&aspell-download-http;"/>
+Download location (FTP):        <ulink url="&aspell-download-ftp;"/>
 Version used:                   &aspell-version;
 Package size:                   &aspell-size;
Index: general/genlib/aspell/aspell.ent
===================================================================
--- general/genlib/aspell/aspell.ent	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/aspell/aspell.ent	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -7,4 +7,5 @@
 <!ENTITY aspell-buildsize "9.4 MB">
 <!ENTITY aspell-version "0.50.3">
+<!ENTITY aspell-download-http "">
 <!ENTITY aspell-download-ftp "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
 <!ENTITY aspell-size "917 KB">
Index: general/genlib/guile/guile-intro.xml
===================================================================
--- general/genlib/guile/guile-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/guile/guile-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -12,6 +12,5 @@
 
 <screen>Guile will utilize:
- <xref linkend="readline"></xref>.
- </screen>
+<xref linkend="readline"/></screen>
 
 </sect2>
Index: general/genlib/gwrap/gwrap-exp.xml
===================================================================
--- general/genlib/gwrap/gwrap-exp.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/gwrap/gwrap-exp.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/usr:
-</userinput> Change the g-wrap default installation directory of /usr/local.</para>
+<para><userinput>--prefix=/usr</userinput> : Change the g-wrap default installation directory of /usr/local.</para>
 
 </sect2>
Index: general/genlib/gwrap/gwrap-intro.xml
===================================================================
--- general/genlib/gwrap/gwrap-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/gwrap/gwrap-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -12,5 +12,5 @@
 
 <screen>G-Wrap depends on:
-<xref linkend="guile"></xref> and <xref linkend="slib"></xref>.</screen>
+<xref linkend="guile"></xref> and <xref linkend="slib"></xref></screen>
 
 </sect2>
Index: general/genlib/libesmtp/libesmtp-intro.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/libesmtp/libesmtp-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -3,4 +3,5 @@
 
 <screen>Download location (HTTP):       <ulink url="&libesmtp-download-http;"/>
+Download location (FTP):        <ulink url="&libesmtp-download-ftp;"/>
 Version used:                   &libesmtp-version;
 Package size:                   &libesmtp-size;
Index: general/genlib/libesmtp/libesmtp.ent
===================================================================
--- general/genlib/libesmtp/libesmtp.ent	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/libesmtp/libesmtp.ent	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -8,3 +8,4 @@
 <!ENTITY libesmtp-version "0.8.12">
 <!ENTITY libesmtp-download-http "http://www.stafford.uklinux.net/libesmtp/libesmtp-1.0.tar.bz2">
+<!ENTITY libesmtp-download-ftp "">
 <!ENTITY libesmtp-size "249 KB">
Index: general/genlib/libfam/libfam-config.xml
===================================================================
--- general/genlib/libfam/libfam-config.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/libfam/libfam-config.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -7,5 +7,5 @@
  <filename>/etc/fam.conf</filename>,
  <filename>/etc/inetd.conf</filename>, 
- <filename>/etc/xinetd.d/fam</filename>,
+ <filename>/etc/xinetd.d/fam</filename>
  or <filename>/etc/xinetd.conf</filename>
  </para>
@@ -18,7 +18,6 @@
 <para>If you use inetd, add the fam entry to /etc/inetd.conf with the
 following command: </para>
-<para><userinput>
-echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/bin/fam fam" &gt;&gt; /etc/inetd.conf
-</userinput></para>
+
+<screen><userinput>echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/bin/fam fam" &gt;&gt; /etc/inetd.conf</userinput></screen>
 
 <para>
Index: general/genlib/libfam/libfam-exp.xml
===================================================================
--- general/genlib/libfam/libfam-exp.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/libfam/libfam-exp.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -3,6 +3,5 @@
 
 <para>
-<userinput>patch -Np1 -i ../dnotify.patch :</userinput>
-This patch causes fam to use the Linux kernel dnotify mechanism to
+<userinput>patch -Np1 -i ../dnotify.patch</userinput> : This patch causes fam to use the Linux kernel dnotify mechanism to
 inform the calling process of file modifications, rather than polling
 the file system for.
@@ -10,6 +9,5 @@
 
 <para>
-<userinput>patch -Np1 -i ../libfam-gcc3.patch :</userinput>
-This patch is necessary to get libfam to compile with gcc-3.2.
+<userinput>patch -Np1 -i ../libfam-gcc3.patch</userinput> : This patch is necessary to get libfam to compile with gcc-3.2.
 </para>
 
Index: general/genlib/libfam/libfam-intro.xml
===================================================================
--- general/genlib/libfam/libfam-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/libfam/libfam-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -7,14 +7,13 @@
 Package size:                   &libfam-size;
 Estimated Disk space required:  &libfam-buildsize;</screen>
+<screen>
+Required patches:
+Download location (FTP):        <ulink url="&libfam-dnotify-patch-http;"/>
+Download location (FTP):        <ulink url="&libfam-gcc3-patch-http;"/></screen>
 
-<para>Required patches</para>
-<screen>Download location (FTP):        <ulink url="&libfam-dnotify-patch-http;"/>
-Download location (FTP):        <ulink url="&libfam-gcc3-patch-http;"/>
-</screen>
+<para>The libfam package contains a File Alteration Monitor.</para>
 
-<screen>fam depends on: <xref linkend="portmap"/></screen>
-
-<para>The libfam package contains
-<userinput>fam</userinput>.</para>
+<screen>fam depends on:
+<xref linkend="portmap"/></screen>
 
 </sect2>
Index: general/genlib/slib/slib.ent
===================================================================
--- general/genlib/slib/slib.ent	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/genlib/slib/slib.ent	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -6,4 +6,4 @@
 <!ENTITY slib-version "2d5">
 <!ENTITY slib-download-http "http://www.swiss.ai.mit.edu/ftpdir/scm/slib&slib-version;.tar.gz">
-<!ENTITY slib-download-ftp "NA">
+<!ENTITY slib-download-ftp "">
 <!ENTITY slib-size "620 KB">
Index: general/prog/gcc2.xml
===================================================================
--- general/prog/gcc2.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/prog/gcc2.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -1,5 +1,5 @@
-<sect1 id="gcc2" xreflabel="gcc2-&gcc2-version;">
+<sect1 id="gcc2" xreflabel="gcc-&gcc2-version;">
 <?dbhtml filename="gcc2.html" dir="general"?>
-<title>gcc2-&gcc2-version;</title>
+<title>gcc-&gcc2-version;</title>
 
 &gcc2-intro;
Index: general/prog/gcc2/gcc2-config.xml
===================================================================
--- general/prog/gcc2/gcc2-config.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/prog/gcc2/gcc2-config.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gcc2</title>
+<title>Configuring gcc</title>
 
 <sect3><title>Configuration Information</title>
@@ -10,7 +10,7 @@
 your requirements.</para>
 
-<para>If you only need the gcc2 libraries, you may delete /opt/gcc2.</para>
+<para>If you only need the gcc-&gcc2-version; libraries, you may delete /opt/gcc2.</para>
 
-<para>Whenever you need to use gcc2 instead of you system installed compiler,
+<para>Whenever you need to use gcc-&gcc2-version; instead of you system installed compiler,
 add <userinput>/opt/gcc2/bin</userinput> to the front of your PATH before compiling the concerned
 package.</para>
Index: general/prog/gcc2/gcc2-desc.xml
===================================================================
--- general/prog/gcc2/gcc2-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/prog/gcc2/gcc2-desc.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The gcc2 package contains the <userinput>gcc2 c and c++ compilers</userinput>
-and <userinput>gcc2
+<para>The gcc-&gcc2-version package contains the
+<userinput>gcc-&gcc2-version; c and c++ compilers</userinput>
+and <userinput>gcc-&gcc2-version;
 libstdc++.so</userinput> that is required by some commercial and pre-compiled
 packages.</para>
Index: general/prog/gcc2/gcc2-inst.xml
===================================================================
--- general/prog/gcc2/gcc2-inst.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/prog/gcc2/gcc2-inst.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of gcc2</title>
+<title>Installation of gcc</title>
 
 <para>Apply the two patches, one to fix compilation and the other to stop the
Index: general/prog/gcc2/gcc2-intro.xml
===================================================================
--- general/prog/gcc2/gcc2-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
+++ general/prog/gcc2/gcc2-intro.xml	(revision f22f96e90f0895e9096f0d535990fb6ff24d9631)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to gcc2-&gcc2-version;</title>
+<title>Introduction to gcc-&gcc2-version;</title>
 
 <screen>Download location (FTP):       <ulink url="&gcc2-download-ftp;"/>
@@ -7,10 +7,10 @@
 Estimated Disk space required: &gcc2-buildsize;</screen>
 
-<para>There are two reasons for installing gcc2. The first is that the kernel
-developers have certified gcc2 as the preferred compiler for compiling the
+<para>There are two reasons for installing gcc-&gcc2-version;. The first is that the kernel
+developers have certified gcc-&gcc2-version; as the preferred compiler for compiling the
 kernel. The other (and more compelling reason) is that some
 commercial closed-source packages (such as Netscape Navigator, Yahoo Pager)
 and precompiled packages (such as Mozilla)
-are linked against gcc2 libs.</para>
+are linked against gcc-&gcc2-version libs.</para>
 
 <para>Download the gcc patches from <ulink url="&hfile-root;"/>.
