From ce9168a9af5b7968d97bda6d17195e5c162293dd 2014-12-22 21:30:00 From: Bradley M. Kuhn Date: 2014-12-22 21:30:00 Subject: [PATCH] Citations of third-party works in appendix only. As alluded to in 2ea19b71d4a917babb29024f06acabfe73309f40 '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. --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 497fa322d41de91446fda3d176485371542894e4..2460c710cd1c3bcebeb7549c8a44b75000123a6f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -65,6 +65,10 @@ There is also a [TODO list on the website](https://copyleft.org/todo/), which are mostly related to formatting, layout and infrastructure, but if you'd like to help there, such help is also welcome. +## Contributing Third-Party CC-BY-SA'd Works + +FIXME + ## Merge Request and Patch Workflow Currently, the main location for work on this project is diff --git a/Makefile b/Makefile index 88881553f25f3dd0d5910f666a80cdf2d33f77f3..d469f33ee3f85517b9e54835194c6e2b4609cf46 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ ifndef WEB_INSTALL_DIR WEB_INSTALL_DIR = /path/to/html/install/directory endif -LATEX_INPUT_FILES = $(BOOK_BASE).tex compliance-guide.tex license-texts.tex enforcement-case-studies.tex gpl-lgpl.tex +LATEX_INPUT_FILES = $(BOOK_BASE).tex compliance-guide.tex license-texts.tex enforcement-case-studies.tex gpl-lgpl.tex third-party-citations.tex BOOK_CLASS_FILE = gpl-book.cls CSS_FILES = css/*.css diff --git a/compliance-guide.tex b/compliance-guide.tex index 6f03540e7faecc4e4c855d1391d3eb4d824e7699..db549e4faf65853b9deecf8b669a07168f09e784 100644 --- a/compliance-guide.tex +++ b/compliance-guide.tex @@ -22,17 +22,7 @@ license is available at \vfill -This part includes material from many sources, including some material from the following -CC-By-SA-licensed published works: \\ - -\begin{itemize} -\item \hrefnofollow{http://www.softwarefreedom.org/resources/2008/compliance-guide.html}{\textit{A Practical Guide GPL Compliance}} by Bradley M. Kuhn, Aaron -Williamson and Karen Sandler, first published on 2008-08-20. \\ -\item \hrefnofollow{http://www.softwarefreedom.org/resources/2014/SFLC-Guide_to_GPL_Compliance_2d_ed.html}{\textit{Software Freedom Law Center Guide to GPL Compliance, 2nd - Edition}} by Eben Moglen and Mishi Choudhary, first published on 2014-10-31. \\ -\end{itemize} - -However, this work is primarily composed of the many contributions it +This work is primarily composed of the many contributions it receives as a public, collaborative project. Please \href{https://gitorious.org/copyleft-org/tutorial/history/master:compliance-guide.tex}{review its Git logs} for full documentation of all contributions. diff --git a/comprehensive-gpl-guide.tex b/comprehensive-gpl-guide.tex index e9ab04e61e640ed3a5e721a480ff51001a7697f1..e9bf721f8b9961976fc826fd481ad01bd8da9074 100644 --- a/comprehensive-gpl-guide.tex +++ b/comprehensive-gpl-guide.tex @@ -172,6 +172,10 @@ material is \textbf{not equivalent} to attending a course. \appendix +\part{Appendices} + +\input{third-party-citations} + \input{license-texts} diff --git a/enforcement-case-studies.tex b/enforcement-case-studies.tex index ee9241370bf3f3f49245fabbb301ff7b5606806d..0fa1f7a78271be6fb5515cdb454404ec30dcac6f 100644 --- a/enforcement-case-studies.tex +++ b/enforcement-case-studies.tex @@ -39,15 +39,7 @@ available at \url{https://creativecommons.org/licenses/by-sa/4.0/legalcode}. \vfill -This part includes material from many sources, including some material from the following -CC-By-SA-licensed published works: \\ - -\begin{itemize} -\item \textit{Enforcement Case Studies}, written by Bradley M. Kuhn and published by the Free - Software Foundation for its CLE courses on 2004-01-20, 2004-08-24, and 2014-03-24. -\end{itemize} - -However, this work is primarily composed of the many contributions it +This work is primarily composed of the many contributions it receives as a public, collaborative project. Please \href{https://gitorious.org/copyleft-org/tutorial/history/master:enforcement-case-studies.tex}{review its Git logs} for full documentation of all contributions. diff --git a/gpl-lgpl.tex b/gpl-lgpl.tex index 4ce4dad47199d9494b76063e4068d4a3b80e843c..8f706c1ba1661530150ff2c32635c6c2935bbefe 100644 --- a/gpl-lgpl.tex +++ b/gpl-lgpl.tex @@ -52,28 +52,8 @@ license is available at \vfill -This part includes material from many sources, including some material from the following -CC-By-SA-licensed published works: \\ -\begin{itemize} -\item \textit{Detailed Analysis of the GNU GPL and Related Licenses}, written by -Bradley M. Kuhn, Daniel B.~Ravicher, and John Sullivan and published by the Free Software Foundation for its CLE courses on 2004-01-20, -2004-08-24, and 2014-03-24. -\item \hrefnofollow{http://gplv3.fsf.org/gpl-rationale-2006-01-16.html}{\textit{GPLv3 First Discussion Draft Rationale}}, written and published by the Free - Software Foundation on 2006-01-16. -\item \hrefnofollow{http://gplv3.fsf.org/opinions-draft-2.html}{\textit{GPLv3 Second Discussion Draft Rationale}}, written and published by the Free - Software Foundation circa 2006-07. -\item \hrefnofollow{http://gplv3.fsf.org/gpl3-dd3-guide}{\textit{GPLv3 Third Discussion Draft Rationale}}, written and published by the Free - Software Foundation on 2007-03-28. -\item \hrefnofollow{http://gplv3.fsf.org/dd3-faq}{\textit{GPLv3 Discussion Draft 3 FAQ}}, written and published by the Free1 Software Foundation on 2007-03-28. -\item \hrefnofollow{http://gplv3.fsf.org/gpl3-dd4-guide.html}{\textit{GPLv3 Final Discussion Draft Rationale}} written and published by the Free - Software Foundation onon 2007-05-31. -\item \hrefnofollow{http://www.gnu.org/licences/gpl3-final-rationale.pdf}{\textit{GPLv3 Final Rationale}}, written and published by the Free - Software Foundation on 2007-06-29. - -\end{itemize} - -However, this work is primarily composed of the many contributions it +This work is primarily composed of the many contributions it receives as a public, collaborative project. Please \href{https://gitorious.org/copyleft-org/tutorial/history/master:gpl-lgpl.tex}{review its Git logs} for full documentation of all contributions. diff --git a/license-texts.tex b/license-texts.tex index d4d5b6fe7cd35cc4ba61d225e8a2348efa533f36..1c1b7f9af7ed7f2168ff40cf5b789d7762f68207 100644 --- a/license-texts.tex +++ b/license-texts.tex @@ -3,11 +3,11 @@ % % Copyright (C) 1989, 1991, 1999, 2002 Free Software Foundation, Inc. -\part{Full Texts of the GNU GPL and Related Licenses} +\vfill -In this appendix, we include a full copy of GPLv2, GPLv3, LGPLv2.1, -LGPLv3, and AGPLv3. These are the most commonly used licenses in the GPL -family of licenses. +The remaining appendices include a full copy of GPLv2, GPLv3, +LGPLv2.1, LGPLv3, and AGPLv3. These are the most commonly used licenses in +the GPL family of licenses. \chapter{The GNU General Public License, version 2} \begin{center} diff --git a/third-party-citations.tex b/third-party-citations.tex new file mode 100644 index 0000000000000000000000000000000000000000..ac5f7486eda7858513f0d13e01823b897a8b3e53 --- /dev/null +++ b/third-party-citations.tex @@ -0,0 +1,53 @@ +% attributions.tex -*- LaTeX -*- +% Part containing all attributions in one place. +% +% Copyright (C) 2014, Bradley M. Kuhn + +\chapter{Citations of Incorporated Material from Other Published Works} + +As a public, collaborative project, this Guide is primarily composed of the +many contributions received via its +\href{https://gitorious.org/copyleft-org/tutorial/source/master:CONTRIBUTING.md}{public + contribution process}. Please +\href{https://gitorious.org/copyleft-org/tutorial/history/master}{review its + Git logs} for full documentation of all contributions. + +Below is a list of CC-By-SA-licensed works, with specific titles and +publication dates, from which any material was incorporated into this Guide. +The specific methods and details of incorporation are fully +documented in the +\href{https://gitorious.org/copyleft-org/tutorial/history/master}{Git logs} +of the project. + +\begin{itemize} +\item \textit{Detailed Analysis of the GNU GPL and Related Licenses}, written by +Bradley M. Kuhn, Daniel B.~Ravicher, and John Sullivan and published by the Free Software Foundation for its CLE courses on 2004-01-20, +2004-08-24, and 2014-03-24. +\item \hrefnofollow{http://gplv3.fsf.org/gpl-rationale-2006-01-16.html}{\textit{GPLv3 First Discussion Draft Rationale}}, written and published by the Free + Software Foundation on 2006-01-16. +\item \hrefnofollow{http://gplv3.fsf.org/opinions-draft-2.html}{\textit{GPLv3 Second Discussion Draft Rationale}}, written and published by the Free + Software Foundation circa 2006-07. +\item \hrefnofollow{http://gplv3.fsf.org/gpl3-dd3-guide}{\textit{GPLv3 Third Discussion Draft Rationale}}, written and published by the Free + Software Foundation on 2007-03-28. +\item \hrefnofollow{http://gplv3.fsf.org/dd3-faq}{\textit{GPLv3 Discussion Draft 3 FAQ}}, written and published by the Free1 Software Foundation on 2007-03-28. +\item \hrefnofollow{http://gplv3.fsf.org/gpl3-dd4-guide.html}{\textit{GPLv3 Final Discussion Draft Rationale}} written and published by the Free + Software Foundation onon 2007-05-31. +\item \hrefnofollow{http://www.gnu.org/licences/gpl3-final-rationale.pdf}{\textit{GPLv3 Final Rationale}}, written and published by the Free + Software Foundation on 2007-06-29. +\item \hrefnofollow{http://www.softwarefreedom.org/resources/2008/compliance-guide.html}{\textit{A Practical Guide GPL Compliance}} written by Bradley M. Kuhn, Aaron +Williamson and Karen Sandler and first published on 2008-08-20. +\item \hrefnofollow{http://www.softwarefreedom.org/resources/2014/SFLC-Guide_to_GPL_Compliance_2d_ed.html}{\textit{Software Freedom Law Center Guide to GPL Compliance, 2nd + Edition}} by Eben Moglen and Mishi Choudhary and first published on 2014-10-31. +\item \textit{Enforcement Case Studies}, written by Bradley M. Kuhn and published by the Free + Software Foundation for its CLE courses on 2004-01-20, 2004-08-24, and 2014-03-24. +\end{itemize} + +Please note, however, that this list above does not include nor adequately +represent the substantial contributions from those who directly +contributed to this Guide using its Git (and formerly, CVS) repository. +Rather, this is a list of third-party published works from which any text was +herein included under their CC-By-SA licensing. Thus, as the reader might +expect, the +\href{https://gitorious.org/copyleft-org/tutorial/history/master}{version + control logs} contain the only true and accurate view available of who has +contributed which portions of this project.