Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 231e47d71a6a1f63185407998d305bbaee6c75ad)
+++ general/prog/perl-modules.xml	(revision d9afe96e9caff2be616f03c0fb4e1fb13223a349)
@@ -720,7 +720,47 @@
     </itemizedlist>
 
+    <!-- SGMLSpm -->
+    <bridgehead renderas="sect3" id="perl-sgmlspm"
+    xreflabel="SGMLSpm-&SGMLSpm-version;">
+    SGMLSpm-&SGMLSpm-version;</bridgehead>
+
+    <indexterm zone="perl-modules perl-sgmlspm">
+      <primary sortas="g-SGMLSpm">SGMLSpm</primary>
+    </indexterm>
+
+    <para>The SGMLSpm module is a <application>Perl</application> library
+    used for parsing the output from James Clark's SGMLS and NSGMLS
+    parsers. This module requires modified installation instructions, shown
+    below.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-&SGMLSpm-version;.tar.gz">
+        SGMLSpm-&SGMLSpm-version;</ulink></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>If your system's <application>Perl</application> version is different
+    than &LFS-Perl-version;, you'll need to modify the <command>sed</command>
+    command below to reflect the version you have installed.</para>
+
+<screen><userinput>sed -i -e "s@/usr/local/bin@/usr/bin@" \
+       -e "s@/usr/local/lib/perl5@/usr/lib/perl5/site_perl/&LFS-Perl-version;@" \
+       -e "s@/usr/local/lib/www/docs@/usr/share/doc/perl5@" \
+    Makefile</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/perl5 &amp;&amp;
+make install_html &amp;&amp;
+rm -v -f /usr/share/doc/perl5/SGMLSpm/sample.pl &amp;&amp;
+install -v -m644 DOC/sample.pl /usr/share/doc/perl5/SGMLSpm</userinput></screen>
+
     <!-- Test::Pod -->
     <bridgehead renderas="sect3" id="perl-test-pod"
-    xreflabel="Test::Pod">The Test::Pod Module</bridgehead>
+    xreflabel="Test::Pod-&Test-Pod-version;">
+    Test::Pod-&Test-Pod-version;</bridgehead>
 
     <indexterm zone="perl-modules perl-test-pod">
@@ -728,10 +768,9 @@
     </indexterm>
 
-    <para>Another useful module, and one which is (typically optionally) used
-    by other modules during the build process is the Test:Pod module. This
-    module is used to check the validity of POD (Plain Old Documentation)
-    files. The Test::Pod module is typically included by module authors to
-    automatically find and check all POD files in a module distribution. This
-    module and all the dependencies can be installed using the
+    <para>The Test:Pod module is (most of the time, optionally) used by other
+    modules during the build process to check the validity of POD (Plain Old
+    Documentation) files. The Test::Pod module is typically included by module
+    authors to automatically find and check all POD files in a module
+    distribution. This module and all the dependencies can be installed using the
     <xref linkend="perl-standard-install"/>.</para>
 
@@ -773,5 +812,6 @@
     <!-- Test::Simple -->
     <bridgehead renderas="sect3" id="perl-test-simple"
-    xreflabel="Test::Simple">The Test::Simple Module</bridgehead>
+    xreflabel="Test::Simple-&Test-Simple-version;">
+    Test::Simple-&Test-Simple-version;</bridgehead>
 
     <indexterm zone="perl-modules perl-test-simple">
@@ -802,74 +842,8 @@
     </itemizedlist>
 
-    <!-- XML::Parser -->
-    <bridgehead renderas="sect3" id="perl-xml-parser"
-    xreflabel="XML::Parser">The XML::Parser Module</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-parser">
-      <primary sortas="g-XML-Parser">XML::Parser</primary>
-    </indexterm>
-
-    <para>The XML::Parser module is a <application>Perl</application> extension
-    interface to James Clark's XML parser,
-    <application>expat</application>. The module can be installed using the
-    <application>Perl</application> Module
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://cpan.org/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">
-        XML-Parser-&XML-Parser-version;</ulink></para>
-
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="expat"/></para>
-          </listitem>
-        </itemizedlist>
-
-      </listitem>
-    </itemizedlist>
-
-    <!-- SGMLSpm -->
-    <bridgehead renderas="sect3" id="perl-sgmlspm"
-    xreflabel="SGMLSpm">The SGMLSpm Module</bridgehead>
-
-    <indexterm zone="perl-modules perl-sgmlspm">
-      <primary sortas="g-SGMLSpm">SGMLSpm</primary>
-    </indexterm>
-
-    <para>The SGMLSpm module is a <application>Perl</application> library
-    used for parsing the output from James Clark's SGMLS and NSGMLS
-    parsers. This module requires modified installation instructions, shown
-    below.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-&SGMLSpm-version;.tar.gz">
-        SGMLSpm-&SGMLSpm-version;</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <para>If your system's <application>Perl</application> version is different
-    than &LFS-Perl-version;, you'll need to modify the <command>sed</command>
-    command below to reflect the version you have installed.</para>
-
-<screen><userinput>sed -i -e "s@/usr/local/bin@/usr/bin@" \
-       -e "s@/usr/local/lib/perl5@/usr/lib/perl5/site_perl/&LFS-Perl-version;@" \
-       -e "s@/usr/local/lib/www/docs@/usr/share/doc/perl5@" \
-    Makefile</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -d -m755 /usr/share/doc/perl5 &amp;&amp;
-make install_html &amp;&amp;
-rm -v -f /usr/share/doc/perl5/SGMLSpm/sample.pl &amp;&amp;
-install -v -m644 DOC/sample.pl /usr/share/doc/perl5/SGMLSpm</userinput></screen>
-
     <!-- Tk -->
     <bridgehead renderas="sect3" id="perl-tk"
-    xreflabel="Perl-Tk">The Tk Module</bridgehead>
+    xreflabel="Perl-Tk-&Perl-Tk-version;">
+    Tk-&Perl-Tk-version;</bridgehead>
 
     <indexterm zone="perl-modules perl-tk">
@@ -902,4 +876,34 @@
     </itemizedlist>
 
+    <!-- XML::Parser -->
+    <bridgehead renderas="sect3" id="perl-xml-parser"
+    xreflabel="XML::Parser-&XML-Parser-version;">
+    XML::Parser-&XML-Parser-version;</bridgehead>
+
+    <indexterm zone="perl-modules perl-xml-parser">
+      <primary sortas="g-XML-Parser">XML::Parser</primary>
+    </indexterm>
+
+    <para>The XML::Parser module is a <application>Perl</application> extension
+    interface to James Clark's XML parser,
+    <application>expat</application>. The module can be installed using the
+    <application>Perl</application> Module
+    <xref linkend="perl-standard-install"/>.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://cpan.org/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">
+        XML-Parser-&XML-Parser-version;</ulink></para>
+
+        <itemizedlist>
+          <listitem>
+            <para><xref linkend="expat"/></para>
+          </listitem>
+        </itemizedlist>
+
+      </listitem>
+    </itemizedlist>
+
   </sect2>
 
@@ -925,9 +929,9 @@
 
     <para>There is an alternate way of installing the modules using
-    <application>Perl</application>'s built-in <command>install</command> command.
-    The command automatically downloads the source from the CPAN
-    archive, extracts it, runs the commands mentioned above, and removes the build
-    tree. You may still need to install dependent library packages before running
-    the automated installation method.</para>
+    <application>Perl</application>'s built-in <command>install</command>
+    command. The command automatically downloads the source from the CPAN
+    archive, extracts it, runs the commands mentioned above, and removes the
+    build source tree. You may still need to install dependent library
+    packages before running the automated installation method.</para>
 
     <para>The first time you run this command, you'll be prompted to enter some
@@ -939,5 +943,6 @@
 <screen role="root"><userinput>perl -MCPAN -e shell</userinput></screen>
 
-    <para>Each module may now be installed from this shell with the command:</para>
+    <para>Each module may now be installed from this shell with the
+    command:</para>
 
 <screen role="root"><userinput>install <replaceable>[Module::Name]</replaceable></userinput></screen>
