Integrate mainline.

[p5sagit/p5-mst-13.2.git] / pod / perldiag.pod

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 37710b9..8a2e4a4 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -49,7 +49,7 @@ letter.
 (W) When using threaded Perl, a thread (not necessarily the main
 thread) exited while there were still other threads running.
 Usually it's a good idea to first collect the return values of the
-created threads by joining them, and only then exit from then main
+created threads by joining them, and only then exit from the main
 thread.  See L<threads>.
 
 =item accept() on closed socket %s
@@ -4166,7 +4166,7 @@ a package qualifier, e.g. C<&our()>, or C<Foo::our()>.
 
 =item Use of tainted arguments in %s is deprecated
 
-(W taint) You have supplied C<system()> or C<exec()> with multiple
+(W taint, deprecated) You have supplied C<system()> or C<exec()> with multiple
 arguments and at least one of them is tainted.  This used to be allowed
 but will become a fatal error in a future version of perl.  Untaint your
 arguments.  See L<perlsec>.