URL fixups from Michael Schwern.

p4raw-id: //depot/perl@13348

9 files changed, 191 insertions, 86 deletions

diff --git a/README.cygwin b/README.cygwin
index 1a8d0b4553..3dc1339159 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -13,10 +13,10 @@ on Cygwin.  This document also describes features of Cygwin that will
 affect how Perl behaves at runtime.
 
 B<NOTE:> There are pre-built Perl packages available for Cygwin and a
-version of Perl is provided on the Cygwin CD.  If you do not need to
-customize the configuration, consider using one of these packages:
+version of Perl is provided in the normal Cygwin install.  If you do
+not need to customize the configuration, consider using one of those
+packages.
 
-  http://cygutils.netpedia.net/
 
 =head1 PREREQUISITES FOR COMPILING PERL ON CYGWIN
 
@@ -31,15 +31,8 @@ about this project can be found at:
 
 A recent net or commercial release of Cygwin is required.
 
-At the time this document was last updated, Cygwin 1.1.5 was current.
+At the time this document was last updated, Cygwin 1.3.5 was current.
 
-B<NOTE:> At this point, minimal effort has been made to provide
-compatibility with old (beta) Cygwin releases.  The focus has been to
-provide a high quality release and not worry about working around old
-bugs.  If you wish to use Perl with Cygwin B20.1 or earlier, consider
-using perl5.005_03, which is available in source and binary form at
-C<http://cygutils.netpedia.net/>.  If there is significant demand,
-a patch kit can be developed to port back to earlier Cygwin versions.
 
 =head2 Cygwin Configuration
 
@@ -117,8 +110,8 @@ near the end of the file.
 Several Perl functions and modules depend on the existence of
 some optional libraries.  Configure will find them if they are
 installed in one of the directories listed as being used for library
-searches.  Pre-built packages for most of these are available at
-C<http://cygutils.netpedia.net/>.
+searches.  Pre-built packages for most of these are available from
+the Cygwin installer.
 
 =over 4
 
diff --git a/README.hpux b/README.hpux
index bc004f11c6..9a766071e9 100644
--- a/README.hpux
+++ b/README.hpux
@@ -203,7 +203,7 @@ libraries for the perl extensions/modules to work. If these libraries
 are built using the default configuration, it might happen that you run
 into an error like "invalid loader fixup" during load phase. HP is aware
 of this problem and address it at
-  http://devresource.hp.com/devresource/Docs/TechTips/cxxTips.html#tip13
+  http://h21007.www2.hp.com/dspp/tech/tech_TechDocumentDetailPage_IDX/1,,392!0!,00.html
 
 A more general approach is to intervene manually, as with an example for
 the DB_File module, which requires SleepyCat's libdb.sl:
@@ -303,7 +303,7 @@ threads library package. Two examples are the HP DCE package, available
 on "HP-UX Hardware Extensions 3.0, Install and Core OS, Release 10.20,
 April 1999 (B3920-13941)" or the Freely available PTH package, available
 though worldwide HP-UX mirrors of precompiled packages
-(e.g. http://hpux.tn.tudelft.nl/hppd/hpux/alpha.html)
+(e.g. http://hpux.tn.tudelft.nl/hppd/hpux/)
 
 =head2 64-bit Perl on HP-UX
 
diff --git a/README.mint b/README.mint
index 91a6b30f6c..df733901b1 100644
--- a/README.mint
+++ b/README.mint
@@ -8,6 +8,13 @@ README.mint - Perl version 5 on Atari MiNT
 
 =head1 DESCRIPTION
 
+There is a binary version of perl available from the FreeMiNT project
+http://freemint.de/  You may wish to use this instead of trying to
+compile yourself.
+
+B<The following advice is from perl 5.004_02 and is probably rather
+out of date.>
+
 If you want to build perl yourself on MiNT (or maybe on an Atari without
 MiNT) you may want to accept some advice from somebody who already did it...
 
@@ -219,6 +226,4 @@ Have fun with Perl!
 
 Guido Flohr
 
-	mailto:gufl0000@stud.uni-sb.de
-	http://stud.uni-sb.de/~gufl0000
-
+	mailto:guido@FreeMiNT.de
diff --git a/README.mpeix b/README.mpeix
index a7ec09d100..926fbe6dfa 100644
--- a/README.mpeix
+++ b/README.mpeix
@@ -17,6 +17,17 @@ README.mpeix - Perl/iX for HP e3000 MPE
 This is a podified version of the above-mentioned web page,
 podified by Jarkko Hietaniemi 2001-Jan-01.
 
+=head1 Binary distribution from HP
+
+The simplest way to obtain Perl for the MPE/iX is to go either of
+these URLs and follow the instructions within.
+
+http://jazz.external.hp.com/src/hp_freeware/perl/
+http://www.bixby.org/mark/perlix.html
+
+Use which ever one is more recent.
+
+
 =head1 What's New in Perl for MPE/iX
 
 June 1, 2000
@@ -43,7 +54,7 @@ Now bundled with various add-on packages:
 
 =item *
 
-libnet (http://www.gbarr.demon.co.uk/libnet/FAQ.html)
+libnet (as seen on CPAN)
 
 =item *
 
@@ -108,7 +119,7 @@ Migrated from cccd.edu to bixby.org.
 =head1 Welcome to Perl/iX
 
 This is the official home page for the HP e3000 MPE/iX
-(http://www.businessservers.hp.com/) port of the Perl scripting
+(http://www.hp.com/go/e3000) port of the Perl scripting
 language (http://www.perl.com/) which gives you all of the power of C,
 awk, sed, and sh in a single language. Check here for the latest news,
 implemented functionality, known bugs, to-do list, etc. Status reports
diff --git a/README.os390 b/README.os390
index cc550f0701..6c690d9b95 100644
--- a/README.os390
+++ b/README.os390
@@ -5,12 +5,12 @@ about pod in pod/perlpod.pod or the short summary in the INSTALL file.
 
 =head1 NAME
 
-README.os390 - building and installing Perl for OS/390.
+README.os390 - building and installing Perl for OS/390 and z/OS
 
 =head1 SYNOPSIS
 
 This document will help you Configure, build, test and install Perl
-on OS/390 Unix System Services.
+on OS/390 (aka z/OS) Unix System Services.
 
 =head1 DESCRIPTION
 
@@ -21,11 +21,19 @@ the ones we've tested it on.
 You may need to carry out some system configuration tasks before
 running the Configure script for Perl.
 
+
+=head2 Tools
+
+The z/OS Unix Tools and Toys list may prove helpful and contains links
+to ports of much of the software required to build Perl.
+http://www-1.ibm.com/servers/eserver/zseries/zos/unix/bpxa1toy.html
+
+
 =head2 Unpacking Perl distribution on OS/390
 
 Gunzip/gzip for OS/390 is discussed at:
 
-   http://www.s390.ibm.com/products/oe/bpxqp1.html
+  http://www-1.ibm.com/servers/eserver/zseries/zos/unix/faq/bpxqp1.html
 
 to extract an ASCII tar archive on OS/390, try this:
 
@@ -44,10 +52,9 @@ The IBM document that described such USS system setup issues was
 SC28-1890-07 "OS/390 UNIX System Services Planning", in particular
 Chapter 6 on customizing the OE shell.
 
-GNU make for OS/390, which is recommended for the build of perl (as well as
-building CPAN modules and extensions), is available from:
-
-  http://www.mks.com/s390/gnu/index.htm
+GNU make for OS/390, which is recommended for the build of perl (as
+well as building CPAN modules and extensions), is available from the
+L</Tools>.
 
 Some people have reported encountering "Out of memory!" errors while
 trying to build Perl using GNU make binaries.  If you encounter such
@@ -386,7 +393,7 @@ Thanks to John Goodyear for dynamic loading help.
 
 L<INSTALL>, L<perlport>, L<perlebcdic>, L<ExtUtils::MakeMaker>.
 
-    http://www.mks.com/s390/gnu/index.htm
+    http://www-1.ibm.com/servers/eserver/zseries/zos/unix/bpxa1toy.html
 
     http://www.redbooks.ibm.com/abstracts/sg245944.html
 
@@ -423,6 +430,8 @@ release of Perl.
 
 This document was podified for the 5.005_03 release of Perl 11 March 1999.
 
+Updated 28 November 2001 for broken URLs.
+
 Updated 12 November 2000 for the 5.7.1 release of Perl.
 
 Updated 15 January 2001 for the 5.7.1 release of Perl.
diff --git a/README.qnx b/README.qnx
index ef3377d127..3922cfe1f7 100644
--- a/README.qnx
+++ b/README.qnx
@@ -98,9 +98,7 @@ A script that emulates the standard unix archive (aka library)
 utility.  Under Watcom 10.6, ar is linked to wlib and provides the
 expected interface. With Watcom 9.5, a cover function is
 required. This one is fairly crude but has proved adequate for
-compiling perl.  A more thorough version is available at:
-
-	http://www.fdma.com/pub/qnx/porting/ar
+compiling perl.
 
 =item qnx/cpp
 
diff --git a/README.solaris b/README.solaris
index 0caad9b577..0243f85703 100644
--- a/README.solaris
+++ b/README.solaris
@@ -42,7 +42,7 @@ number as reported by uname.  Here's a partial translation table:
     SunOS    5.8       Solaris 8       solaris    2.8
 
 The complete table can be found in the Sun Managers' FAQ
-L<ftp://ftp.cs.toronto.edu/pub/jdd/sun-managers/faq> under
+L<ftp://ftp.cs.toronto.edu/pub/jdd/sunmanagers/faq> under
 "9.1) Which Sun models run which versions of SunOS?".
 
 =head1 RESOURCES
@@ -58,7 +58,7 @@ The Solaris FAQ is available at
 L<http://www.science.uva.nl/pub/solaris/solaris2.html>.
 
 The Sun Managers' FAQ is available at
-L<ftp://ftp.cs.toronto.edu/pub/jdd/sun-managers/faq>
+L<ftp://ftp.cs.toronto.edu/pub/jdd/sunmanagers/faq>
 
 =item Precompiled Binaries
 
diff --git a/README.vos b/README.vos
index eb01e37169..6e31e2c4da 100644
--- a/README.vos
+++ b/README.vos
@@ -8,16 +8,20 @@ README.vos - Perl for Stratus VOS
 
 =head1 SYNOPSIS
 
-This is a port of Perl version 5 to VOS.  Perl is a scripting or
-macro language that is popular on many systems.  See your local
-computer bookstore for a number of good books on Perl.
+This is a port of Perl version 5 to VOS.  Perl is a scripting or macro
+language that is popular on many systems.  See L<perlbook> for a
+number of good books on Perl.
+
+This is instructions for compiling Perl from source.  For most people,
+you can simply download a pre-compiled distribution from
+ftp://ftp.stratus.com/pub/vos/posix/ga/ga.html
 
 =head2 Stratus POSIX Support
 
 Note that there are two different implementations of POSIX.1
 support on VOS.  There is an alpha version of POSIX that is
 available from the Stratus anonymous ftp site
-(ftp://ftp.stratus.com/pub/vos/posix/alpha/alpha.html).  There is
+(ftp://ftp.stratus.com/pub/vos/posix/).  There is
 a generally-available version of POSIX that comes with the VOS
 Standard C Compiler or VOS C runtime in VOS Release 14.3.0 or
 higher.  This port of perl will compile and bind with either
@@ -70,7 +74,7 @@ Stratus FTP site.  Login anonymously to ftp.stratus.com and
 get the file /pub/vos/posix/alpha/posix.save.evf.gz in
 binary file-transfer mode.  Or use the Uniform Resource
 Locator (URL)
-ftp://ftp.stratus.com/pub/vos/alpha/posix.save.evf.gz from
+ftp://ftp.stratus.com/pub/vos/posix/alpha/posix.save.evf.gz from
 your web browser.  Instructions for unbundling this file
 are at ftp://ftp.stratus.com/pub/vos/utility/utility.html.
 This is not a standard Stratus product.
diff --git a/pod/perlmodlib.pod b/pod/perlmodlib.pod
index 2d0b9ae636..bc7acfc122 100644
--- a/pod/perlmodlib.pod
+++ b/pod/perlmodlib.pod
@@ -776,7 +776,7 @@ Convert POD data to formatted *roff input
 
 =item Pod::ParseLink
 
-Parse an L<> formatting code in POD text
+Parse an LE<lt>E<gt> formatting code in POD text
 
 =item Pod::ParseUtils
 
@@ -1133,8 +1133,8 @@ You should try to choose one close to you:
 South Africa
 
     ftp://ftp.is.co.za/programming/perl/CPAN/
+    ftp://ftp.mweb.co.za/pub/mirrors/cpan/
     ftp://ftp.saix.net/pub/CPAN/
-    ftp://ftpza.co.za/pub/mirrors/cpan/
     ftp://ftp.sun.ac.za/CPAN/
 
 =back
@@ -1149,21 +1149,23 @@ China
 
     ftp://freesoft.cei.gov.cn/pub/languages/perl/CPAN/
     http://www2.linuxforum.net/mirror/CPAN/
+    http://CPAN.pacific.net.hk/
+    ftp://ftp.pacific.net.hk/pub/mirror/CPAN/
     http://cpan.shellhung.org/
     ftp://ftp.shellhung.org/pub/CPAN
 
 =item *
 
-Hong Kong
+India
 
-    http://CPAN.pacific.net.hk/
-    ftp://ftp.pacific.net.hk/pub/mirror/CPAN/
+    http://cpan.in.freeos.com
+    ftp://cpan.in.freeos.com/pub/CPAN/
 
 =item *
 
 Indonesia
 
-    http://piksi.itb.ac.id/CPAN/
+    http://cpan.itb.web.id/
     ftp://mirrors.piksi.itb.ac.id/CPAN/
     http://CPAN.mweb.co.id/
     ftp://ftp.mweb.co.id/pub/languages/perl/CPAN/
@@ -1174,6 +1176,7 @@ Israel
 
     http://www.iglu.org.il:/pub/CPAN/
     ftp://ftp.iglu.org.il/pub/CPAN/
+    http://cpan.lerner.co.il/
     http://bioinfo.weizmann.ac.il/pub/software/perl/CPAN/
     ftp://bioinfo.weizmann.ac.il/pub/software/perl/CPAN/
 
@@ -1181,7 +1184,7 @@ Israel
 
 Japan
 
-    ftp://ftp.u-aizu.ac.jp/pub/lang/perl/CPAN/
+    ftp://ftp.u-aizu.ac.jp/pub/CPAN
     ftp://ftp.kddlabs.co.jp/CPAN/
     http://mirror.nucba.ac.jp/mirror/Perl/
     ftp://mirror.nucba.ac.jp/mirror/Perl/
@@ -1192,6 +1195,26 @@ Japan
 
 =item *
 
+Korea
+
+    http://mirror.Mazic.org/pub/CPAN
+    ftp://mirror.Mazic.org/pub/CPAN
+
+=item *
+
+Philippines
+
+    http://www.adzu.edu.ph/CPAN
+
+=item *
+
+Russian Federation
+
+    http://cpan.tomsk.ru
+    ftp://cpan.tomsk.ru/pub/CPAN
+
+=item *
+
 Saudi Arabia
 
     ftp://ftp.isu.net.sa/pub/CPAN/
@@ -1201,8 +1224,6 @@ Saudi Arabia
 Singapore
 
     http://cpan.hjc.edu.sg
-    http://ftp.nus.edu.sg/unix/perl/CPAN/
-    ftp://ftp.nus.edu.sg/pub/unix/perl/CPAN/
 
 =item *
 
@@ -1210,7 +1231,7 @@ South Korea
 
     http://CPAN.bora.net/
     ftp://ftp.bora.net/pub/CPAN/
-    http://ftp.kornet.net/CPAN/
+    http://ftp.kornet.net/pub/CPAN/
     ftp://ftp.kornet.net/pub/CPAN/
     ftp://ftp.nuri.net/pub/CPAN/
 
@@ -1221,6 +1242,8 @@ Taiwan
     ftp://coda.nctu.edu.tw/UNIX/perl/CPAN
     ftp://ftp.ee.ncku.edu.tw/pub/perl/CPAN/
     ftp://ftp1.sinica.edu.tw/pub1/perl/CPAN/
+    http://ftp.tku.edu.tw/pub/CPAN/
+    ftp://ftp.tku.edu.tw/pub/CPAN/
 
 =item *
 
@@ -1254,14 +1277,16 @@ Costa Rica
 
 Austria
 
-    ftp://ftp.tuwien.ac.at/pub/languages/perl/CPAN/
+    ftp://ftp.tuwien.ac.at/pub/CPAN/
 
 =item *
 
 Belgium
 
-    http://ftp.easynet.be/CPAN/
-    ftp://ftp.easynet.be/CPAN/
+    http://ftp.easynet.be/pub/CPAN/
+    ftp://ftp.easynet.be/pub/CPAN/
+    http://cpan.skynet.be
+    ftp://ftp.skynet.be/pub/CPAN
     ftp://ftp.kulnet.kuleuven.ac.be/pub/mirror/CPAN/
 
 =item *
@@ -1280,15 +1305,16 @@ Croatia
 
 Czech Republic
 
-    http://www.fi.muni.cz/pub/perl/
-    ftp://ftp.fi.muni.cz/pub/perl/
+    http://ftp.fi.muni.cz/pub/CPAN/
+    ftp://ftp.fi.muni.cz/pub/CPAN/
     ftp://sunsite.mff.cuni.cz/MIRRORS/ftp.funet.fi/pub/languages/perl/CPAN/
 
 =item *
 
 Denmark
 
-    ftp://sunsite.auc.dk/pub/languages/perl/CPAN/
+    http://mirrors.sunsite.dk/cpan/
+    ftp://sunsite.dk/mirrors/cpan/
     http://www.cpan.dk/CPAN/
     ftp://www.cpan.dk/ftp.cpan.org/CPAN/
 
@@ -1298,7 +1324,8 @@ England
 
     http://www.mirror.ac.uk/sites/ftp.funet.fi/pub/languages/perl/CPAN
     ftp://ftp.mirror.ac.uk/sites/ftp.funet.fi/pub/languages/perl/CPAN/
-    ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/
+    http://cpan.crazygreek.co.uk
+    ftp://ftp.demon.co.uk/pub/CPAN/
     ftp://ftp.flirble.org/pub/languages/perl/CPAN/
     ftp://ftp.plig.org/pub/CPAN/
     ftp://sunsite.doc.ic.ac.uk/packages/CPAN/
@@ -1317,16 +1344,21 @@ Estonia
 Finland
 
     ftp://ftp.funet.fi/pub/languages/perl/CPAN/
+    http://cpan.kpnqwest.fi/
 
 =item *
 
 France
 
     ftp://cpan.ftp.worldonline.fr/pub/CPAN/
+    http://cpan.mirrors.easynet.fr/
+    ftp://cpan.mirrors.easynet.fr/pub/ftp.cpan.org/
     ftp://ftp.club-internet.fr/pub/perl/CPAN/
+    http://fr.cpan.org/
     ftp://ftp.lip6.fr/pub/perl/CPAN/
     ftp://ftp.oleane.net/pub/mirrors/CPAN/
     ftp://ftp.pasteur.fr/pub/computing/CPAN/
+    http://cpan.cict.fr/
     ftp://cpan.cict.fr/pub/CPAN/
     ftp://ftp.uvsq.fr/pub/perl/CPAN/
 
@@ -1342,7 +1374,9 @@ Germany
     http://ftp.gwdg.de/pub/languages/perl/CPAN/
     ftp://ftp.gwdg.de/pub/languages/perl/CPAN/
     ftp://ftp.uni-hamburg.de/pub/soft/lang/perl/CPAN/
-    ftp://ftp.leo.org/pub/comp/general/programming/languages/script/perl/CPAN/
+    ftp://ftp.leo.org/pub/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/
 
@@ -1359,14 +1393,15 @@ Hungary
 
     http://cpan.artifact.hu/
     ftp://cpan.artifact.hu/CPAN/
-    ftp://ftp.kfki.hu/pub/packages/perl/CPAN/
+    http://ftp.kfki.hu/pub/CPAN/
+    ftp://ftp.kfki.hu/pub/CPAN/
 
 =item *
 
 Iceland
 
-    http://cpan.gm.is/
-    ftp://ftp.gm.is/pub/CPAN/
+    http://ftp.rhnet.is/pub/CPAN/
+    ftp://ftp.rhnet.is/pub/CPAN/
 
 =item *
 
@@ -1400,11 +1435,19 @@ Latvia
 
 =item *
 
+Lithuania
+
+    ftp://ftp.unix.lt/pub/CPAN/
+
+=item *
+
 Netherlands
 
     ftp://download.xs4all.nl/pub/mirror/CPAN/
     ftp://ftp.nl.uu.net/pub/CPAN/
     ftp://ftp.nluug.nl/pub/languages/perl/CPAN/
+    http://cpan.cybercomm.nl/
+    ftp://mirror.cybercomm.nl/pub/cpan/
     ftp://ftp.cpan.nl/pub/CPAN/
     http://www.cs.uu.nl/mirror/CPAN/
     ftp://ftp.cs.uu.nl/mirror/CPAN/
@@ -1413,7 +1456,7 @@ Netherlands
 
 Norway
 
-    ftp://sunsite.uio.no/pub/languages/perl/CPAN/
+    ftp://ftp.uninett.no/pub/languages/perl/CPAN
     ftp://ftp.uit.no/pub/languages/perl/cpan/
 
 =item *
@@ -1421,6 +1464,8 @@ Norway
 Poland
 
     ftp://ftp.pk.edu.pl/pub/lang/perl/CPAN/
+    http://www.fic.uni.lodz.pl/pub/CPAN
+    ftp://ftp.fic.uni.lodz.pl/pub/CPAN
     ftp://ftp.mega.net.pl/pub/mirrors/ftp.perl.com/
     ftp://ftp.man.torun.pl/pub/doc/CPAN/
     ftp://sunsite.icm.edu.pl/pub/CPAN/
@@ -1431,8 +1476,13 @@ Portugal
 
     ftp://ftp.ua.pt/pub/CPAN/
     ftp://perl.di.uminho.pt/pub/CPAN/
+    http://cpan.ip.pt/
+    ftp://cpan.ip.pt/pub/perl/
     ftp://ftp.ist.utl.pt/pub/CPAN/
+    http://cpan.ip.pt/
+    ftp://cpan.ip.pt/pub/cpan/
     ftp://ftp.netc.pt/pub/CPAN/
+    ftp://ftp.up.pt/pub/CPAN
 
 =item *
 
@@ -1443,6 +1493,7 @@ Romania
     ftp://ftp.dntis.ro/pub/cpan/
     ftp://ftp.opsynet.com/cpan/
     ftp://ftp.dnttm.ro/pub/CPAN/
+    ftp://ftp.lasting.ro/pub/CPAN
     ftp://ftp.timisoara.roedu.net/mirrors/CPAN/
 
 =item *
@@ -1453,6 +1504,7 @@ Russia
     http://cpan.rinet.ru/
     ftp://cpan.rinet.ru/pub/mirror/CPAN/
     ftp://ftp.aha.ru/pub/CPAN/
+    http://cpan.sai.msu.ru/
     ftp://ftp.sai.msu.su/pub/lang/perl/CPAN/
 
 =item *
@@ -1480,6 +1532,7 @@ Sweden
 
     http://ftp.du.se/CPAN/
     ftp://ftp.du.se/pub/CPAN/
+    ftp://mirror.dataphone.se/pub/CPAN
     ftp://ftp.sunet.se/pub/lang/perl/CPAN/
 
 =item *
@@ -1495,6 +1548,14 @@ Turkey
 
     ftp://sunsite.bilkent.edu.tr/pub/languages/CPAN/
 
+=item *
+
+Ukraine
+
+    http://cpan.org.ua/
+    ftp://cpan.org.ua/
+    ftp://ftp.perl.org.ua/pub/CPAN/
+
 =back
 
 =head2 North America
@@ -1531,17 +1592,28 @@ Nova Scotia
 
 Ontario
 
-    ftp://ftp.crc.ca/pub/packages/lang/perl/CPAN/
+    ftp://ftp.crc.ca/pub/CPAN/
+
+=item *
+
+Quebec
+
+    http://cpan.mirror.smartworker.org/
+    ftp://cpan.mirror.smartworker.org/pub/CPAN
+
+=back
 
 =item *
 
 Mexico
 
+    http://cpan.azc.uam.mx
+    ftp://cpan.azc.uam.mx/mirrors/CPAN
+    http://cpan.unam.mx/
+    ftp://cpan.unam.mx/pub/CPAN
     http://www.msg.com.mx/CPAN/
     ftp://ftp.msg.com.mx/pub/CPAN/
 
-=back
-
 =item *
 
 United States
@@ -1560,11 +1632,16 @@ Alabama
 California
 
     http://www.cpan.org/
-    ftp://ftp.cpan.org/CPAN/
+    ftp://cpan.valueclick.com/pub/CPAN/
+    http://mirrors.gossamer-threads.com/CPAN
     ftp://cpan.nas.nasa.gov/pub/perl/CPAN/
     ftp://ftp.digital.com/pub/plan/perl/CPAN/
-    http://www.kernel.org/pub/mirrors/cpan/
-    ftp://ftp.kernel.org/pub/mirrors/cpan/
+    http://mirrors.kernel.org/cpan/
+    ftp://mirrors.kernel.org/pub/CPAN
+    http://cpan.digisle.net/
+    ftp://cpan.digisle.net/pub/CPAN
+    http://www.linuxjar.com/CPAN
+    ftp://linuxjar.com/pub/CPAN
     http://www.perl.com/CPAN/
     http://download.sourceforge.net/mirrors/CPAN/
 
@@ -1576,23 +1653,24 @@ Colorado
 
 =item *
 
-Florida
+District of Columbia
 
-    ftp://ftp.cise.ufl.edu/pub/perl/CPAN/
+    ftp://ftp.dc.us.telia.net/pub/cpan/
 
 =item *
 
-Georgia
+Florida
 
-    ftp://ftp.twoguys.org/CPAN/
+    ftp://ftp.cise.ufl.edu/pub/mirrors/CPAN/
+    http://mirror.csit.fsu.edu/pub/CPAN/
+    ftp://mirror.csit.fsu.edu/pub/CPAN/
 
 =item *
 
 Illinois
 
-    http://www.neurogames.com/mirrors/CPAN
-    http://uiarchive.uiuc.edu/mirrors/ftp/ftp.cpan.org/pub/CPAN/
-    ftp://uiarchive.uiuc.edu/mirrors/ftp/ftp.cpan.org/pub/CPAN/
+    http://uiarchive.uiuc.edu/mirrors/ftp/cpan.cse.msu.edu/
+    ftp://uiarchive.uiuc.edu/mirrors/ftp/cpan.cse.msu.edu/
 
 =item *
 
@@ -1601,6 +1679,8 @@ Indiana
     ftp://ftp.uwsg.indiana.edu/pub/perl/CPAN/
     http://cpan.nitco.com/
     ftp://cpan.nitco.com/pub/CPAN/
+    http://archive.progeny.com/CPAN/
+    ftp://archive.progeny.com/CPAN/
     ftp://cpan.in-span.net/
     http://csociety-ftp.ecn.purdue.edu/pub/CPAN
     ftp://csociety-ftp.ecn.purdue.edu/pub/CPAN
@@ -1617,10 +1697,18 @@ Kentucky
 Massachusetts
 
     ftp://ftp.ccs.neu.edu/net/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/
+    http://cpan.mirrors.netnumina.com/
+    ftp://mirrors.netnumina.com/cpan/
     ftp://ftp.iguide.com/pub/mirrors/packages/perl/CPAN/
 
 =item *
 
+Michigan
+
+    ftp://cpan.cse.msu.edu/
+
+=item *
+
 New Jersey
 
     ftp://ftp.cpanel.net/pub/CPAN/
@@ -1630,11 +1718,7 @@ New Jersey
 New York
 
     ftp://ftp.freesoftware.com/pub/perl/CPAN/
-    http://www.deao.net/mirrors/CPAN/
-    ftp://ftp.deao.net/pub/CPAN/
-    ftp://ftp.stealth.net/pub/mirrors/ftp.cpan.org/pub/CPAN/
-    http://mirror.nyc.anidea.com/CPAN/
-    ftp://mirror.nyc.anidea.com/pub/CPAN/
+    ftp://ftp.stealth.net/pub/CPAN/
     http://www.rge.com/pub/languages/perl/
     ftp://ftp.rge.com/pub/languages/perl/
     ftp://mirrors.cloud9.net/pub/mirrors/CPAN/
@@ -1661,7 +1745,7 @@ Oklahoma
 
 Oregon
 
-    ftp://ftp.orst.edu/pub/packages/CPAN/
+    ftp://ftp.orst.edu/pub/CPAN
 
 =item *
 
@@ -1669,6 +1753,8 @@ Pennsylvania
 
     http://ftp.epix.net/CPAN/
     ftp://ftp.epix.net/pub/languages/perl/
+    http://mirrors.phenominet.com/pub/CPAN/
+    ftp://mirrors.phenominet.com/pub/CPAN/
     ftp://carroll.cac.psu.edu/pub/CPAN/
 
 =item *
@@ -1682,8 +1768,6 @@ Tennessee
 Texas
 
     http://ftp.sedl.org/pub/mirrors/CPAN/
-    http://jhcloos.com/pub/mirror/CPAN/
-    ftp://jhcloos.com/pub/mirror/CPAN/
 
 =item *
 
@@ -1706,8 +1790,9 @@ Washington
 
     http://cpan.llarian.net/
     ftp://cpan.llarian.net/pub/CPAN/
+    http://cpan.mirrorcentral.com/
+    ftp://ftp.mirrorcentral.com/pub/CPAN/
     ftp://ftp-mirror.internap.com/pub/CPAN/
-    ftp://ftp.spu.edu/pub/CPAN/
 
 =back
 
@@ -1729,7 +1814,6 @@ Australia
 =item *
 
 New Zealand
-
     ftp://ftp.auckland.ac.nz/pub/perl/CPAN/
 
 =back
@@ -1749,8 +1833,7 @@ Argentina
 Brazil
 
     ftp://cpan.pop-mg.com.br/pub/CPAN/
-    ftp://ftp.matrix.com.br/pub/perl/
-    ftp://cpan.if.usp.br/pub/mirror/CPAN/
+    ftp://ftp.matrix.com.br/pub/perl/CPAN/
 
 =item *
 
@@ -1761,6 +1844,7 @@ Chile
 
 =back
 
+
 For an up-to-date listing of CPAN sites,
 see http://www.cpan.org/SITES or ftp://www.cpan.org/SITES .
 
@@ -2037,8 +2121,9 @@ Copying, ToDo etc.
 
 =over 4
 
-=item Adding a Copyright Notice.
+=item *
 
+Adding a Copyright Notice.
 
 How you choose to license your work is a personal decision.
 The general mechanism is to assert your Copyright and then make