Upgrade CPAN from version 2.05-TRIAL2 to 2.05

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 92f7f6e..8114082 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -252,7 +252,7 @@ use File::Glob qw(:case);
     },
 
     'CPAN' => {
-        'DISTRIBUTION' => 'ANDK/CPAN-2.05-TRIAL2.tar.gz',
+        'DISTRIBUTION' => 'ANDK/CPAN-2.05.tar.gz',
         'FILES'        => q[cpan/CPAN],
         'EXCLUDED'     => [
             qr{^distroprefs/},

diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
index ace2b11..4ed4b6c 100644 (file)
--- a/cpan/CPAN/lib/CPAN.pm
+++ b/cpan/CPAN/lib/CPAN.pm
@@ -3758,7 +3758,7 @@ which to try in which order.
 
 Henk P. Penning maintains a site that collects data about CPAN sites:
 
-  http://www.cs.uu.nl/people/henkp/mirmon/cpan.html
+  http://mirrors.cpan.org/
 
 Also, feel free to play with experimental features. Run
 

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 29b787b..186500d 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -44,7 +44,7 @@ keep in sync with the latest CPAN release.
 
 =item *
 
-L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05-TRIAL2.
+L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05.
 
 This fixes L<local::lib> shell variable string output and prevents an endless
 loop when running "notest test Module" for some Module having dependencies.