Index: general/prog/gcc3.xml
===================================================================
--- general/prog/gcc3.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
+++ general/prog/gcc3.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,5 @@
 <title><application><acronym>GCC</acronym></application>-&gcc3-version;</title>
 <indexterm zone="gcc3">
-<primary sortas="a-gcc3">GCC-&gcc3-version;</primary></indexterm>
+<primary sortas="a-GCC-3">GCC-&gcc3-version;</primary></indexterm>
 
 <sect2>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
+++ general/prog/ruby.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -20,5 +20,6 @@
 <?dbhtml filename="ruby.html"?>
 <title>Ruby-&ruby-version;</title>
-<indexterm zone="ruby-package"><primary sortas="a-Ruby">Ruby</primary></indexterm>
+<indexterm zone="ruby-package">
+<primary sortas="a-Ruby">Ruby</primary></indexterm>
 
 <sect2>
@@ -31,10 +32,14 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&ruby-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&ruby-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&ruby-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&ruby-download-ftp;"/></para></listitem>
 <listitem><para>Download MD5 sum: &ruby-md5sum;</para></listitem>
 <listitem><para>Download size: &ruby-size;</para></listitem>
-<listitem><para>Estimated disk space required: &ruby-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &ruby-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&ruby-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&ruby-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -61,5 +66,4 @@
 make install &amp;&amp;
 make install-doc</command></userinput></screen>
-
 
 </sect2>
@@ -97,5 +101,6 @@
 <listitem><para>is an interpreted scripting language for quick
 and easy object-oriented programming.</para>
-<indexterm zone="ruby-package ruby"><primary sortas="b-ruby">ruby</primary></indexterm>
+<indexterm zone="ruby-package ruby">
+<primary sortas="b-ruby">ruby</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -105,5 +110,6 @@
 <listitem><para>is the interactive interface for
 <application>Ruby</application>.</para>
-<indexterm zone="ruby-package irb"><primary sortas="b-irb">irb</primary></indexterm>
+<indexterm zone="ruby-package irb">
+<primary sortas="b-irb">irb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -113,5 +119,6 @@
 <listitem><para>is Tiny eRuby. It interprets a
 <application>Ruby</application> code embedded text file.</para>
-<indexterm zone="ruby-package erb"><primary sortas="b-erb">erb</primary></indexterm>
+<indexterm zone="ruby-package erb">
+<primary sortas="b-erb">erb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -121,5 +128,6 @@
 <listitem><para>displays documentation from a database on
 <application>Ruby</application> classes, modules and methods.</para>
-<indexterm zone="ruby-package ri"><primary sortas="b-ri">ri</primary></indexterm>
+<indexterm zone="ruby-package ri">
+<primary sortas="b-ri">ri</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -129,10 +137,8 @@
 <listitem><para>contains the <acronym>API</acronym> functions required
 by <application>Ruby</application>.</para>
-<indexterm zone="ruby-package libruby"><primary
-sortas="c-libruby">libruby.so</primary></indexterm>
+<indexterm zone="ruby-package libruby">
+<primary sortas="c-libruby">libruby.so</primary></indexterm>
 </listitem>
 </varlistentry>
-
-
 </variablelist>
 
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
+++ general/prog/tcl.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -19,7 +19,6 @@
 <?dbhtml filename="tcl.html"?>
 <title>Tcl-&tcl-version;</title>
-<indexterm zone="tcl"><primary
-sortas="a-Tcl">Tcl</primary></indexterm>
-
+<indexterm zone="tcl">
+<primary sortas="a-Tcl">Tcl</primary></indexterm>
 
 <sect2>
@@ -125,6 +124,6 @@
 <listitem><para> is a simple shell containing the
 <application>Tcl</application> interpreter.</para>
-<indexterm zone="tcl tclsh"><primary
-sortas="b-tclsh">tclsh</primary></indexterm>
+<indexterm zone="tcl tclsh">
+<primary sortas="b-tclsh">tclsh</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -134,6 +133,6 @@
 <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>
+<indexterm zone="tcl libtcl">
+<primary sortas="c-libtcl">libtcl.so</primary></indexterm>
 </listitem>
 </varlistentry>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
+++ general/prog/tk.xml	(revision 6a2bce28117beb456b94b32c9af05e4ff9aa4345)
@@ -19,7 +19,6 @@
 <?dbhtml filename="tk.html"?>
 <title>Tk-&tk-version;</title>
-<indexterm zone="tk"><primary
-sortas="a-Tk">Tk</primary></indexterm>
-
+<indexterm zone="tk">
+<primary sortas="a-Tk">Tk</primary></indexterm>
 
 <sect2>
@@ -124,6 +123,6 @@
 <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>
+<indexterm zone="tk wish">
+<primary sortas="b-wish">wish</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -133,6 +132,6 @@
 <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>
+<indexterm zone="tk libtk">
+<primary sortas="c-libtk">libtk.so</primary></indexterm>
 </listitem>
 </varlistentry>
