Index: general/genlib/stlport/stlport-exp.xml
===================================================================
--- general/genlib/stlport/stlport-exp.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ general/genlib/stlport/stlport-exp.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -4,5 +4,5 @@
 <para><userinput>GCC_VERSION=...</userinput> : STLport needs the
 location of the C++ headers, which are installed in
-<userinput>/usr/include/c++/$GCC_VERSION</userinput>
+<filename>/usr/include/c++/$GCC_VERSION</filename>
 if installed as per the instructions in LFS.</para>
 <para><userinput>sed -e ...</userinput> : Replace the location where STLport
Index: general/prog/gcc2/gcc2-config.xml
===================================================================
--- general/prog/gcc2/gcc2-config.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ general/prog/gcc2/gcc2-config.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -14,5 +14,5 @@
 
 <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
+add <filename class="directory">/opt/gcc2/bin</filename> to the front of your
 <envar>PATH</envar> before compiling the concerned
 package.</para>
Index: general/prog/jdk/j2sdk-config.xml
===================================================================
--- general/prog/jdk/j2sdk-config.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ general/prog/jdk/j2sdk-config.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -22,5 +22,5 @@
 <filename>/etc/man.conf</filename></para>
 
-<para>The java plugin is in the directory <userinput>$JAVA_HOME/jre/plugin/i?86/ns610/</userinput>.
+<para>The java plugin is in the directory <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns610/</filename>.
 Make a symbolic link to the file in that directory from your plugins directory.
 </para>
Index: general/sysutils/fcron/fcron-config.xml
===================================================================
--- general/sysutils/fcron/fcron-config.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ general/sysutils/fcron/fcron-config.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -61,7 +61,7 @@
 <sect3><title>Config files</title>
 
-<para><userinput>/etc/fcron.conf</userinput>,
-<userinput>/etc/fcron.allow</userinput>,
-<userinput>/etc/fcron.deny</userinput></para>
+<para><filename>/etc/fcron.conf</filename>,
+<filename>/etc/fcron.allow</filename>,
+<filename>/etc/fcron.deny</filename></para>
 
 <para>There are no required changes in any of these files.
Index: general/sysutils/gpm/gpm-config.xml
===================================================================
--- general/sysutils/gpm/gpm-config.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ general/sysutils/gpm/gpm-config.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -73,5 +73,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/sysconfig/mouse</userinput>
+<para><filename>/etc/sysconfig/mouse</filename>
 This file contains the name of your mouse device and the protocol which
 it uses.  To create this file, run the following:</para>
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ introduction/welcome/conventions.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -36,7 +36,5 @@
 	bin:x:1:
 	......
-<userinput>EOF</userinput>
-</screen>
-</para>
+<userinput>EOF</userinput></screen></para>
 
 <blockquote><para>This type of section is used mainly when creating 
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ kde/core/arts.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -35,5 +35,6 @@
 <sect2><title>aRts Installation Command explanations</title>
 <para><userinput>--prefix=&kde-dir;</userinput> : This option tells the
-process to install the package in &kde-dir;.  We put aRts here because this
+process to install the package in <filename
+class="directory">&kde-dir;</filename>.  We put aRts here because this
 package is required before installing KDE.</para>
 
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ kde/inst/kde-libs.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -33,5 +33,6 @@
 <sect2><title>kdelibs Installation Command explanations</title>
 <para><userinput>--prefix=&kde-dir;</userinput> : This option tells
-the process to install the package in &kde-dir;.</para>
+the process to install the package in <filename
+class="directory">&kde-dir;</filename>.</para>
 
 <para><userinput>--disable-debug</userinput> : This option causes the
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ postlfs/config/random.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -54,5 +54,6 @@
 chmod 755 /etc/rc.d/init.d/random</userinput></screen></para>
 
-<para>Create the symbolic links to this file in the relevant rc.d directories 
+<para>Create the symbolic links to this file in the relevant
+<filename class="directory">rc.d</filename> directories 
 with the following commands:
 <screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
Index: postlfs/editors/emacs/emacs-desc.xml
===================================================================
--- postlfs/editors/emacs/emacs-desc.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ postlfs/editors/emacs/emacs-desc.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -59,5 +59,6 @@
 
 <sect3><title>fakemail</title>
-<para>fakemail is a sendmail-like interface to /bin/mail.</para></sect3>
+<para>fakemail is a sendmail-like interface to
+<filename>/bin/mail</filename>.</para></sect3>
 
 <sect3><title>hexl</title>
Index: postlfs/filesystems/ext3.xml
===================================================================
--- postlfs/filesystems/ext3.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ postlfs/filesystems/ext3.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -18,9 +18,9 @@
 ext3, edit the entry so that it looks similar to the following line.</para>
 
-<para><userinput>/dev/hdXX /mnt_point ext3 defaults 1 0</userinput></para>
+<para><screen>/dev/hdXX /mnt_point ext3 defaults 1 0</screen></para>
 
 <para>In the above line, replace <filename>/dev/hdXX</filename> by the
 partition (e.g. <filename>/dev/hda2</filename>),
-/mnt_point by the mount point (e.g. <filename>/home</filename>). The 0 in the last field ensures
+<filename class="directory">/mnt_point</filename> by the mount point (e.g. <filename>/home</filename>). The 0 in the last field ensures
 that the partition will not be checked for consistency during bootup by the
 checkfs script. You may replace the ext3 fs type in the above by auto if you 
Index: postlfs/security/firewalling/masqrouter.xml
===================================================================
--- postlfs/security/firewalling/masqrouter.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ postlfs/security/firewalling/masqrouter.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -24,5 +24,5 @@
 echo "of the quoted configuration rules."
 echo "You can find some quite comprehensive information"
-echo "about firewalling in Chapter 6 of the BLFS book."
+echo "about firewalling in Chapter 4 of the BLFS book."
 echo "http://beyond.linuxfromscratch.org/"
 echo
Index: postlfs/security/shadow/shadow-config.xml
===================================================================
--- postlfs/security/shadow/shadow-config.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ postlfs/security/shadow/shadow-config.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -3,8 +3,9 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/pam.d/login</userinput>,
-<userinput>/etc/pam.d/passwd</userinput>,
-<userinput>/etc/pam.d/su</userinput>,
-<userinput>/etc/pam.d/shadow</userinput>, <userinput>/etc/pam.d/useradd</userinput></para>
+<para><filename>/etc/pam.d/login</filename>,
+<filename>/etc/pam.d/passwd</filename>,
+<filename>/etc/pam.d/su</filename>,
+<filename>/etc/pam.d/shadow</filename>,
+<filename>/etc/pam.d/useradd</filename></para>
 </sect3>
 
Index: postlfs/security/tripwire/tripwire-config.xml
===================================================================
--- postlfs/security/tripwire/tripwire-config.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ postlfs/security/tripwire/tripwire-config.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -36,5 +36,5 @@
 
 <para>During configuration tripwire will create 2 keys: a site key and
- a local key which will be stored in /etc/tripwire/.</para>
+ a local key which will be stored in <filename class="directory">/etc/tripwire/</filename>.</para>
 
 </sect3>
Index: server/mail/sendmail/sendmail-desc.xml
===================================================================
--- server/mail/sendmail/sendmail-desc.xml	(revision f32ecb0e0fd81a57541b17c501a8b0d504900ccd)
+++ server/mail/sendmail/sendmail-desc.xml	(revision 064db32a393667d1532f29d4e69f4b8dde019bbc)
@@ -31,5 +31,5 @@
 <para>mailq prints a summary of waiting mail messages.</para></sect3>
 <sect3><title>newaliases</title>
-<para>newaliases rebuilds /etc/mail/aliases.db.</para></sect3>
+<para>newaliases rebuilds <filename>/etc/mail/aliases.db</filename>.</para></sect3>
 <sect3><title>sendmail</title>
 <para>sendmail is the Sendmail mail transport agent.</para></sect3>
