Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ basicnet/mailnews/nail.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title>Nail-&nail-version;</title>
 <indexterm zone="nail-package">
-<primary sortas="a-Nail-package">Nail</primary></indexterm>
+<primary sortas="a-Nail">Nail</primary></indexterm>
 
 <sect2>
@@ -131,17 +131,17 @@
 </varlistentry>
 
-<varlistentry id="nail-mail">
+<varlistentry id="mail-nail">
 <term><command>mail</command></term>
 <listitem><para>is a symbolic link to <command>nail</command>.</para>
-<indexterm zone="nail-package nail-mail">
-<primary sortas="g-mail-nail">mail</primary></indexterm>
+<indexterm zone="nail-package mail-nail">
+<primary sortas="g-mail">mail</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="nail-mailx">
+<varlistentry id="mailx-nail">
 <term><command>mailx</command></term>
 <listitem><para>is a symbolic link to <command>nail</command>.</para>
-<indexterm zone="nail-package nail-mailx">
-<primary sortas="g-mailx-nail">mailx</primary></indexterm>
+<indexterm zone="nail-package mailx-nail">
+<primary sortas="g-mailx">mailx</primary></indexterm>
 </listitem>
 </varlistentry>
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ basicnet/netutils/whois.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -21,5 +21,5 @@
 <title>Whois-&whois-version;</title>
 <indexterm zone="whois-package">
-<primary sortas="a-whois-package">Whois</primary></indexterm>
+<primary sortas="a-Whois">Whois</primary></indexterm>
 
 <sect2>
Index: general/genutils/tidy.xml
===================================================================
--- general/genutils/tidy.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ general/genutils/tidy.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -21,5 +21,5 @@
 <title>HTML Tidy-&tidy-version;</title>
 <indexterm zone="html-tidy">
-<primary sortas="a-html-tidy">HTML Tidy</primary></indexterm>
+<primary sortas="a-HTML-Tidy">HTML Tidy</primary></indexterm>
 
 <sect2>
Index: general/prog/gcc3.xml
===================================================================
--- general/prog/gcc3.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ general/prog/gcc3.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title><application><acronym>GCC</acronym></application>-&gcc3-version;</title>
 <indexterm zone="gcc3">
-<primary sortas="a-gcc3">GCC-&gcc3-version;</primary></indexterm>
+<primary sortas="a-GCC-3">GCC-&gcc3-version;</primary></indexterm>
 
 <sect2>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ general/prog/ruby.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,6 @@
 <?dbhtml filename="ruby.html"?>
 <title>Ruby-&ruby-version;</title>
-<indexterm zone="ruby-package"><primary sortas="a-Ruby">Ruby</primary></indexterm>
+<indexterm zone="ruby-package">
+<primary sortas="a-Ruby">Ruby</primary></indexterm>
 
 <sect2>
@@ -31,10 +32,14 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&ruby-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&ruby-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&ruby-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&ruby-download-ftp;"/></para></listitem>
 <listitem><para>Download MD5 sum: &ruby-md5sum;</para></listitem>
 <listitem><para>Download size: &ruby-size;</para></listitem>
-<listitem><para>Estimated disk space required: &ruby-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &ruby-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&ruby-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&ruby-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -61,5 +66,4 @@
 make install &amp;&amp;
 make install-doc</command></userinput></screen>
-
 
 </sect2>
@@ -97,5 +101,6 @@
 <listitem><para>is an interpreted scripting language for quick
 and easy object-oriented programming.</para>
-<indexterm zone="ruby-package ruby"><primary sortas="b-ruby">ruby</primary></indexterm>
+<indexterm zone="ruby-package ruby">
+<primary sortas="b-ruby">ruby</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -105,5 +110,6 @@
 <listitem><para>is the interactive interface for
 <application>Ruby</application>.</para>
-<indexterm zone="ruby-package irb"><primary sortas="b-irb">irb</primary></indexterm>
+<indexterm zone="ruby-package irb">
+<primary sortas="b-irb">irb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -113,5 +119,6 @@
 <listitem><para>is Tiny eRuby. It interprets a
 <application>Ruby</application> code embedded text file.</para>
-<indexterm zone="ruby-package erb"><primary sortas="b-erb">erb</primary></indexterm>
+<indexterm zone="ruby-package erb">
+<primary sortas="b-erb">erb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -121,5 +128,6 @@
 <listitem><para>displays documentation from a database on
 <application>Ruby</application> classes, modules and methods.</para>
-<indexterm zone="ruby-package ri"><primary sortas="b-ri">ri</primary></indexterm>
+<indexterm zone="ruby-package ri">
+<primary sortas="b-ri">ri</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -129,10 +137,8 @@
 <listitem><para>contains the <acronym>API</acronym> functions required
 by <application>Ruby</application>.</para>
-<indexterm zone="ruby-package libruby"><primary
-sortas="c-libruby">libruby.so</primary></indexterm>
+<indexterm zone="ruby-package libruby">
+<primary sortas="c-libruby">libruby.so</primary></indexterm>
 </listitem>
 </varlistentry>
-
-
 </variablelist>
 
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ general/prog/tcl.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -19,7 +19,6 @@
 <?dbhtml filename="tcl.html"?>
 <title>Tcl-&tcl-version;</title>
-<indexterm zone="tcl"><primary
-sortas="a-Tcl">Tcl</primary></indexterm>
-
+<indexterm zone="tcl">
+<primary sortas="a-Tcl">Tcl</primary></indexterm>
 
 <sect2>
@@ -125,6 +124,6 @@
 <listitem><para> is a simple shell containing the
 <application>Tcl</application> interpreter.</para>
-<indexterm zone="tcl tclsh"><primary
-sortas="b-tclsh">tclsh</primary></indexterm>
+<indexterm zone="tcl tclsh">
+<primary sortas="b-tclsh">tclsh</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -134,6 +133,6 @@
 <listitem><para>contains the <acronym>API</acronym> functions required
 by <application>Tcl</application>.</para>
-<indexterm zone="tcl libtcl"><primary
-sortas="c-libtcl">libtcl.so</primary></indexterm>
+<indexterm zone="tcl libtcl">
+<primary sortas="c-libtcl">libtcl.so</primary></indexterm>
 </listitem>
 </varlistentry>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ general/prog/tk.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -19,7 +19,6 @@
 <?dbhtml filename="tk.html"?>
 <title>Tk-&tk-version;</title>
-<indexterm zone="tk"><primary
-sortas="a-Tk">Tk</primary></indexterm>
-
+<indexterm zone="tk">
+<primary sortas="a-Tk">Tk</primary></indexterm>
 
 <sect2>
@@ -124,6 +123,6 @@
 <application>Tk</application> toolkit that creates a main window and
 then processes <application>Tcl</application> commands.</para>
-<indexterm zone="tk wish"><primary
-sortas="b-wish">wish</primary></indexterm>
+<indexterm zone="tk wish">
+<primary sortas="b-wish">wish</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -133,6 +132,6 @@
 <listitem><para>contains the <acronym>API</acronym> functions required
 by <application>Tk</application>.</para>
-<indexterm zone="tk libtk"><primary
-sortas="c-libtk">libtk.so</primary></indexterm>
+<indexterm zone="tk libtk">
+<primary sortas="c-libtk">libtk.so</primary></indexterm>
 </listitem>
 </varlistentry>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ general/sysutils/gpm.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -92,5 +92,5 @@
 <sect3 id="gpm-init"><title>gpm init.d script</title>
 <indexterm zone="gpm-package gpm-init">
-<primary sortas="f-GPM-init">gpm</primary></indexterm>
+<primary sortas="f-gpm-init">gpm</primary></indexterm>
 
 <para>Install the <filename>/etc/rc.d/init.d/gpm</filename>
@@ -126,5 +126,5 @@
 <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>
+<primary sortas="e-etc-sysconfig-mouse">/etc/sysconfig/mouse</primary>
 </indexterm>
 </sect3>
Index: postlfs/config/netfs.xml
===================================================================
--- postlfs/config/netfs.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/config/netfs.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -14,5 +14,5 @@
 <title>Configuring for Network Filesystems</title>
 <indexterm zone="postlfs-config-netfs">
-<primary sortas="f-netfs-init">netfs</primary></indexterm>
+<primary sortas="f-netfs">netfs</primary></indexterm>
 
 <para>While <acronym>LFS</acronym> is capable of mounting network file
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/config/profile.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -58,5 +58,5 @@
 <title><filename>/etc/profile</filename></title>
 <indexterm zone="postlfs-config-profile etc-profile-profile">
-<primary sortas="e-etc-profile-profile">/etc/profile</primary>
+<primary sortas="e-etc-profile">/etc/profile</primary>
 </indexterm>
 
@@ -397,6 +397,5 @@
 <title><filename>/etc/bashrc</filename></title>
 <indexterm zone="postlfs-config-profile etc-bashrc-profile">
-<primary 
-sortas="e-etc-bashrc-profile">/etc/bashrc</primary>
+<primary sortas="e-etc-bashrc">/etc/bashrc</primary>
 </indexterm>
 
@@ -447,5 +446,5 @@
 <title><filename>~/.bash_profile</filename></title>
 <indexterm zone="postlfs-config-profile bash_profile-profile">
-<primary sortas="e-AA.bash_profile-profile">~/.bash_profile</primary>
+<primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
 </indexterm>
 
@@ -501,5 +500,5 @@
 <title><filename>~/.bashrc</filename></title>
 <indexterm zone="postlfs-config-profile bashrc-profile">
-<primary sortas="e-AA.bashrc-profile">~/.bashrc</primary>
+<primary sortas="e-AA.bashrc">~/.bashrc</primary>
 </indexterm>
 
@@ -533,5 +532,5 @@
 <title><filename>~/.bash_logout</filename></title>
 <indexterm zone="postlfs-config-profile bash_logout-profile">
-<primary sortas="e-AA.bash_logout-profile">~/.bash_logout</primary>
+<primary sortas="e-AA.bash_logout">~/.bash_logout</primary>
 </indexterm>
 
@@ -556,8 +555,8 @@
 <title><filename>/etc/dircolors</filename></title>
 <indexterm zone="postlfs-config-profile etc-dircolors-profile">
-<primary sortas="e-etc-dircolors-profile">/etc/dircolors</primary>
+<primary sortas="e-etc-dircolors">/etc/dircolors</primary>
 </indexterm>
 <indexterm zone="postlfs-config-profile etc-dircolors-profile">
-<primary sortas="e-AA.dircolors-profile">~/.dircolors</primary>
+<primary sortas="e-AA.dircolors">~/.dircolors</primary>
 </indexterm>
 
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/config/random.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -14,5 +14,5 @@
 <title>Random number generation</title>
 <indexterm zone="postlfs-config-random">
-<primary sortas="f-random-init">random</primary></indexterm>
+<primary sortas="f-random">random</primary></indexterm>
 
 <para>The Linux kernel supplies a random number generator which is accessed
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/config/vimrc.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -14,7 +14,7 @@
 <title>The /etc/vimrc and ~/.vimrc Files</title>
 <indexterm zone="postlfs-config-vimrc">
-<primary sortas="e-etc-vimrc-vimrc">/etc/vimrc</primary></indexterm>
+<primary sortas="e-etc-vimrc">/etc/vimrc</primary></indexterm>
 <indexterm zone="postlfs-config-vimrc">
-<primary sortas="e-AA.vimrc-vimrc">~/.vimrc</primary></indexterm>
+<primary sortas="e-AA.vimrc">~/.vimrc</primary></indexterm>
 
 <para>The <acronym>LFS</acronym> book installs <application>Vim</application>
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/security/cracklib.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -22,6 +22,5 @@
 <title>cracklib-&cracklib-version;</title>
 <indexterm zone="cracklib">
-<primary sortas="a-cracklib">Cracklib</primary></indexterm>
-
+<primary sortas="a-Cracklib">Cracklib</primary></indexterm>
 
 <sect2>
@@ -50,5 +49,6 @@
 url="&patch-root;/cracklib,&cracklib-version;-blfs-1.patch"/></para></listitem>
 <listitem><para>Recommended Patch: <ulink
-url="&patch-root;/cracklib,&cracklib-version;-heimdal-1.patch"/></para></listitem>
+url="&patch-root;/cracklib,&cracklib-version;-heimdal-1.patch"/></para>
+</listitem>
 </itemizedlist>
 
@@ -108,5 +108,4 @@
 <title>Contents</title>
 
-
 <segmentedlist>
 <segtitle>Installed Programs</segtitle>
@@ -126,5 +125,6 @@
 <varlistentry id="libcrack">
 <term><filename class='libraryfile'>libcrack.so</filename></term>
-<listitem><para> libraries provide a fast dictionary lookup method for strong password enforcement.</para>
+<listitem><para> libraries provide a fast dictionary lookup method for strong 
+password enforcement.</para>
 <indexterm zone="cracklib libcrack">
 <primary sortas="c-libcrack">libcrack.so</primary></indexterm>
@@ -133,5 +133,4 @@
 </variablelist>
 
-
 </sect2>
 
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/security/gnupg.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -21,5 +21,5 @@
 <title>GnuPG-&gnupg-version;</title>
 <indexterm zone="gnupg">
-<primary sortas="a-gnupg">GnuPG</primary></indexterm>
+<primary sortas="a-GnuPG">GnuPG</primary></indexterm>
 
 <sect2>
Index: postlfs/security/linux_pam.xml
===================================================================
--- postlfs/security/linux_pam.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/security/linux_pam.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -108,7 +108,12 @@
 </title>
 
-<sect3><title>Config files</title>
-<para><filename>/etc/pam.d/*</filename> or <filename>/etc/pam.conf</filename>
-</para></sect3>
+<sect3 id="pam-config"><title>Config files</title>
+<para><filename>/etc/pam.d/*</filename> or 
+<filename>/etc/pam.conf</filename></para>
+<indexterm zone="Linux_PAM pam-config">
+<primary sortas="e-etc-pam.d">/etc/pam.d/*</primary></indexterm>
+<indexterm zone="Linux_PAM pam-config">
+<primary sortas="e-etc-pam.conf">/etc/pam.conf</primary></indexterm>
+</sect3>
 
 <sect3><title>Configuration Information</title>
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/security/mitkrb.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title><acronym>MIT</acronym> krb5-&mitkrb-version;</title>
 <indexterm zone="mitkrb">
-<primary sortas="a-kerberos-MIT">Kerberos5(MIT)</primary></indexterm>
+<primary sortas="a-Kerberos-MIT">Kerberos5(MIT)</primary></indexterm>
 
 <sect2>
@@ -175,5 +175,4 @@
 
 <sect4><title>Kerberos Configuration</title>
-
 <para>
 Create the Kerberos configuration file with the following command:
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/security/shadow.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -118,5 +118,5 @@
 alternatively, <filename>/etc/pam.conf</filename></para>
 <indexterm zone="shadow pam.d">
-<primary sortas="e-etc-pam.d">/etc/pam.d/</primary></indexterm>
+<primary sortas="e-etc-pam.d">/etc/pam.d/*</primary></indexterm>
 <indexterm zone="shadow pam.d">
 <primary sortas="e-etc-pam.conf">/etc/pam.conf</primary></indexterm>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/security/stunnel.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title>Stunnel-&stunnel-version;</title>
 <indexterm zone="stunnel-package">
-<primary sortas="a-Stunnel-package">Stunnel</primary></indexterm>
+<primary sortas="a-Stunnel">Stunnel</primary></indexterm>
 
 <sect2>
Index: postlfs/shells/ash.xml
===================================================================
--- postlfs/shells/ash.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/shells/ash.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -85,7 +85,7 @@
 
 <indexterm zone="ash-package ash-config">
-<primary sortas="e-etc-profile-ash">/etc/profile</primary></indexterm>
+<primary sortas="e-etc-profile">/etc/profile</primary></indexterm>
 <indexterm zone="ash-package ash-config">
-<primary sortas="e-Ahome-.profile-ash">$HOME/.profile</primary></indexterm>
+<primary sortas="e-AHOME-.profile">$HOME/.profile</primary></indexterm>
 </sect3>
 
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/shells/tcsh.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -21,5 +21,5 @@
 <title>Tcsh-&tcsh-version;</title>
 <indexterm zone="tcsh-package">
-<primary sortas="a-Tcsh-package">Tcsh</primary></indexterm>
+<primary sortas="a-Tcsh">Tcsh</primary></indexterm>
 
 <sect2>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ postlfs/shells/zsh.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -21,5 +21,5 @@
 <title>ZSH-&zsh-version;</title>
 <indexterm zone="zsh-package">
-<primary sortas="a-ZSH-package">ZSH</primary></indexterm>
+<primary sortas="a-ZSH">ZSH</primary></indexterm>
 
 <sect2>
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ pst/typesetting/jadetex.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title>JadeTeX-&jadetex-version;</title>
 <indexterm zone="jadetex-package">
-<primary sortas="a-jadetex-package">JadeTeX</primary></indexterm>
+<primary sortas="a-JadeTeX">JadeTeX</primary></indexterm>
 
 <sect2>
Index: pst/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ pst/typesetting/tex.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -22,5 +22,5 @@
 <title>TeX-&tex-version;</title>
 <indexterm zone="tex">
-<primary sortas="a-tex">TeX</primary></indexterm>
+<primary sortas="a-TeX">TeX</primary></indexterm>
 
 <sect2>
@@ -184,5 +184,5 @@
 a tour of the expansive <application>TeX</application> documentation.</para>
 <indexterm zone="tex tex-programs">
-<primary sortas="b-tex-programs">TeX programs</primary></indexterm>
+<primary sortas="b-TeX-programs">TeX programs</primary></indexterm>
 </listitem>
 </varlistentry>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ server/mail/sendmail.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title>Sendmail-&sendmail-version;</title>
 <indexterm zone="sendmail-package">
-<primary sortas="a-sendmail-package">Sendmail</primary></indexterm>
+<primary sortas="a-Sendmail">Sendmail</primary></indexterm>
 
 <sect2>
@@ -249,9 +249,9 @@
 </varlistentry>
 
-<varlistentry id="mailq">
+<varlistentry id="mailq-sendmail">
 <term><command>mailq</command></term>
 <listitem><para>prints a summary of outbound mail messages waiting for 
 delivery.</para>
-<indexterm zone="sendmail-package mailq">
+<indexterm zone="sendmail-package mailq-sendmail">
 <primary sortas="b-mailq">mailq</primary></indexterm>
 </listitem>
@@ -266,9 +266,9 @@
 </varlistentry>
 
-<varlistentry id="newaliases">
+<varlistentry id="newaliases-sendmail">
 <term><command>newaliases</command></term>
 <listitem><para>rebuilds <filename>/etc/mail/aliases.db</filename> from the 
 contents of <filename>/etc/mail/aliases</filename>.</para>
-<indexterm zone="sendmail-package newaliases">
+<indexterm zone="sendmail-package newaliases-sendmail">
 <primary sortas="b-newaliases">newaliases</primary></indexterm>
 </listitem>
@@ -293,9 +293,9 @@
 </varlistentry>
 
-<varlistentry id="sendmail">
+<varlistentry id="sendmail-sendmail">
 <term><command>sendmail</command></term>
 <listitem><para>is the <application>Sendmail</application> mail transport 
 agent.</para>
-<indexterm zone="sendmail-package sendmail">
+<indexterm zone="sendmail-package sendmail-sendmail">
 <primary sortas="b-sendmail">sendmail</primary></indexterm>
 </listitem>
@@ -311,8 +311,8 @@
 </varlistentry>
 
-<varlistentry id="vacation">
+<varlistentry id="vacation-sendmail">
 <term><command>vacation</command></term>
 <listitem><para>is an email auto responder.</para>
-<indexterm zone="sendmail-package vacation">
+<indexterm zone="sendmail-package vacation-sendmail">
 <primary sortas="b-vacation">vacation</primary></indexterm>
 </listitem>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ template/template.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -25,5 +25,5 @@
 <title><application>TEMPLATE</application>-&TEMPLATE-version;</title>
 <indexterm zone="TEMPLATE-package">
-<primary sortas="a-TEMPLATE-package">TEMPLATE</primary></indexterm>
+<primary sortas="a-TEMPLATE">TEMPLATE</primary></indexterm>
 
 <sect2>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 915eda5a8751b832c4b83eddb2782a3aadbb06be)
+++ x/wm/fluxbox.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -60,12 +60,17 @@
 </sect2>
 
-
 <sect2>
 <title>Configuring <application>Fluxbox</application></title>
 
-<sect3><title>Config files</title>
+<sect3 id="fluxbox-config"><title>Config files</title>
 <para><filename>~/.fluxbox/init</filename>,
 <filename>~/.fluxbox/keys</filename>,
 <filename>~/.fluxbox/menu</filename></para>
+<indexterm zone="fluxbox-package fluxbox-config">
+<primary sortas="e-AA.fluxbox-init">~/.fluxbox/init</primary></indexterm>
+<indexterm zone="fluxbox-package fluxbox-config">
+<primary sortas="e-AA.fluxbox-keys">~/.fluxbox/keys</primary></indexterm>
+<indexterm zone="fluxbox-package fluxbox-config">
+<primary sortas="e-AA.fluxbox-menu">~/.fluxbox/menu</primary></indexterm>
 </sect3>
 
@@ -97,6 +102,7 @@
 <segtitle>Installed Directory</segtitle>
 <seglistitem>
-<seg>fluxbox, fbsetbg, bsetroot, fluxbox-generate_menu, startfluxbox, and fbrun</seg>
-<seg>/usr/share/fluxbox</seg></seglistitem>
+<seg>fluxbox, fbsetbg, bsetroot, fluxbox-generate_menu, startfluxbox, and 
+fbrun</seg>
+<seg>/usr/share/fluxbox and ~/.fluxbox</seg></seglistitem>
 </segmentedlist>
 
@@ -107,7 +113,8 @@
 <varlistentry id="fluxbox">
 <term><command>fluxbox</command></term>
-<listitem><para>is a window manager for <application>X11
-</application> based on <application>Blackbox</application> 0.61.0.</para>
-<indexterm zone="fluxbox-package fluxbox"><primary sortas="b-fluxbox">fluxbox</primary></indexterm>
+<listitem><para>is a window manager for <application>X11</application> based 
+on <application>Blackbox</application> 0.61.0.</para>
+<indexterm zone="fluxbox-package fluxbox">
+<primary sortas="b-fluxbox">fluxbox</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -119,6 +126,6 @@
 <command>wmsetbg</command>, <command>xv</command>,
 <command>qiv</command> or <command>xsri</command> to be used.</para>
-<indexterm zone="fluxbox-package fbsetbg"><primary
-sortas="b-fbsetbg">fbsetbg</primary></indexterm>
+<indexterm zone="fluxbox-package fbsetbg">
+<primary sortas="b-fbsetbg">fbsetbg</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -128,6 +135,6 @@
 <listitem><para>is a <application>Blackbox</application> 
 utility to change root window appearance.</para>
-<indexterm zone="fluxbox-package bsetroot"><primary
-sortas="b-bsetroot">bsetroot</primary></indexterm>
+<indexterm zone="fluxbox-package bsetroot">
+<primary sortas="b-bsetroot">bsetroot</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -136,6 +143,6 @@
 <term><command>fluxbox-generate_menu</command></term>
 <listitem><para> is a menu maker utility.</para>
-<indexterm zone="fluxbox-package fluxbox-generate"><primary
-sortas="b-fluxbox-generate">fluxbox-generate_menu</primary></indexterm>
+<indexterm zone="fluxbox-package fluxbox-generate">
+<primary sortas="b-fluxbox-generate">fluxbox-generate_menu</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -144,7 +151,8 @@
 <term><command>startfluxbox</command></term>
 <listitem><para> is a session startup script that
-allows for command executions prior to <command>fluxbox</command> starting.</para>
-<indexterm zone="fluxbox-package startfluxbox"><primary
-sortas="b-startfluxbox">startfluxbox</primary></indexterm>
+allows for command executions prior to <command>fluxbox</command> 
+starting.</para>
+<indexterm zone="fluxbox-package startfluxbox">
+<primary sortas="b-startfluxbox">startfluxbox</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -153,6 +161,6 @@
 <term><command>fbrun</command></term>
 <listitem><para> displays a run dialog window.</para>
-<indexterm zone="fluxbox-package fbrun"><primary
-sortas="b-fbrun">fbrun</primary></indexterm>
+<indexterm zone="fluxbox-package fbrun">
+<primary sortas="b-fbrun">fbrun</primary></indexterm>
 </listitem>
 </varlistentry>
