aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorAlbert Krewinkel <tarleb@moltkeplatz.de>2014-04-27 19:51:14 +0200
committerAlbert Krewinkel <tarleb@moltkeplatz.de>2014-04-27 19:51:14 +0200
commitfb24888f52f2d6dfe37adb966ae7a9761e77d4cb (patch)
tree46b680dd3f5a72078784b976749219c8f83e2907 /COPYRIGHT
parent60297089f642818599b925c5e3bd7ecdfbf93c1d (diff)
downloadpandoc-fb24888f52f2d6dfe37adb966ae7a9761e77d4cb.tar.gz
COPYRIGHT: Specifiy the version of the GPL
All code in pandoc licensed under the GPL version 2 or later is just marked as being licensed under the GPL. There are multiple versions of the GPL, most notably version 2, version 3 and the Affero GPL. As to avoid possible confusion, licensing info is updated to be more specific about the GPL and its version.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT20
1 files changed, 9 insertions, 11 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index cfec5a4bf..85dbe1585 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -35,38 +35,38 @@ licenses.
src/Text/Pandoc/Writers/Texinfo.hs
Copyright (C) 2008-2010 John MacFarlane and Peter Wang
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/OpenDocument.hs
Copyright (C) 2008-2010 Andrea Rossato and John MacFarlane
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Org.hs
Copyright (C) 2010 Puneeth Chaganti
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Textile.hs
Copyright (C) 2010 Paul Rivier
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Org.hs
tests/Tests/Readers/Org.hs
Copyright (C) 2014 Albert Krewinkel
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Biblio.hs
Copyright (C) 2008-2010 Andrea Rossato
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
data/LaTeXMathML.js
@@ -74,15 +74,13 @@ Adapted by Jeff Knisely and Douglas Woodall from
ASCIIMathML.js v. 1.4.7
Copyright (C) 2005 Peter Jipsen
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
-data/MathMLInHTML.js
+data/MathMLinHTML.js
Copyright (C) 2004 Peter Jipsen http://www.chapman.edu/~jipsen
Released under the GNU General Public License version 2 or later.
-See the GNU General Public License
-(at http://www.gnu.org/copyleft/gpl.html) for more details.
----------------------------------------------------------------------
s5/default
@@ -113,7 +111,7 @@ windows/modpath.iss
Copyright (c) 2007 Jared Breland
http://legroom.net/software
-Released under the GPL.
+Released under the GNU General Public License version 2 or later.
------------------------------------------------------------------------
The dzslides template contains javascript and CSS from Paul Rouget's