diff options
author | John MacFarlane <jgm@berkeley.edu> | 2018-04-25 16:22:59 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2018-04-25 16:22:59 -0700 |
commit | d48d0df787028565e964f224e0748f71852f8cdc (patch) | |
tree | d10de930b613eb708899295f6943d1666349d0be /COPYRIGHT | |
parent | bb428df32b8c8d33f1c3d16cdb8677ff5c41da20 (diff) | |
download | pandoc-d48d0df787028565e964f224e0748f71852f8cdc.tar.gz |
Clarified dual-licensing of templates. Closes #4593.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r-- | COPYRIGHT | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -69,8 +69,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- -Pandoc's templates (in `data/templates`) are dual-licensed GPL (v2 or -higher, same as pandoc) and the BSD 3-clause license. +Pandoc's templates (in `data/templates`) are dual-licensed as either +GPL (v2 or higher, same as pandoc) or (at your option) the BSD +3-clause license. Copyright (c) 2014--2018, John MacFarlane |