Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision d5d65544595f65e0cc1a13622c9a663ab5be1a3b)
+++ 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 d5d65544595f65e0cc1a13622c9a663ab5be1a3b)
+++ 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 d5d65544595f65e0cc1a13622c9a663ab5be1a3b)
+++ 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 d5d65544595f65e0cc1a13622c9a663ab5be1a3b)
+++ 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 d5d65544595f65e0cc1a13622c9a663ab5be1a3b)
+++ 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 d5d65544595f65e0cc1a13622c9a663ab5be1a3b)
+++ 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>
 
