diff --git a/postlfs/editors/ed.xml b/postlfs/editors/ed.xml
index 5fac6b21d0..8ba35f5301 100644
--- a/postlfs/editors/ed.xml
+++ b/postlfs/editors/ed.xml
@@ -19,6 +19,9 @@
 </sect1info>
 <?dbhtml filename="ed.html"?>
 <title>Ed-&ed-version;</title>
+<indexterm zone="ed"><primary
+sortas="a-Ed">Ed</primary></indexterm>
+
 
 <sect2>
 <title>Introduction to <application>Ed</application></title>
@@ -70,8 +73,11 @@ files:</para>
 commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --exec-prefix="" &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
 
@@ -89,24 +95,36 @@ unavailable.</para>
 <sect2>
 <title>Contents</title>
 
-<para>The <application>Ed</application> package contains
-<command>ed</command> and
-<command>red</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<seglistitem>
+<seg>ed and red</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="ed-prog">
+<term><filename>ed</filename></term>
+<listitem><para>is a line-oriented text editor.</para>
+<indexterm zone="ed ed-prog">
+<primary sortas="b-ed">ed</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>ed</title>
-<para><command>ed</command>
-is a line-oriented text editor.
-</para></sect3>
+<varlistentry id="red">
+<term><filename>red</filename></term>
+<listitem><para>is a restricted ed&mdash;it can only edit files in the
+current directory and cannot execute shell commands.
+</para>
+<indexterm zone="ed red">
+<primary sortas="b-red">red</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>red</title>
-<para><command>red</command>
-is a restricted ed&mdash;it can only edit files in the current directory
-and cannot execute shell commands.
-</para></sect3>
+</variablelist>
 
 </sect2>
 
diff --git a/postlfs/editors/joe.xml b/postlfs/editors/joe.xml
index da424a447d..157c7f41b2 100644
--- a/postlfs/editors/joe.xml
+++ b/postlfs/editors/joe.xml
@@ -12,13 +12,15 @@
   <!ENTITY joe-time          "0.11 SBU">
 ]>
 
-<sect1 id="postlfs-editors-joe">
+<sect1 id="joe">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="joe.html"?>
 <title>JOE-&joe-version;</title>
+<indexterm zone="joe"><primary
+sortas="a-JOE">JOE</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application><acronym>JOE</acronym></application></title>
@@ -50,68 +52,121 @@ url="&joe-download-ftp;"/></para></listitem>
 following commands:</para>
 
 <screen><userinput><command>./configure --sysconfdir=/etc --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
 
 <sect2>
 <title>Configuration files</title>
 
-<para><application><acronym>JOE</acronym></application> can make use of 
-several configuration files. Information about these files may be found in the 
-joe man page. These files are <filename>/etc/jmacsrc</filename>, 
-<filename>/etc/joerc</filename>, <filename>/etc/jpicorc</filename>, 
-<filename>/etc/jstarrc</filename>, and <filename>/etc/rjoerc</filename>. 
-<application><acronym>JOE</acronym></application> can also make use of
-<filename>~/.joerc</filename>, which may be copied from
-<filename>/etc/joerc</filename> and customized for each user's
-taste.</para>
+<sect3 id="joe-config"><title>Config files</title>
+<para><filename>/etc/jmacsrc</filename>,
+<filename>/etc/joerc</filename>, <filename>/etc/jpicorc</filename>,
+<filename>/etc/jstarrc</filename>, <filename>/etc/rjoerc</filename>,
+<filename>~/.joerc</filename></para>
+<indexterm zone="joe joe-config">
+<primary sortas="e-etc-jmacsrc">/etc/jmacsrcrc</primary>
+</indexterm>
+<indexterm zone="joe joe-config">
+<primary sortas="e-etc-joerc">/etc/joerc</primary>
+</indexterm>
+<indexterm zone="joe joe-config">
+<primary sortas="e-etc-jpicorc">/etc/jpicorc</primary>
+</indexterm>
+<indexterm zone="joe joe-config">
+<primary sortas="e-etc-jstarrc">/etc/jstarrc</primary>
+</indexterm>
+<indexterm zone="joe joe-config">
+<primary sortas="e-etc-rjoerc">/etc/rjoerc</primary>
+</indexterm>
+<indexterm zone="joe joe-config">
+<primary sortas="e-AA.joerc">~/.joerc</primary>
+</indexterm>
+</sect3>
 
 </sect2>
 
 <sect2>
 <title>Contents</title>
 
-<para>The <application><acronym>JOE</acronym></application> package contains 
-<command>jmacs</command>,
-<command>joe</command>, <command>jpico</command>,
-<command>jstar</command>, <command>rjoe</command> and
-<command>termidx</command>.</para>
-</sect2>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Directory</segtitle>
+<seglistitem>
+<seg>jmacs, joe, jpico, jstar, rjoe and termidx</seg>
+<seg>/etc/joe</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>jmacs</title>
-<para><command>jmacs</command> is a symbolic link to
+<varlistentry id="jmacs">
+<term><filename>jmacs</filename></term>
+<listitem><para>is a symbolic link to
 <command>joe</command> used to launch <application>Emacs</application>
-emulation mode.</para></sect3>
+emulation mode.</para>
+<indexterm zone="joe jmacs">
+<primary sortas="b-jmacs">jmacs</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>joe</title>
-<para><command>joe</command> is a small text editor capable of emulating
+<varlistentry id="joe-prog">
+<term><filename>joe</filename></term>
+<listitem><para>is a small text editor capable of emulating
 WordStar, <application>Pico</application>, and
-<application>Emacs</application>.</para></sect3>
+<application>Emacs</application>.</para>
+<indexterm zone="joe joe-prog">
+<primary sortas="b-joe">joe</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>jpico</title>
-<para><command>jpico</command> is a symbolic link to
+<varlistentry id="jpico">
+<term><filename>jpico</filename></term>
+<listitem><para>is a symbolic link to
 <command>joe</command> used to launch <application>Pico</application>
-emulation mode.</para></sect3>
+emulation mode.</para>
+<indexterm zone="joe jpico">
+<primary sortas="b-jpico">jpico</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>jstar</title>
-<para><command>jstar</command> is a symbolic link to
+<varlistentry id="jstar">
+<term><filename>jstar</filename></term>
+<listitem><para>is a symbolic link to
 <command>joe</command> used to launch WordStar
-emulation mode.</para></sect3>
+emulation mode.</para>
+<indexterm zone="joe jstar">
+<primary sortas="b-jstar">jstar</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>rjoe</title>
-<para><command>rjoe</command> is a symbolic link to
+<varlistentry id="rjoe">
+<term><filename>rjoe</filename></term>
+<listitem><para>is a symbolic link to
 <command>joe</command> that restricts
 <application><acronym>JOE</acronym></application> to editing
-only files which are specified on the command-line.</para></sect3>
+only files which are specified on the command-line.</para>
+<indexterm zone="joe rjoe">
+<primary sortas="b-rjoe">rjoe</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>termidx</title>
-<para><command>termidx</command> is a program used by
-<command>joe</command> to generate the termcap index
-file.</para></sect3>
+<varlistentry id="termidx">
+<term><filename>termidx</filename></term>
+<listitem><para>is a program used by
+<command>joe</command> to generate the termcap index file.</para>
+<indexterm zone="joe termidx">
+<primary sortas="b-termidx">termidx</primary></indexterm>
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
 
diff --git a/postlfs/editors/nano.xml b/postlfs/editors/nano.xml
index 633cf02439..7e2b687334 100644
--- a/postlfs/editors/nano.xml
+++ b/postlfs/editors/nano.xml
@@ -105,8 +105,10 @@ configurations and has some documentation included in the comments.</para>
 
 <segmentedlist>
 <segtitle>Installed Programs</segtitle>
+<segtitle>Installed Directory</segtitle>
 <seglistitem>
 <seg>nano</seg>
+<seg>/usr/share/doc/nano</seg>
 </seglistitem>
 </segmentedlist>