aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-07-10 19:12:09 +0200
committerJohn MacFarlane <jgm@berkeley.edu>2017-07-10 19:12:09 +0200
commitf55cfe2541a90c9feed9a907085b5e9327bbcce6 (patch)
treeb084d7f5f18ebec68bf34c49fb0adcde9c270c92 /COPYRIGHT
parent770e0cccc1d028415cc9e180b08b396fb0bc379b (diff)
downloadpandoc-f55cfe2541a90c9feed9a907085b5e9327bbcce6.tar.gz
COPYRIGHT: clarify that templates are dual-licensed.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT31
1 files changed, 27 insertions, 4 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 2cc57f6f5..0be663097 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,8 @@
Pandoc
Copyright (C) 2006-2017 John MacFarlane <jgm at berkeley dot edu>
-This code is released under the [GPL], version 2 or later:
+With the exceptions noted below, this code is released under the [GPL],
+version 2 or later:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,9 +28,31 @@ Pandoc's complete source code is available from the [Pandoc home page].
[Pandoc home page]: http://pandoc.org
-Pandoc includes some code from other authors. The copyright and license
-statements for these sources are included below. All are GPL-compatible
-licenses.
+Pandoc includes some code with different copyrights, or subject to different
+licenses. The copyright and license statements for these sources are included
+below. All are GPL-compatible licenses.
+
+----------------------------------------------------------------------
+Pandoc's templates (in `data/templates`) are dual-licensed GPL (v2 or
+higher, same as pandoc) and the BSD 3-clause license, copied below:
+
+Copyright (c) 2014--2017, John MacFarlane
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of John MacFarlane nor the names of other contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Muse.hs