summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-11 14:18:19 +0000
committerGeorg Brandl <georg@python.org>2008-01-11 14:18:19 +0000
commitdb0bbcb136c90beffabf04da959ff5a8386ba7e5 (patch)
tree4a2df2cff86a1f0e7ffccf573207ec9a64c22b7e
parent13107c19d056a622ee833e872ec2ffe1a9069607 (diff)
downloadsphinx-git-db0bbcb136c90beffabf04da959ff5a8386ba7e5.tar.gz
Update copyright years and change license to BSD.
-rw-r--r--convert.py4
-rw-r--r--converter/__init__.py4
-rw-r--r--converter/docnodes.py4
-rw-r--r--converter/filenamemap.py4
-rw-r--r--converter/latexparser.py4
-rw-r--r--converter/restwriter.py4
-rw-r--r--converter/tokenizer.py4
-rw-r--r--converter/util.py4
-rw-r--r--sphinx-build.py4
-rw-r--r--sphinx-web.py4
-rw-r--r--sphinx/__init__.py4
-rw-r--r--sphinx/_jinja.py4
-rw-r--r--sphinx/addnodes.py4
-rw-r--r--sphinx/builder.py4
-rw-r--r--sphinx/directives.py4
-rw-r--r--sphinx/environment.py4
-rw-r--r--sphinx/highlighting.py4
-rw-r--r--sphinx/htmlhelp.py4
-rw-r--r--sphinx/htmlwriter.py4
-rw-r--r--sphinx/latexwriter.py4
-rw-r--r--sphinx/patchlevel.py4
-rw-r--r--sphinx/refcounting.py4
-rw-r--r--sphinx/roles.py4
-rw-r--r--sphinx/search.py4
-rw-r--r--sphinx/util/__init__.py4
-rw-r--r--sphinx/util/console.py4
-rw-r--r--sphinx/util/json.py4
-rw-r--r--sphinx/web/__init__.py4
-rw-r--r--sphinx/web/admin.py4
-rw-r--r--sphinx/web/antispam.py4
-rw-r--r--sphinx/web/application.py4
-rw-r--r--sphinx/web/database.py4
-rw-r--r--sphinx/web/feed.py4
-rw-r--r--sphinx/web/mail.py4
-rw-r--r--sphinx/web/markup.py4
-rw-r--r--sphinx/web/oldurls.py4
-rw-r--r--sphinx/web/robots.py4
-rw-r--r--sphinx/web/serve.py4
-rw-r--r--sphinx/web/userdb.py4
-rw-r--r--sphinx/web/util.py4
-rw-r--r--sphinx/web/wsgiutil.py4
41 files changed, 82 insertions, 82 deletions
diff --git a/convert.py b/convert.py
index 3654a1fca..9b48e3e5e 100644
--- a/convert.py
+++ b/convert.py
@@ -3,8 +3,8 @@
Convert the Python documentation to Sphinx
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import sys
diff --git a/converter/__init__.py b/converter/__init__.py
index 82b90e5e0..46f10322b 100644
--- a/converter/__init__.py
+++ b/converter/__init__.py
@@ -3,8 +3,8 @@
Documentation converter - high level functions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import sys
diff --git a/converter/docnodes.py b/converter/docnodes.py
index 336499e9d..85ca2625b 100644
--- a/converter/docnodes.py
+++ b/converter/docnodes.py
@@ -3,8 +3,8 @@
Python documentation LaTeX parser - document nodes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
diff --git a/converter/filenamemap.py b/converter/filenamemap.py
index 90f4b38ac..0d743b41a 100644
--- a/converter/filenamemap.py
+++ b/converter/filenamemap.py
@@ -3,8 +3,8 @@
Map LaTeX filenames to ReST filenames
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
# '' means: use same name, strip prefix if applicable.
diff --git a/converter/latexparser.py b/converter/latexparser.py
index 2ca126d76..bceffd2d9 100644
--- a/converter/latexparser.py
+++ b/converter/latexparser.py
@@ -5,8 +5,8 @@
For more documentation, look into the ``restwriter.py`` file.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from .docnodes import CommentNode, RootNode, NodeList, ParaSepNode, \
diff --git a/converter/restwriter.py b/converter/restwriter.py
index a2f7ec031..da964c695 100644
--- a/converter/restwriter.py
+++ b/converter/restwriter.py
@@ -53,8 +53,8 @@
- Block level markup inside "alltt" environments doesn't work.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
# yay!
diff --git a/converter/tokenizer.py b/converter/tokenizer.py
index 053ecc0c4..619609193 100644
--- a/converter/tokenizer.py
+++ b/converter/tokenizer.py
@@ -5,8 +5,8 @@
For more documentation, look into the ``restwriter.py`` file.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import re
diff --git a/converter/util.py b/converter/util.py
index 45ab26fa2..7b7cc4bbb 100644
--- a/converter/util.py
+++ b/converter/util.py
@@ -3,8 +3,8 @@
Python documentation conversion utils
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import re
diff --git a/sphinx-build.py b/sphinx-build.py
index ab356f6f2..ecd6febe5 100644
--- a/sphinx-build.py
+++ b/sphinx-build.py
@@ -3,8 +3,8 @@
Sphinx - Python documentation toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import sys
diff --git a/sphinx-web.py b/sphinx-web.py
index 9f8ef8b74..c5082abaa 100644
--- a/sphinx-web.py
+++ b/sphinx-web.py
@@ -3,8 +3,8 @@
Sphinx - Python documentation webserver
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Armin Ronacher, Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher, Georg Brandl.
+ :license: BSD.
"""
import sys
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index ddca826a5..593bd20dc 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -5,8 +5,8 @@
The Python documentation toolchain.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import sys
diff --git a/sphinx/_jinja.py b/sphinx/_jinja.py
index 3a61801f2..c89311314 100644
--- a/sphinx/_jinja.py
+++ b/sphinx/_jinja.py
@@ -5,8 +5,8 @@
Jinja glue.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import absolute_import
diff --git a/sphinx/addnodes.py b/sphinx/addnodes.py
index 1a49a6828..e5f88a601 100644
--- a/sphinx/addnodes.py
+++ b/sphinx/addnodes.py
@@ -3,8 +3,8 @@
sphinx.addnodes
~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from docutils import nodes
diff --git a/sphinx/builder.py b/sphinx/builder.py
index 468f7ab9d..eed5cd62f 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -5,8 +5,8 @@
Builder classes for different output formats.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/directives.py b/sphinx/directives.py
index a53bb7c6e..16ae589aa 100644
--- a/sphinx/directives.py
+++ b/sphinx/directives.py
@@ -5,8 +5,8 @@
Handlers for additional ReST directives.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/environment.py b/sphinx/environment.py
index d755ca854..140df1605 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -5,8 +5,8 @@
Global creation environment.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index e60df9470..34421110f 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -5,8 +5,8 @@
Highlight code blocks using Pygments.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import cgi
diff --git a/sphinx/htmlhelp.py b/sphinx/htmlhelp.py
index a5b1f4f8a..262c4631c 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 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/htmlwriter.py b/sphinx/htmlwriter.py
index 12286a834..56536c5cd 100644
--- a/sphinx/htmlwriter.py
+++ b/sphinx/htmlwriter.py
@@ -5,8 +5,8 @@
docutils writers handling Sphinx' custom nodes.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from docutils import nodes
diff --git a/sphinx/latexwriter.py b/sphinx/latexwriter.py
index a3d5a06ad..c1d7a801d 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 by Georg Brandl, Dave Kuhlman.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl, Dave Kuhlman.
+ :license: BSD.
"""
import re
diff --git a/sphinx/patchlevel.py b/sphinx/patchlevel.py
index 85615a58e..a3a6d6904 100644
--- a/sphinx/patchlevel.py
+++ b/sphinx/patchlevel.py
@@ -6,8 +6,8 @@
Extract version info from Include/patchlevel.h.
Adapted from Doc/tools/getversioninfo.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/refcounting.py b/sphinx/refcounting.py
index 3f3b92462..c1b5f7c05 100644
--- a/sphinx/refcounting.py
+++ b/sphinx/refcounting.py
@@ -6,8 +6,8 @@
Handle reference counting annotations, based on refcount.py
and anno-api.py.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/roles.py b/sphinx/roles.py
index f99063bed..6f1c38034 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -5,8 +5,8 @@
Handlers for additional ReST roles.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import re
diff --git a/sphinx/search.py b/sphinx/search.py
index f5622f704..fb5d0a580 100644
--- a/sphinx/search.py
+++ b/sphinx/search.py
@@ -5,8 +5,8 @@
Create a search index for offline search.
- :copyright: 2007 by Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher.
+ :license: BSD.
"""
import re
import pickle
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index a4c5be64c..b75fa5bbb 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -5,8 +5,8 @@
Utility functions for Sphinx.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import os
diff --git a/sphinx/util/console.py b/sphinx/util/console.py
index b6a462a33..69c3d2bb2 100644
--- a/sphinx/util/console.py
+++ b/sphinx/util/console.py
@@ -5,8 +5,8 @@
Format colored console output.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
codes = {}
diff --git a/sphinx/util/json.py b/sphinx/util/json.py
index c2436e518..cc2c78252 100644
--- a/sphinx/util/json.py
+++ b/sphinx/util/json.py
@@ -10,8 +10,8 @@
Uses the basestring encode function from simplejson.
- :copyright: 2007 by Armin Ronacher, Bob Ippolito.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher, Bob Ippolito.
+ :license: BSD.
"""
import re
diff --git a/sphinx/web/__init__.py b/sphinx/web/__init__.py
index 7d9867d08..ee81f8ab3 100644
--- a/sphinx/web/__init__.py
+++ b/sphinx/web/__init__.py
@@ -5,8 +5,8 @@
A web application to serve the Python docs interactively.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import os
diff --git a/sphinx/web/admin.py b/sphinx/web/admin.py
index 0c5f34862..80f847b63 100644
--- a/sphinx/web/admin.py
+++ b/sphinx/web/admin.py
@@ -5,8 +5,8 @@
Admin application parts.
- :copyright: 2007 by Georg Brandl, Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl, Armin Ronacher.
+ :license: BSD.
"""
from .util import render_template
diff --git a/sphinx/web/antispam.py b/sphinx/web/antispam.py
index 14fda41b0..ab9f5f666 100644
--- a/sphinx/web/antispam.py
+++ b/sphinx/web/antispam.py
@@ -6,8 +6,8 @@
Small module that performs anti spam tests based on the bad content
regex list provided by moin moin.
- :copyright: 2007 by Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher.
+ :license: BSD.
"""
from __future__ import with_statement
import re
diff --git a/sphinx/web/application.py b/sphinx/web/application.py
index df8069355..5ec11a6f8 100644
--- a/sphinx/web/application.py
+++ b/sphinx/web/application.py
@@ -6,8 +6,8 @@
A simple WSGI application that serves an interactive version
of the python documentation.
- :copyright: 2007 by Georg Brandl, Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl, Armin Ronacher.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/web/database.py b/sphinx/web/database.py
index 3dc5b15e7..c5393bf27 100644
--- a/sphinx/web/database.py
+++ b/sphinx/web/database.py
@@ -9,8 +9,8 @@
usable connection which is also set as the connection for the
thread that called that function.
- :copyright: 2007 by Georg Brandl, Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl, Armin Ronacher.
+ :license: BSD.
"""
import time
import sqlite3
diff --git a/sphinx/web/feed.py b/sphinx/web/feed.py
index cd89ea85c..4a3bf3896 100644
--- a/sphinx/web/feed.py
+++ b/sphinx/web/feed.py
@@ -5,8 +5,8 @@
Nifty module that generates RSS feeds.
- :copyright: 2007 by Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher.
+ :license: BSD.
"""
import time
from datetime import datetime
diff --git a/sphinx/web/mail.py b/sphinx/web/mail.py
index 631ead672..59f30ff31 100644
--- a/sphinx/web/mail.py
+++ b/sphinx/web/mail.py
@@ -6,8 +6,8 @@
A simple module for sending e-mails, based on simplemail.py.
:copyright: 2004-2007 by Gerold Penz.
- 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import os.path
diff --git a/sphinx/web/markup.py b/sphinx/web/markup.py
index 84a82322a..460d139f9 100644
--- a/sphinx/web/markup.py
+++ b/sphinx/web/markup.py
@@ -35,8 +35,8 @@
<quote>cite someone</quote>
Like <blockquote> in HTML.
- :copyright: 2007 by Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher.
+ :license: BSD.
"""
import cgi
import re
diff --git a/sphinx/web/oldurls.py b/sphinx/web/oldurls.py
index fedfb13be..3077c6cfb 100644
--- a/sphinx/web/oldurls.py
+++ b/sphinx/web/oldurls.py
@@ -5,8 +5,8 @@
Handle old URLs gracefully.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
import re
diff --git a/sphinx/web/robots.py b/sphinx/web/robots.py
index 857dc2fc4..b2b26d89b 100644
--- a/sphinx/web/robots.py
+++ b/sphinx/web/robots.py
@@ -5,8 +5,8 @@
robots.txt
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
robots_txt = """\
diff --git a/sphinx/web/serve.py b/sphinx/web/serve.py
index b5ff12552..a1e7d78b4 100644
--- a/sphinx/web/serve.py
+++ b/sphinx/web/serve.py
@@ -7,8 +7,8 @@
automatically. Works with any WSGI application but it won't help in non
`wsgiref` environments. Use it only for development.
- :copyright: 2007 by Armin Ronacher, Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher, Georg Brandl.
+ :license: BSD.
"""
import os
import sys
diff --git a/sphinx/web/userdb.py b/sphinx/web/userdb.py
index 8ce0560df..f9eefd92d 100644
--- a/sphinx/web/userdb.py
+++ b/sphinx/web/userdb.py
@@ -7,8 +7,8 @@
that stores users and their passwords so that they can gain access
to the administration system.
- :copyright: 2007 by Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher.
+ :license: BSD.
"""
from __future__ import with_statement
from os import path
diff --git a/sphinx/web/util.py b/sphinx/web/util.py
index 872ec029b..1723f122b 100644
--- a/sphinx/web/util.py
+++ b/sphinx/web/util.py
@@ -5,8 +5,8 @@
Miscellaneous utilities.
- :copyright: 2007 by Georg Brandl.
- :license: Python license.
+ :copyright: 2007-2008 by Georg Brandl.
+ :license: BSD.
"""
from __future__ import with_statement
diff --git a/sphinx/web/wsgiutil.py b/sphinx/web/wsgiutil.py
index 76575cdf3..3deccbee1 100644
--- a/sphinx/web/wsgiutil.py
+++ b/sphinx/web/wsgiutil.py
@@ -6,8 +6,8 @@
To avoid further dependencies this module collects some of the
classes werkzeug provides and use in other views.
- :copyright: 2007 by Armin Ronacher.
- :license: Python license.
+ :copyright: 2007-2008 by Armin Ronacher.
+ :license: BSD.
"""
from __future__ import with_statement