Index: basicnet/basicnet.ent
===================================================================
--- basicnet/basicnet.ent	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ basicnet/basicnet.ent	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -15,5 +15,5 @@
 %links;
 %lynx;
-%w3m
+%w3m;
 
 <!-- Basic Networking Programs -->
Index: basicnet/netprogs/portmap/portmap-config.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-config.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ basicnet/netprogs/portmap/portmap-config.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -9,5 +9,5 @@
 
 <para><screen><userinput>
-cat > /etc/rc.d/init.d/portmap << "EOF"</userinput>
+cat &gt; /etc/rc.d/init.d/portmap &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/rc.d/init.d/portmap
Index: general/genlib/libesmtp/libesmtp-intro.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-intro.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ general/genlib/libesmtp/libesmtp-intro.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to libesmtp-&libesmtp-version</title>
+<title>Introduction to libesmtp-&libesmtp-version;</title>
 
 <screen>Download location (HTTP):       <ulink url="&libesmtp-download-http;"/>
Index: general/genlib/libfam/libfam-config.xml
===================================================================
--- general/genlib/libfam/libfam-config.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ general/genlib/libfam/libfam-config.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -19,5 +19,5 @@
 following command: </para>
 <para><userinput>
-echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/bin/fam fam" >> /etc/inetd.conf
+echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/bin/fam fam" &gt;&gt; /etc/inetd.conf
 </userinput></para>
 
@@ -28,5 +28,5 @@
 <para>
 <screen><userinput>
-cat >> /etc/xinetd.conf << "EOF"
+cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
     # description: FAM - file alteration monitor
     service sgi_fam
Index: general/genlib/pspell/pspell-intro.xml
===================================================================
--- general/genlib/pspell/pspell-intro.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ general/genlib/pspell/pspell-intro.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to pspell-&pspell-version</title>
+<title>Introduction to pspell-&pspell-version;</title>
 
 <screen>Download location (HTTP):       <ulink url="&pspell-download-http;"/>
Index: general/prog/perl/perl-modules-intro.xml
===================================================================
--- general/prog/perl/perl-modules-intro.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ general/prog/perl/perl-modules-intro.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -6,5 +6,5 @@
 along with their dependencies.</para>
 
-<screen><ulink url="http://search.cpan.org/CPAN/authors/id/C/CS/CSOE/PDL-&PDL-version;.tar.gz">PDL-&PDL-version</ulink>
+<screen><ulink url="http://search.cpan.org/CPAN/authors/id/C/CS/CSOE/PDL-&PDL-version;.tar.gz">PDL-&PDL-version;</ulink>
 	<ulink url="http://search.cpan.org/CPAN/authors/id/A/AA/AALLAN/Astro-FITS-Header-Astro-FITS-Header-version;.tar.gz">Astro-FITS-Header-&Astro-FITS-Header-version;</ulink>
 <ulink url="http://search.cpan.org/CPAN/authors/id/L/LU/LUPUS/Gtk-Perl-&Gtk-Perl-version;.tar.gz">Gtk-Perl-&Gtk-Perl-version;</ulink>
Index: gnome/config/config-core.xml
===================================================================
--- gnome/config/config-core.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ gnome/config/config-core.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -5,5 +5,5 @@
 
 <para>Create an .xinitrc file to start GNOME:
-<screen><userinput>echo "export GDK_USE_XFT=1" &gt ~/.xinitrc &amp;&amp;
+<screen><userinput>echo "export GDK_USE_XFT=1" &gt; ~/.xinitrc &amp;&amp;
 echo "exec gnome-session" &gt;&gt; ~/.xinitrc</userinput></screen>
 and ensure all libraries can be found with:
Index: multimedia/audioutils/XMMS.xml
===================================================================
--- multimedia/audioutils/XMMS.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ multimedia/audioutils/XMMS.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -1,3 +1,3 @@
-<sect1 id="xmms" xreflabel="xmms-&XMMS-version">
+<sect1 id="xmms" xreflabel="xmms-&XMMS-version;">
 <?dbhtml filename="xmms.html" dir="multimedia"?>
 <title>xmms-&XMMS-version;</title>
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ postlfs/config/bootdisk.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -41,6 +41,6 @@
 <para><screen><userinput>cp -ax /etc/rc* /mnt/loop1/etc
 cp -ax /etc/fstab /mnt/loop1/etc
-echo "root:x:0:0:root:/root:/bin/bash" > /mnt/loop1/etc/passwd
-cat > /mnt/loop1/etc/group << "EOF"
+echo "root:x:0:0:root:/root:/bin/bash" &gt; /mnt/loop1/etc/passwd
+cat &gt; /mnt/loop1/etc/group &lt;&lt; "EOF"
 root:x:0:
 bin:x:1:
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ postlfs/config/random.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -34,5 +34,5 @@
 	                cat /var/tmp/random-seed >/dev/urandom
 		fi
-		dd if=/dev/urandom of=/var/tmp/random-seed count=1 &>/dev/null
+		dd if=/dev/urandom of=/var/tmp/random-seed count=1 &amp;>/dev/null
 		evaluate_retval
 		;;
@@ -40,5 +40,5 @@
 	stop)
 		echo "Saving random seed..."
-		dd if=/dev/urandom of=/var/tmp/random-seed count=1 &>/dev/null
+		dd if=/dev/urandom of=/var/tmp/random-seed count=1 &amp;>/dev/null
 		evaluate_retval
 		;;
Index: postlfs/filesystems/xfs/xfs.ent
===================================================================
--- postlfs/filesystems/xfs/xfs.ent	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ postlfs/filesystems/xfs/xfs.ent	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -13,4 +13,4 @@
 <!ENTITY xfspatch-version "2.4.19">
 <!ENTITY xfs-download-http "">
-<!ENTITY xfsprogs-download-ftp"ftp://oss.sgi.com/projects/xfs/download/Release-1.1/cmd_tars/xfsprogs-2.0.3.src.tar.gz">
-<!ENTITY xfspatch-download-ftp"ftp://oss.sgi.com/projects/xfs/download/patches/2.4.19/xfs-2.4.19-all-i386.bz2">
+<!ENTITY xfsprogs-download-ftp "ftp://oss.sgi.com/projects/xfs/download/Release-1.1/cmd_tars/xfsprogs-2.0.3.src.tar.gz">
+<!ENTITY xfspatch-download-ftp "ftp://oss.sgi.com/projects/xfs/download/patches/2.4.19/xfs-2.4.19-all-i386.bz2">
Index: postlfs/postlfs.ent
===================================================================
--- postlfs/postlfs.ent	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ postlfs/postlfs.ent	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -21,5 +21,5 @@
 <!ENTITY postlfs-security-tripwire SYSTEM "security/tripwire.xml">
 <!ENTITY % Linux_PAM SYSTEM "security/pam/linux_pam.ent">
-%Linux_PAM
+%Linux_PAM;
 <!ENTITY postlfs-security-syslog SYSTEM "security/syslog.xml">
 
Index: postlfs/security/firewalling/masqrouter.xml
===================================================================
--- postlfs/security/firewalling/masqrouter.xml	(revision 896104b161979bb29912aebcf1be09e9b47c1716)
+++ postlfs/security/firewalling/masqrouter.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
@@ -7,5 +7,5 @@
 make sure that there are no servers running on it, especially not X11 et
 al.  And, as a general principle, the box itself should not access any untrusted
-service<footnote><para>Thínk of a nameserver giving answers that make your
+service<footnote><para>Think of a nameserver giving answers that make your
 bind crash, or, even worse, that implement a worm via a 
 buffer-overflow.</para></footnote>.</para>
