PerlFAQ sync.

p4raw-id: //depot/perl@18185

1 files changed, 11 insertions, 27 deletions

diff --git a/pod/perlfaq2.pod b/pod/perlfaq2.pod
index f1781015d6..46bdd40f03 100644
--- a/pod/perlfaq2.pod
+++ b/pod/perlfaq2.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-perlfaq2 - Obtaining and Learning about Perl ($Revision: 1.13 $, $Date: 2002/04/26 16:56:35 $)
+perlfaq2 - Obtaining and Learning about Perl ($Revision: 1.17 $, $Date: 2002/11/16 23:33:08 $)
 
 =head1 DESCRIPTION
 
@@ -90,7 +90,7 @@ architecture.
 
 =head2 What modules and extensions are available for Perl?  What is CPAN?  What does CPAN/src/... mean?
 
-CPAN stands for Comprehensive Perl Archive Network, a ~700mb archive
+CPAN stands for Comprehensive Perl Archive Network, a ~1.2Gb archive
 replicated on nearly 200 machines all over the world.  CPAN contains
 source code, non-native ports, documentation, scripts, and many
 third-party modules and extensions, designed for everything from
@@ -167,7 +167,6 @@ assistance:
 
     http://perldoc.cpan.org/
     http://www.perldoc.com/
-    http://reference.perl.com/query.cgi?tutorials
     http://bookmarks.cpan.org/search.cgi?cat=Training%2FTutorials
 
 =head2 What are the Perl newsgroups on Usenet?  Where do I post questions?
@@ -366,7 +365,7 @@ Recommended books on (or mostly on) Perl follow.
 	ISBN 1-930110-00-6 [1st edition 2001]
 	http://www.manning.com/cross
 
-	Mastering Perl/Tk
+    Mastering Perl/Tk
 	by Steve Lidie and Nancy Walsh
 	ISBN 1-56592-716-8 [1st edition January 2002]
 	http://www.oreilly.com/catalog/mastperltk/
@@ -399,26 +398,13 @@ http://www.stonehenge.com/merlyn/LinuxMag/ .
 
 =head2 Perl on the Net: FTP and WWW Access
 
-To get the best performance, pick a site from
-the list below and use it to grab the complete list of mirror sites
-which is at /CPAN/MIRRORED.BY or at http://mirror.cpan.org/ .
-From there you can find the quickest site for you.  Remember, the
-following list is I<not> the complete list of CPAN mirrors
-(the complete list contains 165 sites as of January 2001):
-
-  http://www.cpan.org/
-  http://www.perl.com/CPAN/
-  http://download.sourceforge.net/mirrors/CPAN/
-  ftp://ftp.digital.com/pub/plan/perl/CPAN/
-  ftp://ftp.flirble.org/pub/languages/perl/CPAN/
-  ftp://ftp.uvsq.fr/pub/perl/CPAN/
-  ftp://ftp.funet.fi/pub/languages/perl/CPAN/
-  ftp://ftp.dti.ad.jp/pub/lang/CPAN/
-  ftp://cpan.if.usp.br/pub/mirror/CPAN/
-
-One may also use xx.cpan.org where "xx" is the 2-letter country code
-for your domain; e.g. Australia would use au.cpan.org.
-[Note: This only applies to countries that host at least one mirror.]
+To get the best performance, pick a site from the list at
+http://www.cpan.org/SITES.html . From there you can find the quickest
+site for you.
+
+You may also use xx.cpan.org where "xx" is the 2-letter country code
+for your domain; e.g. Australia would use au.cpan.org. [Note: This
+only applies to countries that host at least one mirror.]
 
 =head2 What mailing lists are there for Perl?
 
@@ -428,9 +414,7 @@ subscription information.
 
 A comprehensive list of Perl related mailing lists can be found at:
 
-	http://lists.cpan.org/
-
-( also visible as http://lists.perl.org/ )
+	http://lists.perl.org/
 
 =head2 Archives of comp.lang.perl.misc