From 97b53b5da151c02173259306f5ae4a375be96766 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Mon, 10 Jan 2005 18:49:09 +0000
Subject: [PATCH] Added index tags to the ASH instructions; updated template

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3245 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/j2sdk.xml             |  3 +-
 introduction/welcome/changelog.xml |  4 +-
 postlfs/shells/ash.xml             | 66 +++++++++++++++++++-----------
 template/template.xml              |  2 +-
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/general/prog/j2sdk.xml b/general/prog/j2sdk.xml
index d896a99afa..61f84ecc6c 100644
--- a/general/prog/j2sdk.xml
+++ b/general/prog/j2sdk.xml
@@ -84,7 +84,8 @@ url="&j2sdk-download-ftp;"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_debug_image-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_fixed_paths-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-static_cxx-1.patch"/></para></listitem>
-<listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-ash-1.patch"/> (Only required if /bin/sh is symlinked to <xref linkend="ash"/>)</para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-ash-1.patch"/> 
+(Only required if /bin/sh is symlinked to <xref linkend="ash-package"/>)</para></listitem>
 </itemizedlist>
 </sect3>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 94a67f1b06..c3d1dc2c36 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -25,8 +25,8 @@ who wrote what.</para>
 <listitem><para>January 10th, 2005 [igor]: Updated to
 OpenLDAP-2.2.20.</para></listitem>
 
-<listitem><para>January 10th, 2005 [randy]: Updated to
-Sendmail-8.13.2.</para></listitem>
+<listitem><para>January 10th, 2005 [randy]: Updated to Sendmail-8.13.2; 
+added index tags to the ASH instructions.</para></listitem>
 
 <listitem><para>January 9th, 2005 [larry]: Updated to
 GnuPG-1.4.0.</para></listitem>
diff --git a/postlfs/shells/ash.xml b/postlfs/shells/ash.xml
index 9cc6d7c07c..8a1f8723c6 100644
--- a/postlfs/shells/ash.xml
+++ b/postlfs/shells/ash.xml
@@ -8,29 +8,31 @@
 <!ENTITY ash-download-http " ">
 <!ENTITY ash-download-ftp "ftp://distro.ibiblio.org/pub/Linux/distributions/slackware/slackware_source/ap/ash/ash-&ash-version;.tar.gz">
 <!ENTITY ash-size "118 KB">
-<!ENTITY ash-buildsize "2.7 MB">
+<!ENTITY ash-buildsize "2.2 MB">
 <!ENTITY ash-time "0.06 SBU">
-
 ]>
 
-<sect1 id="ash" xreflabel="ASH-&ash-version;">
+<sect1 id="ash-package" xreflabel="ASH-&ash-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="ash.html"?>
 <title>ASH-&ash-version;</title>
+<indexterm zone="ash-package">
+<primary sortas="a-ash-package">ASH</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>ASH</application></title>
 
-<para><command>ash</command> is a shell that is the most compliant with the
-Bourne Shell (not to be confused with Bourne Again SHell i.e., <application>Bash</application>
-installed in <acronym>LFS</acronym>) without any additional features.
-Bourne Shell is available on most commercial
-<acronym>UNIX</acronym> systems. Hence <command>ash</command> is useful for testing
-scripts to be <command>sh</command>-compliant. It also has a small memory and space requirements
-compared to the other <command>sh</command>-compliant shells.</para>
+<para><command>ash</command> is a shell that is the most compliant with the 
+Bourne Shell (not to be confused with Bourne Again SHell i.e., 
+<application>Bash</application> installed in <acronym>LFS</acronym>) without 
+any additional features. Bourne Shell is available on most commercial
+<acronym>UNIX</acronym> systems. Hence <command>ash</command> is useful for 
+testing scripts to be <command>sh</command>-compliant. It also has a small 
+memory and space requirements compared to the other 
+<command>sh</command>-compliant shells.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -48,7 +50,8 @@ url="&ash-download-ftp;"/></para></listitem>
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink 
-url="&patch-root;/ash-&ash-version;-cumulative_fixes-1.patch"/></para></listitem>
+url="&patch-root;/ash-&ash-version;-cumulative_fixes-1.patch"/></para>
+</listitem>
 </itemizedlist>
 </sect3>
 
@@ -57,14 +60,16 @@ url="&patch-root;/ash-&ash-version;-cumulative_fixes-1.patch"/></para></listitem
 <sect2>
 <title>Installation of <application>ASH</application></title>
 
-<para>Install <application>ASH</application> by running the following commands:</para>
+<para>Install <application>ASH</application> by running the following 
+commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../ash-0.4.0-cumulative_fixes-1.patch &amp;&amp;
 make &amp;&amp;
 install -m 755 sh /bin/ash &amp;&amp;
 install -m 644 sh.1 /usr/share/man/man1/ash.1</command></userinput></screen>
 
-<para>If you would like to make <command>ash</command> the default sh shell, make a symlink.</para>
+<para>If you would like to make <command>ash</command> the default sh shell, 
+make a symlink.</para>
 
 <screen><userinput><command>ln -sf ash /bin/sh</command></userinput></screen>
 
@@ -74,25 +79,38 @@ install -m 644 sh.1 /usr/share/man/man1/ash.1</command></userinput></screen>
 <title>Configuring <application>ASH</application></title>
 
 <sect3><title>Config files</title>
-<para><application>ASH</application> sources <filename>/etc/profile</filename>
-and <filename>$HOME/.profile</filename></para>
+<para><application>ASH</application> sources 
+<filename id="ash-etc-profile">/etc/profile</filename> 
+<indexterm zone="ash-package ash-etc-profile">
+<primary sortas="e-ash-etc-profile">/etc/profile</primary></indexterm>
+and <filename id="ash-home-profile">$HOME/.profile</filename></para>
+<indexterm zone="ash-package ash-home-profile">
+<primary sortas="e-ash-home-profile">$HOME/.profile</primary></indexterm>
 </sect3>
 
 </sect2>
 
 <sect2>
 <title>Contents</title>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<seglistitem>
+<seg>ash</seg>
+</seglistitem>
+</segmentedlist>
 
-<para>The <application>ASH</application> package contains <command>ash</command>,
-a <command>sh</command> compliant shell.</para>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>ash</title>
-<para><command>ash</command> is a <command>sh</command>-compliant shell.</para>
-</sect3>
+<varlistentry id="ash">
+<term><command>ash</command></term>
+<listitem><para>is a <command>sh</command>-compliant shell.</para>
+<indexterm zone="ash-package ash">
+<primary sortas="b-ash">ash</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
diff --git a/template/template.xml b/template/template.xml
index 424ee5b058..e8535eeacb 100644
--- a/template/template.xml
+++ b/template/template.xml
@@ -24,7 +24,7 @@
 <?dbhtml filename="TEMPLATE.html"?>
 <title><application>TEMPLATE</application>-&TEMPLATE-version;</title>
 <indexterm zone="TEMPLATE-package">
-<primary sortas="a-TEMPLATE">TEMPLATE</primary></indexterm>
+<primary sortas="a-TEMPLATE-package">TEMPLATE</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>TEMPLATE</application></title>