diff --git a/content/web/proftpd.xml b/content/web/proftpd.xml
index 28d2cc849a..7d2253f9e4 100644
--- a/content/web/proftpd.xml
+++ b/content/web/proftpd.xml
@@ -51,8 +51,8 @@ useradd -c proftpd -d /home/ftp -g proftpd -s /bin/false proftpd</command>
 <para>Install <application>ProFTPD</application> by running the following commands:</para>
 
 <screen><userinput><command>install_user=proftpd install_group=proftpd \
-&nbsp;&nbsp;&nbsp;./configure --prefix=/usr --sysconfdir=/etc \
-&nbsp;&nbsp;&nbsp;--localstatedir=/var/run &amp;&amp;
+    ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var/run &amp;&amp;
 make &amp;&amp;
 make install </command></userinput></screen>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2d5f6f33d6..73b8799c6c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -18,6 +18,9 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>June 17th, 2004 [randy]: replaced all non-breaking spaces 
+(&amp;nbsp;) with regular spaces inside &lt;pre&gt; tags.</para></listitem>
+
 <listitem><para>June 17th, 2004 [randy]: updated to GIMP-2.0.2.</para></listitem>
 
 <listitem><para>June 17th, 2004 [randy]: updated to vim-6.3.</para></listitem>
diff --git a/postlfs/config/bootdisk.xml b/postlfs/config/bootdisk.xml
index 884f971f36..99d4cb57e2 100644
--- a/postlfs/config/bootdisk.xml
+++ b/postlfs/config/bootdisk.xml
@@ -255,15 +255,15 @@ set.</para>
 
 <screen><userinput><command>mkdir /mnt/loop1/dev/pts
 cp -a \ 
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/null /dev/console \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/fb[0-7] /dev/fd /dev/fd0 /dev/fd0h1440 /dev/full \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/hda* /dev/hdb* /dev/hdc* /dev/hdd* /dev/initctl /dev/kmem \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/loop[0-3] /dev/lp0 /dev/mem /dev/port \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/psaux /dev/ram \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/ram0 /dev/ram1 /dev/ram2 /dev/ram3 /dev/random /dev/rtc \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/shm /dev/stderr /dev/stdin /dev/stdout /dev/tty \
-&nbsp;&nbsp;&nbsp;&nbsp;/dev/tty[0-9] /dev/ttyS0 /dev/ttyS1 /dev/urandom /dev/zero \
-&nbsp;&nbsp;/mnt/loop1/dev</command></userinput></screen>
+    /dev/null /dev/console \
+    /dev/fb[0-7] /dev/fd /dev/fd0 /dev/fd0h1440 /dev/full \
+    /dev/hda* /dev/hdb* /dev/hdc* /dev/hdd* /dev/initctl /dev/kmem \
+    /dev/loop[0-3] /dev/lp0 /dev/mem /dev/port \
+    /dev/psaux /dev/ram \
+    /dev/ram0 /dev/ram1 /dev/ram2 /dev/ram3 /dev/random /dev/rtc \
+    /dev/shm /dev/stderr /dev/stdin /dev/stdout /dev/tty \
+    /dev/tty[0-9] /dev/ttyS0 /dev/ttyS1 /dev/urandom /dev/zero \
+  /mnt/loop1/dev</command></userinput></screen>
 
 <para><emphasis>What is needed in the <filename class="directory">/etc</filename>
 directory</emphasis></para>
@@ -502,11 +502,11 @@ shown next.</para>
 needed will be minimal.  You can add them to the ramdisk image with:</para>
 
 <screen><userinput><command>strip -p --strip-unneeded --remove-section=.comment \
-&nbsp;&nbsp;&nbsp;&nbsp;-o /mnt/loop1/lib/libc.so.6 /lib/libc-2.3.3.so &amp;&amp;
+    -o /mnt/loop1/lib/libc.so.6 /lib/libc-2.3.3.so &amp;&amp;
 strip -p --strip-unneeded --remove-section=.comment \
-&nbsp;&nbsp;&nbsp;&nbsp;-o /mnt/loop1/lib/ld-linux.so.2 /lib/ld-2.3.3.so &amp;&amp;
+    -o /mnt/loop1/lib/ld-linux.so.2 /lib/ld-2.3.3.so &amp;&amp;
 strip -p --strip-unneeded --remove-section=.comment \
-&nbsp;&nbsp;&nbsp;&nbsp;-o /mnt/loop1/lib/libdl.so.2 /lib/libdl-2.3.3.so &amp;&amp;
+    -o /mnt/loop1/lib/libdl.so.2 /lib/libdl-2.3.3.so &amp;&amp;
 chmod 555 /mnt/loop1/lib/{libc.so.6,ld-linux.so.2,libdl.so.2}</command></userinput></screen>  
 
 <para>Note that the above commands change the names of the libraries,
diff --git a/x/lib/qt.xml b/x/lib/qt.xml
index 4223ff0d66..30afb789de 100644
--- a/x/lib/qt.xml
+++ b/x/lib/qt.xml
@@ -123,8 +123,8 @@ export QTDIR=$PWD &amp;&amp;
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
 export PATH=$PWD/bin:$PATH &amp;&amp;
 ./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
-&nbsp;&nbsp;&nbsp;-system-libmng -system-zlib -system-libjpeg -no-exceptions \
-&nbsp;&nbsp;&nbsp;-thread -plugin-imgfmt-png &amp;&amp;
+    -system-libmng -system-zlib -system-libjpeg -no-exceptions \
+    -thread -plugin-imgfmt-png &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 ln -sfn qt-&qt-version; /opt/qt &amp;&amp;