Skip to content

Commit

Permalink
Update copyright notices for 2021 (#7012)
Browse files Browse the repository at this point in the history
  • Loading branch information
tarleb committed Jan 8, 2021
1 parent 327e142 commit 4f34345
Show file tree
Hide file tree
Showing 175 changed files with 200 additions and 200 deletions.
26 changes: 13 additions & 13 deletions COPYRIGHT
@@ -1,5 +1,5 @@
Pandoc
Copyright (C) 2006-2020 John MacFarlane <jgm at berkeley dot edu>
Copyright (C) 2006-2021 John MacFarlane <jgm at berkeley dot edu>

With the exceptions noted below, this code is released under the [GPL],
version 2 or later:
Expand Down Expand Up @@ -37,7 +37,7 @@ The modules in the `pandoc-types` repository (Text.Pandoc.Definition,
Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON,
Text.Pandoc.Walk) are licensed under the BSD 3-clause license:

Copyright (c) 2006-2020, John MacFarlane
Copyright (c) 2006-2021, John MacFarlane

All rights reserved.

Expand Down Expand Up @@ -73,7 +73,7 @@ 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--2020, John MacFarlane
Copyright (c) 2014--2021, John MacFarlane

----------------------------------------------------------------------
src/Text/Pandoc/Writers/Muse.hs
Expand All @@ -83,19 +83,19 @@ Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Writers/Texinfo.hs
Copyright (C) 2008-2020 John MacFarlane and Peter Wang
Copyright (C) 2008-2021 John MacFarlane and Peter Wang

Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Writers/OpenDocument.hs
Copyright (C) 2008-2020 Andrea Rossato and John MacFarlane
Copyright (C) 2008-2021 Andrea Rossato and John MacFarlane

Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Writers/Org.hs
Copyright (C) 2010-2020 Puneeth Chaganti, John MacFarlane, and
Copyright (C) 2010-2021 Puneeth Chaganti, John MacFarlane, and
Albert Krewinkel

Released under the GNU General Public License version 2 or later.
Expand All @@ -115,7 +115,7 @@ Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Readers/Textile.hs
Copyright (C) 2010-2020 Paul Rivier and John MacFarlane
Copyright (C) 2010-2021 Paul Rivier and John MacFarlane

Released under the GNU General Public License version 2 or later.

Expand All @@ -133,31 +133,31 @@ Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Readers/EPUB.hs
Copyright (C) 2014-2020 Matthew Pickering and John MacFarlane
Copyright (C) 2014-2021 Matthew Pickering and John MacFarlane

Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Readers/Org.hs
src/Text/Pandoc/Readers/Org/*
test/Tests/Readers/Org/*
Copyright (C) 2014-2020 Albert Krewinkel
Copyright (C) 2014-2021 Albert Krewinkel

Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Lua.hs
src/Text/Pandoc/Lua/*
test/lua/*
Copyright (C) 2017--2020 Albert Krewinkel and John MacFarlane
Copyright (C) 2017--2021 Albert Krewinkel and John MacFarlane

Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
src/Text/Pandoc/Readers/Jira.hs
src/Text/Pandoc/Writers/Jira.hs
test/Tests/Readers/Jira.hs
Copyright (C) 2019--2020 Albert Krewinkel
Copyright (C) 2019--2021 Albert Krewinkel

Released under the GNU General Public License version 2 or later.

Expand All @@ -169,7 +169,7 @@ Released under the GNU General Public License version 2 or later.

----------------------------------------------------------------------
data/pandoc.lua
Copyright (C) 2017-2020 Albert Krewinkel
Copyright (C) 2017-2021 Albert Krewinkel

Released under the GNU General Public License version 2 or later.

Expand All @@ -183,7 +183,7 @@ Released under the Do What the Fuck You Want To Public License.
------------------------------------------------------------------------
Pandoc embeds a lua interpreter (via hslua).

Copyright © 1994–2019 Lua.org, PUC-Rio.
Copyright © 1994–2020 Lua.org, PUC-Rio.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
2 changes: 1 addition & 1 deletion MANUAL.txt
Expand Up @@ -6329,7 +6329,7 @@ application, here are some things to keep in mind:

# Authors

Copyright 2006--2020 John MacFarlane (jgm@berkeley.edu). Released
Copyright 2006--2021 John MacFarlane (jgm@berkeley.edu). Released
under the [GPL], version 2 or greater. This software carries no
warranty of any kind. (See COPYRIGHT for full copyright and
warranty notices.) For a full list of contributors, see the file
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -236,7 +236,7 @@ opening a new issue.

## License

© 2006-2020 John MacFarlane (jgm@berkeley.edu). Released under the
© 2006-2021 John MacFarlane (jgm@berkeley.edu). Released under the
[GPL](http://www.gnu.org/copyleft/gpl.html "GNU General Public License"),
version 2 or greater. This software carries no warranty of any kind.
(See COPYRIGHT for full copyright and warranty notices.)
2 changes: 1 addition & 1 deletion README.template
Expand Up @@ -81,7 +81,7 @@ new issue.
License
-------

© 2006-2020 John MacFarlane (jgm@berkeley.edu). Released under the
© 2006-2021 John MacFarlane (jgm@berkeley.edu). Released under the
[GPL], version 2 or greater. This software carries no warranty of
any kind. (See COPYRIGHT for full copyright and warranty notices.)

Expand Down
2 changes: 1 addition & 1 deletion app/pandoc.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
{- |
Module : Main
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion benchmark/benchmark-pandoc.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-
Copyright (C) 2012-2019 John MacFarlane <jgm@berkeley.edu>
Copyright (C) 2012-2021 John MacFarlane <jgm@berkeley.edu>
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
Expand Down
2 changes: 1 addition & 1 deletion benchmark/weigh-pandoc.hs
Expand Up @@ -2,7 +2,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Main
Copyright : © 2016-2019 John MacFarlane <jgm@berkeley.edu>
Copyright : © 2016-2021 John MacFarlane <jgm@berkeley.edu>
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion pandoc.cabal
Expand Up @@ -4,7 +4,7 @@ version: 2.11.3.2
build-type: Simple
license: GPL-2.0-or-later
license-file: COPYING.md
copyright: (c) 2006-2020 John MacFarlane
copyright: (c) 2006-2021 John MacFarlane
author: John MacFarlane <jgm@berkeley.edu>
maintainer: John MacFarlane <jgm@berkeley.edu>
bug-reports: https://github.com/jgm/pandoc/issues
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc.hs
Expand Up @@ -3,7 +3,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{- |
Module : Text.Pandoc
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/App.hs
Expand Up @@ -3,7 +3,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{- |
Module : Text.Pandoc.App
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
4 changes: 2 additions & 2 deletions src/Text/Pandoc/App/CommandLineOptions.hs
Expand Up @@ -6,7 +6,7 @@
{-# LANGUAGE FlexibleContexts #-}
{- |
Module : Text.Pandoc.App.CommandLineOptions
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down Expand Up @@ -968,7 +968,7 @@ usageMessage programName = usageInfo (programName ++ " [OPTIONS] [FILES]")

copyrightMessage :: String
copyrightMessage = intercalate "\n" [
"Copyright (C) 2006-2020 John MacFarlane. Web: https://pandoc.org",
"Copyright (C) 2006-2021 John MacFarlane. Web: https://pandoc.org",
"This is free software; see the source for copying conditions. There is no",
"warranty, not even for merchantability or fitness for a particular purpose." ]

Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/App/FormatHeuristics.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.App.FormatHeuristics
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/App/Opt.hs
Expand Up @@ -7,7 +7,7 @@
{-# LANGUAGE FlexibleContexts #-}
{- |
Module : Text.Pandoc.App.Opt
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/App/OutputSettings.hs
Expand Up @@ -5,7 +5,7 @@
{-# LANGUAGE TupleSections #-}
{- |
Module : Text.Pandoc.App
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Asciify.hs
@@ -1,6 +1,6 @@
{- |
Module : Text.Pandoc.Asciify
Copyright : Copyright (C) 2013-2020 John MacFarlane
Copyright : Copyright (C) 2013-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/BCP47.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.BCP47
Copyright : Copyright (C) 2017–2020 John MacFarlane
Copyright : Copyright (C) 2017-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/CSS.hs
@@ -1,6 +1,6 @@
{- |
Module : Text.Pandoc.CSS
Copyright : © 2006-2020 John MacFarlane <jgm@berkeley.edu>,
Copyright : © 2006-2021 John MacFarlane <jgm@berkeley.edu>,
2015-2016 Mauro Bieg,
2015 Ophir Lifshitz <hangfromthefloor@gmail.com>
License : GNU GPL, version 2 or above
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/CSV.hs
@@ -1,6 +1,6 @@
{- |
Module : Text.Pandoc.CSV
Copyright : Copyright (C) 2017–2020 John MacFarlane <jgm@berkeley.edu>
Copyright : Copyright (C) 2017-2021 John MacFarlane <jgm@berkeley.edu>
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Stability : alpha
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Data.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{- |
Module : Text.Pandoc.Data
Copyright : Copyright (C) 2013-2020 John MacFarlane
Copyright : Copyright (C) 2013-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Error.hs
Expand Up @@ -3,7 +3,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.Error
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Extensions.hs
Expand Up @@ -6,7 +6,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.Extensions
Copyright : Copyright (C) 2012-2020 John MacFarlane
Copyright : Copyright (C) 2012-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Filter.hs
Expand Up @@ -4,7 +4,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.Filter
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Filter/JSON.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.Filter
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Filter/Lua.hs
@@ -1,6 +1,6 @@
{- |
Module : Text.Pandoc.Filter.Lua
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Filter/Path.hs
@@ -1,6 +1,6 @@
{- |
Module : Text.Pandoc.Filter.Path
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley@edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Highlighting.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.Highlighting
Copyright : Copyright (C) 2008-2020 John MacFarlane
Copyright : Copyright (C) 2008-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Image.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings, ScopedTypeVariables, CPP #-}
{- |
Module : Text.Pandoc.Image
Copyright : Copyright (C) 2020 John MacFarlane
Copyright : Copyright (C) 2020-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/ImageSize.hs
Expand Up @@ -3,7 +3,7 @@
{-# OPTIONS_GHC -fno-warn-type-defaults #-}
{- |
Module : Text.Pandoc.ImageSize
Copyright : Copyright (C) 2011-2020 John MacFarlane
Copyright : Copyright (C) 2011-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Logging.hs
Expand Up @@ -4,7 +4,7 @@
{-# LANGUAGE OverloadedStrings #-}
{- |
Module : Text.Pandoc.Logging
Copyright : Copyright (C) 2006-2020 John MacFarlane
Copyright : Copyright (C) 2006-2021 John MacFarlane
License : GNU GPL, version 2 or above
Maintainer : John MacFarlane <jgm@berkeley.edu>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Lua.hs
@@ -1,6 +1,6 @@
{- |
Module : Text.Pandoc.Lua
Copyright : Copyright © 2017–2020 Albert Krewinkel
Copyright : Copyright © 2017-2021 Albert Krewinkel
License : GNU GPL, version 2 or above
Maintainer : Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
Expand Down
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Lua/ErrorConversion.hs
Expand Up @@ -3,7 +3,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{- |
Module : Text.Pandoc.Lua.ErrorConversion
Copyright : © 2020 Albert Krewinkel
Copyright : © 2020-2021 Albert Krewinkel
License : GNU GPL, version 2 or above
Maintainer : Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
Expand Down
4 changes: 2 additions & 2 deletions src/Text/Pandoc/Lua/Filter.hs
@@ -1,8 +1,8 @@
{-# LANGUAGE FlexibleContexts #-}
{- |
Module : Text.Pandoc.Lua.Filter
Copyright : © 2012–2020 John MacFarlane,
© 2017-2020 Albert Krewinkel
Copyright : © 2012-2021 John MacFarlane,
© 2017-2021 Albert Krewinkel
License : GNU GPL, version 2 or above
Maintainer : Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
Stability : alpha
Expand Down

0 comments on commit 4f34345

Please sign in to comment.