26 files changed, 68 insertions, 69 deletions
diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml
index dff5d0775..ccf05b83e 100644
--- a/chapter06/aboutdebug.xml
+++ b/chapter06/aboutdebug.xml
@@ -37,7 +37,7 @@ symbols, the difference will generally be a factor between 2 and 5.</para>
 software, a lot of disk space can be regained by removing these symbols .</para>
 
 <para>To remove debugging symbols from a binary (which must be an a.out
-or ELF binary), run <userinput>strip --strip-debug filename</userinput>.
+or ELF binary), run <command>strip --strip-debug filename</command>.
 Wildcards can be used to treat multiple files (use something like
 <userinput>strip --strip-debug $LFS/tools/bin/*</userinput>).</para>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 994b7000c..f7862db68 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -39,7 +39,7 @@ following command will do so:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And reload the newly compiled <userinput>bash</userinput> program:</para>
+<para>And reload the newly compiled <command>bash</command> program:</para>
 
 <screen><userinput>exec /bin/bash --login +h</userinput></screen>
 
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index e67810b0d..d1893c1f0 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -4,7 +4,7 @@
 
 <para>The Bzip2 package contains programs for compressing and decompressing
 files. On text files they achieve a much better compression than the
-traditional <userinput>gzip</userinput>.</para>
+traditional <command>gzip</command>.</para>
 
 <screen>&buildtime; &bzip2-time;
 &diskspace; &bzip2-compsize;</screen>
@@ -34,13 +34,13 @@ against it.</para>
 
 <para>If you are reinstalling Bzip2, you will now first have to do
 <userinput>rm -f /usr/bin/bz*</userinput>, otherwise the following
-<userinput>make install</userinput> will fail.</para>
+<command>make install</command> will fail.</para>
 
 <para>Install the programs:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And install the shared <userinput>bzip2</userinput> binary into the
+<para>And install the shared <command>bzip2</command> binary into the
 <filename class="directory">/bin</filename> directory, then make some
 necessary symbolic links, and clean up:</para>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 6364740be..f97d4d777 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -68,13 +68,12 @@ with a series of short descriptions of these.</para>
 <para>It is time to enter the chroot environment in order to begin installing
 the packages we need. Before you can chroot, however, you need to become
 <emphasis>root</emphasis>, since only <emphasis>root</emphasis>
-can execute the <userinput>chroot</userinput> command.</para>
+can execute the <command>chroot</command> command.</para>
 
 <para>Just like earlier, ensure the LFS environment variable is set up properly
 by running <userinput>echo $LFS</userinput> and ensuring it shows the path to
 your LFS partition's mount point, which is
-<filename class="directory">/mnt/lfs</filename> if you followed our
-example.</para>
+<filename class="directory">/mnt/lfs</filename> if you followed our example.</para>
 
 <para>Become <emphasis>root</emphasis> and run the following command
 to enter the chroot environment:</para>
@@ -84,12 +83,12 @@ to enter the chroot environment:</para>
 &nbsp;&nbsp;&nbsp;&nbsp;PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
 &nbsp;&nbsp;&nbsp;&nbsp;/tools/bin/bash --login +h</userinput></screen>
 
-<para>The <userinput>-i</userinput> option given to the
-<userinput>env</userinput> command will clear all variables of the chroot
+<para>The <emphasis>-i</emphasis> option given to the
+<command>env</command> command will clear all variables of the chroot
 environment. After that, only the HOME, TERM, PS1 and PATH variables are
 set again. The TERM=$TERM construct will set the TERM variable inside chroot
 to the same value as outside chroot; this variable is needed for programs
-like <userinput>vim</userinput> and <userinput>less</userinput> to operate
+like <command>vim</command> and <command>less</command> to operate
 properly. If you need other variables present, such as CFLAGS or CXXFLAGS,
 this is a good place to set them again.</para>
 
@@ -103,8 +102,8 @@ the chroot command.</para>
 last in the PATH. This means that a temporary tool will not be used any more
 as soon as its final version is installed. Well, at least when the shell
 doesn't remember the locations of executed binaries -- for this reason hashing
-is switched off by passing the <userinput>+h</userinput> option to
-<userinput>bash</userinput>.</para>
+is switched off by passing the <emphasis>+h</emphasis> option to
+<command>bash</command>.</para>
 
 <para>You have to make sure all the commands in the rest of this chapter and
 in the following chapters are run from within the chroot environment.
@@ -281,15 +280,15 @@ will now work.</para>
 
 <screen><userinput>exec /tools/bin/bash --login +h</userinput></screen>
 
-<para>Note the use of the <userinput>+h</userinput> directive. This tells
-<userinput>bash</userinput> not to use its internal path hashing. Without this
-directive, <userinput>bash</userinput> would remember the paths to binaries it
+<para>Note the use of the <emphasis>+h</emphasis> directive. This tells
+<command>bash</command> not to use its internal path hashing. Without this
+directive, <command>bash</command> would remember the paths to binaries it
 has executed. Since we want to use our newly compiled binaries as soon as
 they are installed, we turn off this function for the duration of this
 chapter.</para>
 
-<para>The <userinput>login</userinput>, <userinput>agetty</userinput> and
-<userinput>init</userinput> programs (and some others) use a number of log
+<para>The <command>login</command>, <command>agetty</command> and
+<command>init</command> programs (and some others) use a number of log
 files to record information such as who was logged into the system and when.
 These programs, however, won't write to the log files if they don't already
 exist. Initialize the log files and give them their proper permissions:</para>
@@ -341,7 +340,7 @@ identical.</para></note>
 <para>From now on every compiled program will link <emphasis>only</emphasis>
 against the libraries in <filename>/usr/lib</filename> and
 <filename>/lib</filename>. The extra
-<userinput>INSTALL=/tools/bin/install</userinput> is needed because the Makefile
+<emphasis>INSTALL=/tools/bin/install</emphasis> is needed because the Makefile
 created during the second pass still contains the reference to
 <filename>/usr/bin/install</filename>, which we obviously haven't installed yet.
 Some host distributions contain a <filename class="symlink">ginstall</filename>
diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml
index e92a7caf5..6d74eed27 100644
--- a/chapter06/config-glibc.xml
+++ b/chapter06/config-glibc.xml
@@ -54,7 +54,7 @@ user mode.</para></listitem>
 </itemizedlist>
 
 <para>Of course, instead of <emphasis>Canada/Eastern</emphasis>, fill in
-the name of the time zone that the <userinput>tzselect</userinput> script
+the name of the time zone that the <command>tzselect</command> script
 gave you.</para>
 
 </sect2>
diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml
index 769292fbc..e3268b6f2 100644
--- a/chapter06/config-shadowpwd.xml
+++ b/chapter06/config-shadowpwd.xml
@@ -23,7 +23,7 @@ command:</para>
 
 <para>Under normal circumstances, you won't have created any passwords yet.
 However, if returning to this section to enable shadowing, you should reset any
-current user passwords with the <userinput>passwd</userinput> command or any
-group passwords with the <userinput>gpasswd</userinput> command.</para>
+current user passwords with the <command>passwd</command> command or any
+group passwords with the <command>gpasswd</command> command.</para>
 </sect2>
 
diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml
index ab9aea8bf..7fa0650ac 100644
--- a/chapter06/config-vim.xml
+++ b/chapter06/config-vim.xml
@@ -2,10 +2,10 @@
 
 <sect2><title>Configuring Vim</title>
 
-<para>By default, <userinput>vim</userinput> runs in vi-compatible mode. Some
-people might like this, but we prefer to run <userinput>vim</userinput> in its
+<para>By default, <command>vim</command> runs in vi-compatible mode. Some
+people might like this, but we prefer to run <command>vim</command> in its
 own mode (else we wouldn't have included it in this book, but the original
-<userinput>vi</userinput>). Create a default vim configuration file by running
+<command>vi</command>). Create a default vim configuration file by running
 the following:</para>
 
 <screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"</userinput>
@@ -18,11 +18,11 @@ syntax on
 " End /etc/vimrc
 <userinput>EOF</userinput></screen>
 
-<para>The <userinput>set nocompatible</userinput> will make
-<userinput>vim</userinput> behave in a more useful way than the default
-vi-compatible manner. The <userinput>set backspace=2</userinput> allows
+<para>The <emphasis>set nocompatible</emphasis> will make
+<command>vim</command> behave in a more useful way than the default
+vi-compatible manner. The <emphasis>set backspace=2</emphasis> allows
 backspacing over line breaks, autoindent and the start of insert. And the
-<userinput>syntax on</userinput> switches on <userinput>vim</userinput>'s
+<emphasis>syntax on</emphasis> switches on <command>vim</command>'s
 semantic colouring.</para>
 
 </sect2>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 38c605909..0d2f9cb81 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -20,14 +20,14 @@ basic system characteristics.</para>
 
 <screen><userinput>patch -Np1 -i ../&coreutils-posixver-patch;</userinput></screen>
 
-<para>Normally the functionality of <userinput>uname</userinput> is somewhat
-broken, in that the <userinput>-p</userinput> switch always returns "unknown".
+<para>Normally the functionality of <command>uname</command> is somewhat
+broken, in that the <emphasis>-p</emphasis> switch always returns "unknown".
 The following patch fixes this behaviour for Intel architectures:</para>
 
 <screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
 
 <para>We do not want Coreutils to install its version of the
-<userinput>hostname</userinput> program, because it is inferior to the version
+<command>hostname</command> program, because it is inferior to the version
 provided by Net-tools. Prevent its installation by applying a patch:</para>
 
 <screen><userinput>patch -Np1 -i ../&coreutils-hostname-patch;</userinput></screen>
@@ -40,7 +40,7 @@ provided by Net-tools. Prevent its installation by applying a patch:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>The <userinput>su</userinput> program from Coreutils wasn't installed in
+<para>The <command>su</command> program from Coreutils wasn't installed in
 Chapter 5 because it needed <emphasis>root</emphasis> privilege to do so. We're
 going to need it in a few moments for the test suite. Therefore we work around
 the problem by installing it now:</para>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index ff36d5748..809f1ca31 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -39,10 +39,10 @@ following command will do so:</para>
 
 <screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
 
-<para>A few programs don't know about <userinput>flex</userinput> yet and try
-to run its predecessor <userinput>lex</userinput>. To support those programs,
+<para>A few programs don't know about <command>flex</command> yet and try
+to run its predecessor <command>lex</command>. To support those programs,
 create a shell script named <filename>lex</filename> that calls
-<userinput>flex</userinput> in Lex emulation mode:</para>
+<command>flex</command> in Lex emulation mode:</para>
 
 <screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 #!/bin/sh
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 670a35b70..920ff6831 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -86,7 +86,7 @@ To honor those packages, create this symlink:</para>
 
 <screen><userinput>ln -s ../usr/bin/cpp /lib</userinput></screen>
 
-<para>Many packages use the name <userinput>cc</userinput> to call the C
+<para>Many packages use the name <command>cc</command> to call the C
 compiler. To satisfy those packages, create a symlink:</para>
 
 <screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2df7bdd3b..5b8d60f4c 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -91,7 +91,7 @@ weren't installed by the above command. Do it with this:</para>
 
 <para>An alternative to running the previous command is to install only those
 locales which you need or want. This can be achieved by using the
-<userinput>localedef</userinput> command. Information on this can be found in
+<command>localedef</command> command. Information on this can be found in
 the <filename>INSTALL</filename> file in the Glibc source. However, there are
 a number of locales that are essential for the tests of future packages to
 pass, in particular, the <emphasis>libstdc++</emphasis> tests from GCC. The
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index f7c3ed066..3722ba239 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -32,7 +32,7 @@ live elsewhere, you may want to change <emphasis>PAGE=letter</emphasis> to
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Some documentation programs, such as <userinput>xman</userinput>,
+<para>Some documentation programs, such as <command>xman</command>,
 will not work properly without the following symlinks:</para>
 
 <screen><userinput>ln -s soelim /usr/bin/zsoelim
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index a2b52b8f2..81e054b4d 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -20,8 +20,8 @@ files.</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>The <userinput>gzexe</userinput> script has the location of the
-<userinput>gzip</userinput> binary hard-wired into it. Because we later change
+<para>The <command>gzexe</command> script has the location of the
+<command>gzip</command> binary hard-wired into it. Because we later change
 the location of the binary, the following command assures that the new
 location gets placed into the script:</para>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index f35b948d1..c5a4fc880 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -61,7 +61,7 @@ replacements are available for many of these servers.</para></listitem>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And move the <userinput>ping</userinput> program to its proper place:</para>
+<para>And move the <command>ping</command> program to its proper place:</para>
 
 <screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 32cb7e4dc..34cea17fc 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -15,8 +15,8 @@
 <sect2>
 <title>Installation of Kbd</title>
 
-<para>By default some of Kbd's utilities (<userinput>setlogcons</userinput>,
-<userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
+<para>By default some of Kbd's utilities (<command>setlogcons</command>,
+<command>setvesablank</command> and <command>getunimap</command>) are
 not installed. First enable the compilation of these utilities:</para>
 
 <screen><userinput>patch -Np1 -i ../&kbd-patch;</userinput></screen>
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
index ea1af2068..a4a025126 100644
--- a/chapter06/lfs-utils.xml
+++ b/chapter06/lfs-utils.xml
@@ -23,7 +23,7 @@
 
 <itemizedlist>
 <listitem><para><userinput>--with-libc</userinput>: This causes the
-<userinput>mktemp</userinput> program to use the <emphasis>mkstemp</emphasis>
+<command>mktemp</command> program to use the <emphasis>mkstemp</emphasis>
 and <emphasis>mkdtemp</emphasis> functions from the system C
 library.</para></listitem>
 </itemizedlist>
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index d98a59241..0763e8c8f 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -16,10 +16,10 @@
 <title>Making devices</title>
 
 <para>Note that unpacking the <filename>MAKEDEV-&makedev-version;.bz2</filename>
-file doesn't create a directory for you to <userinput>cd</userinput> into, as
+file doesn't create a directory for you to <command>cd</command> into, as
 the file contains only a shell script.</para>
 
-<para>Install the <userinput>MAKEDEV</userinput> script:</para>
+<para>Install the <command>MAKEDEV</command> script:</para>
 
 <screen><userinput>bzcat MAKEDEV-&makedev-version;.bz2 &gt; /dev/MAKEDEV
 chmod 754 /dev/MAKEDEV</userinput></screen>
@@ -36,7 +36,7 @@ chmod 754 /dev/MAKEDEV</userinput></screen>
 verbose mode.</para></listitem>
 
 <listitem><para><userinput>generic-nopty</userinput>: This instructs
-<userinput>MAKEDEV</userinput> to create a generic selection of commonly used
+<command>MAKEDEV</command> to create a generic selection of commonly used
 device special files, except for the ptyXX and ttyXX range of files. We don't
 need those files because we are going to use Unix98 PTYs via the
 <emphasis>devpts</emphasis> file system.</para></listitem>
@@ -44,7 +44,7 @@ need those files because we are going to use Unix98 PTYs via the
 
 <para>If it turns out that some special device <filename>zzz</filename> that
 you need is missing, try running <userinput>./MAKEDEV -v zzz</userinput>.
-Alternatively, you may create devices via the <userinput>mknod</userinput>
+Alternatively, you may create devices via the <command>mknod</command>
 program. Please refer to its man and info pages if you need more
 information.</para>
 
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 2594c8936..d308a1263 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -31,7 +31,7 @@ properly handled by Less:</para>
 
 <para>The third is also a sed substitution to comment out the "MANPATH
 /usr/man" line in the <filename>man.conf</filename> file to prevent redundant
-results when using programs such as <userinput>whatis</userinput>:</para>
+results when using programs such as <command>whatis</command>:</para>
 
 <screen><userinput>sed -i 's%MANPATH./usr/man%#&amp;%' src/man.conf.in</userinput></screen>
  
@@ -50,7 +50,7 @@ FHS by putting cat pages under /var/cache/man provided that that directory
 exists.</para></listitem>
 
 <listitem><para><userinput>-confdir=/etc</userinput>: This tells the
-<userinput>man</userinput> program to look for the <filename>man.conf</filename>
+<command>man</command> program to look for the <filename>man.conf</filename>
 configuration file in the <filename>/etc</filename> directory.</para></listitem>
 </itemizedlist>
 
@@ -62,9 +62,9 @@ configuration file in the <filename>/etc</filename> directory.</para></listitem>
 
 <screen><userinput>make install</userinput></screen>
 
-<note><para>If you wish to disable SGR escape sequences, you should
-edit the man.conf file and add the <userinput>-c</userinput> argument
-to nroff.</para></note>
+<note><para>If you wish to disable SGR escape sequences, you should edit the
+<filename>man.conf</filename> file and add the <emphasis>-c</emphasis> switch
+to NROFF.</para></note>
 
 <para>You may want to also take a look at the BLFS page at
 <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/> which deals with
diff --git a/chapter06/mountproc.xml b/chapter06/mountproc.xml
index a60f76e10..e15c3546e 100644
--- a/chapter06/mountproc.xml
+++ b/chapter06/mountproc.xml
@@ -44,7 +44,7 @@ now the most common way for pseudo terminals (PTYs) to be implemented.</para>
 <para>The most likely cause is that your host system's kernel was compiled
 without support for the devpts file system. You can check which file systems
 your kernel supports by peeking into its internals with a command such as
-<userinput>cat /proc/filesystems</userinput>. If a file system type named
+<command>cat /proc/filesystems</command>. If a file system type named
 <emphasis>devfs</emphasis> is listed there, then we'll be able to work around
 the problem by mounting the host's devfs file system on top of the new
 <filename>/dev</filename> structure which we'll create later on in the section
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 56e313d73..70bcdd33a 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -16,7 +16,7 @@
 <title>Installation of Net-tools</title>
 
 <para>If you don't know what to answer to all the questions asked during the
-<userinput>make config</userinput> phase below, then just accept the defaults.
+<command>make config</command> phase below, then just accept the defaults.
 This will be just fine in the majority of cases. What you're asked here is a
 bunch of questions about which network protocols you've enabled in your
 kernel. The default answers will enable the tools from this package to work
@@ -35,7 +35,7 @@ program:</para>
 <screen><userinput>make config</userinput></screen>
 
 <para>If you intend to accept the default settings, you may skip the
-questions generated by <emphasis>make config</emphasis> by running
+questions generated by <command>make config</command> by running
 <userinput>yes "" | make config</userinput> instead.</para>
 
 <para>Compile the package:</para>
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 0b58365d6..57bb23a7a 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -19,7 +19,7 @@
 
 <screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
 
-<para>Again, the preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only
+<para>Again, the preprocessor flag <emphasis>-D_GNU_SOURCE</emphasis> is only
 needed on the PowerPC platform. On other architectures you can leave it out.</para>
 
 <para>Compile the package:</para>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index f1d0598bf..8e69cbcee 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -22,7 +22,7 @@
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
 
 <para>If you want more control over the way Perl sets itself up to be
-built, you can run the interactive <userinput>Configure</userinput> script
+built, you can run the interactive <command>Configure</command> script
 instead and modify the way Perl is built. If you think you can live with the
 (sensible) defaults Perl auto-detects, then just use the command listed
 above.</para>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 3cde75179..f506ed5b8 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -48,9 +48,9 @@ therefore make it a symbolic link to <filename>pstree</filename>:</para>
 <screen><userinput>mv /bin/pstree* /usr/bin
 ln -sf pstree /usr/bin/pstree.x11</userinput></screen>
 
-<para>By default Psmisc's <userinput>pidof</userinput> program isn't installed.
+<para>By default Psmisc's <command>pidof</command> program isn't installed.
 Generally, this isn't a problem because we later install the Sysvinit package,
-which provides a better <userinput>pidof</userinput> program. But if you're not
+which provides a better <command>pidof</command> program. But if you're not
 going to use Sysvinit, you should complete the installation of Psmisc by
 creating the following symlink:</para>
 
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index 856262fe3..5c9c6b510 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -16,9 +16,9 @@ way.</para>
 <sect2>
 <title>Installation of Shadow</title>
 
-<para>Shadow hard-wires the path to the <userinput>passwd</userinput> binary
+<para>Shadow hard-wires the path to the <command>passwd</command> binary
 within the binary itself, but does this the wrong way. If a
-<userinput>passwd</userinput> binary is not present before installing Shadow,
+<command>passwd</command> binary is not present before installing Shadow,
 the package incorrectly assumes it is going to be located at
 <filename>/bin/passwd</filename>, but then installs it in
 <filename>/usr/bin/passwd</filename>. This will lead to errors about not finding
@@ -84,7 +84,7 @@ directory for it to work properly:</para>
 
 <screen><userinput>mkdir /etc/default</userinput></screen>
 
-<para>Coreutils has already installed a better <userinput>groups</userinput>
+<para>Coreutils has already installed a better <command>groups</command>
 program in <filename>/usr/bin</filename>. Remove the one installed by
 Shadow:</para>
 
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index f167cfb80..fd543bdbb 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -19,7 +19,7 @@ messages.</para>
 
 <para>The FHS recommends that we use <filename>/var/lib/hwclock</filename>,
 instead of the usual <filename>/etc</filename>, as the location for the
-<filename>adjtime</filename> file. To make the <userinput>hwclock</userinput>
+<filename>adjtime</filename> file. To make the <command>hwclock</command>
 program FHS-compliant, run the following:</para>
 
 <screen><userinput>cp hwclock/hwclock.c{,.backup}
@@ -44,12 +44,12 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 
 <itemizedlist>
 <listitem><para><userinput>HAVE_KILL=yes</userinput>: This prevents the
-<userinput>kill</userinput> program (already installed by Procps) from being
+<command>kill</command> program (already installed by Procps) from being
 built and installed again.</para></listitem>
 
 <listitem><para><userinput>HAVE_SLN=yes</userinput>: This prevents the
-<userinput>sln</userinput> program (a statically linked
-<userinput>ln</userinput>, already installed by Glibc) from being built and
+<command>sln</command> program (a statically linked
+<command>ln</command>, already installed by Glibc) from being built and
 installed again.</para></listitem>
 </itemizedlist>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index e82ccb111..7159413f7 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -52,7 +52,7 @@ the following command will do so:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>When called as <userinput>vi</userinput>, <userinput>vim</userinput>
+<para>When called as <command>vi</command>, <command>vim</command>
 will run in old-fashioned vi-mode. To allow this, create a symlink:</para>
 
 <screen><userinput>ln -s vim /usr/bin/vi</userinput></screen>