Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ general/prog/perl-modules.xml	(revision 5a9f4b03245f2d77b61787463658e77408e213cd)
@@ -70,5 +70,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/M/MB/MBARBON/Module-Info-&Module-Info-version;.tar.gz">
+        url="http://cpan.org/authors/id/M/MB/MBARBON/Module-Info-&Module-Info-version;.tar.gz">
         Module-Info-&Module-Info-version;</ulink>
         (<xref linkend="perl-standard-install"/>)</para>
@@ -94,5 +94,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-&Test-Pod-version;.tar.gz">
+        url="http://cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-&Test-Pod-version;.tar.gz">
         Test-Pod-&Test-Pod-version;</ulink></para>
 
@@ -100,5 +100,5 @@
           <listitem>
             <para id="perl-pod-simple"><ulink
-            url="http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-&Pod-Simple-version;.tar.gz">
+            url="http://cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-&Pod-Simple-version;.tar.gz">
             Pod-Simple-&Pod-Simple-version;</ulink></para>
             <indexterm zone="perl-modules perl-pod-simple">
@@ -109,5 +109,5 @@
               <listitem>
                 <para id="perl-pod-escapes"><ulink
-                url="http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-&Pod-Escapes-version;.tar.gz">
+                url="http://cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-&Pod-Escapes-version;.tar.gz">
                 Pod-Escapes-&Pod-Escapes-version;</ulink></para>
                 <indexterm zone="perl-modules perl-pod-escapes">
@@ -120,5 +120,5 @@
           <listitem>
             <para id="perl-test-builder-tester"><ulink
-            url="http://www.cpan.org/authors/id/M/MA/MARKF/Test-Builder-Tester-&Test-Builder-Tester-version;.tar.gz">
+            url="http://cpan.org/authors/id/M/MA/MARKF/Test-Builder-Tester-&Test-Builder-Tester-version;.tar.gz">
             Test-Builder-Tester-&Test-Builder-Tester-version;</ulink></para>
             <indexterm zone="perl-modules perl-test-builder-tester">
@@ -174,5 +174,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-&Module-Build-version;.tar.gz">
+        url="http://cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-&Module-Build-version;.tar.gz">
         Module-Build-&Module-Build-version;</ulink></para>
 
@@ -180,5 +180,5 @@
           <listitem>
             <para id="perl-module-signature"><ulink
-            url="http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-&Module-Signature-version;.tar.gz">
+            url="http://cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-&Module-Signature-version;.tar.gz">
             Module-Signature-&Module-Signature-version;</ulink> (optional)</para>
             <indexterm zone="perl-modules perl-module-signature">
@@ -189,5 +189,5 @@
               <listitem>
                 <para id="perl-digest-sha"><ulink
-                url="http://www.cpan.org/authors/id/M/MS/MSHELOR/Digest-SHA-&Digest-SHA-version;.tar.gz">
+                url="http://cpan.org/authors/id/M/MS/MSHELOR/Digest-SHA-&Digest-SHA-version;.tar.gz">
                 Digest-SHA-&Digest-SHA-version;</ulink></para>
                 <indexterm zone="perl-modules perl-digest-sha">
@@ -197,5 +197,5 @@
               <listitem>
                 <para id="perl-par-dist"><ulink
-                url="http://www.cpan.org/authors/id/A/AU/AUTRIJUS/PAR-Dist-&PAR-Dist-version;.tar.gz">
+                url="http://cpan.org/authors/id/A/AU/AUTRIJUS/PAR-Dist-&PAR-Dist-version;.tar.gz">
                 PAR-Dist-&PAR-Dist-version;</ulink></para>
                 <indexterm zone="perl-modules perl-par-dist">
@@ -211,5 +211,5 @@
           <listitem>
             <para id="perl-extutils-parsexs"><ulink
-            url="http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-&ExtUtils-ParseXS-version;.tar.gz">
+            url="http://cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-&ExtUtils-ParseXS-version;.tar.gz">
             ExtUtils-ParseXS-&ExtUtils-ParseXS-version;</ulink></para>
             <indexterm zone="perl-modules perl-extutils-parsexs">
@@ -220,5 +220,5 @@
               <listitem>
                 <para id="perl-extutils-cbuilder"><ulink
-                url="http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-&ExtUtils-CBuilder-version;.tar.gz">
+                url="http://cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-&ExtUtils-CBuilder-version;.tar.gz">
                 ExtUtils-CBuilder-&ExtUtils-CBuilder-version;</ulink></para>
                 <indexterm zone="perl-modules perl-extutils-cbuilder">
@@ -231,5 +231,5 @@
           <listitem>
             <para id="perl-archive-tar"><ulink
-            url="http://www.cpan.org/authors/id/K/KA/KANE/Archive-Tar-&Archive-Tar-version;.tar.gz">
+            url="http://cpan.org/authors/id/K/KA/KANE/Archive-Tar-&Archive-Tar-version;.tar.gz">
             Archive-Tar-&Archive-Tar-version;</ulink></para>
             <indexterm zone="perl-modules perl-archive-tar">
@@ -240,5 +240,5 @@
               <listitem>
                 <para id="perl-io-zlib"><ulink
-                url="http://www.cpan.org/authors/id/T/TO/TOMHUGHES/IO-Zlib-&IO-Zlib-version;.tar.gz">
+                url="http://cpan.org/authors/id/T/TO/TOMHUGHES/IO-Zlib-&IO-Zlib-version;.tar.gz">
                 IO-Zlib-&IO-Zlib-version;</ulink></para>
                 <indexterm zone="perl-modules perl-io-zlib">
@@ -249,5 +249,5 @@
                   <listitem>
                     <para id="perl-compress-zlib"><ulink
-                    url="http://www.cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
+                    url="http://cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
                     Compress-Zlib-&Compress-Zlib-version;</ulink></para>
                     <indexterm zone="perl-modules perl-compress-zlib">
@@ -263,5 +263,5 @@
               <listitem>
                 <para id="perl-text-diff"><ulink
-                url="http://www.cpan.org/authors/id/R/RB/RBS/Text-Diff-&Text-Diff-version;.tar.gz">
+                url="http://cpan.org/authors/id/R/RB/RBS/Text-Diff-&Text-Diff-version;.tar.gz">
                 Text-Diff-&Text-Diff-version;</ulink></para>
                 <indexterm zone="perl-modules perl-text-diff">
@@ -272,5 +272,5 @@
                   <listitem>
                     <para id="perl-algorithm-diff"><ulink
-                    url="http://www.cpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-&Algorithm-Diff-version;.zip">
+                    url="http://cpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-&Algorithm-Diff-version;.zip">
                     Algorithm-Diff-&Algorithm-Diff-version;</ulink></para>
                     <indexterm zone="perl-modules perl-algorithm-diff">
@@ -286,5 +286,5 @@
           <listitem>
             <para id="perl-yaml"><ulink
-            url="http://www.cpan.org/authors/id/I/IN/INGY/YAML-&YAML-version;.tar.gz">
+            url="http://cpan.org/authors/id/I/IN/INGY/YAML-&YAML-version;.tar.gz">
             YAML-&YAML-version;</ulink></para>
             <indexterm zone="perl-modules perl-yaml">
@@ -325,5 +325,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
+        url="http://cpan.org/authors/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
         HTML-Parser-&HTML-Parser-version;</ulink></para>
 
@@ -331,5 +331,5 @@
           <listitem>
             <para id="perl-html-tagset"><ulink
-            url="http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Tagset-&HTML-Tagset-version;.tar.gz">
+            url="http://cpan.org/authors/id/S/SB/SBURKE/HTML-Tagset-&HTML-Tagset-version;.tar.gz">
             HTML-Tagset-&HTML-Tagset-version;</ulink></para>
             <indexterm zone="perl-modules perl-html-tagset">
@@ -358,5 +358,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">
+        url="http://cpan.org/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">
         XML-Parser-&XML-Parser-version;</ulink></para>
 
@@ -385,5 +385,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-&SGMLSpm-version;.tar.gz">
+        url="http://cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-&SGMLSpm-version;.tar.gz">
         SGMLSpm-&SGMLSpm-version;</ulink></para>
       </listitem>
@@ -427,5 +427,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/N/NI/NI-S/Tk-&Perl-Tk-version;.tar.gz">
+        url="http://cpan.org/authors/id/N/NI/NI-S/Tk-&Perl-Tk-version;.tar.gz">
         Tk-&Perl-Tk-version;</ulink></para>
 
@@ -456,5 +456,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/O/OL/OLAF/Net-DNS-&Net-DNS-version;.tar.gz">
+        url="http://cpan.org/authors/id/O/OL/OLAF/Net-DNS-&Net-DNS-version;.tar.gz">
         Net-DNS-&Net-DNS-version;</ulink></para>
 
@@ -462,5 +462,5 @@
           <listitem>
             <para id="perl-digest-hmac"><ulink
-            url="http://www.cpan.org/authors/id/G/GA/GAAS/Digest-HMAC-&Digest-HMAC-version;.tar.gz">
+            url="http://cpan.org/authors/id/G/GA/GAAS/Digest-HMAC-&Digest-HMAC-version;.tar.gz">
             Digest-HMAC-&Digest-HMAC-version;</ulink></para>
             <indexterm zone="perl-modules perl-digest-hmac">
@@ -471,5 +471,5 @@
               <listitem>
                 <para id="perl-digest-sha1"><ulink
-                url="http://www.cpan.org/authors/id/G/GA/GAAS/Digest-SHA1-&Digest-SHA1-version;.tar.gz">
+                url="http://cpan.org/authors/id/G/GA/GAAS/Digest-SHA1-&Digest-SHA1-version;.tar.gz">
                 Digest-SHA1-&Digest-SHA1-version;</ulink></para>
                 <indexterm zone="perl-modules perl-digest-sha1">
@@ -482,5 +482,5 @@
           <listitem>
             <para id="perl-net-ip"><ulink
-            url="http://www.cpan.org/authors/id/M/MA/MANU/Net-IP-&Net-IP-version;.tar.gz">
+            url="http://cpan.org/authors/id/M/MA/MANU/Net-IP-&Net-IP-version;.tar.gz">
             Net-IP-&Net-IP-version;</ulink></para>
             <indexterm zone="perl-modules perl-net-ip">
@@ -490,5 +490,5 @@
           <listitem>
             <para id="perl-io-socket-inet6"><ulink
-            url="http://www.cpan.org/authors/id/M/MO/MONDEJAR/IO-Socket-INET6-&IO-Socket-INET6-version;.tar.gz">
+            url="http://cpan.org/authors/id/M/MO/MONDEJAR/IO-Socket-INET6-&IO-Socket-INET6-version;.tar.gz">
             IO-Socket-INET6-&IO-Socket-INET6-version;</ulink> (required for
             IPv6 support)</para>
@@ -500,5 +500,5 @@
               <listitem>
                 <para id="perl-socket6"><ulink
-                url="http://www.cpan.org/authors/id/U/UM/UMEMOTO/Socket6-&Socket6-version;.tar.gz">
+                url="http://cpan.org/authors/id/U/UM/UMEMOTO/Socket6-&Socket6-version;.tar.gz">
                 Socket6-&Socket6-version;</ulink></para>
                 <indexterm zone="perl-modules perl-socket6">
@@ -511,5 +511,5 @@
           <listitem>
             <para id="perl-digest-bubblebabble"><ulink
-            url="http://www.cpan.org/authors/id/B/BT/BTROTT/Digest-BubbleBabble-&Digest-BubbleBabble-version;.tar.gz">
+            url="http://cpan.org/authors/id/B/BT/BTROTT/Digest-BubbleBabble-&Digest-BubbleBabble-version;.tar.gz">
             Digest-BubbleBabble-&Digest-BubbleBabble-version;</ulink>
             (optional, only used during the test suite)</para>
@@ -556,5 +556,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-&LWP-version;.tar.gz">
+        url="http://cpan.org/authors/id/G/GA/GAAS/libwww-perl-&LWP-version;.tar.gz">
         LWP-&LWP-version;</ulink></para>
 
@@ -562,5 +562,5 @@
           <listitem>
             <para id="perl-uri"><ulink
-            url="http://www.cpan.org/authors/id/G/GA/GAAS/URI-&URI-version;.tar.gz">
+            url="http://cpan.org/authors/id/G/GA/GAAS/URI-&URI-version;.tar.gz">
             URI-&URI-version;</ulink></para>
             <indexterm zone="perl-modules perl-uri">
@@ -571,5 +571,5 @@
               <listitem>
                 <para id="perl-business-isbn"><ulink
-                url="http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
+                url="http://cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
                 Business-ISBN-&Business-ISBN-version;</ulink> (optional, only
                 used during the test suite)</para>
@@ -581,5 +581,5 @@
                   <listitem>
                     <para id="perl-business-isbn-data"><ulink
-                    url="http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-Data-&Business-ISBN-Data-version;.tar.gz">
+                    url="http://cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-Data-&Business-ISBN-Data-version;.tar.gz">
                     Business-ISBN-Data-&Business-ISBN-Data-version;</ulink></para>
                     <indexterm zone="perl-modules perl-business-isbn-data">
@@ -593,5 +593,5 @@
                       <listitem>
                         <para id="perl-test-prereq"><ulink
-                        url="http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Prereq-&Test-Prereq-version;.tar.gz">
+                        url="http://cpan.org/authors/id/B/BD/BDFOY/Test-Prereq-&Test-Prereq-version;.tar.gz">
                         Test-Prereq-&Test-Prereq-version;</ulink></para>
                         <indexterm zone="perl-modules perl-test-prereq">
@@ -608,5 +608,5 @@
                           <listitem>
                             <para id="perl-module-corelist"><ulink
-                            url="http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-&Module-Corelist-version;.tar.gz">
+                            url="http://cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-&Module-Corelist-version;.tar.gz">
                             Module-CoreList-&Module-Corelist-version;</ulink></para>
                             <indexterm zone="perl-modules perl-module-corelist">
@@ -631,10 +631,10 @@
           <listitem>
             <para><ulink
-            url="http://www.cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
+            url="http://cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
             Compress-Zlib-&Compress-Zlib-version;</ulink></para>
           </listitem>
           <listitem>
             <para id="perl-crypt-ssleay"><ulink
-            url="http://www.cpan.org/authors/id/C/CH/CHAMAS/Crypt-SSLeay-&Crypt-SSLeay-version;.tar.gz">
+            url="http://cpan.org/authors/id/C/CH/CHAMAS/Crypt-SSLeay-&Crypt-SSLeay-version;.tar.gz">
             Crypt-SSLeay-&Crypt-SSLeay-version;</ulink> (optional, for HTTPS
             support)</para>
@@ -672,5 +672,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/S/SB/SBECK/DateManip-&DateManip-version;.tar.gz">
+        url="http://cpan.org/authors/id/S/SB/SBECK/DateManip-&DateManip-version;.tar.gz">
         DateManip-&DateManip-version;</ulink>
         (<xref linkend="perl-standard-install"/>)</para>
@@ -717,5 +717,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/P/PJ/PJF/Finance-Quote-&Finance-Quote-version;.tar.gz">
+        url="http://cpan.org/authors/id/P/PJ/PJF/Finance-Quote-&Finance-Quote-version;.tar.gz">
         Finance-Quote-&Finance-Quote-version;</ulink></para>
 
@@ -723,5 +723,5 @@
           <listitem>
             <para id="perl-html-tableextract"><ulink
-            url="http://www.cpan.org/authors/id/M/MS/MSISK/HTML-TableExtract-&HTML-TableExtract-version;.tar.gz">
+            url="http://cpan.org/authors/id/M/MS/MSISK/HTML-TableExtract-&HTML-TableExtract-version;.tar.gz">
             HTML-TableExtract-&HTML-TableExtract-version;</ulink></para>
             <indexterm zone="perl-modules perl-html-tableextract">
@@ -759,5 +759,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/M/MS/MSISK/Finance-QuoteHist-&Finance-QuoteHist-version;.tar.gz">
+        url="http://cpan.org/authors/id/M/MS/MSISK/Finance-QuoteHist-&Finance-QuoteHist-version;.tar.gz">
         Finance-QuoteHist-&Finance-QuoteHist-version;</ulink></para>
 
@@ -765,5 +765,5 @@
           <listitem>
             <para><ulink
-            url="http://www.cpan.org/authors/id/M/MS/MSISK/HTML-TableExtract-&HTML-TableExtract-version;.tar.gz">
+            url="http://cpan.org/authors/id/M/MS/MSISK/HTML-TableExtract-&HTML-TableExtract-version;.tar.gz">
             HTML-TableExtract-&HTML-TableExtract-version;</ulink></para>
 
@@ -783,5 +783,5 @@
           <listitem>
             <para id="perl-text-csv_xs"><ulink
-            url="http://www.cpan.org/authors/id/J/JW/JWIED/Text-CSV_XS-&Text-CSV_XS-version;.tar.gz">
+            url="http://cpan.org/authors/id/J/JW/JWIED/Text-CSV_XS-&Text-CSV_XS-version;.tar.gz">
             Text-CSV_XS-&Text-CSV_XS-version;</ulink></para>
             <indexterm zone="perl-modules perl-text-csv_xs">
@@ -810,5 +810,5 @@
       <listitem>
         <para><ulink
-        url="http://www.cpan.org/authors/id/S/SM/SMPETERS/Archive-Zip-&Archive-Zip-version;.tar.gz">
+        url="http://cpan.org/authors/id/S/SM/SMPETERS/Archive-Zip-&Archive-Zip-version;.tar.gz">
         Archive-Zip-&Archive-Zip-version;</ulink></para>
 
@@ -816,5 +816,5 @@
           <listitem>
             <para><ulink
-            url="http://www.cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
+            url="http://cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
             Compress-Zlib-&Compress-Zlib-version;</ulink></para>
           </listitem>
