applied patch (via private mail), modulo retrohunks in pod/perlfaq2.pod

	Subject: Re: docpatch 
	Message-Id: <199807051515.JAA03644@jhereg.perl.com>

p4raw-id: //depot/perl@1325

1 files changed, 13 insertions, 15 deletions

diff --git a/pod/perlfaq1.pod b/pod/perlfaq1.pod
index 34caab8c29..ee071e4216 100644
--- a/pod/perlfaq1.pod
+++ b/pod/perlfaq1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-perlfaq1 - General Questions About Perl ($Revision: 1.12 $, $Date: 1997/04/24 22:43:34 $)
+perlfaq1 - General Questions About Perl ($Revision: 1.14 $, $Date: 1998/06/14 22:15:25 $)
 
 =head1 DESCRIPTION
 
@@ -51,10 +51,10 @@ users the informal support will more than suffice.  See the answer to
 
 You should definitely use version 5.  Version 4 is old, limited, and
 no longer maintained; its last patch (4.036) was in 1992.  The most
-recent production release is 5.004.  Further references to the Perl
+recent production release is 5.004_01.  Further references to the Perl
 language in this document refer to this production release unless
 otherwise specified.  There may be one or more official bug fixes for
-5.004 by the time you read this, and also perhaps some experimental
+5.004_01 by the time you read this, and also perhaps some experimental
 versions on the way to the next release.
 
 =head2 What are perl4 and perl5?
@@ -250,15 +250,13 @@ behind).  Several important bugs were fixed from the 5.000 through
 Copyright (c) 1997, 1998 Tom Christiansen and Nathan Torkington.
 All rights reserved.
 
-When included as part of the Standard Version of Perl, or as part of
-its complete documentation whether printed or otherwise, this work
-may be distributed only under the terms of Perl's Artistic License.
-Any distribution of this file or derivatives thereof I<outside>
-of that package require that special arrangements be made with
-copyright holder.
-
-Irrespective of its distribution, all code examples in this file
-are hereby placed into the public domain.  You are permitted and
-encouraged to use this code in your own programs for fun
-or for profit as you see fit.  A simple comment in the code giving
-credit would be courteous but is not required.
+When included as an integrated part of the Standard Distribution
+of Perl or of its documentation (printed or otherwise), this works is
+covered under Perl's Artistic Licence.  For separate distributions of
+all or part of this FAQ outside of that, see L<perlfaq>.
+
+Irrespective of its distribution, all code examples here are public
+domain.  You are permitted and encouraged to use this code and any
+derivatives thereof in your own programs for fun or for profit as you
+see fit.  A simple comment in the code giving credit to the FAQ would
+be courteous but is not required.