Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ basicnet/mailnews/nail.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -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-package">Nail</primary></indexterm>
 
 <sect2>
@@ -97,9 +97,9 @@
 <filename>~/.nailrc</filename></para>
 <indexterm zone="nail-package nail-config">
-<primary sortas="e-nail.rc">/etc/nail.rc</primary></indexterm>
+<primary sortas="e-etc-nail.rc">/etc/nail.rc</primary></indexterm>
 <indexterm zone="nail-package nail-config">
-<primary sortas="e-nail-mailrc">~/.mailrc</primary></indexterm>
+<primary sortas="e-AA.mailrc">~/.mailrc</primary></indexterm>
 <indexterm zone="nail-package nail-config">
-<primary sortas="e-nail-nailrc">~/.nailrc</primary></indexterm>
+<primary sortas="e-AA.nailrc">~/.nailrc</primary></indexterm>
 </sect3>
 
@@ -135,5 +135,5 @@
 <listitem><para>is a symbolic link to <command>nail</command>.</para>
 <indexterm zone="nail-package nail-mail">
-<primary sortas="g-nail-mail">mail</primary></indexterm>
+<primary sortas="g-mail-nail">mail</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -143,5 +143,5 @@
 <listitem><para>is a symbolic link to <command>nail</command>.</para>
 <indexterm zone="nail-package nail-mailx">
-<primary sortas="g-nail-mailx">mailx</primary></indexterm>
+<primary sortas="g-mailx-nail">mailx</primary></indexterm>
 </listitem>
 </varlistentry>
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ postlfs/security/mitkrb.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -159,5 +159,7 @@
 </para>
 <indexterm zone="mitkrb krb5-config">
-<primary sortas="e-kerberos-config">/etc/krb5.conf</primary>
+<primary sortas="e-etc-krb5.conf">/etc/krb5.conf</primary></indexterm>
+<indexterm zone="mitkrb krb5-config">
+<primary sortas="e-var-lib-krb5kdc-kdc.conf">/var/lib/krb5kdc/kdc.conf</primary>
 </indexterm>
 </sect3>
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ postlfs/security/shadow.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -51,5 +51,6 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Patch to fix linking against PAM:
-<ulink url="&patch-root;/shadow-&shadow-version;-pam-1.patch"/></para></listitem>
+<ulink url="&patch-root;/shadow-&shadow-version;-pam-1.patch"/></para>
+</listitem>
 </itemizedlist>
 </sect3>
@@ -105,6 +106,6 @@
 
 <sect2>
-<title>Configuring <application>Linux-<acronym>PAM</acronym></application> to work 
-with <application>Shadow</application></title>
+<title>Configuring <application>Linux-<acronym>PAM</acronym></application> to 
+work with <application>Shadow</application></title>
 
 <sect3 id="pam.d"><title>Config files</title>
@@ -117,7 +118,7 @@
 alternatively, <filename>/etc/pam.conf</filename></para>
 <indexterm zone="shadow pam.d">
-<primary sortas="e-pam-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-pam-pam.conf">/etc/pam.conf</primary></indexterm>
+<primary sortas="e-etc-pam.conf">/etc/pam.conf</primary></indexterm>
 </sect3>
 
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ postlfs/security/stunnel.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -20,5 +20,5 @@
 <title>Stunnel-&stunnel-version;</title>
 <indexterm zone="stunnel-package">
-<primary sortas="a-Stunnel">Stunnel</primary></indexterm>
+<primary sortas="a-Stunnel-package">Stunnel</primary></indexterm>
 
 <sect2>
@@ -128,5 +128,5 @@
 <para><filename>/etc/stunnel/stunnel.conf</filename></para>
 <indexterm zone="stunnel-package stunnel-config">
-<primary sortas="e-stunnel-config">/etc/stunnel/stunnel.conf</primary>
+<primary sortas="e-etc-stunnel-stunnel.conf">/etc/stunnel/stunnel.conf</primary>
 </indexterm>
 </sect3>
Index: postlfs/shells/ash.xml
===================================================================
--- postlfs/shells/ash.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ postlfs/shells/ash.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -21,5 +21,5 @@
 <title>ASH-&ash-version;</title>
 <indexterm zone="ash-package">
-<primary sortas="a-ash-package">ASH</primary></indexterm>
+<primary sortas="a-ASH-package">ASH</primary></indexterm>
 
 <sect2>
@@ -85,7 +85,7 @@
 
 <indexterm zone="ash-package ash-config">
-<primary sortas="e-ash-etc-profile">/etc/profile</primary></indexterm>
+<primary sortas="e-etc-profile-ash">/etc/profile</primary></indexterm>
 <indexterm zone="ash-package ash-config">
-<primary sortas="e-ash-home-profile">$HOME/.profile</primary></indexterm>
+<primary sortas="e-Ahome-.profile-ash">$HOME/.profile</primary></indexterm>
 </sect3>
 
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ postlfs/shells/tcsh.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -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-package">Tcsh</primary></indexterm>
 
 <sect2>
@@ -89,21 +89,21 @@
 
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-etc-csh.cshrc">/etc/csh.cshrc</primary></indexterm>
+<primary sortas="e-etc-csh.cshrc">/etc/csh.cshrc</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-etc-csh.login">/etc/csh.login</primary></indexterm>
+<primary sortas="e-etc-csh.login">/etc/csh.login</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-etc-csh.logout">/etc/csh.logout</primary></indexterm>
+<primary sortas="e-etc-csh.logout">/etc/csh.logout</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-.tcshrc">~/.tcshrc</primary></indexterm>
+<primary sortas="e-AA.tcshrc">~/.tcshrc</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-.cshrc">~/.cshrc</primary></indexterm>
+<primary sortas="e-AA.cshrc">~/.cshrc</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-.history">~/.history</primary></indexterm>
+<primary sortas="e-AA.history">~/.history</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-.cshdirs">~/.cshdirs</primary></indexterm>
+<primary sortas="e-AA.cshdirs">~/.cshdirs</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-.login">~/.login</primary></indexterm>
+<primary sortas="e-AA.login">~/.login</primary></indexterm>
 <indexterm zone="tcsh-package tcsh-config">
-<primary sortas="e-tcsh-.logout">~/.logout</primary></indexterm>
+<primary sortas="e-AA.logout">~/.logout</primary></indexterm>
 </sect3>
 
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ postlfs/shells/zsh.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -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-package">ZSH</primary></indexterm>
 
 <sect2>
@@ -80,13 +80,13 @@
 
 <indexterm zone="zsh-package zsh-config">
-<primary sortas="e-zsh-zshenv">/etc/zshenv</primary></indexterm>
+<primary sortas="e-etc-zshenv">/etc/zshenv</primary></indexterm>
 <indexterm zone="zsh-package zsh-config">
-<primary sortas="e-zsh-zprofile">/etc/zprofile</primary></indexterm>
+<primary sortas="e-etc-zprofile">/etc/zprofile</primary></indexterm>
 <indexterm zone="zsh-package zsh-config">
-<primary sortas="e-zsh-zshrc">/etc/zshrc</primary></indexterm>
+<primary sortas="e-etc-zshrc">/etc/zshrc</primary></indexterm>
 <indexterm zone="zsh-package zsh-config">
-<primary sortas="e-zsh-zlogin">/etc/zlogin</primary></indexterm>
+<primary sortas="e-etc-zlogin">/etc/zlogin</primary></indexterm>
 <indexterm zone="zsh-package zsh-config">
-<primary sortas="e-zsh-zlogout">/etc/zlogout</primary></indexterm>
+<primary sortas="e-etc-zlogout">/etc/zlogout</primary></indexterm>
 </sect3>
 
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ pst/ps/fop.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -21,5 +21,5 @@
 <title><application><acronym>FOP</acronym></application>-&fop-version;</title>
 <indexterm zone="fop-package">
-<primary sortas="a-FOP">FOP</primary></indexterm>
+<primary sortas="a-FOP-package">FOP</primary></indexterm>
 
 <sect2>
@@ -227,5 +227,5 @@
 <para><filename>~/.foprc</filename></para>
 <indexterm zone="fop-package fop-config">
-<primary sortas="e-fop-config">~/.foprc</primary></indexterm>
+<primary sortas="e-AA.foprc">~/.foprc</primary></indexterm>
 </sect3>
 
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ pst/xml/docbook-xsl.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -100,5 +100,5 @@
 <para><filename>/etc/xml/catalog</filename></para>
 <indexterm zone="docbook-xsl docbook-xsl-config"><primary
-sortas="e-docbook-catalog">catalog</primary></indexterm>
+sortas="e-etc-xml-catalog-docbook-xsl">/etc/xml/catalog</primary></indexterm>
 </sect3>
 
Index: pst/xml/docbook.xml
===================================================================
--- pst/xml/docbook.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ pst/xml/docbook.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -32,9 +32,13 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&DocBook-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&DocBook-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&DocBook-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&DocBook-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &DocBook-size;</para></listitem>
-<listitem><para>Estimated disk space required: &DocBook-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &DocBook-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&DocBook-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&DocBook-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -126,7 +130,7 @@
 <filename>/etc/xml/docbook</filename></para>
 <indexterm zone="DocBook docbook-config"><primary
-sortas="e-docbook-catalog">/etc/xml/docbook</primary></indexterm>
+sortas="e-etc-xml-docbook-docbook-xml">/etc/xml/docbook</primary></indexterm>
 <indexterm zone="DocBook docbook-config"><primary
-sortas="e-docbook-catalog">/etc/xml/catalog</primary></indexterm>
+sortas="e-etc-xml-catalog-docbook-xml">/etc/xml/catalog</primary></indexterm>
 </sect3>
 
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ server/mail/sendmail.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -149,5 +149,5 @@
 <para><filename>/etc/mail/*</filename></para>
 <indexterm zone="sendmail-package sendmail-config">
-<primary sortas="e-sendmail-config">/etc/mail/*</primary></indexterm>
+<primary sortas="e-etc-mail-sendmail">/etc/mail/*</primary></indexterm>
 </sect3>
 
Index: template/template.xml
===================================================================
--- template/template.xml	(revision c284cd25184f15e09b2e2dfbaee3f2c6773500ee)
+++ template/template.xml	(revision 0cd6d67227aa27329e76ef8d217abc0c5f16bd60)
@@ -97,12 +97,12 @@
 
 <sect3 id="TEMPLATE-config"><title>Config files</title>
-<para><filename>/path/to/Configfilename1</filename> and 
-<filename>/path/to/Configfilename2</filename></para>
+<para><filename>~/.Configfilename1</filename> and 
+<filename>/etc/path/Configfilename2</filename></para>
 
 <indexterm zone="TEMPLATE-package TEMPLATE-config">
-<primary sortas="e-SomeUniqueName1">/path/to/Configfilename1</primary>
+<primary sortas="e-AA.Configfilename1">/path/to/Configfilename1</primary>
 </indexterm>
 <indexterm zone="TEMPLATE-package TEMPLATE-config">
-<primary sortas="e-SomeUniqueName2">/path/to/Configfilename2</primary>
+<primary sortas="e-etc-path-Configfilename2">/path/to/Configfilename2</primary>
 </indexterm>
 </sect3>
