Merge pull request #1268 from tarleb/copyright-housekeeping

Copyright housekeeping

2 files changed, 10 insertions, 49 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index cfec5a4bf..cd5adb1be 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -35,38 +35,32 @@ 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.
-
-----------------------------------------------------------------------
-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,46 +68,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
-S5 slides.js and css files
-by Eric A. Meyer
-<http://meyerweb.com/eric/tools/s5
-
-Released under an explicit Public Domain License
-
-----------------------------------------------------------------------
-slidy/default
-Slidy javascript and CSS
-by Dave Raggett
-http://www.w3.org/Talks/Tools/Slidy2
-
-Released under W3C document and software licenses
-
-----------------------------------------------------------------------
-slideous/default
-Slideous javascript and CSS
-by Stefan Gössner
-http://goessner.net/
-
-Released under Creative Commons GNU LGPL License
-
-------------------------------------------------------------------------
-windows/modpath.iss
-Copyright (c) 2007 Jared Breland
-http://legroom.net/software
-
-Released under the GPL.
 
 ------------------------------------------------------------------------
 The dzslides template contains javascript and CSS from Paul Rouget's
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`