Quick integration of mainline changes to date

p4raw-id: //depot/vmsperl@4821
p4raw-branched: from //depot/perl@4249 'branch in'
	eg/cgi/dna_small_gif.uu eg/cgi/wilogo_gif.uu epoc/config.sh
	epoc/epocish.c epoc/link.pl ext/DB_File/hints/sco.pl
	ext/DynaLoader/XSLoader_pm.PL ext/DynaLoader/hints/aix.pl
	ext/DynaLoader/hints/openbsd.pl ext/File/Glob/Makefile.PL
	ext/File/Glob/TODO ext/IPC/SysV/hints/cygwin.pl
	ext/NDBM_File/hints/cygwin.pl ext/NDBM_File/hints/sco.pl
	ext/ODBM_File/hints/cygwin.pl lib/byte.pm lib/byte_heavy.pl
	lib/unicode/Jamo.txt lib/unicode/NamesList.html
	lib/unicode/UCD300.html lib/unicode/Unicode.300
	lib/unicode/Unicode3.html os2/OS2/REXX/DLL/Changes
	os2/OS2/REXX/DLL/DLL.pm os2/OS2/REXX/DLL/DLL.xs
	os2/OS2/REXX/DLL/MANIFEST os2/OS2/REXX/DLL/Makefile.PL
	os2/OS2/REXX/t/rx_emxrv.t t/lib/glob-case.t t/lib/glob-taint.t
	t/pod/multiline_items.xr t/pod/pod2usage.xr t/pod/podselect.xr
	win32/vmem.h t/pod/multiline_items.t t/pod/pod2usage.t
	t/pod/podselect.t (@4280..) pod/perlhack.pod (@4340..)
	ext/File/Glob/Changes ext/File/Glob/Glob.xs t/lib/glob-global.t
	(@4356..) t/lib/glob-basic.t (@4393..) lib/Pod/Man.pm (@4404..)
	pod/perlfilter.pod (@4406..) t/io/nargv.t (@4503..)
	ext/File/Glob/bsd_glob.c ext/File/Glob/bsd_glob.h (@4514..)
	epoc/createpkg.pl epoc/epoc_stubs.c (@4556..)
	lib/unicode/Eq/Latin1.pl lib/unicode/Eq/Unicode.pl
	lib/unicode/In/BopomofoExtended.pl
	lib/unicode/In/BraillePatterns.pl
	lib/unicode/In/CJKRadicalsSupplement.pl
	lib/unicode/In/CJKUnifiedIdeographsExtensionA.pl
	lib/unicode/In/Cherokee.pl
	lib/unicode/In/IdeographicDescriptionCharacters.pl
	lib/unicode/In/KangxiRadicals.pl lib/unicode/In/Khmer.pl
	lib/unicode/In/Mongolian.pl lib/unicode/In/Myanmar.pl
	lib/unicode/In/Ogham.pl lib/unicode/In/Runic.pl
	lib/unicode/In/Sinhala.pl lib/unicode/In/Syriac.pl
	lib/unicode/In/Thaana.pl
	lib/unicode/In/UnifiedCanadianAboriginalSyllabics.pl
	lib/unicode/In/YiRadicals.pl lib/unicode/In/YiSyllables.pl
	(@4573..) pod/perlfork.pod (@4602..) ext/File/Glob/Glob.pm
	(@4615..) win32/genmk95.pl (@4653..) win32/vdir.h (@4702..)
	win32/perlhost.h (@4789..)
p4raw-deleted: from //depot/perl@4249 'delete in'
	eg/cgi/dna.small.gif.uu eg/cgi/wilogo.gif.uu (@2830..)
	os2/POSIX.mkfifo (@3518..) lib/warning.pm warning.h (@4008..)
	lib/unicode/Jamo-2.txt lib/unicode/UnicodeData-Latest.txt
	(@4184..) lib/unicode/Unicode.html (@4209..)
	lib/unicode/Eq/Latin1 lib/unicode/Eq/Unicode (@4228..)
	lib/Pod/PlainText.pm (@4280..) ext/DynaLoader/dl_cygwin.xs
	(@4302..) epoc/config.h (@4475..) epoc/perl.mmp epoc/perl.pkg
	(@4556..)
p4raw-integrated: from //depot/perl@4249 'copy in' ext/B/NOTES
	ext/B/ramblings/runtime.porting (@562..) hints/amigaos.sh
	(@575..) lib/Net/Ping.pm (@854..) lib/strict.pm (@988..)
	ext/Thread/Thread/Queue.pm (@1085..)
	ext/Thread/Thread/Semaphore.pm (@1086..)
	lib/ExtUtils/Installed.pm (@1315..) plan9/plan9ish.h (@1451..)
	mpeix/mpeixish.h (@1478..) Porting/p4d2p (@1485..)
	ext/ODBM_File/hints/sco.pl ext/Thread/sync.t ext/Thread/sync2.t
	hints/lynxos.sh lib/Text/Tabs.pm os2/OS2/REXX/Changes
	os2/OS2/REXX/t/rx_dllld.t os2/OS2/REXX/t/rx_objcall.t
	os2/OS2/REXX/t/rx_tievar.t os2/OS2/REXX/t/rx_tieydb.t
	os2/OS2/REXX/t/rx_vrexx.t os2/dl_os2.c t/comp/term.t
	t/io/print.t t/op/glob.t util.h win32/bin/perlglob.pl (@1575..)
	ext/B/O.pm (@1617..) ext/Thread/typemap lib/File/DosGlob.pm
	(@1760..) t/op/substr.t (@1780..) vos/vosish.h (@1838..)
	lib/ExtUtils/Mkbootstrap.pm (@1932..) Porting/genlog (@1978..)
	lib/constant.pm (@2029..) t/op/array.t (@2210..)
	lib/Math/Complex.pm (@2219..) hints/dynixptx.sh (@2318..)
	ext/IO/IO.pm (@2354..) hints/mint.sh lib/Tie/Array.pm
	lib/Tie/Hash.pm (@2620..) os2/Changes (@2695..) globvar.sym
	(@2746..) t/comp/bproto.t (@2817..) lib/DB.pm (@2820..)
	hints/mpeix.sh lib/FindBin.pm (@2830..) ext/IO/lib/IO/Select.pm
	(@2882..) t/lib/english.t (@2891..) t/op/subst.t (@2892..)
	t/op/range.t (@2923..) pod/perl5005delta.pod (@2929..)
	hints/next_3.sh hints/next_3_0.sh (@3023..) lib/Getopt/Std.pm
	(@3034..) lib/File/Spec.pm (@3042..) t/pragma/warn/1global
	(@3096..) t/pod/emptycmd.t t/pod/for.t t/pod/for.xr
	t/pod/headings.t t/pod/headings.xr t/pod/include.t
	t/pod/include.xr t/pod/included.t t/pod/included.xr
	t/pod/lref.t t/pod/lref.xr t/pod/nested_items.t
	t/pod/nested_items.xr t/pod/nested_seqs.t t/pod/nested_seqs.xr
	t/pod/oneline_cmds.t t/pod/oneline_cmds.xr t/pod/testcmp.pl
	(@3129..) README.hurd (@3148..) ext/re/re.pm (@3152..)
	lib/ExtUtils/Liblist.pm t/comp/require.t (@3153..)
	Porting/p4desc (@3183..) Porting/pumpkin.pod hints/linux.sh
	myconfig.SH (@3267..) t/op/readdir.t (@3299..)
	t/pod/special_seqs.t t/pod/special_seqs.xr (@3304..)
	t/lib/fields.t (@3335..) t/op/taint.t (@3357..)
	lib/File/Copy.pm (@3362..) installhtml (@3371..)
	ext/Socket/Socket.pm (@3391..) t/lib/ipc_sysv.t t/op/nothread.t
	(@3399..) lib/CPAN/FirstTime.pm (@3458..) pod/perlfaq8.pod
	(@3459..) pod/perlcall.pod pod/perlipc.pod pod/perltie.pod
	pod/perlxs.pod (@3460..) t/pragma/strict-subs (@3514..)
	ext/ByteLoader/ByteLoader.pm lib/Math/BigFloat.pm (@3516..)
	x2p/walk.c (@3518..) win32/win32thread.c win32/win32thread.h
	(@3525..) os2/OS2/REXX/REXX.xs (@3531..) utf8.h (@3537..)
	lib/ExtUtils/Embed.pm (@3553..) ext/Thread/Thread/Specific.pm
	(@3564..) ext/POSIX/Makefile.PL lib/Cwd.pm (@3582..) hv.h
	(@3602..) ext/NDBM_File/NDBM_File.pm ext/ODBM_File/ODBM_File.pm
	ext/SDBM_File/SDBM_File.pm (@3603..) lib/Sys/Hostname.pm
	(@3631..) os2/os2.c (@3640..) emacs/ptags miniperlmain.c
	(@3660..) ext/IO/IO.xs win32/config_h.PL win32/dl_win32.xs
	win32/runperl.c win32/win32sck.c (@3667..) pod/Win32.pod
	pod/perlfaq4.pod pod/perltodo.pod (@3676..) lib/vars.pm
	(@3686..) lib/ExtUtils/Manifest.pm (@3693..) hints/README.hints
	hints/epix.sh hints/esix4.sh hints/next_4.sh (@3753..)
	ext/GDBM_File/GDBM_File.pm lib/CPAN.pm pod/perllocale.pod
	(@3754..) lib/bigfloat.pl (@3759..) lib/Pod/Text/Color.pm
	lib/Pod/Text/Termcap.pm pod/pod2text.PL (@3788..)
	ext/POSIX/POSIX.pm lib/AutoLoader.pm (@3794..) Porting/makerel
	(@3797..) t/lib/io_unix.t (@3825..) EXTERN.h Porting/patchls
	ext/SDBM_File/sdbm/pair.c makedepend.SH (@3852..)
	lib/File/Spec/Unix.pm unixish.h (@3855..)
	lib/ExtUtils/Mksymlists.pm (@3856..) t/pragma/utf8.t (@3892..)
	README (@3901..) t/op/eval.t (@3988..) MAINTAIN
	ext/B/B/Stash.pm ext/ByteLoader/ByteLoader.xs
	ext/Fcntl/Fcntl.xs ext/SDBM_File/Makefile.PL lib/Math/Trig.pm
	os2/OS2/REXX/Makefile.PL perlsdio.h regnodes.h utils/perlbug.PL
	(@4008..) epoc/epoc.c pod/perltoc.pod pod/perlvar.pod regexp.h
	t/lib/attrs.t t/op/time.t t/pragma/warn/2use
	t/pragma/warn/3both t/pragma/warn/7fatal universal.c warnings.h
	warnings.pl (@4076..) ext/Opcode/Opcode.pm ext/attrs/attrs.xs
	t/pragma/warn/pp_ctl (@4081..) t/pragma/warn/pp_sys (@4088..)
	t/pragma/sub_lval.t (@4090..) t/TEST (@4092..) xsutils.c
	(@4101..) pod/buildtoc (@4120..) djgpp/config.over
	djgpp/djgppsed.sh pod/pod2usage.PL pod/podselect.PL (@4121..)
	lib/Pod/Html.pm (@4122..) av.h (@4123..) t/pragma/locale.t
	(@4130..) pod/perldata.pod (@4131..) pod/perllexwarn.pod
	(@4132..) ext/B/typemap ext/DB_File/DB_File.pm
	lib/ExtUtils/typemap (@4142..) ext/B/Makefile.PL
	t/lib/bigfltpm.t (@4149..) lib/ExtUtils/MM_VMS.pm
	vms/descrip_mms.template (@4182..) ext/DynaLoader/dl_vmesa.xs
	ext/DynaLoader/dl_vms.xs lib/unicode/ReadMe.txt pod/perlsyn.pod
	t/op/groups.t (@4184..) t/pragma/warn/op (@4189..) thrdvar.h
	(@4197..) ext/B/B/Terse.pm (@4199..) t/lib/posix.t (@4223..)
	keywords.h keywords.pl pod/perlfaq3.pod pod/perlsub.pod
	t/pragma/strict-vars (@4227..) pod/perlfaq9.pod (@4228..)
	djgpp/configure.bat lib/Exporter/Heavy.pm (@4242..)
	Porting/findvars lib/ExtUtils/xsubpp pod/perlguts.pod
	t/lib/filecopy.t (@4271..) ext/attrs/attrs.pm (@4278..)
	t/op/avhv.t (@4279..) lib/Pod/Checker.pm
	lib/Pod/InputObjects.pm t/pod/testp2pt.pl (@4280..)
	lib/Pod/Usage.pm pod/podchecker.PL t/pod/poderrs.t
	t/pod/poderrs.xr t/pod/testpchk.pl (@4281..) lib/Pod/Text.pm
	pod/pod2man.PL (@4282..) ext/Devel/Peek/Peek.xs
	ext/DynaLoader/dl_beos.xs ext/DynaLoader/dl_dld.xs
	ext/DynaLoader/dl_mpeix.xs ext/DynaLoader/dlutils.c perlio.c
	(@4302..) ext/B/defsubs_h.PL t/pragma/constant.t (@4303..)
	ext/Thread/Thread.xs (@4316..) ext/Thread/Thread.pm (@4328..)
	lib/Exporter.pm (@4331..) ext/DynaLoader/dl_aix.xs (@4336..)
	pod/Makefile pod/roffitall (@4340..) lib/lib.pm (@4343..)
	pod/perlref.pod (@4345..) perly.y perly_c.diff (@4350..)
	t/lib/safe2.t (@4353..) hints/svr5.sh (@4377..)
	pod/perlfaq2.pod (@4383..) lib/Benchmark.pm (@4384..)
	win32/include/dirent.h (@4385..) pod/perlopentut.pod (@4390..)
	hints/os2.sh os2/Makefile.SHs (@4393..) lib/Pod/Parser.pm
	lib/Pod/Select.pm (@4400..) malloc.c (@4402..)
	pod/perlmodlib.pod (@4404..) perlvars.h (@4409..) t/op/sort.t
	(@4418..) t/op/int.t (@4430..) os2/OS2/REXX/REXX.pm t/io/fs.t
	t/op/magic.t (@4432..) lib/File/Path.pm (@4433..)
	t/op/lex_assign.t (@4436..) lib/attributes.pm (@4437..)
	pod/perlop.pod (@4438..) ext/POSIX/POSIX.xs (@4448..)
	Policy_sh.SH ext/Data/Dumper/Dumper.xs hints/dec_osf.sh
	t/lib/charnames.t (@4475..) lib/Time/Local.pm (@4481..) cv.h
	ext/B/B/Xref.pm (@4485..) doop.c handy.h hints/irix_6.sh pp.h
	taint.c (@4496..) deb.c (@4505..) dosish.h os2/os2ish.h perly.c
	vms/perly_c.vms (@4511..) ext/B/B/Lint.pm pod/perlmod.pod
	pod/perlrun.pod (@4515..) bytecode.pl ext/B/B.pm
	ext/B/B/Asmdata.pm ext/B/B/CC.pm ext/B/B/Debug.pm
	ext/B/B/Deparse.pm ext/ByteLoader/bytecode.h
	ext/ByteLoader/byterun.c ext/ByteLoader/byterun.h
	ext/Devel/Peek/Peek.pm gv.h (@4545..) README.epoc
	epoc/epocish.h ext/B/B.xs ext/Fcntl/Fcntl.pm hints/hpux.sh
	t/lib/syslfs.t t/op/lfs.t t/op/pat.t (@4556..)
	ext/DynaLoader/DynaLoader_pm.PL hints/solaris_2.sh
	lib/unicode/Is/SylA.pl lib/unicode/Is/SylC.pl
	lib/unicode/Is/SylE.pl lib/unicode/Is/SylI.pl
	lib/unicode/Is/SylO.pl lib/unicode/Is/SylU.pl
	lib/unicode/Is/SylV.pl lib/unicode/Is/SylWA.pl
	lib/unicode/Is/SylWC.pl lib/unicode/Is/SylWE.pl
	lib/unicode/Is/SylWI.pl lib/unicode/Is/SylWV.pl
	lib/unicode/mktables.PL t/op/pack.t t/op/regexp.t utils/h2xs.PL
	utils/perldoc.PL vms/vms.c vms/vmsish.h win32/win32iop.h
	(@4573..) t/lib/dumper.t t/pragma/overload.t (@4574..)
	ext/Errno/Errno_pm.PL ext/IO/lib/IO/Socket.pm (@4575..)
	t/op/misc.t (@4578..) ext/Opcode/Opcode.xs (@4579..) cop.h
	(@4588..) lib/perl5db.pl (@4601..) XSUB.h globals.c
	pod/perl.pod run.c scope.c (@4602..) op.h win32/perllib.c
	(@4603..) AUTHORS pod/perlport.pod t/op/runlevel.t (@4604..)
	scope.h (@4605..) README.vms hints/aix.sh vms/subconfigure.com
	(@4606..) pod/perlxstut.pod (@4620..) regcomp.h (@4622..)
	ext/Devel/DProf/DProf.pm ext/DynaLoader/Makefile.PL (@4623..)
	pod/perltrap.pod (@4630..) ext/B/B/Bytecode.pm (@4631..)
	opcode.h opcode.pl t/pragma/warn/4lint t/pragma/warn/doio
	t/pragma/warn/pp_hot (@4641..) mg.c (@4658..) iperlsys.h
	(@4660..) ext/B/B/C.pm (@4662..) pod/perlre.pod (@4666..)
	embedvar.h (@4668..) t/lib/filefind.t (@4671..) intrpvar.h
	(@4672..) ext/DynaLoader/dl_hpux.xs ext/DynaLoader/dl_next.xs
	ext/DynaLoader/dl_rhapsody.xs (@4686..) lib/File/Find.pm
	(@4687..) cygwin/Makefile.SHs (@4688..) t/op/re_tests (@4693..)
	hv.c (@4694..) t/op/delete.t (@4695..) utf8.c (@4698..)
	thread.h (@4704..) pod/perldiag.pod pp_sys.c (@4709..)
	Makefile.SH (@4712..) hints/cygwin.sh t/op/stat.t (@4717..)
	README.os2 lib/ExtUtils/Install.pm (@4720..) t/pragma/warn/doop
	t/pragma/warn/pp t/pragma/warn/regcomp t/pragma/warn/sv
	t/pragma/warn/toke t/pragma/warn/utf8 (@4721..)
	lib/diagnostics.pm (@4722..) regcomp.c (@4724..) configpm
	pp_ctl.c sv.h (@4726..) global.sym (@4727..) INTERN.h
	README.win32 lib/ExtUtils/MM_Win32.pm makedef.pl (@4729..)
	t/io/argv.t (@4732..) doio.c pp_hot.c (@4736..) toke.c
	(@4740..) gv.c (@4742..) win32/win32.h (@4743..)
	ext/Devel/DProf/DProf.xs objXSUB.h (@4744..)
	ext/Data/Dumper/Dumper.pm (@4745..) embed.h embed.pl
	ext/DynaLoader/dl_dlopen.xs proto.h (@4746..) pp.c (@4747..)
	sv.c (@4749..) lib/ExtUtils/MM_Unix.pm
	lib/ExtUtils/MakeMaker.pm (@4754..) util.c utils/perlcc.PL
	(@4755..) t/io/open.t (@4757..) regexec.c (@4759..) MANIFEST
	installman (@4769..) Porting/Glossary (@4771..) t/lib/thread.t
	(@4772..) Changes INSTALL Porting/config.sh Porting/config_H
	config_h.SH installperl patchlevel.h win32/config.bc
	win32/config.gc win32/config.vc win32/config_sh.PL
	win32/win32.c (@4773..) win32/Makefile win32/config_H.bc
	win32/config_H.gc win32/config_H.vc win32/makefile.mk (@4774..)
	perl.c (@4779..) t/op/fork.t (@4791..) av.c pod/perldelta.pod
	(@4796..) pod/perlfunc.pod (@4799..) dump.c (@4800..) op.c
	(@4801..) perl.h (@4805..) Configure (@4814..) 'merge in'
	configure.com (@4767..)

1 files changed, 273 insertions, 212 deletions

diff --git a/pod/perlmodlib.pod b/pod/perlmodlib.pod
index 99d31bd6e1..05570d9732 100644
--- a/pod/perlmodlib.pod
+++ b/pod/perlmodlib.pod
@@ -48,15 +48,15 @@ The following pragmas are defined (and have their own documentation).
 
 =item attributes
 
-set/get the attributes of a subroutine or variable
+Get/set subroutine or variable attributes
 
 =item attrs
 
-set/get attributes of a subroutine (obsolescent)
+Set/get attributes of a subroutine (deprecated)
 
 =item autouse
 
-postpone load of modules until a function is used
+Postpone load of modules until a function is used
 
 =item base
 
@@ -66,77 +66,81 @@ Establish IS-A relationship with base class at compile time
 
 Use MakeMaker's uninstalled version of a package
 
+=item caller
+
+Inherit pragmatic attributes from caller's context 
+
+=item charnames
+
+Define character names for C<\N{named}> string literal escape.
+
 =item constant
 
-declare constants
+Declare constants
 
 =item diagnostics
 
-Perl compiler pragma to force verbose warning diagnostics
+Force verbose warning diagnostics
 
 =item fields
 
-compile-time class fields
+Declare a class's attribute fields at compile-time 
 
 =item filetest
 
-control the filetest permission operators
+Control the filetest operators like C<-r>, C<-w> for AFS, etc.
 
 =item integer
 
-compute arithmetic in integer instead of double
+Compute arithmetic in integer instead of double
 
 =item less
 
-perl pragma to request less of something from the compiler
+Request less of something from the compiler (unimplemented)
 
 =item lib
 
-manipulate @INC at compile time
+Manipulate @INC at compile time
 
 =item locale
 
-use and avoid POSIX locales for built-in operations
+Use or avoid POSIX locales for built-in operations
 
 =item ops
 
-restrict unsafe operations when compiling
+Restrict unsafe operations when compiling
 
 =item overload
 
-Package for overloading perl operations
+Overload Perl operations
 
 =item re
 
-alter regular expression behavior
+Alter regular expression behavior
 
 =item sigtrap
 
-enable simple signal handling
+Enable simple signal handling
 
 =item strict
 
-restrict unsafe constructs
+Restrict unsafe constructs
 
 =item subs
 
-predeclare sub names
+Predeclare subroutine names
 
 =item utf8
 
-turn on UTF-8 and Unicode support
+Turn on UTF-8 and Unicode support
 
 =item vars
 
-predeclare global variable names
+Predeclare global variable names (obsoleted by our())
 
 =item warnings
 
-control optional warnings
-
-=item vmsish
-
-control VMS-specific language features
+Control optional warnings
 
 =back
 
@@ -150,19 +154,19 @@ Exporter module.  See their own documentation for details.
 
 =item AnyDBM_File
 
-provide framework for multiple DBMs
+Provide framework for multiple DBM libraries
 
 =item AutoLoader
 
-load subroutines only on demand
+Load subroutines only on demand
 
 =item AutoSplit
 
-split a package for autoloading
+Split a package for autoloading
 
 =item B
 
-The Perl Compiler; See also L<perlcc>.
+Guts of the Perl code generator (aka compiler) 
 
 =item B::Asmdata
 
@@ -194,7 +198,7 @@ Walk Perl syntax tree, printing debug info about ops
 
 =item B::Deparse
 
-Perl compiler backend to produce perl code
+Perl compiler backend to produce Perl code
 
 =item B::Disassembler
 
@@ -202,7 +206,7 @@ Disassemble Perl bytecode
 
 =item B::Lint
 
-Perl lint
+Module to catch dubious constructs
 
 =item B::Showlex
 
@@ -212,6 +216,8 @@ Show lexical variables used in functions or files
 
 Helper module for CC backend
 
+B::Stash -- XXX NFI XXX
+
 =item B::Terse
 
 Walk Perl syntax tree, printing terse info about ops
@@ -222,11 +228,15 @@ Generates cross reference reports for Perl programs
 
 =item Benchmark
 
-benchmark running times of code
+Benchmark running times of code
+
+=item ByteLoader
+
+Load byte-compiled Perl code
 
 =item CGI
 
-Simple Common Gateway Interface Class
+Simple Common Gateway Interface class
 
 =item CGI::Apache
 
@@ -244,6 +254,10 @@ Interface to Netscape Cookies
 
 CGI Interface for Fast CGI
 
+=item CGI::Pretty
+
+Module to produce nicely formatted HTML code
+
 =item CGI::Push
 
 Simple Interface to Server Push
@@ -254,11 +268,11 @@ Try more than one constructors and return the first object available
 
 =item CPAN
 
-query, download and build perl modules from CPAN sites
+Query, download, and build Perl modules from CPAN sites
 
 =item CPAN::FirstTime
 
-Utility for CPAN::Config file Initialization
+Utility for CPAN::Config file initialization
 
 =item CPAN::Nox
 
@@ -266,23 +280,27 @@ Wrapper around CPAN.pm without using any XS module
 
 =item Carp
 
-warn of errors (from perspective of caller)
+Act like warn/die from perspective of caller
+
+=item Carp::Heavy
+
+Carp guts
 
 =item Class::Struct
 
-declare struct-like datatypes as Perl classes
+Declare struct-like datatypes as Perl classes
 
 =item Config
 
-access Perl configuration information
+Access Perl configuration information
 
 =item Cwd
 
-get pathname of current working directory
+Get pathname of current working directory
 
 =item DB
 
-programmatic interface to the Perl debugging API 
+Programmatic interface to the Perl debugging API (experimental)
 
 =item DB_File
 
@@ -290,7 +308,11 @@ Perl5 access to Berkeley DB version 1.x
 
 =item Data::Dumper
 
-stringified perl data structures, suitable for both printing and C<eval>
+Serialize Perl data structures
+
+=item Devel::DProf
+
+A Perl execution profiler 
 
 =item Devel::Peek
 
@@ -298,15 +320,15 @@ A data debugging tool for the XS programmer
 
 =item Devel::SelfStubber
 
-generate stubs for a SelfLoading module
+Generate stubs for a SelfLoading module
 
 =item DirHandle
 
-supply object methods for directory handles
+Supply object methods for directory handles
 
 =item Dumpvalue
 
-provides screen dump of Perl data.
+Provide screen dump of Perl data
 
 =item DynaLoader
 
@@ -314,31 +336,35 @@ Dynamically load C libraries into Perl code
 
 =item English
 
-use nice English (or awk) names for ugly punctuation variables
+Use English (or awk) names for ugly punctuation variables
 
 =item Env
 
-perl module that imports environment variables
+Access environment variables as regular ones
 
 =item Errno
 
-System errno constants
+Load the libc errno.h defines
 
 =item Exporter
 
-Implements default import method for modules
+Implement default import method for modules
+
+=item Exporter::Heavy
+
+Exporter guts
 
 =item ExtUtils::Command
 
-utilities to replace common UNIX commands in Makefiles etc.
+Utilities to replace common Unix commands in Makefiles etc.
 
 =item ExtUtils::Embed
 
-Utilities for embedding Perl in C/C++ applications
+Utilities for embedding Perl in C/C++ programs
 
 =item ExtUtils::Install
 
-install files from here to there
+Install files from here to there
 
 =item ExtUtils::Installed
 
@@ -346,63 +372,69 @@ Inventory management of installed modules
 
 =item ExtUtils::Liblist
 
-determine libraries to use and how to use them
+Determine libraries to use and how to use them
+
+=item ExtUtils::MM_Cygwin
+
+Methods to override Unix behavior in ExtUtils::MakeMaker
 
 =item ExtUtils::MM_OS2
 
-methods to override UN*X behavior in ExtUtils::MakeMaker
+Methods to override Unix behavior in ExtUtils::MakeMaker
 
 =item ExtUtils::MM_Unix
 
-methods used by ExtUtils::MakeMaker
+Methods used by ExtUtils::MakeMaker
 
 =item ExtUtils::MM_VMS
 
-methods to override UN*X behavior in ExtUtils::MakeMaker
+Methods to override Unix behavior in ExtUtils::MakeMaker
 
 =item ExtUtils::MM_Win32
 
-methods to override UN*X behavior in ExtUtils::MakeMaker
+Methods to override Unix behavior in ExtUtils::MakeMaker
 
 =item ExtUtils::MakeMaker
 
-create an extension Makefile
+Create an extension Makefile
 
 =item ExtUtils::Manifest
 
-utilities to write and check a MANIFEST file
-
-=item ExtUtils::Miniperl
+Utilities to write and check a MANIFEST file
 
-write the C code for perlmain.c
+ExtUtils::Miniperl, writemain - Write the C code for perlmain.c
 
 =item ExtUtils::Mkbootstrap
 
-make a bootstrap file for use by DynaLoader
+Make a bootstrap file for use by DynaLoader
 
 =item ExtUtils::Mksymlists
 
-write linker options files for dynamic extension
+Write linker options files for dynamic extension
 
 =item ExtUtils::Packlist
 
-manage .packlist files
+Manage .packlist files
 
 =item ExtUtils::testlib
 
-add blib/* directories to @INC
+Add blib/* directories to @INC
 
 =item Fatal
 
-replace functions with equivalents which succeed or die
+Replace functions with equivalents which succeed or die
 
 =item Fcntl
 
-load the C Fcntl.h defines
+Load the libc fcntl.h defines
 
 =item File::Basename
 
-split a pathname into pieces
+Split a pathname into pieces
+
+=item File::CheckTree
+
+Run many filetest checks on a tree
 
 =item File::Compare
 
@@ -414,23 +446,27 @@ Copy files or filehandles
 
 =item File::DosGlob
 
-DOS like globbing and then some
+DOS-like globbing and then some
 
 =item File::Find
 
-traverse a file tree
+Traverse a file tree 
+
+=item File::Glob
+
+Perl extension for BSD filename globbing 
 
 =item File::Path
 
-create or remove a series of directories
+Create or remove a series of directories
 
 =item File::Spec
 
-portably perform operations on file names
+Portably perform operations on file names
 
 =item File::Spec::Functions
 
-portably perform operations on file names
+Portably perform operations on file names
 
 =item File::Spec::Mac
 
@@ -438,43 +474,43 @@ File::Spec for MacOS
 
 =item File::Spec::OS2
 
-methods for OS/2 file specs
+Methods for OS/2 file specs
 
 =item File::Spec::Unix
 
-methods used by File::Spec
+Methods used by File::Spec
 
 =item File::Spec::VMS
 
-methods for VMS file specs
+Methods for VMS file specs
 
 =item File::Spec::Win32
 
-methods for Win32 file specs
+Methods for Win32 file specs
 
 =item File::stat
 
-by-name interface to Perl's built-in stat() functions
+By-name interface to Perl's built-in stat() functions
 
 =item FileCache
 
-keep more files open than the system permits
+Keep more files open than the system permits
 
 =item FileHandle
 
-supply object methods for filehandles
+Supply object methods for filehandles
 
 =item FindBin
 
-Locate directory of original perl script
+Locate installation directory of running Perl program
 
 =item GDBM_File
 
-Perl5 access to the gdbm library.
+Access to the gdbm library
 
 =item Getopt::Long
 
-extended processing of command line options
+Extended processing of command line options
 
 =item Getopt::Std
 
@@ -482,27 +518,27 @@ Process single-character switches with switch clustering
 
 =item I18N::Collate
 
-compare 8-bit scalar data according to the current locale
+Compare 8-bit scalar data according to current locale
 
 =item IO
 
-load various IO modules
+Front-end to load various IO modules
 
 =item IO::Dir
 
-supply object methods for directory handles
+Supply object methods for directory handles
 
 =item IO::File
 
-supply object methods for filehandles
+Supply object methods for filehandles
 
 =item IO::Handle
 
-supply object methods for I/O handles
+Supply object methods for I/O handles
 
 =item IO::Pipe
 
-supply object methods for pipes
+Supply object methods for pipes
 
 =item IO::Poll
 
@@ -510,7 +546,7 @@ Object interface to system poll call
 
 =item IO::Seekable
 
-supply seek based methods for I/O objects
+Supply seek based methods for I/O objects
 
 =item IO::Select
 
@@ -534,11 +570,11 @@ SysV Msg IPC object class
 
 =item IPC::Open2
 
-open a process for both reading and writing
+Open a process for both reading and writing
 
 =item IPC::Open3
 
-open a process for reading, writing, and error handling
+Open a process for reading, writing, and error handling
 
 =item IPC::Semaphore
 
@@ -558,35 +594,31 @@ Arbitrary size integer math package
 
 =item Math::Complex
 
-complex numbers and associated mathematical functions
+Complex numbers and associated mathematical functions
 
 =item Math::Trig
 
-trigonometric functions
-
-=item NDBM_File
-
-Tied access to ndbm files
+Trigonometric functions
 
 =item Net::Ping
 
-check a remote host for reachability
+Check a remote host for reachability
 
 =item Net::hostent
 
-by-name interface to Perl's built-in gethost*() functions
+By-name interface to Perl's built-in gethost*() functions
 
 =item Net::netent
 
-by-name interface to Perl's built-in getnet*() functions
+By-name interface to Perl's built-in getnet*() functions
 
 =item Net::protoent
 
-by-name interface to Perl's built-in getproto*() functions
+By-name interface to Perl's built-in getproto*() functions
 
 =item Net::servent
 
-by-name interface to Perl's built-in getserv*() functions
+By-name interface to Perl's built-in getserv*() functions
 
 =item O
 
@@ -594,19 +626,47 @@ Generic interface to Perl Compiler backends
 
 =item Opcode
 
-Disable named opcodes when compiling perl code
+Disable named opcodes when compiling Perl code
 
 =item POSIX
 
 Perl interface to IEEE Std 1003.1
 
+=item Pod::Checker
+
+Check pod documents for syntax errors
+
 =item Pod::Html
 
-module to convert pod files to HTML
+Module to convert pod files to HTML
+
+=item Pod::InputObjects
+
+Manage POD objects 
+
+=item Pod::Man
+
+Convert POD data to formatted *roff input
+
+=item Pod::Parser
+
+Base class for creating POD filters and translators
+
+=item Pod::Select
+
+Extract selected sections of POD from input
 
 =item Pod::Text
 
-convert POD data to formatted ASCII text
+Convert POD data to formatted ASCII text
+
+=item Pod::Text::Color
+
+Convert POD data to formatted color ASCII text
+
+=item Pod::Usage
+
+Print a usage message from embedded pod documentation
 
 =item SDBM_File
 
@@ -618,27 +678,27 @@ Compile and execute code in restricted compartments
 
 =item Search::Dict
 
-search for key in dictionary file
+Search for key in dictionary file
 
 =item SelectSaver
 
-save and restore selected file handle
+Save and restore selected file handle
 
 =item SelfLoader
 
-load functions only on demand
+Load functions only on demand
 
 =item Shell
 
-run shell commands transparently within perl
+Run shell commands transparently within Perl
 
 =item Socket
 
-load the C socket.h defines and structure manipulators
+Load the libc socket.h defines and structure manipulators
 
 =item Symbol
 
-manipulate Perl symbols and their names
+Manipulate Perl symbols and their names
 
 =item Sys::Hostname
 
@@ -646,85 +706,65 @@ Try every conceivable way to get hostname
 
 =item Sys::Syslog
 
-Perl interface to the UNIX syslog(3) calls
+Interface to the libc syslog(3) calls
 
 =item Term::Cap
 
-Perl termcap interface
+Termcap interface
 
 =item Term::Complete
 
-Perl word completion module
+Word completion module
 
 =item Term::ReadLine
 
-Perl interface to various C<readline> packages. 
+Interface to various `readline' packages. 
 
 =item Test
 
-provides a simple framework for writing test scripts
+Provides a simple framework for writing test scripts
 
 =item Test::Harness
 
-run perl standard test scripts with statistics
+Run Perl standard test scripts with statistics
 
 =item Text::Abbrev
 
-create an abbreviation table from a list
+Create an abbreviation table from a list
 
 =item Text::ParseWords
 
-parse text into an array of tokens or array of arrays
+Parse text into a list of tokens or array of arrays
 
 =item Text::Soundex
 
-Implementation of the Soundex Algorithm as Described by Knuth
+Implementation of the Soundex Algorithm as described by Knuth
 
-=item Text::Tabs -- expand and unexpand tabs per the unix expand(1) and unexpand(1)
+Text::Tabs -- expand and unexpand tabs per expand(1) and unexpand(1)
 
 =item Text::Wrap
 
-line wrapping to form simple paragraphs
-
-=item Thread 
-
-multithreading
-
-=item Thread::Queue 
-
-thread-safe queues
-
-=item Thread::Semaphore 
-
-thread-safe semaphores
-
-=item Thread::Signal 
-
-Start a thread which runs signal handlers reliably
-
-=item Thread::Specific 
-
-thread-specific keys
+Line wrapping to form simple paragraphs
 
 =item Tie::Array
 
-base class for tied arrays
+Base class for tied arrays
 
 =item Tie::Handle
 
-base class definitions for tied handles
+Base class definitions for tied handles
 
-=item Tie::Hash, Tie::StdHash
+=item Tie::Hash
 
-base class definitions for tied hashes
+Base class definitions for tied hashes
 
 =item Tie::RefHash
 
-use references as hash keys
+Use references as hash keys
 
-=item Tie::Scalar, Tie::StdScalar
+=item Tie::Scalar
 
-base class definitions for tied scalars
+Base class definitions for tied scalars
 
 =item Tie::SubstrHash
 
@@ -732,31 +772,31 @@ Fixed-table-size, fixed-key-length hashing
 
 =item Time::Local
 
-efficiently compute time from local and GMT time
+Efficiently compute time from local and GMT time
 
 =item Time::gmtime
 
-by-name interface to Perl's built-in gmtime() function
+By-name interface to Perl's built-in gmtime() function
 
 =item Time::localtime
 
-by-name interface to Perl's built-in localtime() function
+By-name interface to Perl's built-in localtime() function
 
 =item Time::tm
 
-internal object used by Time::gmtime and Time::localtime
+Internal object used by Time::gmtime and Time::localtime
 
 =item UNIVERSAL
 
-base class for ALL classes (blessed references)
+Base class for ALL classes (blessed references)
 
 =item User::grent
 
-by-name interface to Perl's built-in getgr*() functions
+By-name interface to Perl's built-in getgr*() functions
 
 =item User::pwent
 
-by-name interface to Perl's built-in getpw*() functions
+By-name interface to Perl's built-in getpw*() functions
 
 =back
 
@@ -875,56 +915,64 @@ You should try to choose one close to you:
 
 =item Africa
 
-   South Africa    ftp://ftp.is.co.za/programming/perl/CPAN/
+    South Africa   ftp://ftp.is.co.za/programming/perl/CPAN/
+                   ftp://ftp.saix.net/pub/CPAN/
+                   ftp://ftp.sun.ac.za/CPAN/
                    ftp://ftpza.co.za/pub/mirrors/cpan/
 
 =item Asia
 
-   China           ftp://freesoft.cei.gov.cn/pub/languages/perl/CPAN/
-   Hong Kong       ftp://ftp.hkstar.com/pub/CPAN/
-   Israel          ftp://bioinfo.weizmann.ac.il/pub/software/perl/CPAN/
-   Japan           ftp://ftp.dti.ad.jp/pub/lang/CPAN/
+    China          ftp://freesoft.cei.gov.cn/pub/languages/perl/CPAN/
+    Hong Kong      ftp://ftp.hkstar.com/pub/CPAN/
+                   ftp://ftp.pacific.net.hk/pub/mirror/CPAN/
+    Indonesia      ftp://malone.piksi.itb.ac.id/pub/CPAN/
+    Israel         ftp://bioinfo.weizmann.ac.il/pub/software/perl/CPAN/
+    Japan          ftp://ftp.dti.ad.jp/pub/lang/CPAN/
                    ftp://ftp.jaist.ac.jp/pub/lang/perl/CPAN/
                    ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/
                    ftp://ftp.meisei-u.ac.jp/pub/CPAN/
                    ftp://ftp.ring.gr.jp/pub/lang/perl/CPAN/
                    ftp://mirror.nucba.ac.jp/mirror/Perl/
-   Singapore       ftp://ftp.nus.edu.sg/pub/unix/perl/CPAN/
-   South Korea     ftp://ftp.bora.net/pub/CPAN/
+    Singapore      ftp://ftp.nus.edu.sg/pub/unix/perl/CPAN/
+    South Korea    ftp://ftp.bora.net/pub/CPAN/
+                   ftp://ftp.kornet.net/pub/CPAN/
                    ftp://ftp.nuri.net/pub/CPAN/
-   Taiwan          ftp://ftp.wownet.net/pub2/PERL/
+    Taiwan         ftp://coda.nctu.edu.tw/computer-languages/perl/CPAN/
+                   ftp://ftp.ee.ncku.edu.tw/pub3/perl/CPAN/
+                   ftp://ftp.wownet.net/pub2/PERL/
                    ftp://ftp1.sinica.edu.tw/pub1/perl/CPAN/
-   Thailand        ftp://ftp.cs.riubon.ac.th/pub/mirrors/CPAN/
+    Thailand       ftp://ftp.cs.riubon.ac.th/pub/mirrors/CPAN/
                    ftp://ftp.nectec.or.th/pub/mirrors/CPAN/
 
 =item Australasia
 
-   Australia       ftp://cpan.topend.com.au/pub/CPAN/
+    Australia      ftp://cpan.topend.com.au/pub/CPAN/
                    ftp://ftp.labyrinth.net.au/pub/perl/CPAN/
                    ftp://ftp.sage-au.org.au/pub/compilers/perl/CPAN/
                    ftp://mirror.aarnet.edu.au/pub/perl/CPAN/
-   New Zealand     ftp://ftp.auckland.ac.nz/pub/perl/CPAN/
+    New Zealand    ftp://ftp.auckland.ac.nz/pub/perl/CPAN/
                    ftp://sunsite.net.nz/pub/languages/perl/CPAN/
 
-Central America
+=item Central America
 
-   Costa Rica      ftp://ftp.ucr.ac.cr/pub/Unix/CPAN/
+    Costa Rica     ftp://ftp.ucr.ac.cr/pub/Unix/CPAN/
 
 =item Europe
 
-   Austria         ftp://ftp.tuwien.ac.at/pub/languages/perl/CPAN/
-   Belgium         ftp://ftp.kulnet.kuleuven.ac.be/pub/mirror/CPAN/
-   Bulgaria        ftp://ftp.ntrl.net/pub/mirrors/CPAN/
-   Croatia         ftp://ftp.linux.hr/pub/CPAN/
-   Czech Republic  ftp://ftp.fi.muni.cz/pub/perl/
+    Austria        ftp://ftp.tuwien.ac.at/pub/languages/perl/CPAN/
+    Belgium        ftp://ftp.kulnet.kuleuven.ac.be/pub/mirror/CPAN/
+    Bulgaria       ftp://ftp.ntrl.net/pub/mirrors/CPAN/
+    Croatia        ftp://ftp.linux.hr/pub/CPAN/
+    Czech Republic ftp://ftp.fi.muni.cz/pub/perl/
                    ftp://sunsite.mff.cuni.cz/Languages/Perl/CPAN/
-   Denmark         ftp://sunsite.auc.dk/pub/languages/perl/CPAN/
-   Estonia         ftp://ftp.ut.ee/pub/languages/perl/CPAN/
-   Finland         ftp://ftp.funet.fi/pub/languages/perl/CPAN/
-   France          ftp://ftp.lip6.fr/pub/perl/CPAN/
+    Denmark        ftp://sunsite.auc.dk/pub/languages/perl/CPAN/
+    Estonia        ftp://ftp.ut.ee/pub/languages/perl/CPAN/
+    Finland        ftp://ftp.funet.fi/pub/languages/perl/CPAN/
+    France         ftp://ftp.lip6.fr/pub/perl/CPAN/
                    ftp://ftp.oleane.net/pub/mirrors/CPAN/
                    ftp://ftp.pasteur.fr/pub/computing/CPAN/
-   Germany         ftp://ftp.archive.de.uu.net/pub/CPAN/
+                   ftp://ftp.uvsq.fr/pub/perl/CPAN/
+    Germany        ftp://ftp.archive.de.uu.net/pub/CPAN/
                    ftp://ftp.gmd.de/packages/CPAN/
                    ftp://ftp.gwdg.de/pub/languages/perl/CPAN/
                    ftp://ftp.leo.org/pub/comp/programming/languages/script/perl/CPAN/
@@ -932,74 +980,87 @@ Central America
                    ftp://ftp.rz.ruhr-uni-bochum.de/pub/CPAN/
                    ftp://ftp.uni-erlangen.de/pub/source/CPAN/
                    ftp://ftp.uni-hamburg.de/pub/soft/lang/perl/CPAN/
-   Greece          ftp://ftp.ntua.gr/pub/lang/perl/
-   Hungary         ftp://ftp.kfki.hu/pub/packages/perl/CPAN/
-   Ireland         ftp://sunsite.compapp.dcu.ie/pub/perl/
-   Italy           ftp://cis.uniRoma2.it/CPAN/
+    Greece         ftp://ftp.ntua.gr/pub/lang/perl/
+    Hungary        ftp://ftp.kfki.hu/pub/packages/perl/CPAN/
+    Iceland        ftp://ftp.gm.is/pub/CPAN/
+    Ireland        ftp://cpan.indigo.ie/pub/CPAN/
+                   ftp://sunsite.compapp.dcu.ie/pub/perl/
+    Italy          ftp://cis.uniRoma2.it/CPAN/
                    ftp://ftp.flashnet.it/pub/CPAN/
                    ftp://ftp.unina.it/pub/Other/CPAN/
                    ftp://ftp.unipi.it/pub/mirror/perl/CPAN/
-   Netherlands     ftp://ftp.cs.uu.nl/mirror/CPAN/
+    Netherlands    ftp://ftp.cs.uu.nl/mirror/CPAN/
                    ftp://ftp.EU.net/packages/cpan/
                    ftp://ftp.nluug.nl/pub/languages/perl/CPAN/
-   Norway          ftp://ftp.uit.no/pub/languages/perl/cpan/
+    Norway         ftp://ftp.uit.no/pub/languages/perl/cpan/
                    ftp://sunsite.uio.no/pub/languages/perl/CPAN/
-   Poland          ftp://ftp.man.szczecin.pl/pub/perl/CPAN/
+    Poland         ftp://ftp.man.szczecin.pl/pub/perl/CPAN/
                    ftp://ftp.man.torun.pl/pub/doc/CPAN/
                    ftp://ftp.pk.edu.pl/pub/lang/perl/CPAN/
                    ftp://sunsite.icm.edu.pl/pub/CPAN/
-   Portugal        ftp://ftp.ci.uminho.pt/pub/mirrors/cpan/
+    Portugal       ftp://ftp.ci.uminho.pt/pub/mirrors/cpan/
                    ftp://ftp.ist.utl.pt/pub/CPAN/
                    ftp://ftp.ua.pt/pub/CPAN/
-   Romania         ftp://ftp.dntis.ro/pub/mirrors/perl-cpan/
+    Romania        ftp://ftp.dntis.ro/pub/mirrors/perl-cpan/
                    ftp://ftp.dnttm.ro/pub/CPAN/
     Russia         ftp://ftp.chg.ru/pub/lang/perl/CPAN/
                    ftp://ftp.sai.msu.su/pub/lang/perl/CPAN/
-   Slovakia        ftp://ftp.entry.sk/pub/languages/perl/CPAN/
-   Slovenia        ftp://ftp.arnes.si/software/perl/CPAN/
-   Spain           ftp://ftp.etse.urv.es/pub/perl/
+    Slovakia       ftp://ftp.entry.sk/pub/languages/perl/CPAN/
+    Slovenia       ftp://ftp.arnes.si/software/perl/CPAN/
+    Spain          ftp://ftp.etse.urv.es/pub/perl/
                    ftp://ftp.rediris.es/mirror/CPAN/
-   Sweden          ftp://ftp.sunet.se/pub/lang/perl/CPAN/
-   Switzerland     ftp://sunsite.cnlab-switch.ch/mirror/CPAN/
-   Turkey          ftp://sunsite.bilkent.edu.tr/pub/languages/CPAN/
-   United Kingdom  ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/
+    Sweden         ftp://ftp.sunet.se/pub/lang/perl/CPAN/
+    Switzerland    ftp://sunsite.cnlab-switch.ch/mirror/CPAN/
+    Turkey         ftp://sunsite.bilkent.edu.tr/pub/languages/CPAN/
+    United Kingdom ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/
                    ftp://ftp.flirble.org/pub/languages/perl/CPAN/
+                   ftp://ftp.mirror.ac.uk/sites/ftp.funet.fi/pub/languages/perl/CPAN/
                    ftp://ftp.plig.org/pub/CPAN/
                    ftp://sunsite.doc.ic.ac.uk/packages/CPAN/
-                   ftp://unix.hensa.ac.uk/mirrors/perl-CPAN/
 
 =item North America
 
-   Alberta         ftp://sunsite.ualberta.ca/pub/Mirror/CPAN/
+    Alberta        ftp://sunsite.ualberta.ca/pub/Mirror/CPAN/
+    California     ftp://cpan.nas.nasa.gov/pub/perl/CPAN/
+                   ftp://cpan.valueclick.com/CPAN/
+                   ftp://ftp.cdrom.com/pub/perl/CPAN/
+                   ftp://ftp.digital.com/pub/plan/perl/CPAN/
     California     ftp://cpan.nas.nasa.gov/pub/perl/CPAN/
+                   ftp://cpan.valueclick.com/CPAN/
                    ftp://ftp.cdrom.com/pub/perl/CPAN/
                    ftp://ftp.digital.com/pub/plan/perl/CPAN/
-   Colorado        ftp://ftp.cs.colorado.edu/pub/perl/CPAN/
-   Florida         ftp://ftp.cise.ufl.edu/pub/perl/CPAN/
-   Illinois        ftp://uiarchive.uiuc.edu/pub/lang/perl/CPAN/
-   Indiana         ftp://csociety-ftp.ecn.purdue.edu/pub/CPAN/
+    Colorado       ftp://ftp.cs.colorado.edu/pub/perl/CPAN/
+    Florida        ftp://ftp.cise.ufl.edu/pub/perl/CPAN/
+    Illinois       ftp://uiarchive.uiuc.edu/pub/lang/perl/CPAN/
+    Indiana        ftp://csociety-ftp.ecn.purdue.edu/pub/CPAN/
                    ftp://ftp.uwsg.indiana.edu/pub/perl/CPAN/
-   Manitoba        ftp://theory.uwinnipeg.ca/pub/CPAN/
-   Massachusetts   ftp://ftp.ccs.neu.edu/net/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/
+    Kentucky       ftp://ftp.uky.edu/CPAN/
+    Manitoba       ftp://theoryx5.uwinnipeg.ca/pub/CPAN/
+    Massachusetts  ftp://ftp.ccs.neu.edu/net/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/
                    ftp://ftp.iguide.com/pub/mirrors/packages/perl/CPAN/
     Mexico         ftp://ftp.msg.com.mx/pub/CPAN/
     Minnesota      ftp://ftp.midearthbbs.com/CPAN/
-   New York        ftp://ftp.rge.com/pub/languages/perl/
-   North Carolina  ftp://ftp.duke.edu/pub/perl/
-   Oklahoma        ftp://ftp.ou.edu/mirrors/CPAN/
+    New York       ftp://ftp.deao.net/pub/CPAN/
+                   ftp://ftp.rge.com/pub/languages/perl/
+                   ftp://ftp.tpj.com/pub/CPAN/
+    Nova Scotia    ftp://cpan.chebucto.ns.ca/pub/CPAN/
+    North Carolina ftp://ftp.duke.edu/pub/perl/
+    Oklahoma       ftp://ftp.ou.edu/mirrors/CPAN/
     Ontario        ftp://ftp.crc.ca/pub/packages/lang/perl/CPAN/
-   Oregon          ftp://ftp.orst.edu/pub/packages/CPAN/
-   Pennsylvania    ftp://ftp.epix.net/pub/languages/perl/
-   Texas           ftp://ftp.sedl.org/pub/mirrors/CPAN/
-   Utah            ftp://mirror.xmission.com/CPAN/
-   Virginia        ftp://ftp.perl.org/pub/perl/CPAN/
+    Oregon         ftp://ftp.orst.edu/pub/packages/CPAN/
+    Pennsylvania   ftp://ftp.epix.net/pub/languages/perl/
+    Tennessee      ftp://ftp.sunsite.utk.edu/pub/CPAN/
+    Texas          ftp://ftp.sedl.org/pub/mirrors/CPAN/
+    Utah           ftp://mirror.xmission.com/CPAN/
+    Virginia       ftp://ftp.perl.org/pub/perl/CPAN/
                    ftp://ruff.cs.jmu.edu/pub/CPAN/
     Washington     ftp://ftp-mirror.internap.com/pub/CPAN/
                    ftp://ftp.spu.edu/pub/CPAN/
 
 =item South America
 
-   Brazil          ftp://cpan.if.usp.br/pub/mirror/CPAN/
+    Brazil         ftp://cpan.if.usp.br/pub/mirror/CPAN/
+                   ftp://ftp.matrix.com.br/pub/perl/
     Chile          ftp://sunsite.dcc.uchile.cl/pub/Lang/perl/CPAN/
 
 =back