summaryrefslogtreecommitdiff
path: root/pod
diff options
context:
space:
mode:
authorDominic Hargreaves <dom@earth.li>2011-08-20 15:44:13 +0100
committerFather Chrysostomos <sprout@cpan.org>2011-08-20 23:32:28 -0700
commit608704e1f3b32d0b3448ff076c8516e218a1e022 (patch)
tree1532461943e04a3fa9cf6bb9a5c6f8531f939f07 /pod
parentf25d4e0545b63ee4449b804027ac80195dc47dd3 (diff)
downloadperl-608704e1f3b32d0b3448ff076c8516e218a1e022.tar.gz
[perl #96000] Apply standard copyright license statement
The original authors have agreed to alter the licensing of these files, in order to remove a potentially problematic invariant title clause: From: Doug MacEachern <dougm@…..com> To: Jon Orwant <orwant@….com> Cc: Jesse Vincent <jesse@fsck.com> Subject: Re: [fwd] [perl #96000] Restrictive licensing term on pod/perlembed.pod, pod/perlmodinstall.pod Message-ID: <1dc71b53-12e2-45d3-af62-f6d169147921@ox.local> In-Reply-To: <CAJs5hDaW+k6mf_NBj-6hPyr4rGvkEjhVtXyJ8ziLXyXimcvgHA@mail.gmail.com> Any license changes to perlembed.pod are fine with me. Or just revert to the original version of the document: "Look at perlmain.c, and do something like that." ;) Best, -Doug ----- Original Message ----- > From: "Jon Orwant" <orwant@….com> > To: "Jesse Vincent" <jesse@fsck.com> > Cc: dougm@….com > Sent: Sunday, July 31, 2011 7:38:49 PM > Subject: Re: [fwd] [perl #96000] Restrictive licensing term on pod/perlembed.pod, pod/perlmodinstall.pod > > Sure, happy to relicense. > > > Jon > > > On Sun, Jul 31, 2011 at 4:03 PM, Jesse Vincent < jesse@fsck.com > > wrote: > > > Hi Doug & Jon, > > I know it's been forever since you last touched the perl core- > > It looks like the Debian folks would like us to relax the licensing > terms on docs that bear your copyrights. > > Would you be willing to relicense the contributions you made to the > two > documents listed below under the same terms as the rest of Perl? > > Thanks! > Jesse > --
Diffstat (limited to 'pod')
-rw-r--r--pod/perlembed.pod16
-rw-r--r--pod/perlmodinstall.pod17
2 files changed, 2 insertions, 31 deletions
diff --git a/pod/perlembed.pod b/pod/perlembed.pod
index 1b2e0c1bbc..e40035eb71 100644
--- a/pod/perlembed.pod
+++ b/pod/perlembed.pod
@@ -1114,18 +1114,4 @@ Server Perl plugins.
Copyright (C) 1995, 1996, 1997, 1998 Doug MacEachern and Jon Orwant. All
Rights Reserved.
-Permission is granted to make and distribute verbatim copies of this
-documentation provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-documentation under the conditions for verbatim copying, provided also
-that they are marked clearly as modified versions, that the authors'
-names and title are unchanged (though subtitles and additional
-authors' names may be added), and that the entire resulting derived
-work is distributed under the terms of a permission notice identical
-to this one.
-
-Permission is granted to copy and distribute translations of this
-documentation into another language, under the above conditions for
-modified versions.
+This document may be distributed under the same terms as Perl itself.
diff --git a/pod/perlmodinstall.pod b/pod/perlmodinstall.pod
index a7b74be9df..f4694cc9a7 100644
--- a/pod/perlmodinstall.pod
+++ b/pod/perlmodinstall.pod
@@ -436,19 +436,4 @@ First version July 22, 1998; last revised November 21, 2001.
Copyright (C) 1998, 2002, 2003 Jon Orwant. All Rights Reserved.
-Permission is granted to make and distribute verbatim copies of this
-documentation provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-documentation under the conditions for verbatim copying, provided also
-that they are marked clearly as modified versions, that the authors'
-names and title are unchanged (though subtitles and additional
-authors' names may be added), and that the entire resulting derived
-work is distributed under the terms of a permission notice identical
-to this one.
-
-Permission is granted to copy and distribute translations of this
-documentation into another language, under the above conditions for
-modified versions.
-
+This document may be distributed under the same terms as Perl itself.