summaryrefslogtreecommitdiff
path: root/pod/perlartistic.pod
diff options
context:
space:
mode:
authorDavid Golden <dagolden@cpan.org>2010-05-06 09:36:59 -0400
committerDavid Golden <dagolden@cpan.org>2010-05-06 09:36:59 -0400
commitfa861958788779f82cb4c14d67b583bc18a75ef9 (patch)
tree63f2b7e240a219dd0bd1e35961f239f73e2cd3d9 /pod/perlartistic.pod
parente94207f0054827b17e4288dc7a991b75906a5b1c (diff)
downloadperl-fa861958788779f82cb4c14d67b583bc18a75ef9.tar.gz
Change perlgpl.pod to GPL 1 to match README
The README and Copying files are specific that Perl is licensed under Artistic or GPL 1 (or later). For whatever reason, perlgpl.pod was created with GPL 2. This commit changes it back to GPL 1 for consistency with the actual license. It also standardizes the introduction to both perlgpl and perlartistic for consistent language explaining the dual license.
Diffstat (limited to 'pod/perlartistic.pod')
-rw-r--r--pod/perlartistic.pod19
1 files changed, 13 insertions, 6 deletions
diff --git a/pod/perlartistic.pod b/pod/perlartistic.pod
index 82f3b689b9..63813ff4fb 100644
--- a/pod/perlartistic.pod
+++ b/pod/perlartistic.pod
@@ -10,13 +10,20 @@ perlartistic - the Perl Artistic License
=head1 DESCRIPTION
-This is B<"The Artistic License">. It's here so that modules,
-programs, etc., that want to declare this as their distribution
-license, can link to it.
+Perl is free software; you can redistribute it and/or modify
+it under the terms of either:
-It is also one of the two licenses Perl allows itself to be
-redistributed and/or modified; for the other one, the GNU General
-Public License, see the L<perlgpl>.
+ a) the GNU General Public License as published by the Free
+ Software Foundation; either version 1, or (at your option) any
+ later version, or
+
+ b) the "Artistic License" which comes with this Kit.
+
+This is B<"The Artistic License">.
+It's here so that modules, programs, etc., that want to declare
+this as their distribution license can link to it.
+
+For the GNU General Public License, see L<perlgpl>.
=head1 The "Artistic License"