Merge in copyright style changes from 0.5.

47 files changed, 53 insertions, 50 deletions

diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index ee0034ff..e0d8813f 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -5,7 +5,7 @@
 
     The Sphinx documentation toolchain.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/_jinja.py b/sphinx/_jinja.py
index 34917701..fba432c4 100644
--- a/sphinx/_jinja.py
+++ b/sphinx/_jinja.py
@@ -5,7 +5,7 @@
 
     Jinja glue.
 
-    :copyright: 2007-2008 by Georg Brandl, Horst Gutmann.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/addnodes.py b/sphinx/addnodes.py
index 1d719d88..b267913b 100644
--- a/sphinx/addnodes.py
+++ b/sphinx/addnodes.py
@@ -5,7 +5,7 @@
 
     Additional docutils nodes.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/application.py b/sphinx/application.py
index c990edc1..1ad7823f 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -7,8 +7,7 @@
 
     Gracefully adapted from the TextPress system by Armin.
 
-
-    :copyright: 2008 by Georg Brandl, Armin Ronacher.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builder.py b/sphinx/builder.py
index 12ef1c97..13c56e18 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -8,7 +8,7 @@
        This module is only kept for API compatibility; new code should
        import these classes directly from the sphinx.builders package.
 
-    :copyright: 2008-2009 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/changes.py b/sphinx/builders/changes.py
index 047b0155..8770d49b 100644
--- a/sphinx/builders/changes.py
+++ b/sphinx/builders/changes.py
@@ -5,7 +5,7 @@
 
     Changelog builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 69015830..1d1af1c0 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -5,7 +5,7 @@
 
     Several HTML builders.
 
-    :copyright: 2007-2009 by Georg Brandl, Armin Ronacher.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
index bb8166ac..9baaa235 100644
--- a/sphinx/builders/htmlhelp.py
+++ b/sphinx/builders/htmlhelp.py
@@ -6,7 +6,7 @@
     Build HTML help support files.
     Parts adapted from Python's Doc/tools/prechm.py.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/latex.py b/sphinx/builders/latex.py
index 2bcbc0d0..3b7b0c19 100644
--- a/sphinx/builders/latex.py
+++ b/sphinx/builders/latex.py
@@ -5,7 +5,7 @@
 
     LaTeX builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py
index a8536f43..5fcda231 100644
--- a/sphinx/builders/linkcheck.py
+++ b/sphinx/builders/linkcheck.py
@@ -5,7 +5,7 @@
 
     The CheckExternalLinksBuilder class.
 
-    :copyright: 2008 by Georg Brandl, Thomas Lamb.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py
index 3ad331e4..855b340e 100644
--- a/sphinx/builders/qthelp.py
+++ b/sphinx/builders/qthelp.py
@@ -5,7 +5,7 @@
 
     Build input files for the Qt collection generator.
 
-    :copyright: 2008 by Antonio Valentino.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/builders/text.py b/sphinx/builders/text.py
index e3eadcbc..aaafedb4 100644
--- a/sphinx/builders/text.py
+++ b/sphinx/builders/text.py
@@ -5,7 +5,7 @@
 
     Plain-text Sphinx builder.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index 558d2e0a..20767f0d 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -5,7 +5,7 @@
 
     sphinx-build command-line handling.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/config.py b/sphinx/config.py
index 4dce42d6..428c0bf4 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -5,8 +5,8 @@
 
     Build configuration file handling.
 
-    :copyright: 2008 by Georg Brandl.
-    :license: BSD, see LICENSE for details license.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import os
diff --git a/sphinx/directives/__init__.py b/sphinx/directives/__init__.py
index ed85dc77..df86f997 100644
--- a/sphinx/directives/__init__.py
+++ b/sphinx/directives/__init__.py
@@ -5,7 +5,7 @@
 
     Handlers for additional ReST directives.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index b4364535..5a438886 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -3,7 +3,7 @@
     sphinx.directives.code
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/directives/desc.py b/sphinx/directives/desc.py
index dc96f799..3ffe048b 100644
--- a/sphinx/directives/desc.py
+++ b/sphinx/directives/desc.py
@@ -3,7 +3,7 @@
     sphinx.directives.desc
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index 2aa5a7fb..f19c4f9b 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -3,7 +3,7 @@
     sphinx.directives.other
     ~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/environment.py b/sphinx/environment.py
index fe290318..0562ce66 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -5,7 +5,11 @@
 
     Global creation environment.
 
+<<<<<<< local
     :copyright: 2007-2009 by Georg Brandl.
+=======
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+>>>>>>> other
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/__init__.py b/sphinx/ext/__init__.py
index 402dd578..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.
+    :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 f94afc75..cf287d2f 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -7,7 +7,7 @@
     the doctree, thus avoiding duplication between docstrings and documentation
     for those who like elaborate docstrings.
 
-    :copyright: 2008 by Georg Brandl, Pauli Virtanen, Martin Hans.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index af6031fd..a3dc5889 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -6,7 +6,7 @@
     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.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index 5ea1dde9..d6697f98 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -6,7 +6,7 @@
     Mimic doctest by automatically executing code snippets and checking
     their results.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/ifconfig.py b/sphinx/ext/ifconfig.py
index 10cab525..f622ec49 100644
--- a/sphinx/ext/ifconfig.py
+++ b/sphinx/ext/ifconfig.py
@@ -16,7 +16,7 @@
     namespace of the project configuration (that is, all variables from ``conf.py``
     are available.)
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index e94b3d67..47ebceb3 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -20,7 +20,7 @@
       also be specified individually, e.g. if the docs should be buildable
       without Internet access.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/jsmath.py b/sphinx/ext/jsmath.py
index 4bc38b51..1bea3304 100644
--- a/sphinx/ext/jsmath.py
+++ b/sphinx/ext/jsmath.py
@@ -6,7 +6,7 @@
     Set up everything for use of JSMath to display math in HTML
     via JavaScript.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/mathbase.py b/sphinx/ext/mathbase.py
index 825eabef..12af089d 100644
--- a/sphinx/ext/mathbase.py
+++ b/sphinx/ext/mathbase.py
@@ -5,7 +5,7 @@
 
     Set up math support in source files and LaTeX/text output.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/pngmath.py b/sphinx/ext/pngmath.py
index 047af9bb..dc1d2ee8 100644
--- a/sphinx/ext/pngmath.py
+++ b/sphinx/ext/pngmath.py
@@ -5,7 +5,7 @@
 
     Render math in HTML via dvipng.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/refcounting.py b/sphinx/ext/refcounting.py
index e42e7e2c..c31d6627 100644
--- a/sphinx/ext/refcounting.py
+++ b/sphinx/ext/refcounting.py
@@ -9,7 +9,7 @@
     Usage: Set the `refcount_file` config value to the path to the reference
     count data file.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/ext/todo.py b/sphinx/ext/todo.py
index 4c1b142c..dac90660 100644
--- a/sphinx/ext/todo.py
+++ b/sphinx/ext/todo.py
@@ -8,7 +8,7 @@
     all todos of your project and lists them along with a backlink to the
     original location.
 
-    :copyright: 2008 Daniel Bültmann.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index e347d01e..c818af30 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -5,7 +5,7 @@
 
     Highlight code blocks using Pygments.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py
index 37c714b4..36fabc61 100644
--- a/sphinx/locale/__init__.py
+++ b/sphinx/locale/__init__.py
@@ -5,7 +5,7 @@
 
     Locale utilities.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index ab0a2094..7ed514ed 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -5,7 +5,7 @@
 
     Quickly setup documentation source to work with Sphinx.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/roles.py b/sphinx/roles.py
index d942ddc9..2bbdab94 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -5,7 +5,7 @@
 
     Handlers for additional ReST roles.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/search.py b/sphinx/search.py
index a823c8f3..f39d3674 100644
--- a/sphinx/search.py
+++ b/sphinx/search.py
@@ -5,7 +5,7 @@
 
     Create a search index for offline search.
 
-    :copyright: 2007-2008 by Armin Ronacher.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 86e84196..c874bdd4 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -8,8 +8,8 @@
 
     :author: Sebastian Wiesner
     :contact: basti.wiesner@gmx.net
-    :copyright: 2008 by Sebastian Wiesner.
-    :license: MIT.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 import sys
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index e25bc5a1..f04f3a31 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -5,7 +5,7 @@
 
     Utility functions for Sphinx.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index 05a1c416..4d5e1996 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -5,7 +5,7 @@
 
     Stuff for docutils compatibility.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/util/console.py b/sphinx/util/console.py
index a783f700..724dee10 100644
--- a/sphinx/util/console.py
+++ b/sphinx/util/console.py
@@ -5,7 +5,7 @@
 
     Format colored console output.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/util/jsdump.py b/sphinx/util/jsdump.py
index d7f8f5a8..2eb4619e 100644
--- a/sphinx/util/jsdump.py
+++ b/sphinx/util/jsdump.py
@@ -4,9 +4,9 @@
     ~~~~~~~~~~~~~~~~~~
 
     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.
+    :copyright: Copyright 2008 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/util/png.py b/sphinx/util/png.py
index feafc463..805a6bdc 100644
--- a/sphinx/util/png.py
+++ b/sphinx/util/png.py
@@ -5,7 +5,7 @@
 
     PNG image manipulation helpers.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
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 41fc042c..1799b77c 100644
--- a/sphinx/util/texescape.py
+++ b/sphinx/util/texescape.py
@@ -5,7 +5,7 @@
 
     TeX escaping helper.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/writers/__init__.py b/sphinx/writers/__init__.py
index 454f54eb..7bb8cad9 100644
--- a/sphinx/writers/__init__.py
+++ b/sphinx/writers/__init__.py
@@ -5,6 +5,6 @@
 
     Custom docutils writers.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 69c1de72..e34b8fa9 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -5,7 +5,7 @@
 
     docutils writers handling Sphinx' custom nodes.
 
-    :copyright: 2007-2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 24acd3db..c16a4271 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -8,7 +8,7 @@
     Much of this code is adapted from Dave Kuhlman's "docpy" writer from his
     docutils sandbox.
 
-    :copyright: 2007-2008 by Georg Brandl, Dave Kuhlman.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
index f54a6386..5c8500fb 100644
--- a/sphinx/writers/text.py
+++ b/sphinx/writers/text.py
@@ -5,7 +5,7 @@
 
     Custom docutils writer for plain text.
 
-    :copyright: 2008 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """