Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5469

5 files changed, 28 insertions, 9 deletions

diff --git a/pod/perl.pod b/pod/perl.pod
index 0414fa4f29..cb627cdb7a 100644
--- a/pod/perl.pod
+++ b/pod/perl.pod
@@ -35,6 +35,7 @@ sections:
     perlmodlib		Perl modules: how to write and use
     perlmodinstall	Perl modules: how to install from CPAN
     perlform		Perl formats
+    perlunicode		Perl unicode support
     perllocale		Perl locale support
 
     perlreftut		Perl references short introduction
@@ -50,7 +51,8 @@ sections:
     perlipc		Perl interprocess communication
     perlfork		Perl fork() information
     perlthrtut		Perl threads tutorial
-    perldbmfilter	Perl DBM Filters
+    perllexwarn		Perl warnings and their control
+    perldbmfilter	Perl DBM filters
 
     perlcompile		Perl compiler suite intro
     perldebug		Perl debugging
@@ -77,6 +79,15 @@ sections:
     perlhack		Perl hackers guide
     perlhist		Perl history records
 
+    perlamiga		Perl notes for Amiga
+    perlcygwin		Perl notes for Cygwin
+    perldos		Perl notes for DOS
+    perlhpux		Perl notes for HP-UX
+    perlos2		Perl notes for OS/2
+    perlos390		Perl notes for OS/390
+    perlvms		Perl notes for VMS
+    perlwin32		Perl notes for Windows
+
 (If you're intending to read these straight through for the first time,
 the suggested order will tend to reduce the number of forward references.)
 
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index bd109ef122..a443ff4ebf 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -1630,6 +1630,15 @@ a connect attempt.  This allows you to configure its options
 A bug that prevented the IO::Socket::protocol() accessor
 from ever returning the correct value has been corrected.
 
+IO::Socket::connect now uses non-blocking IO instead of alarm()
+to do connect timeouts.
+
+IO::Socket::accept now uses select() instead of alarm() for doing
+timeouts.
+
+IO::Socket::INET->new now sets $! correctly on failure. $@ is
+still set for backwards compatability.
+
 =item JPL
 
 Java Perl Lingo is now distributed with Perl.  See jpl/README
diff --git a/pod/perlpod.pod b/pod/perlpod.pod
index 0997c71738..49e0ffc767 100644
--- a/pod/perlpod.pod
+++ b/pod/perlpod.pod
@@ -289,9 +289,8 @@ B<pod2man> for details).  Thus, you shouldn't write things like C<the
 LE<lt>fooE<gt> manpage>, if you want the translated document to read
 sensibly.
 
-If you don need or want total control of the text used for a
-link in the output use the form LE<lt>show this text|fooE<gt>
-instead.
+If you need total control of the text used for a link in the output
+use the form LE<lt>show this text|fooE<gt> instead.
 
 =item *
 
diff --git a/pod/perlre.pod b/pod/perlre.pod
index 6dd98ae3bf..64f7f1cdcb 100644
--- a/pod/perlre.pod
+++ b/pod/perlre.pod
@@ -570,7 +570,7 @@ so you should only do so if you are also using taint checking.
 Better yet, use the carefully constrained evaluation within a Safe
 module.  See L<perlsec> for details about both these mechanisms.
 
-=item C<(?p{ code })>
+=item C<(??{ code })>
 
 B<WARNING>: This extended regular expression feature is considered
 highly experimental, and may be changed or deleted without notice.
@@ -592,7 +592,7 @@ The following pattern matches a parenthesized group:
 	     (?:
 		(?> [^()]+ )	# Non-parens without backtracking
 	      |
-		(?p{ $re })	# Group with matching parens
+		(??{ $re })	# Group with matching parens
 	     )*
 	     \)
 	  }x;
@@ -1175,7 +1175,7 @@ else in the whole regular expression.)
 For this grouping operator there is no need to describe the ordering, since
 only whether or not C<S> can match is important.
 
-=item C<(?p{ EXPR })>
+=item C<(??{ EXPR })>
 
 The ordering is the same as for the regular expression which is
 the result of EXPR.
diff --git a/pod/perltoc.pod b/pod/perltoc.pod
index 83d40d4241..0a67fdc232 100644
--- a/pod/perltoc.pod
+++ b/pod/perltoc.pod
@@ -1648,7 +1648,7 @@ cntrl, graph, print, punct, xdigit
 
 C<(?#text)>, C<(?imsx-imsx)>, C<(?:pattern)>, C<(?imsx-imsx:pattern)>,
 C<(?=pattern)>, C<(?!pattern)>, C<(?E<lt>=pattern)>, C<(?<!pattern)>, C<(?{
-code })>, C<(?p{ code })>, C<(?E<gt>pattern)>,
+code })>, C<(??{ code })>, C<(?E<gt>pattern)>,
 C<(?(condition)yes-pattern|no-pattern)>, C<(?(condition)yes-pattern)>
 
 =item Backtracking
@@ -1663,7 +1663,7 @@ C<(?(condition)yes-pattern|no-pattern)>, C<(?(condition)yes-pattern)>
 
 C<ST>, C<S|T>, C<S{REPEAT_COUNT}>, C<S{min,max}>, C<S{min,max}?>, C<S?>,
 C<S*>, C<S+>, C<S??>, C<S*?>, C<S+?>, C<(?E<gt>S)>, C<(?=S)>, C<(?<=S)>,
-C<(?!S)>, C<(?<!S)>, C<(?p{ EXPR })>,
+C<(?!S)>, C<(?<!S)>, C<(??{ EXPR })>,
 C<(?(condition)yes-pattern|no-pattern)>
 
 =item Creating custom RE engines