Fix a few remaining copyrights and add 2009 to license.

9 files changed, 8 insertions, 12 deletions

diff --git a/LICENSE b/LICENSE
index 8b1ad263..faac79f0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2007-2008 by the Sphinx team (see AUTHORS file).
+Copyright (c) 2007-2009 by the Sphinx team (see AUTHORS file).
 All rights reserved.
 
 License for Sphinx
diff --git a/doc/conf.py b/doc/conf.py
index 89247821..709d6f75 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -36,7 +36,7 @@ master_doc = 'contents'
 
 # General substitutions.
 project = 'Sphinx'
-copyright = '2008, Georg Brandl'
+copyright = '2007-2009, Georg Brandl'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index 52b4b0ac..8847b6dc 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -5,7 +5,7 @@
 
     Builder superclass for all builders.
 
-    :copyright: 2007-2008 by Georg Brandl, Sebastian Wiesner, Horst Gutmann.
+    :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 0562ce66..b70bd250 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -5,11 +5,7 @@
 
     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/jinja2glue.py b/sphinx/jinja2glue.py
index 996df70b..0c7c5d72 100644
--- a/sphinx/jinja2glue.py
+++ b/sphinx/jinja2glue.py
@@ -5,7 +5,7 @@
 
     Glue code for the jinja2 templating engine.
 
-    :copyright: 2008 by Sebastian Wiesner.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index 03481233..a61a051a 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -5,7 +5,7 @@
 
     Utilities parsing and analyzing Python code.
 
-    :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/pycode/nodes.py b/sphinx/pycode/nodes.py
index d0fb522b..4d27fc66 100644
--- a/sphinx/pycode/nodes.py
+++ b/sphinx/pycode/nodes.py
@@ -5,7 +5,7 @@
 
     Parse tree node implementations.
 
-    :copyright: 2009 by Georg Brandl.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/sphinx/util/docstrings.py b/sphinx/util/docstrings.py
index d7e20e4c..1b0a599a 100644
--- a/sphinx/util/docstrings.py
+++ b/sphinx/util/docstrings.py
@@ -5,7 +5,7 @@
 
     Utilities for docstring processing.
 
-    :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/jsdump.py b/sphinx/util/jsdump.py
index 2eb4619e..8c760b68 100644
--- a/sphinx/util/jsdump.py
+++ b/sphinx/util/jsdump.py
@@ -6,7 +6,7 @@
     This module implements a simple JavaScript serializer.
     Uses the basestring encode function from simplejson by Bob Ippolito.
 
-    :copyright: Copyright 2008 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """