This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Fix use of == to compare strings in perlref.pod
[perl5.git] / pod / perlmodlib.PL
index 23251ac..608b64e 100644 (file)
@@ -5,35 +5,47 @@ use warnings;
 
 $ENV{LC_ALL} = 'C';
 
-use FindBin;
-chdir $FindBin::Bin or die "$0: Can't chdir $FindBin::Bin: $!";
+my $Quiet;
+@ARGV = grep { not($_ eq '-q' and $Quiet = 1) } @ARGV;
 
-my $Quiet = @ARGV && $ARGV[0] eq '-q';
-
-open (OUT, ">perlmodlib.pod") or die $!;
-my (@pragma, @mod, @files);
+if (@ARGV) {
+    my $workdir = shift;
+    chdir $workdir
+        or die "Couldn't chdir to '$workdir': $!";
+}
+require 'regen/regen_lib.pl';
 
 # MANIFEST itself is Unix style filenames, so we have to assume that Unix style
 # filenames will work.
 
-open (MANIFEST, "../MANIFEST") or die $!;
-@files = grep m#(?:\.pm|\.pod|_pm\.PL)#, map {s/\s.*//s; $_}
-    grep {m#^lib# || m#^ext#} grep !m#/(?:t|demo)/#, <MANIFEST>;
+open MANIFEST, '<', 'MANIFEST'
+    or die "Can't open MANIFEST: $!";
+my @files =
+    grep !m#/perl.*\.pod#,
+    grep m#(?:\.pm|\.pod|_pm\.PL)#,
+    map {s/\s.*//s; $_}
+    grep { m#^(lib|ext|dist|cpan)/# && !m#/(?:t|demo)/# }
+    <MANIFEST>;
+close MANIFEST
+    or die "$0: failed to close MANIFEST: $!";
+
+my $out = open_new('pod/perlmodlib.pod', undef,
+                   {by => "$0 extracting documentation",
+                    from => 'the Perl source files'}, 1);
 
 my %exceptions = (
     'abbrev' => 'Text::Abbrev',
     'carp' => 'Carp',
     'getopt' => 'Getopt::Std',
-    'B<CGI::Carp>' => 'CGI::Carp',
-    'ModuleInfo' => 'Module::Build::ModuleInfo',
-    '$notes_name' => 'Module::Build::Notes',
     'Encode::MIME::NAME' => 'Encode::MIME::Name',
     'libnetFAQ' => 'Net::libnetFAQ',
 );
 
+my (@pragma, @mod);
+
 for my $filename (@files) {
-    unless (open MOD, '<', "../$filename") {
-       warn "Couldn't open ../$filename: $!";
+    unless (open MOD, '<', $filename) {
+        warn "Couldn't open $filename: $!";
        next;
     }
 
@@ -54,7 +66,8 @@ for my $filename (@files) {
     }
     my $title = <MOD>;
     chomp $title;
-    close MOD;
+    close MOD
+        or die "Error closing $filename: $!";
 
     ($name, $thing) = split / --? /, $title, 2;
 
@@ -80,17 +93,16 @@ for my $filename (@files) {
 # Much easier to special case it like this than special case the depending on
 # and parsing lib/Config.pod, or special case opening configpm and finding its
 # =head1 (which is not found with the $/="" above)
-push @mod, <<'CONFIG';
-=item Config
+push @mod, "=item Config\n\nAccess Perl configuration information\n\n";
 
-Access Perl configuration information
 
-CONFIG
-
-print OUT <<'EOF';
-=for maintainers
-Generated by perlmodlib.PL -- DO NOT EDIT!
+# The intent of using =cut as the heredoc terminator is to make the whole file
+# parse as (reasonably) sane Pod as-is to anything that attempts to
+# brute-force treat it as such. The content is already useful - this just
+# makes it tidier, by stopping anything doing this mistaking the rest of the
+# Perl code for Pod. eg http://search.cpan.org/dist/perl/pod/perlmodlib.PL
 
+print $out <<'=cut';
 =head1 NAME
 
 perlmodlib - constructing new Perl modules and finding existing ones
@@ -137,11 +149,12 @@ The following pragmas are defined (and have their own documentation).
 
 =over 12
 
-EOF
+=cut
+
+print $out $_ for sort @pragma;
 
-print OUT $_ for (sort @pragma);
+print $out <<'=cut';
 
-print OUT <<EOF;
 =back
 
 =head2 Standard Modules
@@ -156,11 +169,12 @@ don't have the gdbm library.
 
 =over 12
 
-EOF
+=cut
 
-print OUT $_ for (sort @mod);
+print $out $_ for sort @mod;
+
+print $out <<'=cut', "=cut\n";
 
-print OUT <<'EOF';
 =back
 
 To find out I<all> modules installed on your system, including
@@ -318,17 +332,20 @@ European and the South American sites.
 
 Registered CPAN sites
 
+=for maintainers
+Generated by Porting/make_modlib_cpan.pl
+
 =head2 Africa
 
 =over 4
 
 =item South Africa
 
-                      http://cpan.mirror.ac.za/
-                      ftp://cpan.mirror.ac.za/
-                      http://mirror.is.co.za/pub/cpan/
-                      ftp://ftp.is.co.za/pub/cpan/
-                      ftp://ftp.saix.net/pub/CPAN/
+  http://cpan.mirror.ac.za/
+  ftp://cpan.mirror.ac.za/
+  http://mirror.is.co.za/pub/cpan/
+  ftp://ftp.is.co.za/pub/cpan/
+  ftp://ftp.saix.net/pub/CPAN/
 
 =back
 
@@ -336,97 +353,92 @@ Registered CPAN sites
 
 =over 4
 
+=item China
+
+  http://cpan.wenzk.com/
+
 =item Hong Kong
 
-                      http://ftp.cuhk.edu.hk/pub/packages/perl/CPAN/
-                      ftp://ftp.cuhk.edu.hk/pub/packages/perl/CPAN/
-                      http://mirrors.geoexpat.com/cpan/
+  http://ftp.cuhk.edu.hk/pub/packages/perl/CPAN/
+  ftp://ftp.cuhk.edu.hk/pub/packages/perl/CPAN/
+  http://mirrors.geoexpat.com/cpan/
 
 =item India
 
-                      http://perlmirror.indialinks.com/
+  http://perlmirror.indialinks.com/
 
 =item Indonesia
 
-                      http://cpan.biz.net.id/
-                      http://komo.vlsm.org/CPAN/
-                      ftp://komo.vlsm.org/CPAN/
-                      http://cpan.pesat.net.id/
-                      http://mirror.unej.ac.id/cpan/
-                      ftp://mirror.unej.ac.id/cpan/
+  http://cpan.biz.net.id/
+  http://komo.vlsm.org/CPAN/
+  ftp://komo.vlsm.org/CPAN/
+  http://cpan.cermin.lipi.go.id/
+  ftp://cermin.lipi.go.id/pub/CPAN/
+  http://cpan.pesat.net.id/
 
 =item Japan
 
-                      ftp://ftp.u-aizu.ac.jp/pub/CPAN
-                      ftp://ftp.kddilabs.jp/CPAN/
-                      http://ftp.nara.wide.ad.jp/pub/CPAN/
-                      ftp://ftp.nara.wide.ad.jp/pub/CPAN/
-                      http://ftp.jaist.ac.jp/pub/CPAN/
-                      ftp://ftp.jaist.ac.jp/pub/CPAN/
-                      ftp://ftp.dti.ad.jp/pub/lang/CPAN/
-                      ftp://ftp.ring.gr.jp/pub/lang/perl/CPAN/
-                      http://ftp.riken.jp/lang/CPAN/
-                      ftp://ftp.riken.jp/lang/CPAN/
-                      http://ftp.yz.yamagata-u.ac.jp/pub/lang/cpan/
-                      ftp://ftp.yz.yamagata-u.ac.jp/pub/lang/cpan/
-
-=item Kazakhstan
-
-                      http://mirror.linuxiso.kz/CPAN/
+  ftp://ftp.u-aizu.ac.jp/pub/CPAN
+  ftp://ftp.kddilabs.jp/CPAN/
+  http://ftp.nara.wide.ad.jp/pub/CPAN/
+  ftp://ftp.nara.wide.ad.jp/pub/CPAN/
+  http://ftp.jaist.ac.jp/pub/CPAN/
+  ftp://ftp.jaist.ac.jp/pub/CPAN/
+  ftp://ftp.dti.ad.jp/pub/lang/CPAN/
+  ftp://ftp.ring.gr.jp/pub/lang/perl/CPAN/
+  http://ftp.riken.jp/lang/CPAN/
+  ftp://ftp.riken.jp/lang/CPAN/
+  http://ftp.yz.yamagata-u.ac.jp/pub/lang/cpan/
+  ftp://ftp.yz.yamagata-u.ac.jp/pub/lang/cpan/
 
 =item Republic of Korea
 
-                      http://ftp.kaist.ac.kr/pub/CPAN
-                      ftp://ftp.kaist.ac.kr/pub/CPAN
-                      http://cpan.mirror.cdnetworks.com/
-                      ftp://cpan.mirror.cdnetworks.com/CPAN/
-                      http://cpan.sarang.net/
-                      ftp://cpan.sarang.net/CPAN/
+  http://ftp.kaist.ac.kr/pub/CPAN
+  ftp://ftp.kaist.ac.kr/pub/CPAN
+  http://cpan.mirror.cdnetworks.com/
+  ftp://cpan.mirror.cdnetworks.com/CPAN/
+  http://cpan.sarang.net/
+  ftp://cpan.sarang.net/CPAN/
 
 =item Russia
 
-                      http://cpan.tomsk.ru/
-                      ftp://cpan.tomsk.ru/
+  http://cpan.tomsk.ru/
+  ftp://cpan.tomsk.ru/
 
 =item Singapore
 
-                      http://mirror.averse.net/pub/CPAN
-                      ftp://mirror.averse.net/pub/CPAN
-                      http://cpan.mirror.choon.net/
-                      http://cpan.oss.eznetsols.org
-                      ftp://ftp.oss.eznetsols.org/cpan
+  http://mirror.averse.net/pub/CPAN
+  ftp://mirror.averse.net/pub/CPAN
+  http://cpan.mirror.choon.net/
+  http://cpan.oss.eznetsols.org
+  ftp://ftp.oss.eznetsols.org/cpan
 
 =item Taiwan
 
-                      http://ftp.cse.yzu.edu.tw/pub/CPAN/
-                      ftp://ftp.cse.yzu.edu.tw/pub/CPAN/
-                      http://cpan.nctu.edu.tw/
-                      ftp://cpan.nctu.edu.tw/
-                      ftp://ftp.ncu.edu.tw/CPAN/
-                      http://cpan.cdpa.nsysu.edu.tw/
-                      ftp://cpan.cdpa.nsysu.edu.tw/Unix/Lang/CPAN/
-                      http://cpan.stu.edu.tw
-                      ftp://ftp.stu.edu.tw/CPAN
-                      http://ftp.stu.edu.tw/CPAN
-                      ftp://ftp.stu.edu.tw/pub/CPAN
-                      http://cpan.cs.pu.edu.tw/
-                      ftp://cpan.cs.pu.edu.tw/pub/CPAN
+  http://ftp.cse.yzu.edu.tw/pub/CPAN/
+  ftp://ftp.cse.yzu.edu.tw/pub/CPAN/
+  http://cpan.nctu.edu.tw/
+  ftp://cpan.nctu.edu.tw/
+  ftp://ftp.ncu.edu.tw/CPAN/
+  http://cpan.cdpa.nsysu.edu.tw/
+  ftp://cpan.cdpa.nsysu.edu.tw/Unix/Lang/CPAN/
+  http://cpan.stu.edu.tw
+  ftp://ftp.stu.edu.tw/CPAN
+  http://ftp.stu.edu.tw/CPAN
+  ftp://ftp.stu.edu.tw/pub/CPAN
+  http://cpan.cs.pu.edu.tw/
+  ftp://cpan.cs.pu.edu.tw/pub/CPAN
 
 =item Thailand
 
-                      http://mirrors.issp.co.th/cpan/
-                      ftp://mirrors.issp.co.th/cpan/
+  http://mirrors.issp.co.th/cpan/
+  ftp://mirrors.issp.co.th/cpan/
+  http://mirror.yourconnect.com/CPAN/
+  ftp://mirror.yourconnect.com/CPAN/
 
 =item Turkey
 
-                      http://cpan.gazi.edu.tr/
-                      http://cpan.ulak.net.tr
-                      ftp://ftp.ulak.net.tr/pub/CPAN
-
-=item Viet Nam
-
-                      http://mirror-fpt-telecom.fpt.net/cpan/
-                      ftp://mirror-fpt-telecom.fpt.net/cpan/
+  http://cpan.gazi.edu.tr/
 
 =back
 
@@ -436,8 +448,8 @@ Registered CPAN sites
 
 =item Costa Rica
 
-                      http://mirrors.ucr.ac.cr/CPAN/
-                      ftp://mirrors.ucr.ac.cr/CPAN/
+  http://mirrors.ucr.ac.cr/CPAN/
+  ftp://mirrors.ucr.ac.cr/CPAN/
 
 =back
 
@@ -447,284 +459,274 @@ Registered CPAN sites
 
 =item Austria
 
-                      http://cpan.inode.at/
-                      ftp://cpan.inode.at
-                      http://gd.tuwien.ac.at/languages/perl/CPAN/
-                      ftp://gd.tuwien.ac.at/pub/CPAN/
+  http://cpan.inode.at/
+  ftp://cpan.inode.at
+  http://gd.tuwien.ac.at/languages/perl/CPAN/
+  ftp://gd.tuwien.ac.at/pub/CPAN/
 
 =item Belgium
 
-                      http://ftp.belnet.be/mirror/ftp.cpan.org/
-                      ftp://ftp.belnet.be/mirror/ftp.cpan.org/
-                      http://ftp.easynet.be/pub/CPAN/
-                      http://cpan.weepee.org/
-                      http://cpan.fluoline.net/
+  http://ftp.belnet.be/mirror/ftp.cpan.org/
+  ftp://ftp.belnet.be/mirror/ftp.cpan.org/
+  http://ftp.easynet.be/pub/CPAN/
+  http://cpan.weepee.org/
 
 =item Bosnia and Herzegovina
 
-                      http://cpan.blic.net/
+  http://cpan.blic.net/
 
 =item Bulgaria
 
-                      http://cpan.cbox.biz/
-                      ftp://cpan.cbox.biz/cpan/
-                      http://cpan.digsys.bg/
-                      ftp://ftp.digsys.bg/pub/CPAN
+  http://cpan.cbox.biz/
+  ftp://cpan.cbox.biz/cpan/
+  http://cpan.digsys.bg/
+  ftp://ftp.digsys.bg/pub/CPAN
 
 =item Croatia
 
-                      http://ftp.carnet.hr/pub/CPAN/
-                      ftp://ftp.carnet.hr/pub/CPAN/
+  http://ftp.carnet.hr/pub/CPAN/
+  ftp://ftp.carnet.hr/pub/CPAN/
 
 =item Czech Republic
 
-                      ftp://ftp.fi.muni.cz/pub/CPAN/
-                      http://archive.cpan.cz/
+  ftp://ftp.fi.muni.cz/pub/CPAN/
+  http://archive.cpan.cz/
 
 =item Denmark
 
-                      http://mirrors.dotsrc.org/cpan
-                      ftp://mirrors.dotsrc.org/cpan/
-                      http://www.cpan.dk/
-                      http://mirror.uni-c.dk/pub/CPAN/
+  http://mirrors.dotsrc.org/cpan
+  ftp://mirrors.dotsrc.org/cpan/
+  http://www.cpan.dk/
+  http://mirror.uni-c.dk/pub/CPAN/
 
 =item Finland
 
-                      ftp://ftp.funet.fi/pub/languages/perl/CPAN/
-                      http://mirror.eunet.fi/CPAN
+  ftp://ftp.funet.fi/pub/languages/perl/CPAN/
+  http://mirror.eunet.fi/CPAN
 
 =item France
 
-                      http://cpan.enstimac.fr/
-                      ftp://ftp.inria.fr/pub/CPAN/
-                      http://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/cpan/
-                      ftp://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/cpan/
-                      ftp://ftp.lip6.fr/pub/perl/CPAN/
-                      http://mir2.ovh.net/ftp.cpan.org
-                      ftp://mir1.ovh.net/ftp.cpan.org
-                      http://cpan.miroir-francais.fr/
-                      ftp://miroir-francais.fr/pub/cpan/
-                      ftp://ftp.oleane.net/pub/CPAN/
-                      http://ftp.crihan.fr/mirrors/ftp.cpan.org/
-                      ftp://ftp.crihan.fr/mirrors/ftp.cpan.org/
-                      http://ftp.u-strasbg.fr/CPAN
-                      ftp://ftp.u-strasbg.fr/CPAN
-                      http://cpan.cict.fr/
-                      ftp://cpan.cict.fr/pub/CPAN/
+  http://cpan.enstimac.fr/
+  ftp://ftp.inria.fr/pub/CPAN/
+  http://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/cpan/
+  ftp://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/cpan/
+  ftp://ftp.lip6.fr/pub/perl/CPAN/
+  http://mir2.ovh.net/ftp.cpan.org
+  ftp://mir1.ovh.net/ftp.cpan.org
+  ftp://ftp.oleane.net/pub/CPAN/
+  http://ftp.crihan.fr/mirrors/ftp.cpan.org/
+  ftp://ftp.crihan.fr/mirrors/ftp.cpan.org/
+  http://ftp.u-strasbg.fr/CPAN
+  ftp://ftp.u-strasbg.fr/CPAN
+  http://cpan.cict.fr/
+  ftp://cpan.cict.fr/pub/CPAN/
 
 =item Germany
 
-                      ftp://ftp.fu-berlin.de/unix/languages/perl/
-                      http://mirrors.softliste.de/cpan/
-                      ftp://ftp.rub.de/pub/CPAN/
-                      http://www.planet-elektronik.de/CPAN/
-                      http://ftp.hosteurope.de/pub/CPAN/
-                      ftp://ftp.hosteurope.de/pub/CPAN/
-                      http://www.mirrorspace.org/cpan/
-                      http://mirror.netcologne.de/cpan/
-                      ftp://mirror.netcologne.de/cpan/
-                      ftp://ftp.freenet.de/pub/ftp.cpan.org/pub/CPAN/
-                      http://ftp-stud.hs-esslingen.de/pub/Mirrors/CPAN/
-                      ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/CPAN/
-                      http://mirrors.zerg.biz/cpan/
-                      http://ftp.gwdg.de/pub/languages/perl/CPAN/
-                      ftp://ftp.gwdg.de/pub/languages/perl/CPAN/
-                      http://dl.ambiweb.de/mirrors/ftp.cpan.org/
-                      http://cpan.mirror.clusters.kg/
-                      http://cpan.mirror.iphh.net/
-                      ftp://cpan.mirror.iphh.net/pub/CPAN/
-                      http://cpan.mirroring.de/
-                      http://mirror.informatik.uni-mannheim.de/pub/mirrors/CPAN/
-                      ftp://mirror.informatik.uni-mannheim.de/pub/mirrors/CPAN/
-                      http://ftp.cw.net/pub/CPAN/
-                      ftp://ftp.cw.net/pub/CPAN/
-                      http://cpan.cpantesters.org/
-                      ftp://cpan.cpantesters.org/CPAN/
-                      http://cpan.mirrored.de/
-                      ftp://mirror.petamem.com/CPAN/
-                      http://cpan.noris.de/
-                      ftp://cpan.noris.de/pub/CPAN/
-                      ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/
-                      ftp://ftp.gmd.de/mirrors/CPAN/
+  ftp://ftp.fu-berlin.de/unix/languages/perl/
+  http://mirrors.softliste.de/cpan/
+  ftp://ftp.rub.de/pub/CPAN/
+  http://www.planet-elektronik.de/CPAN/
+  http://ftp.hosteurope.de/pub/CPAN/
+  ftp://ftp.hosteurope.de/pub/CPAN/
+  http://www.mirrorspace.org/cpan/
+  http://mirror.netcologne.de/cpan/
+  ftp://mirror.netcologne.de/cpan/
+  ftp://ftp.freenet.de/pub/ftp.cpan.org/pub/CPAN/
+  http://ftp-stud.hs-esslingen.de/pub/Mirrors/CPAN/
+  ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/CPAN/
+  http://mirrors.zerg.biz/cpan/
+  http://ftp.gwdg.de/pub/languages/perl/CPAN/
+  ftp://ftp.gwdg.de/pub/languages/perl/CPAN/
+  http://dl.ambiweb.de/mirrors/ftp.cpan.org/
+  http://cpan.mirror.clusters.kg/
+  http://cpan.mirror.iphh.net/
+  ftp://cpan.mirror.iphh.net/pub/CPAN/
+  http://cpan.mirroring.de/
+  http://mirror.informatik.uni-mannheim.de/pub/mirrors/CPAN/
+  ftp://mirror.informatik.uni-mannheim.de/pub/mirrors/CPAN/
+  http://www.chemmedia.de/mirrors/CPAN/
+  http://ftp.cw.net/pub/CPAN/
+  ftp://ftp.cw.net/pub/CPAN/
+  http://cpan.cpantesters.org/
+  ftp://cpan.cpantesters.org/CPAN/
+  http://cpan.mirrored.de/
+  ftp://mirror.petamem.com/CPAN/
+  http://cpan.noris.de/
+  ftp://cpan.noris.de/pub/CPAN/
+  ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/
+  ftp://ftp.gmd.de/mirrors/CPAN/
 
 =item Greece
 
-                      ftp://ftp.forthnet.gr/pub/languages/perl/CPAN
-                      ftp://ftp.ntua.gr/pub/lang/perl/
-                      http://cpan.cc.uoc.gr/
-                      ftp://ftp.cc.uoc.gr/mirrors/CPAN/
+  ftp://ftp.forthnet.gr/pub/languages/perl/CPAN
+  ftp://ftp.ntua.gr/pub/lang/perl/
+  http://cpan.cc.uoc.gr/
+  ftp://ftp.cc.uoc.gr/mirrors/CPAN/
 
 =item Hungary
 
-                      http://cpan.mirrors.enexis.hu/
-                      ftp://cpan.mirrors.enexis.hu/mirrors/cpan/
-                      http://cpan.hu/
+  http://cpan.mirrors.enexis.hu/
+  ftp://cpan.mirrors.enexis.hu/mirrors/cpan/
+  http://cpan.hu/
 
 =item Iceland
 
-                      http://ftp.rhnet.is/pub/CPAN/
-                      ftp://ftp.rhnet.is/pub/CPAN/
+  http://ftp.rhnet.is/pub/CPAN/
+  ftp://ftp.rhnet.is/pub/CPAN/
 
 =item Ireland
 
-                      http://ftp.esat.net/pub/languages/perl/CPAN/
-                      ftp://ftp.esat.net/pub/languages/perl/CPAN/
-                      http://ftp.heanet.ie/mirrors/ftp.perl.org/pub/CPAN
-                      ftp://ftp.heanet.ie/mirrors/ftp.perl.org/pub/CPAN
+  http://ftp.esat.net/pub/languages/perl/CPAN/
+  ftp://ftp.esat.net/pub/languages/perl/CPAN/
+  http://ftp.heanet.ie/mirrors/ftp.perl.org/pub/CPAN
+  ftp://ftp.heanet.ie/mirrors/ftp.perl.org/pub/CPAN
 
 =item Italy
 
-                      http://bo.mirror.garr.it/mirrors/CPAN/
-                      http://cpan.panu.it/
-                      ftp://ftp.panu.it/pub/mirrors/perl/CPAN/
-                      http://cpan.fastbull.org/
+  http://bo.mirror.garr.it/mirrors/CPAN/
+  http://cpan.panu.it/
+  ftp://ftp.panu.it/pub/mirrors/perl/CPAN/
 
 =item Latvia
 
-                      http://kvin.lv/pub/CPAN/
+  http://kvin.lv/pub/CPAN/
 
 =item Lithuania
 
-                      http://ftp.litnet.lt/pub/CPAN/
-                      ftp://ftp.litnet.lt/pub/CPAN/
+  http://ftp.litnet.lt/pub/CPAN/
+  ftp://ftp.litnet.lt/pub/CPAN/
 
 =item Malta
 
-                      http://cpan.waldonet.net.mt/
+  http://cpan.waldonet.net.mt/
 
 =item Netherlands
 
-                      ftp://ftp.quicknet.nl/pub/CPAN/
-                      http://mirror.hostfuss.com/CPAN/
-                      ftp://mirror.hostfuss.com/CPAN/
-                      http://mirrors3.kernel.org/cpan/
-                      ftp://mirrors3.kernel.org/pub/CPAN/
-                      http://cpan.osmirror.nl/
-                      ftp://ftp.osmirror.nl/pub/cpan/
-                      http://cpan.mirror.versatel.nl/
-                      ftp://ftp.mirror.versatel.nl/cpan/
-                      ftp://download.xs4all.nl/pub/mirror/CPAN/
-                      http://mirror.leaseweb.com/CPAN/
-                      ftp://mirror.leaseweb.com/CPAN/
-                      ftp://ftp.cpan.nl/pub/CPAN/
-                      http://archive.cs.uu.nl/mirror/CPAN/
-                      ftp://ftp.cs.uu.nl/mirror/CPAN/
-                      http://https://luxitude.net/cpan/
+  ftp://ftp.quicknet.nl/pub/CPAN/
+  http://mirror.hostfuss.com/CPAN/
+  ftp://mirror.hostfuss.com/CPAN/
+  http://mirrors3.kernel.org/cpan/
+  ftp://mirrors3.kernel.org/pub/CPAN/
+  http://cpan.mirror.versatel.nl/
+  ftp://ftp.mirror.versatel.nl/cpan/
+  ftp://download.xs4all.nl/pub/mirror/CPAN/
+  http://mirror.leaseweb.com/CPAN/
+  ftp://mirror.leaseweb.com/CPAN/
+  ftp://ftp.cpan.nl/pub/CPAN/
+  http://archive.cs.uu.nl/mirror/CPAN/
+  ftp://ftp.cs.uu.nl/mirror/CPAN/
+  http://luxitude.net/cpan/
 
 =item Norway
 
-                      ftp://ftp.uninett.no/pub/languages/perl/CPAN
-                      ftp://ftp.uit.no/pub/languages/perl/cpan/
+  ftp://ftp.uninett.no/pub/languages/perl/CPAN
+  ftp://ftp.uit.no/pub/languages/perl/cpan/
 
 =item Poland
 
-                      http://mirror.icis.pcz.pl/CPAN/
-                      ftp://mirror.icis.pcz.pl/CPAN/
-                      http://piotrkosoft.net/pub/mirrors/CPAN/
-                      ftp://ftp.piotrkosoft.net/pub/mirrors/CPAN/
-                      http://ftp.man.poznan.pl/pub/CPAN
-                      ftp://ftp.man.poznan.pl/pub/CPAN
-                      ftp://sunsite.icm.edu.pl/pub/CPAN/
-                      ftp://ftp.tpnet.pl/d4/CPAN/
+  http://piotrkosoft.net/pub/mirrors/CPAN/
+  ftp://ftp.piotrkosoft.net/pub/mirrors/CPAN/
+  http://ftp.man.poznan.pl/pub/CPAN
+  ftp://ftp.man.poznan.pl/pub/CPAN
+  ftp://ftp.ps.pl/pub/CPAN/
+  ftp://sunsite.icm.edu.pl/pub/CPAN/
+  ftp://ftp.tpnet.pl/d4/CPAN/
 
 =item Portugal
 
-                      http://cpan.dei.uc.pt/
-                      ftp://ftp.dei.uc.pt/pub/CPAN
-                      ftp://ftp.ist.utl.pt/pub/CPAN/
-                      http://cpan.perl.pt/
-                      http://cpan.ip.pt/
-                      ftp://cpan.ip.pt/pub/cpan/
-                      http://mirrors.nfsi.pt/CPAN/
-                      ftp://mirrors.nfsi.pt/pub/CPAN/
-                      http://cpan.dcc.fc.up.pt/
+  http://cpan.dei.uc.pt/
+  ftp://ftp.dei.uc.pt/pub/CPAN
+  ftp://ftp.ist.utl.pt/pub/CPAN/
+  http://cpan.perl.pt/
+  http://cpan.ip.pt/
+  ftp://cpan.ip.pt/pub/cpan/
+  http://mirrors.nfsi.pt/CPAN/
+  ftp://mirrors.nfsi.pt/pub/CPAN/
+  http://cpan.dcc.fc.up.pt/
 
 =item Romania
 
-                      http://ftp.astral.ro/pub/CPAN/
-                      ftp://ftp.astral.ro/pub/CPAN/
-                      ftp://ftp.lug.ro/CPAN
-                      http://mirrors.xservers.ro/CPAN/
-                      http://mirrors.hostingromania.ro/ftp.cpan.org/
-                      ftp://ftp.hostingromania.ro/mirrors/ftp.cpan.org/
-                      ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.cpan.org/
-                      ftp://ftp.ambra.ro/pub/CPAN
+  http://ftp.astral.ro/pub/CPAN/
+  ftp://ftp.astral.ro/pub/CPAN/
+  ftp://ftp.lug.ro/CPAN
+  http://mirrors.xservers.ro/CPAN/
+  http://mirrors.hostingromania.ro/ftp.cpan.org/
+  ftp://ftp.hostingromania.ro/mirrors/ftp.cpan.org/
+  ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.cpan.org/
 
 =item Russia
 
-                      ftp://ftp.aha.ru/CPAN/
-                      http://cpan.rinet.ru/
-                      ftp://cpan.rinet.ru/pub/mirror/CPAN/
-                      ftp://ftp.SpringDaemons.com/pub/CPAN/
-                      http://cpan.nx1.ru/
-                      ftp://cpan.nx1.ru/
-                      http://mirror.rol.ru/CPAN/
-                      http://ftp.silvernet.ru/CPAN/
-                      http://ftp.spbu.ru/CPAN/
-                      ftp://ftp.spbu.ru/CPAN/
+  ftp://ftp.aha.ru/CPAN/
+  http://cpan.rinet.ru/
+  ftp://cpan.rinet.ru/pub/mirror/CPAN/
+  ftp://ftp.SpringDaemons.com/pub/CPAN/
+  http://mirror.rol.ru/CPAN/
+  http://ftp.silvernet.ru/CPAN/
+  http://ftp.spbu.ru/CPAN/
+  ftp://ftp.spbu.ru/CPAN/
 
 =item Slovakia
 
-                      http://cpan.fyxm.net/
+  http://cpan.fyxm.net/
 
 =item Slovenia
 
-                      http://www.klevze.si/cpan
+  http://www.klevze.si/cpan
 
 =item Spain
 
-                      http://osl.ugr.es/CPAN/
-                      ftp://ftp.rediris.es/mirror/CPAN/
-                      http://ftp.gui.uva.es/sites/cpan.org/
-                      ftp://ftp.gui.uva.es/sites/cpan.org/
+  http://osl.ugr.es/CPAN/
+  ftp://ftp.rediris.es/mirror/CPAN/
+  http://ftp.gui.uva.es/sites/cpan.org/
+  ftp://ftp.gui.uva.es/sites/cpan.org/
 
 =item Sweden
 
-                      http://mirrors4.kernel.org/cpan/
-                      ftp://mirrors4.kernel.org/pub/CPAN/
+  http://mirrors4.kernel.org/cpan/
+  ftp://mirrors4.kernel.org/pub/CPAN/
 
 =item Switzerland
 
-                      http://cpan.mirror.solnet.ch/
-                      ftp://ftp.solnet.ch/mirror/CPAN/
-                      http://mirror.switch.ch/ftp/mirror/CPAN/
-                      ftp://mirror.switch.ch/mirror/CPAN/
+  http://cpan.mirror.solnet.ch/
+  ftp://ftp.solnet.ch/mirror/CPAN/
+  ftp://ftp.adwired.ch/CPAN/
+  http://mirror.switch.ch/ftp/mirror/CPAN/
+  ftp://mirror.switch.ch/mirror/CPAN/
 
 =item Ukraine
 
-                      http://cpan.makeperl.org/
-                      ftp://cpan.makeperl.org/pub/CPAN
-                      http://cpan.org.ua/
-                      http://no-more.kiev.ua/CPAN/
-                      ftp://no-more.kiev.ua/pub/CPAN/
-                      http://cpan.gafol.net/
-                      ftp://ftp.gafol.net/pub/cpan/
+  http://cpan.makeperl.org/
+  ftp://cpan.makeperl.org/pub/CPAN
+  http://cpan.org.ua/
+  http://cpan.gafol.net/
+  ftp://ftp.gafol.net/pub/cpan/
 
 =item United Kingdom
 
-                      http://www.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/
-                      ftp://ftp.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/
-                      http://mirror.tje.me.uk/pub/mirrors/ftp.cpan.org/
-                      ftp://mirror.tje.me.uk/pub/mirrors/ftp.cpan.org/
-                      http://www.mirror.8086.net/sites/CPAN/
-                      ftp://ftp.mirror.8086.net/sites/CPAN/
-                      http://cpan.mirror.anlx.net/
-                      ftp://ftp.mirror.anlx.net/CPAN/
-                      http://mirror.bytemark.co.uk/CPAN/
-                      ftp://mirror.bytemark.co.uk/CPAN/
-                      http://cpan.etla.org/
-                      ftp://cpan.etla.org/pub/CPAN
-                      ftp://ftp.demon.co.uk/pub/CPAN/
-                      http://mirror.sov.uk.goscomb.net/CPAN/
-                      ftp://mirror.sov.uk.goscomb.net/pub/CPAN/
-                      http://ftp.plig.net/pub/CPAN/
-                      ftp://ftp.plig.net/pub/CPAN/
-                      http://ftp.ticklers.org/pub/CPAN/
-                      ftp://ftp.ticklers.org/pub/CPAN/
-                      http://cpan.mirrors.uk2.net/
-                      ftp://mirrors.uk2.net/pub/CPAN/
-                      http://mirror.ox.ac.uk/sites/www.cpan.org/
-                      ftp://mirror.ox.ac.uk/sites/www.cpan.org/
+  http://www.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/
+  ftp://ftp.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/
+  http://mirror.tje.me.uk/pub/mirrors/ftp.cpan.org/
+  ftp://mirror.tje.me.uk/pub/mirrors/ftp.cpan.org/
+  http://www.mirror.8086.net/sites/CPAN/
+  ftp://ftp.mirror.8086.net/sites/CPAN/
+  http://cpan.mirror.anlx.net/
+  ftp://ftp.mirror.anlx.net/CPAN/
+  http://mirror.bytemark.co.uk/CPAN/
+  ftp://mirror.bytemark.co.uk/CPAN/
+  http://cpan.etla.org/
+  ftp://cpan.etla.org/pub/CPAN
+  ftp://ftp.demon.co.uk/pub/CPAN/
+  http://mirror.sov.uk.goscomb.net/CPAN/
+  ftp://mirror.sov.uk.goscomb.net/pub/CPAN/
+  http://ftp.plig.net/pub/CPAN/
+  ftp://ftp.plig.net/pub/CPAN/
+  http://ftp.ticklers.org/pub/CPAN/
+  ftp://ftp.ticklers.org/pub/CPAN/
+  http://cpan.mirrors.uk2.net/
+  ftp://mirrors.uk2.net/pub/CPAN/
+  http://mirror.ox.ac.uk/sites/www.cpan.org/
+  ftp://mirror.ox.ac.uk/sites/www.cpan.org/
 
 =back
 
@@ -734,30 +736,28 @@ Registered CPAN sites
 
 =item Bahamas
 
-                      http://www.securehost.com/mirror/CPAN/
+  http://www.securehost.com/mirror/CPAN/
 
 =item Canada
 
-                      http://cpan.justanotherperlhacker.com/pub/CPAN/
-                      ftp://cpan.justanotherperlhacker.com/pub/CPAN/
-                      http://cpan.arcticnetwork.ca
-                      ftp://mirror.arcticnetwork.ca/pub/CPAN
-                      http://cpan.sunsite.ualberta.ca/
-                      ftp://cpan.sunsite.ualberta.ca/pub/CPAN/
-                      http://theoryx5.uwinnipeg.ca/pub/CPAN/
-                      ftp://theoryx5.uwinnipeg.ca/pub/CPAN/
-                      http://arwen.cs.dal.ca/mirror/CPAN/
-                      ftp://arwen.cs.dal.ca/pub/mirror/CPAN/
-                      http://CPAN.mirror.rafal.ca/
-                      ftp://CPAN.mirror.rafal.ca/pub/CPAN/
-                      ftp://ftp.nrc.ca/pub/CPAN/
-                      http://mirror.csclub.uwaterloo.ca/pub/CPAN/
-                      ftp://mirror.csclub.uwaterloo.ca/pub/CPAN/
+  http://cpan.arcticnetwork.ca
+  ftp://mirror.arcticnetwork.ca/pub/CPAN
+  http://cpan.sunsite.ualberta.ca/
+  ftp://cpan.sunsite.ualberta.ca/pub/CPAN/
+  http://theoryx5.uwinnipeg.ca/pub/CPAN/
+  ftp://theoryx5.uwinnipeg.ca/pub/CPAN/
+  http://arwen.cs.dal.ca/mirror/CPAN/
+  ftp://arwen.cs.dal.ca/pub/mirror/CPAN/
+  http://CPAN.mirror.rafal.ca/
+  ftp://CPAN.mirror.rafal.ca/pub/CPAN/
+  ftp://ftp.nrc.ca/pub/CPAN/
+  http://mirror.csclub.uwaterloo.ca/pub/CPAN/
+  ftp://mirror.csclub.uwaterloo.ca/pub/CPAN/
 
 =item Mexico
 
-                      http://www.msg.com.mx/CPAN/
-                      ftp://ftp.msg.com.mx/pub/CPAN/
+  http://www.msg.com.mx/CPAN/
+  ftp://ftp.msg.com.mx/pub/CPAN/
 
 =item United States
 
@@ -765,150 +765,145 @@ Registered CPAN sites
 
 =item Alabama
 
-                      http://mirror.hiwaay.net/CPAN/
-                      ftp://mirror.hiwaay.net/CPAN/
+  http://mirror.hiwaay.net/CPAN/
+  ftp://mirror.hiwaay.net/CPAN/
+
+=item Arizona
+
+  http://cpan.ezarticleinformation.com/
 
 =item California
 
-                      http://cpan.knowledgematters.net/
-                      http://cpan.binkerton.com/
-                      http://cpan.develooper.com/
-                      http://mirrors.gossamer-threads.com/CPAN
-                      http://cpan.schatt.com/
-                      http://mirrors.kernel.org/cpan/
-                      ftp://mirrors.kernel.org/pub/CPAN
-                      http://mirrors2.kernel.org/cpan/
-                      ftp://mirrors2.kernel.org/pub/CPAN/
-                      http://cpan.mirrors.redwire.net/
-                      http://cpan.mirror.facebook.net/
-                      http://mirrors1.kernel.org/cpan/
-                      ftp://mirrors1.kernel.org/pub/CPAN/
-                      http://cpan-sj.viaverio.com/
-                      ftp://cpan-sj.viaverio.com/pub/CPAN/
-                      http://www.perl.com/CPAN/
-                      http://cpan.yahoo.com/
+  http://cpan.knowledgematters.net/
+  http://cpan.binkerton.com/
+  http://cpan.develooper.com/
+  http://mirrors.gossamer-threads.com/CPAN
+  http://cpan.schatt.com/
+  http://mirrors.kernel.org/cpan/
+  ftp://mirrors.kernel.org/pub/CPAN
+  http://mirrors2.kernel.org/cpan/
+  ftp://mirrors2.kernel.org/pub/CPAN/
+  http://cpan.mirror.facebook.net/
+  http://mirrors1.kernel.org/cpan/
+  ftp://mirrors1.kernel.org/pub/CPAN/
+  http://cpan-sj.viaverio.com/
+  ftp://cpan-sj.viaverio.com/pub/CPAN/
+  http://www.perl.com/CPAN/
 
 =item Florida
 
-                      ftp://ftp.cise.ufl.edu/pub/mirrors/CPAN/
-                      http://mirror.atlantic.net/pub/CPAN/
-                      ftp://mirror.atlantic.net/pub/CPAN/
-                      http://mirror.candidhosting.com/pub/CPAN
-                      ftp://mirror.candidhosting.com/pub/CPAN
+  ftp://ftp.cise.ufl.edu/pub/mirrors/CPAN/
+  http://mirror.atlantic.net/pub/CPAN/
+  ftp://mirror.atlantic.net/pub/CPAN/
 
 =item Idaho
 
-                      http://mirror.its.uidaho.edu/pub/cpan/
-                      ftp://mirror.its.uidaho.edu/cpan/
+  http://mirror.its.uidaho.edu/pub/cpan/
+  ftp://mirror.its.uidaho.edu/cpan/
 
 =item Illinois
 
-                      http://cpan.mirrors.hoobly.com/
-                      http://cpan.uchicago.edu/pub/CPAN/
-                      ftp://cpan.uchicago.edu/pub/CPAN/
-                      http://mirrors.servercentral.net/CPAN/
-                      http://www.stathy.com/CPAN/
-                      ftp://www.stathy.com/CPAN/
+  http://cpan.mirrors.hoobly.com/
+  http://cpan.uchicago.edu/pub/CPAN/
+  ftp://cpan.uchicago.edu/pub/CPAN/
+  http://mirrors.servercentral.net/CPAN/
+  http://www.stathy.com/CPAN/
+  ftp://www.stathy.com/CPAN/
 
 =item Indiana
 
-                      ftp://ftp.uwsg.iu.edu/pub/perl/CPAN/
-                      http://cpan.netnitco.net/
-                      ftp://cpan.netnitco.net/pub/mirrors/CPAN/
-                      http://ftp.ndlug.nd.edu/pub/perl/
-                      ftp://ftp.ndlug.nd.edu/pub/perl/
-                      http://fx.saintjoe.edu/pub/CPAN
+  ftp://ftp.uwsg.iu.edu/pub/perl/CPAN/
+  http://cpan.netnitco.net/
+  ftp://cpan.netnitco.net/pub/mirrors/CPAN/
+  http://ftp.ndlug.nd.edu/pub/perl/
+  ftp://ftp.ndlug.nd.edu/pub/perl/
 
 =item Massachusetts
 
-                      ftp://ftp.ccs.neu.edu/net/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/
+  http://mirrors.ccs.neu.edu/CPAN/
 
 =item Michigan
 
-                      http://ftp.wayne.edu/cpan/
-                      ftp://ftp.wayne.edu/cpan/
+  http://ftp.wayne.edu/cpan/
+  ftp://ftp.wayne.edu/cpan/
 
 =item Minnesota
 
-                      http://cpan.msi.umn.edu/
+  http://cpan.msi.umn.edu/
 
 =item New Jersey
 
-                      http://mirror.datapipe.net/CPAN/
-                      ftp://mirror.datapipe.net/pub/CPAN/
+  http://mirror.datapipe.net/CPAN/
+  ftp://mirror.datapipe.net/pub/CPAN/
 
 =item New York
 
-                      http://mirrors.24-7-solutions.net/pub/CPAN/
-                      ftp://mirrors.24-7-solutions.net/pub/CPAN/
-                      http://mirror.cc.columbia.edu/pub/software/cpan/
-                      ftp://mirror.cc.columbia.edu/pub/software/cpan/
-                      http://cpan.belfry.net/
-                      http://cpan.erlbaum.net/
-                      ftp://cpan.erlbaum.net/CPAN/
-                      http://cpan.hexten.net/
-                      ftp://cpan.hexten.net/
-                      http://ftp.fxcorporate.com/CPAN/
-                      ftp://ftp.fxcorporate.com/pub/CPAN/
-                      ftp://mirror.nyi.net/CPAN/
-                      http://mirror.rit.edu/CPAN/
-                      ftp://mirror.rit.edu/CPAN/
+  http://mirrors.24-7-solutions.net/pub/CPAN/
+  ftp://mirrors.24-7-solutions.net/pub/CPAN/
+  http://mirror.cc.columbia.edu/pub/software/cpan/
+  ftp://mirror.cc.columbia.edu/pub/software/cpan/
+  http://cpan.belfry.net/
+  http://cpan.erlbaum.net/
+  ftp://cpan.erlbaum.net/CPAN/
+  http://cpan.hexten.net/
+  ftp://cpan.hexten.net/
+  ftp://mirror.nyi.net/CPAN/
+  http://mirror.rit.edu/CPAN/
+  ftp://mirror.rit.edu/CPAN/
 
 =item North Carolina
 
-                      http://www.ibiblio.org/pub/mirrors/CPAN
-                      ftp://ftp.ncsu.edu/pub/mirror/CPAN/
+  http://www.ibiblio.org/pub/mirrors/CPAN
+  ftp://ftp.ncsu.edu/pub/mirror/CPAN/
 
 =item Oregon
 
-                      http://ftp.osuosl.org/pub/CPAN/
-                      ftp://ftp.osuosl.org/pub/CPAN/
+  http://ftp.osuosl.org/pub/CPAN/
+  ftp://ftp.osuosl.org/pub/CPAN/
 
 =item Pennsylvania
 
-                      http://ftp.epix.net/CPAN/
-                      ftp://ftp.epix.net/pub/languages/perl/
-                      http://cpan.pair.com/
-                      ftp://cpan.pair.com/pub/CPAN/
+  http://ftp.epix.net/CPAN/
+  ftp://ftp.epix.net/pub/languages/perl/
+  http://cpan.pair.com/
+  ftp://cpan.pair.com/pub/CPAN/
 
 =item South Carolina
 
-                      http://cpan.mirror.clemson.edu/
+  http://cpan.mirror.clemson.edu/
 
 =item Tennessee
 
-                      http://mira.sunsite.utk.edu/CPAN/
+  http://mira.sunsite.utk.edu/CPAN/
 
 =item Texas
 
-                      http://mirror.uta.edu/CPAN
+  http://mirror.uta.edu/CPAN
 
 =item Utah
 
-                      http://cpan.cs.utah.edu
-                      ftp://cpan.cs.utah.edu/pub/CPAN/
-                      ftp://mirror.xmission.com/CPAN/
+  ftp://mirror.xmission.com/CPAN/
 
 =item Virginia
 
-                      http://cpan-du.viaverio.com/
-                      ftp://cpan-du.viaverio.com/pub/CPAN/
-                      http://perl.secsup.org/
-                      ftp://perl.secsup.org/pub/perl/
-                      ftp://mirror.cogentco.com/pub/CPAN/
+  http://cpan-du.viaverio.com/
+  ftp://cpan-du.viaverio.com/pub/CPAN/
+  http://perl.secsup.org/
+  ftp://perl.secsup.org/pub/perl/
+  ftp://mirror.cogentco.com/pub/CPAN/
 
 =item Washington
 
-                      http://cpan.llarian.net/
-                      ftp://cpan.llarian.net/pub/CPAN/
-                      ftp://ftp-mirror.internap.com/pub/CPAN/
+  http://cpan.llarian.net/
+  ftp://cpan.llarian.net/pub/CPAN/
+  ftp://ftp-mirror.internap.com/pub/CPAN/
 
 =item Wisconsin
 
-                      http://cpan.mirrors.tds.net
-                      ftp://cpan.mirrors.tds.net/pub/CPAN
-                      http://mirror.sit.wisc.edu/pub/CPAN/
-                      ftp://mirror.sit.wisc.edu/pub/CPAN/
+  http://cpan.mirrors.tds.net
+  ftp://cpan.mirrors.tds.net/pub/CPAN
+  http://mirror.sit.wisc.edu/pub/CPAN/
+  ftp://mirror.sit.wisc.edu/pub/CPAN/
 
 =back
 
@@ -920,19 +915,19 @@ Registered CPAN sites
 
 =item Australia
 
-                      http://mirror.internode.on.net/pub/cpan/
-                      ftp://mirror.internode.on.net/pub/cpan/
-                      http://cpan.mirror.aussiehq.net.au/
-                      http://mirror.as24220.net/cpan/
-                      ftp://mirror.as24220.net/cpan/
+  http://mirror.internode.on.net/pub/cpan/
+  ftp://mirror.internode.on.net/pub/cpan/
+  http://cpan.mirror.aussiehq.net.au/
+  http://mirror.as24220.net/cpan/
+  ftp://mirror.as24220.net/cpan/
 
 =item New Zealand
 
-                      ftp://ftp.auckland.ac.nz/pub/perl/CPAN/
-                      http://cpan.inspire.net.nz
-                      ftp://cpan.inspire.net.nz/cpan
-                      http://cpan.catalyst.net.nz/CPAN/
-                      ftp://cpan.catalyst.net.nz/pub/CPAN/
+  ftp://ftp.auckland.ac.nz/pub/perl/CPAN/
+  http://cpan.inspire.net.nz
+  ftp://cpan.inspire.net.nz/cpan
+  http://cpan.catalyst.net.nz/CPAN/
+  ftp://cpan.catalyst.net.nz/pub/CPAN/
 
 =back
 
@@ -942,26 +937,25 @@ Registered CPAN sites
 
 =item Argentina
 
-                      http://cpan.patan.com.ar/
-                      http://cpan.localhost.net.ar
-                      ftp://mirrors.localhost.net.ar/pub/mirrors/CPAN
+  http://cpan.patan.com.ar/
+  http://cpan.localhost.net.ar
+  ftp://mirrors.localhost.net.ar/pub/mirrors/CPAN
 
 =item Brazil
 
-                      ftp://cpan.pop-mg.com.br/pub/CPAN/
-                      http://ftp.pucpr.br/CPAN
-                      ftp://ftp.pucpr.br/CPAN
-                      http://cpan.kinghost.net/
-                      ftp://ftp.linorg.usp.br/CPAN
+  ftp://cpan.pop-mg.com.br/pub/CPAN/
+  http://ftp.pucpr.br/CPAN
+  ftp://ftp.pucpr.br/CPAN
+  http://cpan.kinghost.net/
 
 =item Chile
 
-                      http://cpan.dcc.uchile.cl/
-                      ftp://cpan.dcc.uchile.cl/pub/lang/cpan/
+  http://cpan.dcc.uchile.cl/
+  ftp://cpan.dcc.uchile.cl/pub/lang/cpan/
 
 =item Colombia
 
-                      http://www.laqee.unal.edu.co/CPAN/
+  http://www.laqee.unal.edu.co/CPAN/
 
 =back
 
@@ -1064,7 +1058,7 @@ its methods by loading dynamic C or C++ objects, but that should be
 totally transparent to the user of the module.  Likewise, the module
 might set up an AUTOLOAD function to slurp in subroutine definitions on
 demand, but this is also transparent.  Only the F<.pm> file is required to
-exist.  See L<perlsub>, L<perltoot>, and L<AutoLoader> for details about
+exist.  See L<perlsub>, L<perlobj>, and L<AutoLoader> for details about
 the AUTOLOAD mechanism.
 
 =head2 Guidelines for Module Creation
@@ -1124,7 +1118,7 @@ Let the objects look after themselves! Generally, avoid hard-wired
 class names as far as possible.
 
 Avoid C<< $r->Class::func() >> where using C<@ISA=qw(... Class ...)> and
-C<< $r->func() >> would work (see L<perlbot> for more details).
+C<< $r->func() >> would work.
 
 Use autosplit so little used or newly added functions won't be a
 burden to programs that don't use them. Add test functions to
@@ -1150,7 +1144,7 @@ of code that need less strictness.
 
 Always use B<-w>.
 
-Follow the guidelines in the perlstyle(1) manual.
+Follow the guidelines in L<perlstyle>.
 
 Always use B<-w>.
 
@@ -1348,7 +1342,7 @@ Give the module a version/issue/release number.
 
 To be fully compatible with the Exporter and MakeMaker modules you
 should store your module's version number in a non-my package
-variable called $VERSION.  This should be a floating point
+variable called $VERSION.  This should be a positive floating point
 number with at least two digits after the decimal (i.e., hundredths,
 e.g, C<$VERSION = "0.01">).  Don't use a "1.3.2" style version.
 See L<Exporter> for details.
@@ -1409,6 +1403,8 @@ old behavior if people rely on it.  Document incompatible changes.
 
 =back
 
+=back
+
 =head2 Guidelines for Converting Perl 4 Library Scripts into Modules
 
 =over 4
@@ -1507,8 +1503,6 @@ or
 
 =back
 
-=back
-
 =head1 NOTE
 
 Perl does not enforce private and public parts of its modules as you may
@@ -1523,8 +1517,7 @@ that a module doesn't pollute any namespace it wasn't asked to.  The
 written contract for the module (A.K.A. documentation) may make other
 provisions.  But then you know when you C<use RedefineTheWorld> that
 you're redefining the world and willing to take the consequences.
-EOF
 
-close MANIFEST or warn "$0: failed to close MANIFEST (../MANIFEST): $!";
-close OUT      or warn "$0: failed to close OUT (perlmodlib.pod): $!";
+=cut
 
+read_only_bottom_close_and_rename($out);