diff --git a/chapter07/console.xml b/chapter07/console.xml
index 0e3cbe2ca..0c0d6fd8f 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -95,7 +95,7 @@ EOF</userinput></screen>
 setting it every time from the <command>console</command> bootscript, then
 instructions are given in <xref linkend="ch-bootable-kernel"/>.  Doing this
 ensures that your keyboard will always work as expected, even when you boot into
-maintenance mode (by passing `init=/bin/sh' to the kernel), as in that
+maintenance mode (by passing <parameter>init=/bin/sh</parameter> to the kernel), as in that
 situation, the <command>console</command> bootscript won't be run.</para>
 
 <para>Since the kernel will set up the keymap, you can omit the KEYMAP variable
diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index ef811fada..c5cc0123b 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -19,12 +19,12 @@ this:</para>
 
 # file system  mount-point  fs-type  options         dump  fsck-order
 
-/dev/<replaceable>[xxx]</replaceable>      /            <replaceable>[fff]</replaceable>      defaults        1     1
-/dev/<replaceable>[yyy]</replaceable>      swap         swap     pri=1           0     0
-proc          /proc        proc     defaults        0     0
-sysfs         /sys         sysfs    defaults        0     0
-devpts        /dev/pts     devpts   gid=4,mode=620  0     0
-shm           /dev/shm     tmpfs    defaults        0     0
+/dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>    defaults        1     1
+/dev/<replaceable>[yyy]</replaceable>     swap         swap     pri=1           0     0
+proc           /proc        proc     defaults        0     0
+sysfs          /sys         sysfs    defaults        0     0
+devpts         /dev/pts     devpts   gid=4,mode=620  0     0
+shm            /dev/shm     tmpfs    defaults        0     0
 # End /etc/fstab
 EOF</userinput></screen>
 
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 099eb4254..d600342a8 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -51,8 +51,7 @@ to userspace until userspace specifies that it is ready:</para>
 <para>If, in <xref linkend="ch-scripts-console"/>, you decided you want
 to compile the keymap into the kernel, issue the command below:</para>
 
-<screen><userinput>loadkeys -m
-/usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> &gt; \
+<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> &gt; \
     <replaceable>[unpacked sources dir]</replaceable>/linux-&linux-version;/drivers/char/defkeymap.c</userinput></screen>
 
 <para>For example, if you have a Dutch keyboard, you would use
@@ -62,7 +61,7 @@ to compile the keymap into the kernel, issue the command below:</para>
 
 <screen><userinput>make menuconfig</userinput></screen>
 
-<para><userinput>make oldconfig</userinput> may be more appropriate in some
+<para><command>make oldconfig</command> may be more appropriate in some
 situations. See the <filename>README</filename> file for more
 information.</para>
 
@@ -79,9 +78,9 @@ scratch.</para>
 the <quote>File systems</quote> menu and is normally enabled by default.</para>
 
 <para>LFS bootscripts make the assumption that you either compile
-both "Support for Host-side USB" and
-"USB device filesystem" directly into the kernel, or don't compile them at
-all. Bootscripts will not work properly if it is a module (usbcore.ko).</para>
+both <quote>Support for Host-side USB</quote> and
+<quote>USB device filesystem</quote> directly into the kernel, or don't compile them at
+all. Bootscripts will not work properly if it is a module (<filename>usbcore.ko</filename>).</para>
 
 <note><para>NPTL requires the kernel to be compiled with GCC 3.x, in this case
 &gcc-version;. Compiling with 2.95.x is known to cause failures in the glibc
@@ -96,14 +95,12 @@ unless you know what you're getting yourself into.</para></note>
 <filename>/etc/modprobe.conf</filename> file. Information pertaining
 to modules and to kernel configuration in general may be found in the
 kernel documentation, which is found in the
-<filename>linux-&linux-version;/Documentation</filename> directory.
-The
-modprobe.conf man page
+<filename class="directory">linux-&linux-version;/Documentation</filename> directory.
+The modprobe.conf man page
 <!-- removed for review from tldp.org
 and the kernel HOWTO at
 <ulink url="http://www.tldp.org/HOWTO/Kernel-HOWTO.html"/> -->
-may also be of
-interest to you.</para>
+may also be of interest to you.</para>
 
 <para>Be very suspicious while reading other documentation, because it
 usually applies to 2.4.x kernels only. As far as the editors know, kernel
@@ -130,7 +127,7 @@ isn't worth the trouble, but if you're really pressed for space, then have a loo
 <ulink url="http://www.linux-mips.org/archives/linux-mips/2002-04/msg00031.html"/>.</para>
 
 <para>Kernel compilation has finished but more steps are required to complete
-the installation. Some files need to be copied to the <filename>/boot</filename>
+the installation. Some files need to be copied to the <filename class="directory">/boot</filename>
 directory.</para>
 
 <para>The path to the kernel image may vary depending on the platform you're
@@ -163,8 +160,8 @@ the packager used will be assigned to somebody on your machine and then that
 person would have write access to the kernel source.</para>
 
 <para>If you are going to keep the kernel source tree around, you may want to
-run <userinput>chown -R 0:0</userinput> on the
-<filename>linux-&linux-version;</filename> directory to ensure all files are
+run <command>chown -R 0:0</command> on the
+<filename class="directory">linux-&linux-version;</filename> directory to ensure all files are
 owned by user <emphasis>root</emphasis>.</para>
 
 </sect2>
@@ -199,7 +196,7 @@ of running scores of programs seemingly at the same time.</para>
 <indexterm zone="ch-bootable-kernel kernel-headers"><primary sortas="e-kernel-headers">kernel headers</primary></indexterm>
 <para>define the interface to the
 services that the kernel provides. The headers in your system's
-<filename>include</filename> directory should <emphasis>always</emphasis> be
+<filename class="directory">include</filename> directory should <emphasis>always</emphasis> be
 the ones against which Glibc was compiled and should therefore
 <emphasis>not</emphasis> be replaced when upgrading the kernel.</para>
 </listitem>