With permission, change the licensing of the docs by

TomC (and Gnat) to comply with the rest of Perl.

p4raw-id: //depot/perl@11607

diff --git a/pod/perlfaq.pod b/pod/perlfaq.pod
index 3f5536b..c2a414f 100644 (file)
--- a/pod/perlfaq.pod
+++ b/pod/perlfaq.pod
@@ -1337,12 +1337,8 @@ All rights reserved.
 
 =head2 Bundled Distributions
 
-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 requires that special arrangements be made with
-copyright holder.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in these files
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perlfaq1.pod b/pod/perlfaq1.pod
index ad18626..abed1a4 100644 (file)
--- a/pod/perlfaq1.pod
+++ b/pod/perlfaq1.pod
@@ -316,10 +316,8 @@ but the most recommendable way is to upgrade to at least Perl 5.6.1.
 Copyright (c) 1997, 1998, 1999, 2000, 2001 Tom Christiansen and Nathan
 Torkington.  All rights reserved.
 
-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>.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples here are in the public
 domain.  You are permitted and encouraged to use this code and any

diff --git a/pod/perlfaq2.pod b/pod/perlfaq2.pod
index ac9c12a..4514a8f 100644 (file)
--- a/pod/perlfaq2.pod
+++ b/pod/perlfaq2.pod
@@ -517,10 +517,8 @@ and there are many other sub-domains for special topics, such as
 Copyright (c) 1997-2001 Tom Christiansen and Nathan Torkington.
 All rights reserved.
 
-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 License.  For separate distributions of
-all or part of this FAQ outside of that, see L<perlfaq>.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples here are in the public
 domain.  You are permitted and encouraged to use this code and any

diff --git a/pod/perlfaq3.pod b/pod/perlfaq3.pod
index bb95629..4eceb46 100644 (file)
--- a/pod/perlfaq3.pod
+++ b/pod/perlfaq3.pod
@@ -820,10 +820,8 @@ information, see L<ExtUtils::MakeMaker>.
 Copyright (c) 1997-1999 Tom Christiansen and Nathan Torkington.
 All rights reserved.
 
-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 License.  For separate distributions of
-all or part of this FAQ outside of that, see L<perlfaq>.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples here are in the public
 domain.  You are permitted and encouraged to use this code and any

diff --git a/pod/perlfaq4.pod b/pod/perlfaq4.pod
index 2c992f2..dfd6374 100644 (file)
--- a/pod/perlfaq4.pod
+++ b/pod/perlfaq4.pod
@@ -1849,12 +1849,8 @@ the PDL module from CPAN instead--it makes number-crunching easy.
 Copyright (c) 1997-1999 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perlfaq5.pod b/pod/perlfaq5.pod
index daa8348..fc7c563 100644 (file)
--- a/pod/perlfaq5.pod
+++ b/pod/perlfaq5.pod
@@ -1179,10 +1179,8 @@ If your array contains lines, just print them:
 Copyright (c) 1997-1999 Tom Christiansen and Nathan Torkington.
 All rights reserved.
 
-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 License.  For separate distributions of
-all or part of this FAQ outside of that, see L<perlfaq>.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples here are in the public
 domain.  You are permitted and encouraged to use this code and any

diff --git a/pod/perlfaq6.pod b/pod/perlfaq6.pod
index 121f66c..9d9b48c 100644 (file)
--- a/pod/perlfaq6.pod
+++ b/pod/perlfaq6.pod
@@ -712,12 +712,8 @@ in L<perlre>.
 Copyright (c) 1997-1999 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perlfaq7.pod b/pod/perlfaq7.pod
index 10b5d25..bc249a0 100644 (file)
--- a/pod/perlfaq7.pod
+++ b/pod/perlfaq7.pod
@@ -969,12 +969,8 @@ you probably only want to use hard references.
 Copyright (c) 1997-1999 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perlfaq8.pod b/pod/perlfaq8.pod
index fa4ac44..d1f2978 100644 (file)
--- a/pod/perlfaq8.pod
+++ b/pod/perlfaq8.pod
@@ -1091,12 +1091,8 @@ but other times it is not.  Modern programs C<use Socket;> instead.
 Copyright (c) 1997-1999 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perlfaq9.pod b/pod/perlfaq9.pod
index a7b1b94..30e6bd2 100644 (file)
--- a/pod/perlfaq9.pod
+++ b/pod/perlfaq9.pod
@@ -588,12 +588,8 @@ an RPC stub generator and includes an RPC::ONC module.
 Copyright (c) 1997-1999 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perlopentut.pod b/pod/perlopentut.pod
index b4003f4..a1d3955 100644 (file)
--- a/pod/perlopentut.pod
+++ b/pod/perlopentut.pod
@@ -846,12 +846,8 @@ the POSIX documentation.
 
 Copyright 1998 Tom Christiansen.  
 
-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 outside of that
-package require that special arrangements be made with copyright
-holder.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in these files are
 hereby placed into the public domain.  You are permitted and

diff --git a/pod/perltoot.pod b/pod/perltoot.pod
index 38cc1f3..0ee7043 100644 (file)
--- a/pod/perltoot.pod
+++ b/pod/perltoot.pod
@@ -1769,12 +1769,8 @@ Class::MethodMaker and Tie::SecureHash
 Copyright (c) 1997, 1998 Tom Christiansen 
 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and

diff --git a/pod/perltootc.pod b/pod/perltootc.pod
index d2d881c..6511fca 100644 (file)
--- a/pod/perltootc.pod
+++ b/pod/perltootc.pod
@@ -1319,12 +1319,8 @@ worth checking out.
 Copyright (c) 1999 Tom Christiansen.
 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.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 Irrespective of its distribution, all code examples in this file
 are hereby placed into the public domain.  You are permitted and
@@ -1334,7 +1330,7 @@ credit would be courteous but is not required.
 
 =head1 ACKNOWLEDGEMENTS
 
-Russ Albery, Jon Orwant, Randy Ray, Larry Rosler, Nat Torkington,
+Russ Allbery, Jon Orwant, Randy Ray, Larry Rosler, Nat Torkington,
 and Stephen Warren all contributed suggestions and corrections to this
 piece.  Thanks especially to Damian Conway for his ideas and feedback,
 and without whose indirect prodding I might never have taken the time