|
bkuhn
|
be1a809b25b5
|
6 years ago
|
|
|
|
bkuhn
|
38685a3ed405
|
6 years ago
|
|
|
|
bkuhn
|
3339fe47ed3f
|
6 years ago
|
|
Meta-License of this Additional Permission
Allow everyone to use the text of this Additional Permission to write more Additional Permissions.
|
|
bkuhn
|
773f569f63cb
|
6 years ago
|
|
Consider other AGPLv3'd Programs in "No Weakening" clause
This change improves the "No Weakening" clause to deal Programs that are not this one.
|
|
Pamela Chestek
|
55256e3c1897
|
6 years ago
|
|
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.
|
|
bkuhn
|
ea8b9aafc763
|
6 years ago
|
|
|
|
Pamela Chestek
|
01190a3e2dad
|
6 years ago
|
|
Rewrite of main permission text.
This was as Pam sent to bkuhn on the Author-Date in this commit.
|
|
bkuhn
|
ccb763287609
|
6 years ago
|
|
Consensus reached to all the output "Website Output"
After much discussion among potential users and others, we'll make this defined term "Website Output".
|
|
Pamela Chestek
|
c497491e6f9d
|
6 years ago
|
|
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.
|
|
bkuhn
|
fc1963c5411e
|
6 years ago
|
|
Formatting changes only: no content changed.
Make title setup match that of the main body of AGPLv3, and refill paragraphs.
|
|
bkuhn
|
21aff912c8b8
|
6 years ago
|
|
Parity with two phrases already used in AGPLv3's main body.
AGPLv3§2 uses the phrase "output from running a covered work", so we use the same phrase here. §6(e) already uses the phrase "general public", and of course "propagate" is a defined term from AGPLv3§0.
This reworked definition of "Covered Output" better normalizes its definition to fit the standard terminology of AGPLv3, and also removes the 'deployed on a website'. We actually don't want to create the idea that deploying on the website is the only way to be eligible for the additional permission. The key issue is to assure that any items that receive the additional permission are distributed to the general public, as we want "one last step" of Affero requirement for the Covered Output, which only once available to the public can then be combined with other software more liberally.
|
|
bkuhn
|
da5fe94dadb4
|
6 years ago
|
|
Ditch the idea of "Package"; makes it all simpler.
The idea of being able to apply this to part of a repository was nice, but it complicates drafting by requiring us to define a term "Package" that is somehow a subset of the "Program" and "unmodified Program", which are terms already used in AGPLv3.
Perhaps later someone can find a way to extend this exception to work that way, but not today.
|
|
bkuhn
|
654069148b04
|
6 years ago
|
|
Remove superfluous "You have the following additional permission:"
We know this document is an additional permission, it says it right at the top, *and* in the section heading of this document's §2. Why say it again?
|
|
bkuhn
|
d9313fd5e1a2
|
6 years ago
|
|
Defined term "Output" should be "Covered Output" instead.
The word "output" (undefined) is used quite a bit in the body of AGPLv3. Since an additional permission is read as part of the license itself, I don't think we should define the term (notwithstanding the apparent case sensitivity) -- particularly since some defined terms in AGPLv3 are not capitalized.
Furthermore, this reinforces that we're primarily concerned about Output that is a derived/derivative/combined work with a covered work under the License.
|
|
bkuhn
|
84d90abc70eb
|
6 years ago
|
|
Wordsmith of Primary grant for Output under Output Licenses.
Clarify what comprises the Output that is under Output Licenses, giving a better bifurcation of the two types of works that can comprise it. We'll want flexibility for any content that didn't come for the Program, or has no reason to otherwise be a covered work.
|
|
bkuhn
|
9432504c6265
|
6 years ago
|
|
Use "covered work", the defined term from AGPLv3 where possible.
AGPLv3 defines the term "covered work" already, which becomes the core phrase of strong copyleft throughout the existing License.
Using this term allows for various simplifications to the permission statement.
Furthermore, there is no reason that the licensor can (or really, should try to) grant or copyright permissions for works that aren't covered works.
Pam Chestek originally gave me this idea by making her change to §2¶2, pointing out that "works" was problematic there.
Finally, the use of the word "file" and "files" was already problematic. Most of the CSS/Javascript/HTML might not be in "files" of its own -- it may for example be inside print statements strewn throughout the covered work. Referring to them as "files" gave the wrong impression to start, something Eric Schultz had raised earlier in drafting.
|
|
Pamela Chestek
|
42e25f25ed67
|
6 years ago
|
|
Merge permission for modified/unmodified & expand permission scope
I don’t see any reason why unmodified and modified require different clauses, particularly since the first one also contemplates modifying (“modify any unmodified Output”). The second paragraph is correct and complete for both modified and unmodified.
The CC0 theoretically gives rights beyond propagating, conveying and modifying. These terms would be read as a limitation on the greater rights under the CC0, which I don't think is what's intended.
Finally, the added content may not be copyrightable, in which case they don’t get the additional permission under the prior revision.
|
|
Pamela Chestek
|
f4273f205359
|
6 years ago
|
|
|
|
Pamela Chestek
|
d18d7f6f32d5
|
6 years ago
|
|
Rewrite of "Output" defined term.
Moved defined term to front, as is standard for a section called “Definitions”. This is stylistically consistent with the AGPL eliminates repetitiveness of second sentence.
|
|
Pamela Chestek
|
47c169060bfa
|
6 years ago
|
|
Allow use exception in less than full package distribution.
Allows for more discrete use (i.e., less than the full distribution) and with more flexibility in how the additional permission is conveyed. Original sentence was verbose and definition of the term “Package” was in the wrong place.
|
|
bkuhn
|
c031017af0f8
|
6 years ago
|
|
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.
|
|
karen
|
53bb60778da3
|
6 years ago
|
|
|
|
karen
|
d0dbbbb927e1
|
6 years ago
|
|
|
|
bkuhn
|
4afcb805753b
|
6 years ago
|
|
Catch-all to assure no other code.
Add suspenders in addition to the belt to assure that even if the other text fails to contain the additional permission, the additional permission is at least contained to only Javascript, HTML and CSS.
|
|
karen
|
86e704ac456f
|
6 years ago
|
|
Remove "normal manner" and some minor changes.
These changes were made by Karen in the Etherpad where we were editing this.
|
|
bkuhn
|
e6954674f120
|
6 years ago
|
|
Add upgradable clause.
Make this exception upgradable.
|
|
bkuhn
|
0cd645c911b0
|
6 years ago
|
|
Merge permission for modified Output into single permission
Based on feedback from Eric Shultz, I've merged the Javascript/CSS permission to work the same way as the HTML permission.
The goal is to give permission for downstream to incorporate unmodified HTML/CSS/Javascript with their own works, but assure that they don't copy parts of the otherwise AGPLv3'd codebase into that Output.
|
|
bkuhn
|
ab4a4b93acfa
|
6 years ago
|
|
Redraft based on relicensing by language
This redraft attempts to relicense all HTML, Javascript and CSS code, but in confined ways. I'm not sure if this solution will work, as it's an entirely different approach to the problem.
|
|
karen
|
c185a0b0a909
|
6 years ago
|
|
Minor Wording changes from Karen.
Karen made minor modifications to wording.
|
|
bkuhn
|
c806f09be584
|
6 years ago
|
|
The Web Template Output Additional Permission for AGPLv3
This is the first draft of the Web Template Output Additional Permission for AGPLv3. The goal is to create an additional permission that will allow an otherwise AGPLv3'd work to output HTML, Javascript and CSS that is under different licenses.
|