Added the 'User Notes' wiki link to each package page; changed all instances of .[so,a] to .{so,a} (brackets changed to braces); changed all replaceable tags to use angle brackets instead of square brackets to encapsulate the text - commit #7

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5835 af4574ff-66df-0310-9fd7-8a98e5e911e0

postlfs/config/autofs.xml

@@ -79,6 +79,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/autofs"/></para>
+
   </sect2>
 
   <sect2 role="kernel" id="autofs-kernel">

postlfs/config/compressdoc.xml

@@ -520,7 +520,7 @@ EOF</userinput></screen>
   install their documentation in non-standard places (such as
   <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>
 
   <para>Example:</para>

postlfs/config/profile.xml

@@ -386,9 +386,9 @@ EOF</userinput></screen>
         </listitem>
       </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>)
       after a dot (so that the result is <quote>en_GB.iso8859-1</quote>). Issue the
@@ -406,8 +406,8 @@ EOF</userinput></screen>
 
 <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 LC_ALL=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>
+export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>
 export G_FILENAME_ENCODING=@locale</literal>
 EOF</userinput></screen>
 

postlfs/config/skel.xml

@@ -130,6 +130,6 @@ SKEL=/etc/skel
   overridden) to the new user's home directory.  For example (perform as the
   <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>

postlfs/editors/bluefish.xml

@@ -74,6 +74,9 @@
     <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>
 
   <sect2 role="installation">

postlfs/editors/ed.xml

@@ -70,6 +70,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ed"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/editors/emacs.xml

@@ -70,6 +70,9 @@
     url="http://sourceforge.net/projects/libungif">libungif</ulink></para>
     <!-- <xref linkend="giflib"/></para> -->
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/emacs"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/editors/joe.xml

@@ -59,6 +59,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/joe"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/editors/nano.xml

@@ -64,6 +64,9 @@
     <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>
 
   <sect2 role="installation">

postlfs/editors/vim.xml

@@ -89,6 +89,9 @@
     <xref linkend="ruby"/>, and
     <xref linkend="gpm"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/vim"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/filesystems/ext3.xml

@@ -31,10 +31,10 @@
   want to convert into ext3, edit the entry so that it looks similar to the
   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.,
   <filename class="directory">/home</filename>). The <option>1</option> in the
@@ -49,7 +49,7 @@
   /etc/fstab</filename>, enable the journal for the partition by running the
   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
   recompiled the kernel to enable ext3 support.</para>

postlfs/filesystems/reiser.xml

@@ -58,6 +58,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/reiser"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/filesystems/xfs.xml

@@ -58,6 +58,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xfs"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -126,7 +129,7 @@ ln -sv ../../lib/libhandle.so.1 /usr/lib/libhandle.so</userinput></screen>
         <seg>fsck.xfs, mkfs.xfs, xfs_admin, xfs_bmap, xfs_check, xfs_copy,
         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>
     </segmentedlist>

postlfs/security/cracklib.xml

@@ -106,6 +106,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="python"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cracklib"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -218,8 +221,8 @@ create-cracklib-dict /usr/share/dict/cracklib-words \
       <seglistitem>
         <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
+        <seg>libcrack.{so,a} and optionally, libcrack_heimdal.{so,a} and
-        cracklibmodule.[so,a] <application>Python</application> module</seg>
+        cracklibmodule.{so,a} <application>Python</application> module</seg>
         <seg>/lib/cracklib, /usr/share/dict and /usr/share/cracklib</seg>
       </seglistitem>
     </segmentedlist>
@@ -241,12 +244,12 @@ create-cracklib-dict /usr/share/dict/cracklib-words \
       </varlistentry>
 
       <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>
       </varlistentry>

postlfs/security/cyrus-sasl.xml

@@ -90,6 +90,9 @@
     <ulink url="http://sqlite.org/">SQLite</ulink>, and
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cyrus-sasl"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -201,7 +204,7 @@ install -v -m700 -d /var/lib/sasl</userinput></screen>
 
       <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>
       </note>

postlfs/security/firewalling.xml

@@ -389,7 +389,7 @@ chmod 700 /etc/rc.d/rc.iptables</userinput></screen>
       <note>
         <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>
       </note>

postlfs/security/gnupg.xml

@@ -80,6 +80,9 @@
     <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>
 
   <sect2 role="installation">

postlfs/security/heimdal.xml

@@ -105,6 +105,9 @@
       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>
 
   <sect2 role="installation">
@@ -307,18 +310,18 @@ cat &gt; /etc/heimdal/krb5.conf &lt;&lt; "EOF"
 <literal># Begin /etc/heimdal/krb5.conf
 
 [libdefaults]
-    default_realm = <replaceable>[EXAMPLE.COM]</replaceable>
+    default_realm = <replaceable>&lt;EXAMPLE.COM&gt;</replaceable>
     encrypt = true
 
 [realms]
-    <replaceable>[EXAMPLE.COM]</replaceable> = {
+    <replaceable>&lt;EXAMPLE.COM&gt;</replaceable> = {
-        kdc = <replaceable>[hostname.example.com]</replaceable>
+        kdc = <replaceable>&lt;hostname.example.com&gt;</replaceable>
-        admin_server = <replaceable>[hostname.example.com]</replaceable>
+        admin_server = <replaceable>&lt;hostname.example.com&gt;</replaceable>
-        kpasswd_server = <replaceable>[hostname.example.com]</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]
     kdc = FILE:/var/log/kdc.log
@@ -330,8 +333,8 @@ EOF
 chmod -v 644 /etc/heimdal/krb5.conf</userinput></screen>
 
         <para>You will need to substitute your domain and proper hostname
-        for the occurrences of the <replaceable>[hostname]</replaceable>
+        for the occurrences of the <replaceable>&lt;hostname&gt;</replaceable>
-        and <replaceable>[EXAMPLE.COM]</replaceable> names.</para>
+        and <replaceable>&lt;EXAMPLE.COM&gt;</replaceable> names.</para>
 
         <para><option>default_realm</option> should be the name of your
         domain changed to ALL CAPS. This isn't required, but both
@@ -371,24 +374,24 @@ kstash</userinput></screen>
         <para>At the <prompt>kadmin&gt;</prompt> prompt, issue the following
         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
         (user). For now, just use your regular login name or root. You may
         create as few, or as many principles as you wish using the following
         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
         <filename class="directory">/etc/heimdal</filename>:
@@ -401,11 +404,11 @@ kstash</userinput></screen>
         database and extract them to the keytab file. You do this in the same
         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
         <command>quit</command> or <command>exit</command>) and return back
@@ -417,7 +420,7 @@ kstash</userinput></screen>
         <para>Attempt to get a TGT (ticket granting 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 get
         your ticket, you should list it with the following command:</para>
@@ -476,10 +479,10 @@ kstash</userinput></screen>
         for the 'kx' service in the IANA database, so you'll have to pick an
         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>
+        for <replaceable>&lt;49150&gt;</replaceable>):</para>
 
-<screen><literal>kx              <replaceable>[49150]</replaceable>/tcp   # Heimdal kerberos X
+<screen><literal>kx              <replaceable>&lt;49150&gt;</replaceable>/tcp   # Heimdal kerberos X
-kx              <replaceable>[49150]</replaceable>/udp   # Heimdal kerberos X</literal></screen>
+kx              <replaceable>&lt;49150&gt;</replaceable>/udp   # Heimdal kerberos X</literal></screen>
 
         <para>For additional information consult <ulink
         url="&hints-root;/downloads/files/heimdal.txt">the
@@ -507,10 +510,10 @@ kx              <replaceable>[49150]</replaceable>/udp   # Heimdal kerberos X</l
         push, rcp, replay_log, rsh, rshd, rxtelnet, rxterm, string2key, su,
         telnet, telnetd, tenletxr, truncate-log, verify_krb5_conf
         and xnlock</seg>
-        <seg>libasn1.[so,a], libeditline.[so,a], libgssapi.[so,a],
+        <seg>libasn1.{so,a}, libeditline.{so,a}, libgssapi.{so,a},
-        libhdb.[so,a], libkadm5clnt.[so,a], libkadm5srv.[so,a], libkafs.[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]
+        libkrb5.{so,a}, libotp.{so,a}, libroken.{so,a}, libsl.{so,a}
-        and libss.[so,a]</seg>
+        and libss.{so,a}</seg>
         <seg>/etc/heimdal, /usr/include/kadm5,
         /usr/share/doc/heimdal-&heimdal-version; and /var/lib/heimdal</seg>
       </seglistitem>
@@ -974,12 +977,12 @@ kx              <replaceable>[49150]</replaceable>/udp   # Heimdal kerberos X</l
       </varlistentry>
 
       <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>
       </varlistentry>
@@ -995,7 +998,7 @@ kx              <replaceable>[49150]</replaceable>/udp   # Heimdal kerberos X</l
       </varlistentry>
 
       <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
           Interface (GSSAPI) functions which provides security
@@ -1003,82 +1006,82 @@ kx              <replaceable>[49150]</replaceable>/udp   # Heimdal kerberos X</l
           underlying mechanisms and technologies and hence allowing source-level
           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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>

postlfs/security/iptables.xml

@@ -63,6 +63,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/iptables"/></para>
+
 </sect2>
 
   <sect2 role="kernel" id='iptables-kernel'>

postlfs/security/linux-pam.xml

@@ -84,6 +84,9 @@
     <ulink url="http://www.prelude-ids.org/">Prelude</ulink>, and
     <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>
 
   <sect2 role="installation">
@@ -245,7 +248,7 @@ other           password        required        pam_unix.so     nullok
 
       <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>
       </seglistitem>
@@ -268,12 +271,12 @@ other           password        required        pam_unix.so     nullok
       </varlistentry>
 
       <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>
       </varlistentry>

postlfs/security/mitkrb.xml

@@ -77,6 +77,9 @@
       KDC server.</para>
     </note>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mitkrb"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -207,17 +210,17 @@ cp -v /usr/sbin/login.krb5 /bin/login</userinput></screen>
 <literal># Begin /etc/krb5.conf
 
 [libdefaults]
-    default_realm = <replaceable>[LFS.ORG]</replaceable>
+    default_realm = <replaceable>&lt;LFS.ORG&gt;</replaceable>
     encrypt = true
 
 [realms]
-    <replaceable>[LFS.ORG]</replaceable> = {
+    <replaceable>&lt;LFS.ORG&gt;</replaceable> = {
-        kdc = <replaceable>[belgarath.lfs.org]</replaceable>
+        kdc = <replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
-        admin_server = <replaceable>[belgarath.lfs.org]</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]
     kdc = SYSLOG[:INFO[:AUTH]]
@@ -228,8 +231,8 @@ cp -v /usr/sbin/login.krb5 /bin/login</userinput></screen>
 EOF</userinput></screen>
 
         <para>You will need to substitute your domain and proper hostname
-        for the occurances of the <replaceable>[belgarath]</replaceable> and
+        for the occurances of the <replaceable>&lt;belgarath&gt;</replaceable> and
-        <replaceable>[lfs.org]</replaceable> names.</para>
+        <replaceable>&lt;lfs.org&gt;</replaceable> names.</para>
 
         <para><option>default_realm</option> should be the name of your
         domain changed to ALL CAPS. This isn't required, but both
@@ -249,7 +252,7 @@ EOF</userinput></screen>
 
         <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
         (users). For now, just use your regular login name or
@@ -257,17 +260,17 @@ EOF</userinput></screen>
 
 <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
         <filename class="directory">/etc</filename> named
@@ -280,8 +283,8 @@ EOF</userinput></screen>
         database and extract them to the keytab file. You do this in the same
         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>
+<screen role='root'><userinput><prompt>kadmin:</prompt> addprinc -randkey ftp/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
-<prompt>kadmin:</prompt> ktadd ftp/<replaceable>[belgarath.lfs.org]</replaceable></userinput></screen>
+<prompt>kadmin:</prompt> ktadd ftp/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
 
         <para>Exit the <command>kadmin</command> program (use
         <command>quit</command> or <command>exit</command>) and return
@@ -292,7 +295,7 @@ EOF</userinput></screen>
 
         <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
         get your ticket, you can list it with the following command:</para>
@@ -386,9 +389,9 @@ EOF</userinput></screen>
         krb524init, krb5kdc, kshd, ksu, ktutil, kvno, login.krb5, rcp, rlogin,
         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],
+        <seg>libcom_err.{so,a}, libdes425.{so,a}, libgssapi.{so,a},
-        libgssrpc.[so,a], libkadm5clnt.[so,a], libkadm5srv.[so,a],
+        libgssrpc.{so,a}, libkadm5clnt.{so,a}, libkadm5srv.{so,a},
-        libkdb5.[so,a], libkrb5.[so,a], and libkrb4.[so,a]</seg>
+        libkdb5.{so,a}, libkrb5.{so,a}, and libkrb4.{so,a}</seg>
         <seg>/usr/include/kerberosIV and /var/lib/krb5kdc</seg>
       </seglistitem>
     </segmentedlist>
@@ -674,17 +677,17 @@ EOF</userinput></screen>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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
           Programming Interface (GSSAPI) functions which provides security
@@ -692,50 +695,50 @@ EOF</userinput></screen>
           underlying mechanisms and technologies and hence allowing source-level
           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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>
 
       <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>
       </varlistentry>

postlfs/security/nss.xml

@@ -91,6 +91,9 @@
     url="http://www.some.url/">DEPENDENCY</ulink></para>
     -->
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nss"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -123,7 +126,7 @@ export NSS_LINUXDIR=$(basename `ls -d $WORKINGDIR/mozilla/dist/Linux*`)</userinp
 
 <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;
 

postlfs/security/openssl.xml

@@ -157,7 +157,7 @@ cp -v -r certs /etc/ssl</userinput></screen>
 
       <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>
     </segmentedlist>
@@ -193,7 +193,7 @@ cp -v -r certs /etc/ssl</userinput></screen>
       </varlistentry>
 
       <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
           various Internet standards. The services provided by  this library
@@ -202,19 +202,19 @@ cp -v -r certs /etc/ssl</userinput></screen>
           <application>OpenSSH</application>, <application>OpenPGP</application>,
           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>
       </varlistentry>
 
       <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
           Layer Security (TLS v1) protocols. It provides a rich API, documentation
           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>
       </varlistentry>

postlfs/security/shadow.xml

@@ -81,6 +81,9 @@
     <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>
 
   <sect2 role="installation">

postlfs/security/stunnel.xml

@@ -72,6 +72,9 @@
     <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>
 
   <sect2 role="installation">
@@ -100,10 +103,10 @@ install -v -m 1770 -o stunnel -g stunnel -d /var/lib/stunnel/run</userinput></sc
       shown below:</para>
 
 <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>
 
@@ -200,14 +203,14 @@ chmod -v 644 /etc/stunnel/stunnel.conf</userinput></screen>
     <para>Next, you need to add the service(s) you wish to encrypt to the
     configuration file. The format is as follows:</para>
 
-<screen><literal>[<replaceable>[service]</replaceable>]
+<screen><literal>[<replaceable>&lt;service&gt;</replaceable>]
-accept  = <replaceable>[hostname:portnumber]</replaceable>
+accept  = <replaceable>&lt;hostname:portnumber&gt;</replaceable>
-connect = <replaceable>[hostname:portnumber]</replaceable></literal></screen>
+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>
 
@@ -263,7 +266,7 @@ connect = <replaceable>[hostname:portnumber]</replaceable></literal></screen>
         <listitem>
           <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>
           </indexterm>

postlfs/security/sudo.xml

@@ -74,6 +74,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
 -->
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sudo"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/security/tripwire.xml

@@ -63,6 +63,9 @@
     <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>
 
   <sect2 role="installation">
@@ -184,10 +187,10 @@ tripwire --init</userinput></screen>
       <application>Tripwire</application> database of your system. Then, as the
       <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
       of the report in front of you. If all the changes were good, then just

postlfs/shells/ash.xml

@@ -72,6 +72,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ash"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/shells/tcsh.xml

@@ -71,6 +71,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tcsh"/></para>
+
   </sect2>
 
   <sect2 role="installation">

postlfs/shells/zsh.xml

@@ -66,6 +66,9 @@
     <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>
 
   <sect2 role="installation">