diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 795a607b7..316f896ea 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -88,6 +88,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 16th, 2005 [matthew]: Typo and markup fixes in
+chapter 7, as reported by Randy McMurchy.</para></listitem>
+
 <listitem><para>June 16th, 2005 [jhuntwork]: Adjusted description of
 the patch package. Thanks Randy McMurchy.</para></listitem>
 
diff --git a/chapter07/console.xml b/chapter07/console.xml
index d67cc868d..9d2d47948 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -27,7 +27,8 @@ for several countries was installed with the LFS-Bootscripts package,
 so the relevant section can be uncommented if the country is
 supported. If still in doubt, look in the <filename
 class="directory">/usr/share/kbd</filename> directory for valid
-keymaps and screen fonts.  Read the loadkeys and setfont manual pages
+keymaps and screen fonts.  Read the <command>loadkeys</command> and
+<command>setfont</command> manual pages
 and determine the correct arguments for these programs. Once decided,
 create the configuration file with the following command:</para>
 
diff --git a/chapter07/hostname.xml b/chapter07/hostname.xml
index 46c083a43..4d336e5b7 100644
--- a/chapter07/hostname.xml
+++ b/chapter07/hostname.xml
@@ -11,8 +11,9 @@
 <primary sortas="d-localnet">localnet</primary>
 <secondary>configuring</secondary></indexterm>
 
-<para>Part of the localnet script is setting up the system's hostname. This
-needs to be configured in the <filename>/etc/sysconfig/network</filename>.</para>
+<para>Part of the <command>localnet</command> script is setting up the system's
+hostname. This needs to be configured in the
+<filename>/etc/sysconfig/network</filename> file.</para>
 
 <para>Create the <filename>/etc/sysconfig/network</filename> file and enter a hostname by
 running:</para>
diff --git a/chapter07/inputrc.xml b/chapter07/inputrc.xml
index 200f9a31b..842f35929 100644
--- a/chapter07/inputrc.xml
+++ b/chapter07/inputrc.xml
@@ -15,8 +15,9 @@ used by <application>Readline</application>, the input-related
 library used by <application>Bash</application> and most other
 shells.</para>
 
-<para>For more information, see the bash info page, section
-<emphasis>Readline Init File</emphasis>. The readline info page is
+<para>For more information, see the <command>bash</command> info page, section
+<emphasis>Readline Init File</emphasis>. The
+<filename class="libraryfile">readline</filename> info page is
 also a good source of information.</para>
 
 <para>Global values are set in <filename>/etc/inputrc</filename>.
diff --git a/chapter07/profile.xml b/chapter07/profile.xml
index 7288dfb77..00e8bcab2 100644
--- a/chapter07/profile.xml
+++ b/chapter07/profile.xml
@@ -12,7 +12,7 @@
 <para>The shell program <command>/bin/bash</command> (hereafter
 referred to as <quote>the shell</quote>) uses a collection of startup
 files to help create an environment to run in. Each file has a
-specific use and may effect login and interactive environments
+specific use and may affect login and interactive environments
 differently. The files in the <filename
 class="directory">/etc</filename> directory provide global settings.
 If an equivalent file exists in the home directory, it may override
diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml
index 0527fac00..a5a43f6a0 100644
--- a/chapter07/setclock.xml
+++ b/chapter07/setclock.xml
@@ -12,7 +12,7 @@
 <secondary>configuring</secondary></indexterm>
 
 <para>The <command>setclock</command> script reads the time from the hardware clock,
-also known as BIOS or the Complementary Metal Oxide Semiconductor
+also known as the BIOS or the Complementary Metal Oxide Semiconductor
 (CMOS) clock. If the hardware clock is set to UTC, this script will convert the hardware clock's time to
 the local time using the <filename>/etc/localtime</filename> file
 (which tells the <command>hwclock</command> program which timezone the
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index aef508e2d..ff50e7161 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -77,7 +77,7 @@ with <systemitem class="filesystem">sysfs</systemitem> as they are
 detected by the kernel.  For drivers compiled as modules, this will
 happen when the module is loaded.  Once the <systemitem
 class="filesystem">sysfs</systemitem> filesystem is mounted (on
-<filename class="directory">/sys</filename>), the data which the
+<filename class="directory">/sys</filename>), data which the
 built-in drivers registered with <systemitem
 class="filesystem">sysfs</systemitem> are available to userspace
 processes and to <command>udev</command> for device node creation.</para>
@@ -130,7 +130,7 @@ the appropriate kernel module to load.  With <command>udev</command>,
 this method will not work because the device node does not exist until
 the module is loaded.  To solve this, the
 <command>S05modules</command> bootscript was added to the
-lfs-bootscripts package, along with the
+LFS-Bootscripts package, along with the
 <filename>/etc/sysconfig/modules</filename> file.  By
 adding module
 names to the <filename>modules</filename> file, these modules will be