Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision 9f6abab3109153e438e736cfcfa049d0e36cb1cc)
+++ basicnet/netlibs/curl.xml	(revision 061ec9d0326e38256cdab4be40bd3109ada31635)
@@ -80,4 +80,7 @@
     the shared library)</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/curl"/></para>
+
   </sect2>
 
@@ -127,5 +130,5 @@
       <seglistitem>
         <seg>curl and curl-config</seg>
-        <seg>libcurl.[so,a]</seg>
+        <seg>libcurl.{so,a}</seg>
         <seg>/usr/include/curl, /usr/share/curl
         and /usr/share/doc/curl-&curl-version;</seg>
@@ -163,10 +166,10 @@
 
       <varlistentry id="libcurl">
-        <term><filename class='libraryfile'>libcurl.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libcurl.{so,a}</filename></term>
         <listitem>
           <para>provides the API functions required by
           <command>curl</command> and other programs.</para>
           <indexterm zone="curl libcurl">
-            <primary sortas="c-libcurl">libcurl.[so,a]</primary>
+            <primary sortas="c-libcurl">libcurl.{so,a}</primary>
           </indexterm>
         </listitem>
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision 9f6abab3109153e438e736cfcfa049d0e36cb1cc)
+++ basicnet/netlibs/gnet.xml	(revision 061ec9d0326e38256cdab4be40bd3109ada31635)
@@ -65,4 +65,7 @@
     <para role="required"><xref linkend="GLib"/> or <xref linkend="glib2"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnet"/></para>
+
   </sect2>
 
@@ -94,5 +97,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libgnet-2.0.[so,a]</seg>
+        <seg>libgnet-2.0.{so,a}</seg>
         <seg>/usr/include/gnet-2.0, /usr/lib/gnet-2.0 and
         /usr/share/doc/libgnet2.0-dev or /usr/share/gtk-doc/html/gnet</seg>
@@ -106,5 +109,5 @@
 
       <varlistentry id="libgnet">
-        <term><filename class='libraryfile'>libgnet-2.0.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnet-2.0.{so,a}</filename></term>
         <listitem>
           <para>is a simple network library written in C. It is
@@ -112,5 +115,5 @@
           intended to be easy to use and port.</para>
           <indexterm zone="gnet libgnet">
-            <primary sortas="c-libgnet-2.0">libgnet-2.0.[so,a]</primary>
+            <primary sortas="c-libgnet-2.0">libgnet-2.0.{so,a}</primary>
           </indexterm>
         </listitem>
Index: basicnet/netlibs/libpcap.xml
===================================================================
--- basicnet/netlibs/libpcap.xml	(revision 9f6abab3109153e438e736cfcfa049d0e36cb1cc)
+++ basicnet/netlibs/libpcap.xml	(revision 061ec9d0326e38256cdab4be40bd3109ada31635)
@@ -68,4 +68,7 @@
     network monitoring cards.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libpcap"/></para>
+
   </sect2>
 
Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision 9f6abab3109153e438e736cfcfa049d0e36cb1cc)
+++ basicnet/netlibs/libsoup.xml	(revision 061ec9d0326e38256cdab4be40bd3109ada31635)
@@ -75,4 +75,7 @@
     </para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libsoup"/></para>
+
   </sect2>
 
@@ -104,5 +107,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libsoup-2.2.[so,a]</seg>
+        <seg>libsoup-2.2.{so,a}</seg>
         <seg>/usr/include/libsoup-2.2 and /usr/share/gtk-doc/html/libsoup</seg>
       </seglistitem>
@@ -115,9 +118,9 @@
 
       <varlistentry id="libsoup-lib">
-        <term><filename class='libraryfile'>libsoup-2.2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libsoup-2.2.{so,a}</filename></term>
         <listitem>
           <para>provides functions for asynchronous HTTP connections.</para>
           <indexterm zone="libsoup libsoup-lib">
-            <primary sortas="c-libsoup-2.2">libsoup-2.2.[so,a]</primary>
+            <primary sortas="c-libsoup-2.2">libsoup-2.2.{so,a}</primary>
           </indexterm>
         </listitem>
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 9f6abab3109153e438e736cfcfa049d0e36cb1cc)
+++ basicnet/netlibs/wvstreams.xml	(revision 061ec9d0326e38256cdab4be40bd3109ada31635)
@@ -83,5 +83,5 @@
     <xref linkend="libvorbis"/>,
     <xref linkend="doxygen"/>,
-    <ulink url="http://www.fftw.org/">FFTW-2.<replaceable>X</replaceable></ulink>,
+    <ulink url="http://www.fftw.org/">FFTW-2.<replaceable>&lt;X&gt;</replaceable></ulink>,
     <ulink url="http://www.swig.org">SWIG</ulink>,
     <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
@@ -91,4 +91,7 @@
     <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/wvstreams"/></para>
+
   </sect2>
 
@@ -174,7 +177,7 @@
       <seglistitem>
         <seg>uni and uniconfd</seg>
-        <seg>libuniconf.[so,a], libwvbase.[so,a], libwvfft.[so,a],
-        libwvoggspeex.[so,a], libwvoggvorbis.[so,a], libwvqt.[so,a],
-        libwvstreams.[so,a], libwvtelephony.[so,a], libwvutils.[so,a] and
+        <seg>libuniconf.{so,a}, libwvbase.{so,a}, libwvfft.{so,a},
+        libwvoggspeex.{so,a}, libwvoggvorbis.{so,a}, libwvqt.{so,a},
+        libwvstreams.{so,a}, libwvtelephony.{so,a}, libwvutils.{so,a} and
         libxplc-cxx.a</seg>
         <seg>/usr/include/wvstreams, /usr/share/doc/wvstreams-&wvstreams-version; and
@@ -209,10 +212,10 @@
 
       <varlistentry id="libuniconf">
-        <term><filename class='libraryfile'>libuniconf.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libuniconf.{so,a}</filename></term>
         <listitem>
           <para>contains functions that define a hierarchical registry
           abstraction in the UniConf configuration system.</para>
           <indexterm zone="wvstreams libuniconf">
-            <primary sortas="c-libuniconf">libuniconf.[so,a]</primary>
+            <primary sortas="c-libuniconf">libuniconf.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -220,9 +223,9 @@
 
       <varlistentry id="libwvbase">
-        <term><filename class='libraryfile'>libwvbase.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvbase.{so,a}</filename></term>
         <listitem>
           <para>contains the Base64 encoder and decoder implementations functions.</para>
           <indexterm zone="wvstreams libwvbase">
-            <primary sortas="c-libwvbase">libwvbase.[so,a]</primary>
+            <primary sortas="c-libwvbase">libwvbase.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -230,5 +233,5 @@
 
       <varlistentry id="libwvfft">
-        <term><filename class='libraryfile'>libwvfft.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvfft.{so,a}</filename></term>
         <listitem>
           <para>enables <application>WvStreams</application> programs to
@@ -237,5 +240,5 @@
           interface.</para>
           <indexterm zone="wvstreams libwvfft">
-            <primary sortas="c-libwvfft">libwvfft.[so,a]</primary>
+            <primary sortas="c-libwvfft">libwvfft.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -243,5 +246,5 @@
 
       <varlistentry id="libwvoggspeex">
-        <term><filename class='libraryfile'>libwvoggspeex.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvoggspeex.{so,a}</filename></term>
         <listitem>
           <para>enables quick and painless creation of audio streams using
@@ -249,5 +252,5 @@
           IP CODEC.</para>
           <indexterm zone="wvstreams libwvoggspeex">
-            <primary sortas="c-libwvoggspeex">libwvoggspeex.[so,a]</primary>
+            <primary sortas="c-libwvoggspeex">libwvoggspeex.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -255,10 +258,10 @@
 
       <varlistentry id="libwvoggvorbis">
-        <term><filename class='libraryfile'>libwvoggvorbis.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvoggvorbis.{so,a}</filename></term>
         <listitem>
           <para>enables quick and painless creation of audio streams using
           the OggVorbis CODEC.</para>
           <indexterm zone="wvstreams libwvoggvorbis">
-            <primary sortas="c-libwvoggvorbis">libwvoggvorbis.[so,a]</primary>
+            <primary sortas="c-libwvoggvorbis">libwvoggvorbis.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -266,5 +269,5 @@
 
       <varlistentry id="libwvqt">
-        <term><filename class='libraryfile'>libwvqt.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvqt.{so,a}</filename></term>
         <listitem>
           <para>enables <application>WvStreams</application> to act as the
@@ -272,5 +275,5 @@
           <application>KDE</application>.</para>
           <indexterm zone="wvstreams libwvqt">
-            <primary sortas="c-libwvqt">libwvqt.[so,a]</primary>
+            <primary sortas="c-libwvqt">libwvqt.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -278,9 +281,9 @@
 
       <varlistentry id="libwvstreams">
-        <term><filename class='libraryfile'>libwvstreams.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvstreams.{so,a}</filename></term>
         <listitem>
           <para>provides functions for basic streaming I/O support.</para>
           <indexterm zone="wvstreams libwvstreams">
-            <primary sortas="c-libwvstreams">libwvstreams.[so,a]</primary>
+            <primary sortas="c-libwvstreams">libwvstreams.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -288,10 +291,10 @@
 
       <varlistentry id="libtelephony">
-        <term><filename class='libraryfile'>libtelephony.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libtelephony.{so,a}</filename></term>
         <listitem>
           <para>contains telephony function routines such as echo
           cancellation, dc offset removal, automatic gain control, etc.</para>
           <indexterm zone="wvstreams libtelephony">
-            <primary sortas="c-libtelephony">libtelephony.[so,a]</primary>
+            <primary sortas="c-libtelephony">libtelephony.{so,a}</primary>
           </indexterm>
         </listitem>
@@ -299,10 +302,10 @@
 
       <varlistentry id="libwvutils">
-        <term><filename class='libraryfile'>libwvutils.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libwvutils.{so,a}</filename></term>
         <listitem>
           <para>contains functions required by the
           <application>WvStreams</application> libraries and utility programs.</para>
           <indexterm zone="wvstreams libwvutils">
-            <primary sortas="c-libwvutils">libwvutils.[so,a]</primary>
+            <primary sortas="c-libwvutils">libwvutils.{so,a}</primary>
           </indexterm>
         </listitem>
