Integrate from mainperl.

p4raw-id: //depot/cfgperl@2779

diff --cc pod/perldelta.pod
index d20d1e0,9bb27ab..6745606
--- 1/pod/perldelta.pod
--- 2/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@@ -154,6 -176,6 +176,13 @@@ Todo
  You can use "Configure -Uinstallusrbinperl" which causes installperl
  to skip installing perl also as /usr/bin/perl.  This is useful if you
  prefer not to modify /usr/bin for some reason or another but harmful
++because many scripts assume to find Perl in /usr/bin/perl.
++
++=head1 Configuration Changes
++
++You can use "Configure -Uinstallusrbinperl" which causes installperl
++to skip installing perl also as /usr/bin/perl.  This is useful if you
++prefer not to modify /usr/bin for some reason or another but harmful
  because many scripts assume to find Perl in /usr/bin/perl.
  
  =head1 BUGS

diff --cc t/lib/textwrap.t
index 3b6a1ea,3b6a1ea..c3a455b
--- 1/t/lib/textwrap.t
--- 2/t/lib/textwrap.t
+++ b/t/lib/textwrap.t
@@@ -88,9 -88,9 +88,7 @@@ DON
  
  $| = 1;
  
--print "1..";
--print @tests/2;
--print "\n";
++print "1..", @tests/2, "\n";
  
  use Text::Wrap;