Index: general/genlib/libfam.xml
===================================================================
--- general/genlib/libfam.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/libfam.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,5 +1,5 @@
-<sect1 id="libfam" xreflabel="libfam-&libfam-version;">
+<sect1 id="libfam" xreflabel="FAM-&libfam-version;">
 <?dbhtml filename="libfam.html" dir="general"?>
-<title>fam-&libfam-version;</title>
+<title>FAM-&libfam-version;</title>
 
 &libfam-intro;
Index: general/genlib/libfam/libfam-config.xml
===================================================================
--- general/genlib/libfam/libfam-config.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/libfam/libfam-config.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application><acronym>fam</acronym></application></title>
+<title>Configuring <application><acronym>FAM</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -17,5 +17,5 @@
 
 <para>If you use <application>inetd</application>, add the
-<application><acronym>fam</acronym></application> entry to
+<application><acronym>FAM</acronym></application> entry to
 <filename>/etc/inetd.conf</filename> with the
 following command: </para>
Index: general/genlib/libfam/libfam-desc.xml
===================================================================
--- general/genlib/libfam/libfam-desc.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/libfam/libfam-desc.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>fam</acronym></application> package contains 
+<para>The <application><acronym>FAM</acronym></application> package contains 
 <command>fam</command> and
 <filename>libfam</filename> libraries.</para>
Index: general/genlib/libfam/libfam-exp.xml
===================================================================
--- general/genlib/libfam/libfam-exp.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/libfam/libfam-exp.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -7,5 +7,6 @@
 
 <para><command>patch -Np1 -i ../fam-gcc3.patch</command> : This patch is 
-necessary to get fam to compile with gcc-&gcc-version;.</para>
+necessary to get <application><acronym>FAM</acronym></application> to compile 
+with gcc-&gcc-version;.</para>
 
 <para><screen><command>libtoolize --force
Index: general/genlib/libfam/libfam-inst.xml
===================================================================
--- general/genlib/libfam/libfam-inst.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/libfam/libfam-inst.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,14 +1,14 @@
 <sect2>
-<title>Installation of <application><acronym>fam</acronym></application></title>
+<title>Installation of <application><acronym>FAM</acronym></application></title>
 
-<para>Download the <application><acronym>fam</acronym></application> patches 
+<para>Download the <application><acronym>FAM</acronym></application> patches 
 from <ulink url="&hfile-root;"/>.</para>
 
-<para>Install <application><acronym>fam</acronym></application> by running the 
+<para>Install <application><acronym>FAM</acronym></application> by running the 
 following commands:</para>
 
 <note><para>You will get warnings about make install being unable to
 merge entries in <filename>/etc/rpc</filename>.  These can be ignored, along 
-with any <acronym>IMON</acronym> or <filename>inetd.conf</filename> warnings, 
+with any <abbrev>imon</abbrev> or <filename>inetd.conf</filename> warnings, 
 as we will be configuring these files after installation.</para></note>
 
Index: general/genlib/libfam/libfam-intro.xml
===================================================================
--- general/genlib/libfam/libfam-intro.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/libfam/libfam-intro.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application><acronym>fam</acronym></application></title>
+<title>Introduction to <application><acronym>FAM</acronym></application></title>
 
-<para>The <application><acronym>fam</acronym></application> package contains a 
+<para>The <application><acronym>FAM</acronym></application> package contains a 
 File Alteration Monitor which is useful for notifying applications of
 changes to the file system.</para>
@@ -19,5 +19,5 @@
 </sect3>
                                                                                 
-<sect3><title><application><acronym>fam</acronym></application> dependencies
+<sect3><title><application><acronym>FAM</acronym></application> dependencies
 </title>
 <sect4><title>Required</title>
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/genlib/lzo.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,5 +1,5 @@
 <sect1 id="LZO" xreflabel="LZO-&LZO-version;">
 <?dbhtml filename="LZO.html" dir="general"?>
-<title>LZO-&LZO-version;</title>
+<title><acronym>LZO</acronym>-&LZO-version;</title>
 
 &LZO-intro;
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/sysutils/gpm.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,13 +1,13 @@
 <sect1 id="gpm" xreflabel="gpm-&gpm-version;">
-<title>gpm-&gpm-version;</title>
+<title><acronym>GPM</acronym>-&gpm-version;</title>
 
-<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
-instructions - it's often much easier (and less error prone) to cut and
-paste between two console windows than to type everything by
-hand!</para>
+<para><application><acronym>GPM</acronym></application> (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) Linux From Scratch instructions - it's often much easier (and less 
+error prone) to cut and paste between two console windows than to type 
+everything by hand!</para>
 
 &gpm-intro;
Index: general/sysutils/gpm/gpm-config.xml
===================================================================
--- general/sysutils/gpm/gpm-config.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/sysutils/gpm/gpm-config.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Configuring <application><acronym>gpm</acronym></application></title>
+<title>Configuring <application><acronym>GPM</acronym></application></title>
 
 <sect3><title>gpm init.d script</title>
-<para>The <application>gpm</application> init.d script can be created using 
-the following commands:  (This assumes that you have followed the
+<para>The <command>gpm</command> init.d script can be created using 
+the following commands:  <!-- (This assumes that you have followed the
 <acronym>LFS</acronym> default of having your $rc_base set to <filename
-class="directory">/etc/rc.d</filename>)</para>
+class="directory">/etc/rc.d</filename>) --></para>
 <screen><userinput><command>cat &gt; /etc/rc.d/init.d/gpm &lt;&lt; "EOF"</command>
 #!/bin/sh
@@ -61,6 +61,6 @@
 chmod 755 /etc/rc.d/init.d/gpm</command></userinput></screen>
 
-<para>You then need to create symbolic links to this file in the relevant rc.d
-directories.  For example:
+<para>You then need to create symbolic links to this file in the
+relevant <filename>rc.d</filename> directories.  For example:
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/gpm ../rc0.d/K10gpm &amp;&amp;
Index: general/sysutils/gpm/gpm-desc.xml
===================================================================
--- general/sysutils/gpm/gpm-desc.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/sysutils/gpm/gpm-desc.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>gpm</acronym></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 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/sysutils/gpm/gpm-inst.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Installation of <application><acronym>gpm</acronym></application></title>
+<title>Installation of <application><acronym>GPM</acronym></application></title>
 
-<para>Download the patches for <application><acronym>gpm</acronym></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><acronym>gpm</acronym></application> by running the following commands:
+<para>Install <application><acronym>GPM</acronym></application> by running the following commands:
 </para>
 <!--
@@ -23,6 +23,7 @@
 
 <para><command>export LDFLAGS="-lm"</command> : The math library
- must be linked with gpm, as ceil() is used in some cursor scrolling
- logic. <envar>LDFLAGS</envar> is only needed if you optimize gpm for size.
+ must be linked with <command>gpm</command>, as ceil() is used in some cursor 
+scrolling logic. <envar>LDFLAGS</envar> is only needed if you optimize
+<command>gpm</command> for size.
 </para>
 
Index: general/sysutils/gpm/gpm-intro.xml
===================================================================
--- general/sysutils/gpm/gpm-intro.xml	(revision 74696d94b490b101fec8343f91e4296e5e00c2fd)
+++ general/sysutils/gpm/gpm-intro.xml	(revision c202baef576316b3c15bca4344f40b94847bde79)
@@ -1,9 +1,9 @@
 <sect2>
-<title>Introduction to <application><acronym>gpm</acronym></application></title>
+<title>Introduction to <application><acronym>GPM</acronym></application></title>
 
-<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 
-need it to compile mouse support into themselves.</para>
+<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 need it to compile mouse support into themselves.</para>
 
 <sect3><title>Package information</title>
