Commit graph

39 commits

Author SHA1 Message Date
Bradley M. Kuhn
558297c9c1 Shorten this sentence a bit. 2014-09-17 18:35:05 -04:00
Bradley M. Kuhn
3e638118b8 Rework these two paragraphs.
As previously written, these two paragraphs were saying very little with
a lot of words.  I've attempted to rework it a bit.
2014-09-17 18:31:43 -04:00
Bradley M. Kuhn
20361c3263 I don't think that While, belonged there anymore. 2014-09-17 18:25:46 -04:00
Bradley M. Kuhn
7d7f1ff75d Reword to simpler text in this sentence. 2014-09-17 18:25:22 -04:00
Bradley M. Kuhn
1548847af9 Credit Martin with his copy editing work in each part.
This required some page reformatting (fewer space skipping).
2014-04-24 19:26:02 -04:00
Martin Michlmayr
0bbf9ec882 Misc copy editing 2014-04-24 19:12:21 -04:00
Martin Michlmayr
7648027275 Typo fixes 2014-04-24 19:12:21 -04:00
Martin Michlmayr
dfcd7ef4ae Consistent usage of "noncommercial" 2014-04-24 19:12:21 -04:00
Bradley M. Kuhn
63c5e1ac91 Remove extra blank line 2014-04-24 19:08:20 -04:00
donaldr3
d622ef22d1 copy edits 2014-03-21 12:55:15 -04:00
Bradley M. Kuhn
6d1dfec3c0 Formatting fixes. 2014-03-21 12:54:59 -04:00
Bradley M. Kuhn
2aa692b2f2 Wordsmith 2014-03-21 12:54:58 -04:00
Bradley M. Kuhn
2e4dac47f8 Section still needs work, but this is better. 2014-03-21 12:54:57 -04:00
Bradley M. Kuhn
dae7009d2d Cut footnote. 2014-03-21 12:54:55 -04:00
Bradley M. Kuhn
6db7dfcc57 Wordsmith. 2014-03-21 12:54:53 -04:00
Bradley M. Kuhn
9ef0ff8602 Wordsmith. 2014-03-21 12:54:46 -04:00
Bradley M. Kuhn
5c677924bc Wordsmith. 2014-03-21 12:54:42 -04:00
Bradley M. Kuhn
8ad7647e4d Wordsmith. 2014-03-21 12:54:40 -04:00
Bradley M. Kuhn
2bcc1ea667 Wordsmith paragraph 2014-03-21 12:54:38 -04:00
Bradley M. Kuhn
2244b0d442 Wordsmith paragraph. 2014-03-21 12:54:34 -04:00
Bradley M. Kuhn
3558a4f693 Wordsmith paragraph. 2014-03-21 12:54:33 -04:00
Bradley M. Kuhn
f9bea67be7 Wordsmith paragraph and add label it now references. 2014-03-21 12:54:32 -04:00
Bradley M. Kuhn
a5f9f756d4 Wordsmith paragraph. 2014-03-21 12:54:31 -04:00
Bradley M. Kuhn
6cbb2d530d Wordsmith paragraph. 2014-03-21 12:54:30 -04:00
Bradley M. Kuhn
929f60c316 Wordsmith this paragraph 2014-03-21 12:54:26 -04:00
Bradley M. Kuhn
de3e1df167 Wordsmith paragraph 2014-03-21 12:54:26 -04:00
Bradley M. Kuhn
6e61ea8545 Correct paragraph. 2014-03-21 12:54:24 -04:00
Bradley M. Kuhn
ce71c2fc8c Wordsmith paragraph and correct for accuracy. 2014-03-21 12:54:23 -04:00
Bradley M. Kuhn
e8cd9043d3 Wordsmith two paragraphs. 2014-03-21 12:54:23 -04:00
Bradley M. Kuhn
d9035896ff Wordsmith this paragraph. 2014-03-21 12:54:22 -04:00
Bradley M. Kuhn
f3caa4bf6b More fine-tuned changes to s/Open Source/Free Software/g.
While I liked Donald's changes in the previous commit enough to take them,
and I don't agree with SFLC's (who was the last to edit those words in this
document) preference for "FOSS", I did want to make some fine tuned changes
that I think are appropriate:

  * say "software freedom" rather than "Free Software" anywhere it fits the
    sentence.

  * Capitalize "Free Software" like that, rather than lower case as Donald's
    change did.

  * Say "copylefted" in a few places where that was the stronger implication.

  * Say "Open Source" in two specific places where the intention is to
    include OSI-approved licenses that may not be Free Software licenses.
2014-03-20 16:08:59 -04:00
Donald Robertson, III
957fff699c FLOSS to free software 2014-03-20 16:02:03 -04:00
Bradley M. Kuhn
ee9e86642a Properly update and format copyright notices and title pages. 2014-03-20 09:59:16 -04:00
Bradley M. Kuhn
fcec57fe6d Move this text to the compliance guide, which is really where it belongs. 2014-03-18 18:26:14 -04:00
Bradley M. Kuhn
2bafeda59e Relicensing is different. Note to that issue on the compliance guide. 2014-03-18 18:25:01 -04:00
Bradley M. Kuhn
3158f32e47 Introductory discussion of GPLv2 for this section that introduces it. 2014-03-16 16:21:17 -04:00
Bradley M. Kuhn
7ad226003d Create and update copyright notice and licensing information. 2014-02-20 13:37:39 -05:00
Bradley M. Kuhn
9eb3c521b0 Incorporate the compliance guide into main text of the book.
This required resectioning the entire compliance guide to be 'one level up'.
It furthermore required a few other formatting and related changes.
2014-02-20 12:46:33 -05:00
Bradley M. Kuhn
4aeb4b25b2 compliance-guide.tex was originally downloaded from the following URL:
http://softwarefreedom.org/resources/2008/compliance-guide.tex

Since I am herein committing an Adaptation of this compliance-guide.tex work
(this commit includes a one-line change made from the version as downloaded
above), this is now an Adaptation as defined by CC-By-SA-3.0-Unported §1(a).

I am thus hereby permitted, per CC-By-SA-3.0-Unported §4(b)(ii), to relicense
this work under CC-By-SA-4.0, because CC-By-SA has the same License Elements
as CC-By-SA-3.0-Unported.  (Therefore, in this case, §4(b)(ii) defines the
"Applicable License" as CC-By-SA-4.0.)

Specifically, the following license text appears in compliance-guide.tex:

  Copyright \copyright{} 2008, Software Freedom Law Center.  Licensed
  \href{http://creativecommons.org/licenses/by-sa/3.0/us/legalcode}{CC-BY-SA
  3.0 unported}.

Here are the actions I took to comply with CC-By-SA-3.0-Unported §4(b)(ii):

  §4(b)(I):   Since the Applicable License is CC-By-SA-4.0, I've now included
              the URI and reference to the copy of CC-By-SA-4.0 in this
              repository as well.

  §4(b)(II):  No additional conditions are imposed.

  §4(b)(III): This term is confusing.  It claims I must "keep intact all
              notices that refer to the Applicable License".  Of course, the
              Applicable License is now the new version of the license, so it
              seems reasonable to interpret this clause as to allow, and
              almost instruct, a change in reference to the 3.0 license to
              the 4.0 license.  However, that's not explicitly allowed for in
              this section, but I can't come to any reasonable interpretation
              of the clause other than updating the notice to refer to the
              new license.

  §4(b)(IV):  No technological measures are imposed.
2014-02-15 18:24:15 -05:00