Conservancy/license-additional-permissions
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Conservancy:21aff912c8b8f74e5bfd03597100bee003409983
Branches Tags
Conservancy:master
...
compare: Conservancy:be1a809b25b5350deca037fc9aec2394c37efce4
Branches Tags
Conservancy:master

10 commits
21aff912c8 ... be1a809b25

Author SHA1 Message Date
Bradley M. Kuhn
be1a809b25 Paragraph reformat only; no textual change. 2018-03-25 15:19:45 -04:00
Bradley M. Kuhn
38685a3ed4 Release 3.0 of The Web Template Output Additional Permission 2018-03-25 15:05:34 -04:00
Bradley M. Kuhn
3339fe47ed Meta-License of this Additional Permission 
Allow everyone to use the text of this Additional Permission to write more
Additional Permissions.
 2018-03-25 15:03:49 -04:00
Bradley M. Kuhn
773f569f63 Consider other AGPLv3'd Programs in "No Weakening" clause 
This change improves the "No Weakening" clause to deal Programs that are not
this one.
 2018-03-25 15:02:35 -04:00
Pamela Chestek
55256e3c18 Remove stray comma that might be misunderstood. 
The comma after "modified Website Output" makes it read that (a) and (b)
might relate back to "unmodified." It doesn't make sense to read it that way,
but for ease of reading and ensuring clarity I would remove the comma.
 2018-03-25 15:01:26 -04:00
Bradley M. Kuhn
ea8b9aafc7 Move "is" for readability. 2018-03-25 15:00:41 -04:00
Pamela Chestek
01190a3e2d Rewrite of main permission text. 
This was as Pam sent to bkuhn on the Author-Date in this commit.
 2018-03-25 14:59:46 -04:00
Bradley M. Kuhn
ccb7632876 Consensus reached to all the output "Website Output" 
After much discussion among potential users and others, we'll make this
defined term "Website Output".
 2018-03-25 14:52:03 -04:00
Pamela Chestek
c497491e6f remove nor & put names of languages in same order throughout 
It's "not HTML, Javascript or CSS" (not nor - the initial negative carries
through to all the enumerated elements. Garner, B. The Oxford Dictionary of
American Usage and Style, Oxford University Press, 2000, pp. 230.)  You
should probably switch "Javascript" and "CSS" so all three are always in the
same order.
 2018-03-25 14:50:36 -04:00
Bradley M. Kuhn
fc1963c541 Formatting changes only: no content changed. 
Make title setup match that of the main body of AGPLv3, and refill
paragraphs.
 2018-03-23 23:01:16 -04:00
1 changed files with 26 additions and 16 deletions
Show stats Expand all files Collapse all files

40
AGPLv3-Web-Template-Output-Additional-Permission.txt
View file

@ -1,4 +1,4 @@
The Web Template Output Additional Permission, Version 0.7
The Web Template Output Additional Permission, Version 3.0
This Web Template Output Additional Permission ("Additional Permission") is
an additional permission under section 7 of the GNU Affero General Public
@ -7,31 +7,33 @@ references this Additional Permission.
1. DEFINITIONS
"Covered Output" means a covered work in the HTML, Javascript, and/or CSS
"Website Output" means a covered work in the HTML, CSS, and/or Javascript
languages, that was output from running a covered work and is propagated to
the general public.
The "Output Licenses" are, for covered works written in HTML, the Creative Commons
Public Domain Dedication 1.0 Universal or any later version as published by
Creative Commons, Inc. ("CC0"), and, for covered works written in CSS and Javascript,
the GNU Lesser General Public License Version 3 or any later version of that
license as published by the Free Software Foundation,
The "Output Licenses" are, for covered works written in HTML, the Creative
Commons Public Domain Dedication 1.0 Universal or any later version as
published by Creative Commons, Inc. ("CC0"), and, for covered works written
in CSS and Javascript, 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").
2. GRANT OF ADDITIONAL PERMISSION
2. Grant of Additional Permission.
The Covered Output is licensed to you under the Output Licenses provided that
Covered Output is comprised only of: (a) Covered Output generated by the
unmodified Program, and/or (b) content that was not already a covered work.
The Website Output is licensed to you under the Output Licenses provided that
it is unmodified, or is modified Website Output comprised only of: (a)
Website Output generated by the unmodified Program and (b) content that was
not already a covered work.
No additional permission is granted for any covered works that are not HTML,
Javascript nor CSS.
CSS, and/or Javascript.
3. NO WEAKENING OF COPYLEFT.
3. No Weakening Of Copyleft.
The availability of this Additional Permission does not imply any general
presumption that third-party software is unaffected by the copyleft
requirements of the AGPLv3 license of this Program.
presumption that software is unaffected by the copyleft requirements of the
AGPLv3 license of this Program or another Program separately licensed under
AGPLv3.
4. Revised Versions of this Additional Permission.
@ -56,3 +58,11 @@ the Program.
Later Additional Permission versions may give you additional or different
permissions. However, no additional obligations are imposed on any author or
copyright holder as a result of your choosing to follow a later version.
5. Meta-License
The actual text of this Additional Permission is made available under CC0.
Software Freedom Conservancy, Inc. asks that you rename this Additional
Permission and remove our name from any modified version of this Additional
Permission.