From fb24888f52f2d6dfe37adb966ae7a9761e77d4cb Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sun, 27 Apr 2014 19:51:14 +0200 Subject: 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. --- COPYRIGHT | 20 +++++++++----------- 1 file 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 -- cgit v1.2.3 From 6cf60f2f8e6aa4e948f7f8140c4f0c7b3156f037 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sun, 27 Apr 2014 21:20:06 +0200 Subject: COPYRIGHT: Remove outdated copyright statements Some files are no longer distributed with pandoc, the respective copyright and licensing information is removed. --- COPYRIGHT | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 85dbe1585..cd5adb1be 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -62,12 +62,6 @@ Copyright (C) 2014 Albert Krewinkel 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 GNU General Public License version 2 or later. - ---------------------------------------------------------------------- data/LaTeXMathML.js Adapted by Jeff Knisely and Douglas Woodall from @@ -82,37 +76,6 @@ Copyright (C) 2004 Peter Jipsen http://www.chapman.edu/~jipsen Released under the GNU General Public License version 2 or later. ----------------------------------------------------------------------- -s5/default -S5 slides.js and css files -by Eric A. Meyer - Date: Sun, 27 Apr 2014 20:09:54 +0200 Subject: README: Update variable defaults documentation The documented default values of variables now agree with their true default values as defined in Writer/HTML.hs. --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 18c296fdd..8ca5ccc41 100644 --- a/README +++ b/README @@ -507,7 +507,7 @@ Options affecting specific writers `-c` *URL*, `--css=`*URL* : Link to a CSS style sheet. This option can be be used repeatedly to - include multiple files. They will be included in the order specified. + include multiple files. They will be included in the order specified. `--reference-odt=`*FILE* : Use the specified file as a style reference in producing an ODT. @@ -771,9 +771,9 @@ as `title`, `author`, and `date`) as well as the following: : base URL for Slidy documents (defaults to `http://www.w3.org/Talks/Tools/Slidy2`) `slideous-url` -: base URL for Slideous documents (defaults to `default`) +: base URL for Slideous documents (defaults to `slideous`) `s5-url` -: base URL for S5 documents (defaults to `ui/default`) +: base URL for S5 documents (defaults to `s5/default`) `revealjs-url` : base URL for reveal.js documents (defaults to `reveal.js`) `theme` -- cgit v1.2.3