Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/databases/db.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -72,4 +72,7 @@
     (for the <command>uudecode</command> command)</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/db"/></para>
+
   </sect2>
 
@@ -185,5 +188,5 @@
       <seglistitem>
         <seg>berkeley_db_svc</seg>
-        <seg>libdb_java.[so,a] and libdb_tcl.[so,a]</seg>
+        <seg>libdb_java.{so,a} and libdb_tcl.{so,a}</seg>
         <seg>/usr/share/doc/db-&db-version;</seg>
       </seglistitem>
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/databases/mysql.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -75,4 +75,7 @@
     <xref linkend="tex"/></para>
     -->
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mysql"/></para>
 
   </sect2>
@@ -248,7 +251,7 @@
       administrator, so use the following command as the <systemitem
       class="username">root</systemitem> user to set one. Replace
-      <replaceable>[new-password]</replaceable> with your own.</para>
-
-<screen role="root"><userinput>mysqladmin -u root password <replaceable>[new-password]</replaceable></userinput></screen>
+      <replaceable>&lt;new-password&gt;</replaceable> with your own.</para>
+
+<screen role="root"><userinput>mysqladmin -u root password <replaceable>&lt;new-password&gt;</replaceable></userinput></screen>
 
       <para>Configuration of the server is now finished. Shut the server
@@ -300,5 +303,5 @@
         resolveip</seg>
         <seg>libdbug.a, libheap.a, libmyisam.a, libmyisammrg.a,
-        libmysqlclient.[so,a], libmysqlclient_r.[so,a], libmystrings.a,
+        libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmystrings.a,
         libmysys.a, and libvio.a</seg>
         <seg>/srv/mysql, /usr/include/mysql, /usr/lib/mysql, /usr/share/mysql, and
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/databases/postgresql.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -77,4 +77,7 @@
     <xref linkend="perl-sgmlspm"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/postgresql"/></para>
+
   </sect2>
 
@@ -233,6 +236,6 @@
         pltcl_listmod, pltcl_loadmod, postgres, postmaster, psql, and
         vacuumdb</seg>
-        <seg>libecpg.[so,a], libecpg_compat.[so,a], libpgport.a, libpgtypes.[so,a],
-        libpq.[so,a], and various charset modules.</seg>
+        <seg>libecpg.{so,a}, libecpg_compat.{so,a}, libpgport.a, libpgtypes.{so,a},
+        libpq.{so,a}, and various charset modules.</seg>
         <seg>/srv/pgsql, /usr/include/libpq, /usr/include/postgresql,
         /usr/lib/postgresql, /usr/share/doc/postgresql, and
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/mail/courier.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -82,4 +82,7 @@
     <ulink url="http://alpha.greenie.net/mgetty/">Mgetty+Sendfax</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/courier"/></para>
+
   </sect2>
 
@@ -205,6 +208,6 @@
     of <application>Aspell</application>.</para>
 
-    <para><option>--enable-mimetypes=<replaceable>[location of mime.types
-    file]</replaceable></option>: Use this switch if you receive an error
+    <para><option>--enable-mimetypes=<replaceable>&lt;location of mime.types
+    file&gt;</replaceable></option>: Use this switch if you receive an error
     saying that the <filename>mime.types</filename> file could not be
     found.</para>
@@ -236,5 +239,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/courier/defaultdomain &lt;&lt; "EOF"
-<literal><replaceable>[yourdomain]</replaceable></literal>
+<literal><replaceable>&lt;yourdomain&gt;</replaceable></literal>
 EOF</userinput></screen>
 
@@ -242,5 +245,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/courier/me &lt;&lt; "EOF"
-<literal><replaceable>[servername.yourdomain]</replaceable></literal>
+<literal><replaceable>&lt;servername.yourdomain&gt;</replaceable></literal>
 EOF</userinput></screen>
 
@@ -249,5 +252,5 @@
 <screen role="root"><userinput>cat &gt; /etc/courier/locals &lt;&lt; "EOF"
 <literal>localhost
-<replaceable>[yourdomain]</replaceable></literal>
+<replaceable>&lt;yourdomain&gt;</replaceable></literal>
 EOF</userinput></screen>
 
@@ -256,5 +259,5 @@
 <screen role="root"><userinput>cat &gt; /etc/courier/esmtpacceptmailfor.dir/system &lt;&lt; "EOF"
 <literal>localhost
-<replaceable>[yourdomain]</replaceable></literal>
+<replaceable>&lt;yourdomain&gt;</replaceable></literal>
 EOF</userinput></screen>
 
@@ -263,5 +266,5 @@
       following entry.</para>
 
-<screen><literal>postmaster: <replaceable>[your administrator email]</replaceable></literal></screen>
+<screen><literal>postmaster: <replaceable>&lt;your administrator email&gt;</replaceable></literal></screen>
 
       <para>If you want to deny access from some hosts from sending mail,
@@ -286,7 +289,7 @@
       <filename class="directory">Maildir</filename> directory:</para>
 
-<screen role="root"><userinput>cd /home/<replaceable>[username]</replaceable> &amp;&amp;
+<screen role="root"><userinput>cd /home/<replaceable>&lt;username&gt;</replaceable> &amp;&amp;
 maildirmake Maildir &amp;&amp;
-chown <replaceable>[username]</replaceable>.<replaceable>[username]</replaceable> Maildir -R</userinput></screen>
+chown <replaceable>&lt;username&gt;</replaceable>.<replaceable>&lt;username&gt;</replaceable> Maildir -R</userinput></screen>
 
       <para>If you wish to use SSL with <application>Courier</application>,
@@ -305,5 +308,5 @@
       an SSL config file. For each service that you wish to utilize, you will
       need to edit the configuration file, and change the
-      <replaceable>[DAEMON]</replaceable>START variable from 'NO' to 'YES'. For
+      <replaceable>&lt;DAEMON&gt;</replaceable>START variable from 'NO' to 'YES'. For
       example, to use SMTP with SSL, you'll need to edit
       <filename>/etc/courier/esmtpd-ssl</filename> and change the value of
@@ -334,5 +337,5 @@
       <filename class='directory'>webmail</filename> or you need to specify it
       during the configure phase with
-      <option>--enable-imageurl=<replaceable>[URL]</replaceable></option>.</para>
+      <option>--enable-imageurl=<replaceable>&lt;URL&gt;</replaceable></option>.</para>
 
 <screen role="root"><userinput>cp -v -a /usr/share/courier/sqwebmail/images /srv/www/htdocs/webmail</userinput></screen>
@@ -350,5 +353,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/courier/webadmin/password &lt;&lt; "EOF"
-<literal><replaceable>[password]</replaceable></literal>
+<literal><replaceable>&lt;password&gt;</replaceable></literal>
 EOF</userinput></screen>
 
@@ -430,5 +433,5 @@
 <screen><literal>MYSQL_SERVER            localhost
 MYSQL_USERNAME          courier
-MYSQL_PASSWORD          <replaceable>[your choice]</replaceable>
+MYSQL_PASSWORD          <replaceable>&lt;your choice&gt;</replaceable>
 MYSQL_SOCKET            /var/run/mysql/mysql.sock
 MYSQL_PORT              3306
@@ -436,5 +439,5 @@
 MYSQL_USER_TABLE        users
 MYSQL_CLEAR_PWFIELD     clear
-DEFAULT DOMAIN          <replaceable>[your domain]</replaceable>
+DEFAULT DOMAIN          <replaceable>&lt;your domain&gt;</replaceable>
 MYSQL_QUOTA_FIELD       quota</literal></screen>
 
@@ -464,5 +467,5 @@
 
 <screen role="root"><userinput>GRANT ALL PRIVILEGES ON *.* TO courier@localhost \
-    IDENTIFIED BY '<replaceable>[password]</replaceable>' WITH GRANT OPTION;
+    IDENTIFIED BY '<replaceable>&lt;password&gt;</replaceable>' WITH GRANT OPTION;
 QUIT</userinput></screen>
 
@@ -475,6 +478,6 @@
 
 <screen role="root"><userinput>cd /home/vmailman &amp;&amp;
-mkdir -v <replaceable>[virtual_user]</replaceable> &amp;&amp;
-cd <replaceable>[virtual_user]</replaceable> &amp;&amp;
+mkdir -v <replaceable>&lt;virtual_user&gt;</replaceable> &amp;&amp;
+cd <replaceable>&lt;virtual_user&gt;</replaceable> &amp;&amp;
 maildirmake Maildir &amp;&amp;
 chown -v vmailman.vmailman Maildir -R</userinput></screen>
@@ -492,12 +495,12 @@
 <screen><userinput>USE courier_mail
 INSERT INTO users VALUES (
-'<replaceable>[virtual_users]</replaceable>@<replaceable>[domain.com]</replaceable>,
-'<replaceable>[encrypted password or blank]</replaceable>',
-'<replaceable>[clear text password or blank]</replaceable>',
-'<replaceable>[User's Name]</replaceable>',
+'<replaceable>&lt;virtual_users&gt;</replaceable>@<replaceable>&lt;domain.com&gt;</replaceable>,
+'<replaceable>&lt;encrypted password or blank&gt;</replaceable>',
+'<replaceable>&lt;clear text password or blank&gt;</replaceable>',
+'<replaceable>&lt;User's Name&gt;</replaceable>',
 9000,
 9000,
-'<replaceable>[location of Maildir]</replaceable>',
-'<replaceable>[Quota in Bytes']</replaceable>
+'<replaceable>&lt;location of Maildir&gt;</replaceable>',
+'<replaceable>&lt;Quota in Bytes'&gt;</replaceable>
 );
 QUIT</userinput></screen>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/mail/exim.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -87,4 +87,7 @@
     <xref linkend="linux-pam"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/exim"/></para>
+
   </sect2>
 
@@ -282,5 +285,5 @@
       <para>The bootscript also starts the <application>Exim</application>
       daemon and dispatches a queue runner process every 15 minutes. Modify
-      the <option>-q<replaceable>[time interval]</replaceable></option>
+      the <option>-q<replaceable>&lt;time interval&gt;</replaceable></option>
       parameter in <filename>/etc/rc.d/init.d/exim</filename>, if necessary
       for your installation.</para>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/mail/postfix.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -81,4 +81,7 @@
     <ulink url="http://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/postfix"/></para>
+
   </sect2>
 
@@ -177,5 +180,5 @@
 
 <screen><literal>CCARGS='-DHAS_CDB'
-AUXLIBS='<replaceable>[/path/to/CDB]/</replaceable>libcdb.a'</literal></screen>
+AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen>
 
       </sect4>
@@ -201,6 +204,6 @@
 
 <screen><userinput>make makefiles CCARGS='-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
-    -DDEF_MANPAGE_DIR=\"/usr/share/man\" <replaceable>[additional args]</replaceable>' \
-    <replaceable>[AUXLIBS='additonal args']</replaceable> &amp;&amp;
+    -DDEF_MANPAGE_DIR=\"/usr/share/man\" <replaceable>&lt;additional args&gt;</replaceable>' \
+    <replaceable>&lt;AUXLIBS='additonal args'&gt;</replaceable> &amp;&amp;
 make</userinput></screen>
 
@@ -284,12 +287,12 @@
       with <command>sed</command> commands entered into the console with
       appropriate substitutions of your non-root login name for
-      <replaceable>[user]</replaceable> and your fully qualified hostname for
-      <replaceable>[localhost.localdomain]</replaceable>. You will find the
+      <replaceable>&lt;user&gt;</replaceable> and your fully qualified hostname for
+      <replaceable>&lt;localhost.localdomain&gt;</replaceable>. You will find the
       <filename>main.cf</filename> file is self documenting, so load it into
       your editor to make the changes you need for your situation.</para>
 
-<screen role="root"><userinput>sed -i "s/LOGIN/<replaceable>[user]</replaceable>/" /etc/aliases &amp;&amp;
+<screen role="root"><userinput>sed -i "s/LOGIN/<replaceable>&lt;user&gt;</replaceable>/" /etc/aliases &amp;&amp;
 sed -i "s/#myhostname = host.domain.tld/myhostname = \
-  <replaceable>[localhost.localdomain]</replaceable>/" /etc/postfix/main.cf &amp;&amp;
+  <replaceable>&lt;localhost.localdomain&gt;</replaceable>/" /etc/postfix/main.cf &amp;&amp;
 /usr/bin/newaliases &amp;&amp;
 /usr/sbin/postfix start</userinput></screen>
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/mail/qpopper.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -69,4 +69,7 @@
     <xref linkend="linux-pam"/>, and
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/qpopper"/></para>
 
   </sect2>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/mail/sendmail.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -73,4 +73,7 @@
     <xref linkend="gs"/> or <xref linkend="espgs"/> (for creating
     PDF documentation)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sendmail"/></para>
 
   </sect2>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/apache.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -83,4 +83,7 @@
     <ulink url="http://www.distcache.org/">distcache</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/apache"/></para>
+
   </sect2>
 
@@ -256,5 +259,5 @@
         htdbm, htdigest, htpasswd, httpd, instdso.sh, logresolve, and
         rotatelogs</seg>
-        <seg>libapr-1.[so,a], libaprutil-1.[so,a], and /usr/lib/apache/*.so</seg>
+        <seg>libapr-1.{so,a}, libaprutil-1.{so,a}, and /usr/lib/apache/*.so</seg>
         <seg>/etc/apache, /srv/www, /usr/include/apache, /usr/lib/apache, and
         /var/log/apache</seg>
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/bind.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -75,4 +75,7 @@
     <xref linkend="docbook-dsssl"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bind"/></para>
+
   </sect2>
 
@@ -246,5 +249,5 @@
  key "rndc_key" {
      algorithm hmac-md5;
-     secret "<replaceable>[Insert secret from rndc-confgen's output here]</replaceable>";
+     secret "<replaceable>&lt;Insert secret from rndc-confgen's output here&gt;</replaceable>";
  };
  zone "." {
@@ -303,5 +306,5 @@
 algorithm "hmac-md5";
     secret
-    "<replaceable>[Insert secret from rndc-confgen's output here]</replaceable>";
+    "<replaceable>&lt;Insert secret from rndc-confgen's output here&gt;</replaceable>";
     };
 options {
@@ -377,5 +380,5 @@
 
       <note>
-        <para>Replace <replaceable>[yourdomain.com]</replaceable> with
+        <para>Replace <replaceable>&lt;yourdomain.com&gt;</replaceable> with
         your own valid domain name.</para>
       </note>
@@ -383,5 +386,5 @@
 <screen role="root"><userinput>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
 cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
-<literal>search <replaceable>[yourdomain.com]</replaceable>
+<literal>search <replaceable>&lt;yourdomain.com&gt;</replaceable>
 nameserver 127.0.0.1</literal>
 EOF</userinput></screen>
@@ -450,6 +453,6 @@
         named, named-checkconf, named-checkzone, nslookup, nsupdate, rndc, and
         rndc-confgen</seg>
-        <seg>libbind9.[so,a], libdns.[so,a], libisc.[so,a], libisccc.[so,a],
-        libisccfg.[so,a], and liblwres.[so,a]</seg>
+        <seg>libbind9.{so,a}, libdns.{so,a}, libisc.{so,a}, libisccc.{so,a},
+        libisccfg.{so,a}, and liblwres.{so,a}</seg>
         <seg>/home/named, /usr/include/bind9, /usr/include/dns, /usr/include/dst,
         /usr/include/isc, /usr/include/isccc, /usr/include/isccfg,
Index: server/major/nfs-utils.xml
===================================================================
--- server/major/nfs-utils.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/nfs-utils.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -72,4 +72,7 @@
     for nfsv4 support, and <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>
     for gss (RPC Security) support.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nfs-utils"/></para>
 
   </sect2>
Index: server/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/proftpd.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -65,4 +65,7 @@
     <para role="optional"><xref linkend="linux-pam"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/proftpd"/></para>
+
   </sect2>
 
Index: server/major/samba3.xml
===================================================================
--- server/major/samba3.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/samba3.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -95,4 +95,7 @@
     <xref linkend="postgresql"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/samba3"/></para>
+
   </sect2>
 
@@ -546,8 +549,8 @@
 
       <para>SWAT can be launched by pointing your web browser to
-      <uri>https://<replaceable>[CA_DN_field]</replaceable>:901</uri>.
+      <uri>https://<replaceable>&lt;CA_DN_field&gt;</replaceable>:901</uri>.
       Substitute the hostname listed in the DN field of the CA certificate
       used with <application>Stunnel</application> for
-      <replaceable>[CA_DN_field]</replaceable>.</para>
+      <replaceable>&lt;CA_DN_field&gt;</replaceable>.</para>
 
       </sect4>
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/vsftpd.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -66,4 +66,7 @@
     <xref linkend="openssl"/>, and
     <xref linkend="tcpwrappers"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/vsftpd"/></para>
 
   </sect2>
Index: server/major/xinetd.xml
===================================================================
--- server/major/xinetd.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/major/xinetd.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -65,4 +65,7 @@
     <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xinetd"/></para>
+
   </sect2>
 
Index: server/other/cvsserver.xml
===================================================================
--- server/other/cvsserver.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/other/cvsserver.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -65,6 +65,6 @@
       CVS repository:</para>
 
-<screen><userinput>cd <replaceable>[sourcedir]</replaceable> &amp;&amp;
-cvs import -m "<replaceable>[repository test]</replaceable>" <replaceable>[cvstest]</replaceable> <replaceable>[vendortag]</replaceable> <replaceable>[releasetag]</replaceable></userinput></screen>
+<screen><userinput>cd <replaceable>&lt;sourcedir&gt;</replaceable> &amp;&amp;
+cvs import -m "<replaceable>&lt;repository test&gt;</replaceable>" <replaceable>&lt;cvstest&gt;</replaceable> <replaceable>&lt;vendortag&gt;</replaceable> <replaceable>&lt;releasetag&gt;</replaceable></userinput></screen>
 
     </sect3>
@@ -88,5 +88,5 @@
 
       <note>
-        <para>Replace <replaceable>[servername]</replaceable> with the
+        <para>Replace <replaceable>&lt;servername&gt;</replaceable> with the
         IP address or host name of the CVS repository machine. You will
         be prompted for the user's shell account password before CVS
@@ -95,5 +95,5 @@
 
 <screen><userinput>export CVS_RSH=/usr/bin/ssh &amp;&amp;
-cvs -d:ext:<replaceable>[servername]</replaceable>:/srv/cvsroot co cvstest</userinput></screen>
+cvs -d:ext:<replaceable>&lt;servername&gt;</replaceable>:/srv/cvsroot co cvstest</userinput></screen>
 
     </sect3>
@@ -160,8 +160,8 @@
     the following command:</para>
 
-<screen><userinput>cvs -d:pserver:anonymous@<replaceable>[servername]</replaceable>:/srv/cvsroot co cvstest</userinput></screen>
+<screen><userinput>cvs -d:pserver:anonymous@<replaceable>&lt;servername&gt;</replaceable>:/srv/cvsroot co cvstest</userinput></screen>
 
     <note>
-      <para>Replace <replaceable>[servername]</replaceable> with the
+      <para>Replace <replaceable>&lt;servername&gt;</replaceable> with the
       IP address or hostname of the CVS server.</para>
     </note>
Index: server/other/dhcp.xml
===================================================================
--- server/other/dhcp.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/other/dhcp.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -78,4 +78,7 @@
     <ulink url="&patch-root;/dhcp-&dhcp-version;-iproute2-3.patch"/>)</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/dhcp"/></para>
+
   </sect2>
 
@@ -180,8 +183,8 @@
 ddns-update-style ad-hoc;
 
-subnet <replaceable>[192.168.5.0]</replaceable> netmask <replaceable>[255.255.255.0]</replaceable> {
-  range <replaceable>[192.168.5.10] [192.168.5.240]</replaceable>;
-  option broadcast-address <replaceable>[192.168.5.255]</replaceable>;
-  option routers <replaceable>[192.168.5.1]</replaceable>;
+subnet <replaceable>&lt;192.168.5.0&gt;</replaceable> netmask <replaceable>&lt;255.255.255.0&gt;</replaceable> {
+  range <replaceable>&lt;192.168.5.10] [192.168.5.240&gt;</replaceable>;
+  option broadcast-address <replaceable>&lt;192.168.5.255&gt;</replaceable>;
+  option routers <replaceable>&lt;192.168.5.1&gt;</replaceable>;
 }</literal>
 EOF</userinput></screen>
Index: server/other/leafnode.xml
===================================================================
--- server/other/leafnode.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/other/leafnode.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -68,4 +68,7 @@
     <para role="recommended"><xref linkend="xinetd"/> and
     <xref linkend="fcron"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/leafnode"/></para>
 
   </sect2>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/other/openldap.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -84,4 +84,7 @@
     <ulink url="http://www.openslp.org/">OpenSLP</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/openldap"/></para>
+
   </sect2>
 
@@ -356,5 +359,5 @@
         ldappasswd, ldapsearch, ldapwhoami, slapadd, slapcat, slapd, slapdn,
         slapindex, slappasswd, slaptest, and slurpd</seg>
-        <seg>liblber.[so,a], libldap.[so,a], and libldap_r.[so,a]</seg>
+        <seg>liblber.{so,a}, libldap.{so,a}, and libldap_r.{so,a}</seg>
         <seg>/etc/openldap, /srv/ldap, and /usr/share/openldap</seg>
       </seglistitem>
@@ -540,5 +543,5 @@
 
       <varlistentry id="liblber">
-        <term><filename class='libraryfile'>liblber.[so,a]</filename></term>
+        <term><filename class='libraryfile'>liblber.{so,a}</filename></term>
         <listitem>
           <para>is a set of lightweight Basic Encoding Rules routines. These
@@ -549,5 +552,5 @@
           and extended operations.</para>
           <indexterm zone="openldap liblber">
-            <primary sortas="c-liblber">liblber.[so,a]</primary>
+            <primary sortas="c-liblber">liblber.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -555,10 +558,10 @@
 
       <varlistentry id="libldap">
-        <term><filename class='libraryfile'>libldap.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libldap.{so,a}</filename></term>
         <listitem>
           <para>supports the LDAP programs and provide functionality for
           other programs interacting with LDAP.</para>
           <indexterm zone="openldap libldap">
-            <primary sortas="c-libldap">libldap.[so,a]</primary>
+            <primary sortas="c-libldap">libldap.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -566,10 +569,10 @@
 
       <varlistentry id="libldap_r">
-        <term><filename class='libraryfile'>libldap_r.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libldap_r.{so,a}</filename></term>
         <listitem>
           <para>contains the functions required by the LDAP programs to
           produce the results from LDAP requests.</para>
           <indexterm zone="openldap libldap_r">
-            <primary sortas="c-libldap_r">libldap_r.[so,a]</primary>
+            <primary sortas="c-libldap_r">libldap_r.{so,a}</primary>
           </indexterm>
         </listitem>
Index: server/other/rsync.xml
===================================================================
--- server/other/rsync.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/other/rsync.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -65,4 +65,7 @@
     <para role="optional"><xref linkend="popt"/> and
     <xref linkend="docbook-utils"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/rsync"/></para>
 
   </sect2>
Index: server/other/svnserver.xml
===================================================================
--- server/other/svnserver.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
+++ server/other/svnserver.xml	(revision 3cb0c57714f874851258a6328b0769eeb2d67a35)
@@ -149,5 +149,5 @@
 
 <screen role="root"><userinput>svn import -m "Initial import." \
-    <replaceable>[/path/to/source/tree]</replaceable> \
+    <replaceable>&lt;/path/to/source/tree&gt;</replaceable> \
     file:///srv/svn/repositories/svntest</userinput></screen>
 
@@ -160,5 +160,5 @@
 chmod -R g+w /srv/svn/repositories/svntest &amp;&amp;
 chmod g+s /srv/svn/repositories/svntest/db &amp;&amp;
-usermod -G svn,svntest,<replaceable>[insert existing groups]</replaceable> <replaceable>[username]</replaceable></userinput></screen>
+usermod -G svn,svntest,<replaceable>&lt;insert existing groups&gt;</replaceable> <replaceable>&lt;username&gt;</replaceable></userinput></screen>
 
       <para><systemitem class="groupname">svntest</systemitem> is the group
@@ -188,5 +188,5 @@
       <note>
         <para>You may need to log out and back in again to refresh your group
-        memberships. '<command>su <replaceable>[username]</replaceable></command>'
+        memberships. '<command>su <replaceable>&lt;username&gt;</replaceable></command>'
         should work around this as well.</para>
       </note>
