Commit graph

22 commits

Author SHA1 Message Date
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
Bradley M. Kuhn
21aff912c8 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.
2018-03-23 22:58:34 -04:00
Bradley M. Kuhn
da5fe94dad 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.
2018-03-23 22:32:04 -04:00
Bradley M. Kuhn
654069148b 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?
2018-03-23 22:29:23 -04:00
Bradley M. Kuhn
d9313fd5e1 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.
2018-03-23 22:27:32 -04:00
Bradley M. Kuhn
84d90abc70 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.
2018-03-23 22:23:48 -04:00
Bradley M. Kuhn
9432504c62 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.
2018-03-23 22:10:32 -04:00
Pamela Chestek
42e25f25ed 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.
2018-03-23 21:37:37 -04:00
Pamela Chestek
f4273f2053 Singular "Output License" was never used. 2018-03-23 21:34:48 -04:00
Pamela Chestek
d18d7f6f32 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.
2018-03-23 17:25:11 -04:00
Pamela Chestek
47c169060b 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.
2018-03-23 16:51:03 -04:00
Bradley M. Kuhn
c031017af0 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.
2018-03-22 19:58:51 -04:00
53bb60778d Move location of defined term. 2018-03-22 19:57:27 -04:00
d0dbbbb927 Make Conservancy a defined term; reformat revised section 2018-03-22 19:55:03 -04:00
Bradley M. Kuhn
4afcb80575 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.
2018-03-22 19:34:25 -04:00
86e704ac45 Remove "normal manner" and some minor changes.
These changes were made by Karen in the Etherpad where we were editing this.
2018-03-22 19:33:55 -04:00
Bradley M. Kuhn
e6954674f1 Add upgradable clause.
Make this exception upgradable.
2018-03-22 19:33:04 -04:00
Bradley M. Kuhn
0cd645c911 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.
2018-03-22 13:30:55 -07:00
Bradley M. Kuhn
ab4a4b93ac 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.
2018-03-22 13:21:56 -07:00
c185a0b0a9 Minor Wording changes from Karen.
Karen made minor modifications to wording.
2018-03-21 10:25:00 -07:00
Bradley M. Kuhn
c806f09be5 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.
2018-03-21 09:57:06 -07:00