Index: postlfs/security/gnupg/gnupg-exp.xml
===================================================================
--- postlfs/security/gnupg/gnupg-exp.xml	(revision 2df36e4199b6e8fb5e77f8651abba6ce7abce96c)
+++ postlfs/security/gnupg/gnupg-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
@@ -2,7 +2,8 @@
 <title>Command explanations</title>
 
-<para><parameter>--libexecdir=/usr/sbin</parameter>: This command
-creates a <filename>gnupg</filename> directory in <filename>/usr/sbin</filename> instead of
-<filename>/usr/libexec</filename>.</para>
+<para><parameter>--libexecdir=/usr/lib</parameter>: This command
+creates a <filename class="directory">gnupg</filename> directory in
+<filename class="directory">/usr/sbin</filename> instead of
+<filename class="directory">/usr/libexec</filename>.</para>
 
 </sect2>
Index: postlfs/security/gnupg/gnupg-inst.xml
===================================================================
--- postlfs/security/gnupg/gnupg-inst.xml	(revision 2df36e4199b6e8fb5e77f8651abba6ce7abce96c)
+++ postlfs/security/gnupg/gnupg-inst.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
@@ -4,5 +4,5 @@
 <para>Install <application>GnuPG</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
Index: postlfs/security/pam/linux_pam-desc.xml
===================================================================
--- postlfs/security/pam/linux_pam-desc.xml	(revision 2df36e4199b6e8fb5e77f8651abba6ce7abce96c)
+++ postlfs/security/pam/linux_pam-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
@@ -3,5 +3,6 @@
 
 <para>The <application>Linux-<acronym>PAM</acronym></application> package 
-contains <command>unix-chkpwd</command> and <filename>libpam</filename> 
+contains <command>unix-chkpwd</command> and <filename
+class="libraryfile">libpam</filename> 
 libraries.</para>
 
@@ -14,5 +15,5 @@
 
 <sect3><title>libpam libraries</title>
-<para><filename>libpam</filename> libraries provide the interfaces between 
+<para><filename class="libraryfile">libpam</filename> libraries provide the interfaces between 
 applications and the modules included with <acronym>PAM</acronym>.</para></sect3>
 
Index: postlfs/security/shadow/shadow-config.xml
===================================================================
--- postlfs/security/shadow/shadow-config.xml	(revision 2df36e4199b6e8fb5e77f8651abba6ce7abce96c)
+++ postlfs/security/shadow/shadow-config.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
@@ -14,5 +14,5 @@
 
 <para>Add the following <application><acronym>PAM</acronym></application> 
-configuration files to <filename>/etc/pam.d</filename> (or add them to
+configuration files to <filename class="directory">/etc/pam.d</filename> (or add them to
 <filename>/etc/pam.conf</filename> with the additional field for the program).
 </para>
Index: postlfs/security/tripwire/tripwire-config.xml
===================================================================
--- postlfs/security/tripwire/tripwire-config.xml	(revision 2df36e4199b6e8fb5e77f8651abba6ce7abce96c)
+++ postlfs/security/tripwire/tripwire-config.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
@@ -3,5 +3,5 @@
 
 <sect3><title>Config files</title>
-<para><filename>/etc/tripwire</filename></para>
+<para><filename class="directory">/etc/tripwire</filename></para>
 </sect3>
 
@@ -10,5 +10,5 @@
 <para><application>Tripwire</application> uses a policy file to determine which 
 files integrity are checked. The default policy file (<filename>twpol.txt
-</filename> found in <filename>/etc/tripwire/</filename>) is for a default 
+</filename> found in <filename class="directory">/etc/tripwire/</filename>) is for a default 
 installation of Redhat 7.0 and is woefully outdated.</para>
 
@@ -23,7 +23,7 @@
 Custom policy file for SuSE 7.2 system</screen>
 
-<para>Download the custom policy file you'd like to try, copy it into <filename>
-/etc/tripwire/</filename>, and use it instead of <filename>twpol.txt
-</filename>. It is, however, recommended that you make your own policy file. 
+<para>Download the custom policy file you'd like to try, copy it into
+<filename class="directory">/etc/tripwire/</filename>, and use it instead of 
+<filename>twpol.txt</filename>. It is, however, recommended that you make your own policy file. 
 Get ideas from the examples above and read <filename>
 /usr/share/doc/tripwire/policyguide.txt</filename>. <filename>twpol.txt
@@ -32,11 +32,11 @@
 changes for uninstallation of software.</para>
 
-<para>After your policy file has been transferred to <filename>/etc/tripwire/
-</filename> you may begin the configuration steps:</para>
+<para>After your policy file has been transferred to <filename
+class="directory">/etc/tripwire/</filename> you may begin the configuration steps:</para>
 
 <screen><userinput><command>twadmin -m P /etc/tripwire/twpol.txt &amp;&amp;
 tripwire -m i</command></userinput></screen>
 
-<para>During configuration tripwire will create two (2) keys: a site key and
+<para>During configuration <application>Tripwire</application> will create two (2) keys: a site key and
  a local key which will be stored in <filename class="directory">/etc/tripwire/
 </filename>.</para>
@@ -56,11 +56,13 @@
 
 <para>Please note that after you run an integrity check, you must check
-the report or email and then modify the tripwire database of the files
-on your system so that tripwire will not continually notify you that
+the report or email and then modify the
+<application>Tripwire</application> database of the files
+on your system so that <application>Tripwire</application> will not continually notify you that
 files you intentionally changed are a security violation. To do this you
 must first <command>ls /var/lib/tripwire/report/</command> and note
 the name of the newest file which starts with <filename>linux-</filename> and 
 ends in <filename>.twr</filename>. This encrypted file was created during the 
-last report creation and is needed to update the tripwire database of your 
+last report creation and is needed to update the
+<application>Tripwire</application> database of your 
 system. Then, type in the following command making the appropriate 
 substitutions for '?':</para>
