Integrate:

[ 21342]
Minor nit in a debug message of the tokenizer.

[ 21343]
Subject: [PATCH] Re: OK: 5.8.1 RC5 on SuSE 8.2 32bit AMD (gcc 3.3 prerelease)
From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Tue, 23 Sep 2003 09:13:55 -0700
Message-ID: <20030923161354.GA2432@efn.org>

[ 21344]
Subject: Re: NCR MP-RAS perl problems [perl #23791]
From: grommel@sears.com
Date: Tue, 23 Sep 2003 13:40:33 -0500
Message-ID: <OF17BD5036.3CA48F9B-ON86256DAA.00483620-86256DAA.0066A1AA@LocalDomain>

[ 21345]
v-promises from John Peaock.

[ 21346]
M::BI news from Tels.

[ 21348]
Subject: [PATCH] perlvar
From: Juerd <juerd@convolution.nl>
Date: Sun, 21 Sep 2003 21:40:54 +0200
Message-ID: <20030921194054.GD14702@c3.convolution.nl>

[ 21349]
The FAQ answer about POD comments was incorrect. [perl #23893]
(plus a few typos.)

[ 21350]
Subject: [PATCH 5.8.x] small perldelta patch
From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Tue, 23 Sep 2003 14:55:24 -0700
Message-ID: <20030923215524.GA3440@efn.org>

[ 21351]
perliol tweaks.
p4raw-link: @21351 on //depot/perl: b0a2be78d1e39d7609b90d53c8fffeee3363fb76
p4raw-link: @21350 on //depot/maint-5.8/perl: f00fc4cdd7e7e6fa370edd985f0d97e3d65b86ce
p4raw-link: @21349 on //depot/perl: 659cfd94ba23a1b903a75ecaffde534106f93c22
p4raw-link: @21348 on //depot/perl: f83912f27d5903d07e19b71d691d929ef9066cbc
p4raw-link: @21346 on //depot/maint-5.8/perl: f505be1cb0ea60b3b37a2de5bbddea0b5782ab29
p4raw-link: @21345 on //depot/maint-5.8/perl: a3fa8036fc3cd02e8efa74b6b61bdf0f5ac97132
p4raw-link: @21344 on //depot/perl: ca37ab507eb0cfe686e1e8008a10e033024f46d5
p4raw-link: @21343 on //depot/perl: 8d410bc4d2eab1d6e87b832152ba1fd130bba116
p4raw-link: @21342 on //depot/perl: 17ad61e03fe30671fca57305b7cdb9cef95a1b94

p4raw-id: //depot/maint-5.8/perl@21352
p4raw-integrated: from //depot/perl@21350 'copy in' pod/perlfaq7.pod
	(@20330..) INSTALL (@20781..) pod/perlpodspec.pod (@21198..)
	hints/svr4.sh (@21247..) t/op/stat.t (@21277..) pod/perliol.pod
	(@21311..) 'merge in' toke.c (@21136..) pod/perlvar.pod
	(@21162..)

8 files changed, 64 insertions, 20 deletions

diff --git a/INSTALL b/INSTALL
index e7fc6bdce1..1ea3e7b967 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1520,6 +1520,15 @@ explicitly above.
 
 This will attempt to make perl in the current directory.
 
+=head2 Expected errors
+
+These errors are normal, and can be ignored:
+
+  ...
+  make: [extra.pods] Error 1 (ignored)
+  ...
+  make: [extras.make] Error 1 (ignored)
+
 =head2 What if it doesn't work?
 
 If you can't compile successfully, try some of the following ideas.
diff --git a/hints/svr4.sh b/hints/svr4.sh
index aa1008da80..c781686e38 100644
--- a/hints/svr4.sh
+++ b/hints/svr4.sh
@@ -153,6 +153,8 @@ esac
 # _mwoflocheckl issue (see ext/POSIX/hints/svr4.pl) would be appreciated.
 #
 if test -f /etc/issue -a -f /etc/.relid; then
+    # libcrypt contains nothing libc wouldn't have.
+    libswanted=`echo " $libswanted " | sed -e 's/ crypt / /'`
     # With the NCR High Performance C Compiler R3.0c, miniperl fails
     # t/op/regexp.t test 461 unless we compile with optimize=-g.
     # Volunteers are needed to determine just which files need special
diff --git a/pod/perlfaq7.pod b/pod/perlfaq7.pod
index a735edc7c8..96d6b88d4a 100644
--- a/pod/perlfaq7.pod
+++ b/pod/perlfaq7.pod
@@ -725,32 +725,27 @@ not necessarily the same as the one in which you were compiled):
 
 =head2 How can I comment out a large block of perl code?
 
-You can use embedded POD to discard it.  The =for directive
-lasts until the next paragraph (two consecutive newlines).
+You can use embedded POD to discard it.  Enclose the blocks you want
+to comment out in POD markers, for example C<=for nobody> and C<=cut>
+(which marks ends of POD blocks).
 
     # program is here
 
     =for nobody
-    This paragraph is commented out
-
-    # program continues
-
-The =begin and =end directives can contain multiple
-paragraphs.
-
-    =begin comment text
 
     all of this stuff
 
     here will be ignored
     by everyone
 
-    =end comment text
+    =cut
+
+    # program continues
 
 The pod directives cannot go just anywhere.  You must put a
 pod directive where the parser is expecting a new statement,
 not just in the middle of an expression or some other
-arbitrary s grammar production.
+arbitrary grammar production.
 
 See L<perlpod> for more details.
 
diff --git a/pod/perliol.pod b/pod/perliol.pod
index a2eeed3287..466959b001 100644
--- a/pod/perliol.pod
+++ b/pod/perliol.pod
@@ -733,10 +733,46 @@ The application (or layer above) must ensure they are consistent.
 
 =back
 
+=head2 Utilities
+
+To ask for the next layer down use PerlIONext(PerlIO *f).
+
+To check that a PerlIO* is valid use PerlIOValid(PerlIO *f).  (All
+this does is really just to check that the pointer is non-NULL and
+that the pointer behind that is non-NULL.)
+
+PerlIOBase(PerlIO *f) returns the "Base" pointer, or in other words,
+the C<PerlIOl*> pointer.
+
+PerlIOSelf(PerlIO* f, type) return the PerlIOBase cast to a type.
+
+Perl_PerlIO_or_Base(PerlIO* f, callback, base, failure, args) either
+calls the I<callback> from the functions of the layer I<f> (just by
+the name of the IO function, like "Read") with the I<args>, or if
+there is no such callback, calls the I<base> version of the callback
+with the same args, or if the f is invalid, set errno to EBADF and
+return I<failure>.
+
+Perl_PerlIO_or_fail(PerlIO* f, callback, failure, args) either calls
+the I<callback> of the functions of the layer I<f> with the I<args>,
+or if there is no such callback, set errno to EINVAL.  Or if the f is
+invalid, set errno to EBADF and return I<failure>.
+
+Perl_PerlIO_or_Base_void(PerlIO* f, callback, base, args) either calls
+the I<callback> of the functions of the layer I<f> with the I<args>,
+or if there is no such callback, calls the I<base> version of the
+callback with the same args, or if the f is invalid, set errno to
+EBADF.
+
+Perl_PerlIO_or_fail_void(PerlIO* f, callback, args) either calls the
+I<callback> of the functions of the layer I<f> with the I<args>, or if
+there is no such callback, set errno to EINVAL.  Or if the f is
+invalid, set errno to EBADF.
+
 =head2 Implementing PerlIO Layers
 
 If you find the implementation document unclear or not sufficient,
-look at the existing perlio layer implementations, which include:
+look at the existing PerlIO layer implementations, which include:
 
 =over
 
diff --git a/pod/perlpodspec.pod b/pod/perlpodspec.pod
index e42bd4f8be..40e5371fe3 100644
--- a/pod/perlpodspec.pod
+++ b/pod/perlpodspec.pod
@@ -238,7 +238,7 @@ ignored.  Examples:
   # This is the first line of program text.
   sub foo { # This is the second.
 
-It is an error to try to I<start> a Pod black with a "=cut" command.  In
+It is an error to try to I<start> a Pod block with a "=cut" command.  In
 that case, the Pod processor must halt parsing of the input file, and
 must by default emit a warning.
 
diff --git a/pod/perlvar.pod b/pod/perlvar.pod
index 85f022e58f..b418194220 100644
--- a/pod/perlvar.pod
+++ b/pod/perlvar.pod
@@ -189,10 +189,9 @@ test.  Outside a C<while> test, this will not happen.
 
 Special package variables when using sort(), see L<perlfunc/sort>.
 Because of this specialness $a and $b don't need to be declared
-(using local(), use vars, or our()) even when using the strict
-vars pragma.  Don't lexicalize them with C<my $a> or C<my $b>
-if you want to be able to use them in the sort() comparison block
-or function.
+(using use vars, or our()) even when using the C<strict 'vars'> pragma.
+Don't lexicalize them with C<my $a> or C<my $b> if you want to be
+able to use them in the sort() comparison block or function.
 
 =back
 
diff --git a/t/op/stat.t b/t/op/stat.t
index b863f98c80..3cc3f0a1fa 100755
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -25,6 +25,7 @@ $Is_OS2     = $^O eq 'os2';
 $Is_Solaris = $^O eq 'solaris';
 $Is_VMS     = $^O eq 'VMS';
 $Is_DGUX    = $^O eq 'dgux';
+$Is_MPRAS   = $^O =~ /svr4/ && -f '/etc/.relid';
 
 $Is_Dosish  = $Is_Dos || $Is_OS2 || $Is_MSWin32 || $Is_NetWare || $Is_Cygwin;
 
@@ -211,6 +212,8 @@ SKIP: {
       if $Is_MSWin32 || $Is_NetWare || $Is_Dos;
     skip "/dev isn't available to test against", 6
       unless -d '/dev' && -r '/dev' && -x '/dev';
+    skip "Skipping; unexpected ls output in MP-RAS", 6
+      if $Is_MPRAS;
 
     my $LS  = $Config{d_readlink} ? "ls -lL" : "ls -l";
     my $CMD = "$LS /dev 2>/dev/null";
diff --git a/toke.c b/toke.c
index 160799602e..16f566d76c 100644
--- a/toke.c
+++ b/toke.c
@@ -2872,8 +2872,8 @@ Perl_yylex(pTHX)
 		/* Assume it was a minus followed by a one-letter named
 		 * subroutine call (or a -bareword), then. */
 		DEBUG_T( { PerlIO_printf(Perl_debug_log,
-			"### %c looked like a file test but was not\n",
-			(int)ftst);
+			"### '-%c' looked like a file test but was not\n",
+			tmp);
 		} );
 		s -= 2;
 	    }