Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ basicnet/textweb/links.xml	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -38,9 +38,13 @@
 <sect3><title><application>Links</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="gpm"/>, <xref linkend="openssl-package"/>, <xref linkend="libpng"/>,
-<xref linkend="libjpeg"/>, <xref linkend="libtiff"/>, <ulink
-url="http://www.svgalib.org/">SVGAlib</ulink>, 
+<para><xref linkend="gpm-package"/>, 
+<xref linkend="openssl-package"/>, 
+<xref linkend="libpng"/>, 
+<xref linkend="libjpeg"/>, 
+<xref linkend="libtiff"/>, 
+<ulink url="http://www.svgalib.org/">SVGAlib</ulink>, 
 <ulink url="http://www.directfb.org/">DirectFB</ulink> and 
-X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>).</para></sect4>
+X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>).</para>
+</sect4>
 </sect3>
 
@@ -65,5 +69,5 @@
 use <application>Links</application> in graphics mode. You will either
 need to install the X Window System or enable frame buffer support in
-your kernel and install <xref linkend="gpm"/>.</para>
+your kernel and install <xref linkend="gpm-package"/>.</para>
 
 </sect2>
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ basicnet/textweb/w3m.xml	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -42,5 +42,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="gpm"/>, 
+<xref linkend="gpm-package"/>, 
 <xref linkend="openssl-package"/>, 
 <xref linkend="imlib"/>, 
Index: general.ent
===================================================================
--- general.ent	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ general.ent	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -1,3 +1,3 @@
-<!ENTITY day          "15">
+<!ENTITY day          "16">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ general/graphlib/aalib.xml	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -43,5 +43,6 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="slang"/> and 
-<xref linkend="gpm"/></para></sect4>
+<xref linkend="gpm-package"/></para>
+</sect4>
 </sect3>
 
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ general/sysutils/gpm.xml	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -10,8 +10,7 @@
 <!ENTITY gpm-buildsize "6.7 MB">
 <!ENTITY gpm-time "0.09 SBU">
-
 ]>
 
-<sect1 id="gpm" xreflabel="GPM-&gpm-version;">
+<sect1 id="gpm-package" xreflabel="GPM-&gpm-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,4 +19,6 @@
 <?dbhtml filename="gpm.html"?>
 <title><acronym>GPM</acronym>-&gpm-version;</title>
+<indexterm zone="gpm-package">
+<primary sortas="a-GPM-package">GPM</primary></indexterm>
 
 <sect2>
@@ -89,5 +90,8 @@
 <title>Configuring <application><acronym>GPM</acronym></application></title>
 
-<sect3><title>gpm init.d script</title>
+<sect3 id="gpm-init"><title>gpm init.d script</title>
+<indexterm zone="gpm-package gpm-init">
+<primary sortas="f-GPM-init">gpm</primary></indexterm>
+
 <para>Install the <filename>/etc/rc.d/init.d/gpm</filename>
 init script included in the
@@ -95,8 +99,7 @@
 
 <screen><userinput><command>make install-gpm</command></userinput></screen>
-
-</sect3>
-
-<sect3><title>Config files</title>
+</sect3>
+
+<sect3 id="gpm-config"><title>Config files</title>
 
 <para><filename>/etc/gpm-root.conf</filename> and 
@@ -117,4 +120,12 @@
 # End /etc/sysconfig/mouse
 <command>EOF</command></userinput></screen>
+
+<indexterm zone="gpm-package gpm-config">
+<primary sortas="e-AA.gpm-root">~/.gpm-root</primary></indexterm>
+<indexterm zone="gpm-package gpm-config">
+<primary sortas="e-etc-gpm-root.conf">/etc/gpm-root.conf</primary></indexterm>
+<indexterm zone="gpm-package gpm-config">
+<primary sortas="e-etc-sysconfig-mouse-gpm">/etc/sysconfig/mouse</primary>
+</indexterm>
 </sect3>
 
@@ -136,5 +147,4 @@
 mice.  <envar>GPMOPTS</envar> is the 'catch all' for any 
 additional options that are needed for your hardware.</para>
-
 </sect3>
 
@@ -144,37 +154,67 @@
 <title>Contents</title>
 
-<para>The <application><acronym>GPM</acronym></application> package contains
-<command>gpm</command>, <command>gpm-root</command>, 
-<command>disable-paste</command>, <command>mev</command>, 
-<command>mouse-test</command> and <command>hltest</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>gpm</title>
-<para><command>gpm</command> is a cut and paste utility and mouse server for
-virtual consoles.</para></sect3>
-
-<sect3><title>gpm-root</title>
-<para><command>gpm-root</command> is a default handler for
-<command>gpm</command>.  It is used to draw menus on the
-root window.</para></sect3>
-
-<sect3><title>disable-paste</title>
-<para><command>disable-paste</command> is a security mechanism used to disable 
-the paste buffer.</para></sect3>
-
-<sect3><title>mev</title>
-<para><command>mev</command> is a program to report mouse events.</para></sect3>
-
-<sect3><title>mouse-test</title>
-<para><command>mouse-test</command> is a tool for determining the mouse type 
-and device it's attached to.</para></sect3>
-
-<sect3><title>hltest</title>
-<para><command>hltest</command> is a simple sample application using the 
-high-level library, meant to be read by programmers trying to use the
-high-level library.</para></sect3>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<seglistitem>
+<seg>disable-paste, gpm, gpm-root, hltest, mev and mouse-test</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="disable-paste">
+<term><command>disable-paste</command></term>
+<listitem><para>is a security mechanism used to disable the paste buffer.</para>
+<indexterm zone="gpm-package disable-paste">
+<primary sortas="b-disable-paste">disable-paste</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="gpm">
+<term><command>gpm</command></term>
+<listitem><para>is a cut and paste utility and mouse server for virtual 
+consoles.</para>
+<indexterm zone="gpm-package gpm">
+<primary sortas="b-gpm">gpm</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="gpm-root">
+<term><command>gpm-root</command></term>
+<listitem><para>is a default handler for <command>gpm</command>. It is used to 
+draw menus on the root window.</para>
+<indexterm zone="gpm-package gpm-root">
+<primary sortas="b-gpm-root">gpm-root</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="hltest">
+<term><command>hltest</command></term>
+<listitem><para>is a simple sample application using the high-level library, 
+meant to be read by programmers trying to use the high-level library.</para>
+<indexterm zone="gpm-package hltest">
+<primary sortas="b-hltest">hltest</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="mev">
+<term><command>mev</command></term>
+<listitem><para>is a program to report mouse events.</para>
+<indexterm zone="gpm-package mev">
+<primary sortas="b-mev">mev</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="mouse-test">
+<term><command>mouse-test</command></term>
+<listitem><para>is a tool for determining the mouse type and device it's 
+attached to.</para>
+<indexterm zone="gpm-package mouse-test">
+<primary sortas="b-mouse-test">mouse-test</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ general/sysutils/mc.xml	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -50,5 +50,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="gpm"/>, 
+<para><xref linkend="gpm-package"/>, 
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
 <xref linkend="samba3"/>,
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 22073e8195f52f2f2880d49d99db97053bcdab0a)
+++ postlfs/editors/vim.xml	(revision 09f7011309072ef16545357ba4dfdac431eaffd2)
@@ -69,5 +69,5 @@
 <xref linkend="tcl"/>, 
 <xref linkend="ruby-package"/> 
-and <xref linkend="gpm"/>
+and <xref linkend="gpm-package"/>
 </para></sect4>
 </sect3>
