Commit graph

844 commits

Author SHA1 Message Date
Bradley M. Kuhn
0ad08b92d5 Would help online contributors send small changes?
HT: Loïc Dachary <loic@dachary.org>

... who told me about this project.
2016-08-16 12:02:02 +02:00
Bradley M. Kuhn
85bbbf1ec6 Gitorious Apocalypse: even more gitorious URLS
I believe these are the last few Gitorious URLs
2016-05-17 08:15:01 -05:00
Bradley M. Kuhn
eb51d8327c Gitorious Apocalypse: remove gitorious more URLs
The Gitorious URLs are now dead.  A few Gitorious URLs continued to
appear in the front matter of the Guide itself.  This fixes those links
to with k.copyleft.org equivalents.
2016-05-17 07:19:09 -05:00
Bradley M. Kuhn
56ec3c68ee This clearly should have been \ref all along. 2015-05-12 07:54:07 -07:00
Bradley M. Kuhn
0b3b7ecffd Notice in Contributing section about individuals.
Individuals act on their own behalf in this project, regardless of who
sponsors it.
2015-05-04 14:10:36 -07:00
Bradley M. Kuhn
4dcf545108 Gitorious Apocalypse: recovery existing clone
These instructions are simple and I've tested them.
2015-04-02 20:51:35 -07:00
Bradley M. Kuhn
0a5d6db003 Gitorious Apocalypse: remove all gitorious URLs
The Gitorious URLs will disappear in the next few hours.  The canonical
hosting location of this project is now on copyleft.org.  Specific
gitorious URLs are generally replaced with k.copyleft.org, which is
copyleft.org's self-hosted Kallithea instance.
2015-04-02 20:32:33 -07:00
Bradley M. Kuhn
26def8538a FIXME note about restoring UCITA reference. 2015-03-16 17:53:40 -07:00
Bradley M. Kuhn
a8d58d6b65 Remove stray open parenthesis. 2015-03-16 10:48:05 -07:00
Bradley M. Kuhn
d3ce0a8a2f Correct spelling of acronym. 2015-03-16 10:39:11 -07:00
Bradley M. Kuhn
73a7028469 More words that don't appear in some dictionaries.
Add to the LocalWords list for Emacs spell checker.
2015-03-13 14:36:56 -07:00
Bradley M. Kuhn
3b357f2747 Update bkuhn & tony copyright notices for 2015
After last commit, there has been new copyrightable material copyrighted
by these two individuals added in 2015.
2015-03-13 14:35:59 -07:00
Bradley M. Kuhn
4067c5f991 Clarify & expound on issue of warranty disclaimer
The existing paragraph on this issue was inadequate, since it punted
entirely to GPLv2§11 for dealing with critics' claims of
unenforceability.  That left a mistaken impression of validity of such
claims.

The commit herein adds reference to CIGS, which likely permits GPL's
sort of warranty disclaimer in most jurisdictions, and also bolsters the
reference to the UCC earlier in the section.

However, given academic debate about the applicability of CIGS to
software licenses, this commit includes a footnote referencing the two
sides of that debate.

Tony Sebro and I co-drafted these changes together.

Signed-Off-By: Tony Sebro <tony@sfconservancy.org>
Signed-Off-By: Bradley M. Kuhn <bkuhn@ebb.org>
2015-03-13 13:07:16 -07:00
Bradley M. Kuhn
e62b08eb9c Note that most USA states/commonwealths adopt UCC.
While most USA lawyers will know this as simple fact, the tutorial wants
to welcome an international audience and non-lawyers too.  As such, this
dependent clause is worth adding.
2015-03-13 12:38:58 -07:00
Bradley M. Kuhn
40fa2e6685 Clarify who "most people" meant, drop UCITA ref.
The intent of this text was to point out that most users don't actually
believe they get warranties, which is still surely correct, given that
GPL disclaims warranties in the same manner nearly every software
license -- proprietary or free -- does anyway.

Also, the forward-reference to the later section's discussion of UCC
should be hinted at here.  There is no explicit reference to UCC made
here, but it is encompassed in "many local laws", since the later
section mentions the specific section of UCC involved.

Meanwhile, the reference to UCITA is dropped, but perhaps it should be
reintroduced in other text in the main warranty section.  UCITA has had
much less policy impact than was expected when the original version of
this text was written.  It might be useful to ask policy folks and
attorneys from Maryland and Virginia who might be able to help explain
what impact UCITA has had being on the books only there.
2015-03-13 09:58:02 -07:00
Bradley M. Kuhn
555a72beb1 Suggestions for in depth discussion of GPLv2§2(a)
GPLv2§2(a) is mentioned quite cursorily.  Olly Betts suggests more
coverage here might useful on IRC.  I noted some ideas after he
suggested it.
2015-03-12 17:15:15 -07:00
Bradley M. Kuhn
ec2abce021 Rework text to introduce definition of CCS.
CCS ultimately wasn't mentioned until much later in the GPLv3 sections,
where, ironically, we have to point out that GPLv3 defined the term as
"Corresponding Source" [0], not CCS, and explain why GPL enforcement
wonks still say CCS.

This rework now introduces the acronym at the natural moment: while
describing GPLv2§3's use of the words "complete" and "corresponding".

Adding that made the section even more disjoint than it already was.  I
put in some \subsection's to make it slightly less so, and did some
wordsmith work on surrounding text.

[0] I wish some GPLv3 drafter had asked me what to call the defined term
     so that I could point out what fit standard parlance. :)
2015-03-09 22:33:52 -07:00
Bradley M. Kuhn
15ae6f3a17 Wordsmith this tortured text. 2015-03-09 19:05:18 -07:00
Bradley M. Kuhn
dca1aa0115 "by definition" is clearer here than "by default"
There's probably another phrase we could use that's even better.
2015-03-09 19:03:53 -07:00
Bradley M. Kuhn
2a42c6fb7e FIXME describing what introduction should say.
We need an introduction, particularly if we merge the CC-BY-SA material
that @mlinksva provided.
2014-12-23 13:37:25 -05:00
Bradley M. Kuhn
0adba83923 FIXME re: "dynamic linking delayed" to runtime.
The existing text of the Guide hints at this point but doesn't discuss
it directly.  This FIXME is merely a reminder note to investigate this
issue in further detail and perhaps add text here on the question.
2014-12-23 13:22:05 -05:00
Bradley M. Kuhn
eab5efb42b Null character needed at end of a LaTeX sentence. 2014-12-23 13:15:46 -05:00
Bradley M. Kuhn
0e49270eb1 Contributing text from third-party works.
Integration of text from third-party works is complicated, since the
text must be incorporated to flow properly with the rest of the Guide.
Also, historical archiving commits are particularly useful in such
situations.  This tutorial explains how to contribute such additions for
this project.
2014-12-22 21:16:33 -05:00
Bradley M. Kuhn
04a38b87ec Order matters in \usepackage{hyperref}.
The problem exhibited only in PDF files, wherein \ref{} links to
appendix chapters referred instead to regular chapters.

http://tex.stackexchange.com/questions/77886/fncychap-and-hyperref-messes-up-page-references
suggest that loading hyperref second fixes the problem.  This indeed
worked.
2014-12-22 21:09:04 -05:00
Mike Linksvayer
27739cd92e copyleft.org tutorial, not conservancy policies 2014-12-22 19:18:23 -05:00
Mike Linksvayer
ce1c96a1a1 Make attributions consistent.
Also, fix a few spurious characters.
2014-12-22 19:13:48 -05:00
Mike Linksvayer
f4fd426471 consistent capitalization of verbs, no reason to copy capitalization within CC-BY-SA or any other license 2014-12-22 14:56:37 -08:00
Bradley M. Kuhn
79c5b890eb Consolidate copyright notices into single place.
Historically, this project used (more-or-less) a file-by-file copyright
inventory.  This commit ends that practice.  The project now has a
single toplevel copyright inventory, stored exclusively in
comprehensive-gpl-guide.tex (so that it appears also in compiled
versions of the Guide as well).

The side-effect of this commit is that the parts may no longer be easily
publishable separably without (at least) the additional work of
copyright notice reconstruction.  This may in particular create a
challenge for the FSF, who has historically selectively published
sections of this Guide as materials for its CLE classes.

However, without this change, this Guide will eventually suffer from the
inherent problems in maintaining file-by-file copyright inventory.
Circumstances simply dictate a single, top-level copyright and license
notice for the entire Guide.

In addition to consolidation of copyright notices, I've also herein
updated my historical copyright notices to properly credit me for my own
work done in 2003 through 2005.

I've also updated the license notice to reflect the changes made by the
previous commit and related issues.
2014-12-22 17:22:50 -05:00
Bradley M. Kuhn
ce9168a9af Citations of third-party works in appendix only.
As alluded to in 2ea19b71d4 's commit
message on 2014-12-17 19:52:15 -0500, keeping any information on a
part-by-part basis is difficult and error-prone, since there exists no
reliable way to auto-generate such information accurately.

Therefore, citations to third-party works, in addition to remaining
fully documented in the commit log as they always have been, are now
placed in specifically one location in the body of the text itself: a
single appendix specifically designed for that purpose.

In this manner, contributors have no house-keeping work regarding
citations.  Contributors need only list third party works and links in
one place: third-party-citations.tex.

Documentation in CONTRIBUTING.md for making contributions of third-party
works is left as a TODO.
2014-12-22 16:30:00 -05:00
Bradley M. Kuhn
1da1b24a14 Wordsmith sentence after phrase "such software".
I think Fontana's change a few commits back which s/it/such software/ in
this sentence is a useful one.  However, the entire sentence reads even
worse because "such software Free Software" looks so strange as a string
of words in the middle of the sentence.

This change is the best rework I could find that resolved the problem.
It's probably not the best option but is certainly an improvement.
2014-12-20 20:04:56 -05:00
Bradley M. Kuhn
c5866203ee Replace editorial commentary w/ FSF's link.
My personal comment here, which I wrote on 2003-05-26 (see
f05ce6c657 ), is probably not particularly
useful.  I still tend to use the phrasing as original stated in the
removed text herein; however, I'm admittedly the only one.  I don't deny
that I hope to coin some terminology usage through my work on this
Guide, but this particular use of "nonfree software" to mean
"noncommercially proprietary" is not so important IMO that this Guide
must coin it.

The FSF's page on this doesn't make that distinction, and has much more
detail on this issue than this section does.  Therefore, the
personal statement is removed, and the organizational statement on the
FSF's site is instead linked to.
2014-12-20 20:04:56 -05:00
Richard Fontana
628ffb6020 Some editorial changes.
Commenting on one: the initial-caps stylistic preference for "Free
Software" (though it contradicts prevailing usage, including that of RMS
and the FSF) ought to be respected, but I think it is confusing to
capitalize the 'S' when referring to nonfree software as "non-Free
Software". So I changed this to "non-Free software" and also implicitly
acknowledged that the preference for "non-Free" over "nonfree" is the
editor-in-chief's stylistic idiosyncrasy.
2014-12-20 20:04:56 -05:00
Richard Fontana
170f507ac6 Some editorial changes. 2014-12-20 20:04:56 -05:00
Richard Fontana
dab88657a4 "GNU project" -> "GNU Project". 2014-12-20 20:04:56 -05:00
Richard Fontana
ff7790d608 "business people" -> "businesspeople" 2014-12-20 20:04:56 -05:00
Bradley M. Kuhn
cd25fdd2c9 Document work-around for 'next' branch rebases.
Upstream in the copyleft.org tutorial repository, the next branch is
sometimes rebased against the master branch.  (For example, this occurs
when there have been quick fixes done on 'master' while new drafting
occurs on 'next'.)

This procedure, while convoluted, is the best way I've found to
compensate for this problem.  Hosting sites like Gitorious really aren't
designed for rebased branches.
2014-12-20 19:34:05 -05:00
Bradley M. Kuhn
81157b3136 No instructions for 'master';just note possibility
Ultimately, users will probably pick either 'master' or 'next' to submit
changes anyway, so just leave the instructions to refer to 'next' and
note that they could replace 'next' with 'master'.
2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
ea09b83e00 It's useful to post merge requests on mailing list 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
c830d8b51b Typo fixes. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
fd2318650e Detailed merge request instructions for Gitorious.
Most Gitorious users know this procedure, but it seems useful to
document it in great detail here, since copyleft.org seeks contributions
from those who might be knew to Git, and those who are more familiar
with procedures of other collaboration sites.
2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
57e8fa1cb2 Note merge request should usually target next.
Some targets to master are acceptable, though.
2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
e1373883c9 More about the next branch. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
6b441fa057 Note TODO list and lack of bugtracker. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
756748a79b Wordsmith this text. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
fd8fdee5bf Rewrite text to not sound so BDFL-ish. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
b855c3f4ca Note that our tools are themselves copylefted. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
d3baa07f5f CONTRIBUTING.md now canonical such information. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
883e2078ec Logs have more than just committers. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
8498c557d5 Correct title and formatting.
There was a typo in the title and a stray comma.
2014-12-20 19:31:56 -05:00
Bradley M. Kuhn
71c4a74974 Begin section on merge/patch workflow. 2014-12-20 19:31:56 -05:00