Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/config/bootdisk.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -67,16 +67,8 @@
 
 <para>Next, we will install <ulink url="http://www.busybox.net/downloads/busybox-0.60.4.tar.bz2">busybox</ulink> onto the image.  Busybox incorporates many of the *nix functions into a single small executable file.</para>
-<screen><userinput>
-tar -xzvf busybox-0.60.4.tar.gz
-cd busybox-0.60.4
-make &amp;&amp;
-make PREFIX=/mnt/loop1 install
-</userinput></screen>
-
-
-<screen><userinput>
-cp -ax /var/utmp /mnt/loop1/var
-mkdir /mnt/loop1/var/log
-</userinput></screen>
+<screen><userinput>make &amp;&amp;
+make PREFIX=/mnt/loop1 install &amp;&amp;
+cp -ax /var/utmp /mnt/loop1/var &amp;&amp;
+mkdir /mnt/loop1/var/log</userinput></screen>
 <para>
 Also, keeping in mind your space limitations, copy any other binaries and libraries you 
@@ -89,29 +81,22 @@
 devices that busybox expects to find.</para>
 
-<screen><userinput>
-mv GNUmakefile Makefile
-make
-make PREFIX=/mnt/loop1 install
-cp /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /tmp
-strip --strip-deb /tmp/ld-linux.so.2 /tmp/libc.so.6 /tmp/libdl.so.2
-mv /tmp/ld-linux.so.2 /tmp/libc.so.6 /tmp/libdl.so.2 /mnt/loop1/lib/	
-</userinput></screen>
+<screen><userinput>mv GNUmakefile Makefile &amp;&amp;
+make &amp;&amp;
+make PREFIX=/mnt/loop1 install &amp;&amp;
+cp /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /tmp &amp;/&amp;
+strip --strip-deb /tmp/ld-linux.so.2 /tmp/libc.so.6 /tmp/libdl.so.2 &amp;&amp;
+mv /tmp/ld-linux.so.2 /tmp/libc.so.6 /tmp/libdl.so.2 /mnt/loop1/lib/</userinput></screen>
 <para>
 We will also need to set up an rc script to handle the devfsd startup.
 Put this in <filename>/mnt/loop1/etc/init.d/rcS</filename></para>
-<screen>
-#!/bin/sh
+<screen>#!/bin/sh
 mount -t devfs devfs /dev
-/sbin/devfsd /dev
-</screen>
+/sbin/devfsd /dev</screen>
 
 <para>
 Next create your compressed root filesystem.  We use -9 with gzip to
 make the smallest possible compressed image.</para>
-<screen><userinput>
-umount /mnt/loop1 &amp;&amp; dd if=/tmp/rfloppy bs=1k | gzip -v9 > rootfs.gz
-</userinput></screen>  
-<screen><userinput>ls -l rootfs.gz</userinput> to make sure it will fit on the diskette.
-</screen>
+<screen><userinput>umount /mnt/loop1 &amp;&amp; dd if=/tmp/rfloppy bs=1k | gzip -v9 > rootfs.gz</userinput></screen>  
+<screen><userinput>ls -l rootfs.gz</userinput> to make sure it will fit on the diskette.</screen>
 <para>
 make a custom kernel that is optimized for size.  Include only those features
Index: postlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/config/skel.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -9,5 +9,5 @@
 <filename>/usr/sbin/useradd</filename> program.</para>
 
-<para>For more information see <filename>man useradd</filename>.</para>
+<para>For more information see <userinput>man useradd</userinput>.</para>
 
 <para>To get started create a <filename>/etc/skel</filename> directory.
@@ -23,5 +23,5 @@
 parameter.  For example:</para>
 
-<para><screen>[prompt]#<userinput>useradd -m -s/bin/bash jwrober</userinput></screen></para>
+<para><screen><userinput>useradd -m -s/bin/bash jwrober</userinput></screen></para>
 
 <para>The <filename>/usr/sbin/useradd</filename> program uses a
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/config/vimrc.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -41,42 +41,32 @@
 options in this example file means here:</para>
 <itemizedlist>
-<listitem><para><userinput>set nocompatible :</userinput>
-This option stops vim from behaving in a strongly vi-compatible way.  It
+<listitem><para><userinput>set nocompatible</userinput> : This option stops vim from behaving in a strongly vi-compatible way.  It
 should be at the start of any vimrc file as it can affect lots of other
 options which you may want to override.</para></listitem>
 
-<listitem><para><userinput>set bs=2 :</userinput>
-This influences the behavior of the backspace option.  It is fairly
+<listitem><para><userinput>set bs=2</userinput> : This influences the behavior of the backspace option.  It is fairly
 complex so see <userinput>:help 'bs'</userinput> for more 
 details.</para></listitem>
 
-<listitem><para><userinput>set columns=80 :</userinput>
-This simply sets the number of columns used on the 
+<listitem><para><userinput>set columns=80</userinput> : This simply sets the number of columns used on the 
 screen.</para></listitem>
 
-<listitem><para><userinput>set background=dark :</userinput>
-This tells vim to use colors which look good on a dark 
+<listitem><para><userinput>set background=dark</userinput> : This tells vim to use colors which look good on a dark 
 background.</para></listitem>
 
-<listitem><para><userinput>set tabstop=8 :</userinput>
-The number of spaces which a tabstop takes.</para></listitem>
+<listitem><para><userinput>set tabstop=8</userinput> : The number of spaces which a tabstop takes.</para></listitem>
 
-<listitem><para><userinput>set wrapmargin=8 :</userinput>
-This is the number of characters from the right window 
+<listitem><para><userinput>set wrapmargin=8</userinput> : This is the number of characters from the right window 
 border where wrapping starts.</para></listitem>
 
-<listitem><para><userinput>set nobk :</userinput>
-This stops vim from creating a backup before 
+<listitem><para><userinput>set nobk</userinput> : This stops vim from creating a backup before 
 overwriting a file.</para></listitem>
 
-<listitem><para><userinput>syntax on :</userinput>
-Enables vim's syntax highlighting.</para></listitem>
+<listitem><para><userinput>syntax on</userinput> : Enables vim's syntax highlighting.</para></listitem>
 
-<listitem><para><userinput>set ruler :</userinput>
-This makes vim show the current row and column at the bottom right of
+<listitem><para><userinput>set ruler</userinput> : This makes vim show the current row and column at the bottom right of
 the screen.</para></listitem>
 
-<listitem><para><userinput>set noexpandtab :</userinput>
-This makes vim insert tabs as tab characters instead of as a set of
+<listitem><para><userinput>set noexpandtab</userinput> : This makes vim insert tabs as tab characters instead of as a set of
 spaces.</para></listitem>
 
Index: postlfs/editors/joe/joe-config.xml
===================================================================
--- postlfs/editors/joe/joe-config.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/editors/joe/joe-config.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -3,5 +3,5 @@
 
 <para>Joe can make use of several configuration files. Information
-about these files may be found in the joe man-page. These files
+about these files may be found in the joe man page. These files
 are <filename>/etc/jmacsrc</filename>, <filename>/etc/joerc</filename>,
 <filename>/etc/jpicorc</filename>, <filename>/etc/jstarrc</filename>,
Index: postlfs/security/firewalling/busybox.xml
===================================================================
--- postlfs/security/firewalling/busybox.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/security/firewalling/busybox.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -103,5 +103,5 @@
 
 <para>These are only examples to show you some of the capabilities of the new 
-firewalling-code in Linux-Kernel 2.4. Have a look at the man-page of
+firewalling-code in Linux-Kernel 2.4. Have a look at the man page of
 iptables.
 There you will find more of them. The port-numbers you'll need for this
Index: postlfs/shells/tcsh/tcsh-config.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-config.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/shells/tcsh/tcsh-config.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -10,5 +10,5 @@
 <filename>/etc/csh.logout</filename>, <filename>~/.logout</filename> and
 <filename>~/.logout</filename>.  More information on these files can be
-found in the <filename>tcsh(1)</filename> man-page.</para>
+found in the <filename>tcsh(1)</filename> man page.</para>
 </sect3>
 
Index: postlfs/shells/tcsh/tcsh-exp.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-exp.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/shells/tcsh/tcsh-exp.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>cp tcsh.man /usr/share/man/man1/tcsh.1</userinput> : tcsh doesn't install its man-page correctly, so we do it manually.</para>
+<para><userinput>cp tcsh.man /usr/share/man/man1/tcsh.1</userinput> : tcsh doesn't install its man page correctly, so we do it manually.</para>
 
 <para><userinput>ln -s /usr/bin/tcsh /bin/csh</userinput> : The FHS states that
Index: postlfs/shells/zsh/zsh-config.xml
===================================================================
--- postlfs/shells/zsh/zsh-config.xml	(revision eac628afd404e17ee3a65874d530d52ac02e923a)
+++ postlfs/shells/zsh/zsh-config.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
@@ -8,5 +8,5 @@
 <filename>/etc/zlogout</filename>.  You can find more information on
 these in the <userinput>zsh(1)</userinput> and related 
-man-pages.</para>
+man pages.</para>
 </sect3>
 
