Index: kde/add/kde-i18n.xml
===================================================================
--- kde/add/kde-i18n.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kde-i18n.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -65,7 +65,7 @@
     internationalization packages in the form of:</para>
 
-<screen><literal>kde-i18n-<replaceable>[xx]</replaceable>-&kde-version;.tar.bz2</literal></screen>
+<screen><literal>kde-i18n-<replaceable>&lt;xx&gt;</replaceable>-&kde-version;.tar.bz2</literal></screen>
 
-    <para>where the <replaceable>[xx]</replaceable> is a two to five letter code
+    <para>where the <replaceable>&lt;xx&gt;</replaceable> is a two to five letter code
     for the country covered.  Download the package(s) you need from
     the directories above.</para>
@@ -78,4 +78,7 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libxml2"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kde-i18n"/></para>
 
   </sect2>
Index: kde/add/kdeaccessibility.xml
===================================================================
--- kde/add/kdeaccessibility.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdeaccessibility.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -77,4 +77,7 @@
     is required by <command>kmouth</command> to render speech.</para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdeaccessibility"/></para>
+
   </sect2>
 
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdeaddons.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -78,4 +78,7 @@
     <xref linkend="sdl"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdeaddons"/></para>
+
   </sect2>
 
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdeadmin.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -73,4 +73,7 @@
     <para role="optional"><xref linkend="linux-pam"/> and
     <ulink url="http://lilo.go.dyndns.org/">LILO</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdeadmin"/></para>
 
   </sect2>
Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdeartwork.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -73,4 +73,7 @@
     <para role="optional"><xref linkend="xscreensaver"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdeartwork"/></para>
+
   </sect2>
 
Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdeedu.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -82,4 +82,7 @@
     url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdeedu"/></para>
+
   </sect2>
 
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdegames.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -72,4 +72,7 @@
     and <xref linkend="doxygen"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdegames"/></para>
+
   </sect2>
 
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdegraphics.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -102,4 +102,7 @@
     <xref linkend="doxygen"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdegraphics"/></para>
+
   </sect2>
 
@@ -155,7 +158,7 @@
         <seg>kio_kamera and several other kdegraphics specific libraries and
         support modules</seg>
-        <seg>The following subdirectories in &kde-dir;: include/[svg,
-        kviewshell, libtext2path-0.1], share/applnk/Graphics, share/apps/[too
-        many to list], and share/config/magic</seg>
+        <seg>The following subdirectories in &kde-dir;: include/{svg,
+        kviewshell, libtext2path-0.1}, share/applnk/Graphics, share/apps/{too
+        many to list}, and share/config/magic</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdemultimedia.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -57,4 +57,7 @@
     installation, go straight to the
     <xref linkend="kdemultimedia-instructions"/>.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdemultimedia"/></para>
 
   </sect2>
@@ -263,7 +266,7 @@
         yaf-vorbis, and yaf-yuv</seg>
         <seg>Numerous kdemultimedia specific libraries</seg>
-        <seg>The following subdirectories in $KDE_PREFIX: include/[libkcddb,
-        mpeglib, noatun], lib/mcop/Noatun, and
-        share/apps/[too many to list]</seg>
+        <seg>The following subdirectories in $KDE_PREFIX: include/{libkcddb,
+        mpeglib, noatun}, lib/mcop/Noatun, and
+        share/apps/{too many to list}</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdenetwork.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -82,4 +82,7 @@
     <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdenetwork"/></para>
+
   </sect2>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdepim.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -91,4 +91,7 @@
     and <xref linkend="doxygen"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdepim"/></para>
+
   </sect2>
 
Index: kde/add/kdetoys.xml
===================================================================
--- kde/add/kdetoys.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdetoys.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -69,4 +69,7 @@
     <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdetoys"/></para>
 
   </sect2>
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/add/kdeutils.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -74,4 +74,7 @@
     and <ulink url="http://tpctl.sourceforge.net/">tpctl</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdeutils"/></para>
+
   </sect2>
 
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/core/arts.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -79,4 +79,7 @@
     <ulink url="http://jackit.sourceforge.net/">JACK</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/arts"/></para>
+
   </sect2>
 
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/core/config.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -46,9 +46,9 @@
     <emphasis>only</emphasis> an <filename>~/.xinitrc</filename> file.  You
     should also delete the directories <filename
-    class='directory'>/tmp/kde-<replaceable>userid</replaceable></filename>,
+    class='directory'>/tmp/kde-<replaceable>&lt;userid&gt;</replaceable></filename>,
     <filename
-    class='directory'>/tmp/ksocket-<replaceable>userid</replaceable></filename>,
+    class='directory'>/tmp/ksocket-<replaceable>&lt;userid&gt;</replaceable></filename>,
     and <filename
-    class='directory'>/var/tmp/kdecache-<replaceable>userid</replaceable></filename>.
+    class='directory'>/var/tmp/kdecache-<replaceable>&lt;userid&gt;</replaceable></filename>.
     Then log out and log in again to ensure the new directory is in use.  Now,
     starting <application>KDE</application> will rebuild the menus.</para>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/core/kdebase.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -97,4 +97,7 @@
     <xref linkend="doxygen"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdebase"/></para>
+
   </sect2>
 
@@ -192,9 +195,9 @@
         <seg>Numerous KDE support libraries, helper modules, and kioslaves</seg>
         <seg>/etc/xdg/menus/applications-merged and the following subdirectories
-        of &kde-dir;/: include/[kate, ksgrd, ksplash, kwin],
-        lib/kconf_update_bin, share/[applnk, apps/[too many to list],
+        of &kde-dir;/: include/{kate, ksgrd, ksplash, kwin},
+        lib/kconf_update_bin, share/{applnk, apps/{too many to list},
         config, config.kcfg, desktop-directories, doc/kdm, fonts,
-        /mimelnk/[fonts, media, print], services/[searchproviders,
-        useragentstrings], sounds, templates, wallpapers, and /var/lib/kdm</seg>
+        /mimelnk/{fonts, media, print}, services/{searchproviders,
+        useragentstrings}, sounds, templates, wallpapers, and /var/lib/kdm</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/core/kdelibs.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -106,4 +106,7 @@
     <xref linkend="doxygen"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdelibs"/></para>
+
   </sect2>
 
@@ -200,8 +203,8 @@
         modules</seg>
         <seg>/etc/kde and the following subdirectories of &kde-dir;/:
-        include/[dnssd, dom, kabc, kate, kdeprint, kdesu, khexedit, kio, kjs,
+        include/{dnssd, dom, kabc, kate, kdeprint, kdesu, khexedit, kio, kjs,
         kmdi, kmediaplayer, knewstuff, kparts, kresources, ksettings, kspell2,
-        ktexteditor, kunittest, libkmid], lib/kde3, and share/[applications,
-        apps, autostart, config, doc, emoticons, icons, mimelnk, services] </seg>
+        ktexteditor, kunittest, libkmid}, lib/kde3, and share/{applications,
+        apps, autostart, config, doc, emoticons, icons, mimelnk, services} </seg>
       </seglistitem>
     </segmentedlist>
Index: kde/core/pre-install-config.xml
===================================================================
--- kde/core/pre-install-config.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/core/pre-install-config.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -69,5 +69,5 @@
 <literal># Begin kde addition to man_db.conf
 
-MANPATH /opt/kde-&kde-version;/man
+MANDATORY_MANPATH /opt/kde-&kde-version;/man
 
 # End kde addition to man_db.conf</literal>
Index: kde/devel/kdebindings.xml
===================================================================
--- kde/devel/kdebindings.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/devel/kdebindings.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -82,4 +82,7 @@
     <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyId=3A1C93FA-7462-47D0-8E56-8DD34C6292F0&amp;displaylang=en">Rotor</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdebindings"/></para>
+
   </sect2>
 
Index: kde/devel/kdesdk.xml
===================================================================
--- kde/devel/kdesdk.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/devel/kdesdk.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -71,4 +71,7 @@
     <xref linkend="libxml2"/></para>
     <!-- <xref linkend="db"/> -->
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdesdk"/></para>
 
   </sect2>
Index: kde/devel/kdevelop.xml
===================================================================
--- kde/devel/kdevelop.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/devel/kdevelop.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -74,4 +74,7 @@
     <ulink url="http://www.graphviz.org/">GraphViz</ulink>, and
     <xref linkend="doxygen"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdevelop"/></para>
 
   </sect2>
Index: kde/devel/kdewebdev.xml
===================================================================
--- kde/devel/kdewebdev.xml	(revision 58c6057882cdf74d9c22b96c9ac93cf550163664)
+++ kde/devel/kdewebdev.xml	(revision a3ef34c276ea52cacb7abedd8b157805e38ca455)
@@ -71,4 +71,7 @@
     <xref linkend="libxslt"/></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdewebdev"/></para>
+
   </sect2>
 
