Fri Jan 11 15:18:20 CET 2008

Author: georg.brandl
Date: Fri Jan 11 15:18:19 2008
New Revision: 59916

Modified:
   doctools/trunk/convert.py
   doctools/trunk/converter/__init__.py
   doctools/trunk/converter/docnodes.py
   doctools/trunk/converter/filenamemap.py
   doctools/trunk/converter/latexparser.py
   doctools/trunk/converter/restwriter.py
   doctools/trunk/converter/tokenizer.py
   doctools/trunk/converter/util.py
   doctools/trunk/sphinx-build.py
   doctools/trunk/sphinx-web.py
   doctools/trunk/sphinx/__init__.py
   doctools/trunk/sphinx/_jinja.py
   doctools/trunk/sphinx/addnodes.py
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/directives.py
   doctools/trunk/sphinx/environment.py
   doctools/trunk/sphinx/highlighting.py
   doctools/trunk/sphinx/htmlhelp.py
   doctools/trunk/sphinx/htmlwriter.py
   doctools/trunk/sphinx/latexwriter.py
   doctools/trunk/sphinx/patchlevel.py
   doctools/trunk/sphinx/refcounting.py
   doctools/trunk/sphinx/roles.py
   doctools/trunk/sphinx/search.py
   doctools/trunk/sphinx/util/__init__.py
   doctools/trunk/sphinx/util/console.py
   doctools/trunk/sphinx/util/json.py
   doctools/trunk/sphinx/web/__init__.py
   doctools/trunk/sphinx/web/admin.py
   doctools/trunk/sphinx/web/antispam.py
   doctools/trunk/sphinx/web/application.py
   doctools/trunk/sphinx/web/database.py
   doctools/trunk/sphinx/web/feed.py
   doctools/trunk/sphinx/web/mail.py
   doctools/trunk/sphinx/web/markup.py
   doctools/trunk/sphinx/web/oldurls.py
   doctools/trunk/sphinx/web/robots.py
   doctools/trunk/sphinx/web/serve.py
   doctools/trunk/sphinx/web/userdb.py
   doctools/trunk/sphinx/web/util.py
   doctools/trunk/sphinx/web/wsgiutil.py
Log:
Update copyright years and change license to BSD.


Modified: doctools/trunk/convert.py
==============================================================================

--- doctools/trunk/convert.py	(original)
+++ doctools/trunk/convert.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/converter/__init__.py
==============================================================================
--- doctools/trunk/converter/__init__.py	(original)
+++ doctools/trunk/converter/__init__.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/converter/docnodes.py
==============================================================================
--- doctools/trunk/converter/docnodes.py	(original)
+++ doctools/trunk/converter/docnodes.py	Fri Jan 11 15:18:19 2008
@@ -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.
 """
 
 

Modified: doctools/trunk/converter/filenamemap.py
==============================================================================
--- doctools/trunk/converter/filenamemap.py	(original)
+++ doctools/trunk/converter/filenamemap.py	Fri Jan 11 15:18:19 2008
@@ -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.

Modified: doctools/trunk/converter/latexparser.py
==============================================================================
--- doctools/trunk/converter/latexparser.py	(original)
+++ doctools/trunk/converter/latexparser.py	Fri Jan 11 15:18:19 2008
@@ -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, \

Modified: doctools/trunk/converter/restwriter.py
==============================================================================
--- doctools/trunk/converter/restwriter.py	(original)
+++ doctools/trunk/converter/restwriter.py	Fri Jan 11 15:18:19 2008
@@ -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!

Modified: doctools/trunk/converter/tokenizer.py
==============================================================================
--- doctools/trunk/converter/tokenizer.py	(original)
+++ doctools/trunk/converter/tokenizer.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/converter/util.py
==============================================================================
--- doctools/trunk/converter/util.py	(original)
+++ doctools/trunk/converter/util.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx-build.py
==============================================================================
--- doctools/trunk/sphinx-build.py	(original)
+++ doctools/trunk/sphinx-build.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx-web.py
==============================================================================
--- doctools/trunk/sphinx-web.py	(original)
+++ doctools/trunk/sphinx-web.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/__init__.py
==============================================================================
--- doctools/trunk/sphinx/__init__.py	(original)
+++ doctools/trunk/sphinx/__init__.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/_jinja.py
==============================================================================
--- doctools/trunk/sphinx/_jinja.py	(original)
+++ doctools/trunk/sphinx/_jinja.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/addnodes.py
==============================================================================
--- doctools/trunk/sphinx/addnodes.py	(original)
+++ doctools/trunk/sphinx/addnodes.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/directives.py
==============================================================================
--- doctools/trunk/sphinx/directives.py	(original)
+++ doctools/trunk/sphinx/directives.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/environment.py
==============================================================================
--- doctools/trunk/sphinx/environment.py	(original)
+++ doctools/trunk/sphinx/environment.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/highlighting.py
==============================================================================
--- doctools/trunk/sphinx/highlighting.py	(original)
+++ doctools/trunk/sphinx/highlighting.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/htmlhelp.py
==============================================================================
--- doctools/trunk/sphinx/htmlhelp.py	(original)
+++ doctools/trunk/sphinx/htmlhelp.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/htmlwriter.py
==============================================================================
--- doctools/trunk/sphinx/htmlwriter.py	(original)
+++ doctools/trunk/sphinx/htmlwriter.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/latexwriter.py
==============================================================================
--- doctools/trunk/sphinx/latexwriter.py	(original)
+++ doctools/trunk/sphinx/latexwriter.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/patchlevel.py
==============================================================================
--- doctools/trunk/sphinx/patchlevel.py	(original)
+++ doctools/trunk/sphinx/patchlevel.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/refcounting.py
==============================================================================
--- doctools/trunk/sphinx/refcounting.py	(original)
+++ doctools/trunk/sphinx/refcounting.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/roles.py
==============================================================================
--- doctools/trunk/sphinx/roles.py	(original)
+++ doctools/trunk/sphinx/roles.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/search.py
==============================================================================
--- doctools/trunk/sphinx/search.py	(original)
+++ doctools/trunk/sphinx/search.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/util/__init__.py
==============================================================================
--- doctools/trunk/sphinx/util/__init__.py	(original)
+++ doctools/trunk/sphinx/util/__init__.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/util/console.py
==============================================================================
--- doctools/trunk/sphinx/util/console.py	(original)
+++ doctools/trunk/sphinx/util/console.py	Fri Jan 11 15:18:19 2008
@@ -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 = {}

Modified: doctools/trunk/sphinx/util/json.py
==============================================================================
--- doctools/trunk/sphinx/util/json.py	(original)
+++ doctools/trunk/sphinx/util/json.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/__init__.py
==============================================================================
--- doctools/trunk/sphinx/web/__init__.py	(original)
+++ doctools/trunk/sphinx/web/__init__.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/admin.py
==============================================================================
--- doctools/trunk/sphinx/web/admin.py	(original)
+++ doctools/trunk/sphinx/web/admin.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/antispam.py
==============================================================================
--- doctools/trunk/sphinx/web/antispam.py	(original)
+++ doctools/trunk/sphinx/web/antispam.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/application.py
==============================================================================
--- doctools/trunk/sphinx/web/application.py	(original)
+++ doctools/trunk/sphinx/web/application.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/web/database.py
==============================================================================
--- doctools/trunk/sphinx/web/database.py	(original)
+++ doctools/trunk/sphinx/web/database.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/feed.py
==============================================================================
--- doctools/trunk/sphinx/web/feed.py	(original)
+++ doctools/trunk/sphinx/web/feed.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/mail.py
==============================================================================
--- doctools/trunk/sphinx/web/mail.py	(original)
+++ doctools/trunk/sphinx/web/mail.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/markup.py
==============================================================================
--- doctools/trunk/sphinx/web/markup.py	(original)
+++ doctools/trunk/sphinx/web/markup.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/oldurls.py
==============================================================================
--- doctools/trunk/sphinx/web/oldurls.py	(original)
+++ doctools/trunk/sphinx/web/oldurls.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/robots.py
==============================================================================
--- doctools/trunk/sphinx/web/robots.py	(original)
+++ doctools/trunk/sphinx/web/robots.py	Fri Jan 11 15:18:19 2008
@@ -5,8 +5,8 @@
 
     robots.txt
 
-    :copyright: 2007 by Georg Brandl.
-    :license: Python license.
+    :copyright: 2007-2008 by Georg Brandl.
+    :license: BSD.
 """
 
 robots_txt = """\

Modified: doctools/trunk/sphinx/web/serve.py
==============================================================================
--- doctools/trunk/sphinx/web/serve.py	(original)
+++ doctools/trunk/sphinx/web/serve.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/userdb.py
==============================================================================
--- doctools/trunk/sphinx/web/userdb.py	(original)
+++ doctools/trunk/sphinx/web/userdb.py	Fri Jan 11 15:18:19 2008
@@ -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

Modified: doctools/trunk/sphinx/web/util.py
==============================================================================
--- doctools/trunk/sphinx/web/util.py	(original)
+++ doctools/trunk/sphinx/web/util.py	Fri Jan 11 15:18:19 2008
@@ -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
 

Modified: doctools/trunk/sphinx/web/wsgiutil.py
==============================================================================
--- doctools/trunk/sphinx/web/wsgiutil.py	(original)
+++ doctools/trunk/sphinx/web/wsgiutil.py	Fri Jan 11 15:18:19 2008
@@ -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
 
