Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/audioutils/cdparanoia.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -73,4 +73,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cdparanoia"/></para>
+
   </sect2>
 
@@ -117,5 +120,5 @@
       <seglistitem>
         <seg>cdparanoia</seg>
-        <seg>libcdda_interface.[so,a] and libcdda_paranoia.[so,a]</seg>
+        <seg>libcdda_interface.{so,a} and libcdda_paranoia.{so,a}</seg>
         <seg>None</seg>
       </seglistitem>
@@ -139,5 +142,5 @@
 
       <varlistentry id="libcdda_interface">
-        <term><filename class='libraryfile'>libcdda_interface.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libcdda_interface.{so,a}</filename></term>
         <listitem>
           <para>contains functions used by <command>cdparanoia</command>, as
@@ -145,5 +148,5 @@
           CD device is CDDA compatible.</para>
           <indexterm zone="cdparanoia libcdda_interface">
-            <primary sortas="c-libcdda_interface">libcdda_interface.[so,a]</primary>
+            <primary sortas="c-libcdda_interface">libcdda_interface.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -151,5 +154,5 @@
 
       <varlistentry id="libcdda_paranoia">
-        <term><filename class='libraryfile'>libcdda_paranoia.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libcdda_paranoia.{so,a}</filename></term>
         <listitem>
           <para>contains functions used by <command>cdparanoia</command>, as
@@ -157,5 +160,5 @@
           error handling and scratch reconstruction capability.</para>
           <indexterm zone="cdparanoia libcdda_paranoia">
-            <primary sortas="c-libcdda_paranoia">libcdda_paranoia.[so,a]</primary>
+            <primary sortas="c-libcdda_paranoia">libcdda_paranoia.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/audioutils/freetts.xml
===================================================================
--- multimedia/audioutils/freetts.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/audioutils/freetts.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -94,4 +94,7 @@
     <xref linkend="unzip"/> and working audio hardware/software.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/freetts"/></para>
+
   </sect2>
 
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/audioutils/lame.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -70,4 +70,7 @@
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/lame"/></para>
+
   </sect2>
 
@@ -110,5 +113,5 @@
       <seglistitem>
         <seg>lame, mp3rtp, and optionally, mp3x</seg>
-        <seg>libmp3lame.[so,a]</seg>
+        <seg>libmp3lame.{so,a}</seg>
         <seg>/usr/include/lame and /usr/share/doc/lame</seg>
       </seglistitem>
@@ -154,10 +157,10 @@
 
       <varlistentry id="libmp3lame">
-        <term><filename class='libraryfile'>libmp3lame.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libmp3lame.{so,a}</filename></term>
         <listitem>
           <para>libraries provide the functions necessary to convert
           raw PCM and WAV files to MP3 files.</para>
           <indexterm zone="lame libmp3lame">
-            <primary sortas="c-libmp3lame">libmp3lame.[so,a]</primary>
+            <primary sortas="c-libmp3lame">libmp3lame.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/audioutils/mpg123.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -72,4 +72,7 @@
     <para role="required"><xref linkend="alsa-oss"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mpg123"/></para>
+
   </sect2>
 
Index: multimedia/audioutils/vorbistools.xml
===================================================================
--- multimedia/audioutils/vorbistools.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/audioutils/vorbistools.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -73,4 +73,7 @@
     <para role="optional"><xref linkend="flac"/> and <xref linkend="speex"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/vorbistools"/></para>
+
   </sect2>
 
Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/audioutils/xmms.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -78,4 +78,7 @@
     <xref linkend="libmikmod"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xmms"/></para>
+
   </sect2>
 
@@ -136,5 +139,5 @@
       <seglistitem>
         <seg>xmms, xmms-config, and wmxmms</seg>
-        <seg>libxmms.[so,a] and numerous input, output, effects, and general
+        <seg>libxmms.{so,a} and numerous input, output, effects, and general
         plugins</seg>
         <seg>/usr/include/xmms, /usr/lib/xmms, /usr/share/xmms and
@@ -187,5 +190,5 @@
 
       <varlistentry id="libxmms">
-        <term><filename class='libraryfile'>libxmms.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libxmms.{so,a}</filename></term>
         <listitem>
           <para>contains graphics and playback functions used by
@@ -193,5 +196,5 @@
           packages.</para>
           <indexterm zone="xmms libxmms">
-            <primary sortas="c-libxmms">libxmms.[so,a]</primary>
+            <primary sortas="c-libxmms">libxmms.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -111,4 +111,7 @@
     <ulink url="http://www.gtkmm.org/">libgnomeuimm</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cdrdao"/></para>
+
   </sect2>
 
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -60,4 +60,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cdrtools"/></para>
+
   </sect2>
 
Index: multimedia/cdwriteutils/dvd+rw-tools.xml
===================================================================
--- multimedia/cdwriteutils/dvd+rw-tools.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -72,4 +72,7 @@
     useless.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/dvd+rw-tools"/></para>
+
   </sect2>
 
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/cdwriteutils/k3b.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -125,4 +125,7 @@
     <xref linkend="libdvdcss"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/k3b"/></para>
+
   </sect2>
 
@@ -211,5 +214,5 @@
         modules for the installed dependencies</seg>
         <seg>The following subdirectories of $KDE_PREFIX/share/:
-        [applnk/Settings/System, apps/k3b, doc/HTML/en/k3b]</seg>
+        {applnk/Settings/System, apps/k3b, doc/HTML/en/k3b}</seg>
       </seglistitem>
     </segmentedlist>
Index: multimedia/cdwriteutils/udftools.xml
===================================================================
--- multimedia/cdwriteutils/udftools.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/cdwriteutils/udftools.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -75,4 +75,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/udftools"/></para>
+
   </sect2>
 
Index: multimedia/libdriv/alsa-firmware.xml
===================================================================
--- multimedia/libdriv/alsa-firmware.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/alsa-firmware.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -63,4 +63,7 @@
     <para role="required"><xref linkend="alsa-tools"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alsa-firmware"/></para>
+
   </sect2>
 
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/alsa-lib.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -65,4 +65,7 @@
     <para role="optional"><xref linkend="doxygen"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alsa-lib"/></para>
+
   </sect2>
 
@@ -172,5 +175,5 @@
       <seglistitem>
         <seg>alsalisp and aserver</seg>
-        <seg>libasound.[so,a]</seg>
+        <seg>libasound.{so,a}</seg>
         <seg>/usr/include/alsa, /usr/share/alsa and
         /usr/share/doc/alsa-lib-&alsa-lib-version;</seg>
@@ -184,9 +187,9 @@
 
       <varlistentry id="libasound">
-        <term><filename class='libraryfile'>libasound.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libasound.{so,a}</filename></term>
         <listitem>
           <para>provides ALSA functions for application programs.</para>
           <indexterm zone="alsa-lib libasound">
-            <primary sortas="c-libasound">libasound.[so,a]</primary>
+            <primary sortas="c-libasound">libasound.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa-oss.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/alsa-oss.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -65,4 +65,7 @@
     <para role="required"><xref linkend="alsa-lib"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alsa-oss"/></para>
+
   </sect2>
 
@@ -106,5 +109,5 @@
       <seglistitem>
         <seg>aoss</seg>
-        <seg>libalsatoss.[so,a], libaoss.[so,a], and libossredir.a</seg>
+        <seg>libalsatoss.{so,a}, libaoss.{so,a}, and libossredir.a</seg>
         <seg>None</seg>
       </seglistitem>
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/alsa-plugins.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -77,4 +77,7 @@
     <para role="optional"><ulink url="http://jackit.sourceforge.net/">JACK</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alsa-plugins"/></para>
+
   </sect2>
 
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/alsa-tools.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -70,4 +70,7 @@
     <command>hdspconf</command> and <command>hdspmixer</command>), and
     <xref linkend="qt"/> to build <command>qlo10k1</command>.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alsa-tools"/></para>
 
   </sect2>
@@ -208,5 +211,5 @@
         <term><command>ld10k1</command></term>
         <listitem>
-          <para>is the server of a EMU10K[1,2] patch loader for ALSA.</para>
+          <para>is the server of a EMU10K{1,2} patch loader for ALSA.</para>
           <indexterm zone="alsa-tools ld10k1">
             <primary sortas="b-ld10k1">ld10k1</primary>
@@ -218,5 +221,5 @@
         <term><command>lo10k1</command></term>
         <listitem>
-          <para>is the client of a EMU10K[1,2] patch loader for ALSA.</para>
+          <para>is the client of a EMU10K{1,2} patch loader for ALSA.</para>
           <indexterm zone="alsa-tools lo10k1">
             <primary sortas="b-lo10k1">lo10k1</primary>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/alsa-utils.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -63,4 +63,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="alsa-lib"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alsa-utils"/></para>
 
   </sect2>
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/audiofile.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -60,4 +60,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/audiofile"/></para>
+
   </sect2>
 
@@ -89,5 +92,5 @@
       <seglistitem>
         <seg>audiofile-config, sfinfo, and sfconvert</seg>
-        <seg>libaudiofile.[so,a]</seg>
+        <seg>libaudiofile.{so,a}</seg>
         <seg>None</seg>
       </seglistitem>
@@ -133,10 +136,10 @@
 
       <varlistentry id="libaudiofile">
-        <term><filename class='libraryfile'>libaudiofile.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libaudiofile.{so,a}</filename></term>
         <listitem>
           <para>contains functions used by programs to support AIFF,
           AIFF-compressed, Sun/NeXT, WAV and BIC audio formats.</para>
           <indexterm zone="audiofile libaudiofile">
-            <primary sortas="c-libaudiofile">libaudiofile.[so,a]</primary>
+            <primary sortas="c-libaudiofile">libaudiofile.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/esound.xml
===================================================================
--- multimedia/libdriv/esound.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/esound.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -71,4 +71,7 @@
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/esound"/></para>
+
   </sect2>
 
@@ -137,5 +140,5 @@
         <seg>esd, esdcat, esdctl, esd-config, esddsp, esdfilt, esdloop, esdmon,
         esdplay, esdrec, and esdsample</seg>
-        <seg>libesd.[so,a] and libesddsp.[so,a]</seg>
+        <seg>libesd.{so,a} and libesddsp.{so,a}</seg>
         <seg>/usr/share/doc/esound-&esound-version;</seg>
       </seglistitem>
@@ -251,5 +254,5 @@
 
       <varlistentry id="libesd">
-        <term><filename class='libraryfile'>libesd.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libesd.{so,a}</filename></term>
         <listitem>
           <para>contains functions used by the <application>EsounD</application>
@@ -257,5 +260,5 @@
           format files.</para>
           <indexterm zone="esound libesd">
-            <primary sortas="c-libesd">libesd.[so,a]</primary>
+            <primary sortas="c-libesd">libesd.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/flac.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -78,4 +78,7 @@
     <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/flac"/></para>
+
   </sect2>
 
@@ -133,6 +136,6 @@
       <seglistitem>
         <seg>flac and metaflac</seg>
-        <seg>libFLAC.[so,a], libFLAC++.[so,a], libOggFLAC.[so,a],
-        libOggFLAC++.[so,a], and libxmms-flac.[so,a]</seg>
+        <seg>libFLAC.{so,a}, libFLAC++.{so,a}, libOggFLAC.{so,a},
+        libOggFLAC++.{so,a}, and libxmms-flac.{so,a}</seg>
         <seg>/usr/share/doc/flac-&flac-version;</seg>
       </seglistitem>
@@ -167,10 +170,10 @@
 
       <varlistentry id="libflac">
-        <term><filename class='libraryfile'>lib[,Ogg]FLAC[,++].[so,a]</filename></term>
+        <term><filename class='libraryfile'>lib{,Ogg}FLAC{,++}.{so,a}</filename></term>
         <listitem>
           <para>these libraries provide native FLAC and Ogg FLAC C/C++ APIs
           for programs utilizing FLAC.</para>
           <indexterm zone="flac libflac">
-            <primary sortas="c-libFLAC">lib[,Ogg]FLAC[,++].[so,a]</primary>
+            <primary sortas="c-libFLAC">lib{,Ogg}FLAC{,++}.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -178,9 +181,9 @@
 
       <varlistentry id="libxmms-flac">
-        <term><filename class='libraryfile'>libxmms-flac.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libxmms-flac.{so,a}</filename></term>
         <listitem>
           <para>is a plugin for <application>XMMS</application>.</para>
           <indexterm zone="flac libxmms-flac">
-            <primary sortas="c-libxmms-flac">libxmms-flac.[so,a]</primary>
+            <primary sortas="c-libxmms-flac">libxmms-flac.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/gst-plugins.xml
===================================================================
--- multimedia/libdriv/gst-plugins.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/gst-plugins.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -155,4 +155,7 @@
     <xref linkend="xine-lib"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gst-plugins"/></para>
+
   </sect2>
 
@@ -232,9 +235,9 @@
       <para>For the next test you'll need to choose an output method valid for
       your system such as osssink/esdsink/artsdsink/alsasink/jacksink. Replace
-      the <replaceable>[output_sink]</replaceable> in the command below with
+      the <replaceable>&lt;output_sink&gt;</replaceable> in the command below with
       a valid output method. Running the command should produce a C tone for a
       short duration.</para>
 
-<screen><userinput>gst-launch --iterations=50 sinesrc ! <replaceable>[output_sink]</replaceable></userinput></screen>
+<screen><userinput>gst-launch --iterations=50 sinesrc ! <replaceable>&lt;output_sink&gt;</replaceable></userinput></screen>
 
     </sect3>
@@ -281,5 +284,5 @@
     script discovers the required dependency package. To prevent a module from
     being built, pass
-    <option>--disable-<replaceable>[module]</replaceable></option> to
+    <option>--disable-<replaceable>&lt;module&gt;</replaceable></option> to
     <command>configure</command>. Run <command>configure --help</command>
     for all the available module names.</para>
@@ -297,5 +300,5 @@
       <seglistitem>
         <seg>gst-launch-ext-0.8 and gst-visualise-0.8</seg>
-        <seg>libgst*.[so,a], numerous <application>GStreamer</application> plugins,
+        <seg>libgst*.{so,a}, numerous <application>GStreamer</application> plugins,
         and a <application>Gstreamer</application> GDK pixbuf loader module</seg>
         <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/system/gstreamer,
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/gstreamer.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -86,4 +86,7 @@
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gstreamer"/></para>
+
   </sect2>
 
@@ -152,6 +155,6 @@
         gst-typefind, gst-typefind-0.8, gst-xmllaunch, gst-xmllaunch-0.8,
         gst-xmlinspect, and gst-xmlinspect-0.8</seg>
-        <seg>libgstcontrol-0.8.[so,a], libgstreamer-0.8.[so,a], and
-        libgst*.[so,a] plugin modules</seg>
+        <seg>libgstcontrol-0.8.{so,a}, libgstreamer-0.8.{so,a}, and
+        libgst*.{so,a} plugin modules</seg>
         <seg>/usr/include/gstreamer-0.8, /usr/lib/gstreamer-0.8,
         /usr/share/doc/gstreamer-&gstreamer-version;,
Index: multimedia/libdriv/id3lib.xml
===================================================================
--- multimedia/libdriv/id3lib.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/id3lib.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -67,4 +67,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/id3lib"/></para>
+
   </sect2>
 
@@ -100,5 +103,5 @@
       <seglistitem>
         <seg>id3convert, id3cp, id3info, and id3tag</seg>
-        <seg>libid3.[so,a]</seg>
+        <seg>libid3.{so,a}</seg>
         <seg>/usr/include/id3 and /usr/share/doc/id3lib-3.8.3</seg>
       </seglistitem>
@@ -151,10 +154,10 @@
 
       <varlistentry id="libid3">
-        <term><filename class='libraryfile'>libid3.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libid3.{so,a}</filename></term>
         <listitem>
           <para>provides functions for the ID3v1/v2 tag editing
           programs as well as other external programs and libraries.</para>
           <indexterm zone="id3lib libid3">
-            <primary sortas="c-libid3">libid3.[so,a]</primary>
+            <primary sortas="c-libid3">libid3.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/liba52.xml
===================================================================
--- multimedia/libdriv/liba52.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/liba52.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -60,4 +60,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/liba52"/></para>
+
   </sect2>
 
@@ -91,5 +94,5 @@
       <seglistitem>
         <seg>a52dec and extract_a52</seg>
-        <seg>liba52.[so,a]</seg>
+        <seg>liba52.{so,a}</seg>
         <seg>/usr/include/a52dec and /usr/share/doc/liba52-&liba52-version;</seg>
       </seglistitem>
@@ -122,10 +125,10 @@
 
       <varlistentry id="liba52-lib">
-        <term><filename class='libraryfile'>liba52.[so,a]</filename></term>
+        <term><filename class='libraryfile'>liba52.{so,a}</filename></term>
         <listitem>
           <para>provides functions for the programs dealing with
           ATSC A/52 streams.</para>
           <indexterm zone="liba52 liba52-lib">
-            <primary sortas="c-liba52">liba52.[so,a]</primary>
+            <primary sortas="c-liba52">liba52.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libao.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -73,4 +73,7 @@
     <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libao"/></para>
+
   </sect2>
 
@@ -132,5 +135,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libao.[so,a] and plugins</seg>
+        <seg>libao.{so,a} and plugins</seg>
         <seg>/usr/include/ao, /usr/lib/ao and /usr/share/doc/libao-&libao-version;</seg>
       </seglistitem>
@@ -143,10 +146,10 @@
 
       <varlistentry id="libao-lib">
-        <term><filename class='libraryfile'>libao.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libao.{so,a}</filename></term>
         <listitem>
           <para>provide functions for programs wishing to output sound over
           supported platforms.</para>
           <indexterm zone="libao libao-lib">
-            <primary sortas="c-libao">libao.[so,a]</primary>
+            <primary sortas="c-libao">libao.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libdv.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -68,4 +68,7 @@
     <xref linkend="x-window-system"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libdv"/></para>
+
   </sect2>
 
@@ -106,5 +109,5 @@
       <seglistitem>
         <seg>dubdv, dvconnect, encodedv, and playdv</seg>
-        <seg>libdv.[so,a]</seg>
+        <seg>libdv.{so,a}</seg>
         <seg>/usr/include/libdv and /usr/share/doc/libdv-&libdv-version;</seg>
       </seglistitem>
@@ -158,10 +161,10 @@
 
       <varlistentry id="libdv-lib">
-        <term><filename class='libraryfile'>libdv.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libdv.{so,a}</filename></term>
         <listitem>
           <para>provides functions for programs interacting with the
           Quasar DV CODEC.</para>
           <indexterm zone="libdv libdv-lib">
-            <primary sortas="c-libdv">libdv.[so,a]</primary>
+            <primary sortas="c-libdv">libdv.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libdvdcss.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -66,4 +66,7 @@
     <xref linkend="tex"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libdvdcss"/></para>
+
   </sect2>
 
@@ -112,5 +115,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libdvdcss.[so,a]</seg>
+        <seg>libdvdcss.{so,a}</seg>
         <seg>/usr/include/dvdcss and /usr/share/doc/libdvdcss-&libdvdcss-version;</seg>
       </seglistitem>
@@ -123,10 +126,10 @@
 
       <varlistentry id="libdvdcss-lib">
-        <term><filename class='libraryfile'>libdvdcss.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libdvdcss.{so,a}</filename></term>
         <listitem>
           <para>provides the functionality that is required for transparent
           DVD access with CSS decryption.</para>
           <indexterm zone="libdvdcss libdvdcss-lib">
-            <primary sortas="c-libdvdcss">libdvdcss.[so,a]</primary>
+            <primary sortas="c-libdvdcss">libdvdcss.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libdvdread.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -64,4 +64,7 @@
     <para role="optional"><xref linkend="libdvdcss"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libdvdread"/></para>
+
   </sect2>
 
@@ -102,5 +105,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libdvdread.[so,a]</seg>
+        <seg>libdvdread.{so,a}</seg>
         <seg>/usr/include/dvdread</seg>
       </seglistitem>
@@ -113,9 +116,9 @@
 
       <varlistentry id="libdvdread-lib">
-        <term><filename class='libraryfile'>libdvdread.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libdvdread.{so,a}</filename></term>
         <listitem>
           <para>provides the functionality that is required to access DVDs.</para>
           <indexterm zone="libdvdread libdvdread-lib">
-            <primary sortas="c-libdvdread">libdvdread.[so,a]</primary>
+            <primary sortas="c-libdvdread">libdvdread.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libfame.xml
===================================================================
--- multimedia/libdriv/libfame.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libfame.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -67,4 +67,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libfame"/></para>
+
   </sect2>
 
@@ -106,5 +109,5 @@
       <seglistitem>
         <seg>libfame-config</seg>
-        <seg>libfame.[so,a]</seg>
+        <seg>libfame.{so,a}</seg>
         <seg>None</seg>
       </seglistitem>
@@ -128,9 +131,9 @@
 
       <varlistentry id="libfame-lib">
-        <term><filename class='libraryfile'>libfame.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libfame.{so,a}</filename></term>
         <listitem>
           <para>provides functions for the video encoding programs.</para>
           <indexterm zone="libfame libfame-lib">
-            <primary sortas="c-libfame">libfame.[so,a]</primary>
+            <primary sortas="c-libfame">libfame.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libmad.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -59,4 +59,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libmad"/></para>
+
   </sect2>
 
@@ -109,5 +112,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libmad.[so,a]</seg>
+        <seg>libmad.{so,a}</seg>
         <seg>None</seg>
       </seglistitem>
@@ -120,9 +123,9 @@
 
       <varlistentry id="libmad-lib">
-        <term><filename class='libraryfile'>libmad.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libmad.{so,a}</filename></term>
         <listitem>
           <para>is a MPEG audio decoder library.</para>
           <indexterm zone="libmad libmad-lib">
-            <primary sortas="c-libmad">libmad.[so,a]</primary>
+            <primary sortas="c-libmad">libmad.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libmikmod.xml
===================================================================
--- multimedia/libdriv/libmikmod.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libmikmod.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -77,4 +77,7 @@
     <ulink url="http://www.anime.net/~sam9407/">SAM9407 driver</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libmikmod"/></para>
+
   </sect2>
 
@@ -130,5 +133,5 @@
       <seglistitem>
         <seg>libmikmod-config</seg>
-        <seg>libmikmod.[so,a]</seg>
+        <seg>libmikmod.{so,a}</seg>
         <seg>/usr/share/doc/libmikmod-&libmikmod-version;</seg>
       </seglistitem>
@@ -152,10 +155,10 @@
 
       <varlistentry id="libmikmod-lib">
-        <term><filename class='libraryfile'>libmikmod.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libmikmod.{so,a}</filename></term>
         <listitem>
           <para>contains functions that are required to play various tracker module
             files.</para>
           <indexterm zone="libmikmod libmikmod-lib">
-            <primary sortas="c-libmikmod">libmikmod.[so,a]</primary>
+            <primary sortas="c-libmikmod">libmikmod.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libmpeg2.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -69,4 +69,7 @@
     <xref linkend="sdl"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libmpeg2"/></para>
+
   </sect2>
 
@@ -113,5 +116,5 @@
       <seglistitem>
         <seg>corrupt_mpeg2, extract_mpeg2 and mpeg2dec</seg>
-        <seg>libmpeg2.[so,a] and libmpeg2convert.[so,a]</seg>
+        <seg>libmpeg2.{so,a} and libmpeg2convert.{so,a}</seg>
         <seg>/usr/include/mpeg2dec and
         /usr/share/doc/mpeg2dec-&libmpeg2-version;</seg>
@@ -145,9 +148,9 @@
 
       <varlistentry id="libmpeg2-lib">
-        <term><filename class='libraryfile'>libmpeg2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libmpeg2.{so,a}</filename></term>
         <listitem>
           <para>contains API functions used to decode MPEG video streams.</para>
           <indexterm zone="libmpeg2 libmpeg2-lib">
-            <primary sortas="c-libmpeg2">libmpeg2.[so,a]</primary>
+            <primary sortas="c-libmpeg2">libmpeg2.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -155,10 +158,10 @@
 
       <varlistentry id="libmpeg2convert">
-        <term><filename class='libraryfile'>libmpeg2convert.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libmpeg2convert.{so,a}</filename></term>
         <listitem>
           <para>contains API functions used for color conversions of MPEG
           video streams.</para>
           <indexterm zone="libmpeg2 libmpeg2convert">
-            <primary sortas="c-libmpeg2convert">libmpeg2convert.[so,a]</primary>
+            <primary sortas="c-libmpeg2convert">libmpeg2convert.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libmpeg3.xml
===================================================================
--- multimedia/libdriv/libmpeg3.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libmpeg3.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -71,4 +71,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="NASM"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libmpeg3"/></para>
 
   </sect2>
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -73,4 +73,7 @@
     <para role="optional"><xref linkend="expat"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libmusicbrainz"/></para>
+
   </sect2>
 
@@ -104,5 +107,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libmusicbrainz.[so,a]</seg>
+        <seg>libmusicbrainz.{so,a}</seg>
         <seg>/usr/include/musicbrainz and
         /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;</seg>
@@ -116,10 +119,10 @@
 
       <varlistentry id="libmusicbrainz-lib">
-        <term><filename class='libraryfile'>libmusicbrainz.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libmusicbrainz.{so,a}</filename></term>
         <listitem>
           <para>contains API functions to access the MusicBrainz database, both
           for looking up data and also for submitting new data.</para>
           <indexterm zone="libmusicbrainz libmusicbrainz-lib">
-            <primary sortas="c-libmusicbrainz">libmusicbrainz.[so,a]</primary>
+            <primary sortas="c-libmusicbrainz">libmusicbrainz.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libogg.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -60,4 +60,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libogg"/></para>
+
   </sect2>
 
@@ -89,5 +92,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libogg.[so,a]</seg>
+        <seg>libogg.{so,a}</seg>
         <seg>/usr/include/ogg and /usr/share/doc/libogg-&libogg-version;</seg>
       </seglistitem>
@@ -100,10 +103,10 @@
 
       <varlistentry id="libogg-lib">
-        <term><filename class='libraryfile'>libogg.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libogg.{so,a}</filename></term>
         <listitem>
           <para>libraries provide the functions required for programs to
           read or write Ogg formatted bit streams.</para>
           <indexterm zone="libogg libogg-lib">
-            <primary sortas="c-libogg">libogg.[so,a]</primary>
+            <primary sortas="c-libogg">libogg.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/libvorbis.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -119,6 +119,6 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libvorbis.[so,a], libvorbisenc.[so,a], and
-        libvorbisfile.[so,a]</seg>
+        <seg>libvorbis.{so,a}, libvorbisenc.{so,a}, and
+        libvorbisfile.{so,a}</seg>
         <seg>/usr/include/vorbis and /usr/share/doc/libvorbis-&libvorbis-version;</seg>
       </seglistitem>
@@ -131,10 +131,10 @@
 
       <varlistentry id="libvorbis-lib">
-        <term><filename class='libraryfile'>libvorbis*.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libvorbis*.{so,a}</filename></term>
         <listitem>
           <para>libraries provide the functions to read and write sound
           files.</para>
           <indexterm zone="libvorbis libvorbis-lib">
-            <primary sortas="c-libvorbis">libvorbis*.[so,a]</primary>
+            <primary sortas="c-libvorbis">libvorbis*.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/nas.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -77,4 +77,7 @@
     <para role="required"><xref linkend="x-window-system"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nas"/></para>
+
   </sect2>
 
@@ -168,5 +171,5 @@
         auplay, aurecord, auscope, autool, auwave, checkmail, issndfile, nasd,
         playbucket, and soundtoh</seg>
-        <seg>libaudio.[so,a]</seg>
+        <seg>libaudio.{so,a}</seg>
         <seg>/etc/nas and /usr/X11R6/include/audio</seg>
       </seglistitem>
@@ -179,5 +182,5 @@
 
       <varlistentry id="au-utilities">
-        <term><command>au[utilities]</command></term>
+        <term><command>au{utilities}</command></term>
         <listitem>
           <para>are a collection of tools to convert, play, edit, record,
@@ -185,5 +188,5 @@
           for a full description of each one.</para>
           <indexterm zone="nas au-utilities">
-            <primary sortas="b-au-utilities">au[utilities]</primary>
+            <primary sortas="b-au-utilities">au{utilities}</primary>
           </indexterm>
         </listitem>
@@ -242,9 +245,9 @@
 
       <varlistentry id="libaudio">
-        <term><filename class='libraryfile'>libaudio.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libaudio.{so,a}</filename></term>
         <listitem>
           <para>contains API functions to read and write audio files.</para>
           <indexterm zone="nas libaudio">
-            <primary sortas="c-libaudio">libaudio.[so,a]</primary>
+            <primary sortas="c-libaudio">libaudio.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/openquicktime.xml
===================================================================
--- multimedia/libdriv/openquicktime.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/openquicktime.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -79,4 +79,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libjpeg"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/openquicktime"/></para>
 
   </sect2>
@@ -174,9 +177,9 @@
 
       <varlistentry id="libopenquicktime">
-        <term><filename class='libraryfile'>libopenquicktime.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libopenquicktime.{so,a}</filename></term>
         <listitem>
           <para>this is the core library.</para>
           <indexterm zone="openquicktime libopenquicktime">
-            <primary sortas="c-libopenquicktime">libopenquicktime.[so,a]</primary>
+            <primary sortas="c-libopenquicktime">libopenquicktime.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/sdl.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -86,4 +86,7 @@
     <ulink url="http://picogui.org/">PicoGUI</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sdl"/></para>
+
   </sect2>
 
@@ -158,5 +161,5 @@
       <seglistitem>
         <seg>sdl-config</seg>
-        <seg>libSDL*.[so,a]</seg>
+        <seg>libSDL*.{so,a}</seg>
         <seg>/usr/include/SDL and /usr/share/doc/SDL-&sdl-version;</seg>
       </seglistitem>
@@ -181,5 +184,5 @@
 
       <varlistentry id="libsdl">
-        <term><filename class='libraryfile'>libSDL*.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libSDL*.{so,a}</filename></term>
         <listitem>
           <para> libraries provide low level access to audio, keyboard, mouse,
@@ -187,5 +190,5 @@
           2D frame buffer across multiple platforms.</para>
           <indexterm zone="sdl libsdl">
-            <primary sortas="c-libsdl">libSDL*.[so,a]</primary>
+            <primary sortas="c-libsdl">libSDL*.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/speex.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -65,4 +65,7 @@
     <para role="optional"><xref linkend="libogg"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/speex"/></para>
+
   </sect2>
 
@@ -94,5 +97,5 @@
       <seglistitem>
         <seg>speexdec and speexenc</seg>
-        <seg>libspeex.[so,a]</seg>
+        <seg>libspeex.{so,a}</seg>
         <seg>/usr/share/doc/speex-1.0.4</seg>
       </seglistitem>
@@ -127,9 +130,9 @@
 
       <varlistentry id="libspeex">
-        <term><filename class='libraryfile'>libspeex.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libspeex.{so,a}</filename></term>
         <listitem>
           <para>provides functions for the audio encoding/decoding programs.</para>
           <indexterm zone="speex libspeex">
-            <primary sortas="c-libspeex">libspeex.[so,a]</primary>
+            <primary sortas="c-libspeex">libspeex.{so,a}</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/xine-lib.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -102,4 +102,7 @@
     and not system-installed versions.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xine-lib"/></para>
+
   </sect2>
 
@@ -118,5 +121,5 @@
 
     <para>You will need to pass
-    <option>--with-xv-path=<replaceable>[/directory/path]</replaceable></option>
+    <option>--with-xv-path=<replaceable>&lt;/directory/path&gt;</replaceable></option>
     to <command>configure</command> if you didn't install
     <application>Xorg</application> or <application>XFree86</application> in
@@ -153,5 +156,5 @@
       <seglistitem>
         <seg>xine-config</seg>
-        <seg>libxine.[a,so] and numerous plugin modules and video extensions</seg>
+        <seg>libxine.{a,so} and numerous plugin modules and video extensions</seg>
         <seg>Output display engine fonts located in
         /usr/share/xine/libxine1/fonts</seg>
Index: multimedia/libdriv/xvid.xml
===================================================================
--- multimedia/libdriv/xvid.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/libdriv/xvid.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -64,4 +64,7 @@
     <para role="optional"><xref linkend="NASM"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xvid"/></para>
+
   </sect2>
 
@@ -97,8 +100,8 @@
     This command makes applications linked against
     <filename class="libraryfile">.so</filename> names, link to
-    <filename class="libraryfile">.so.<replaceable>MAJOR</replaceable></filename>.
+    <filename class="libraryfile">.so.<replaceable>&lt;MAJOR&gt;</replaceable></filename>.
     This ensures better binary compatibility, as
     <application>XviD</application> developers take care not changing the
-    <replaceable>MAJOR</replaceable> number until there is an incompatible
+    <replaceable>&lt;MAJOR&gt;</replaceable> number until there is an incompatible
     ABI change.</para>
 
@@ -115,5 +118,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libxvidcore.[so,a]</seg>
+        <seg>libxvidcore.{so,a}</seg>
         <seg>/usr/share/doc/xvidcore-&xvid-version;</seg>
       </seglistitem>
@@ -126,10 +129,10 @@
 
     <varlistentry id="libxvidcore">
-      <term><filename class='libraryfile'>libxvidcore.[so,a]</filename></term>
+      <term><filename class='libraryfile'>libxvidcore.{so,a}</filename></term>
       <listitem>
         <para>provides functions to encode and decode most
         MPEG-4 video data.</para>
         <indexterm zone="xvid libxvidcore">
-          <primary sortas="c-libxvidcore">libxvidcore.[so,a]</primary>
+          <primary sortas="c-libxvidcore">libxvidcore.{so,a}</primary>
         </indexterm>
       </listitem>
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/videoutils/avifile.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -113,4 +113,7 @@
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/avifile"/></para>
+
   </sect2>
 
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/videoutils/ffmpeg.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -98,4 +98,7 @@
     <xref linkend="tex"/> (to build HTML documentation)</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ffmpeg"/></para>
+
   </sect2>
 
@@ -176,5 +179,5 @@
     installed.</para>
 
-    <para><option>--enable-<replaceable>[codec]</replaceable></option>: Review
+    <para><option>--enable-<replaceable>&lt;codec&gt;</replaceable></option>: Review
     the available options and codecs using the
     <command>./configure --help</command> command. Also review the information
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/videoutils/mplayer.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -291,4 +291,7 @@
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mplayer"/></para>
+
   </sect2>
 
@@ -446,5 +449,5 @@
 chown -v -R root:root /usr/share/mplayer/font &amp;&amp;
 cd /usr/share/mplayer/font &amp;&amp;
-ln -v -sf &mplayer-font;/font-arial-<replaceable>[font size]</replaceable>-iso-8859-1/* .</userinput></screen>
+ln -v -sf &mplayer-font;/font-arial-<replaceable>&lt;font size&gt;</replaceable>-iso-8859-1/* .</userinput></screen>
 
       <para>Available font sizes are 14, 18, 24 or 28.</para>
@@ -467,10 +470,10 @@
 <literal># Create a /dev/dvd symlink
 
-KERNEL="<replaceable>[dvd drive]</replaceable>", SYMLINK="dvd"</literal>
+KERNEL="<replaceable>&lt;dvd drive&gt;</replaceable>", SYMLINK="dvd"</literal>
 
 EOF
 udevstart</userinput></screen>
 
-      <para>Replace <replaceable>[dvd drive]</replaceable> with whatever
+      <para>Replace <replaceable>&lt;dvd drive&gt;</replaceable> with whatever
       device is appropriate, for example <filename>hdc</filename>. If
       you don't know which device to choose, type:</para>
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/videoutils/transcode.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -103,4 +103,7 @@
     <ulink url="http://sourceforge.net/projects/mjpeg">MMX Jpeg</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/transcode"/></para>
+
   </sect2>
 
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
+++ multimedia/videoutils/xine-ui.xml	(revision 0e2aa080de3f731698e2814a977e5dc4b1adba62)
@@ -73,4 +73,7 @@
     <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xine-ui"/></para>
+
   </sect2>
 
@@ -128,6 +131,6 @@
         <seg>aaxine, cacaxine, fbxine, xine, xine-bugreport, xine-check, and
         xine-remote</seg>
-        <seg>/usr/share/xine/[desktop,skins,visuals] and
-        /usr/share/doc/[xine-ui,xitk]</seg>
+        <seg>/usr/share/xine/{desktop,skins,visuals} and
+        /usr/share/doc/{xine-ui,xitk}</seg>
       </seglistitem>
     </segmentedlist>
