Index: general/genlib/glib/glib2-exp.xml
===================================================================
--- general/genlib/glib/glib2-exp.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/glib/glib2-exp.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -3,5 +3,6 @@
 
 <para><command>--enable-gtk-doc</command> : This switch will rebuild
-the API documentation during the make command.</para>
+the <acronym>API</acronym> documentation during the
+<command>make</command> command.</para>
 
 </sect2>
Index: general/genlib/guile/guile-intro.xml
===================================================================
--- general/genlib/guile/guile-intro.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/guile/guile-intro.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -2,7 +2,8 @@
 <title>Introduction to <application>Guile</application></title>
 
-<para>The <application>Guile</application> package contains the Project GNU's 
-extension language library.  <application>Guile</application> also contains a 
-stand alone <application>Scheme</application> interpreter.</para>
+<para>The <application>Guile</application> package contains the Project 
+<acronym>GNU</acronym>'s extension language library.  <application>Guile
+</application> also contains a stand alone <application>Scheme</application> 
+interpreter.</para>
 
 <sect3><title>Package information</title>
Index: general/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/gwrap.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -5,5 +5,4 @@
 &gwrap-intro;
 &gwrap-inst;
-&gwrap-exp;
 &gwrap-desc;
 
Index: general/genlib/libfam/libfam-exp.xml
===================================================================
--- general/genlib/libfam/libfam-exp.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/libfam/libfam-exp.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -9,4 +9,12 @@
 necessary to get fam to compile with gcc-&gcc-version;.</para>
 
+<para><screen><command>libtoolize --force
+aclocal
+automake --add-missing
+autoconf</command></screen>
+These commands are necessary since the patches affect the
+<filename>configure.in</filename> file. They regenerate a new
+<command>configure</command> command with the necessary changes.</para>
+
 </sect2>
 
Index: general/genlib/lzo/lzo-desc.xml
===================================================================
--- general/genlib/lzo/lzo-desc.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/lzo/lzo-desc.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>LZO package provides 
+<para><application><acronym>LZO</acronym></application> package provides 
 <filename class="libraryfile">liblzo</filename> library.</para>
 
Index: general/genlib/lzo/lzo-inst.xml
===================================================================
--- general/genlib/lzo/lzo-inst.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/lzo/lzo-inst.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>LZO</application></title>
+<title>Installation of <application><acronym>LZO</acronym></application></title>
 
-<para>Install <application>LZO</application> by running the
+<para>Install <application><acronym>LZO</acronym></application> by running the
 following commands:</para>
 
Index: general/genlib/lzo/lzo-intro.xml
===================================================================
--- general/genlib/lzo/lzo-intro.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/genlib/lzo/lzo-intro.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Introduction to <application>LZO</application></title>
+<title>Introduction to <application><acronym>LZO</acronym></application></title>
 
-<para><application>LZO</application> is a data compression library which is suitable for data
-decompression and compression in real-time. This means it favours
-speed over compression ratio.</para>
+<para><application><acronym>LZO</acronym></application> is a data compression 
+library which is suitable for data decompression and compression in real-time. 
+This means it favours speed over compression ratio.</para>
 
 <sect3><title>Package information</title>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/graphlib/lcms.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -6,5 +6,5 @@
 &lcms-inst;
 <!-- &lcms-exp; -->
-&lcms-config;
+<!--&lcms-config; -->
 &lcms-desc;
 
Index: general/graphlib/lcms/lcms-inst.xml
===================================================================
--- general/graphlib/lcms/lcms-inst.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/graphlib/lcms/lcms-inst.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -4,7 +4,9 @@
 <para>Install <application>lcms</application> by running the following commands:</para>
 
-<screen><userinput><command>make &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
 make install</command></userinput></screen>
 
+<!--
 <para>The above completes the installation for most users, for users
 interested in image conversion, this package includes two utilities that
@@ -27,5 +29,5 @@
 <para>Final installation of this module appears to be left undone by the
 package which infers that a Python programmer would know what to
-do.</para> 
+do.</para> -->
 
 </sect2>
Index: general/graphlib/lcms/lcms.ent
===================================================================
--- general/graphlib/lcms/lcms.ent	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/graphlib/lcms/lcms.ent	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -5,8 +5,8 @@
 <!ENTITY lcms-desc SYSTEM "lcms-desc.xml">
 <!ENTITY lcms-config SYSTEM "lcms-config.xml">
-<!ENTITY lcms-buildsize "6.9 MB">
-<!ENTITY lcms-version "1.10">
+<!ENTITY lcms-buildsize "8.5 MB">
+<!ENTITY lcms-version "1.11">
 <!ENTITY lcms-download-http "http://www.littlecms.com/lcms-&lcms-version;.tar.gz">
 <!ENTITY lcms-download-ftp "">
-<!ENTITY lcms-size "232 KB">
-<!ENTITY lcms-time "0.29 SBU">
+<!ENTITY lcms-size "276 KB">
+<!ENTITY lcms-time "0.19 SBU">
Index: general/graphlib/libungif/libungif-inst.xml
===================================================================
--- general/graphlib/libungif/libungif-inst.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/graphlib/libungif/libungif-inst.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -5,7 +5,7 @@
 commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen>
+make install</command></userinput></screen>
 
 <note><para>If you get an error during the make portion compiling
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/sysutils/gpm.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -2,7 +2,7 @@
 <title>gpm-&gpm-version;</title>
 
-<para>Gpm (the general purpose mouse daemon) is a mouse server for
-applications running in the console.  It not only provides cut and paste
-support generally, but its library component is used by various software
+<para><acronym>GPM</acronym> (the general purpose mouse daemon) is a mouse 
+server for applications running in the console.  It not only provides cut and 
+paste support generally, but its library component is used by various software
 such as links to provide mouse support to the application generally.  It
 is useful on desktops, especially if following (Beyond)LinuxFromScratch
Index: general/sysutils/gpm/gpm-config.xml
===================================================================
--- general/sysutils/gpm/gpm-config.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/sysutils/gpm/gpm-config.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>gpm</application></title>
+<title>Configuring <application><acronym>gpm</acronym></application></title>
 
 <sect3><title>gpm init.d script</title>
@@ -106,3 +106,2 @@
 
 </sect2>
-
Index: general/sysutils/gpm/gpm-desc.xml
===================================================================
--- general/sysutils/gpm/gpm-desc.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/sysutils/gpm/gpm-desc.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>gpm</application> package contains
+<para>The <application><acronym>gpm</acronym></application> package contains
 <command>gpm</command>,
 <command>gpm-root</command>, <command>disable-paste</command>
Index: general/sysutils/gpm/gpm-inst.xml
===================================================================
--- general/sysutils/gpm/gpm-inst.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/sysutils/gpm/gpm-inst.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Installation of <application>gpm</application></title>
+<title>Installation of <application><acronym>gpm</acronym></application></title>
 
-<para>Download the patches for <application>gpm</application> from <ulink url="&hfile-root;"/>.</para>
+<para>Download the patches for <application><acronym>gpm</acronym></application> from <ulink url="&hfile-root;"/>.</para>
 
-<para>Install <application>gpm</application> by running the following commands:
+<para>Install <application><acronym>gpm</acronym></application> by running the following commands:
 </para>
 <!--
Index: general/sysutils/gpm/gpm-intro.xml
===================================================================
--- general/sysutils/gpm/gpm-intro.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/sysutils/gpm/gpm-intro.xml	(revision cf7ae1626de06af7f90f9021239c0d5c99e9421e)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>gpm</application></title>
+<title>Introduction to <application><acronym>gpm</acronym></application></title>
 
-<para>The <application>gpm</application> package contains a mouse server for 
+<para>The <application><acronym>gpm</acronym></application> package contains a mouse server for 
 the console and <command>xterm</command>. This is useful for cutting and 
 pasting text in console mode, and also because many console-based programs 
