Dual-life perlfaq

19 files changed, 89 insertions, 163 deletions

diff --git a/MANIFEST b/MANIFEST
index c03f829873..e6ee5ac99f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3183,6 +3183,17 @@ dist/Net-Ping/t/410_syn_host.t		Ping Net::Ping
 dist/Net-Ping/t/450_service.t		Ping Net::Ping
 dist/Net-Ping/t/500_ping_icmp.t		Ping Net::Ping
 dist/Net-Ping/t/510_ping_udp.t		Ping Net::Ping
+dist/perlfaq/lib/perlfaq1.pod		General Questions About Perl
+dist/perlfaq/lib/perlfaq2.pod	Obtaining and Learning about Perl
+dist/perlfaq/lib/perlfaq3.pod	Programming Tools
+dist/perlfaq/lib/perlfaq4.pod	Data Manipulation
+dist/perlfaq/lib/perlfaq5.pod	Files and Formats
+dist/perlfaq/lib/perlfaq6.pod	Regexes
+dist/perlfaq/lib/perlfaq7.pod	Perl Language Issues
+dist/perlfaq/lib/perlfaq8.pod	System Interaction
+dist/perlfaq/lib/perlfaq9.pod	Networking
+dist/perlfaq/lib/perlfaq.pm	Perl frequently asked questions
+dist/perlfaq/lib/perlfaq.pod	Perl frequently asked questions
 dist/Pod-Perldoc/lib/perldoc.pod			Look up Perl documentation in Pod format
 dist/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm	utility module for perldoc
 dist/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm	options parsing for perldoc
@@ -4367,16 +4378,6 @@ pod/perldiag.pod		Perl diagnostic messages
 pod/perldsc.pod			Perl data structures intro
 pod/perlebcdic.pod		Considerations for running Perl on EBCDIC platforms
 pod/perlembed.pod		Perl ways to embed perl in your C or C++ application
-pod/perlfaq1.pod		General Questions About Perl
-pod/perlfaq2.pod		Obtaining and Learning about Perl
-pod/perlfaq3.pod		Programming Tools
-pod/perlfaq4.pod		Data Manipulation
-pod/perlfaq5.pod		Files and Formats
-pod/perlfaq6.pod		Regexes
-pod/perlfaq7.pod		Perl Language Issues
-pod/perlfaq8.pod		System Interaction
-pod/perlfaq9.pod		Networking
-pod/perlfaq.pod			Perl frequently asked questions
 pod/perlfilter.pod		Perl source filters
 pod/perlfork.pod		Perl fork() information
 pod/perlform.pod		Perl formats
diff --git a/META.yml b/META.yml
index 1b611583ef..13a27e4c92 100644
--- a/META.yml
+++ b/META.yml
@@ -42,6 +42,7 @@ no_index:
     - dist/Math-BigRat
     - dist/Module-CoreList
     - dist/Net-Ping
+    - dist/perlfaq
     - dist/Pod-Perldoc
     - dist/Safe
     - dist/SelfLoader
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 1d8dd82ed8..287c4cbfbd 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -762,11 +762,12 @@ use File::Glob qw(:case);
 	'UPSTREAM'	=> 'blead',
 	},
 
-    'faq' =>
+    'perlfaq' =>
 	{
 	'MAINTAINER'	=> 'perlfaq',
-	'FILES'		=> q[pod/perlfaq*],
-	'UPSTREAM'	=> undef,
+	'DISTRIBUTION'  => 'FLORA/perlfaq-5.015000.tar.gz',
+	'FILES'		=> q[dist/perlfaq],
+	'UPSTREAM'	=> 'blead',
 	},
 
     'File::Basename' =>
diff --git a/dist/perlfaq/lib/perlfaq.pm b/dist/perlfaq/lib/perlfaq.pm
new file mode 100644
index 0000000000..9331e915bc
--- /dev/null
+++ b/dist/perlfaq/lib/perlfaq.pm
@@ -0,0 +1,7 @@
+package # This is here merely for reasons related to our toolchain. It's not
+        # supposed to be indexed.
+    perlfaq;
+
+our $VERSION = '5.015000';
+
+0; # not is it supposed to be loaded
diff --git a/pod/perlfaq.pod b/dist/perlfaq/lib/perlfaq.pod
index 9ca88c8fe0..3b128898fd 100644
--- a/pod/perlfaq.pod
+++ b/dist/perlfaq/lib/perlfaq.pod
@@ -1436,5 +1436,3 @@ How do I fetch/put an FTP file?
 How can I do RPC in Perl?
 
 =back
-
-
diff --git a/pod/perlfaq1.pod b/dist/perlfaq/lib/perlfaq1.pod
index bea50a059e..643ff4671e 100644
--- a/pod/perlfaq1.pod
+++ b/dist/perlfaq/lib/perlfaq1.pod
@@ -2,7 +2,7 @@
 
 perlfaq1 - General Questions About Perl
 
-=head1 DESCRIPTION 
+=head1 DESCRIPTION
 
 This section of the FAQ answers very general, high-level questions
 about Perl.
diff --git a/pod/perlfaq2.pod b/dist/perlfaq/lib/perlfaq2.pod
index 443d84b9a1..e74e621762 100644
--- a/pod/perlfaq2.pod
+++ b/dist/perlfaq/lib/perlfaq2.pod
@@ -231,7 +231,7 @@ There are many good books on Perl. See the L<perlbook> documentation or
 There's also I<$foo Magazin>, a German magazine dedicated to Perl, at
 ( http://www.foo-magazin.de ). The I<Perl-Zeitung> is another
 German-speaking magazine for Perl beginners (see
-http://perl-zeitung.at.tf ). 
+http://perl-zeitung.at.tf ).
 
 Magazines that frequently carry quality articles on Perl include
 I<Unix Review> ( http://www.unixreview.com/ ), I<Linux Magazine> (
diff --git a/pod/perlfaq3.pod b/dist/perlfaq/lib/perlfaq3.pod
index 78b1dba410..78b1dba410 100644
--- a/pod/perlfaq3.pod
+++ b/dist/perlfaq/lib/perlfaq3.pod
diff --git a/pod/perlfaq4.pod b/dist/perlfaq/lib/perlfaq4.pod
index 17fc71ee68..40000f8905 100644
--- a/pod/perlfaq4.pod
+++ b/dist/perlfaq/lib/perlfaq4.pod
@@ -464,7 +464,7 @@ millennium.
 (contributed by brian d foy)
 
 You could just store all your dates as a number and then subtract.
-Life isn't always that simple though. 
+Life isn't always that simple though.
 
 The C<Time::Piece> module, which comes with Perl, replaces C<localtime>
 with a version that returns an object. It also overloads the comparison
@@ -473,12 +473,12 @@ operators so you can compare them directly:
 	use Time::Piece;
 	my $date1 = localtime( $some_time );
 	my $date2 = localtime( $some_other_time );
-	
+
 	if( $date1 < $date2 ) {
 		print "The date was in the past\n";
 		}
 
-You can also get differences with a subtraction, which returns a 
+You can also get differences with a subtraction, which returns a
 C<Time::Seconds> object:
 
 	my $diff = $date1 - $date2;
@@ -526,7 +526,7 @@ You can also do the same things with the C<DateTime> module:
 
 You can use the C<Time::JulianDay> module available on CPAN.  Ensure
 that you really want to find a Julian day, though, as many people have
-different ideas about Julian days (see http://www.hermetic.ch/cal_stud/jdn.htm 
+different ideas about Julian days (see http://www.hermetic.ch/cal_stud/jdn.htm
 for instance):
 
 	$  perl -MTime::JulianDay -le 'print local_julian_day( time )'
@@ -562,16 +562,16 @@ function.
 Most people try to use the time rather than the calendar to figure out
 dates, but that assumes that days are twenty-four hours each.  For
 most people, there are two days a year when they aren't: the switch to
-and from summer time throws this off. For example, the rest of the 
+and from summer time throws this off. For example, the rest of the
 suggestions will be wrong sometimes:
 
 Starting with Perl 5.10, C<Time::Piece> and C<Time::Seconds> are part
-of the standard distribution, so you might think that you could do 
+of the standard distribution, so you might think that you could do
 something like this:
 
 	use Time::Piece;
 	use Time::Seconds;
-	
+
 	my $yesterday = localtime() - ONE_DAY; # WRONG
 	print "Yesterday was $yesterday\n";
 
@@ -2481,7 +2481,7 @@ required work for you.
 
 (contributed by brian d foy)
 
-The trick to this problem is avoiding accidental autovivification. If 
+The trick to this problem is avoiding accidental autovivification. If
 you want to check three keys deep, you might naE<0xEF>vely try this:
 
 	my %hash;
@@ -2489,7 +2489,7 @@ you want to check three keys deep, you might naE<0xEF>vely try this:
 		...;
 		}
 
-Even though you started with a completely empty hash, after that call to 
+Even though you started with a completely empty hash, after that call to
 C<exists> you've created the structure you needed to check for C<key3>:
 
 	%hash = (
@@ -2515,14 +2515,14 @@ subroutine can tell you not only if the keys exist but also get the
 value:
 
 	use Data::Diver qw(Dive);
-	
+
     my @exists = Dive( \%hash, qw(key1 key2 key3) );
     if(  ! @exists  ) {
         ...; # keys do not exist
-    	} 
+	}
     elsif(  ! defined $exists[0]  ) {
         ...; # keys exist but value is undef
-    	}
+	}
 
 You can easily do this yourself too by checking each level of the hash
 before you move onto the next level. This is essentially what
@@ -2531,17 +2531,17 @@ C<Data::Diver> does for you:
 	if( check_hash( \%hash, qw(key1 key2 key3) ) ) {
 		...;
 		}
-	
+
 	sub check_hash {
 	   my( $hash, @keys ) = @_;
-	
+
 	   return unless @keys;
-	
+
 	   foreach my $key ( @keys ) {
 		   return unless eval { exists $hash->{$key} };
 		   $hash = $hash->{$key};
 		   }
-	
+
 	   return 1;
 	   }
 
@@ -2566,17 +2566,17 @@ Assuming that you don't care about IEEE notations like "NaN" or
 "Infinity", you probably just want to use a regular expression:
 
 	use 5.010;
-	
+
 	given( $number ) {
-		when( /\D/ )             
+		when( /\D/ )
 			{ say "\thas nondigits"; continue }
-		when( /^\d+\z/ )         
+		when( /^\d+\z/ )
 			{ say "\tis a whole number"; continue }
-		when( /^-?\d+\z/ )       
+		when( /^-?\d+\z/ )
 			{ say "\tis an integer"; continue }
-		when( /^[+-]?\d+\z/ )    
+		when( /^[+-]?\d+\z/ )
 			{ say "\tis a +/- integer"; continue }
-		when( /^-?(?:\d+\.?|\.\d)\d*\z/ ) 
+		when( /^-?(?:\d+\.?|\.\d)\d*\z/ )
 			{ say "\tis a real number"; continue }
 		when( /^[+-]?(?=\.?\d)\d*\.?\d*(?:e[+-]?\d+)?\z/i)
 			{ say "\tis a C float" }
diff --git a/pod/perlfaq5.pod b/dist/perlfaq/lib/perlfaq5.pod
index 76b6d3e0e2..e7ed594517 100644
--- a/pod/perlfaq5.pod
+++ b/dist/perlfaq/lib/perlfaq5.pod
@@ -1138,7 +1138,7 @@ you see someone do this:
 You should think long and hard about why you need everything loaded at
 once. It's just not a scalable solution.
 
-If you "mmap" the file with the File::Map module from 
+If you "mmap" the file with the File::Map module from
 CPAN, you can virtually load the entire file into a
 string without actually storing it in memory:
 
diff --git a/pod/perlfaq6.pod b/dist/perlfaq/lib/perlfaq6.pod
index 3066187fa6..d72fee946b 100644
--- a/pod/perlfaq6.pod
+++ b/dist/perlfaq/lib/perlfaq6.pod
@@ -716,7 +716,7 @@ If you have Perl 5.10 or later, this is almost trivial. You just smart
 match against an array of regular expression objects:
 
 	my @patterns = ( qr/Fr.d/, qr/B.rn.y/, qr/W.lm./ );
-	
+
 	if( $string ~~ @patterns ) {
 		...
 		};
diff --git a/pod/perlfaq7.pod b/dist/perlfaq/lib/perlfaq7.pod
index fcf270d9ce..c32b109542 100644
--- a/pod/perlfaq7.pod
+++ b/dist/perlfaq/lib/perlfaq7.pod
@@ -1067,4 +1067,3 @@ are hereby placed into the public domain.  You are permitted and
 encouraged to use this code in your own programs for fun
 or for profit as you see fit.  A simple comment in the code giving
 credit would be courteous but is not required.
-
diff --git a/pod/perlfaq8.pod b/dist/perlfaq/lib/perlfaq8.pod
index c3b179d4be..c3b179d4be 100644
--- a/pod/perlfaq8.pod
+++ b/dist/perlfaq/lib/perlfaq8.pod
diff --git a/pod/perlfaq9.pod b/dist/perlfaq/lib/perlfaq9.pod
index d211e96c8a..8ab955243a 100644
--- a/pod/perlfaq9.pod
+++ b/dist/perlfaq/lib/perlfaq9.pod
@@ -438,7 +438,7 @@ This I<just> matches the address itself:
 	my $local      = qr{(?:$dot_atom|$quoted)};
 	my $quotedpair = qr{\\[\x00-\x09\x0B-\x0c\x0e-\x7e]};
 	my $domain_lit = qr{\[(?:$quotedpair|[\x21-\x5a\x5e-\x7e])*\]};
- 	my $domain     = qr{(?:$dot_atom|$domain_lit)};
+	my $domain     = qr{(?:$dot_atom|$domain_lit)};
 	my $addr_spec  = qr{$local\@$domain};
 
 Just match an address against C</^${addr_spec}$/> to see if it follows
@@ -629,7 +629,7 @@ name, or the domain name.
 
 	my $host = hostfqdn();
 
-The C<Sys::Hostname> module, part of the Standard Library, can also get the 
+The C<Sys::Hostname> module, part of the Standard Library, can also get the
 hostname:
 
 	use Sys::Hostname;
diff --git a/lib/.gitignore b/lib/.gitignore
index e51dce168b..43939bc963 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -393,6 +393,7 @@
 /ops.pm
 /parent.pm
 /perldoc.pod
+/perlfaq*
 /re.pm
 /threads
 /threads.pm
diff --git a/pod.lst b/pod.lst
index 2ac5f21f34..74205f23e1 100644
--- a/pod.lst
+++ b/pod.lst
@@ -33,16 +33,16 @@ h Tutorials
   perltrap		Perl traps for the unwary
   perldebtut		Perl debugging tutorial
 
-  perlfaq		Perl frequently asked questions
-2 perlfaq1		General Questions About Perl
-2 perlfaq2		Obtaining and Learning about Perl
-2 perlfaq3		Programming Tools
-2 perlfaq4		Data Manipulation
-2 perlfaq5		Files and Formats
-2 perlfaq6		Regexes
-2 perlfaq7		Perl Language Issues
-2 perlfaq8		System Interaction
-2 perlfaq9		Networking
+  dist/perlfaq/lib/perlfaq		Perl frequently asked questions
+2 dist/perlfaq/lib/perlfaq1		General Questions About Perl
+2 dist/perlfaq/lib/perlfaq2		Obtaining and Learning about Perl
+2 dist/perlfaq/lib/perlfaq3		Programming Tools
+2 dist/perlfaq/lib/perlfaq4		Data Manipulation
+2 dist/perlfaq/lib/perlfaq5		Files and Formats
+2 dist/perlfaq/lib/perlfaq6		Regexes
+2 dist/perlfaq/lib/perlfaq7		Perl Language Issues
+2 dist/perlfaq/lib/perlfaq8		System Interaction
+2 dist/perlfaq/lib/perlfaq9		Networking
 
 h Reference Manual
 
diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat
index 9d42f109e4..c7f851bf9e 100644
--- a/t/porting/known_pod_issues.dat
+++ b/t/porting/known_pod_issues.dat
@@ -168,6 +168,13 @@ dist/math-bigrat/lib/math/bigrat.pm	Verbatim line length including indents excee
 dist/module-corelist/blib/script/corelist	Verbatim line length including indents exceeds 80 by	1
 dist/module-corelist/lib/module/corelist.pm	Verbatim line length including indents exceeds 80 by	4
 dist/net-ping/lib/net/ping.pm	Verbatim line length including indents exceeds 80 by	2
+dist/perlfaq/lib/perlfaq2.pod	Verbatim line length including indents exceeds 80 by	1
+dist/perlfaq/lib/perlfaq4.pod	Verbatim line length including indents exceeds 80 by	16
+dist/perlfaq/lib/perlfaq5.pod	Verbatim line length including indents exceeds 80 by	40
+dist/perlfaq/lib/perlfaq6.pod	Verbatim line length including indents exceeds 80 by	36
+dist/perlfaq/lib/perlfaq7.pod	Verbatim line length including indents exceeds 80 by	7
+dist/perlfaq/lib/perlfaq8.pod	Verbatim line length including indents exceeds 80 by	20
+dist/perlfaq/lib/perlfaq9.pod	Verbatim line length including indents exceeds 80 by	7
 dist/safe/safe.pm	Verbatim line length including indents exceeds 80 by	1
 dist/safe/safe.pm	empty section in previous paragraph	1
 dist/selfloader/lib/selfloader.pm	Verbatim line length including indents exceeds 80 by	14
@@ -217,17 +224,9 @@ pod/perldelta.pod	Apparent broken link	2
 pod/perldelta.pod	Pod NAME already used	-1
 pod/perldiag.pod	=item type mismatch	1
 pod/perldiag.pod	Verbatim line length including indents exceeds 80 by	2
-pod/perldoc.pod	? Should you be using F<...> or maybe L<...> instead of	1
 pod/perldsc.pod	Verbatim line length including indents exceeds 80 by	4
 pod/perlebcdic.pod	Verbatim line length including indents exceeds 80 by	273
 pod/perlembed.pod	Verbatim line length including indents exceeds 80 by	27
-pod/perlfaq2.pod	Verbatim line length including indents exceeds 80 by	1
-pod/perlfaq4.pod	Verbatim line length including indents exceeds 80 by	16
-pod/perlfaq5.pod	Verbatim line length including indents exceeds 80 by	40
-pod/perlfaq6.pod	Verbatim line length including indents exceeds 80 by	36
-pod/perlfaq7.pod	Verbatim line length including indents exceeds 80 by	7
-pod/perlfaq8.pod	Verbatim line length including indents exceeds 80 by	20
-pod/perlfaq9.pod	Verbatim line length including indents exceeds 80 by	7
 pod/perlfunc.pod	There is more than one target	1
 pod/perlfunc.pod	Verbatim line length including indents exceeds 80 by	183
 pod/perlgit.pod	Verbatim line length including indents exceeds 80 by	14
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index ee8e733a78..41068fda5e 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -413,27 +413,26 @@ pod12 = [.lib.pods]perlboot.pod [.lib.pods]perlbot.pod [.lib.pods]perlbs2000.pod
 pod13 = [.lib.pods]perlclib.pod [.lib.pods]perlcn.pod [.lib.pods]perlcommunity.pod [.lib.pods]perlcompile.pod [.lib.pods]perlcygwin.pod
 pod14 = [.lib.pods]perldata.pod [.lib.pods]perldbmfilter.pod [.lib.pods]perldebguts.pod [.lib.pods]perldebtut.pod [.lib.pods]perldebug.pod
 pod15 = [.lib.pods]perldelta.pod [.lib.pods]perldgux.pod [.lib.pods]perldiag.pod [.lib.pods]perldos.pod [.lib.pods]perldsc.pod [.lib.pods]perlebcdic.pod
-pod16 = [.lib.pods]perlembed.pod [.lib.pods]perlepoc.pod [.lib.pods]perlfaq.pod [.lib.pods]perlfaq1.pod [.lib.pods]perlfaq2.pod [.lib.pods]perlfaq3.pod
-pod17 = [.lib.pods]perlfaq4.pod [.lib.pods]perlfaq5.pod [.lib.pods]perlfaq6.pod [.lib.pods]perlfaq7.pod [.lib.pods]perlfaq8.pod [.lib.pods]perlfaq9.pod
-pod18 = [.lib.pods]perlfilter.pod [.lib.pods]perlfork.pod [.lib.pods]perlform.pod [.lib.pods]perlfreebsd.pod [.lib.pods]perlfunc.pod [.lib.pods]perlgit.pod
-pod19 = [.lib.pods]perlglossary.pod [.lib.pods]perlgpl.pod [.lib.pods]perlguts.pod [.lib.pods]perlhack.pod [.lib.pods]perlhacktips.pod
-pod20 = [.lib.pods]perlhacktut.pod [.lib.pods]perlhaiku.pod [.lib.pods]perlhist.pod [.lib.pods]perlhpux.pod [.lib.pods]perlhurd.pod [.lib.pods]perlintern.pod
-pod21 = [.lib.pods]perlinterp.pod [.lib.pods]perlintro.pod [.lib.pods]perliol.pod [.lib.pods]perlipc.pod [.lib.pods]perlirix.pod [.lib.pods]perljp.pod
-pod22 = [.lib.pods]perlko.pod [.lib.pods]perllexwarn.pod [.lib.pods]perllinux.pod [.lib.pods]perllocale.pod [.lib.pods]perllol.pod [.lib.pods]perlmacos.pod
-pod23 = [.lib.pods]perlmacosx.pod [.lib.pods]perlmod.pod [.lib.pods]perlmodinstall.pod [.lib.pods]perlmodlib.pod [.lib.pods]perlmodstyle.pod
-pod24 = [.lib.pods]perlmpeix.pod [.lib.pods]perlmroapi.pod [.lib.pods]perlnetware.pod [.lib.pods]perlnewmod.pod [.lib.pods]perlnumber.pod
-pod25 = [.lib.pods]perlobj.pod [.lib.pods]perlop.pod [.lib.pods]perlopenbsd.pod [.lib.pods]perlopentut.pod [.lib.pods]perlos2.pod [.lib.pods]perlos390.pod
-pod26 = [.lib.pods]perlos400.pod [.lib.pods]perlpacktut.pod [.lib.pods]perlperf.pod [.lib.pods]perlplan9.pod [.lib.pods]perlpod.pod
-pod27 = [.lib.pods]perlpodspec.pod [.lib.pods]perlpodstyle.pod [.lib.pods]perlpolicy.pod [.lib.pods]perlport.pod [.lib.pods]perlpragma.pod
-pod28 = [.lib.pods]perlqnx.pod [.lib.pods]perlre.pod [.lib.pods]perlreapi.pod [.lib.pods]perlrebackslash.pod [.lib.pods]perlrecharclass.pod
-pod29 = [.lib.pods]perlref.pod [.lib.pods]perlreftut.pod [.lib.pods]perlreguts.pod [.lib.pods]perlrequick.pod [.lib.pods]perlreref.pod
-pod30 = [.lib.pods]perlretut.pod [.lib.pods]perlriscos.pod [.lib.pods]perlrun.pod [.lib.pods]perlsec.pod [.lib.pods]perlsolaris.pod [.lib.pods]perlsource.pod
-pod31 = [.lib.pods]perlstyle.pod [.lib.pods]perlsub.pod [.lib.pods]perlsymbian.pod [.lib.pods]perlsyn.pod [.lib.pods]perlthrtut.pod [.lib.pods]perltie.pod
-pod32 = [.lib.pods]perltoc.pod [.lib.pods]perltodo.pod [.lib.pods]perltooc.pod [.lib.pods]perltoot.pod [.lib.pods]perltrap.pod [.lib.pods]perltru64.pod
-pod33 = [.lib.pods]perltw.pod [.lib.pods]perlunicode.pod [.lib.pods]perlunifaq.pod [.lib.pods]perluniintro.pod [.lib.pods]perluniprops.pod
-pod34 = [.lib.pods]perlunitut.pod [.lib.pods]perlutil.pod [.lib.pods]perluts.pod [.lib.pods]perlvar.pod [.lib.pods]perlvmesa.pod [.lib.pods]perlvms.pod
-pod35 = [.lib.pods]perlvos.pod [.lib.pods]perlwin32.pod [.lib.pods]perlxs.pod [.lib.pods]perlxstut.pod
-pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $(pod9) $(pod10) $(pod11) $(pod12) $(pod13) $(pod14) $(pod15) $(pod16) $(pod17) $(pod18) $(pod19) $(pod20) $(pod21) $(pod22) $(pod23) $(pod24) $(pod25) $(pod26) $(pod27) $(pod28) $(pod29) $(pod30) $(pod31) $(pod32) $(pod33) $(pod34) $(pod35)
+pod16 = [.lib.pods]perlembed.pod [.lib.pods]perlepoc.pod [.lib.pods]perlfilter.pod [.lib.pods]perlfork.pod [.lib.pods]perlform.pod [.lib.pods]perlfreebsd.pod
+pod17 = [.lib.pods]perlfunc.pod [.lib.pods]perlgit.pod [.lib.pods]perlglossary.pod [.lib.pods]perlgpl.pod [.lib.pods]perlguts.pod [.lib.pods]perlhack.pod
+pod18 = [.lib.pods]perlhacktips.pod [.lib.pods]perlhacktut.pod [.lib.pods]perlhaiku.pod [.lib.pods]perlhist.pod [.lib.pods]perlhpux.pod
+pod19 = [.lib.pods]perlhurd.pod [.lib.pods]perlintern.pod [.lib.pods]perlinterp.pod [.lib.pods]perlintro.pod [.lib.pods]perliol.pod [.lib.pods]perlipc.pod
+pod20 = [.lib.pods]perlirix.pod [.lib.pods]perljp.pod [.lib.pods]perlko.pod [.lib.pods]perllexwarn.pod [.lib.pods]perllinux.pod [.lib.pods]perllocale.pod
+pod21 = [.lib.pods]perllol.pod [.lib.pods]perlmacos.pod [.lib.pods]perlmacosx.pod [.lib.pods]perlmod.pod [.lib.pods]perlmodinstall.pod
+pod22 = [.lib.pods]perlmodlib.pod [.lib.pods]perlmodstyle.pod [.lib.pods]perlmpeix.pod [.lib.pods]perlmroapi.pod [.lib.pods]perlnetware.pod
+pod23 = [.lib.pods]perlnewmod.pod [.lib.pods]perlnumber.pod [.lib.pods]perlobj.pod [.lib.pods]perlop.pod [.lib.pods]perlopenbsd.pod
+pod24 = [.lib.pods]perlopentut.pod [.lib.pods]perlos2.pod [.lib.pods]perlos390.pod [.lib.pods]perlos400.pod [.lib.pods]perlpacktut.pod
+pod25 = [.lib.pods]perlperf.pod [.lib.pods]perlplan9.pod [.lib.pods]perlpod.pod [.lib.pods]perlpodspec.pod [.lib.pods]perlpodstyle.pod
+pod26 = [.lib.pods]perlpolicy.pod [.lib.pods]perlport.pod [.lib.pods]perlpragma.pod [.lib.pods]perlqnx.pod [.lib.pods]perlre.pod [.lib.pods]perlreapi.pod
+pod27 = [.lib.pods]perlrebackslash.pod [.lib.pods]perlrecharclass.pod [.lib.pods]perlref.pod [.lib.pods]perlreftut.pod [.lib.pods]perlreguts.pod
+pod28 = [.lib.pods]perlrequick.pod [.lib.pods]perlreref.pod [.lib.pods]perlretut.pod [.lib.pods]perlriscos.pod [.lib.pods]perlrun.pod [.lib.pods]perlsec.pod
+pod29 = [.lib.pods]perlsolaris.pod [.lib.pods]perlsource.pod [.lib.pods]perlstyle.pod [.lib.pods]perlsub.pod [.lib.pods]perlsymbian.pod
+pod30 = [.lib.pods]perlsyn.pod [.lib.pods]perlthrtut.pod [.lib.pods]perltie.pod [.lib.pods]perltoc.pod [.lib.pods]perltodo.pod [.lib.pods]perltooc.pod
+pod31 = [.lib.pods]perltoot.pod [.lib.pods]perltrap.pod [.lib.pods]perltru64.pod [.lib.pods]perltw.pod [.lib.pods]perlunicode.pod [.lib.pods]perlunifaq.pod
+pod32 = [.lib.pods]perluniintro.pod [.lib.pods]perluniprops.pod [.lib.pods]perlunitut.pod [.lib.pods]perlutil.pod [.lib.pods]perluts.pod
+pod33 = [.lib.pods]perlvar.pod [.lib.pods]perlvmesa.pod [.lib.pods]perlvms.pod [.lib.pods]perlvos.pod [.lib.pods]perlwin32.pod [.lib.pods]perlxs.pod
+pod34 = [.lib.pods]perlxstut.pod
+pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $(pod9) $(pod10) $(pod11) $(pod12) $(pod13) $(pod14) $(pod15) $(pod16) $(pod17) $(pod18) $(pod19) $(pod20) $(pod21) $(pod22) $(pod23) $(pod24) $(pod25) $(pod26) $(pod27) $(pod28) $(pod29) $(pod30) $(pod31) $(pod32) $(pod33) $(pod34)
 
 PERLDELTA_CURRENT = [.pod]perl5151delta.pod
 
@@ -1041,46 +1040,6 @@ makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm nonxsext
 	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
 	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
 
-[.lib.pods]perlfaq.pod : [.pod]perlfaq.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq1.pod : [.pod]perlfaq1.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq2.pod : [.pod]perlfaq2.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq3.pod : [.pod]perlfaq3.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq4.pod : [.pod]perlfaq4.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq5.pod : [.pod]perlfaq5.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq6.pod : [.pod]perlfaq6.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq7.pod : [.pod]perlfaq7.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq8.pod : [.pod]perlfaq8.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
-[.lib.pods]perlfaq9.pod : [.pod]perlfaq9.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
 [.lib.pods]perlfilter.pod : [.pod]perlfilter.pod
 	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
 	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
diff --git a/win32/pod.mak b/win32/pod.mak
index a8b8700f28..b185e96a2e 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -91,16 +91,6 @@ POD = \
 	perldsc.pod	\
 	perlebcdic.pod	\
 	perlembed.pod	\
-	perlfaq.pod	\
-	perlfaq1.pod	\
-	perlfaq2.pod	\
-	perlfaq3.pod	\
-	perlfaq4.pod	\
-	perlfaq5.pod	\
-	perlfaq6.pod	\
-	perlfaq7.pod	\
-	perlfaq8.pod	\
-	perlfaq9.pod	\
 	perlfilter.pod	\
 	perlfork.pod	\
 	perlform.pod	\
@@ -249,16 +239,6 @@ MAN = \
 	perldsc.man	\
 	perlebcdic.man	\
 	perlembed.man	\
-	perlfaq.man	\
-	perlfaq1.man	\
-	perlfaq2.man	\
-	perlfaq3.man	\
-	perlfaq4.man	\
-	perlfaq5.man	\
-	perlfaq6.man	\
-	perlfaq7.man	\
-	perlfaq8.man	\
-	perlfaq9.man	\
 	perlfilter.man	\
 	perlfork.man	\
 	perlform.man	\
@@ -407,16 +387,6 @@ HTML = \
 	perldsc.html	\
 	perlebcdic.html	\
 	perlembed.html	\
-	perlfaq.html	\
-	perlfaq1.html	\
-	perlfaq2.html	\
-	perlfaq3.html	\
-	perlfaq4.html	\
-	perlfaq5.html	\
-	perlfaq6.html	\
-	perlfaq7.html	\
-	perlfaq8.html	\
-	perlfaq9.html	\
 	perlfilter.html	\
 	perlfork.html	\
 	perlform.html	\
@@ -565,16 +535,6 @@ TEX = \
 	perldsc.tex	\
 	perlebcdic.tex	\
 	perlembed.tex	\
-	perlfaq.tex	\
-	perlfaq1.tex	\
-	perlfaq2.tex	\
-	perlfaq3.tex	\
-	perlfaq4.tex	\
-	perlfaq5.tex	\
-	perlfaq6.tex	\
-	perlfaq7.tex	\
-	perlfaq8.tex	\
-	perlfaq9.tex	\
 	perlfilter.tex	\
 	perlfork.tex	\
 	perlform.tex	\