Index: xsoft/graphweb/dillo.xml
===================================================================
--- xsoft/graphweb/dillo.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/graphweb/dillo.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -73,4 +73,7 @@
     <xref linkend="wget"/> (for downloading via FTP) and
     <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/dillo"/></para>
 
   </sect2>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/graphweb/firefox.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -93,4 +93,7 @@
     <para role="optional"><xref linkend="unzip"/> and
     <xref linkend="libgnomeui"/> (to build the gnomevfs extension)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/firefox"/></para>
 
   </sect2>
@@ -386,5 +389,5 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>ln -v -s ../../mozilla/plugins/<replaceable>[plugin.so]</replaceable> \
+<screen role="root"><userinput>ln -v -s ../../mozilla/plugins/<replaceable>&lt;plugin.so&gt;</replaceable> \
     /usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
 
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/graphweb/galeon.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -75,4 +75,7 @@
     <xref linkend="iso-codes"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/galeon"/></para>
+
   </sect2>
 
@@ -117,8 +120,8 @@
         <seg>galeon and galeon-config-tool</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/galeon
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/galeon
         and the following subdirectories of $GNOME_PREFIX/share/:
-        [doc/galeon-&galeon-version;,
-        [gnome/help, omf, sounds]/galeon]</seg>
+        {doc/galeon-&galeon-version;,
+        {gnome/help, omf, sounds}/galeon}</seg>
       </seglistitem>
     </segmentedlist>
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/graphweb/seamonkey.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -141,4 +141,7 @@
       <xref linkend="libgnomeui"/> (to build the gnomevfs extension)
     </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/seamonkey"/></para>
 
   </sect2>
@@ -507,5 +510,5 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>ln -v -s ../../seamonkey/plugins/<replaceable>[plugin.so]</replaceable> \
+<screen role="root"><userinput>ln -v -s ../../seamonkey/plugins/<replaceable>&lt;plugin.so&gt;</replaceable> \
     /usr/lib/seamonkey-&seamonkey-version;/plugins</userinput></screen>
 
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/office/abiword.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -90,4 +90,7 @@
     <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/abiword"/></para>
+
   </sect2>
 
@@ -189,8 +192,8 @@
 
 <screen><userinput>mkdir -p -v ~/.AbiSuite/templates &amp;&amp;
-cp -v /usr/share/AbiSuite-2.4/templates/normal.awt-<replaceable>[lang]</replaceable> \
+cp -v /usr/share/AbiSuite-2.4/templates/normal.awt-<replaceable>&lt;lang&gt;</replaceable> \
       ~/.AbiSuite/templates/normal.awt</userinput></screen>
 
-      <para>Obviously, change <replaceable>[lang]</replaceable> in the above
+      <para>Obviously, change <replaceable>&lt;lang&gt;</replaceable> in the above
       command to fit the name of the file you want.</para>
 
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/office/evolution.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -86,4 +86,7 @@
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/evolution"/></para>
+
   </sect2>
 
@@ -151,9 +154,9 @@
         <seg>lib/evolution/2.4/* (contains support libraries, conduits,
         and other components)</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/evolution
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/evolution
         and the following subdirectories of $GNOME_PREFIX/:
         include/evolution-2.4,
         lib/evolution,
-        share/[[,omf/]evolution, [gnome/help,idl]/evolution-2.4]</seg>
+        share/{{,omf/}evolution, {gnome/help,idl}/evolution-2.4}</seg>
       </seglistitem>
     </segmentedlist>
Index: xsoft/office/gimp.xml
===================================================================
--- xsoft/office/gimp.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/office/gimp.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -116,4 +116,7 @@
     <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gimp"/></para>
+
   </sect2>
 
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/office/gnucash.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -102,4 +102,7 @@
     <ulink
     url="http://sourceforge.net/projects/libchipcard">libchipcard</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnucash"/></para>
 
   </sect2>
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/office/gnumeric.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -87,4 +87,7 @@
     </note>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnumeric"/></para>
+
   </sect2>
 
@@ -190,8 +193,8 @@
         <seg>numerous filters, plugins and <application>GNOME</application>
         components</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnumeric,
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnumeric,
         /usr/lib/gnumeric,
         /usr/share/doc/gnumeric-&gnumeric-version;, and
-        /usr/share/[[,gnome/help/, omf/, pixmaps/]gnumeric,mc]</seg>
+        /usr/share/{{,gnome/help/, omf/, pixmaps/}gnumeric,mc}</seg>
       </seglistitem>
     </segmentedlist>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/other/balsa.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -86,4 +86,7 @@
     <ulink url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-1.9.x</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/balsa"/></para>
+
   </sect2>
 
Index: xsoft/other/gaim.xml
===================================================================
--- xsoft/other/gaim.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/other/gaim.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -83,4 +83,7 @@
 
 </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gaim"/></para>
 
   </sect2>
Index: xsoft/other/pan.xml
===================================================================
--- xsoft/other/pan.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/other/pan.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -73,4 +73,7 @@
     gtkspell-2.0.4</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/pan"/></para>
+
   </sect2>
 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/other/thunderbird.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -115,4 +115,7 @@
     <para role="optional"><xref linkend="unzip"/> and
     <xref linkend="libgnomeui"/> (to build the gnomevfs extension)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/thunderbird"/></para>
 
   </sect2>
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/suites/koffice.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -63,6 +63,6 @@
     <para><application>KOffice</application> has many localization
     packages in the form of:
-    <filename>koffice-l10n-<replaceable>[xx]</replaceable>-&koffice-version;.tar.bz2</filename>.
-    The <replaceable>[xx]</replaceable> is a two to seven character code for the
+    <filename>koffice-l10n-<replaceable>&lt;xx&gt;</replaceable>-&koffice-version;.tar.bz2</filename>.
+    The <replaceable>&lt;xx&gt;</replaceable> is a two to seven character code for the
     country covered. The sizes of these files range from about 0.4 MB to 4.6
     MB. </para>
@@ -104,4 +104,7 @@
     and <xref linkend="doxygen"/> (for apidox)</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/koffice"/></para>
+
   </sect2>
 
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision c5c26547cd4bcbe4df37c43bab4c00f92e812540)
+++ xsoft/suites/openoffice.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
@@ -164,4 +164,7 @@
     <xref linkend="unixodbc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/openoffice"/></para>
+
   </sect2>
 
@@ -355,8 +358,8 @@
     <application>CUPS</application> for printing.</para>
 
-    <para><parameter>--with-lang=<replaceable>[LANG]</replaceable></parameter>:
+    <para><parameter>--with-lang=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
     Makes an install set for the desired language. ENUS is the default.</para>
 
-    <para><parameter>--with-dict=<replaceable>[LANG]</replaceable></parameter>:
+    <para><parameter>--with-dict=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
     This switch installs dictionaries for the desired languages. ENUS is
     the default.</para>
