Index: postlfs/config/autofs.xml
===================================================================
--- postlfs/config/autofs.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/config/autofs.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -79,4 +79,7 @@
       </listitem>
     </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/autofs"/></para>
 
   </sect2>
Index: postlfs/config/compressdoc.xml
===================================================================
--- postlfs/config/compressdoc.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/config/compressdoc.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -521,5 +521,5 @@
   <filename class="directory">/usr/X11R6/man</filename>, etc.). Be sure
   to add these locations to the file <filename>/etc/man_db.conf</filename>, as
-  <envar>MANDATORY_MANPATH</envar> <replaceable>[/path]</replaceable>
+  <envar>MANDATORY_MANPATH</envar> <replaceable>&lt;/path&gt;</replaceable>
   lines.</para>
 
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/config/profile.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -387,7 +387,7 @@
       </itemizedlist>
 
-      <para>Replace <replaceable>[ll]</replaceable> with the two-letter code for
+      <para>Replace <replaceable>&lt;ll&gt;</replaceable> with the two-letter code for
       your language (e.g., <quote>en</quote>) and
-      <replaceable>[CC]</replaceable> with the two-letter code for your country
+      <replaceable>&lt;CC&gt;</replaceable> with the two-letter code for your country
       (e.g., <quote>GB</quote>). Also you may need to specify (and this is actually
       the preferred form) your character encoding (e.g., <quote>iso8859-1</quote>)
@@ -407,6 +407,6 @@
 <screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
 <literal># Set up i18n variables
-export LC_ALL=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>
+export LC_ALL=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>
+export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>
 export G_FILENAME_ENCODING=@locale</literal>
 EOF</userinput></screen>
Index: postlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/config/skel.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -131,5 +131,5 @@
   <systemitem class="username">root</systemitem> user):</para>
 
-<screen role="root"><userinput>useradd -m <replaceable>[newuser]</replaceable></userinput></screen>
+<screen role="root"><userinput>useradd -m <replaceable>&lt;newuser&gt;</replaceable></userinput></screen>
 
 </sect1>
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/editors/bluefish.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -74,4 +74,7 @@
     <xref linkend="desktop-file-utils"/> and
     <xref linkend="shared-mime-info"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bluefish"/></para>
 
   </sect2>
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/editors/ed.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -70,4 +70,7 @@
       </listitem>
     </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ed"/></para>
 
   </sect2>
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/editors/emacs.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -71,4 +71,7 @@
     <!-- <xref linkend="giflib"/></para> -->
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/emacs"/></para>
+
   </sect2>
 
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/editors/joe.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -60,4 +60,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/joe"/></para>
+
   </sect2>
 
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/editors/nano.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -64,4 +64,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="slang"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nano"/></para>
 
   </sect2>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/editors/vim.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -89,4 +89,7 @@
     <xref linkend="ruby"/>, and
     <xref linkend="gpm"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/vim"/></para>
 
   </sect2>
Index: postlfs/filesystems/ext3.xml
===================================================================
--- postlfs/filesystems/ext3.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/filesystems/ext3.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -32,8 +32,8 @@
   following line.</para>
 
-<screen><literal>/dev/hd<replaceable>[XX]</replaceable> /mnt_point ext3 defaults 1 1</literal></screen>
+<screen><literal>/dev/hd<replaceable>&lt;XX&gt;</replaceable> /mnt_point ext3 defaults 1 1</literal></screen>
 
   <para>In the above line, replace
-  <filename>/dev/hd<replaceable>[XX]</replaceable></filename> by the
+  <filename>/dev/hd<replaceable>&lt;XX&gt;</replaceable></filename> by the
   partition (e.g., <filename>/dev/hda2</filename>),
   <filename class="directory">/mnt_point</filename> by the mount point (e.g.,
@@ -50,5 +50,5 @@
   following command.</para>
 
-<screen role="root"><userinput>tune2fs -j /dev/hd<replaceable>[XX]</replaceable></userinput></screen>
+<screen role="root"><userinput>tune2fs -j /dev/hd<replaceable>&lt;XX&gt;</replaceable></userinput></screen>
 
   <para>Remount the concerned partitions, or simply reboot if you have
Index: postlfs/filesystems/reiser.xml
===================================================================
--- postlfs/filesystems/reiser.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/filesystems/reiser.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -58,4 +58,7 @@
       </listitem>
     </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/reiser"/></para>
 
   </sect2>
Index: postlfs/filesystems/xfs.xml
===================================================================
--- postlfs/filesystems/xfs.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/filesystems/xfs.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -59,4 +59,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xfs"/></para>
+
   </sect2>
 
@@ -127,5 +130,5 @@
         xfs_db, xfs_freeze, xfs_growfs, xfs_info, xfs_io, xfs_logprint,
         xfs_mkfile, xfs_ncheck, xfs_repair, and xfs_rtcp</seg>
-        <seg>libhandle.[so,a]</seg>
+        <seg>libhandle.{so,a}</seg>
         <seg>/usr/share/doc/xfsprogs</seg>
       </seglistitem>
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/cracklib.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -107,4 +107,7 @@
     <para role="optional"><xref linkend="python"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cracklib"/></para>
+
   </sect2>
 
@@ -219,6 +222,6 @@
         <seg>cracklib-check, cracklib-format, cracklib-packer,
         cracklib-unpacker and create-cracklib-dict</seg>
-        <seg>libcrack.[so,a] and optionally, libcrack_heimdal.[so,a] and
-        cracklibmodule.[so,a] <application>Python</application> module</seg>
+        <seg>libcrack.{so,a} and optionally, libcrack_heimdal.{so,a} and
+        cracklibmodule.{so,a} <application>Python</application> module</seg>
         <seg>/lib/cracklib, /usr/share/dict and /usr/share/cracklib</seg>
       </seglistitem>
@@ -242,10 +245,10 @@
 
       <varlistentry id="libcrack">
-        <term><filename class='libraryfile'>libcrack.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libcrack.{so,a}</filename></term>
         <listitem>
           <para>provides a fast dictionary lookup method for strong
           password enforcement.</para>
           <indexterm zone="cracklib libcrack">
-            <primary sortas="c-libcrack">libcrack.[so,a]</primary>
+            <primary sortas="c-libcrack">libcrack.{so,a}</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/cyrus-sasl.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -91,4 +91,7 @@
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cyrus-sasl"/></para>
+
   </sect2>
 
@@ -202,5 +205,5 @@
       <note>
         <para>You'll need to modify the init script and replace the
-        <option><replaceable>[authmech]</replaceable></option> parameter
+        <option><replaceable>&lt;authmech&gt;</replaceable></option> parameter
         to the <option>-a</option> switch with your desired authentication
         mechanism.</para>
Index: postlfs/security/firewalling.xml
===================================================================
--- postlfs/security/firewalling.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/firewalling.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -390,5 +390,5 @@
         <para>If the interface you're connecting to the Internet
         doesn't connect via PPP, you will need to change
-        <replaceable>ppp+</replaceable> to the name of the interface
+        <replaceable>&lt;ppp+&gt;</replaceable> to the name of the interface
         (e.g., <emphasis role="strong">eth1</emphasis>) which you are
         using.</para>
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/gnupg.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -80,4 +80,7 @@
     <xref linkend="docbook-utils"/>, and <ulink
     url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnupg"/></para>
 
   </sect2>
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/heimdal.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -105,4 +105,7 @@
       and the KDC server is more than 5 minutes.</para>
     </note>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/heimdal"/></para>
 
   </sect2>
@@ -308,16 +311,16 @@
 
 [libdefaults]
-    default_realm = <replaceable>[EXAMPLE.COM]</replaceable>
+    default_realm = <replaceable>&lt;EXAMPLE.COM&gt;</replaceable>
     encrypt = true
 
 [realms]
-    <replaceable>[EXAMPLE.COM]</replaceable> = {
-        kdc = <replaceable>[hostname.example.com]</replaceable>
-        admin_server = <replaceable>[hostname.example.com]</replaceable>
-        kpasswd_server = <replaceable>[hostname.example.com]</replaceable>
+    <replaceable>&lt;EXAMPLE.COM&gt;</replaceable> = {
+        kdc = <replaceable>&lt;hostname.example.com&gt;</replaceable>
+        admin_server = <replaceable>&lt;hostname.example.com&gt;</replaceable>
+        kpasswd_server = <replaceable>&lt;hostname.example.com&gt;</replaceable>
     }
 
 [domain_realm]
-    .<replaceable>[example.com]</replaceable> = <replaceable>[EXAMPLE.COM]</replaceable>
+    .<replaceable>&lt;example.com&gt;</replaceable> = <replaceable>&lt;EXAMPLE.COM&gt;</replaceable>
 
 [logging]
@@ -331,6 +334,6 @@
 
         <para>You will need to substitute your domain and proper hostname
-        for the occurrences of the <replaceable>[hostname]</replaceable>
-        and <replaceable>[EXAMPLE.COM]</replaceable> names.</para>
+        for the occurrences of the <replaceable>&lt;hostname&gt;</replaceable>
+        and <replaceable>&lt;EXAMPLE.COM&gt;</replaceable> names.</para>
 
         <para><option>default_realm</option> should be the name of your
@@ -372,5 +375,5 @@
         statement:</para>
 
-<screen role="root"><userinput>init <replaceable>[EXAMPLE.COM]</replaceable></userinput></screen>
+<screen role="root"><userinput>init <replaceable>&lt;EXAMPLE.COM&gt;</replaceable></userinput></screen>
 
         <para>The database must now be populated with at least one principle
@@ -379,15 +382,15 @@
         statement:</para>
 
-<screen role="root"><userinput>add <replaceable>[loginname]</replaceable></userinput></screen>
+<screen role="root"><userinput>add <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
 
         <para>The KDC server and any machine running kerberized
         server daemons must have a host key installed:</para>
 
-<screen role="root"><userinput>add --random-key host/<replaceable>[hostname.example.com]</replaceable></userinput></screen>
+<screen role="root"><userinput>add --random-key host/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
 
         <para>After choosing the defaults when prompted, you will have to
         export the data to a keytab file:</para>
 
-<screen role="root"><userinput>ext host/<replaceable>[hostname.example.com]</replaceable></userinput></screen>
+<screen role="root"><userinput>ext host/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
 
         <para>This should have created two files in
@@ -402,9 +405,9 @@
         way you created the host principles. Below is an example:</para>
 
-<screen role="root"><userinput>add --random-key ftp/<replaceable>[hostname.example.com]</replaceable></userinput></screen>
+<screen role="root"><userinput>add --random-key ftp/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
 
         <para>(choose the defaults)</para>
 
-<screen role="root"><userinput>ext ftp/<replaceable>[hostname.example.com]</replaceable></userinput></screen>
+<screen role="root"><userinput>ext ftp/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
 
         <para>Exit the <command>kadmin</command> program (use
@@ -418,5 +421,5 @@
         the following command:</para>
 
-<screen><userinput>kinit <replaceable>[loginname]</replaceable></userinput></screen>
+<screen><userinput>kinit <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
 
         <para>You will be prompted for the password you created. After you get
@@ -477,8 +480,8 @@
         unused port number. Add an entry to the <filename>services</filename>
         file similar to the entry below (substitute your chosen port number
-        for <replaceable>[49150]</replaceable>):</para>
-
-<screen><literal>kx              <replaceable>[49150]</replaceable>/tcp   # Heimdal kerberos X
-kx              <replaceable>[49150]</replaceable>/udp   # Heimdal kerberos X</literal></screen>
+        for <replaceable>&lt;49150&gt;</replaceable>):</para>
+
+<screen><literal>kx              <replaceable>&lt;49150&gt;</replaceable>/tcp   # Heimdal kerberos X
+kx              <replaceable>&lt;49150&gt;</replaceable>/udp   # Heimdal kerberos X</literal></screen>
 
         <para>For additional information consult <ulink
@@ -508,8 +511,8 @@
         telnet, telnetd, tenletxr, truncate-log, verify_krb5_conf
         and xnlock</seg>
-        <seg>libasn1.[so,a], libeditline.[so,a], libgssapi.[so,a],
-        libhdb.[so,a], libkadm5clnt.[so,a], libkadm5srv.[so,a], libkafs.[so,a],
-        libkrb5.[so,a], libotp.[so,a], libroken.[so,a], libsl.[so,a]
-        and libss.[so,a]</seg>
+        <seg>libasn1.{so,a}, libeditline.{so,a}, libgssapi.{so,a},
+        libhdb.{so,a}, libkadm5clnt.{so,a}, libkadm5srv.{so,a}, libkafs.{so,a},
+        libkrb5.{so,a}, libotp.{so,a}, libroken.{so,a}, libsl.{so,a}
+        and libss.{so,a}</seg>
         <seg>/etc/heimdal, /usr/include/kadm5,
         /usr/share/doc/heimdal-&heimdal-version; and /var/lib/heimdal</seg>
@@ -975,10 +978,10 @@
 
       <varlistentry id="libasn1">
-        <term><filename class='libraryfile'>libasn1.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libasn1.{so,a}</filename></term>
         <listitem>
           <para>provides the ASN.1 and DER functions to encode and decode
           the Kerberos TGTs.</para>
           <indexterm zone="heimdal libasn1">
-            <primary sortas="c-libasn1">libasn1.[so,a]</primary>
+            <primary sortas="c-libasn1">libasn1.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -996,5 +999,5 @@
 
       <varlistentry id="libgssapi">
-        <term><filename class='libraryfile'>libgssapi.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgssapi.{so,a}</filename></term>
         <listitem>
           <para>contain the Generic Security Service Application Programming
@@ -1004,5 +1007,5 @@
           portability of applications to different environments.</para>
           <indexterm zone="heimdal libgssapi">
-            <primary sortas="c-libgssapi">libgssapi.[so,a]</primary>
+            <primary sortas="c-libgssapi">libgssapi.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1010,10 +1013,10 @@
 
       <varlistentry id="libhdb">
-        <term><filename class='libraryfile'>libhdb.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libhdb.{so,a}</filename></term>
         <listitem>
           <para>is a <application>Heimdal</application> Kerberos 5
           authentication/authorization database access library.</para>
           <indexterm zone="heimdal libhdb">
-            <primary sortas="c-libhdb">libhdb.[so,a]</primary>
+            <primary sortas="c-libhdb">libhdb.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1021,10 +1024,10 @@
 
       <varlistentry id="libkadm5clnt">
-        <term><filename class='libraryfile'>libkadm5clnt.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkadm5clnt.{so,a}</filename></term>
         <listitem>
           <para>contains the administrative authentication and password
           checking functions required by Kerberos 5 client-side programs.</para>
           <indexterm zone="heimdal libkadm5clnt">
-            <primary sortas="c-libkadm5clnt">libkadm5clnt.[so,a]</primary>
+            <primary sortas="c-libkadm5clnt">libkadm5clnt.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1032,10 +1035,10 @@
 
       <varlistentry id="libkadm5srv">
-        <term><filename class='libraryfile'>libkadm5srv.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkadm5srv.{so,a}</filename></term>
         <listitem>
           <para>contain the administrative authentication and password
           checking functions required by Kerberos 5 servers.</para>
           <indexterm zone="heimdal libkadm5srv">
-            <primary sortas="c-libkadm5srv">libkadm5srv.[so,a]</primary>
+            <primary sortas="c-libkadm5srv">libkadm5srv.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1043,9 +1046,9 @@
 
       <varlistentry id="libkafs">
-        <term><filename class='libraryfile'>libkafs.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkafs.{so,a}</filename></term>
         <listitem>
           <para>contains the functions required to authenticated to AFS.</para>
           <indexterm zone="heimdal libkafs">
-            <primary sortas="c-libkafs">libkafs.[so,a]</primary>
+            <primary sortas="c-libkafs">libkafs.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1053,9 +1056,9 @@
 
       <varlistentry id="libkrb5">
-        <term><filename class='libraryfile'>libkrb5.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkrb5.{so,a}</filename></term>
         <listitem>
           <para>is an all-purpose Kerberos 5 library.</para>
           <indexterm zone="heimdal libkrb5">
-            <primary sortas="c-libkrb5">libkrb5.[so,a]</primary>
+            <primary sortas="c-libkrb5">libkrb5.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1063,10 +1066,10 @@
 
       <varlistentry id="libotp">
-        <term><filename class='libraryfile'>libotp.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libotp.{so,a}</filename></term>
         <listitem>
           <para>contains the functions required to handle authenticating
           one time passwords.</para>
           <indexterm zone="heimdal libotp">
-            <primary sortas="c-libotp">libotp.[so,a]</primary>
+            <primary sortas="c-libotp">libotp.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -1074,10 +1077,10 @@
 
       <varlistentry id="libroken">
-        <term><filename class='libraryfile'>libroken.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libroken.{so,a}</filename></term>
         <listitem>
           <para>is a library containing Kerberos 5 compatibility
           functions.</para>
           <indexterm zone="heimdal libroken">
-            <primary sortas="c-libroken">libroken.[so,a]</primary>
+            <primary sortas="c-libroken">libroken.{so,a}</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/iptables.xml
===================================================================
--- postlfs/security/iptables.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/iptables.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -63,4 +63,7 @@
       </listitem>
     </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/iptables"/></para>
 
 </sect2>
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/linux-pam.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -85,4 +85,7 @@
     <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/linux-pam"/></para>
+
   </sect2>
 
@@ -246,5 +249,5 @@
       <seglistitem>
         <seg>pam_tally</seg>
-        <seg>libpam.[so,a], libpamc.[so,a], and libpam_misc.[so,a]</seg>
+        <seg>libpam.{so,a}, libpamc.{so,a}, and libpam_misc.{so,a}</seg>
         <seg>/etc/pam.d, /etc/security, /lib/security and
         /usr/include/security</seg>
@@ -269,10 +272,10 @@
 
       <varlistentry id="libpam">
-        <term><filename class='libraryfile'>libpam.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libpam.{so,a}</filename></term>
         <listitem>
           <para>provides the interfaces between applications and the
           PAM modules.</para>
           <indexterm zone="linux-pam libpam">
-            <primary sortas="c-libpam">libpam.[so,a]</primary>
+            <primary sortas="c-libpam">libpam.{so,a}</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/mitkrb.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -78,4 +78,7 @@
     </note>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mitkrb"/></para>
+
   </sect2>
 
@@ -208,15 +211,15 @@
 
 [libdefaults]
-    default_realm = <replaceable>[LFS.ORG]</replaceable>
+    default_realm = <replaceable>&lt;LFS.ORG&gt;</replaceable>
     encrypt = true
 
 [realms]
-    <replaceable>[LFS.ORG]</replaceable> = {
-        kdc = <replaceable>[belgarath.lfs.org]</replaceable>
-        admin_server = <replaceable>[belgarath.lfs.org]</replaceable>
+    <replaceable>&lt;LFS.ORG&gt;</replaceable> = {
+        kdc = <replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
+        admin_server = <replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
     }
 
 [domain_realm]
-    .<replaceable>[lfs.org]</replaceable> = <replaceable>[LFS.ORG]</replaceable>
+    .<replaceable>&lt;lfs.org&gt;</replaceable> = <replaceable>&lt;LFS.ORG&gt;</replaceable>
 
 [logging]
@@ -229,6 +232,6 @@
 
         <para>You will need to substitute your domain and proper hostname
-        for the occurances of the <replaceable>[belgarath]</replaceable> and
-        <replaceable>[lfs.org]</replaceable> names.</para>
+        for the occurances of the <replaceable>&lt;belgarath&gt;</replaceable> and
+        <replaceable>&lt;lfs.org&gt;</replaceable> names.</para>
 
         <para><option>default_realm</option> should be the name of your
@@ -250,5 +253,5 @@
         <para>Create the KDC database:</para>
 
-<screen role="root"><userinput>kdb5_util create -r <replaceable>[LFS.ORG]</replaceable> -s</userinput></screen>
+<screen role="root"><userinput>kdb5_util create -r <replaceable>&lt;LFS.ORG&gt;</replaceable> -s</userinput></screen>
 
         <para>Now you should populate the database with principles
@@ -258,15 +261,15 @@
 <screen role="root"><userinput>kadmin.local
 <prompt>kadmin:</prompt> add_policy dict-only
-<prompt>kadmin:</prompt> addprinc -policy dict-only <replaceable>[loginname]</replaceable></userinput></screen>
+<prompt>kadmin:</prompt> addprinc -policy dict-only <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
 
         <para>The KDC server and any machine running kerberized
         server daemons must have a host key installed:</para>
 
-<screen role='root'><userinput><prompt>kadmin:</prompt> addprinc -randkey host/<replaceable>[belgarath.lfs.org]</replaceable></userinput></screen>
+<screen role='root'><userinput><prompt>kadmin:</prompt> addprinc -randkey host/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
 
         <para>After choosing the defaults when prompted, you will have to
         export the data to a keytab file:</para>
 
-<screen role='root'><userinput><prompt>kadmin:</prompt> ktadd host/<replaceable>[belgarath.lfs.org]</replaceable></userinput></screen>
+<screen role='root'><userinput><prompt>kadmin:</prompt> ktadd host/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
 
         <para>This should have created a file in
@@ -281,6 +284,6 @@
         way you created the host principles. Below is an example:</para>
 
-<screen role='root'><userinput><prompt>kadmin:</prompt> addprinc -randkey ftp/<replaceable>[belgarath.lfs.org]</replaceable>
-<prompt>kadmin:</prompt> ktadd ftp/<replaceable>[belgarath.lfs.org]</replaceable></userinput></screen>
+<screen role='root'><userinput><prompt>kadmin:</prompt> addprinc -randkey ftp/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
+<prompt>kadmin:</prompt> ktadd ftp/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
 
         <para>Exit the <command>kadmin</command> program (use
@@ -293,5 +296,5 @@
         <para>Attempt to get a ticket with the following command:</para>
 
-<screen><userinput>kinit <replaceable>[loginname]</replaceable></userinput></screen>
+<screen><userinput>kinit <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
 
         <para>You will be prompted for the password you created. After you
@@ -387,7 +390,7 @@
         rsh, sclient, sim_client, sim_server, sserver, telnet, telnetd,
         uuclient, uuserver, v5passwd, and v5passwdd</seg>
-        <seg>libcom_err.[so,a], libdes425.[so,a], libgssapi.[so,a],
-        libgssrpc.[so,a], libkadm5clnt.[so,a], libkadm5srv.[so,a],
-        libkdb5.[so,a], libkrb5.[so,a], and libkrb4.[so,a]</seg>
+        <seg>libcom_err.{so,a}, libdes425.{so,a}, libgssapi.{so,a},
+        libgssrpc.{so,a}, libkadm5clnt.{so,a}, libkadm5srv.{so,a},
+        libkdb5.{so,a}, libkrb5.{so,a}, and libkrb4.{so,a}</seg>
         <seg>/usr/include/kerberosIV and /var/lib/krb5kdc</seg>
       </seglistitem>
@@ -675,9 +678,9 @@
 
       <varlistentry id="libcom_err">
-        <term><filename class='libraryfile'>libcom_err.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libcom_err.{so,a}</filename></term>
         <listitem>
           <para>implements the Kerberos library error code.</para>
           <indexterm zone="mitkrb libcom_err">
-            <primary sortas="c-libcom_err">libcom_err.[so,a]</primary>
+            <primary sortas="c-libcom_err">libcom_err.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -685,5 +688,5 @@
 
       <varlistentry id="libgssapi-mitkrb">
-        <term><filename class='libraryfile'>libgssapi.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgssapi.{so,a}</filename></term>
         <listitem>
           <para>contain the Generic Security Service Application
@@ -693,5 +696,5 @@
           portability of applications to different environments.</para>
           <indexterm zone="mitkrb libgssapi">
-            <primary sortas="c-libgssapi">libgssapi.[so,a]</primary>
+            <primary sortas="c-libgssapi">libgssapi.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -699,10 +702,10 @@
 
       <varlistentry id="libkadm5clnt-mitkrb">
-        <term><filename class='libraryfile'>libkadm5clnt.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkadm5clnt.{so,a}</filename></term>
         <listitem>
           <para>contains the administrative authentication and password
           checking functions required by Kerberos 5 client-side programs.</para>
           <indexterm zone="mitkrb libkadm5clnt">
-            <primary sortas="c-libkadm5clnt">libkadm5clnt.[so,a]</primary>
+            <primary sortas="c-libkadm5clnt">libkadm5clnt.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -710,10 +713,10 @@
 
       <varlistentry id="libkadm5srv-mitkrb">
-        <term><filename class='libraryfile'>libkadm5srv.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkadm5srv.{so,a}</filename></term>
         <listitem>
           <para>contain the administrative authentication and password
           checking functions required by Kerberos 5 servers.</para>
           <indexterm zone="mitkrb libkadm5srv">
-            <primary sortas="c-libkadm5srv">libkadm5srv.[so,a]</primary>
+            <primary sortas="c-libkadm5srv">libkadm5srv.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -721,10 +724,10 @@
 
       <varlistentry id="libkdb5">
-        <term><filename class='libraryfile'>libkdb5.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkdb5.{so,a}</filename></term>
         <listitem>
           <para>is a Kerberos 5 authentication/authorization database
           access library.</para>
           <indexterm zone="mitkrb libkdb5">
-            <primary sortas="c-libkdb5">libkdb5.[so,a]</primary>
+            <primary sortas="c-libkdb5">libkdb5.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -732,9 +735,9 @@
 
       <varlistentry id="libkrb5-mitkrb">
-        <term><filename class='libraryfile'>libkrb5.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libkrb5.{so,a}</filename></term>
         <listitem>
           <para>is an all-purpose Kerberos 5 library.</para>
           <indexterm zone="mitkrb libkrb5">
-            <primary sortas="c-libkrb5">libkrb5.[so,a]</primary>
+            <primary sortas="c-libkrb5">libkrb5.{so,a}</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/nss.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -92,4 +92,7 @@
     -->
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nss"/></para>
+
   </sect2>
 
@@ -124,5 +127,5 @@
 <screen><userinput>bash
 
-export DOMSUF=<replaceable>[validdomain.name]</replaceable> &amp;&amp;
+export DOMSUF=<replaceable>&lt;validdomain.name&gt;</replaceable> &amp;&amp;
 export PATH=$PATH:$WORKINGDIR/mozilla/dist/$NSS_LINUXDIR/bin &amp;&amp;
 export TEST_RESULTSDIR=$WORKINGDIR/mozilla/tests_results/security &amp;&amp;
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/openssl.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -158,5 +158,5 @@
       <seglistitem>
         <seg>c_rehash, openssl, and openssl_fips_fingerprint</seg>
-        <seg>libcrypto.[so,a] and libssl.[so,a]</seg>
+        <seg>libcrypto.{so,a} and libssl.{so,a}</seg>
         <seg>/etc/ssl and /usr/include/ssl</seg>
       </seglistitem>
@@ -194,5 +194,5 @@
 
       <varlistentry id="libcrypto">
-        <term><filename class='libraryfile'>libcrypto.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libcrypto.{so,a}</filename></term>
         <listitem>
           <para>implements a wide range of cryptographic algorithms used in
@@ -203,5 +203,5 @@
           and other cryptographic standards.</para>
           <indexterm zone="openssl libcrypto">
-            <primary sortas="c-libcrypto">libcrypto.[so,a]</primary>
+            <primary sortas="c-libcrypto">libcrypto.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -209,5 +209,5 @@
 
       <varlistentry id="libssl">
-        <term><filename class='libraryfile'>libssl.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libssl.{so,a}</filename></term>
         <listitem>
           <para>implements the Secure Sockets Layer (SSL v2/v3) and Transport
@@ -215,5 +215,5 @@
           on which can be found by running <command>man 3 ssl</command>.</para>
           <indexterm zone="openssl libssl">
-            <primary sortas="c-libssl">libssl.[so,a]</primary>
+            <primary sortas="c-libssl">libssl.{so,a}</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/shadow.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -81,4 +81,7 @@
     <para role="required"><xref linkend="linux-pam"/> and/or
     <xref linkend="cracklib"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/shadow"/></para>
 
   </sect2>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/stunnel.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -72,4 +72,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="tcpwrappers"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/stunnel"/></para>
 
   </sect2>
@@ -101,8 +104,8 @@
 
 <screen><literal>-----BEGIN RSA PRIVATE KEY-----
-<replaceable>[many encrypted lines of unencrypted key]</replaceable>
+<replaceable>&lt;many encrypted lines of unencrypted key&gt;</replaceable>
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-<replaceable>[many encrypted lines of certificate]</replaceable>
+<replaceable>&lt;many encrypted lines of certificate&gt;</replaceable>
 -----END CERTIFICATE-----</literal></screen>
     </note>
@@ -201,12 +204,12 @@
     configuration file. The format is as follows:</para>
 
-<screen><literal>[<replaceable>[service]</replaceable>]
-accept  = <replaceable>[hostname:portnumber]</replaceable>
-connect = <replaceable>[hostname:portnumber]</replaceable></literal></screen>
+<screen><literal>[<replaceable>&lt;service&gt;</replaceable>]
+accept  = <replaceable>&lt;hostname:portnumber&gt;</replaceable>
+connect = <replaceable>&lt;hostname:portnumber&gt;</replaceable></literal></screen>
 
       <para>If you use <application>Stunnel</application> to encrypt a daemon
       started from <command>[x]inetd</command>, you may need to disable that
       daemon in the <filename>/etc/[x]inetd.conf</filename> file and enable a
-      corresponding <replaceable>[service]</replaceable>_stunnel service. You
+      corresponding <replaceable>&lt;service&gt;</replaceable>_stunnel service. You
       may have to add an appropriate entry in <filename>/etc/services</filename>
       as well.</para>
@@ -264,5 +267,5 @@
           <para> is a program designed to work as an SSL
           encryption wrapper between remote clients and local
-          (<command>[x]inetd</command>-startable) or remote servers.</para>
+          (<command>{x}inetd</command>-startable) or remote servers.</para>
           <indexterm zone="stunnel stunnel-prog">
             <primary sortas="b-stunnel">stunnel</primary>
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/sudo.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -75,4 +75,7 @@
 -->
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sudo"/></para>
+
   </sect2>
 
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/security/tripwire.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -63,4 +63,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">MTA (See <xref linkend="server-mail"/>)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tripwire"/></para>
 
   </sect2>
@@ -185,8 +188,8 @@
       <systemitem class='username'>root</systemitem> user, type
       in the following command making the appropriate substitutions for
-      <replaceable>[?]</replaceable>:</para>
+      <replaceable>&lt;?&gt;</replaceable>:</para>
 
 <screen role="root"><userinput>tripwire --update -twrfile \
-    /var/lib/tripwire/report/linux-<replaceable>[???????]</replaceable>-<replaceable>[??????]</replaceable>.twr</userinput></screen>
+    /var/lib/tripwire/report/linux-<replaceable>&lt;???????&gt;</replaceable>-<replaceable>&lt;??????&gt;</replaceable>.twr</userinput></screen>
 
       <para>You will be placed into <application>vim</application> with a copy
Index: postlfs/shells/ash.xml
===================================================================
--- postlfs/shells/ash.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/shells/ash.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -72,4 +72,7 @@
       </listitem>
     </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ash"/></para>
 
   </sect2>
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/shells/tcsh.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -71,4 +71,7 @@
       </listitem>
     </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tcsh"/></para>
 
   </sect2>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
+++ postlfs/shells/zsh.xml	(revision 3597eb66fbc1d763029fbe86cae0c57e9d44b65f)
@@ -66,4 +66,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pcre"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/zsh"/></para>
 
   </sect2>
