Index: general/prog/expect.xml
===================================================================
--- general/prog/expect.xml	(revision 233a4f4399cbf323c0d7a6eed2c7e26d106c886f)
+++ general/prog/expect.xml	(revision ffcbd0dbe9de803fa2db90437237dc17443a6d65)
@@ -20,4 +20,6 @@
 <?dbhtml filename="expect.html"?>
 <title>Expect-&expect-version;</title>
+<indexterm zone="expect">
+<primary sortas="a-Expect">Expect</primary></indexterm>
 
 <sect2>
@@ -54,5 +56,4 @@
 
 <sect3><title><application>Expect</application> dependencies</title>
-
 <sect4><title>Required</title>
 <para><xref linkend="tcl"/></para>
@@ -75,6 +76,9 @@
 ./configure --prefix=/usr --with-tcl=/usr/lib \
     --with-tclinclude=/usr/include/tcl8.4 --enable-shared &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 ln -sf ../libexpect5.42.a /usr/lib/expect5.42</command></userinput></screen>
 
@@ -98,15 +102,20 @@
 <title>Configuring <application>Expect</application></title>
 
-<sect3><title>Config files</title>
+<sect3 id="expect-config"><title>Config files</title>
 <para><filename>$exp_library/expect.rc</filename> and 
 <filename>~/.expect.rc</filename></para>
+<indexterm zone="expect expect-config">
+<primary sortas="e-AA.expect.rc">~/.expect.rc</primary></indexterm>
+<indexterm zone="expect expect-config">
+<primary sortas="e-Aexp_library-expect.rc">$exp_library/expect.rc</primary>
+</indexterm>
 </sect3>
 
 <sect3><title>Configuration Information</title>
 
-<para>Reference the <command>expect</command> man page for information about
-utilizing the <filename>expect.rc</filename> configuration files. Additionally,
-many of the tools contained in the <application>Expect</application> package
-will use their own configuration files. Reference the respective man page, or
+<para>Reference the <command>expect</command> man page for information about 
+utilizing the <filename>expect.rc</filename> configuration files. Additionally, 
+many of the tools contained in the <application>Expect</application> package 
+will use their own configuration files. Reference the respective man page, or 
 examine the script directly for configuration file information.</para>
 </sect3>
@@ -117,153 +126,240 @@
 <title>Contents</title>
 
-<para>The <application>Expect</application> package contains the 
-<filename class='libraryfile'>libexpect</filename> libraries, 
-<command>autoexpect</command>, 
-<command>autopasswd</command>, 
-<command>cryptdir</command>, 
-<command>decryptdir</command>, 
-<command>dislocate</command>, 
-<command>expect</command>, 
-<command>ftp-rfc</command>, 
-<command>kibitz</command>, 
-<command>lpunlock</command>, 
-<command>mkpasswd</command>, 
-<command>passmass</command>, 
-<command>rftp</command>, 
-<command>rlogin-cwd</command>, 
-<command>timed-read</command>, 
-<command>timed-run</command>, 
-<command>unbuffer</command>, 
-<command>weather</command> and optionally 
-(if <application>expect</application> was linked against 
-<application>Tk</application>), 
-<command>expectk</command>, 
-<command>multixterm</command>, 
-<command>tknewsbiff</command>, 
-<command>tkpasswd</command>, 
-<command>xkibitz</command> and 
-<command>xpstat</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>autoexpect</title>
-<para><command>autoexpect</command> generates an 
-<application>Expect</application> script from watching a session.</para>
-</sect3>
-
-<sect3><title>autopasswd</title>
-<para><command>autopasswd</command> is a wrapper to make passwd(1) be 
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directory</segtitle>
+
+<seglistitem>
+<seg>autoexpect, autopasswd, cryptdir, decryptdir, dislocate, expect, ftp-rfc, 
+kibitz, lpunlock, mkpasswd, passmass, rftp, rlogin-cwd, timed-read, timed-run, 
+unbuffer, weather and optionally (if <application>expect</application> was 
+linked against <application>Tk</application>), expectk, multixterm, 
+tknewsbiff, tkpasswd, xkibitz and xpstat</seg>
+<seg>libexpect5.42.[so,a]</seg>
+<seg>/usr/lib/expect5.42</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="autoexpect">
+<term><command>autoexpect</command></term>
+<listitem><para>generates an <application>Expect</application> script from 
+watching a session.</para>
+<indexterm zone="expect autoexpect">
+<primary sortas="b-autoexpect">autoexpect</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="autopasswd">
+<term><command>autopasswd</command></term>
+<listitem><para>is a wrapper to make <command>passwd</command>(1) be 
 non-interactive.</para>
-</sect3>
-
-<sect3><title>cryptdir</title>
-<para><command>cryptdir</command> encrypts all files in a directory.</para>
-</sect3>
-
-<sect3><title>decryptdir</title>
-<para><command>decryptdir</command> decrypts all files in a directory.</para>
-</sect3>
-
-<sect3><title>dislocate</title>
-<para><command>dislocate</command> allows processes to be disconnected and 
-reconnected to a terminal.</para>
-</sect3>
-
-<sect3><title>expect</title>
-<para><command>expect</command> is a program that <quote>talks</quote> to 
-other interactive programs according to a script.</para>
-</sect3>
-
-<sect3><title>ftp-rfc</title>
-<para><command>ftp-rfc</command> retrieves an rfc (or the index) from 
-uunet.</para>
-</sect3>
-
-<sect3><title>kibitz</title>
-<para><command>kibitz</command> allows two (or more) people to interact with 
-one shell (or any arbitrary program).</para>
-</sect3>
-
-<sect3><title>lpunlock</title>
-<para><command>lpunlock</command> unhangs a printer which claims it is 
-<quote>waiting for lock</quote>.</para>
-</sect3>
-
-<sect3><title>mkpasswd</title>
-<para><command>mkpasswd</command> generates passwords and can apply them 
-automatically to users.</para>
-</sect3>
-
-<sect3><title>passmass</title>
-<para><command>passmass</command> changes a password on multiple 
-machines.</para>
-</sect3>
-
-<sect3><title>rftp</title>
-<para><command>rftp</command> is much like <command>ftp</command> except 
-it uses '~g' and '~p' instead of 'mget' and 'mput'.</para>
-</sect3>
-
-<sect3><title>rlogin-cwd</title>
-<para><command>rlogin-cwd</command> is <command>rlogin</command> except 
-it uses the local current directory as the current working directory on the 
-remote machine.</para>
-</sect3>
-
-<sect3><title>timed-read</title>
-<para><command>timed-read</command> reads a complete line from stdin
-and aborts after a given number of seconds.</para>
-</sect3>
-
-<sect3><title>timed-run</title>
-<para><command>timed-run</command> runs a program for a given amount of 
-time.</para>
-</sect3>
-
-<sect3><title>unbuffer</title>
-<para><command>unbuffer</command> disables the output buffering that occurs 
-when program output is redirected.</para>
-</sect3>
-
-<sect3><title>weather</title>
-<para><command>weather</command> retrieves a weather report (courtesy 
-University of Michigan) for a given city or geographical area.</para>
-</sect3>
-
-<sect3><title>expectk</title>
-<para><command>expectk</command> is a combination of 
-<application>Expect</application> with <application>Tk</application> and should 
-run any <command>wish</command> or <application>Expect</application> 
-script.</para>
-</sect3>
-
-<sect3><title>multixterm</title>
-<para><command>multixterm</command> creates multiple <command>xterm</command>s 
-that can be driven together or separately.</para>
-</sect3>
-
-<sect3><title>tknewsbiff</title>
-<para><command>tknewsbiff</command> pops up a window when there is unread news 
-in your favorite newsgroups and removes the window after you've read the 
-news.</para>
-</sect3>
-
-<sect3><title>tkpasswd</title>
-<para><command>tkpasswd</command> is a script to change passwords using 
+<indexterm zone="expect autopasswd">
+<primary sortas="b-autopasswd">autopasswd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="cryptdir">
+<term><command>cryptdir</command></term>
+<listitem><para>encrypts all files in a directory.</para>
+<indexterm zone="expect cryptdir">
+<primary sortas="b-cryptdir">cryptdir</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="decryptdir">
+<term><command>decryptdir</command></term>
+<listitem><para>decrypts all files in a directory.</para>
+<indexterm zone="expect decryptdir">
+<primary sortas="b-decryptdir">decryptdir</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="dislocate">
+<term><command>dislocate</command></term>
+<listitem><para>allows processes to be disconnected and reconnected to a 
+terminal.</para>
+<indexterm zone="expect dislocate">
+<primary sortas="b-dislocate">dislocate</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="expect-prog">
+<term><command>expect</command></term>
+<listitem><para>is a program that <quote>talks</quote> to other interactive 
+programs according to a script.</para>
+<indexterm zone="expect expect-prog">
+<primary sortas="b-expect">expect</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ftp-rfc">
+<term><command>ftp-rfc</command></term>
+<listitem><para>retrieves an <acronym>RFC</acronym> (or the index) from 
+<acronym>UUNET</acronym>.</para>
+<indexterm zone="expect ftp-rfc">
+<primary sortas="b-ftp-rfc">ftp-rfc</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="kibitz">
+<term><command>kibitz</command></term>
+<listitem><para>allows two (or more) people to interact with one shell 
+(or any arbitrary program).</para>
+<indexterm zone="expect kibitz">
+<primary sortas="b-kibitz">kibitz</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="lpunlock">
+<term><command>lpunlock</command></term>
+<listitem><para>unhangs a printer which claims it is <quote>waiting for 
+lock</quote>.</para>
+<indexterm zone="expect lpunlock">
+<primary sortas="b-lpunlock">lpunlock</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="mkpasswd">
+<term><command>mkpasswd</command></term>
+<listitem><para>generates passwords and can apply them automatically to 
+users.</para>
+<indexterm zone="expect mkpasswd">
+<primary sortas="b-mkpasswd">mkpasswd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="passmass">
+<term><command>passmass</command></term>
+<listitem><para>changes a password on multiple machines.</para>
+<indexterm zone="expect passmass">
+<primary sortas="b-passmass">passmass</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="rftp">
+<term><command>rftp</command></term>
+<listitem><para>is much like <command>ftp</command> except
+it uses <userinput>~g</userinput> and <userinput>~p</userinput> instead of 
+<userinput>mget</userinput> and <userinput>mput</userinput>.</para>
+<indexterm zone="expect rftp">
+<primary sortas="b-rftp">rftp</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="rlogin-cwd">
+<term><command>rlogin-cwd</command></term>
+<listitem><para>is <command>rlogin</command> except it uses the local current 
+directory as the current working directory on the remote machine.</para>
+<indexterm zone="expect rlogin-cwd">
+<primary sortas="b-rlogin-cwd">rlogin-cwd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="timed-read">
+<term><command>timed-read</command></term>
+<listitem><para> reads a complete line from stdin and aborts after a given 
+number of seconds.</para>
+<indexterm zone="expect timed-read">
+<primary sortas="b-timed-read">timed-read</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="timed-run">
+<term><command>timed-run</command></term>
+<listitem><para>runs a program for a given amount of time.</para>
+<indexterm zone="expect timed-run">
+<primary sortas="b-timed-run">timed-run</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="unbuffer">
+<term><command>unbuffer</command></term>
+<listitem><para>disables the output buffering that occurs when program output 
+is redirected.</para>
+<indexterm zone="expect unbuffer">
+<primary sortas="b-unbuffer">unbuffer</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="weather">
+<term><command>weather</command></term>
+<listitem><para>retrieves a weather report (courtesy University of Michigan) 
+for a given city or geographical area.</para>
+<indexterm zone="expect weather">
+<primary sortas="b-weather">weather</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="expectk">
+<term><command>expectk</command></term>
+<listitem><para>is a combination of <application>Expect</application> with 
+<application>Tk</application> and should run any <command>wish</command> or 
+<application>Expect</application> script.</para>
+<indexterm zone="expect expectk">
+<primary sortas="b-expectk">expectk</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="multixterm">
+<term><command>multixterm</command></term>
+<listitem><para>creates multiple <command>xterm</command>s that can be driven 
+together or separately.</para>
+<indexterm zone="expect multixterm">
+<primary sortas="b-multixterm">multixterm</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="tknewsbiff">
+<term><command>tknewsbiff</command></term>
+<listitem><para>pops up a window when there is unread news in your favorite 
+newsgroups and removes the window after you've read the news.</para>
+<indexterm zone="expect tknewsbiff">
+<primary sortas="b-tknewsbiff">tknewsbiff</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="tkpasswd">
+<term><command>tkpasswd</command></term>
+<listitem><para>is a script to change passwords using 
 <command>expectk</command>.</para>
-</sect3>
-
-<sect3><title>xkibitz</title>
-<para><command>xkibitz</command> allows users in separate 
-<command>xterm</command>s to share one shell (or any program that runs in an 
-<command>xterm</command>).</para>
-</sect3>
-
-<sect3><title>xpstat</title>
-<para><command>xpstat</command> is a script that acts as a front-end for 
+<indexterm zone="expect tkpasswd">
+<primary sortas="b-tkpasswd">tkpasswd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="xkibitz">
+<term><command>xkibitz</command></term>
+<listitem><para>allows users in separate <command>xterm</command>s to share 
+one shell (or any program that runs in an <command>xterm</command>).</para>
+<indexterm zone="expect xkibitz">
+<primary sortas="b-xkibitz">xkibitz</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="xpstat">
+<term><command>xpstat</command></term>
+<listitem><para>is a script that acts as a front-end for 
 <command>xpilot</command>.</para>
-</sect3>
+<indexterm zone="expect xpstat">
+<primary sortas="b-xpstat">xpstat</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libexpect">
+<term><filename class='libraryfile'>libexpect5.42.[so,a]</filename></term>
+<listitem><para> contains functions that allow 
+<application>Expect</application> to be used as a 
+<application>Tcl</application> extension or to be used directly from C or 
+C++ (without <application>Tcl</application>).</para>
+<indexterm zone="expect libexpect">
+<primary sortas="c-libexpect5.42">libexpect5.42.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
