Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/bootdisk.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -141,12 +141,12 @@
 utility that also has many transformation capabilities.</para>
 
-<para><command>if=/dev/zero</command>: This parameter assigns
+<para><parameter>if=/dev/zero</parameter>: This parameter assigns
 <command>dd</command>'s input file to a device that returns an infinite
 stream of zeroes.</para>
 
-<para><command>of=/tmp/rfloppy</command>: This parameter directs
+<para><parameter>of=/tmp/rfloppy</parameter>: This parameter directs
 <command>dd</command>'s output to <filename>/tmp/rfloppy</filename>.</para>
 
-<para><command>bs=1k count=4096</command>: These parameters tell
+<para><parameter>bs=1k count=4096</parameter>: These parameters tell
 <filename>dd</filename> to read and write in "chunks" of 1024 bytes and
 process 4096 "chunks".</para>
@@ -184,5 +184,5 @@
 
 <para>If your <command>mount</command> supports the
-<userinput>-o loop</userinput> option <emphasis>and</emphasis> your
+<option>-o loop</option> option <emphasis>and</emphasis> your
 <filename>/etc/mtab</filename> is a real file, rather than a symlink to
 <filename>/proc</filename>, the three above commands can be replaced
@@ -509,5 +509,5 @@
 
 <para>Unmount the loopback file.  If you used <command>mount</command>'s
-<userinput>-o loop</userinput> option, the "bond" between the loop device
+<option>-o loop</option> option, the "bond" between the loop device
 and the file will be removed when the unmount is done.  Just omit the
 <command>losetup -d /dev/loop1</command> from the following
@@ -592,6 +592,6 @@
 of <filename>/dev/floppy/0</filename>.</para>
 
-<screen><userinput><command>rdev -r /dev/floppy/0 16865
-dd if=/tmp/rootfs.gz of=/dev/floppy/0 bs=1k seek=481</command></userinput></screen>
+<screen><userinput><command>rdev -r /dev/floppy/0 <replaceable>16865</replaceable>
+dd if=/tmp/rootfs.gz of=/dev/floppy/0 bs=1k seek=<replaceable>481</replaceable></command></userinput></screen>
 
 <para>In this command, <command>seek</command> was used to position to
@@ -628,5 +628,5 @@
 image on the diskette.</para>
 
-<screen><userinput><command>rdev -r /dev/floppy/0 49152</command></userinput></screen>
+<screen><userinput><command>rdev -r /dev/floppy/0 <replaceable>49152</replaceable></command></userinput></screen>
 
 <para>Note that the initrd image is <emphasis>not</emphasis> copied to
Index: postlfs/config/compressdoc.xml
===================================================================
--- postlfs/config/compressdoc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/compressdoc.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -418,6 +418,7 @@
 documentation in nonstandard places (such as <filename class="directory"> 
 /usr/X11R6/man</filename>, etc...). Don't forget to add those locations in the 
-file <filename>/etc/man.conf</filename>, as a MANPATH=/path section. Example:
-<screen><userinput>
+file <filename>/etc/man.conf</filename>, as a
+<envar>MANPATH</envar>=<replaceable>/path</replaceable> section.</para>
+<para> Example:<screen><userinput>
     ...
     MANPATH=/usr/share/man
@@ -425,6 +426,5 @@
     MANPATH=/usr/X11R6/man
     MANPATH=/opt/qt/doc/man
-    ...
-</userinput></screen></para>
+    ...</userinput></screen></para>
 
 <para>Generally, package installation systems do not compress man/info pages, 
Index: postlfs/config/inputrc.xml
===================================================================
--- postlfs/config/inputrc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/inputrc.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -37,6 +37,6 @@
 file to <filename>/etc/inputrc</filename> and the home directory
 of any user already existing in the system, including root, that needs
-a private version of the file.  Be sure to use the "-p"  parameter
-of "cp" to maintain permissions and be sure to change owner and group
+a private version of the file.  Be sure to use the <option>-p</option> parameter
+of <command>cp</command> to maintain permissions and be sure to change owner and group
 appropriately.
 </para>
Index: postlfs/config/logon.xml
===================================================================
--- postlfs/config/logon.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/logon.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -35,5 +35,5 @@
 display various information.  All escape codes consist of a backslash
 (\) immediately followed by one of the letters explained 
-below (so \d in <filename>/etc/issue</filename> would 
+below (so <option>\d</option> in <filename>/etc/issue</filename> would 
 insert the current date).</para>
 
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/profile.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -47,5 +47,5 @@
 <filename>~/.dircolors</filename> files called from
 <filename>/etc/profile</filename>. They control colorized output of
-things like <emphasis>ls --color</emphasis>.
+things like <command>ls --color</command>.
 </para>
 
Index: postlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/skel.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -96,5 +96,5 @@
 
 <para>When adding a new user with <command>useradd</command> use
-the <userinput>-m</userinput> parameter, which tells
+the <option>-m</option> parameter, which tells
 <command>useradd</command> to create the user's home directory and
 copy files from <filename>/etc/skel</filename> (can be overridden) to
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/config/vimrc.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -52,23 +52,23 @@
 <itemizedlist>
 
-<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><option>set bs=2</option> : This influences the behavior 
+of the backspace option.  It is fairly complex so see <command>:help 'bs'
+</command> for more details.</para></listitem>
 
-<listitem><para><userinput>set columns=80</userinput> : This simply sets the 
+<listitem><para><option>set columns=80</option> : This simply sets the 
 number of columns used on the screen.</para></listitem>
 
-<listitem><para><userinput>set background=dark</userinput> : This tells
+<listitem><para><option>set background=dark</option> : This tells
 <command>vim</command> to use colors which look good on a dark 
 background.</para></listitem>
 
-<listitem><para><userinput>set wrapmargin=8</userinput> : This is the number of 
+<listitem><para><option>set wrapmargin=8</option> : This is the number of 
 characters from the right window  border where wrapping starts.</para>
 </listitem>
 
-<listitem><para><userinput>syntax on</userinput> : Enables
+<listitem><para><option>syntax on</option> : Enables
 <command>vim</command>'s syntax highlighting.</para></listitem>
 
-<listitem><para><userinput>set ruler</userinput> : This makes <command>vim
+<listitem><para><option>set ruler</option> : This makes <command>vim
 </command> show the current row and column at the bottom right of
 the screen.</para></listitem>
@@ -79,7 +79,7 @@
 <para>More information on the <emphasis>many</emphasis> <command>vim</command> 
 options can be found by reading the help inside <command>vim</command> itself.  
-Do this by typing <command>:</command><userinput>help</userinput> in 
+Do this by typing <command>:</command><option>help</option> in 
 <command>vim</command> to get the general help, or by typing <command>:
-</command><userinput>help usr_toc.txt</userinput> to view 
+</command><option>help usr_toc.txt</option> to view 
 the User Manual Table of Contents.</para>
 
Index: postlfs/editors/vim/vim-exp.xml
===================================================================
--- postlfs/editors/vim/vim-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/editors/vim/vim-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--with-features=huge</command> : Enables all the additional
+<para><option>--with-features=huge</option>: Enables all the additional
 features available in <application>Vim</application>.</para>
 
Index: postlfs/filesystems/ext3.xml
===================================================================
--- postlfs/filesystems/ext3.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/filesystems/ext3.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -25,5 +25,5 @@
 partition (e.g. <filename>/dev/hda2</filename>), <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 
+<option>0</option> 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 want to ensure that the partition is mounted 
Index: postlfs/filesystems/reiser/reiser-exp.xml
===================================================================
--- postlfs/filesystems/reiser/reiser-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/filesystems/reiser/reiser-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,10 +2,10 @@
 <title>Command explanations</title>
 
-<para><command>--prefix=/usr</command> : This ensures that
+<para><option>--prefix=/usr</option>: This ensures that
 the manual pages are installed in the correct location while still
 installing the programs in <filename>/sbin</filename> as they should
 be.</para>
 
-<para><command>--sbindir=/sbin</command> : This ensures that the
+<para><option>--sbindir=/sbin</option>: This ensures that the
 <application>ReiserFS</application> 
 utilities are installed in <filename>/sbin</filename> as they should be.</para>
Index: postlfs/filesystems/xfs/xfs-patch-inst.xml
===================================================================
--- postlfs/filesystems/xfs/xfs-patch-inst.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/filesystems/xfs/xfs-patch-inst.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,5 +2,5 @@
 <title>Patching Linux-&xfspatch-version; for <acronym>XFS</acronym></title>
 
-<para>Build an <acronym>XFS</acronym>-enabled Linux &xfspatch-version; kernel 
+<para>Build an <acronym>XFS</acronym> enabled Linux &xfspatch-version; kernel 
 with the following commands:</para>
 
Index: postlfs/security/firewalling/masqrouter.xml
===================================================================
--- postlfs/security/firewalling/masqrouter.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/firewalling/masqrouter.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -3,7 +3,9 @@
 
 <para>A true Firewall has two interfaces, one connected to an intranet,
-in this example, eth0, and one connected to the internet, here, ppp0. 
+in this example, <emphasis role="strong">eth0</emphasis>, and one
+connected to the internet, here, <emphasis role="strong">ppp0</emphasis>. 
 To provide the maximum security against the box itself being broken into,
-make sure that there are no servers running on it, especially not X11 et
+make sure that there are no servers running on it, especially not
+<application>X11</application> et
 al.  And, as a general principle, the box itself should not access any untrusted
 service (Think of a name server giving answers that make your
@@ -88,8 +90,8 @@
 <para>Note: if the interface you're connecting to the Internet 
 doesn't connect via ppp, you will need to change
-<userinput>ppp+</userinput> to the name of the interface which you are
+<replaceable>ppp+</replaceable> to the name of the interface which you are
 using.  If you are using the same interface type to connect to both your
 intranet and the internet, you need to use the actual name of the
-interface such as <emphasis>eth<userinput>0</userinput></emphasis>, 
+interface such as <emphasis role="strong">eth0</emphasis>, 
 on both interfaces.</para>
 
Index: postlfs/security/gnupg/gnupg-exp.xml
===================================================================
--- postlfs/security/gnupg/gnupg-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/gnupg/gnupg-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--libexecdir=/usr/sbin</command> : This command
+<para><option>--libexecdir=/usr/sbin</option>: This command
 creates a <filename>gnupg</filename> directory in <filename>/usr/sbin</filename> instead of
 <filename>/usr/libexec</filename>.</para>
Index: postlfs/security/iptables/iptables-exp.xml
===================================================================
--- postlfs/security/iptables/iptables-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/iptables/iptables-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>PREFIX=/usr</command> : Compiles and installs 
+<para><parameter>PREFIX=/usr</parameter>: Compiles and installs 
 <application>iptables</application> into the 
 <filename class="directory">/usr</filename> hierarchy instead of 
Index: postlfs/security/pam/linux_pam-exp.xml
===================================================================
--- postlfs/security/pam/linux_pam-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/pam/linux_pam-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,14 +2,14 @@
 <title>Command explanations</title>
 
-<para><command>--enable-static-libpam</command> : This switch builds
+<para><option>--enable-static-libpam</option>: This switch builds
 static <acronym>PAM</acronym> libraries as well as the dynamic libraries.</para>
 
-<para><command>--with-mailspool=/var/mail</command> : This switch makes
+<para><option>--with-mailspool=/var/mail</option>: This switch makes
 the mailspool directory <acronym>FHS</acronym> compliant.</para>
 
-<para><command>--enable-read-both-confs</command>  : This switch lets the local administrator choose which configuration file setup to use.</para>
+<para><option>--enable-read-both-confs</option>: This switch lets the local administrator choose which configuration file setup to use.</para>
 
 <para><command>mv /lib/libpam.a /lib/libpam_misc.a /lib/libpamc.a
-/usr/lib</command> : This command moves the static libraries to
+/usr/lib</command>: This command moves the static libraries to
 <filename>/usr/lib</filename> to comply with <acronym>FHS</acronym>.</para>
 
Index: postlfs/security/shadow/shadow-exp.xml
===================================================================
--- postlfs/security/shadow/shadow-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/shadow/shadow-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>cp debian/securetty /etc/securetty</command> : This
+<para><command>cp debian/securetty /etc/securetty</command>: This
 command sets the tty's that allow logins through <acronym>PAM</acronym>.</para>
 
Index: postlfs/security/tripwire/tripwire-config.xml
===================================================================
--- postlfs/security/tripwire/tripwire-config.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/tripwire/tripwire-config.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -38,5 +38,5 @@
 tripwire -m i</command></userinput></screen>
 
-<para>During configuration tripwire will create 2 keys: a site key and
+<para>During configuration tripwire will create two (2) keys: a site key and
  a local key which will be stored in <filename class="directory">/etc/tripwire/
 </filename>.</para>
Index: postlfs/security/tripwire/tripwire-exp.xml
===================================================================
--- postlfs/security/tripwire/tripwire-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/security/tripwire/tripwire-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,17 +2,17 @@
 <title>Command explanations</title>
 
-<para><command>ln -s make /usr/bin/gmake</command> : The reason we create the 
+<para><command>ln -s make /usr/bin/gmake</command>: The reason we create the 
 <command>gmake</command> symlink is that <application>Tripwire</application> 
 will only install if the symlink is present. It may be safely removed after 
 installation.</para>
 
-<para><command>gmake release</command> : This command creates the
+<para><command>gmake release</command>: This command creates the
 <application>Tripwire</application> binaries.</para>
 
-<para><command>cp install.{sh,cfg} .</command> : These are copied to the main
+<para><command>cp install.{sh,cfg} .</command>: These are copied to the main
 <application>Tripwire</application> directory so that the script can be used to 
 install the package.</para>
 
-<para><command>cp policy/*.txt /usr/share/doc/tripwire</command> : This command 
+<para><command>cp policy/*.txt /usr/share/doc/tripwire</command>: This command 
 installs the documentation.</para>
 
Index: postlfs/shells/tcsh/tcsh-exp.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
+++ postlfs/shells/tcsh/tcsh-exp.xml	(revision 3df86b6699190f9397c74c4f8b10ebd603ae5168)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><command>cp tcsh.man /usr/share/man/man1/tcsh.1</command> :
+<para><command>cp tcsh.man /usr/share/man/man1/tcsh.1</command>:
 <application>Tcsh</application> doesn't install its man page correctly, so we do it manually.</para>
 
-<para><command>ln -s /usr/bin/tcsh /bin/csh</command> : The
+<para><command>ln -s /usr/bin/tcsh /bin/csh</command>: The
 <acronym>FHS</acronym> states that
 if there is a <application>C</application> shell installed, there should be a symlink from
