update copyright notice to include generic asciidoc contributors (#115)

Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>

19 files changed, 91 insertions, 40 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 13273f3..59d75b4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,5 @@
-Copyright (C) 2000-2007 Stuart Rackham
-
-Email: srackham@gmail.com
+Copyright (C) 2000-2013 Stuart Rackham
+Copyright (C) 2013-2020 AsciiDoc Contributors
 
 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
diff --git a/README.asciidoc b/README.asciidoc
index 90f62fe..10fb930 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -43,6 +43,8 @@ Current AsciiDoc version tested on Ubuntu 18.04 with:
 
 Copying
 -------
-Copyright (C) 2002-2013 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License version 2
-(GPLv2).
+Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).
diff --git a/a2x.py b/a2x.py
index a482123..89268da 100755
--- a/a2x.py
+++ b/a2x.py
@@ -4,9 +4,28 @@
 a2x - A toolchain manager for AsciiDoc (converts Asciidoc text files to other
       file formats)
 
-Copyright: Stuart Rackham (c) 2009
-License:   MIT
-Email:     srackham@gmail.com
+Free use of this software is granted under the terms of the MIT license.
+
+Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 """
 
 import os
diff --git a/asciidoc.py b/asciidoc.py
index d9c00ff..dcdeceb 100755
--- a/asciidoc.py
+++ b/asciidoc.py
@@ -3,8 +3,11 @@
 """
 asciidoc - converts an AsciiDoc text file to HTML or DocBook
 
-Copyright (C) 2002-2010 Stuart Rackham. Free use of this software is granted
-under the terms of the GNU General Public License (GPL).
+Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).
 """
 
 import ast
diff --git a/asciidocapi.py b/asciidocapi.py
index 745aa10..a5a29bd 100644
--- a/asciidocapi.py
+++ b/asciidocapi.py
@@ -47,8 +47,11 @@ Doctests:
    AsciiDocError: ERROR: <stdin>: line 1: [blockdef-listing] missing closing delimiter
 
 
-Copyright (C) 2009 Stuart Rackham. Free use of this software is granted
-under the terms of the GNU General Public License (GPL).
+Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).
 
 """
 
diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt
index 046b4fd..19ee91b 100644
--- a/doc/a2x.1.txt
+++ b/doc/a2x.1.txt
@@ -373,6 +373,8 @@ asciidoc(1)
 
 COPYING
 -------
-Copyright \(C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the MIT license.
+Copyright \(C) 2002-2013 Stuart Rackham.
+Copyright \(C) 2013-2020 AsciiDoc Contributors.
+
+Free use of this software is granted under the terms of the MIT license.
 
diff --git a/doc/asciidoc.1.txt b/doc/asciidoc.1.txt
index 9a17287..3a0a24d 100644
--- a/doc/asciidoc.1.txt
+++ b/doc/asciidoc.1.txt
@@ -228,6 +228,9 @@ a2x(1)
 
 COPYING
 -------
-Copyright \(C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License (GPL).
+Copyright \(C) 2002-2013 Stuart Rackham.
+Copyright \(C) 2013-2020 AsciiDoc Contributors.
+
+Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).
 
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index b0b2714..f201ce6 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -6080,4 +6080,5 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License version 2 for more details.
 
-Copyright (C) 2002-2011 Stuart Rackham.
+Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.
diff --git a/filters/code/code-filter.py b/filters/code/code-filter.py
index eb4f28a..6a39dfb 100755
--- a/filters/code/code-filter.py
+++ b/filters/code/code-filter.py
@@ -46,8 +46,11 @@ URLS
     https://asciidoc.org/
 
 COPYING
-    Copyright (C) 2002-2006 Stuart Rackham. Free use of this software is
-    granted under the terms of the GNU General Public License (GPL).
+    Copyright (C) 2002-2013 Stuart Rackham.
+    Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+    Free use of this software is granted under the terms of the GNU General
+    Public License version 2 (GPLv2).
 '''
 
 import os
diff --git a/filters/latex/latex2img.py b/filters/latex/latex2img.py
index a446dd7..824fc8c 100755
--- a/filters/latex/latex2img.py
+++ b/filters/latex/latex2img.py
@@ -54,8 +54,11 @@ AUTHOR
     http://code.google.com/p/latexmath2png/
 
 COPYING
-    Copyright (C) 2010 Stuart Rackham. Free use of this software is
-    granted under the terms of the MIT License.
+    Copyright (C) 2002-2013 Stuart Rackham.
+    Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+    Free use of this software is granted under the terms of the GNU General
+    Public License version 2 (GPLv2).
 '''
 
 import os
diff --git a/filters/music/music2png.py b/filters/music/music2png.py
index 4458108..c758b4c 100755
--- a/filters/music/music2png.py
+++ b/filters/music/music2png.py
@@ -46,8 +46,11 @@ AUTHOR
     Written by Stuart Rackham, <srackham@gmail.com>
 
 COPYING
-    Copyright (C) 2006 Stuart Rackham. Free use of this software is
-    granted under the terms of the GNU General Public License (GPL).
+    Copyright (C) 2002-2013 Stuart Rackham.
+    Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+    Free use of this software is granted under the terms of the GNU General
+    Public License version 2 (GPLv2).
 '''
 
 import os
diff --git a/help.conf b/help.conf
index 0ba921d..a4b8775 100644
--- a/help.conf
+++ b/help.conf
@@ -193,8 +193,11 @@ RESOURCES
 
 COPYING
 
-   Copyright (C) 2002-2011 Stuart Rackham. Free use of this software is
-   granted under the terms of the GNU General Public License (GPL).
+   Copyright (C) 2002-2013 Stuart Rackham.
+   Copyright (C) 2013-2020 AsciiDoc Contributors.
+
+   Free use of this software is granted under the terms of the GNU General
+   Public License version 2 (GPLv2).
 
 
 [syntax]
diff --git a/tests/data/asciidoc.1-docbook.xml b/tests/data/asciidoc.1-docbook.xml
index 67236b8..6878b67 100644
--- a/tests/data/asciidoc.1-docbook.xml
+++ b/tests/data/asciidoc.1-docbook.xml
@@ -458,7 +458,9 @@ contributed to it.</simpara>
 </refsect1>
 <refsect1 id="_copying">
 <title>COPYING</title>
-<simpara>Copyright (C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License (GPL).</simpara>
+<simpara>Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.</simpara>
+<simpara>Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).</simpara>
 </refsect1>
 </refentry>
diff --git a/tests/data/asciidoc.1-docbook5.xml b/tests/data/asciidoc.1-docbook5.xml
index cb33293..fccb074 100644
--- a/tests/data/asciidoc.1-docbook5.xml
+++ b/tests/data/asciidoc.1-docbook5.xml
@@ -457,7 +457,9 @@ contributed to it.</simpara>
 </refsect1>
 <refsect1 xml:id="_copying">
 <title>COPYING</title>
-<simpara>Copyright (C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License (GPL).</simpara>
+<simpara>Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.</simpara>
+<simpara>Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).</simpara>
 </refsect1>
 </refentry>
diff --git a/tests/data/asciidoc.1-html4.html b/tests/data/asciidoc.1-html4.html
index 5c069d9..e28d0f9 100644
--- a/tests/data/asciidoc.1-html4.html
+++ b/tests/data/asciidoc.1-html4.html
@@ -371,8 +371,10 @@ contributed to it.</p>
 <h2><a name="_see_also"></a>SEE ALSO</h2>
 <p>a2x(1)</p>
 <h2><a name="_copying"></a>COPYING</h2>
-<p>Copyright (C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License (GPL).</p>
+<p>Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.</p>
+<p>Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).</p>
 <p></p>
 <p></p>
 <hr><p><small>
diff --git a/tests/data/asciidoc.1-html5.html b/tests/data/asciidoc.1-html5.html
index fb02518..f0d31eb 100644
--- a/tests/data/asciidoc.1-html5.html
+++ b/tests/data/asciidoc.1-html5.html
@@ -1148,8 +1148,10 @@ contributed to it.</p></div>
 <div class="sect1">
 <h2 id="_copying">COPYING</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Copyright (C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License (GPL).</p></div>
+<div class="paragraph"><p>Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.</p></div>
+<div class="paragraph"><p>Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).</p></div>
 </div>
 </div>
 </div>
diff --git a/tests/data/asciidoc.1-xhtml11.html b/tests/data/asciidoc.1-xhtml11.html
index 162e006..c2c16cc 100644
--- a/tests/data/asciidoc.1-xhtml11.html
+++ b/tests/data/asciidoc.1-xhtml11.html
@@ -1150,8 +1150,10 @@ contributed to it.</p></div>
 <div class="sect1">
 <h2 id="_copying">COPYING</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Copyright (C) 2002-2011 Stuart Rackham. Free use of this software is
-granted under the terms of the GNU General Public License (GPL).</p></div>
+<div class="paragraph"><p>Copyright (C) 2002-2013 Stuart Rackham.
+Copyright (C) 2013-2020 AsciiDoc Contributors.</p></div>
+<div class="paragraph"><p>Free use of this software is granted under the terms of the GNU General
+Public License version 2 (GPLv2).</p></div>
 </div>
 </div>
 </div>
diff --git a/tests/testasciidoc.py b/tests/testasciidoc.py
index 85f34a4..347b7be 100755
--- a/tests/testasciidoc.py
+++ b/tests/testasciidoc.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
-__version__ = '0.2.0'
-__copyright__ = 'Copyright (C) 2009 Stuart Rackham'
+__version__ = '0.3.0'
 
 
 import difflib
diff --git a/website/index.txt b/website/index.txt
index ceed1fd..eab0c33 100644
--- a/website/index.txt
+++ b/website/index.txt
@@ -16,8 +16,6 @@ full list of all additions, changes and bug fixes. Changes are
 documented in the updated link:userguide.html[User Guide]. See the
 link:INSTALL.html[Installation page] for downloads and and
 installation instructions.
-
-'Matthew Peveler'
 ************************************************************************
 
 Introduction