integrate cfgperl changes into mainline

p4raw-id: //depot/perl@2318

8 files changed, 19 insertions, 14 deletions

diff --git a/pod/perlfaq3.pod b/pod/perlfaq3.pod
index d06f2bef7a..478b0805d4 100644
--- a/pod/perlfaq3.pod
+++ b/pod/perlfaq3.pod
@@ -425,7 +425,7 @@ is the recommended Win95/NT port), or (eventually) build your own
 Win95/NT Perl using WinGCC, then you'll have to modify the Registry
 yourself.
 
-Macintosh perl scripts will have the the appropriate Creator and
+Macintosh perl scripts will have the appropriate Creator and
 Type, so that double-clicking them will invoke the perl application.
 
 I<IMPORTANT!>: Whatever you do, PLEASE don't get frustrated, and just
diff --git a/pod/perlfaq4.pod b/pod/perlfaq4.pod
index 633f5f109b..39325c2f69 100644
--- a/pod/perlfaq4.pod
+++ b/pod/perlfaq4.pod
@@ -207,7 +207,7 @@ http://www.perl.com/CPAN/authors/David_Muir_Sharnoff/modules/Time/JulianDay.pm.g
 =head2 Does Perl have a year 2000 problem?  Is Perl Y2K compliant?
 
 Short answer: No, Perl does not have a Year 2000 problem.  Yes,
-Perl is Y2K compliant.  The programmers you're hired to use it,
+Perl is Y2K compliant.  The programmers you've hired to use it,
 however, probably are not.
 
 Long answer: Perl is just as Y2K compliant as your pencil--no more,
@@ -378,7 +378,7 @@ There are a number of ways, with varying efficiency: If you want a
 count of a certain single character (X) within a string, you can use the
 C<tr///> function like so:
 
-    $string = "ThisXlineXhasXsomeXx'sXinXit":
+    $string = "ThisXlineXhasXsomeXx'sXinXit";
     $count = ($string =~ tr/X//);
     print "There are $count X charcters in the string";
 
@@ -1326,7 +1326,7 @@ The Data::Dumper module on CPAN is nice for printing out
 data structures, and FreezeThaw for copying them.  For example:
 
     use FreezeThaw qw(freeze thaw);
-    $new = thaw freeze $old;
+    ($new) = thaw freeze $old;
 
 Where $old can be (a reference to) any kind of data structure you'd like.
 It will be deeply copied.
diff --git a/pod/perlfaq5.pod b/pod/perlfaq5.pod
index 98e706afad..015c9b4d21 100644
--- a/pod/perlfaq5.pod
+++ b/pod/perlfaq5.pod
@@ -343,8 +343,8 @@ and use it as though it were a normal filehandle.
 Then use any of those as you would a normal filehandle.  Anywhere that
 Perl is expecting a filehandle, an indirect filehandle may be used
 instead. An indirect filehandle is just a scalar variable that contains
-a filehandle.  Functions like C<print>, C<open>, C<seek>, or the functions or
-the C<E<lt>FHE<gt>> diamond operator will accept either a read filehandle
+a filehandle.  Functions like C<print>, C<open>, C<seek>, or
+the C<E<lt>FHE<gt>> diamond operator will accept either a real filehandle
 or a scalar variable containing one:
 
     ($ifh, $ofh, $efh) = (*STDIN, *STDOUT, *STDERR);
@@ -352,7 +352,7 @@ or a scalar variable containing one:
     $got = <$ifh>
     print $efh "What was that: $got";
 
-Of you're passing a filehandle to a function, you can write
+If you're passing a filehandle to a function, you can write
 the function in two ways:
 
     sub accept_fh {
diff --git a/pod/perlfaq7.pod b/pod/perlfaq7.pod
index e1bccc883f..cb7f3c027a 100644
--- a/pod/perlfaq7.pod
+++ b/pod/perlfaq7.pod
@@ -313,7 +313,7 @@ caller's scope.
 
 Variable suicide is when you (temporarily or permanently) lose the
 value of a variable.  It is caused by scoping through my() and local()
-interacting with either closures or aliased foreach() interator
+interacting with either closures or aliased foreach() iterator
 variables and subroutine arguments.  It used to be easy to
 inadvertently lose a variable's value this way, but now it's much
 harder.  Take this code:
diff --git a/pod/perlfaq8.pod b/pod/perlfaq8.pod
index c4036ff35d..cbc87b5fd7 100644
--- a/pod/perlfaq8.pod
+++ b/pod/perlfaq8.pod
@@ -449,8 +449,8 @@ http://www.perl.com/CPAN/doc/misc/ancient/tutorial/eg/itimers.pl .
 
 =head2 How can I measure time under a second?
 
-In general, you may not be able to.  The Time::HiRes module (available
-from CPAN) provides this functionality for some systems.
+The Time::HiRes module (available from CPAN) provides this
+functionality for some systems.
 
 In general, you may not be able to.  But if your system supports both the
 syscall() function in Perl as well as a system call like gettimeofday(2),
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 8e7cf6da28..2d1e1dfa42 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -320,7 +320,7 @@ produce more accurate results than the bare stat() mode bits.
 
 When under the C<use filetest 'access'> the above-mentioned filetests
 will test whether the permission can (not) be granted using the
-access() family of system calls.  Also note that the -x and -X may
+access() family of system calls.  Also note that the C<-x> and C<-X> may
 under this pragma return true even if there are no execute permission
 bits set (nor any extra execute permission ACLs).  This strangeness is
 due to the underlying system calls' definitions.  Read the
diff --git a/pod/perlhist.pod b/pod/perlhist.pod
index 95a354fd51..b84eeabc49 100644
--- a/pod/perlhist.pod
+++ b/pod/perlhist.pod
@@ -6,7 +6,7 @@ perlhist - the Perl history records
 
 =for RCS
 #
-# $Id: perlhist.pod,v 1.48 1998/08/03 08:50:12 jhi Exp $
+# $Id: perlhist.pod,v 1.54 1998/11/22 17:43:17 jhi Exp jhi $
 #
 =end RCS
 
@@ -265,6 +265,7 @@ the strings?).
           5.004_04-m3   1998-May-15
           5.004_04-m4   1998-May-19
           5.004_04-MT5  1998-Jul-21
+          5.004_04-MT6  1998-Oct-09
 
  Malcolm  5.004_50      1997-Sep-09     The 5.005 development track.
           5.004_51      1997-Oct-02
@@ -303,6 +304,8 @@ the strings?).
 
  Sarathy  5.005_50      1998-Jul-26     The 5.006 development track.
           5.005_51      1998-Aug-10
+          5.005_52      1998-Sep-25
+          5.005_53      1998-Oct-31
 
 =head2 SELECTED RELEASE SIZES
 
@@ -448,11 +451,12 @@ The "diff lines kb" means that for example the patch 5.003_08, to be
 applied on top of the 5.003_07 (or whatever was before the 5.003_08)
 added lines for 110 kilobytes, it removed lines for 19 kilobytes, and
 changed lines for 424 kilobytes.  Just the lines themselves are
-counted, not their context.  The "+ - !" become from the diff(1)s
+counted, not their context.  The "+ - !" become from the diff(1)
 context diff output format.
 
  Pump-  Release         Date           diff lines kB
- king                                     +   -   !
+ king                                  -------------
+                                          +   -   !
  ===========================================================================
 
  Chip     5.003_08      1996-Nov-19     110  19 424
diff --git a/pod/pod2man.PL b/pod/pod2man.PL
index 9d0ecc31bc..4edf4f8bb2 100644
--- a/pod/pod2man.PL
+++ b/pod/pod2man.PL
@@ -331,6 +331,7 @@ sub makedate {
     my $secs = shift;
     my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($secs);
     my $mname = (qw{Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec})[$mon];
+    $year += 1900;
     return "$mday/$mname/$year";
 }