diff --git a/gnome/add/at-spi.xml b/gnome/add/at-spi.xml
index a0fbc60760..9d81381d24 100644
--- a/gnome/add/at-spi.xml
+++ b/gnome/add/at-spi.xml
@@ -69,6 +69,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/at-spi"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -112,13 +115,13 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>at-spi-registryd</seg>
-        <seg>libspi.[so,a], libcspi.[so,a], libloginhelper.[so,a], the
+        <seg>libspi.{so,a}, libcspi.{so,a}, libloginhelper.{so,a}, the
         libatk-bridge.so <application>GTK+</application> module, and
         <application>ORBit</application>-2.0 Accessibility modules</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/at-spi-1.0,
         lib/at-spi,
-        share/[gtk-doc/html/at-spi-cspi, idl/at-spi-1.0]</seg>
+        share/{gtk-doc/html/at-spi-cspi, idl/at-spi-1.0}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/bug-buddy.xml b/gnome/add/bug-buddy.xml
index 6b6686ea9f..8044407120 100644
--- a/gnome/add/bug-buddy.xml
+++ b/gnome/add/bug-buddy.xml
@@ -65,6 +65,9 @@
     <para role="required"><xref linkend="gnome-desktop"/> and
     <xref linkend="gnome-menus"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bug-buddy"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -112,8 +115,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>bug-buddy</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/bug-buddy
-        and $GNOME_PREFIX/share/[,gnome/help/, omf/]bug-buddy</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/bug-buddy
+        and $GNOME_PREFIX/share/{,gnome/help/, omf/}bug-buddy</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/eog.xml b/gnome/add/eog.xml
index 3640e63429..cb05fcfe85 100644
--- a/gnome/add/eog.xml
+++ b/gnome/add/eog.xml
@@ -70,6 +70,9 @@
     <xref linkend="libexif"/>, and
     <xref linkend="lcms"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/eog"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -116,8 +119,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>eog</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/eog
-        and $GNOME_PREFIX/share/[gnome/help/, omf/, pixmaps/]eog</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/eog
+        and $GNOME_PREFIX/share/{gnome/help/, omf/, pixmaps/}eog</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/epiphany.xml b/gnome/add/epiphany.xml
index 03ebd18302..b672b93c15 100644
--- a/gnome/add/epiphany.xml
+++ b/gnome/add/epiphany.xml
@@ -79,6 +79,9 @@
     see <xref linkend="hal-runtime-dependencies"/>), and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/epiphany"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -147,10 +150,10 @@ make</userinput></screen>
       <seglistitem>
         <seg>epiphany</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/epiphany
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/epiphany
         and the following subdirectories of $GNOME_PREFIX/:
         include/epiphany-1.8,
-        share/[,gnome/help/, gtk-doc/html/, omf/]epiphany</seg>
+        share/{,gnome/help/, gtk-doc/html/, omf/}epiphany</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/evince.xml b/gnome/add/evince.xml
index 7c49c5c0f3..78d22c7fb4 100644
--- a/gnome/add/evince.xml
+++ b/gnome/add/evince.xml
@@ -87,6 +87,9 @@
     <ulink url="http://djvulibre.djvuzone.org/">DjVuLibre</ulink>, and
     <ulink url="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/">t1lib</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/evince"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -146,10 +149,10 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>evince and evince-thumbnailer</seg>
-        <seg>libevince-properties-page.[so,a] and a
+        <seg>libevince-properties-page.{so,a} and a
         <application>Nautilus</application> extension</seg>
         <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/evince
-        and $GNOME_PREFIX/share/[,gnome/help/ ,omf/]evince</seg>
+        and $GNOME_PREFIX/share/{,gnome/help/ ,omf/}evince</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/evolution-data-server.xml b/gnome/add/evolution-data-server.xml
index f16c34f278..c20cdc34f0 100644
--- a/gnome/add/evolution-data-server.xml
+++ b/gnome/add/evolution-data-server.xml
@@ -79,6 +79,9 @@ xreflabel="Evolution Data Server-&evolution-data-server-version;">
     <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/evolution-data-server"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -136,10 +139,10 @@ make</userinput></screen>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/evolution-data-server-1.4,
         lib/evolution-data-server-1.2,
-        share/[evolution-data-server-1.4,
-        gtk-doc/html/libe[book,cal,data[,server]],
+        share/{evolution-data-server-1.4,
+        gtk-doc/html/libe{book,cal,data{,server}},
         idl/evolution-data-server-1.2,
-        pixmaps/evolution-data-server-1.4]</seg>
+        pixmaps/evolution-data-server-1.4}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/file-roller.xml b/gnome/add/file-roller.xml
index b730ec401e..44cf516701 100644
--- a/gnome/add/file-roller.xml
+++ b/gnome/add/file-roller.xml
@@ -64,6 +64,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="nautilus"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/file-roller"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -110,8 +113,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>file-roller</seg>
         <seg>A Bonobo component and Nautilus extension</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/file-roller
-        and $GNOME_PREFIX/share/[,gnome/help/, omf/]file-roller</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/file-roller
+        and $GNOME_PREFIX/share/{,gnome/help/, omf/}file-roller</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gal.xml b/gnome/add/gal.xml
index f5ec10f7f5..67fa97cc51 100644
--- a/gnome/add/gal.xml
+++ b/gnome/add/gal.xml
@@ -69,6 +69,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gal"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -107,7 +110,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgal-a11y-2.4.[so,a] and libgal-2.4.[so,a]</seg>
+        <seg>libgal-a11y-2.4.{so,a} and libgal-2.4.{so,a}</seg>
         <seg>$GNOME_PREFIX/include/gal-2.4,
         $GNOME_PREFIX/share/gtk-doc/html/gal-2.4, and
         $GNOME_PREFIX/share/gal-2.4</seg>
diff --git a/gnome/add/gcalctool.xml b/gnome/add/gcalctool.xml
index 6cee83988c..e3108f02cd 100644
--- a/gnome/add/gcalctool.xml
+++ b/gnome/add/gcalctool.xml
@@ -66,6 +66,9 @@
     <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="scrollkeeper"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gcalctool"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -112,8 +115,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>gcalctool and gnome-calculator</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gcalctool
-        and $GNOME_PREFIX/share/[gnome/help/, omf/]gcalctool</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gcalctool
+        and $GNOME_PREFIX/share/{gnome/help/, omf/}gcalctool</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gconf-editor.xml b/gnome/add/gconf-editor.xml
index 2e68dcca31..4e74093fd6 100644
--- a/gnome/add/gconf-editor.xml
+++ b/gnome/add/gconf-editor.xml
@@ -64,6 +64,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeui"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gconf-editor"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -111,8 +114,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>gconf-editor</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gconf-editor
-        and $GNOME_PREFIX/share/[gnome/help, omf, pixmaps]/gconf-editor</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gconf-editor
+        and $GNOME_PREFIX/share/{gnome/help, omf, pixmaps}/gconf-editor</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gdm.xml b/gnome/add/gdm.xml
index a95bbed445..176d0ec91e 100644
--- a/gnome/add/gdm.xml
+++ b/gnome/add/gdm.xml
@@ -70,6 +70,9 @@
     <para role="optional"><xref linkend="linux-pam"/> and
     <xref linkend="tcpwrappers"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gdm"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -280,10 +283,10 @@ chmod -v 644 $GNOME_PREFIX/share/xsessions/gnome-dbus.desktop</userinput></scree
         gdm-safe-restart, gdm-stop, gdmXnest, gdmXnestchooser, gdmdynamic,
         gdmflexiserver, gdmphotosetup, gdmsetup, and gdmthemetester</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/[,g]dm,
+        <seg>&gnome-etc-dir;/{,g}dm,
         /var/lib/gdm,
         /var/log/gdm and the following directories in $GNOME_PREFIX/:
-        share/[[,gnome/help/ ,omf/]gdm, gnome/capplets, xsessions]</seg>
+        share/{{,gnome/help/ ,omf/}gdm, gnome/capplets, xsessions}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gedit.xml b/gnome/add/gedit.xml
index d93631d331..9014b7544e 100644
--- a/gnome/add/gedit.xml
+++ b/gnome/add/gedit.xml
@@ -67,6 +67,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="aspell"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gedit"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -113,11 +116,11 @@ make</userinput></screen>
       <seglistitem>
         <seg>gedit and gnome-text-editor</seg>
         <seg><application>gedit</application> plugin modules</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gedit-2
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gedit-2
         and the following subdirectoreis of $GNOME_PREFIX/:
         include/gedit-&gnome-version;,
         lib/gedit-2,
-        share/[gedit-2, [gnome/help, omf]/gedit]</seg>
+        share/{gedit-2, {gnome/help, omf}/gedit}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/ggv.xml b/gnome/add/ggv.xml
index d666eae947..97df3e8ac7 100644
--- a/gnome/add/ggv.xml
+++ b/gnome/add/ggv.xml
@@ -67,6 +67,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="cups"/> or <xref linkend="LPRng"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ggv"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/add/gnome-audio.xml b/gnome/add/gnome-audio.xml
index cbbcbf0132..f77153c19d 100644
--- a/gnome/add/gnome-audio.xml
+++ b/gnome/add/gnome-audio.xml
@@ -61,6 +61,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-audio"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/add/gnome-games.xml b/gnome/add/gnome-games.xml
index f662423134..cd8ebf7284 100644
--- a/gnome/add/gnome-games.xml
+++ b/gnome/add/gnome-games.xml
@@ -80,6 +80,9 @@
     network game server daemon <command>games-server.py</command>, which
     requires <xref linkend="python"/>.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-games"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -147,12 +150,12 @@ make</userinput></screen>
         gnobots2, gnome-stones, gnometris, gnomine, gnotravex, gnotski,
         gtali, iagno, mahjongg, same-gnome, and sol</seg>
         <seg><command>gnome-stones</command> objects libraries</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/[many game names]
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/{many game names}
         and the following subdirectories of $GNOME_PREFIX/:
         lib/gnome-stones,
-        share/[[many game names],
-        [,omf/]gnome-games,
-        [,help,pixmaps,sound]/[game name],
+        share/{{many game names},
+        {,omf/}gnome-games,
+        {,help,pixmaps,sound}/{game name},
         /var/lib/games</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/add/gnome-keyring-manager.xml b/gnome/add/gnome-keyring-manager.xml
index d9b719c61b..a96e60c3b7 100644
--- a/gnome/add/gnome-keyring-manager.xml
+++ b/gnome/add/gnome-keyring-manager.xml
@@ -66,6 +66,9 @@
     <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="gnome-doc-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-keyring-manager"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -112,8 +115,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnome-keyring-manager</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnome-keyring-manager
-        and $GNOME_PREFIX/share/[,gnome/help/ ,omf/]gnome-keyring-manager</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnome-keyring-manager
+        and $GNOME_PREFIX/share/{,gnome/help/ ,omf/}gnome-keyring-manager</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnome-mag.xml b/gnome/add/gnome-mag.xml
index b637af2cd1..abd5ad64f0 100644
--- a/gnome/add/gnome-mag.xml
+++ b/gnome/add/gnome-mag.xml
@@ -81,6 +81,9 @@
     <filename>xextensions.pc</filename> file as shown in the
     <xref linkend="xfree86"/> instructions.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-mag"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -113,7 +116,7 @@ make</userinput></screen>
         <seg>libgnome-mag.so</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/gnome-mag-1.0,
-        share/[doc/gnome-mag-0.12.3,gnome-mag,idl/gnome-mag-1.0]</seg>
+        share/{doc/gnome-mag-0.12.3,gnome-mag,idl/gnome-mag-1.0}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnome-media.xml b/gnome/add/gnome-media.xml
index bec85ccb5e..3ed6737e01 100644
--- a/gnome/add/gnome-media.xml
+++ b/gnome/add/gnome-media.xml
@@ -73,6 +73,9 @@
     <command>sendmail</command> command) and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-media"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -128,21 +131,21 @@ gst-register</userinput></screen>
         <seg>CDDBSlave2, cddb-slave2-properties, cddb-track-editor,
         gnome-audio-profiles-properties, gnome-cd, gnome-sound-recorder,
         gnome-volume-control, gstreamer-properties, and vumeter</seg>
-        <seg>libcddb-slave2.[so,a], libgnome-media-profiles.[so,a],
-        libgnome-media-profiles.[so,a] libglade library, and
+        <seg>libcddb-slave2.{so,a}, libgnome-media-profiles.{so,a},
+        libgnome-media-profiles.{so,a} libglade library, and
         GNOME_Media_CDDBSlave2.server bonobo server</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[[,schemas/]apps/[CDDB-Slave2,
-        gnome-[cd, sound-recorder, volume-control]],
-        [,schemas/]system/gstreamer/audio]
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{{,schemas/}apps/{CDDB-Slave2,
+        gnome-{cd, sound-recorder, volume-control}},
+        {,schemas/}system/gstreamer/audio}
         and the following subdirectories of $GNOME_PREFIX/:
-        include/[cddb-slave2,gnome-media],
+        include/{cddb-slave2,gnome-media},
         lib/gnome-media,
-        share/[gnome-[media,sound-recorder],
-        gnome/help/[gnome-[cd, sound-recorder, volume-control],
-        grecord, gstreamer-properties],
+        share/{gnome-{media,sound-recorder},
+        gnome/help/{gnome-{cd, sound-recorder, volume-control},
+        grecord, gstreamer-properties},
         gsteamer-properties,
         omf/gnome-media,
-        pixmaps/gnome-[cd, media]]</seg>
+        pixmaps/gnome-{cd, media}}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnome-netstatus.xml b/gnome/add/gnome-netstatus.xml
index 18eb45778d..189a13003d 100644
--- a/gnome/add/gnome-netstatus.xml
+++ b/gnome/add/gnome-netstatus.xml
@@ -67,6 +67,9 @@ xreflabel="GNOME Netstatus-&gnome-netstatus-version;">
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gnome-panel"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-netstatus"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -123,8 +126,8 @@ make</userinput></screen>
         <seg>None</seg>
         <seg>None</seg>
         <seg>gnome-netstatus-applet</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/netstatus_applet
-        and $GNOME_PREFIX/share/[,gnome/help/ ,omf/]gnome-netstatus</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/netstatus_applet
+        and $GNOME_PREFIX/share/{,gnome/help/ ,omf/}gnome-netstatus</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnome-speech.xml b/gnome/add/gnome-speech.xml
index af33602f27..2450fba13b 100644
--- a/gnome/add/gnome-speech.xml
+++ b/gnome/add/gnome-speech.xml
@@ -86,6 +86,9 @@
     <ulink url="http://www.fonix.com/">DECTalk</ulink>, and
     <ulink url="http://www.cepstral.com/">Theta</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-speech"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -162,13 +165,13 @@ install -v -m644 -D doc/gnome-speech.html \
       <seglistitem>
         <seg>festival-synthesis-driver, freetts-synthesis-driver and
         test-speech</seg>
-        <seg>libgnomespeech.[so,a]. Other drivers and libraries are also
+        <seg>libgnomespeech.{so,a}. Other drivers and libraries are also
         installed if you have enabled additional backends.</seg>
         <seg>The following subdirectories of $GNOME_PREFIX:
         include/gnome-speech-1.0,
-        share/[doc/gnome-speech-&gnome-speech-version;,
+        share/{doc/gnome-speech-&gnome-speech-version;,
         gnome-speech,
-        idl/gnome-speech-1.0]</seg>
+        idl/gnome-speech-1.0}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -189,11 +192,11 @@ install -v -m644 -D doc/gnome-speech.html \
       </varlistentry>
 
       <varlistentry id="libgnomespeech">
-        <term><filename class='libraryfile'>libgnomespeech.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnomespeech.{so,a}</filename></term>
         <listitem>
           <para>provides the API for programs to convert text into speech.</para>
           <indexterm zone="gnome-speech libgnomespeech">
-            <primary sortas="c-libgnomespeech">libgnomespeech.[so,a]</primary>
+            <primary sortas="c-libgnomespeech">libgnomespeech.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/add/gnome-system-monitor.xml b/gnome/add/gnome-system-monitor.xml
index b02d2cbb0f..0c3aeb59c1 100644
--- a/gnome/add/gnome-system-monitor.xml
+++ b/gnome/add/gnome-system-monitor.xml
@@ -69,6 +69,9 @@ xreflabel="GNOME System Monitor-&gnome-system-monitor-version;">
     <xref linkend="libwnck"/>, and
     <xref linkend="libgtop"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-system-monitor"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -125,8 +128,8 @@ to running <command>make install</command>.</para></note>
       <seglistitem>
         <seg>gnome-system-monitor</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/procman
-        and $GNOME_PREFIX/share/[gnome/help, omf]/gnome-system-monitor</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/procman
+        and $GNOME_PREFIX/share/{gnome/help, omf}/gnome-system-monitor</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnome-utils.xml b/gnome/add/gnome-utils.xml
index dda831035d..75960a6e7c 100644
--- a/gnome/add/gnome-utils.xml
+++ b/gnome/add/gnome-utils.xml
@@ -69,6 +69,9 @@
     <para role="optional"><xref linkend="linux-pam"/> (only if consolehelper
     is also installed) and <xref linkend="hal"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-utils"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -130,14 +133,14 @@ make</userinput></screen>
         <seg>gfloppy, gnome-dictionary, gnome-panel-screenshot,
         gnome-screenshot, gnome-search-tool, and gnome-system-log</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/[gfloppy,
-        gnome-[dictionary, screenshot, search-tool, system-log]] and
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/{gfloppy,
+        gnome-{dictionary, screenshot, search-tool, system-log}} and
         the following subdirectories of $GNOME_PREFIX/:
         lib/gnome-utils,
-        share/[gnome-[screenshot, system-log, utils],
-        gnome/help/[gfloppy, gnome-dictionary, gnome-search-tool, gnome-system-log]
+        share/{gnome-{screenshot, system-log, utils},
+        gnome/help/{gfloppy, gnome-dictionary, gnome-search-tool, gnome-system-log}
         omf/gnome-utils,
-        pixmaps/gsearchtool]</seg>
+        pixmaps/gsearchtool}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnome-volume-manager.xml b/gnome/add/gnome-volume-manager.xml
index 0f78033bdf..2c2dbc04d0 100644
--- a/gnome/add/gnome-volume-manager.xml
+++ b/gnome/add/gnome-volume-manager.xml
@@ -79,6 +79,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="nautilus"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-volume-manager"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -153,7 +156,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnome-volume-manager and gnome-volume-properties</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]desktop/gnome/volume_manager
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}desktop/gnome/volume_manager
         and $GNOME_PREFIX/share/gnome-volume-manager</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/add/gnomemeeting.xml b/gnome/add/gnomemeeting.xml
index 8208781862..30b432c581 100644
--- a/gnome/add/gnomemeeting.xml
+++ b/gnome/add/gnomemeeting.xml
@@ -78,6 +78,9 @@
     <xref linkend="dbus"/>, and
     <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnomemeeting"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -124,8 +127,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnomemeeting and gnomemeeting-config-tool</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnomemeeting
-        and $GNOME_PREFIX/share/[gnome/help/, omf/, sounds/]gnomemeeting</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnomemeeting
+        and $GNOME_PREFIX/share/{gnome/help/, omf/, sounds/}gnomemeeting</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gnopernicus.xml b/gnome/add/gnopernicus.xml
index b5265956b1..24ea7639b2 100644
--- a/gnome/add/gnopernicus.xml
+++ b/gnome/add/gnopernicus.xml
@@ -71,6 +71,9 @@
     <para role="optional"><xref linkend="gtk-doc"/> and
     <ulink url="http://www.mielke.cc/brltty/">BRLTTY</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnopernicus"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -132,13 +135,13 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnopernicus, gnopernicus-mag-config and srcore</seg>
         <seg><application>Gnopernicus</application> support libraries</seg>
-        <seg>&gnome-etc-dir;/[gconf/gconf.xml.defaults/[,schemas/]apps/gnopernicus,
-        gnopernicus-1.0], and the following subdirectories of
+        <seg>&gnome-etc-dir;/{gconf/gconf.xml.defaults/{,schemas/}apps/gnopernicus,
+        gnopernicus-1.0}, and the following subdirectories of
         $GNOME_PREFIX/:
         include/gnopernicus-1.0,
         lib/gnopernicus-1.0,
-        share/[gnome/help/[brlmonitor,gnopernicus], gnopernicus,
-        omf/gnopernicus]</seg>
+        share/{gnome/help/{brlmonitor,gnopernicus}, gnopernicus,
+        omf/gnopernicus}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gok.xml b/gnome/add/gok.xml
index d5676f12eb..6dcf61a28f 100644
--- a/gnome/add/gok.xml
+++ b/gnome/add/gok.xml
@@ -71,6 +71,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gok"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -140,9 +143,9 @@ chmod -v 644 `pkg-config --variable=prefix
       <seglistitem>
         <seg>gok and create-branching-keyboard</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gok,
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gok,
         and the following subdirectories of $GNOME_PREFIX/:
-        share/[,gnome/help/, gtk-doc/html, omf]gok</seg>
+        share/{,gnome/help/, gtk-doc/html, omf}gok</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/gpdf.xml b/gnome/add/gpdf.xml
index 1921804520..d378c53f2b 100644
--- a/gnome/add/gpdf.xml
+++ b/gnome/add/gpdf.xml
@@ -71,6 +71,9 @@
     <ulink
     url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gpdf"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/add/gtkhtml.xml b/gnome/add/gtkhtml.xml
index 6034e46c92..7cdebdb12e 100644
--- a/gnome/add/gtkhtml.xml
+++ b/gnome/add/gtkhtml.xml
@@ -71,6 +71,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libsoup"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gtkhtml"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -102,7 +105,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgtkhtml-3.x.[so,a] and libgnome-gtkhtml-editor-3.x.[so,a]</seg>
+        <seg>libgtkhtml-3.x.{so,a} and libgnome-gtkhtml-editor-3.x.{so,a}</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgtkhtml-3.x,
         lib/gtkhtml, and
@@ -116,11 +119,11 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgtkhtml-3">
-        <term><filename class='libraryfile'>libgtkhtml-3.x.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgtkhtml-3.x.{so,a}</filename></term>
         <listitem>
           <para>provide the functions to render HTML within applications.</para>
           <indexterm zone="gtkhtml libgtkhtml-3">
-            <primary sortas="c-libgtkhtml-3">libgtkhtml-3.x.[so,a]</primary>
+            <primary sortas="c-libgtkhtml-3">libgtkhtml-3.x.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/add/gtksourceview.xml b/gnome/add/gtksourceview.xml
index f58ec5beb2..df21bf8f0c 100644
--- a/gnome/add/gtksourceview.xml
+++ b/gnome/add/gtksourceview.xml
@@ -69,6 +69,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gtksourceview"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -102,10 +105,10 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgtksourceview-1.0.[so,a]</seg>
+        <seg>libgtksourceview-1.0.{so,a}</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/gtksourceview-1.0,
-        share/[gtk-doc/html/gtksourceview, gtksourceview-1.0]</seg>
+        share/{gtk-doc/html/gtksourceview, gtksourceview-1.0}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -115,11 +118,11 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgtksourceview-1">
-        <term><filename class='libraryfile'>libgtksourceview-1.0.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgtksourceview-1.0.{so,a}</filename></term>
         <listitem>
           <para>contains function extensions for the GtkTextView widget.</para>
           <indexterm zone="gtksourceview libgtksourceview-1">
-            <primary sortas="c-libgtksourceview-1.0">libgtksourceview-1.0.[so,a]</primary>
+            <primary sortas="c-libgtksourceview-1.0">libgtksourceview-1.0.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/add/gucharmap.xml b/gnome/add/gucharmap.xml
index 37b82ef69e..3504887ded 100644
--- a/gnome/add/gucharmap.xml
+++ b/gnome/add/gucharmap.xml
@@ -70,6 +70,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libgnomeui"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gucharmap"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -116,7 +119,7 @@ make</userinput></screen>
         <seg>libgucharmap.so</seg>
         <seg>The following subdirectories $GNOME_PREFIX/:
         include/gucharmap and
-        share/[gnome/help/, omf/]/gucharmap</seg>
+        share/{gnome/help/, omf/}/gucharmap</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/java-access-bridge.xml b/gnome/add/java-access-bridge.xml
index bbf5bcc15b..61a5096157 100644
--- a/gnome/add/java-access-bridge.xml
+++ b/gnome/add/java-access-bridge.xml
@@ -68,6 +68,9 @@ xreflabel="Java Access Bridge-&java-access-bridge-version;">
     <para role="required"><xref linkend="at-spi"/> and
     <xref linkend="jdk"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/java-access-bridge"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/add/libgail-gnome.xml b/gnome/add/libgail-gnome.xml
index 853fb63f31..6c843bf2cb 100644
--- a/gnome/add/libgail-gnome.xml
+++ b/gnome/add/libgail-gnome.xml
@@ -67,6 +67,9 @@
     <para role="required"><xref linkend="gnome-panel"/> and
     <xref linkend="at-spi"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgail-gnome"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/add/libgnomecups.xml b/gnome/add/libgnomecups.xml
index 710248c05d..1fdc2baa74 100644
--- a/gnome/add/libgnomecups.xml
+++ b/gnome/add/libgnomecups.xml
@@ -68,6 +68,9 @@
     <xref linkend="glib2"/>, and
     <xref linkend="perl-xml-parser"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomecups"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -100,7 +103,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgnomecups-1.0.[so,a]</seg>
+        <seg>libgnomecups-1.0.{so,a}</seg>
         <seg>$GNOME_PREFIX/include/libgnomecups-1</seg>
       </seglistitem>
     </segmentedlist>
@@ -111,12 +114,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgnomecups-lib">
-        <term><filename class='libraryfile'>libgnomecups-1.0.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnomecups-1.0.{so,a}</filename></term>
         <listitem>
           <para>libraries are used to wrap the <application>CUPS</application>
           API in a <application>GLib</application> type interface.</para>
           <indexterm zone="libgnomecups libgnomecups-lib">
-            <primary sortas="c-libgnomecups">libgnomecups-1.0.[so,a]</primary>
+            <primary sortas="c-libgnomecups">libgnomecups-1.0.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/add/libgnomeprint.xml b/gnome/add/libgnomeprint.xml
index 335d093444..ab7f9b2592 100644
--- a/gnome/add/libgnomeprint.xml
+++ b/gnome/add/libgnomeprint.xml
@@ -77,6 +77,9 @@
     <option>--without-cups</option> to the <command>configure</command>
     command in the instructions below.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomeprint"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -126,11 +129,11 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgnomeprint-2-2.[so,a] and numerous filters and modules</seg>
+        <seg>libgnomeprint-2-2.{so,a} and numerous filters and modules</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgnomeprint-2.2,
         lib/libgnomeprint,
-        share/[,gtk-doc/html/]libgnomeprint</seg>
+        share/{,gtk-doc/html/}libgnomeprint</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -140,12 +143,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgnomeprint-2">
-        <term><filename class='libraryfile'>libgnomeprint-2-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnomeprint-2-2.{so,a}</filename></term>
         <listitem>
           <para>implements the <application>GNOME</application> Printing
           Architecture.</para>
           <indexterm zone="libgnomeprint libgnomeprint-2">
-            <primary sortas="c-libgnomeprint-2-2">libgnomeprint-2-2.[so,a]</primary>
+            <primary sortas="c-libgnomeprint-2-2">libgnomeprint-2-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/add/libgnomeprintui.xml b/gnome/add/libgnomeprintui.xml
index d49c58283e..82887fa7bd 100644
--- a/gnome/add/libgnomeprintui.xml
+++ b/gnome/add/libgnomeprintui.xml
@@ -69,6 +69,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomeprintui"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -111,10 +114,10 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgnomeprintui-2-2.[so,a]</seg>
+        <seg>libgnomeprintui-2-2.{so,a}</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgnomeprintui-2.2 and
-        share/[,gtk-doc/html/]libgnomeprintui</seg>
+        share/{,gtk-doc/html/}libgnomeprintui</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -124,12 +127,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgnomeprintui-2">
-        <term><filename class='libraryfile'>libgnomeprintui-2-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnomeprintui-2-2.{so,a}</filename></term>
         <listitem>
           <para>is the GUI portion of the <application>GNOME</application>
           Printing Architecture implementation.</para>
           <indexterm zone="libgnomeprintui libgnomeprintui-2">
-            <primary sortas="c-libgnomeprintui-2-2">libgnomeprintui-2-2.[so,a]</primary>
+            <primary sortas="c-libgnomeprintui-2-2">libgnomeprintui-2-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/add/nautilus-cd-burner.xml b/gnome/add/nautilus-cd-burner.xml
index 4abe11a83e..a8ca2774e7 100644
--- a/gnome/add/nautilus-cd-burner.xml
+++ b/gnome/add/nautilus-cd-burner.xml
@@ -76,6 +76,9 @@ xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
     <xref linkend="dvd-rw-tools"/> packages are required to be installed or you
     won't be able to create ISO filesystems or burn CDs and DVDs.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nautilus-cd-burner"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -125,7 +128,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>nautilus-cd-burner</seg>
         <seg>libnautilus-burn.so and gnome-vfs and nautilus modules</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/nautilus-cd-burner
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/nautilus-cd-burner
         and the following subdirectories of $GNOME_PREFIX/:
         include/libnautilus-burn,
         lib/nautilus-cd-burner, and
diff --git a/gnome/add/sound-juicer.xml b/gnome/add/sound-juicer.xml
index ff7f0e7ffa..8929bcebcb 100644
--- a/gnome/add/sound-juicer.xml
+++ b/gnome/add/sound-juicer.xml
@@ -83,6 +83,9 @@
 <screen><userinput>gst-inspect | grep cdparanoia</userinput></screen>
     </note>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sound-juicer"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -146,8 +149,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>sound-juicer</seg>
         <seg>none</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/sound-juicer
-        and $GNOME_PREFIX/share/[,gnome/help/ ,omf/]sound-juicer</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/sound-juicer
+        and $GNOME_PREFIX/share/{,gnome/help/ ,omf/}sound-juicer</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/system-tools-backends.xml b/gnome/add/system-tools-backends.xml
index 3676f8f24d..59d275c92a 100644
--- a/gnome/add/system-tools-backends.xml
+++ b/gnome/add/system-tools-backends.xml
@@ -66,6 +66,9 @@ xreflabel="system-tools-backends-&system-tools-backends-version;">
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="perl-xml-parser"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/system-tools-backends"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/add/totem.xml b/gnome/add/totem.xml
index 1eff663df1..d05195a764 100644
--- a/gnome/add/totem.xml
+++ b/gnome/add/totem.xml
@@ -90,6 +90,9 @@
     <para>Note: <xref linkend="libdvdcss"/> is a run-time requirement if you
     wish to play encrypted DVDs</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/totem"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -160,15 +163,15 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>totem, totem-video-thumbnailer and optionally, vanity</seg>
-        <seg>libtotem-plparser.[so,a], a <application>Nautilus</application>
+        <seg>libtotem-plparser.{so,a}, a <application>Nautilus</application>
         extension plugin and optionally, a <application>Mozilla</application>
         video plugin</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[[,schemas/]apps/totem,
-        [,schemas/]desktop/gnome/[thumbnailers, url-handlers]/[too many to list]]
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{{,schemas/}apps/totem,
+        {,schemas/}desktop/gnome/{thumbnailers, url-handlers}/{too many to list}}
         and the following subdirectories of $GNOME_PREFIX/:
         include/totem,
         lib/totem,
-        share/[,gnome/help/ ,omf/]totem</seg>
+        share/{,gnome/help/ ,omf/}totem</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/add/zenity.xml b/gnome/add/zenity.xml
index 8d3b51ea45..6bf03a4658 100644
--- a/gnome/add/zenity.xml
+++ b/gnome/add/zenity.xml
@@ -67,6 +67,9 @@
     <para role="required"><xref linkend="libgnomecanvas"/> and
     <xref linkend="gnome-doc-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/zenity"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -108,7 +111,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>gdialog and zenity</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/[,gnome/help/, omf/]zenity</seg>
+        <seg>$GNOME_PREFIX/share/{,gnome/help/, omf/}zenity</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/control-center.xml b/gnome/core/control-center.xml
index 89ed5902f0..463fb7ac43 100644
--- a/gnome/core/control-center.xml
+++ b/gnome/core/control-center.xml
@@ -72,6 +72,9 @@
     <xref linkend="gst-plugins"/>, and
     <xref linkend="xscreensaver"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/control-center"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -137,16 +140,16 @@ make</userinput></screen>
         gnome-theme-manager, gnome-theme-thumbnailer,
         gnome-thumbnail-font, gnome-typing-monitor, gnome-ui-properties,
         gnome-window-properties, and themus-theme-applier</seg>
-        <seg>libgnome-window-settings.[so,a],
+        <seg>libgnome-window-settings.{so,a},
         <application>GNOME VFS</application> and window manager settings library
         modules and <application>Nautilus</application> library module
         extensions</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,desktop/][,schemas/]apps/[too many to list]
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,desktop/}{,schemas/}apps/{too many to list}
         and the following subdirectories of $GNOME_PREFIX/:
         include/gnome-window-settings-2.0,
-        lib/[lib, nautilus, window-manager-settings],
-        share/[[,gnome/help/,omf]control-center-2.0,
-        gnome/[cursor-fonts,vfolders]]</seg>
+        lib/{lib, nautilus, window-manager-settings},
+        share/{{,gnome/help/,omf}control-center-2.0,
+        gnome/{cursor-fonts,vfolders}}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/eel.xml b/gnome/core/eel.xml
index 11c498a6f1..94b45ddfd5 100644
--- a/gnome/core/eel.xml
+++ b/gnome/core/eel.xml
@@ -66,6 +66,9 @@
     <xref linkend="gnome-menus"/>, and
     <xref linkend="gail"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/eel"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -95,7 +98,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libeel-2.[so,a]</seg>
+        <seg>libeel-2.{so,a}</seg>
         <seg>$GNOME_PREFIX/include/eel-2</seg>
       </seglistitem>
     </segmentedlist>
@@ -106,12 +109,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libeel-2">
-        <term><filename class='libraryfile'>libeel-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libeel-2.{so,a}</filename></term>
         <listitem>
           <para>is a collection of widgets developed by the
           <application>Nautilus</application> project.</para>
           <indexterm zone="eel libeel-2">
-            <primary sortas="c-libeel-2">libeel-2.[so,a]</primary>
+            <primary sortas="c-libeel-2">libeel-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/gail.xml b/gnome/core/gail.xml
index 45236257da..cf6b82917d 100644
--- a/gnome/core/gail.xml
+++ b/gnome/core/gail.xml
@@ -67,6 +67,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gail"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/core/gconf.xml b/gnome/core/gconf.xml
index 06740771d0..7d97d672f9 100644
--- a/gnome/core/gconf.xml
+++ b/gnome/core/gconf.xml
@@ -70,6 +70,9 @@
     <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gconf"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -123,12 +126,12 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gconf-merge-tree and gconftool-2</seg>
-        <seg>libgconf-2.[so,a]</seg>
+        <seg>libgconf-2.{so,a}</seg>
         <seg>&gnome-etc-dir;/gconf and the following subdirectories of
         $GNOME_PREFIX/:
         include/gconf,
         lib/GConf, and
-        share/[GConf, gtk-doc/html/gconf, sgml/gconf]</seg>
+        share/{GConf, gtk-doc/html/gconf, sgml/gconf}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -159,12 +162,12 @@ make</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libgconf-2">
-        <term><filename class='libraryfile'>libgconf-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgconf-2.{so,a}</filename></term>
         <listitem>
           <para>provide the functions necessary to maintain the
           configuration database.</para>
           <indexterm zone="GConf libgconf-2">
-            <primary sortas="c-libgconf-2">libgconf-2.[so,a]</primary>
+            <primary sortas="c-libgconf-2">libgconf-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/gnome-applets.xml b/gnome/core/gnome-applets.xml
index 9d7f61e5ed..ea5129334e 100644
--- a/gnome/core/gnome-applets.xml
+++ b/gnome/core/gnome-applets.xml
@@ -79,6 +79,9 @@
     url="http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.2.2.tar.gz">
     libnotify-0.2.2</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-applets"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -137,13 +140,13 @@ make -C man install-man</userinput></screen>
       <seglistitem>
         <seg>cpufreq-selector and gswitchit-plugins-capplet</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]apps/[too
-        many to list] and the following subdirectories of $GNOME_PREFIX/:
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}apps/{too
+        many to list} and the following subdirectories of $GNOME_PREFIX/:
         include/libgswitchit,
         lib/gnome-applets,
-        share/[gnome-applets, [gnome/help,omf]/[too many to list],
-        pixmaps/[accessx-status-applet, cpufreq-applet, stickynotes], and
-        xmodmap]</seg>
+        share/{gnome-applets, {gnome/help,omf}/{too many to list},
+        pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes}, and
+        xmodmap}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/gnome-backgrounds.xml b/gnome/core/gnome-backgrounds.xml
index 68fa0ecfcc..186d2299eb 100644
--- a/gnome/core/gnome-backgrounds.xml
+++ b/gnome/core/gnome-backgrounds.xml
@@ -64,6 +64,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="perl-xml-parser"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-backgrounds"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -97,8 +100,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/[gnome-background-properties,
-        pixmaps/backgrounds]</seg>
+        <seg>$GNOME_PREFIX/share/{gnome-background-properties,
+        pixmaps/backgrounds}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/gnome-desktop.xml b/gnome/core/gnome-desktop.xml
index 661d64da65..a43d9ebee4 100644
--- a/gnome/core/gnome-desktop.xml
+++ b/gnome/core/gnome-desktop.xml
@@ -69,6 +69,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="startup-notification"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-desktop"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -117,10 +120,10 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gnome-about</seg>
-        <seg>libgnome-desktop-2.[so,a]</seg>
+        <seg>libgnome-desktop-2.{so,a}</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/gnome-desktop-2.0,
-        share/[gnome-about, [gnome/help,omf]/[fdl,gnome-feedback,gpl,lgpl]</seg>
+        share/{gnome-about, {gnome/help,omf}/{fdl,gnome-feedback,gpl,lgpl}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -140,13 +143,13 @@ make</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libgnome-desktop-2">
-        <term><filename class='libraryfile'>libgnome-desktop-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnome-desktop-2.{so,a}</filename></term>
         <listitem>
           <para>contains APIs being tested for inclusion in
           <application>libgnome</application> or
           <application>libgnomeui</application>.</para>
           <indexterm zone="gnome-desktop libgnome-desktop-2">
-            <primary sortas="c-libgnome-desktop-2">libgnome-desktop-2.[so,a]</primary>
+            <primary sortas="c-libgnome-desktop-2">libgnome-desktop-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/gnome-doc-utils.xml b/gnome/core/gnome-doc-utils.xml
index 600c283bde..b55bb10e46 100644
--- a/gnome/core/gnome-doc-utils.xml
+++ b/gnome/core/gnome-doc-utils.xml
@@ -76,6 +76,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-doc-utils"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -111,8 +114,8 @@ make</userinput></screen>
         <seg>gnome-doc-prepare and xml2po</seg>
         <seg>None</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
-        share/[gnome-doc-utils, gnome/help/gnome-doc-[make,xslt],
-        omf/gnome-doc-[make,xslt], xml/gnome, and xml2po]</seg>
+        share/{gnome-doc-utils, gnome/help/gnome-doc-{make,xslt},
+        omf/gnome-doc-{make,xslt}, xml/gnome, and xml2po}</seg>
         <seg>Custom DocBook XSLT stylesheets</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/core/gnome-icon-theme.xml b/gnome/core/gnome-icon-theme.xml
index 894b540895..415f6de9cf 100644
--- a/gnome/core/gnome-icon-theme.xml
+++ b/gnome/core/gnome-icon-theme.xml
@@ -68,6 +68,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-icon-theme"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/core/gnome-keyring.xml b/gnome/core/gnome-keyring.xml
index 75cd30c1c2..2594a9504a 100644
--- a/gnome/core/gnome-keyring.xml
+++ b/gnome/core/gnome-keyring.xml
@@ -63,6 +63,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gtk2"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-keyring"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/core/gnome-menus.xml b/gnome/core/gnome-menus.xml
index 17bed60f9c..9068bf633c 100644
--- a/gnome/core/gnome-menus.xml
+++ b/gnome/core/gnome-menus.xml
@@ -73,6 +73,9 @@
     <para role="optional"><xref linkend="python"/> and
     <xref linkend="gamin"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-menus"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -134,12 +137,12 @@ ln -v -s $GNOME_PREFIX/lib/python2.4/site-packages/gmenu.* \
 
       <seglistitem>
         <seg>gnome-menu-spec-test</seg>
-        <seg>libgnome-menu.[so,a]</seg>
+        <seg>libgnome-menu.{so,a}</seg>
         <seg>&gnome-etc-dir;/xdg and the following subdirectories of
         $GNOME_PREFIX/:
         include/gnome-menus,
         lib/python2.4/site-packages/GMenuSimpleEditor,
-        share/[desktop-directories, gnome-menus]</seg>
+        share/{desktop-directories, gnome-menus}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -160,12 +163,12 @@ ln -v -s $GNOME_PREFIX/lib/python2.4/site-packages/gmenu.* \
       </varlistentry>
 
       <varlistentry id="libgnome-menu">
-        <term><filename class='libraryfile'>libgnome-menu.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnome-menu.{so,a}</filename></term>
         <listitem>
           <para>contains functions required to support GNOME's implementation
           of the Desktop Menu Specification.</para>
           <indexterm zone="gnome-menus libgnome-menu">
-            <primary sortas="c-libgnome-menu">libgnome-menu.[so,a]</primary>
+            <primary sortas="c-libgnome-menu">libgnome-menu.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/gnome-mime-data.xml b/gnome/core/gnome-mime-data.xml
index 7cf2f82c46..20acd42ab4 100644
--- a/gnome/core/gnome-mime-data.xml
+++ b/gnome/core/gnome-mime-data.xml
@@ -64,6 +64,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="perl-xml-parser"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-mime-data"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -109,7 +112,7 @@ install -v -m644 -D man/gnome-vfs-mime.5 \
       <seglistitem>
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/[application-registry, share/mime-info]</seg>
+        <seg>$GNOME_PREFIX/share/{application-registry, share/mime-info}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/gnome-panel.xml b/gnome/core/gnome-panel.xml
index e1d41aec97..64eed8995c 100644
--- a/gnome/core/gnome-panel.xml
+++ b/gnome/core/gnome-panel.xml
@@ -71,6 +71,9 @@
     <xref linkend="gnomemeeting"/>) and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-panel"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -119,14 +122,14 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gnome-desktop-item-edit, gnome-panel and panel-test-applets</seg>
-        <seg>libpanel-applet-2.[so,a]</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]/apps
+        <seg>libpanel-applet-2.{so,a}</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}/apps
         and the following subdirectories of $GNOME_PREFIX/:
         include/panel-2.0,
         lib/gnome-panel,
-        share/[gnome/[help/[too many to list], panel],
+        share/{gnome/{help/{too many to list}, panel},
         gtk-doc/html/panel-applet, icons, idl/gnome-panel-2.0,
-        omf/[too many too list]]</seg>
+        omf/{too many too list}}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -136,12 +139,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libpanel-applet-2">
-        <term><filename class='libraryfile'>libpanel-applet-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libpanel-applet-2.{so,a}</filename></term>
         <listitem>
           <para>allow development of small applications (applets) which
           may be embedded in the panel.</para>
           <indexterm zone="gnome-panel libpanel-applet-2">
-            <primary sortas="c-libpanel-applet-2">libpanel-applet-2.[so,a]</primary>
+            <primary sortas="c-libpanel-applet-2">libpanel-applet-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/gnome-session.xml b/gnome/core/gnome-session.xml
index 2a451dad24..922d7d3b25 100644
--- a/gnome/core/gnome-session.xml
+++ b/gnome/core/gnome-session.xml
@@ -66,6 +66,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="tcpwrappers"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-session"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -107,7 +110,7 @@ make</userinput></screen>
         <seg>gnome-session, gnome-session-properties, gnome-session-remove,
         gnome-session-save, and gnome-wm</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnome-session
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnome-session
         and $GNOME_PREFIX/share/pixmaps/splash</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/core/gnome-terminal.xml b/gnome/core/gnome-terminal.xml
index b4ec2d4f55..2567d376fd 100644
--- a/gnome/core/gnome-terminal.xml
+++ b/gnome/core/gnome-terminal.xml
@@ -66,6 +66,9 @@
     <xref linkend="vte"/>, and
     <xref linkend="startup-notification"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-terminal"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -112,8 +115,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnome-terminal</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnome-terminal
-        and $GNOME_PREFIX/share/[,gnome/help/, omf/]gnome-terminal</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnome-terminal
+        and $GNOME_PREFIX/share/{,gnome/help/, omf/}gnome-terminal</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/gnome-themes.xml b/gnome/core/gnome-themes.xml
index fe2202266b..e020ac2843 100644
--- a/gnome/core/gnome-themes.xml
+++ b/gnome/core/gnome-themes.xml
@@ -64,6 +64,9 @@
     <para role="required"><xref linkend="perl-xml-parser"/> and
     <xref linkend="gtk-engines"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-themes"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -104,7 +107,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>None</seg>
         <seg>None</seg>
-        <seg>Several directories under /usr/share/[themes,icons]</seg>
+        <seg>Several directories under /usr/share/{themes,icons}</seg>
         <seg>Several themes in the /usr/share/themes hierarchy and icons
         in the /usr/share/icons hierarchy</seg>
       </seglistitem>
diff --git a/gnome/core/gnome-vfs.xml b/gnome/core/gnome-vfs.xml
index 9cc4723323..5fffe98229 100644
--- a/gnome/core/gnome-vfs.xml
+++ b/gnome/core/gnome-vfs.xml
@@ -83,6 +83,9 @@
     <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
     <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-vfs"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -145,12 +148,12 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnomevfs-cat, gnomevfs-copy, gnomevfs-info, gnomevfs-ls,
         gnomevfs-mkdir, gnomevfs-mv, gnomevfs-rm, and gnome-vfs-daemon</seg>
-        <seg>libgnomevfs-2.[so,a] and modules</seg>
+        <seg>libgnomevfs-2.{so,a} and modules</seg>
         <seg>The following subdirectories of &gnome-etc-dir;/:
-        gconf/[schemas, gconf.xml.defaults/[desktop, schemas, system],
-        gnome-vfs-2.0] and the following subdirectories of $GNOME_PREFIX/:
-        include/gnome-vfs-[,module-]2.0,
-        lib/gnome-vfs[,-2.0],
+        gconf/{schemas, gconf.xml.defaults/{desktop, schemas, system},
+        gnome-vfs-2.0} and the following subdirectories of $GNOME_PREFIX/:
+        include/gnome-vfs-{,module-}2.0,
+        lib/gnome-vfs{,-2.0},
         share/gtk-doc/html/gnome-vfs-2.0</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/core/gnome2-user-docs.xml b/gnome/core/gnome2-user-docs.xml
index 0786bfd959..9edb9368ed 100644
--- a/gnome/core/gnome2-user-docs.xml
+++ b/gnome/core/gnome2-user-docs.xml
@@ -66,6 +66,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome2-user-docs"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -113,8 +116,8 @@ chmod -v 644 `pkg-config \
       <seglistitem>
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/[gnome/help/[gnome-access-guide,system-admin-guide,user-guide],
-        omf/[gnome2-user-docs,user-guide]]</seg>
+        <seg>$GNOME_PREFIX/share/{gnome/help/{gnome-access-guide,system-admin-guide,user-guide},
+        omf/{gnome2-user-docs,user-guide}}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/gtk-engines.xml b/gnome/core/gtk-engines.xml
index 4dff33d309..25da2cfe13 100644
--- a/gnome/core/gtk-engines.xml
+++ b/gnome/core/gtk-engines.xml
@@ -64,6 +64,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gtk2"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gtk-engines"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -95,7 +98,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>None</seg>
         <seg><application>GTK-2</application> engines libraries</seg>
-        <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/[theme name]</seg>
+        <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme name}</seg>
         <seg>Crux, Clearlooks, Industrial, LighthouseBlue, Metal, Mist,
         Redmond, and ThinIce</seg>
       </seglistitem>
diff --git a/gnome/core/libbonobo.xml b/gnome/core/libbonobo.xml
index 0fbee301d5..66c97ad214 100644
--- a/gnome/core/libbonobo.xml
+++ b/gnome/core/libbonobo.xml
@@ -71,6 +71,9 @@
     <para role="optional"><xref linkend="x-window-system"/> and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libbonobo"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -127,15 +130,15 @@ make</userinput></screen>
         <seg>activation-client, bonobo-slay, echo-client-2,
         bonobo-activation-run-query, bonobo-activation-server, and
         bonobo-activation-sysconf</seg>
-        <seg>libbonobo-2.[so,a], libbonobo-activation.[so,a],
+        <seg>libbonobo-2.{so,a}, libbonobo-activation.{so,a},
         <application>ORBit-2</application> bonobo module, bonobo
-        servers, and libmoniker_std_2.[so,a] bonobo library</seg>
+        servers, and libmoniker_std_2.{so,a} bonobo library</seg>
         <seg>&gnome-etc-dir;/bonobo-activation and the following subdirectories
         of $GNOME_PREFIX/:
-        include/[bonobo-activation-2.0,libbonobo-2.0],
-        lib/[bonobo[,-2.0],libbonobo], and
-        share/[gtk-doc/html/[bonobo-activation,libbonobo],
-        idl/bonobo-[,activation-]2.0]</seg>
+        include/{bonobo-activation-2.0,libbonobo-2.0},
+        lib/{bonobo{,-2.0},libbonobo}, and
+        share/{gtk-doc/html/{bonobo-activation,libbonobo},
+        idl/bonobo-{,activation-}2.0}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -145,12 +148,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libbonobo-2">
-        <term><filename class='libraryfile'>libbonobo-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libbonobo-2.{so,a}</filename></term>
         <listitem>
           <para>are a set of language and system independent CORBA interfaces
           for creating reusable components and compound documents.</para>
           <indexterm zone="libbonobo libbonobo-2">
-            <primary sortas="c-libbonobo-2">libbonobo-2.[so,a]</primary>
+            <primary sortas="c-libbonobo-2">libbonobo-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/libbonoboui.xml b/gnome/core/libbonoboui.xml
index 2a6d1bcb1d..98e01882b4 100644
--- a/gnome/core/libbonoboui.xml
+++ b/gnome/core/libbonoboui.xml
@@ -67,6 +67,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libbonoboui"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -96,10 +99,10 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>bonobo-browser and test-moniker</seg>
-        <seg>libbonoboui-2.[so,a] and libbonobo.[so,a] Glade library</seg>
+        <seg>libbonoboui-2.{so,a} and libbonobo.{so,a} Glade library</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libbonoboui-2.0 and
-        share/[applications, gnome-2.0, gtk-doc/html/libbonoboui]</seg>
+        share/{applications, gnome-2.0, gtk-doc/html/libbonoboui}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -109,12 +112,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libbonoboui-2">
-        <term><filename class='libraryfile'>libbonoboui-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libbonoboui-2.{so,a}</filename></term>
         <listitem>
           <para>are the GUI portion of the <application>Bonobo</application>
           libraries.</para>
           <indexterm zone="libbonoboui libbonoboui-2">
-            <primary sortas="c-">libbonoboui-2.[so,a]</primary>
+            <primary sortas="c-">libbonoboui-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/libgnome.xml b/gnome/core/libgnome.xml
index 86a68929c1..5075460926 100644
--- a/gnome/core/libgnome.xml
+++ b/gnome/core/libgnome.xml
@@ -67,6 +67,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnome"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -115,10 +118,10 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gnome-open</seg>
-        <seg>libgnome-2.[so,a] and the libmoniker_extra_2.[so,a] bonobo
+        <seg>libgnome-2.{so,a} and the libmoniker_extra_2.{so,a} bonobo
         library</seg>
-        <seg>&gnome-etc-dir;/[gconf/gconf.xml.defaults/[too many to list],
-        sound],
+        <seg>&gnome-etc-dir;/{gconf/gconf.xml.defaults/{too many to list},
+        sound},
         include/libgnome-2.0, and
         share/gtk-doc/html/libgnome</seg>
       </seglistitem>
@@ -130,12 +133,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgnome-2">
-        <term><filename class='libraryfile'>libgnome-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnome-2.{so,a}</filename></term>
         <listitem>
           <para>are the non-GUI portion of the <application>GNOME</application>
           libraries.</para>
           <indexterm zone="libgnome libgnome-2">
-            <primary sortas="c-libgnome-2">libgnome-2.[so,a]</primary>
+            <primary sortas="c-libgnome-2">libgnome-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/libgnomecanvas.xml b/gnome/core/libgnomecanvas.xml
index 893367bcfa..649b3d1550 100644
--- a/gnome/core/libgnomecanvas.xml
+++ b/gnome/core/libgnomecanvas.xml
@@ -69,6 +69,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomecanvas"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -101,7 +104,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgnomecanvas-2.[so,a] and the libcanvas.[so,a] Glade
+        <seg>libgnomecanvas-2.{so,a} and the libcanvas.{so,a} Glade
         library</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgnomecanvas-2.0,
diff --git a/gnome/core/libgnomeui.xml b/gnome/core/libgnomeui.xml
index 144a9bac5e..2ba41a4adc 100644
--- a/gnome/core/libgnomeui.xml
+++ b/gnome/core/libgnomeui.xml
@@ -68,6 +68,9 @@
     <para role="optional"><xref linkend="libjpeg"/> and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomeui"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -142,11 +145,11 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gnome_segv2</seg>
-        <seg>libgnomeui-2.[so,a], the libgnome.[so,a] Glade library, and
-        the libgnome-vfs.[so,a] <application>GTK+</application> library</seg>
+        <seg>libgnomeui-2.{so,a}, the libgnome.{so,a} Glade library, and
+        the libgnome-vfs.{so,a} <application>GTK+</application> library</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgnomeui-2.0,
-        lib/[gtk-2.0/2.4.0/filesystems, libgnomeui], and
+        lib/{gtk-2.0/2.4.0/filesystems, libgnomeui}, and
         share/gtk-doc/html/libgnomeui</seg>
       </seglistitem>
     </segmentedlist>
@@ -157,12 +160,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgnomeui-2">
-        <term><filename class='libraryfile'>libgnomeui-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnomeui-2.{so,a}</filename></term>
         <listitem>
           <para>are the GUI portion of the <application>GNOME</application>
           libraries.</para>
           <indexterm zone="libgnomeui libgnomeui-2">
-            <primary sortas="c-libgnomeui-2">libgnomeui-2.[so,a]</primary>
+            <primary sortas="c-libgnomeui-2">libgnomeui-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/libgtop.xml b/gnome/core/libgtop.xml
index 71e9142334..c2945135f1 100644
--- a/gnome/core/libgtop.xml
+++ b/gnome/core/libgtop.xml
@@ -68,6 +68,9 @@
     <xref linkend="gdbm"/>, and
     <xref linkend="x-window-system"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgtop"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -150,7 +153,7 @@ install -v -m755 examples/.libs/* \
 
       <seglistitem>
         <seg>file_by_inode2 and mkinodedb2</seg>
-        <seg>libgtop-2.0.[so,a]</seg>
+        <seg>libgtop-2.0.{so,a}</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgtop-2.0 and
         share/libgtop-&libgtop-version;</seg>
@@ -163,12 +166,12 @@ install -v -m755 examples/.libs/* \
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgtop-2">
-        <term><filename class='libraryfile'>libgtop-2.0.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgtop-2.0.{so,a}</filename></term>
         <listitem>
           <para>contains the functions that allow access to system
           performance data.</para>
           <indexterm zone="libgtop libgtop-2">
-            <primary sortas="c-libgtop-2">libgtop-2.0.[so,a]</primary>
+            <primary sortas="c-libgtop-2">libgtop-2.0.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/nautilus.xml b/gnome/core/nautilus.xml
index 483de98dbb..24f34c283e 100644
--- a/gnome/core/nautilus.xml
+++ b/gnome/core/nautilus.xml
@@ -69,6 +69,9 @@
     <para role="optional"><xref linkend="startup-notification"/> and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nautilus"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -114,10 +117,10 @@ install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} `pkg-config \
         <seg>nautilus, nautilus-connect-server, and
         nautilus-file-management-properties</seg>
         <seg>libnautilus-extension.so, libnautilus-private.so</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]apps/nautilus
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}apps/nautilus
         and the following subdirectories of $GNOME_PREFIX/:
         include/nautilus,
-        share/[doc/nautilus-&nautilus-version;, [,pixmaps]nautilus]</seg>
+        share/{doc/nautilus-&nautilus-version;, {,pixmaps}nautilus}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/orbit2.xml b/gnome/core/orbit2.xml
index d0b19b5609..32ce890dee 100644
--- a/gnome/core/orbit2.xml
+++ b/gnome/core/orbit2.xml
@@ -69,6 +69,9 @@
     <para role="optional"><xref linkend="gtk-doc"/> and
     <xref linkend="openssl"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/orbit2"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -119,12 +122,12 @@ make</userinput></screen>
       <seglistitem>
         <seg>ior-decode-2, linc-cleanup-sockets, orbit-idl-2,
         orbit2-config and typelib-dump</seg>
-        <seg>libname-server-2.a, libORBit-2.[so,a], libORBit-imodule-2.[so,a],
-        libORBitCosNaming-2.[so,a], and Everything_module.[so,a]</seg>
+        <seg>libname-server-2.a, libORBit-2.{so,a}, libORBit-imodule-2.{so,a},
+        libORBitCosNaming-2.{so,a}, and Everything_module.{so,a}</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/orbit-2.0,
         lib/orbit-2.0, and
-        share/[gtk-doc/html/ORBit2, idl/orbit-2.0]</seg>
+        share/{gtk-doc/html/ORBit2, idl/orbit-2.0}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -134,11 +137,11 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libORBit-2">
-        <term><filename class='libraryfile'>libORBit-2.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libORBit-2.{so,a}</filename></term>
         <listitem>
           <para>is the CORBA API.</para>
           <indexterm zone="ORBit2 libORBit-2">
-            <primary sortas="c-libORBit-2">libORBit-2.[so,a]</primary>
+            <primary sortas="c-libORBit-2">libORBit-2.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/pre-install-config.xml b/gnome/core/pre-install-config.xml
index e57594641e..88466a8f42 100644
--- a/gnome/core/pre-install-config.xml
+++ b/gnome/core/pre-install-config.xml
@@ -54,7 +54,7 @@ EOF</userinput></screen>
 <screen role='root'><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
 <literal># Begin gnome addition to man_db.conf
 
-MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/man
+MANDATORY_MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/man
 
 # End gnome addition to man_db.conf</literal>
 EOF</userinput></screen>
diff --git a/gnome/core/scrollkeeper.xml b/gnome/core/scrollkeeper.xml
index 2b615760fb..df0de7c2e0 100644
--- a/gnome/core/scrollkeeper.xml
+++ b/gnome/core/scrollkeeper.xml
@@ -70,6 +70,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="intltool"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/scrollkeeper"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -164,7 +167,7 @@ make</userinput></screen>
         scrollkeeper-uninstall, and scrollkeeper-update</seg>
         <seg>libscrollkeeper.so</seg>
         <seg>/usr/share/doc/scrollkeeper-&scrollkeeper-version;,
-        /usr/share/[omf, [,xml/]scrollkeeper], and
+        /usr/share/{omf, {,xml/}scrollkeeper}, and
         /var/lib/scrollkeeper</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/core/vte.xml b/gnome/core/vte.xml
index 6821f3454b..85f2ef1ae5 100644
--- a/gnome/core/vte.xml
+++ b/gnome/core/vte.xml
@@ -67,6 +67,9 @@
     <para role="optional"><xref linkend="gtk-doc"/> and
     <ulink url="http://www.pygtk.org/">PyGTK</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/vte"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -117,7 +120,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>vte</seg>
-        <seg>libvte.[so,a] and vtemodule.[so,a]
+        <seg>libvte.{so,a} and vtemodule.{so,a}
         <application>Python</application> module</seg>
         <seg>/usr/include/vte, /usr/lib/vte, /usr/share/gtk-doc/html/vte,
         and /usr/share/vte</seg>
@@ -141,12 +144,12 @@ make</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libvte">
-        <term><filename class='libraryfile'>libvte.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libvte.{so,a}</filename></term>
         <listitem>
           <para>provide the functions necessary to implement a
           <quote>termcap file</quote> for terminal emulators.</para>
           <indexterm zone="vte libvte">
-            <primary sortas="c-libvte">libvte.[so,a]</primary>
+            <primary sortas="c-libvte">libvte.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/core/yelp.xml b/gnome/core/yelp.xml
index 217d42421f..914ae824f5 100644
--- a/gnome/core/yelp.xml
+++ b/gnome/core/yelp.xml
@@ -79,6 +79,9 @@
       also requires a Gecko rendering engine.</para>
     </note>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/yelp"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -121,7 +124,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnome-help and yelp</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/yelp and
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/yelp and
         $GNOME_PREFIX/share/yelp</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/otherlibs/bonobo14.xml b/gnome/otherlibs/bonobo14.xml
index ee5c3ab2a7..289f6e54d5 100644
--- a/gnome/otherlibs/bonobo14.xml
+++ b/gnome/otherlibs/bonobo14.xml
@@ -69,6 +69,9 @@
     <para role="optional"><xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bonobo14"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -120,8 +123,8 @@ install -v -m644 doc/{FAQ,Monikers,*.txt} \
         bonobo-selector, bonobo-text-plain, echo-client, efstool, gshell,
         libefs-config, moniker-test, sample-container and
         sample-control-container</seg>
-        <seg>libbonobo.[so,a], libbonobobox.[so,a], libbonobo-print.[so,a],
-        libefs.[so,a] and <application>Bonobo</application> plugin and
+        <seg>libbonobo.{so,a}, libbonobobox.{so,a}, libbonobo-print.{so,a},
+        libefs.{so,a} and <application>Bonobo</application> plugin and
         moniker modules</seg>
         <seg>/opt/gnome-1.4/include/gnome-1.0/bonobo,
         /opt/gnome-1.4/lib/bonobo,
diff --git a/gnome/otherlibs/gal1.xml b/gnome/otherlibs/gal1.xml
index b2221c3a34..2df2f3307b 100644
--- a/gnome/otherlibs/gal1.xml
+++ b/gnome/otherlibs/gal1.xml
@@ -70,6 +70,9 @@
     <para role="optional"><xref linkend="gnome-vfs1"/> and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gal1"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -117,7 +120,7 @@ cd ..</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libgal.[so,a]</seg>
+        <seg>libgal.{so,a}</seg>
         <seg>/opt/gnome-1.4/include/gal-1.0,
         /opt/gnome-1.4/share/etable and
         /opt/gnome-1.4/share/gal</seg>
diff --git a/gnome/otherlibs/gconf1.xml b/gnome/otherlibs/gconf1.xml
index f89fadc4de..56ec43413a 100644
--- a/gnome/otherlibs/gconf1.xml
+++ b/gnome/otherlibs/gconf1.xml
@@ -82,6 +82,9 @@
     <xref linkend="guile"/>, and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gconf1"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -132,7 +135,7 @@ cd ../..</userinput></screen>
       <seglistitem>
         <seg>gconf-config, gconf-config-1, gconf-sanity-check-1, gconfd-1,
         gconftool, gconftool-1</seg>
-        <seg>libgconf-1.[so,a], libgconf-gtk-1.[so,a] and
+        <seg>libgconf-1.{so,a}, libgconf-gtk-1.{so,a} and
         <application>GConf</application> backend modules</seg>
         <seg>/opt/gnome-1.4/etc/gconf,
         /opt/gnome-1.4/include/gconf,
@@ -147,12 +150,12 @@ cd ../..</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgconf-1">
-        <term><filename class='libraryfile'>libgconf-1.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgconf-1.{so,a}</filename></term>
         <listitem>
           <para>provide the functions necessary to maintain the
           configuration database.</para>
           <indexterm zone="GConf1 libgconf-1">
-            <primary sortas="c-libgconf-1">libgconf-1.[so,a]</primary>
+            <primary sortas="c-libgconf-1">libgconf-1.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/otherlibs/gdk.xml b/gnome/otherlibs/gdk.xml
index 8cf3632294..056bed57e8 100644
--- a/gnome/otherlibs/gdk.xml
+++ b/gnome/otherlibs/gdk.xml
@@ -68,6 +68,9 @@
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gdk"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -102,8 +105,8 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gdk-pixbuf-config</seg>
-        <seg>libgdk_pixbuf.[so,a], libgdk_pixbuf_xlib.[so,a],
-        libgnomecanvaspixbuf.[so,a], and many gdk-pixbuf loader modules</seg>
+        <seg>libgdk_pixbuf.{so,a}, libgdk_pixbuf_xlib.{so,a},
+        libgnomecanvaspixbuf.{so,a}, and many gdk-pixbuf loader modules</seg>
         <seg>/opt/gnome-1.4/include/gdk-pixbuf-1.0,
         /opt/gnome-1.4/lib/gdk-pixbuf and
         /opt/gnome-1.4/share/gnome/html/gdk-pixbuf</seg>
@@ -116,12 +119,12 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgdk_pixbuf1">
-        <term><filename class='libraryfile'>libgdk_pixbuf.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgdk_pixbuf.{so,a}</filename></term>
         <listitem>
           <para>contains the <application>GTK+</application> pixel buffer
           libraries for the <application>GIMP</application> Toolkit.</para>
           <indexterm zone="gdk libgdk_pixbuf1">
-            <primary sortas="c-libgdk_pixbuf">libgdk_pixbuf.[so,a]</primary>
+            <primary sortas="c-libgdk_pixbuf">libgdk_pixbuf.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/otherlibs/gnome-libs.xml b/gnome/otherlibs/gnome-libs.xml
index 8eca690040..0bd102f2f8 100644
--- a/gnome/otherlibs/gnome-libs.xml
+++ b/gnome/otherlibs/gnome-libs.xml
@@ -81,6 +81,9 @@
     <xref linkend="esound"/>, and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-libs"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -156,9 +159,9 @@ make</userinput></screen>
         gnome-dump-metadata, gnome-gen-mimedb, gnome-moz-remote,
         gnome-name-service, gnome-pty-helper, gnome_segv, goad-browser,
         libart-config, loadshlib and new-object</seg>
-        <seg>libart_lgpl.[so,a], libgnome.[so,a], libgnomeui.[so,a],
-        libgnomesupport.[so,a], libgnorba.[so,a], libgnorbagtk.[so,a],
-        libgtkxmhtml.[so,a], and libzvt.[so,a]</seg>
+        <seg>libart_lgpl.{so,a}, libgnome.{so,a}, libgnomeui.{so,a},
+        libgnomesupport.{so,a}, libgnorba.{so,a}, libgnorbagtk.{so,a},
+        libgtkxmhtml.{so,a}, and libzvt.{so,a}</seg>
         <seg>/opt/gnome-1.4/doc,
         /opt/gnome-1.4/etc/sound,
         /opt/gnome-1.4/include/gnome-1.0,
@@ -178,56 +181,56 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libart_lgpl1">
-        <term><filename class='libraryfile'>libart_lgpl.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libart_lgpl.{so,a}</filename></term>
         <listitem>
           <para>is the LGPL component of <application>libart</application>.</para>
           <indexterm zone="gnome-libs libart_lgpl1">
-            <primary sortas="c-libart_lgpl">libart_lgpl.[so,a]</primary>
+            <primary sortas="c-libart_lgpl">libart_lgpl.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libgnome1">
-        <term><filename class='libraryfile'>libgnome.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnome.{so,a}</filename></term>
         <listitem>
           <para>is the non-GUI part of the <application>GNOME</application>
           library.</para>
           <indexterm zone="gnome-libs libgnome1">
-            <primary sortas="c-libgnome">libgnome.[so,a]</primary>
+            <primary sortas="c-libgnome">libgnome.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libgnomeui1">
-        <term><filename class='libraryfile'>libgnomeui.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnomeui.{so,a}</filename></term>
         <listitem>
           <para>is the GUI part of the <application>GNOME</application>
           library.</para>
           <indexterm zone="gnome-libs libgnomeui1">
-            <primary sortas="c-libgnomeui">libgnomeui.[so,a]</primary>
+            <primary sortas="c-libgnomeui">libgnomeui.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libgnorbagtk1">
-        <term><filename class='libraryfile'>libgnorbagtk.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libgnorbagtk.{so,a}</filename></term>
         <listitem>
           <para>is the <application>GNOME</application>
           <application>CORBA</application> <application>GTK</application>
           framework.</para>
           <indexterm zone="gnome-libs libgnorbagtk1">
-            <primary sortas="c-libgnorbagtk">libgnorbagtk.[so,a]</primary>
+            <primary sortas="c-libgnorbagtk">libgnorbagtk.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libzvt1">
-        <term><filename class='libraryfile'>libzvt.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libzvt.{so,a}</filename></term>
         <listitem>
           <para>provides the functions necessary to emulate
           <command>xterm</command>.</para>
           <indexterm zone="gnome-libs libzvt1">
-            <primary sortas="c-libzvt">libzvt.[so,a]</primary>
+            <primary sortas="c-libzvt">libzvt.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/otherlibs/gnome-print.xml b/gnome/otherlibs/gnome-print.xml
index b1f3398f41..7c0581bea3 100644
--- a/gnome/otherlibs/gnome-print.xml
+++ b/gnome/otherlibs/gnome-print.xml
@@ -74,6 +74,9 @@
     <xref linkend="gnome-libs"/> and
     <xref linkend="libxml"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-print"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -104,7 +107,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gnome-font-install</seg>
-        <seg>libgnomeprint.[so,a]</seg>
+        <seg>libgnomeprint.{so,a}</seg>
         <seg>/opt/gnome-1.4/etc/gnome,
         /opt/gnome-1.4/include/gnome-1.0/libgnomeprint,
         /opt/gnome-1.4/share/fonts,
diff --git a/gnome/otherlibs/gnome-vfs1.xml b/gnome/otherlibs/gnome-vfs1.xml
index f0ed58f952..38f6befd52 100644
--- a/gnome/otherlibs/gnome-vfs1.xml
+++ b/gnome/otherlibs/gnome-vfs1.xml
@@ -83,6 +83,9 @@
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-vfs1"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -113,7 +116,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>gnome-vfs-config</seg>
-        <seg>libgnomevfs.[so,a], libgnomevfs-pthread.[so,a] and
+        <seg>libgnomevfs.{so,a}, libgnomevfs-pthread.{so,a} and
         <application>GNOME VFS</application> filesystem modules</seg>
         <seg>/opt/gnome-1.4/etc/vfs,
         /opt/gnome-1.4/include/gnome-vfs-1.0,
diff --git a/gnome/otherlibs/gtkhtml1.xml b/gnome/otherlibs/gtkhtml1.xml
index d540676b3f..2fefcf306f 100644
--- a/gnome/otherlibs/gtkhtml1.xml
+++ b/gnome/otherlibs/gtkhtml1.xml
@@ -79,6 +79,9 @@
     <xref linkend="libghttp"/> and
     <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gtkhtml1"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -124,7 +127,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>ebrowser, gnome-gtkhtml-editor-1.1 and
         gtkhtml-properties-capplet</seg>
-        <seg>libgtkhtml-1.1.[so,a], <application>Bonobo</application>
+        <seg>libgtkhtml-1.1.{so,a}, <application>Bonobo</application>
         plugin modules and <application>Glade</application> rendering
         components</seg>
         <seg>/opt/gnome-1.4/include/gtkhtml-1.1,
diff --git a/gnome/otherlibs/guppi.xml b/gnome/otherlibs/guppi.xml
index f87078e07e..ace11c6650 100644
--- a/gnome/otherlibs/guppi.xml
+++ b/gnome/otherlibs/guppi.xml
@@ -86,6 +86,9 @@
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/guppi"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/otherlibs/libcapplet.xml b/gnome/otherlibs/libcapplet.xml
index 1c10b77688..4798cf50e4 100644
--- a/gnome/otherlibs/libcapplet.xml
+++ b/gnome/otherlibs/libcapplet.xml
@@ -66,6 +66,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libcapplet"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -104,7 +107,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libcapplet.[so,a]</seg>
+        <seg>libcapplet.{so,a}</seg>
         <seg>/opt/gnome-1.4/include/libcapplet-1.4</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/otherlibs/libghttp.xml b/gnome/otherlibs/libghttp.xml
index 187a6de686..e868f71221 100644
--- a/gnome/otherlibs/libghttp.xml
+++ b/gnome/otherlibs/libghttp.xml
@@ -58,6 +58,9 @@
       </listitem>
     </itemizedlist>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libghttp"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -98,7 +101,7 @@ install -v -m644 -D doc/ghttp.html \
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libghttp.[so,a]</seg>
+        <seg>libghttp.{so,a}</seg>
         <seg>/opt/gnome-1.4/share/doc/libghttp-&libghttp-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/otherlibs/libglade14.xml b/gnome/otherlibs/libglade14.xml
index c36800d89f..d6dba921e5 100644
--- a/gnome/otherlibs/libglade14.xml
+++ b/gnome/otherlibs/libglade14.xml
@@ -69,6 +69,9 @@
     <xref linkend="python"/> (to run the <command>libglade-xgettext</command>
     script) and <xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libglade14"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -111,8 +114,8 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>libglade-config and libglade-xgettext</seg>
-        <seg>libglade.[so,a] and optionally, libglade-bonobo.[so,a] and
-        libglade-gnome.[so,a]</seg>
+        <seg>libglade.{so,a} and optionally, libglade-bonobo.{so,a} and
+        libglade-gnome.{so,a}</seg>
         <seg>/opt/gnome-1.4/include/libglade-1.0 and
         /opt/gnome-1.4/share/gnome/html/libglade</seg>
       </seglistitem>
diff --git a/gnome/otherlibs/oaf.xml b/gnome/otherlibs/oaf.xml
index e893abfc01..0d8e1221cb 100644
--- a/gnome/otherlibs/oaf.xml
+++ b/gnome/otherlibs/oaf.xml
@@ -68,6 +68,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/oaf"/></para>
+
   </sect2>
 
   <sect2 role="installation">
diff --git a/gnome/otherlibs/orbit.xml b/gnome/otherlibs/orbit.xml
index 20c381b4ea..ec4eb5d08b 100644
--- a/gnome/otherlibs/orbit.xml
+++ b/gnome/otherlibs/orbit.xml
@@ -67,6 +67,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="tcpwrappers"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/orbit"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -100,9 +103,9 @@ cp -v -R docs/* /opt/gnome-1.4/share/doc/ORBit-&ORBit-version;</userinput></scre
         <seg>ior-decode, libIDL-config, name-client, old-name-server,
         orbit-config, orbit-idl, orbit-ird, orbit-event-server, and
         orbit-name-server</seg>
-        <seg>libIDL.[so,a], libIIOP.[so,a], libname-server.a,
-        liborbit-c-backend.a, libORBit.[so,a], libORBitCosNaming.[so,a],
-        and libORBitutil.[so,a]</seg>
+        <seg>libIDL.{so,a}, libIIOP.{so,a}, libname-server.a,
+        liborbit-c-backend.a, libORBit.{so,a}, libORBitCosNaming.{so,a},
+        and libORBitutil.{so,a}</seg>
         <seg>/opt/gnome-1.4,
         /opt/gnome-1.4/include/libIDL-1.0,
         /opt/gnome-1.4/include/orbit-1.0,
@@ -117,43 +120,43 @@ cp -v -R docs/* /opt/gnome-1.4/share/doc/ORBit-&ORBit-version;</userinput></scre
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libIDL-ORBit">
-        <term><filename class='libraryfile'>libIDL.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libIDL.{so,a}</filename></term>
         <listitem>
           <para>library is the Interface Definition Language mappings for
           CORBA.</para>
           <indexterm zone="ORBit libIDL-ORBit">
-            <primary sortas="c-libIDL">libIDL.[so,a]</primary>
+            <primary sortas="c-libIDL">libIDL.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libIIOP">
-        <term><filename class='libraryfile'>libIIOP.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libIIOP.{so,a}</filename></term>
         <listitem>
           <para>is for low level CORBA communications.</para>
           <indexterm zone="ORBit libIIOP">
-            <primary sortas="c-libIIOP">libIIOP.[so,a]</primary>
+            <primary sortas="c-libIIOP">libIIOP.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libORBit">
-        <term><filename class='libraryfile'>libORBit.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libORBit.{so,a}</filename></term>
         <listitem>
           <para>is the CORBA API.</para>
           <indexterm zone="ORBit libORBit">
-            <primary sortas="c-libORBit">libORBit.[so,a]</primary>
+            <primary sortas="c-libORBit">libORBit.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libORBitutil">
-        <term><filename class='libraryfile'>libORBitutil.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libORBitutil.{so,a}</filename></term>
         <listitem>
           <para>contains the convenience routines for
           <application>ORBit</application>.</para>
           <indexterm zone="ORBit libORBitutil">
-            <primary sortas="c-libORBitutil">libORBitutil.[so,a]</primary>
+            <primary sortas="c-libORBitutil">libORBitutil.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/gnome/otherlibs/otherlibs-config.xml b/gnome/otherlibs/otherlibs-config.xml
index cd725abc87..1469a93ab0 100644
--- a/gnome/otherlibs/otherlibs-config.xml
+++ b/gnome/otherlibs/otherlibs-config.xml
@@ -46,7 +46,7 @@ EOF</userinput></screen>
 <screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
 <literal># Begin GNOME-1 addition to man_db.conf
 
-MANPATH /opt/gnome-1.4/man
+MANDATORY_MANPATH /opt/gnome-1.4/man
 
 # END GNOME-1 addition to man_db.conf</literal>
 EOF</userinput></screen>
diff --git a/gnome/otherlibs/soup.xml b/gnome/otherlibs/soup.xml
index db0f39fed8..6afe989914 100644
--- a/gnome/otherlibs/soup.xml
+++ b/gnome/otherlibs/soup.xml
@@ -84,6 +84,9 @@
     <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/soup"/></para>
+
   </sect2>
 
   <sect2 role="installation">
@@ -127,7 +130,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>soup-config, soup-httpd, soup-ssl-proxy and soup-wsdl</seg>
-        <seg>libsoup.[so,a], libsoup-apache.[so,a] and libwsdl.[so,a]</seg>
+        <seg>libsoup.{so,a}, libsoup-apache.{so,a} and libwsdl.{so,a}</seg>
         <seg>/opt/gnome-1.4/include/soup and
         /opt/gnome-1.4/share/gtk-doc/html/soup</seg>
       </seglistitem>