Index: general/genlib/libfam/libfam-config.xml
===================================================================
--- general/genlib/libfam/libfam-config.xml	(revision 512e06f90a28c59055affbfad0b9802a9be086bc)
+++ general/genlib/libfam/libfam-config.xml	(revision 4af6b98859bda9fc3d932f4669e909bc65fb18e2)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring fam</title>
+<title>Configuring <application><acronym>fam</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -16,17 +16,16 @@
 <para>Configuring the file alteration monitor.</para>
 
-<para>If you use inetd, add the fam entry to
+<para>If you use <application>inetd</application>, add the
+<application><acronym>fam</acronym></application> entry to
 <filename>/etc/inetd.conf</filename> with the
 following command: </para>
 
-<screen><userinput>echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/bin/fam fam" &gt;&gt; /etc/inetd.conf</userinput></screen>
+<screen><userinput><command>echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/bin/fam fam" &gt;&gt; /etc/inetd.conf</command></userinput></screen>
 
-<para>
-If you use xinetd, add an entry to
+<para>If you use <application>xinetd</application>, add an entry to
 <filename>/etc/xinetd.conf</filename> with the following command (be
-sure the "nogroup" group exists):
-</para>
-<para>
-<screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
+sure the "nogroup" group exists):</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
     # description: FAM - file alteration monitor
     service sgi_fam
@@ -42,5 +41,5 @@
         rpc_number      = 391002
     }
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 </sect3>
Index: general/genlib/libfam/libfam-desc.xml
===================================================================
--- general/genlib/libfam/libfam-desc.xml	(revision 512e06f90a28c59055affbfad0b9802a9be086bc)
+++ general/genlib/libfam/libfam-desc.xml	(revision 4af6b98859bda9fc3d932f4669e909bc65fb18e2)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The fam package contains <userinput>fam</userinput> and
+<para>The <application><acronym>fam</acronym></application> package contains 
+<command>fam</command> and
 <filename>libfam</filename> libraries.</para>
 
@@ -11,5 +12,5 @@
 <sect3><title>fam</title>
 
-<para>fam is the file alteration monitor.</para>
+<para><command>fam</command> is the file alteration monitor.</para>
 
 </sect3>
Index: general/genlib/libfam/libfam-exp.xml
===================================================================
--- general/genlib/libfam/libfam-exp.xml	(revision 512e06f90a28c59055affbfad0b9802a9be086bc)
+++ general/genlib/libfam/libfam-exp.xml	(revision 4af6b98859bda9fc3d932f4669e909bc65fb18e2)
@@ -2,13 +2,10 @@
 <title>Command explanations</title>
 
-<para>
-<userinput>patch -Np1 -i ../fam-dnotify.patch</userinput> : This patch causes fam to use the Linux kernel dnotify mechanism to
-inform the calling process of file modifications, rather than polling
-the file system for.
-</para>
+<para><command>patch -Np1 -i ../fam-dnotify.patch</command> : This patch causes 
+fam to use the Linux kernel dnotify mechanism to inform the calling process of 
+file modifications, rather than polling the file system for.</para>
 
-<para>
-<userinput>patch -Np1 -i ../fam-gcc3.patch</userinput> : This patch is necessary to get fam to compile with gcc-3.2.
-</para>
+<para><command>patch -Np1 -i ../fam-gcc3.patch</command> : This patch is 
+necessary to get fam to compile with gcc-&gcc-version;.</para>
 
 </sect2>
Index: general/genlib/libfam/libfam-inst.xml
===================================================================
--- general/genlib/libfam/libfam-inst.xml	(revision 512e06f90a28c59055affbfad0b9802a9be086bc)
+++ general/genlib/libfam/libfam-inst.xml	(revision 4af6b98859bda9fc3d932f4669e909bc65fb18e2)
@@ -1,16 +1,18 @@
 <sect2>
-<title>Installation of fam</title>
+<title>Installation of <application><acronym>fam</acronym></application></title>
 
-<para>Download the fam patches from <ulink url="&hfile-root;"/>.</para>
+<para>Download the <application><acronym>fam</acronym></application> patches 
+from <ulink url="&hfile-root;"/>.</para>
 
-<para>Install fam by running the following commands:</para>
+<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 IMON
-or inetd.conf warnings, as we will be configuring these files after
-installation.</para></note>
+merge entries in <filename>/etc/rpc</filename>.  These can be ignored, along 
+with any <acronym>IMON</acronym> or <filename>inetd.conf</filename> warnings, 
+as we will be configuring these files after installation.</para></note>
 
 
-<para><screen><userinput>patch -Np1 -i ../fam-dnotify.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../fam-dnotify.patch &amp;&amp;
 patch -Np1 -i ../fam-gcc3.patch &amp;&amp;
 libtoolize --force &amp;&amp;
@@ -20,5 +22,5 @@
 ./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 
Index: general/genlib/libfam/libfam-intro.xml
===================================================================
--- general/genlib/libfam/libfam-intro.xml	(revision 512e06f90a28c59055affbfad0b9802a9be086bc)
+++ general/genlib/libfam/libfam-intro.xml	(revision 4af6b98859bda9fc3d932f4669e909bc65fb18e2)
@@ -1,15 +1,27 @@
 <sect2>
-<title>Introduction to fam</title>
+<title>Introduction to <application><acronym>fam</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libfam-download-http;"/>
-Download location (FTP):        <ulink url="&libfam-download-ftp;"/>
-Version used:                   &libfam-version;
-Package size:                   &libfam-size;
-Estimated Disk space required:  &libfam-buildsize;</screen>
+<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>
 
-<para>The fam package contains a File Alteration Monitor.</para>
-
-<screen>fam depends on:
-<xref linkend="portmap"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libfam-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libfam-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libfam-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libfam-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libfam-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>fam</acronym></application> dependencies
+</title>
+<sect4><title>Required</title>
+<para><xref linkend="portmap"/></para></sect4>
+</sect3>
 
 </sect2>
