From 0b28b3e6f6666383c2eb497972328af8e6fc5fef Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 3 Jan 2009 11:57:07 +0100 Subject: [PATCH] Switch copyright and license tags to single style. Add contributor names in AUTHORS instead, and add the license of etree13 to LICENSE. --- AUTHORS | 28 +++++++++-- LICENSE | 92 +++++++++++++++++++++++------------ sphinx/__init__.py | 4 +- sphinx/_jinja.py | 4 +- sphinx/addnodes.py | 4 +- sphinx/application.py | 4 +- sphinx/builder.py | 4 +- sphinx/cmdline.py | 4 +- sphinx/config.py | 2 +- sphinx/directives/__init__.py | 4 +- sphinx/directives/code.py | 4 +- sphinx/directives/desc.py | 4 +- sphinx/directives/other.py | 4 +- sphinx/environment.py | 4 +- sphinx/ext/__init__.py | 4 +- sphinx/ext/autodoc.py | 4 +- sphinx/ext/coverage.py | 4 +- sphinx/ext/doctest.py | 4 +- sphinx/ext/ifconfig.py | 4 +- sphinx/ext/intersphinx.py | 4 +- sphinx/ext/jsmath.py | 4 +- sphinx/ext/mathbase.py | 4 +- sphinx/ext/pngmath.py | 4 +- sphinx/ext/refcounting.py | 4 +- sphinx/ext/todo.py | 4 +- sphinx/highlighting.py | 4 +- sphinx/htmlhelp.py | 4 +- sphinx/htmlwriter.py | 4 +- sphinx/latexwriter.py | 4 +- sphinx/linkcheck.py | 4 +- sphinx/locale/__init__.py | 4 +- sphinx/quickstart.py | 4 +- sphinx/roles.py | 4 +- sphinx/search.py | 4 +- sphinx/setup_command.py | 2 +- sphinx/textwriter.py | 4 +- sphinx/util/__init__.py | 4 +- sphinx/util/compat.py | 4 +- sphinx/util/console.py | 4 +- sphinx/util/jsdump.py | 6 +-- sphinx/util/png.py | 4 +- sphinx/util/stemmer.py | 2 +- sphinx/util/texescape.py | 4 +- tests/run.py | 4 +- tests/test_application.py | 4 +- tests/test_autodoc.py | 4 +- tests/test_build.py | 4 +- tests/test_config.py | 4 +- tests/test_coverage.py | 4 +- tests/test_env.py | 4 +- tests/test_i18n.py | 4 +- tests/test_markup.py | 4 +- tests/test_quickstart.py | 4 +- tests/util.py | 4 +- 54 files changed, 187 insertions(+), 137 deletions(-) diff --git a/AUTHORS b/AUTHORS index e5a737733..72a2469ef 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,26 @@ -The doctools are written and maintained by Georg Brandl . -Substantial parts of the templates and the web application were written by -Armin Ronacher . +Sphinx is written and maintained by Georg Brandl . -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 +. + +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 2db70e5f1..ecc8005cc 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 7c7e35370..1dccf1c0f 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 d6e98b214..3adf0de82 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 8b20f7ac0..6ea47d31c 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 e97fe7344..ecc2037ad 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 3f3ec2c9e..33322d581 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 1add81934..20767f0d4 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 fa04ac2a8..a9c7ae953 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 462b2cffc..df86f9972 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 5ea477635..5a438886a 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 3c0bad157..fc6cb4f6a 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 b63d139c8..f92683a32 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 62ae4b03b..ab6b1f0bb 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 d111f11b9..c6e239518 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 ddaba04cc..ee45a312b 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 f03dbc1e2..c26a1cfd0 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 87c8cf177..3a44c3f70 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 204178f2f..f622ec49c 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 0c034e0d5..463f5437b 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 bd2579de5..1bea33044 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 fc002c604..12af089da 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 e3c812a1a..dc1d2ee8d 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 c6e5a76fc..c31d66270 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 f4bed7401..dac906604 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 1637b2c3f..fe82b0bc3 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 4cc68bc95..84ef31d90 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 0505fd08f..f983aa76d 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 3d01f3b75..bfc9165ac 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 37aeb7a74..a4e876e21 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 bedade3c9..36fabc615 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 1f0765756..4ab26b861 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 d28112384..0b66c8e8d 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 46ff986dd..f39d3674f 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 86e84196f..3eee30351 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 4aa180390..383af7828 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 13b53ac7f..e42731066 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 208b8218d..4d5e19964 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 d6ebcb947..724dee104 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 3d246d0cc..2eb4619e5 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 a22acba2e..805a6bdc3 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 a5e5cbbc5..7eeb77b2b 100644 --- a/sphinx/util/stemmer.py +++ b/sphinx/util/stemmer.py @@ -24,7 +24,7 @@ Release 1: January 2001 - :copyright: 2001 by Vivake Gupta . + :copyright: Copyright 2001 by Vivake Gupta . :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 8412a3a3f..1799b77c6 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 f67a34327..4cc23442a 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 e00e990f6..6425e2753 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 ee3fdf1dc..752c0725d 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 b48cccc3f..aed56a8c6 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 57d1936b2..bc5ab8a0b 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 82279f50d..369788a19 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 ec651957b..390c69995 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 da0af246d..94648727e 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 f1125103c..5fd70f051 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 a76a1cdfd..4c2d0f3ec 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 c4c535922..2cd2c031b 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