Create defined term for Output Licenses
Since Karen felt we needed to repeat the names of the licenses in the modified version paragraph, I've instead pulled that out as a defined term and used it throughout.
This commit is contained in:
parent
53bb60778d
commit
c031017af0
1 changed files with 23 additions and 20 deletions
|
@ -1,5 +1,5 @@
|
||||||
The Web Template Output Additional Permission, Version 0.6
|
The Web Template Output Additional Permission, Version 0.7
|
||||||
|
|
||||||
This Web Template Output Additional Permission ("Additional Permission") is
|
This Web Template Output Additional Permission ("Additional Permission") is
|
||||||
an additional permission under section 7 of the GNU Affero General Public
|
an additional permission under section 7 of the GNU Affero General Public
|
||||||
License, version 3 ("AGPLv3"). It applies to all material licensed under
|
License, version 3 ("AGPLv3"). It applies to all material licensed under
|
||||||
|
@ -7,41 +7,44 @@ AGPLv3 included in a repository ("the Package") where this Additional
|
||||||
Permission appears in a file called LICENSE.ADDITIONAL-PERMISSION at the top
|
Permission appears in a file called LICENSE.ADDITIONAL-PERMISSION at the top
|
||||||
directory of the repository.
|
directory of the repository.
|
||||||
|
|
||||||
|
1. DEFINITIONS
|
||||||
|
|
||||||
When you use this Package to create a website, the Package generates HTML,
|
When you use this Package to create a website, the Package generates HTML,
|
||||||
Javascript, and CSS files which are deployed to create a website and
|
Javascript, and CSS files which are deployed to create a website and
|
||||||
distributed publicly as part of a deployment. Files in the HTML, Javascript
|
distributed publicly as part of a deployment. Files in the HTML, Javascript
|
||||||
or CSS languages that are publicly distributed on a website are considered
|
or CSS languages that are publicly distributed on a website are considered
|
||||||
"Output" of the Package,
|
"Output" of the Package.
|
||||||
|
|
||||||
1. GRANT OF ADDITIONAL PERMISSION
|
The "Output License" for works written in HTML is the Creative Commons Public
|
||||||
|
Domain Dedication 1.0 Universal, or any later version as published by
|
||||||
|
Creative Commons, Inc. ("CC0"), and the "Output License" for works written in
|
||||||
|
CSS and Javascript is the GNU Lesser General Public License Version 3 or any
|
||||||
|
later version of that license as published by the Free Software Foundation,
|
||||||
|
Inc ("LGPLv3-or-later"). (Together, the "Output Licenses".)
|
||||||
|
|
||||||
You have permission to propagate specific works of Output under terms other
|
2. GRANT OF ADDITIONAL PERMISSION
|
||||||
than AGPLv3, as set forth in this section.
|
|
||||||
|
You have permission to propagate, convey and/or modify specific works of
|
||||||
|
Output under terms other than AGPLv3, as set forth in this section:
|
||||||
|
|
||||||
If you do not modify the Package, you may propogate, convey, and/or modify
|
If you do not modify the Package, you may propogate, convey, and/or modify
|
||||||
unmodified HTML Output under the terms of the Creative Commons Public Domain
|
any unmodified Output under the Output Licenses.
|
||||||
Dedication 1.0 Universal, or any later version as published by Creative
|
|
||||||
Commons, Inc. ("CC0"), and unmodified CSS and Javascript Output under the
|
|
||||||
terms of the GNU Lesser General Public License Version 3 or any later version
|
|
||||||
of that license as published by the Free Software Foundation, Inc
|
|
||||||
("LGPLv3-or-later").
|
|
||||||
|
|
||||||
If you modify the Package, you may propogate, convey, and/or modify any
|
If you modify the Package, you may propogate, convey, and/or modify any
|
||||||
Output under the respective licensing as specified above for unmodified
|
Output under the Output Licenses, provided that such Output includes only
|
||||||
Output, provided that such Output includes only Output either generated by
|
Output either generated by the unmodified Package, and/or additional Output
|
||||||
the unmodified Package, and/or additional Output copyrighted by you and/or
|
copyrighted by you and/or seperatedly licensed to you by a third party.
|
||||||
seperatedly licensed to you by a third party.
|
|
||||||
|
|
||||||
This additional permission never applies to any works that are not HTML,
|
No additional permission is granted to any works that are not HTML,
|
||||||
Javascript nor CSS in any event.
|
Javascript nor CSS.
|
||||||
|
|
||||||
2. NO WEAKENING OF COPYLEFT.
|
3. NO WEAKENING OF COPYLEFT.
|
||||||
|
|
||||||
The availability of this Additional Permission does not imply any general
|
The availability of this Additional Permission does not imply any general
|
||||||
presumption that third-party software is unaffected by the copyleft
|
presumption that third-party software is unaffected by the copyleft
|
||||||
requirements of the AGPLv3 license of this Package.
|
requirements of the AGPLv3 license of this Package.
|
||||||
|
|
||||||
3. Revised Versions of this Additional Permission.
|
4. Revised Versions of this Additional Permission.
|
||||||
|
|
||||||
The Software Freedom Conservancy, Inc. ("Conservancy") may publish revised
|
The Software Freedom Conservancy, Inc. ("Conservancy") may publish revised
|
||||||
and/or new versions of this Additional Permission from time to time. Such
|
and/or new versions of this Additional Permission from time to time. Such
|
||||||
|
|
Loading…
Reference in a new issue