Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 990f983d17d564017ba7592a2795355fb5a4fc7d)
+++ general/prog/tcl.xml	(revision bad8b539cbca46c3e201a7641fad633248e10696)
@@ -19,4 +19,7 @@
 <?dbhtml filename="tcl.html"?>
 <title>Tcl-&tcl-version;</title>
+<indexterm zone="tcl"><primary
+sortas="a-Tcl">Tcl</primary></indexterm>
+
 
 <sect2>
@@ -103,16 +106,38 @@
 <title>Contents</title>
 
-<para>The <application>Tcl</application> package contains
-<command>tclsh</command>, the 
-<filename class='libraryfile'>libtcl</filename> libraries and miscellaneous 
-tools and scripts.</para>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>tclsh</seg>
+<seg>libtcl</seg>
+<seg>/usr/lib/tcl8.4 and /usr/include/tcl8.4</seg></seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="tclsh">
+<term><command>tclsh</command></term>
+<listitem><para> is a simple shell containing the
+<application>Tcl</application> interpreter.</para>
+<indexterm zone="tcl tclsh"><primary
+sortas="b-tclsh">tclsh</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>tclsh</title>
-<para><command>tclsh</command> is a simple shell containing the 
-<application>Tcl</application> interpreter.</para></sect3>
+<varlistentry id="libtcl">
+<term><filename role="library">libtcl.so</filename></term>
+<listitem><para>contains the <acronym>API</acronym> functions required
+by <application>Tcl</application>.</para>
+<indexterm zone="tcl libtcl"><primary
+sortas="c-libtcl">libtcl.so</primary></indexterm>
+</listitem>
+</varlistentry>
+
+
+</variablelist>
 
 </sect2>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 990f983d17d564017ba7592a2795355fb5a4fc7d)
+++ general/prog/tk.xml	(revision bad8b539cbca46c3e201a7641fad633248e10696)
@@ -19,4 +19,7 @@
 <?dbhtml filename="tk.html"?>
 <title>Tk-&tk-version;</title>
+<indexterm zone="tk"><primary
+sortas="a-Tk">Tk</primary></indexterm>
+
 
 <sect2>
@@ -102,17 +105,38 @@
 <title>Contents</title>
 
-<para>The <application>Tk</application> package contains
-<command>wish</command>, the
-<filename class='libraryfile'>libtk</filename> library and miscellaneous 
-tools and scripts.</para>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>wish</seg>
+<seg>libtk</seg>
+<seg>/usr/lib/tk8.4 and /usr/include/tk8.4</seg></seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="wish">
+<term><command>wish</command></term>
+<listitem><para> is a simple shell containing the
+<application>Tk</application> toolkit that creates a main window and
+then processes <application>Tcl</application> commands.</para>
+<indexterm zone="tk wish"><primary
+sortas="b-wish">wish</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>wish</title>
-<para><command>wish</command> is a simple shell containing the 
-<application>Tk</application> toolkit that creates a main window and 
-then processes <application>Tcl</application> commands.</para></sect3>
+<varlistentry id="libtk">
+<term><filename role="library">libtk.so</filename></term>
+<listitem><para>contains the <acronym>API</acronym> functions required
+by <application>Tk</application>.</para>
+<indexterm zone="tk libtk"><primary
+sortas="c-libtk">libtk.so</primary></indexterm>
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 990f983d17d564017ba7592a2795355fb5a4fc7d)
+++ x/wm/fluxbox.xml	(revision bad8b539cbca46c3e201a7641fad633248e10696)
@@ -19,4 +19,6 @@
 <?dbhtml filename="fluxbox.html" ?>
 <title>Fluxbox-&fluxbox-version;</title>
+<indexterm zone="fluxbox-package"><primary
+sortas="a-Fluxbox">Fluxbox</primary></indexterm>
 
 <sect2>
