integrate cfgperl contents into mainline

p4raw-id: //depot/perl@5822

diff --cc embed.pl
Simple merge

diff --cc ext/Thread/Thread.pm
index 3e50a99,3e50a99..00cba8a
--- 1/ext/Thread/Thread.pm
--- 2/ext/Thread/Thread.pm
+++ b/ext/Thread/Thread.pm
@@@ -36,16 -36,16 +36,15 @@@ Thread - manipulate threads in Perl (EX
  
  =head1 DESCRIPTION
  
--The C<Thread> module provides multithreading support for perl.
--
--WARNING: Threading is an experimental feature.  Both the interface
--and implementation are subject to change drastically.
++    WARNING: Threading is an experimental feature.  Both the interface
++    and implementation are subject to change drastically.  In fact, this
++    documentation describes the flavor of threads that was in version
++    5.005.  Perl 5.6.0 and later have the beginnings of support for
++    interpreter threads, which (when finished) is expected to be
++    significantly different from what is described here.  The information
++    contained here may therefore soon be obsolete.  Use at your own risk!
  
--In fact, this documentation describes the flavor of threads that was in
--version 5.005.  Perl v5.6 has the beginnings of support for interpreter
--threads, which (when finished) is expected to be significantly different
--from what is described here.  The information contained here may therefore
--soon be obsolete.  Use at your own risk!
++The C<Thread> module provides multithreading support for perl.
  
  =head1 FUNCTIONS
  

diff --cc op.c
Simple merge

diff --cc perlapi.c
index b396d6b,787c2f2..787c2f2
mode 100644,100755..100644
--- 1/perlapi.c
--- 2/perlapi.c
+++ b/perlapi.c

diff --cc pod/perldelta.pod
Simple merge

diff --cc pod/perlthrtut.pod
index 88849dd,88849dd..0314d9d
--- 1/pod/perlthrtut.pod
--- 2/pod/perlthrtut.pod
+++ b/pod/perlthrtut.pod
@@@ -4,6 -4,6 +4,14 @@@ perlthrtut - tutorial on threads in Per
  
  =head1 DESCRIPTION
  
++    WARNING: Threading is an experimental feature.  Both the interface
++    and implementation are subject to change drastically.  In fact, this
++    documentation describes the flavor of threads that was in version
++    5.005.  Perl 5.6.0 and later have the beginnings of support for
++    interpreter threads, which (when finished) is expected to be
++    significantly different from what is described here.  The information
++    contained here may therefore soon be obsolete.  Use at your own risk!
++
  One of the most prominent new features of Perl 5.005 is the inclusion
  of threads.  Threads make a number of things a lot easier, and are a
  very useful addition to your bag of programming tricks.

diff --cc toke.c
Simple merge