Index: general/prog/autoconf213.xml
===================================================================
--- general/prog/autoconf213.xml	(revision 0fc5e82bc8c165bc0e2be43e273ab254c9acc007)
+++ general/prog/autoconf213.xml	(revision 3f7bcbcfabc3b0e307c471b05383542ea836f6cd)
@@ -21,15 +21,15 @@
   </sect1info>
 
-  <title>Autoconf-&autoconf213-version;</title>
+  <title>Autoconf&autoconf213-version;</title>
 
   <indexterm zone="autoconf213">
-    <primary sortas="a-Autoconf-213">Autoconf-213</primary>
+    <primary sortas="a-Autoconf213">Autoconf213</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Autoconf-2.13</title>
-
-    <para>
-      <application>Autoconf-2.13</application> is an old version of
+    <title>Introduction to Autoconf2.13</title>
+
+    <para>
+      <application>Autoconf2.13</application> is an old version of
       <application>Autoconf</application> . This old version accepts switches
       which are not valid in more recent versions. Now that
@@ -85,5 +85,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Autoconf-2.13 Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Autoconf2.13 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -98,5 +98,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Autoconf-2.13</title>
+    <title>Installation of Autoconf2.13</title>
 
     <para>
@@ -164,5 +164,10 @@
       <seglistitem>
         <seg>
-          autoconf-2.13, autoheader-2.13, autoreconf-2.13, autoscan-2.13, autoupdate-2.13, ifnames-2.13
+          autoconf2.13, 
+          autoheader2.13, 
+          autoreconf2.13, 
+          autoscan2.13, 
+          autoupdate2.13, and
+          ifnames2.13
         </seg>
         <seg>
@@ -180,6 +185,6 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="autoconf-2.13">
-        <term><command>autoconf-2.13</command></term>
+      <varlistentry id="autoconf2.13">
+        <term><command>autoconf2.13</command></term>
         <listitem>
           <para>
@@ -187,12 +192,12 @@
             code packages to adapt to many kinds of Unix-like systems.
           </para>
-          <indexterm zone="autoconf213 autoconf-2.13">
-            <primary sortas="b-autoconf-2.13">autoconf-2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoheader-2.13">
-        <term><command>autoheader-2.13</command></term>
+          <indexterm zone="autoconf213 autoconf2.13">
+            <primary sortas="b-autoconf2.13">autoconf2.13</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoheader2.13">
+        <term><command>autoheader2.13</command></term>
         <listitem>
           <para>
@@ -200,16 +205,16 @@
            <emphasis>#define</emphasis> statements for configure to use
           </para>
-          <indexterm zone="autoconf213 autoheader-2.13">
-            <primary sortas="b-autoheader-2.13">autoheader-2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoreconf-2.13">
-        <term><command>autoreconf-2.13</command></term>
-        <listitem>
-          <para>
-           This automatically runs <command>autoconf-2.13</command>,
-           <command>autoheader-2.13</command>, <command>aclocal</command>,
+          <indexterm zone="autoconf213 autoheader2.13">
+            <primary sortas="b-autoheader2.13">autoheader2.13</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoreconf2.13">
+        <term><command>autoreconf2.13</command></term>
+        <listitem>
+          <para>
+           This automatically runs <command>autoconf2.13</command>,
+           <command>autoheader2.13</command>, <command>aclocal</command>,
            <command>automake</command>, <command>gettextize</command> and
            <command>libtoolize</command> in the right order when changes
@@ -217,12 +222,12 @@
            <command>automake</command> template files.
           </para>
-          <indexterm zone="autoconf213 autoreconf-2.13">
-            <primary sortas="b-autoreconf-2.13">autoreconf-2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoscan-2.13">
-        <term><command>autoscan-2.13</command></term>
+          <indexterm zone="autoconf213 autoreconf2.13">
+            <primary sortas="b-autoreconf2.13">autoreconf2.13</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoscan2.13">
+        <term><command>autoscan2.13</command></term>
         <listitem>
           <para>
@@ -230,12 +235,12 @@
             <filename>configure.in</filename> file.
           </para>
-          <indexterm zone="autoconf213 autoscan-2.13">
-            <primary sortas="b-autoscan-2.13">autoscan-2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoupdate-2.13">
-        <term><command>autoupdate-2.13</command></term>
+          <indexterm zone="autoconf213 autoscan2.13">
+            <primary sortas="b-autoscan2.13">autoscan2.13</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoupdate2.13">
+        <term><command>autoupdate2.13</command></term>
         <listitem>
           <para>
@@ -244,12 +249,12 @@
             to use the current macro names.
           </para>
-          <indexterm zone="autoconf213 autoupdate-2.13">
-            <primary sortas="b-autoupdate-2.13">autoupdate-2,13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifnames-2.13">
-        <term><command>ifnames-2.13</command></term>
+          <indexterm zone="autoconf213 autoupdate2.13">
+            <primary sortas="b-autoupdate2.13">autoupdate2.13</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ifnames2.13">
+        <term><command>ifnames2.13</command></term>
         <listitem>
           <para>
@@ -260,6 +265,6 @@
             by autoscan.]
           </para>
-          <indexterm zone="autoconf213 ifnames-2.13">
-            <primary sortas="b-ifnames-2.13">ifnames-2.13</primary>
+          <indexterm zone="autoconf213 ifnames2.13">
+            <primary sortas="b-ifnames2.13">ifnames2.13</primary>
           </indexterm>
         </listitem>
