Index: general/genlib/aspell/aspell-desc.xml
===================================================================
--- general/genlib/aspell/aspell-desc.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/genlib/aspell/aspell-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The aspell package contains the <userinput>aspell
-library</userinput>.</para>
+<para>The aspell package contains the <filename>aspell</filename>
+library.</para>
 
 </sect2>
Index: general/genlib/expat/expat-inst.xml
===================================================================
--- general/genlib/expat/expat-inst.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/genlib/expat/expat-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,5 +2,5 @@
 <title>Installation of expat</title>
 
-<para>The <filename>expat.h</filename> declares XML_Status after it's first use.  This is
+<para>The <filename>expat.h</filename> declares XML_Status after its first use.  This is
 corrected by the following patch:
 
Index: general/genlib/libesmtp/libesmtp-desc.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-desc.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/genlib/libesmtp/libesmtp-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The libesmtp package contains the <userinput>libesmtp
-library</userinput>.</para>
+<para>The libesmtp package contains the <filename>libesmtp</filename>
+library.</para>
 
 </sect2>
Index: general/genlib/popt/popt-desc.xml
===================================================================
--- general/genlib/popt/popt-desc.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/genlib/popt/popt-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The popt package contains the <userinput>popt
-library</userinput>.</para>
+<para>The popt package contains the <filename>popt</filename> library.</para>
 
 </sect2>
Index: general/genutils/bc/bc-inst.xml
===================================================================
--- general/genutils/bc/bc-inst.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/genutils/bc/bc-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,9 +2,13 @@
 <title>Installation of bc</title>
 
+<para>Download the patches for bc from <ulink url="&hfile-root;"/>.</para>
+
 <para>Install bc by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --with-readline &amp;&amp;
-sed 's|\(^_PR.*readline.*$\)|/* \1 */|' bc/scan.l > new-scan.l &&
-mv new-scan.l bc/scan.l &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../bc-1.06-flex-invocation.patch
+&amp;&amp;
+patch -Np1 -i ../bc-1.06-info.patch &amp;&amp;
+patch -Np1 -i ../bc-1.06-readline.patch &amp;&amp;
+./configure --prefix=/usr --with-readline &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: general/graphlib/aalib/aalib-desc.xml
===================================================================
--- general/graphlib/aalib/aalib-desc.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/graphlib/aalib/aalib-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The aalib package contains the <userinput>Ascii Art
-libraries</userinput>, <userinput>aalib-config</userinput>,
+<para>The aalib package contains the <filename>Ascii Art</filename> libraries, <userinput>aalib-config</userinput>,
 <userinput>aainfo</userinput>, <userinput>aatest</userinput> and
 <userinput>aasavefont</userinput>.</para>
Index: general/graphlib/lcms/lcms-desc.xml
===================================================================
--- general/graphlib/lcms/lcms-desc.xml	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/graphlib/lcms/lcms-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The lcms package contains the <userinput>lcms library</userinput>.</para>
+<para>The lcms package contains the <filename>lcms</filename> library.</para>
 
 </sect2>
Index: general/sysutils/gpm/gpm.ent
===================================================================
--- general/sysutils/gpm/gpm.ent	(revision 0cef228a1eb81be708b0ab3c7d4f0f3af60ef7ac)
+++ general/sysutils/gpm/gpm.ent	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -8,3 +8,3 @@
 <!ENTITY gpm-download-http "">
 <!ENTITY gpm-download-ftp "ftp://arcana.linux.it/pub/gpm/gpm-&gpm-version;.tar.bz2">
-<!ENTITY gpm-size "382 KB">
+<!ENTITY gpm-size "556 KB">
