Index: general/genlib/expat/expat-desc.xml
===================================================================
--- general/genlib/expat/expat-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/expat/expat-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The expat package contains the <userinput>expat
-libraries</userinput> and 
+<para>The expat package contains the <filename>expat</filename> libraries and 
 <userinput>xmlwf</userinput>.</para>
 
Index: general/genlib/gdbm/gdbm-desc.xml
===================================================================
--- general/genlib/gdbm/gdbm-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/gdbm/gdbm-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gdbm package contains <userinput>gdbm libraries</userinput>.</para>
+<para>The gdbm package contains <filename>gdbm</filename> libraries.</para>
 
 </sect2>
Index: general/genlib/glib/glib-desc.xml
===================================================================
--- general/genlib/glib/glib-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/glib/glib-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The glib package contains <userinput>GLib libraries</userinput>.</para>
+<para>The glib package contains <filename>GLib</filename> libraries.</para>
 
 </sect2>
Index: general/genlib/glib/glib2-desc.xml
===================================================================
--- general/genlib/glib/glib2-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/glib/glib2-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The glib package contains <userinput>GLib libraries</userinput>.</para>
+<para>The glib package contains <filename>GLib</filename> libraries.</para>
 
 </sect2>
Index: general/genlib/gmp/gmp-desc.xml
===================================================================
--- general/genlib/gmp/gmp-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/gmp/gmp-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gmp package contains <userinput>gmp libraries</userinput>.</para>
+<para>The gmp package contains <filename>gmp</filename> libraries.</para>
 
 </sect2>
Index: general/genlib/pcre/pcre-desc.xml
===================================================================
--- general/genlib/pcre/pcre-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/pcre/pcre-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The pcre package contains the <userinput>pcre
-libraries</userinput>, <userinput>pcregrep</userinput>,
+<para>The pcre package contains the <filename>pcre</filename> libraries, <userinput>pcregrep</userinput>,
 <userinput>pcretest</userinput> and 
 <userinput>pcre-config</userinput>.</para>
Index: general/genlib/slang/slang-desc.xml
===================================================================
--- general/genlib/slang/slang-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/slang/slang-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The slang package contains the slang library, which is used to
-create robust, multi-platform software.</para>
+<para>The slang package contains the <filename>slang</filename> library.</para>
 
 </sect2>
Index: general/genlib/stlport/stlport-desc.xml
===================================================================
--- general/genlib/stlport/stlport-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genlib/stlport/stlport-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -3,5 +3,5 @@
 
 <para>The STLport package contains STLport headers <userinput>/usr/include/stlport</userinput>
-and STLport dynamic and static libraries.</para>
+and <filename>STLport</filename> dynamic and static libraries.</para>
 
 </sect2>
Index: general/genutils/rep-gtk/rep-gtk-desc.xml
===================================================================
--- general/genutils/rep-gtk/rep-gtk-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/genutils/rep-gtk/rep-gtk-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The rep-gtk package contains <userinput>Lisp bindings</userinput>.</para>
+<para>The rep-gtk package contains <filename>Lisp</filename> bindings.</para>
 
 </sect2>
Index: general/graphlib/imlib/imlib-desc.xml
===================================================================
--- general/graphlib/imlib/imlib-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/graphlib/imlib/imlib-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The imlib package contains <userinput>imlib libraries</userinput>.</para>
+<para>The imlib package contains <filename>imlib</filename> libraries.</para>
 
 </sect2>
Index: general/graphlib/libjpeg/libjpeg-desc.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/graphlib/libjpeg/libjpeg-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -4,6 +4,6 @@
 <para>The libjpeg package contains <userinput>cjpeg</userinput>,
 <userinput>djpeg</userinput>, <userinput>jpegtran</userinput>,
-<userinput>rdjpgcom</userinput>, <userinput>wrjpgcom</userinput> and <userinput>jpeg
-libraries</userinput>.</para>
+<userinput>rdjpgcom</userinput>, <userinput>wrjpgcom</userinput> and
+<filename>jpeg</filename> libraries.</para>
 
 </sect2>
Index: general/graphlib/libjpeg/libjpeg-exp.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-exp.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/graphlib/libjpeg/libjpeg-exp.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -3,5 +3,6 @@
 
 <para><userinput>./configure --enable-static --enable-shared --prefix=/usr</userinput> : This command tells libjpeg to build both shared and
-static libraries and to install them with a base of /usr.</para>
+static libraries and to install them with a base of
+<filename>/usr</filename>.</para>
 
 </sect2>
Index: general/graphlib/libmng/libmng-desc.xml
===================================================================
--- general/graphlib/libmng/libmng-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/graphlib/libmng/libmng-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The libmng package contains <userinput>mng
-libraries</userinput>.</para>
+<para>The libmng package contains <filename>mng</filename> libraries.</para>
 
 </sect2>
Index: general/graphlib/libtiff/libtiff-desc.xml
===================================================================
--- general/graphlib/libtiff/libtiff-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/graphlib/libtiff/libtiff-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -11,5 +11,6 @@
 <userinput>tiffdither</userinput>, <userinput>tiffdump</userinput>,
 <userinput>tiffinfo</userinput>, <userinput>tiffmedian</userinput>,
-<userinput>tiffsplit</userinput> and <userinput>tiff libraries</userinput></para>
+<userinput>tiffsplit</userinput> and <filename>tiff</filename>
+libraries.</para>
 
 </sect2>
Index: general/graphlib/libungif/libungif-desc.xml
===================================================================
--- general/graphlib/libungif/libungif-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/graphlib/libungif/libungif-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -16,6 +16,6 @@
 <userinput>giftext</userinput>, <userinput>gifwedge</userinput>,
 <userinput>icon2gif</userinput>, <userinput>raw2gif</userinput>,
-<userinput>rgb2gif</userinput>, <userinput>text2gif</userinput> and <userinput>ungif
-libraries</userinput>.</para>
+<userinput>rgb2gif</userinput>, <userinput>text2gif</userinput> and
+<filename>ungif</filename> libraries.</para>
 
 </sect2>
Index: general/prog/gcc/gcc-desc.xml
===================================================================
--- general/prog/gcc/gcc-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/prog/gcc/gcc-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -13,5 +13,5 @@
 <userinput>gnatmake</userinput>, <userinput>gnatprep</userinput>,
 <userinput>gnatpsta</userinput>, <userinput>gnatpsys</userinput>,
-<userinput>gnatxref</userinput> and <userinput>gcc libraries</userinput>.</para>
+<userinput>gnatxref</userinput> and <filename>gcc</filename> libraries.</para>
 
 </sect2>
Index: general/prog/librep/librep-desc.xml
===================================================================
--- general/prog/librep/librep-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/prog/librep/librep-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -3,5 +3,5 @@
 
 <para>The librep package contains <userinput>rep</userinput> and
-<userinput>librep libraries</userinput>.</para>
+<filename>librep</filename> libraries.</para>
 
 </sect2>
Index: general/sysutils/gpm/gpm-desc.xml
===================================================================
--- general/sysutils/gpm/gpm-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ general/sysutils/gpm/gpm-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The gpm package contains <userinput>gpm, gpm-root, disable-paste
-and mev</userinput>.</para>
+<para>The gpm package contains <userinput>gpm</userinput>,
+<userinput>gpm-root</userinput>, <userinput>disable-paste</userinput>
+and <userinput>mev</userinput>.</para>
 
 </sect2>
