Switch copyright and license tags to single style. Add contributor

names in AUTHORS instead, and add the license of etree13 to
LICENSE.

54 files changed, 187 insertions, 137 deletions

diff --git a/AUTHORS b/AUTHORS
index e5a73773..72a2469e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,26 @@
-The doctools are written and maintained by Georg Brandl <georg@python.org>.
-Substantial parts of the templates and the web application were written by
-Armin Ronacher <armin.ronacher@active-4.com>.
+Sphinx is written and maintained by Georg Brandl <georg@python.org>.
 
-Other contributors are noted in the :copyright: fields within the docstrings
-of the respective files.
+Substantial parts of the templates were written by Armin Ronacher
+<armin.ronacher@active-4.com>.
+
+Other contributors, listed alphabetically, are:
+
+* Daniel Bültmann -- todo extension
+* Josip Dzolonga -- coverage builder
+* Horst Gutmann -- internationalization support
+* Martin Hans -- autodoc improvements
+* Dave Kuhlman -- original LaTeX writer
+* Thomas Lamb -- linkcheck builder
+* Benjamin Peterson -- unittests
+* Pauli Virtanen -- autodoc improvements
+* Sebastian Wiesner -- image handling, distutils support
 
 Many thanks for all contributions!
+
+There are also a few modules or functions incorporated from other
+authors and projects:
+
+* sphinx.util.jsdump uses the basestring encoding from simplejson,
+  written by Bob Ippolito, released under the MIT license
+* sphinx.util.stemmer was written by Vivake Gupta, placed in the
+  Public Domain
diff --git a/LICENSE b/LICENSE
index 2db70e5f..ecc8005c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,62 @@
-Copyright (c) 2007-2008 by the respective authors (see AUTHORS file).

-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.

-

-    * The names of the contributors may not be used to endorse or

-      promote products derived from this software without specific

-      prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+Copyright (c) 2007-2009 by the respective authors (see AUTHORS file).
+All rights reserved.
+
+License for Sphinx
+==================
+
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Licenses for incorporated software
+==================================
+
+The ElementTree package, included in this distribution in
+test/etree13, is available under the following license:
+
+----------------------------------------------------------------------
+The ElementTree toolkit is
+
+Copyright (c) 1999-2007 by Fredrik Lundh
+
+By obtaining, using, and/or copying this software and/or its
+associated documentation, you agree that you have read, understood,
+and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+associated documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appears in all
+copies, and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Secret Labs
+AB or the author not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- ABILITY
+AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+----------------------------------------------------------------------
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 7c7e3537..1dccf1c0 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -5,8 +5,8 @@
 
     The Sphinx documentation toolchain.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/sphinx/_jinja.py b/sphinx/_jinja.py
index d6e98b21..3adf0de8 100644
--- a/sphinx/_jinja.py
+++ b/sphinx/_jinja.py
@@ -5,8 +5,8 @@
 
     Jinja glue.
 
-    :copyright: 2007-2008 by Georg Brandl, Horst Gutmann.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import codecs
diff --git a/sphinx/addnodes.py b/sphinx/addnodes.py
index 8b20f7ac..6ea47d31 100644
--- a/sphinx/addnodes.py
+++ b/sphinx/addnodes.py
@@ -5,8 +5,8 @@
 
     Additional docutils nodes.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from docutils import nodes
diff --git a/sphinx/application.py b/sphinx/application.py
index e97fe734..ecc2037a 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -8,8 +8,8 @@
     Gracefully adapted from the TextPress system by Armin.
 
 
-    :copyright: 2008 by Georg Brandl, Armin Ronacher.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/sphinx/builder.py b/sphinx/builder.py
index 3f3ec2c9..33322d58 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -5,8 +5,8 @@
 
     Builder classes for different output formats.
 
-    :copyright: 2007-2009 by Georg Brandl, Sebastian Wiesner, Horst Gutmann.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index 1add8193..20767f0d 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -5,8 +5,8 @@
 
     sphinx-build command-line handling.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/sphinx/config.py b/sphinx/config.py
index fa04ac2a..a9c7ae95 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -5,7 +5,7 @@
 
     Build configuration file handling.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD license.
 """
 
diff --git a/sphinx/directives/__init__.py b/sphinx/directives/__init__.py
index 462b2cff..df86f997 100644
--- a/sphinx/directives/__init__.py
+++ b/sphinx/directives/__init__.py
@@ -5,8 +5,8 @@
 
     Handlers for additional ReST directives.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from sphinx.directives.desc import *
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 5ea47763..5a438886 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -3,8 +3,8 @@
     sphinx.directives.code
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/sphinx/directives/desc.py b/sphinx/directives/desc.py
index 3c0bad15..fc6cb4f6 100644
--- a/sphinx/directives/desc.py
+++ b/sphinx/directives/desc.py
@@ -3,8 +3,8 @@
     sphinx.directives.desc
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index b63d139c..f92683a3 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -3,8 +3,8 @@
     sphinx.directives.other
     ~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 62ae4b03..ab6b1f0b 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -5,8 +5,8 @@
 
     Global creation environment.
 
-    :copyright: 2007-2009 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/ext/__init__.py b/sphinx/ext/__init__.py
index d111f11b..c6e23951 100644
--- a/sphinx/ext/__init__.py
+++ b/sphinx/ext/__init__.py
@@ -5,6 +5,6 @@
 
     Contains Sphinx features not activated by default.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index ddaba04c..ee45a312 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -7,8 +7,8 @@
     the doctree, thus avoiding duplication between docstrings and documentation
     for those who like elaborate docstrings.
 
-    :copyright: 2008 by Georg Brandl, Pauli Virtanen, Martin Hans.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index f03dbc1e..c26a1cfd 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -6,8 +6,8 @@
     Check Python modules and C API for coverage.  Mostly written by Josip
     Dzolonga for the Google Highly Open Participation contest.
 
-    :copyright: 2008 by Josip Dzolonga, Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index 87c8cf17..3a44c3f7 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -6,8 +6,8 @@
     Mimic doctest by automatically executing code snippets and checking
     their results.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/ext/ifconfig.py b/sphinx/ext/ifconfig.py
index 204178f2..f622ec49 100644
--- a/sphinx/ext/ifconfig.py
+++ b/sphinx/ext/ifconfig.py
@@ -16,8 +16,8 @@
     namespace of the project configuration (that is, all variables from ``conf.py``
     are available.)
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from docutils import nodes
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 0c034e0d..463f5437 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -20,8 +20,8 @@
       also be specified individually, e.g. if the docs should be buildable
       without Internet access.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import time
diff --git a/sphinx/ext/jsmath.py b/sphinx/ext/jsmath.py
index bd2579de..1bea3304 100644
--- a/sphinx/ext/jsmath.py
+++ b/sphinx/ext/jsmath.py
@@ -6,8 +6,8 @@
     Set up everything for use of JSMath to display math in HTML
     via JavaScript.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from docutils import nodes
diff --git a/sphinx/ext/mathbase.py b/sphinx/ext/mathbase.py
index fc002c60..12af089d 100644
--- a/sphinx/ext/mathbase.py
+++ b/sphinx/ext/mathbase.py
@@ -5,8 +5,8 @@
 
     Set up math support in source files and LaTeX/text output.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from docutils import nodes, utils
diff --git a/sphinx/ext/pngmath.py b/sphinx/ext/pngmath.py
index e3c812a1..dc1d2ee8 100644
--- a/sphinx/ext/pngmath.py
+++ b/sphinx/ext/pngmath.py
@@ -5,8 +5,8 @@
 
     Render math in HTML via dvipng.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/ext/refcounting.py b/sphinx/ext/refcounting.py
index c6e5a76f..c31d6627 100644
--- a/sphinx/ext/refcounting.py
+++ b/sphinx/ext/refcounting.py
@@ -9,8 +9,8 @@
     Usage: Set the `refcount_file` config value to the path to the reference
     count data file.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from os import path
diff --git a/sphinx/ext/todo.py b/sphinx/ext/todo.py
index f4bed740..dac90660 100644
--- a/sphinx/ext/todo.py
+++ b/sphinx/ext/todo.py
@@ -8,8 +8,8 @@
     all todos of your project and lists them along with a backlink to the
     original location.
 
-    :copyright: 2008 Daniel Bültmann.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from docutils import nodes
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 1637b2c3..fe82b0bc 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -5,8 +5,8 @@
 
     Highlight code blocks using Pygments.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/sphinx/htmlhelp.py b/sphinx/htmlhelp.py
index 4cc68bc9..84ef31d9 100644
--- a/sphinx/htmlhelp.py
+++ b/sphinx/htmlhelp.py
@@ -6,8 +6,8 @@
     Build HTML help support files.
     Adapted from the original Doc/tools/prechm.py.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/sphinx/htmlwriter.py b/sphinx/htmlwriter.py
index 0505fd08..f983aa76 100644
--- a/sphinx/htmlwriter.py
+++ b/sphinx/htmlwriter.py
@@ -5,8 +5,8 @@
 
     docutils writers handling Sphinx' custom nodes.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/sphinx/latexwriter.py b/sphinx/latexwriter.py
index 3d01f3b7..bfc9165a 100644
--- a/sphinx/latexwriter.py
+++ b/sphinx/latexwriter.py
@@ -8,8 +8,8 @@
     Much of this code is adapted from Dave Kuhlman's "docpy" writer from his
     docutils sandbox.
 
-    :copyright: 2007-2008 by Georg Brandl, Dave Kuhlman.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/linkcheck.py b/sphinx/linkcheck.py
index 37aeb7a7..a4e876e2 100644
--- a/sphinx/linkcheck.py
+++ b/sphinx/linkcheck.py
@@ -5,8 +5,8 @@
 
     The CheckExternalLinksBuilder class.
 
-    :copyright: 2008 by Georg Brandl, Thomas Lamb.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import socket
diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py
index bedade3c..36fabc61 100644
--- a/sphinx/locale/__init__.py
+++ b/sphinx/locale/__init__.py
@@ -5,8 +5,8 @@
 
     Locale utilities.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 _ = lambda x: x
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 1f076575..4ab26b86 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -5,8 +5,8 @@
 
     Quickly setup documentation source to work with Sphinx.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys, os, time
diff --git a/sphinx/roles.py b/sphinx/roles.py
index d2811238..0b66c8e8 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -5,8 +5,8 @@
 
     Handlers for additional ReST roles.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/search.py b/sphinx/search.py
index 46ff986d..f39d3674 100644
--- a/sphinx/search.py
+++ b/sphinx/search.py
@@ -5,8 +5,8 @@
 
     Create a search index for offline search.
 
-    :copyright: 2007-2008 by Armin Ronacher.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 import re
 import cPickle as pickle
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 86e84196..3eee3035 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -8,7 +8,7 @@
 
     :author: Sebastian Wiesner
     :contact: basti.wiesner@gmx.net
-    :copyright: 2008 by Sebastian Wiesner.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: MIT.
 """
 
diff --git a/sphinx/textwriter.py b/sphinx/textwriter.py
index 4aa18039..383af782 100644
--- a/sphinx/textwriter.py
+++ b/sphinx/textwriter.py
@@ -5,8 +5,8 @@
 
     Custom docutils writer for plain text.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index 13b53ac7..e4273106 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -5,8 +5,8 @@
 
     Utility functions for Sphinx.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index 208b8218..4d5e1996 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -5,8 +5,8 @@
 
     Stuff for docutils compatibility.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from docutils import nodes
diff --git a/sphinx/util/console.py b/sphinx/util/console.py
index d6ebcb94..724dee10 100644
--- a/sphinx/util/console.py
+++ b/sphinx/util/console.py
@@ -5,8 +5,8 @@
 
     Format colored console output.
 
-    :copyright: 2007-2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/sphinx/util/jsdump.py b/sphinx/util/jsdump.py
index 3d246d0c..2eb4619e 100644
--- a/sphinx/util/jsdump.py
+++ b/sphinx/util/jsdump.py
@@ -4,10 +4,10 @@
     ~~~~~~~~~~~~~~~~~~
 
     This module implements a simple JavaScript serializer.
-    Uses the basestring encode function from simplejson.
+    Uses the basestring encode function from simplejson by Bob Ippolito.
 
-    :copyright: 2008 by Armin Ronacher, Bob Ippolito, Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2008 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/sphinx/util/png.py b/sphinx/util/png.py
index a22acba2..805a6bdc 100644
--- a/sphinx/util/png.py
+++ b/sphinx/util/png.py
@@ -5,8 +5,8 @@
 
     PNG image manipulation helpers.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import struct
diff --git a/sphinx/util/stemmer.py b/sphinx/util/stemmer.py
index a5e5cbbc..7eeb77b2 100644
--- a/sphinx/util/stemmer.py
+++ b/sphinx/util/stemmer.py
@@ -24,7 +24,7 @@
 
     Release 1: January 2001
 
-    :copyright: 2001 by Vivake Gupta <v@nano.com>.
+    :copyright: Copyright 2001 by Vivake Gupta <v@nano.com>.
     :license: Public Domain ("can be used free of charge for any purpose").
 """
 
diff --git a/sphinx/util/texescape.py b/sphinx/util/texescape.py
index 8412a3a3..1799b77c 100644
--- a/sphinx/util/texescape.py
+++ b/sphinx/util/texescape.py
@@ -5,8 +5,8 @@
 
     TeX escaping helper.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 tex_replacements = [
diff --git a/tests/run.py b/tests/run.py
index f67a3432..4cc23442 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -6,8 +6,8 @@
 
     This script runs the Sphinx unit test suite.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/tests/test_application.py b/tests/test_application.py
index e00e990f..6425e275 100644
--- a/tests/test_application.py
+++ b/tests/test_application.py
@@ -5,8 +5,8 @@
 
     Test the Sphinx class.
 
-    :copyright: 2008 by Benjamin Peterson.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from StringIO import StringIO
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index ee3fdf1d..752c0725 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -6,8 +6,8 @@
     Test the autodoc extension.  This tests mainly the RstGenerator; the auto
     directives are tested in a test source file translated by test_build.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from util import *
diff --git a/tests/test_build.py b/tests/test_build.py
index b48cccc3..aed56a8c 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -5,8 +5,8 @@
 
     Test the entire build process with the test root.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/tests/test_config.py b/tests/test_config.py
index 57d1936b..bc5ab8a0 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -6,8 +6,8 @@
     Test the sphinx.config.Config class and its handling in the
     Application class.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from util import *
diff --git a/tests/test_coverage.py b/tests/test_coverage.py
index 82279f50..369788a1 100644
--- a/tests/test_coverage.py
+++ b/tests/test_coverage.py
@@ -5,8 +5,8 @@
 
     Test the coverage builder.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import pickle
diff --git a/tests/test_env.py b/tests/test_env.py
index ec651957..390c6999 100644
--- a/tests/test_env.py
+++ b/tests/test_env.py
@@ -5,8 +5,8 @@
 
     Test the BuildEnvironment class.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from util import *
diff --git a/tests/test_i18n.py b/tests/test_i18n.py
index da0af246..94648727 100644
--- a/tests/test_i18n.py
+++ b/tests/test_i18n.py
@@ -5,8 +5,8 @@
 
     Test locale features.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 from util import *
diff --git a/tests/test_markup.py b/tests/test_markup.py
index f1125103..5fd70f05 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -5,8 +5,8 @@
 
     Test various Sphinx-specific markup extensions.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import re
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index a76a1cdf..4c2d0f3e 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -5,8 +5,8 @@
 
     Test the sphinx.quickstart module.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/tests/util.py b/tests/util.py
index c4c53592..2cd2c031 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -3,8 +3,8 @@
     Sphinx test suite utilities
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys