changeset 24:335d7489a074

make license strings more consistent, refer to LICENSE.txt MoinMoin ever was licensed under "GNU GPL v2 (or any later version)", so this change is NOT a license change, just making things more clear and more consistent. All references to moin's license now use an identical string, this makes license detection easier.
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 27 Feb 2011 01:12:24 +0100
parents 74eecd2b3b6b
children 3e888522973b
files MoinMoin/__init__.py MoinMoin/_template.py MoinMoin/_tests/__init__.py MoinMoin/_tests/_test_template.py MoinMoin/_tests/ldap_testbase.py MoinMoin/_tests/maketestwiki.py MoinMoin/_tests/test_error.py MoinMoin/_tests/test_test_environ.py MoinMoin/_tests/test_user.py MoinMoin/_tests/test_wikiutil.py MoinMoin/_tests/wikiconfig.py MoinMoin/app.py MoinMoin/apps/admin/__init__.py MoinMoin/apps/admin/views.py MoinMoin/apps/feed/__init__.py MoinMoin/apps/feed/_tests/test_feed.py MoinMoin/apps/feed/views.py MoinMoin/apps/frontend/__init__.py MoinMoin/apps/frontend/_tests/test_frontend.py MoinMoin/apps/frontend/views.py MoinMoin/apps/misc/__init__.py MoinMoin/apps/misc/_tests/test_misc.py MoinMoin/apps/misc/views.py MoinMoin/apps/serve/__init__.py MoinMoin/apps/serve/views.py MoinMoin/auth/__init__.py MoinMoin/auth/_tests/test_ldap_login.py MoinMoin/auth/http.py MoinMoin/auth/ldap_login.py MoinMoin/auth/log.py MoinMoin/auth/openidrp.py MoinMoin/auth/smb_mount.py MoinMoin/config/__init__.py MoinMoin/config/_tests/test_defaultconfig.py MoinMoin/config/default.py MoinMoin/conftest.py MoinMoin/converter/__init__.py MoinMoin/converter/_args.py MoinMoin/converter/_args_wiki.py MoinMoin/converter/_table.py MoinMoin/converter/_tests/test__args.py MoinMoin/converter/_tests/test__args_wiki.py MoinMoin/converter/_tests/test__wiki_macro.py MoinMoin/converter/_tests/test_creole_in.py MoinMoin/converter/_tests/test_docbook_in.py MoinMoin/converter/_tests/test_docbook_out.py MoinMoin/converter/_tests/test_html_in.py MoinMoin/converter/_tests/test_html_in_out.py MoinMoin/converter/_tests/test_html_out.py MoinMoin/converter/_tests/test_include.py MoinMoin/converter/_tests/test_link.py MoinMoin/converter/_tests/test_mediawiki_in.py MoinMoin/converter/_tests/test_moinwiki19_in.py MoinMoin/converter/_tests/test_moinwiki_in.py MoinMoin/converter/_tests/test_moinwiki_in_out.py MoinMoin/converter/_tests/test_moinwiki_out.py MoinMoin/converter/_tests/test_rst_in.py MoinMoin/converter/_tests/test_rst_out.py MoinMoin/converter/_tests/test_smiley.py MoinMoin/converter/_wiki_macro.py MoinMoin/converter/archive_in.py MoinMoin/converter/audio_video_in.py MoinMoin/converter/creole_in.py MoinMoin/converter/docbook_in.py MoinMoin/converter/docbook_out.py MoinMoin/converter/everything.py MoinMoin/converter/highlight.py MoinMoin/converter/html_in.py MoinMoin/converter/html_out.py MoinMoin/converter/image_in.py MoinMoin/converter/include.py MoinMoin/converter/link.py MoinMoin/converter/macro.py MoinMoin/converter/mediawiki_in.py MoinMoin/converter/moinwiki19_in.py MoinMoin/converter/moinwiki_in.py MoinMoin/converter/moinwiki_out.py MoinMoin/converter/nonexistent_in.py MoinMoin/converter/pygments_in.py MoinMoin/converter/rst_in.py MoinMoin/converter/rst_out.py MoinMoin/converter/smiley.py MoinMoin/converter/text_csv_in.py MoinMoin/converter/text_in.py MoinMoin/datastruct/__init__.py MoinMoin/datastruct/backends/__init__.py MoinMoin/datastruct/backends/_tests/__init__.py MoinMoin/datastruct/backends/_tests/test_composite_dicts.py MoinMoin/datastruct/backends/_tests/test_composite_groups.py MoinMoin/datastruct/backends/_tests/test_config_dicts.py MoinMoin/datastruct/backends/_tests/test_config_groups.py MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py MoinMoin/datastruct/backends/_tests/test_wiki_groups.py MoinMoin/datastruct/backends/composite_dicts.py MoinMoin/datastruct/backends/composite_groups.py MoinMoin/datastruct/backends/config_dicts.py MoinMoin/datastruct/backends/config_groups.py MoinMoin/datastruct/backends/config_lazy_groups.py MoinMoin/datastruct/backends/wiki_dicts.py MoinMoin/datastruct/backends/wiki_groups.py MoinMoin/error.py MoinMoin/i18n/__init__.py MoinMoin/items/__init__.py MoinMoin/items/_tests/test_Item.py MoinMoin/log.py MoinMoin/macro/Anchor.py MoinMoin/macro/Date.py MoinMoin/macro/DateTime.py MoinMoin/macro/EditedSystemPages.py MoinMoin/macro/GetText.py MoinMoin/macro/GetVal.py MoinMoin/macro/GoTo.py MoinMoin/macro/HighlighterList.py MoinMoin/macro/InterWiki.py MoinMoin/macro/MailTo.py MoinMoin/macro/PageCount.py MoinMoin/macro/PageSize.py MoinMoin/macro/PagenameList.py MoinMoin/macro/RandomItem.py MoinMoin/macro/TemplateList.py MoinMoin/macro/Verbatim.py MoinMoin/macro/WikiConfig.py MoinMoin/macro/WikiConfigHelp.py MoinMoin/macro/__init__.py MoinMoin/macro/_base.py MoinMoin/macro/_tests/test__base.py MoinMoin/mail/__init__.py MoinMoin/mail/_tests/test_sendmail.py MoinMoin/mail/sendmail.py MoinMoin/script/__init__.py MoinMoin/script/account/__init__.py MoinMoin/script/account/create.py MoinMoin/script/account/disable.py MoinMoin/script/account/resetpw.py MoinMoin/script/index/__init__.py MoinMoin/script/index/build.py MoinMoin/script/maint/__init__.py MoinMoin/script/maint/reduce_revisions.py MoinMoin/script/maint/set_meta.py MoinMoin/script/maint/xml.py MoinMoin/script/migration/__init__.py MoinMoin/script/migration/backend.py MoinMoin/script/moin.py MoinMoin/script/old/__init__.py MoinMoin/script/old/print_stats.py MoinMoin/search/Xapian/__init__.py MoinMoin/search/Xapian/indexing.py MoinMoin/search/Xapian/search.py MoinMoin/search/Xapian/tokenizer.py MoinMoin/search/__init__.py MoinMoin/search/_tests/test_search.py MoinMoin/search/_tests/test_wiki_analyzer.py MoinMoin/search/builtin.py MoinMoin/search/queryparser/__init__.py MoinMoin/search/queryparser/expressions.py MoinMoin/search/results.py MoinMoin/search/term.py MoinMoin/security/__init__.py MoinMoin/security/_tests/test_security.py MoinMoin/security/_tests/test_ticket.py MoinMoin/security/textcha.py MoinMoin/security/ticket.py MoinMoin/signalling/__init__.py MoinMoin/signalling/log.py MoinMoin/signalling/signals.py MoinMoin/storage/__init__.py MoinMoin/storage/_tests/test_backends.py MoinMoin/storage/_tests/test_backends_flatfile.py MoinMoin/storage/_tests/test_backends_fs.py MoinMoin/storage/_tests/test_backends_fs19.py MoinMoin/storage/_tests/test_backends_fs2.py MoinMoin/storage/_tests/test_backends_hg.py MoinMoin/storage/_tests/test_backends_memory.py MoinMoin/storage/_tests/test_backends_router.py MoinMoin/storage/_tests/test_backends_sqla.py MoinMoin/storage/_tests/test_middleware_acl.py MoinMoin/storage/_tests/test_serialization.py MoinMoin/storage/_tests/tests_backend_api.py MoinMoin/storage/backends/__init__.py MoinMoin/storage/backends/_flatutils.py MoinMoin/storage/backends/_fsutils.py MoinMoin/storage/backends/acl.py MoinMoin/storage/backends/fileserver.py MoinMoin/storage/backends/flatfile.py MoinMoin/storage/backends/fs.py MoinMoin/storage/backends/fs19.py MoinMoin/storage/backends/fs19_logfile.py MoinMoin/storage/backends/fs2.py MoinMoin/storage/backends/hg.py MoinMoin/storage/backends/indexing.py MoinMoin/storage/backends/memory.py MoinMoin/storage/backends/router.py MoinMoin/storage/backends/sqla.py MoinMoin/storage/error.py MoinMoin/storage/serialization.py MoinMoin/themes/__init__.py MoinMoin/themes/_tests/test_navi_bar.py MoinMoin/user.py MoinMoin/util/__init__.py MoinMoin/util/_tests/test_diff3.py MoinMoin/util/_tests/test_diff_text.py MoinMoin/util/_tests/test_filesys.py MoinMoin/util/_tests/test_interwiki.py MoinMoin/util/_tests/test_iri.py MoinMoin/util/_tests/test_lock.py MoinMoin/util/_tests/test_mime.py MoinMoin/util/_tests/test_paramparser.py MoinMoin/util/_tests/test_pysupport.py MoinMoin/util/_tests/test_registry.py MoinMoin/util/_tests/test_tree.py MoinMoin/util/_tests/test_util.py MoinMoin/util/_tests/test_version.py MoinMoin/util/chartypes_create.py MoinMoin/util/clock.py MoinMoin/util/diff3.py MoinMoin/util/diff_html.py MoinMoin/util/diff_text.py MoinMoin/util/filesys.py MoinMoin/util/interwiki.py MoinMoin/util/iri.py MoinMoin/util/lock.py MoinMoin/util/mime.py MoinMoin/util/paramparser.py MoinMoin/util/plugins.py MoinMoin/util/profile.py MoinMoin/util/pysupport.py MoinMoin/util/python_compatibility.py MoinMoin/util/registry.py MoinMoin/util/thread_monitor.py MoinMoin/util/tree.py MoinMoin/util/version.py MoinMoin/wikiutil.py
diffstat 233 files changed, 234 insertions(+), 234 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2000-2006 by Juergen Hermann <jh@web.de>,
             2002-2011 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/_template.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_template.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     <what this stuff does ... - verbose enough>
 
     @copyright: 2011 MoinMoin:YourNameHere
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/_tests/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     @copyright: 2007 MoinMoin:KarolNowak,
                 2008 MoinMoin:ThomasWaldmann,
                 2008, 2010 MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, shutil
--- a/MoinMoin/_tests/_test_template.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/_test_template.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
                 2007 MoinMoin:AlexanderSchremmer
                 2009 MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 # include here the module that you want to test:
--- a/MoinMoin/_tests/ldap_testbase.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/ldap_testbase.py	Sun Feb 27 01:12:24 2011 +0100
@@ -32,7 +32,7 @@
     # /etc/init.d/apparmor stop
 
     @copyright: 2008 by Thomas Waldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 SLAPD_EXECUTABLE = 'slapd'  # filename of LDAP server executable - if it is not
--- a/MoinMoin/_tests/maketestwiki.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/maketestwiki.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     maketestwiki.py
 
 @copyright: 2005 by Thomas Waldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, sys, shutil, errno
--- a/MoinMoin/_tests/test_error.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/test_error.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 
     @copyright: 2003-2004 by Nir Soffer <nirs AT freeshell DOT org>,
                 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/_tests/test_test_environ.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/test_test_environ.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - Tests for our test environment
 
     @copyright: 2009 by MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/_tests/test_user.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/test_user.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 
     @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
                 2009 by ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/_tests/test_wikiutil.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/test_wikiutil.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
                 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/_tests/wikiconfig.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/_tests/wikiconfig.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
 work without setting them (like data_dir).
 
 @copyright: 2000-2004 by Juergen Hermann <jh@web.de>
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/app.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/app.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
             2002-2011 MoinMoin:ThomasWaldmann,
             2008 MoinMoin:FlorianKrupicka,
             2010 MoinMoin:DiogenesAugusto
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 import os
 
--- a/MoinMoin/apps/admin/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/admin/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This package contains all views, templates, static files for wiki administration.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import Module
--- a/MoinMoin/apps/admin/views.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/admin/views.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
                 2001-2003 Juergen Hermann <jh@web.de>,
                 2010 MoinMoin:DiogenesAugusto,
                 2010 MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import request, url_for, flash, redirect
--- a/MoinMoin/apps/feed/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/feed/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     (like atom, ...).
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import Module
--- a/MoinMoin/apps/feed/_tests/test_feed.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/feed/_tests/test_feed.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - basic tests for feeds
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 class TestFeeds(object):
--- a/MoinMoin/apps/feed/views.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/feed/views.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
                 2010 MoinMoin:DiogenesAugusto
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from datetime import datetime
--- a/MoinMoin/apps/frontend/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/frontend/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     user usually sees.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import Module
--- a/MoinMoin/apps/frontend/_tests/test_frontend.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/frontend/_tests/test_frontend.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     MoinMoin - basic tests for frontend
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 from MoinMoin.apps.frontend import views
 from werkzeug import ImmutableMultiDict
--- a/MoinMoin/apps/frontend/views.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/frontend/views.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     @copyright: 2003-2010 MoinMoin:ThomasWaldmann,
                 2008 MoinMoin:FlorianKrupicka,
                 2010 MoinMoin:DiogenesAugusto
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
@@ -1363,7 +1363,7 @@
 
     @copyright: 2001 Richard Jones <richard@bizarsoftware.com.au>,
                 2001 Juergen Hermann <jh@web.de>
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
     """
     start, end, matches = findMatches(item_name)
     keys = matches.keys()
--- a/MoinMoin/apps/misc/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/misc/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This package contains misc. stuff that doesn't fit into another view category.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import Module
--- a/MoinMoin/apps/misc/_tests/test_misc.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/misc/_tests/test_misc.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - basic tests for misc views
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 class TestMisc(object):
--- a/MoinMoin/apps/misc/views.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/misc/views.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     Misc. stuff that doesn't fit into another view category.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import time
--- a/MoinMoin/apps/serve/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/serve/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     filesystem outside of moin.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import Module
--- a/MoinMoin/apps/serve/views.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/apps/serve/views.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - external static file serving
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import Response, abort
--- a/MoinMoin/auth/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -126,7 +126,7 @@
                 2005-2009 MoinMoin:ThomasWaldmann,
                 2007      MoinMoin:JohannesBerg
 
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/auth/_tests/test_ldap_login.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/_tests/test_ldap_login.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     @copyright: 2008 MoinMoin:ThomasWaldmann,
                 2010 MoinMoin:ReimarBauer
 
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/auth/http.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/http.py	Sun Feb 27 01:12:24 2011 +0100
@@ -15,7 +15,7 @@
     auth_methods_trusted = ['http', ]
 
     @copyright: 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/auth/ldap_login.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/ldap_login.py	Sun Feb 27 01:12:24 2011 +0100
@@ -14,7 +14,7 @@
 
     @copyright: 2006-2008 MoinMoin:ThomasWaldmann,
                 2006 Nick Phillips
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/auth/log.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/log.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     logged, of course).
 
     @copyright: 2006-2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/auth/openidrp.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/openidrp.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This code handles login requests for openid multistage authentication.
 
     @copyright: 2010 MoinMoin:Nichita Utiu
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/auth/smb_mount.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/auth/smb_mount.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
 
     @copyright: 2006-2008 MoinMoin:ThomasWaldmann
                 2007 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/config/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/config/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - site-wide configuration defaults (NOT per single wiki!)
 
     @copyright: 2005-2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 import re
 
--- a/MoinMoin/config/_tests/test_defaultconfig.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/config/_tests/test_defaultconfig.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.config.default Tests
 
     @copyright: 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/config/default.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/config/default.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
                 2005-2010 MoinMoin:ThomasWaldmann,
                 2008      MoinMoin:JohannesBerg,
                 2010      MoinMoin:DiogenesAugusto
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/conftest.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/conftest.py	Sun Feb 27 01:12:24 2011 +0100
@@ -12,7 +12,7 @@
 @copyright: 2005 MoinMoin:NirSoffer,
             2007 MoinMoin:AlexanderSchremmer,
             2008 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 # exclude some directories from py.test test discovery, pathes relative to this file
--- a/MoinMoin/converter/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -14,7 +14,7 @@
 TODO: Merge with new-style macros.
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from ..util.registry import RegistryBase
--- a/MoinMoin/converter/_args.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_args.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Arguments wrapper
 
 @copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/converter/_args_wiki.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_args_wiki.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Arguments support for wiki formats
 
 @copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/_table.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_table.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - table data to DOM conversion support
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/_tests/test__args.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test__args.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter._args
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test__args_wiki.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test__args_wiki.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter._args_wiki
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test__wiki_macro.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test__wiki_macro.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter._wiki_macro
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_creole_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_creole_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.creole_in
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_docbook_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_docbook_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 MoinMoin - Tests for MoinMoin.converter.docbook_in
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/converter/_tests/test_docbook_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_docbook_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.docbook_out
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/converter/_tests/test_html_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_html_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.html_in
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/converter/_tests/test_html_in_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_html_in_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
            It will check that roundtrip conversion is working well.
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import StringIO
--- a/MoinMoin/converter/_tests/test_html_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_html_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2007 MoinMoin:BastianBlank
             2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/converter/_tests/test_include.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_include.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.include
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_link.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_link.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.link
 
 @copyright: 2007 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_mediawiki_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_mediawiki_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_moinwiki19_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki19_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.moinwiki19_in
 
 @copyright: 2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_moinwiki_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.moinwiki_in
 
 @copyright: 2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_moinwiki_in_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki_in_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_moinwiki_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 MoinMoin - Tests for MoinMoin.converter.moinwiki_out
 
 @copyright: 2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_rst_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_rst_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_rst_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_rst_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.rst_out
 
 @copyright: 2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/converter/_tests/test_smiley.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_tests/test_smiley.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.converter.smiley
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/converter/_wiki_macro.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/_wiki_macro.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Base class for wiki parser with macro support.
 
 @copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/converter/archive_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/archive_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Make a DOM Tree representation of an archive (== list contents of it in a table).
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from datetime import datetime
--- a/MoinMoin/converter/audio_video_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/audio_video_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
 Note: currently this is quite same as image_in.
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/converter/creole_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/creole_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -18,7 +18,7 @@
     @copyright: 2007 MoinMoin:RadomirDopieralski (creole 0.5 implementation),
                 2007 MoinMoin:ThomasWaldmann (updates)
                 2008-2010 MoinMoin:BastianBlank
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/docbook_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/docbook_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -9,7 +9,7 @@
   * ulink
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/docbook_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/docbook_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 
 @copyright: 2010 MoinMoin:ValentinJaniaut,
             table conversion based on html_out table conversion by Bastian Blank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/everything.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/everything.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Convert any item to a DOM Tree (we just create a link to download it).
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/converter/highlight.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/highlight.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Text highlighting converter
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/html_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/html_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 TODO : Add support for style
 
 @copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/html_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/html_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank
             2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/image_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/image_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Convert image to <object> tag for the DOM Tree.
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/converter/include.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/include.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank,
             2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/link.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/link.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 special wiki links.
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/macro.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/macro.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Expands all macro elements in a internal Moin document.
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/mediawiki_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/mediawiki_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
             2007 MoinMoin:ReimarBauer,
             2008-2010 MoinMoin:BastianBlank
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/moinwiki19_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/moinwiki19_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
             2006-2008 MoinMoin:ThomasWaldmann,
             2007 MoinMoin:ReimarBauer,
             2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/moinwiki_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/moinwiki_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
             2006-2008 MoinMoin:ThomasWaldmann,
             2007 MoinMoin:ReimarBauer,
             2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/moinwiki_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/moinwiki_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/nonexistent_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/nonexistent_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Convert a non-existent item to the DOM Tree.
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/converter/pygments_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/pygments_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank,
             2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/rst_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/rst_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -11,7 +11,7 @@
             2004 Matthew Gilbert <gilbert AT voxmea DOT net>,
             2004 Alexander Schremmer <alex AT alexanderweb DOT de>
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/rst_out.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/rst_out.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
 
 @copyright: 2008 MoinMoin:BastianBlank
             2010 MoinMoin:DmitryAndreev
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/smiley.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/smiley.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
 
 @copyright: 2010 MoinMoin:ValentinJaniaut,
             2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/converter/text_csv_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/text_csv_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - CSV text data to DOM converter
 
 @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/converter/text_in.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/converter/text_in.py	Sun Feb 27 01:12:24 2011 +0100
@@ -9,7 +9,7 @@
 
 @copyright: 2008 MoinMoin:ThomasWaldmann,
             2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import absolute_import
--- a/MoinMoin/datastruct/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - datastruct (groups and dicts) support.
 
 @copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends.wiki_dicts import WikiDicts
--- a/MoinMoin/datastruct/backends/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - base classes for datastructs.
 
 @copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from UserDict import DictMixin
--- a/MoinMoin/datastruct/backends/_tests/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
                 2007 by MoinMoin:ThomasWaldmann
                 2008 by MoinMoin:MelitaMihaljevic
                 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
 
--- a/MoinMoin/datastruct/backends/_tests/test_composite_dicts.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_composite_dicts.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 
 @copyright: 2009 MoinMoin:DmitrijsMilajevs
             2008 MoinMoin: MelitaMihaljevic
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from py.test import raises
--- a/MoinMoin/datastruct/backends/_tests/test_composite_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_composite_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 MoinMoin.datastruct.backends.composite_groups test
 
 @copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from py.test import raises
--- a/MoinMoin/datastruct/backends/_tests/test_config_dicts.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_config_dicts.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.backends.config_dicts tests
 
     @copyright: 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from  MoinMoin.datastruct.backends._tests import DictsBackendTest
--- a/MoinMoin/datastruct/backends/_tests/test_config_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_config_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.backends.config_groups tests
 
     @copyright: 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends._tests import GroupsBackendTest
--- a/MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.backends.config_lazy_groups tests
 
     @copyright: 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends._tests import GroupsBackendTest
--- a/MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
                 2007 by MoinMoin:ThomasWaldmann,
                 2009 by MoinMoin:DmitrijsMilajevs,
                 2010 by MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends._tests import DictsBackendTest
--- a/MoinMoin/datastruct/backends/_tests/test_wiki_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_wiki_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
             2008 by MoinMoin:MelitaMihaljevic,
             2009 by MoinMoin:DmitrijsMilajevs,
             2010 by MoinMoin:ReimarBauer
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/datastruct/backends/composite_dicts.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/composite_dicts.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - dict access via various backends.
 
 @copyright: 2009 DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends import BaseDictsBackend, DictDoesNotExistError
--- a/MoinMoin/datastruct/backends/composite_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/composite_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
 backends.
 
 @copyright: 2009 DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends import BaseGroupsBackend, GroupDoesNotExistError
--- a/MoinMoin/datastruct/backends/config_dicts.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/config_dicts.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 The config group backend enables you to define dicts in a configuration file.
 
 @copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends import BaseDict, BaseDictsBackend, DictDoesNotExistError
--- a/MoinMoin/datastruct/backends/config_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/config_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 members in a configuration file.
 
 @copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends import GreedyGroup, BaseGroupsBackend, GroupDoesNotExistError
--- a/MoinMoin/datastruct/backends/config_lazy_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/config_lazy_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -8,7 +8,7 @@
     should be based on this concept.
 
     @copyright: 2009 MoinMoin:DmitrijsMilajevs
-    @license: GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.datastruct.backends import LazyGroup, LazyGroupsBackend
--- a/MoinMoin/datastruct/backends/wiki_dicts.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/wiki_dicts.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
                 2003 by Gustavo Niemeyer,
                 2009 MoinMoin:DmitrijsMilajevs,
                 2010 MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/datastruct/backends/wiki_groups.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/datastruct/backends/wiki_groups.py	Sun Feb 27 01:12:24 2011 +0100
@@ -11,7 +11,7 @@
 @copyright: 2008 MoinMoin:ThomasWaldmann,
             2009 MoinMoin:DmitrijsMilajevs,
             2010 MoinMoin:ReimarBauer
-@license: GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 from flask import flaskg
 from MoinMoin.items import USERGROUP
--- a/MoinMoin/error.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/error.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     Supply Error class and sub classes used to raise various errors
 
     @copyright: 2004-2005 Nir Soffer <nirs@freeshell.org>
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import sys
--- a/MoinMoin/i18n/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/i18n/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -10,7 +10,7 @@
 L_ == lazy_gettext
 
 @copyright: 2011 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import current_app, request, flaskg
--- a/MoinMoin/items/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/items/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -11,7 +11,7 @@
                 2009 MoinMoin:BastianBlank,
                 2010 MoinMoin:ValentinJaniaut,
                 2010 MoinMoin:DiogenesAugusto
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, re, time, datetime, shutil, base64
--- a/MoinMoin/items/_tests/test_Item.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/items/_tests/test_Item.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.items Tests
 
     @copyright: 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/log.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/log.py	Sun Feb 27 01:12:24 2011 +0100
@@ -48,7 +48,7 @@
 
     @copyright: 2008 MoinMoin:ThomasWaldmann,
                 2007 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 # This is the "last resort" fallback logging configuration for the case
--- a/MoinMoin/macro/Anchor.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/Anchor.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - Anchor Macro to put an anchor at the place where it is used.
 
     @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util.tree import moin_page
--- a/MoinMoin/macro/Date.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/Date.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     adapted to the TZ settings of the user viewing the content.
 
     @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import time
--- a/MoinMoin/macro/DateTime.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/DateTime.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     adapted to the TZ settings of the user viewing the content.
 
     @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/macro/EditedSystemPages.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/EditedSystemPages.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2004 Nir Soffer <nirs@freeshell.org>,
                 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/macro/GetText.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/GetText.py	Sun Feb 27 01:12:24 2011 +0100
@@ -8,7 +8,7 @@
 
     @copyright: 2001 Juergen Hermann <jh@web.de>,
                 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.i18n import _, L_, N_
--- a/MoinMoin/macro/GetVal.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/GetVal.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin GetVal macro - gets a value for a specified key from a dict.
 
     @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/macro/GoTo.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/GoTo.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Provides a goto box.
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/macro/HighlighterList.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/HighlighterList.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
 
     @copyright: 2009 MoinMoin:EugeneSyromyatnikov,
                 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import pygments.lexers
--- a/MoinMoin/macro/InterWiki.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/InterWiki.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     Outputs the interwiki map.
 
     @copyright: 2007-2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import current_app as app
--- a/MoinMoin/macro/MailTo.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/MailTo.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     link for logged in users or an obfuscated display as given as the macro argument.
 
     @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/macro/PageCount.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/PageCount.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2007 MoinMoin:ThomasWaldmann
     @copyright: 2008 MoinMoin:BastianBlank
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.macro._base import MacroInlineBase
--- a/MoinMoin/macro/PageSize.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/PageSize.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2002 Juergen Hermann <jh@web.de>,
                 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.Page import Page
--- a/MoinMoin/macro/PagenameList.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/PagenameList.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     Note: PageList is a similar thing using the search engine.
 
     @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/macro/RandomItem.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/RandomItem.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
     @copyright: 2000 Juergen Hermann <jh@web.de>,
                 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import random
--- a/MoinMoin/macro/TemplateList.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/TemplateList.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     TemplateList - compatibility wrapper around PagenameList
 
     @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.macro.PagenameList import Macro as PNLMacro
--- a/MoinMoin/macro/Verbatim.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/Verbatim.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     Outputs the text verbatimly.
 
     @copyright: 2005-2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.macro._base import MacroInlineBase
--- a/MoinMoin/macro/WikiConfig.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/WikiConfig.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2008 MoinMoin:JohannesBerg,
                 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import current_app as app
--- a/MoinMoin/macro/WikiConfigHelp.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/WikiConfigHelp.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2008 MoinMoin:JohannesBerg,
                 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.i18n import _, L_, N_
--- a/MoinMoin/macro/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -9,7 +9,7 @@
 TODO: Merge with converters
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import pysupport
--- a/MoinMoin/macro/_base.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/_base.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Macro base class
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import iri
--- a/MoinMoin/macro/_tests/test__base.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/macro/_tests/test__base.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.macro._base
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/mail/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/mail/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,6 +4,6 @@
     Subpackage containing e-mail support code.
 
     @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
--- a/MoinMoin/mail/_tests/test_sendmail.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/mail/_tests/test_sendmail.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     MoinMoin - MoinMoin.mail.sendmail Tests
 
     @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from email.Charset import Charset, QP
--- a/MoinMoin/mail/sendmail.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/mail/sendmail.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 
     @copyright: 2003 Juergen Hermann <jh@web.de>,
                 2008-2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, re
--- a/MoinMoin/script/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2000-2002 Juergen Hermann <jh@web.de>,
                 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, sys, time
--- a/MoinMoin/script/account/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/account/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,5 +2,5 @@
     MoinMoin - User Accounts Management Scripts
 
     @copyright: 2006,2011 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
--- a/MoinMoin/script/account/create.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/account/create.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2006 MoinMoin:ThomasWaldmann,
             2011 MoinMoin:ReimarBauer
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/script/account/disable.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/account/disable.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 @copyright: 2006 MoinMoin:ThomasWaldmann,
             2011 MoinMoin:ReimarBauer
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/script/account/resetpw.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/account/resetpw.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 @copyright: 2006 MoinMoin:ThomasWaldmann,
             2008 MoinMoin:JohannesBerg,
             2011 MoinMoin:ReimarBauer
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/script/index/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/index/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     fixed to not confuse it with the xapian.org "xapian" module.
 
     @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import pysupport
--- a/MoinMoin/script/index/build.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/index/build.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - build xapian search engine's index
 
 @copyright: 2006-2009 MoinMoin:ThomasWaldmann
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/script/maint/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/maint/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - Maintenance Script Package
 
     @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import pysupport
--- a/MoinMoin/script/maint/reduce_revisions.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/maint/reduce_revisions.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
     @copyright: 2009 MoinMoin:ChristopherDenter,
                 2011 MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/script/maint/set_meta.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/maint/set_meta.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
 
     @copyright: 2009 MoinMoin:ChristopherDenter,
                 2011 MoinMoin:ReimarBauer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/script/maint/xml.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/maint/xml.py	Sun Feb 27 01:12:24 2011 +0100
@@ -10,7 +10,7 @@
 
     @copyright: 2009 MoinMoin:ChristopherDenter,
                 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import sys, time
--- a/MoinMoin/script/migration/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/migration/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - Migration Script Package
 
     @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import pysupport
--- a/MoinMoin/script/migration/backend.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/migration/backend.py	Sun Feb 27 01:12:24 2011 +0100
@@ -9,7 +9,7 @@
 
     @copyright: 2008 MoinMoin:PawelPacana,
                 2008-2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import shutil, sys
--- a/MoinMoin/script/moin.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/moin.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     Usage: moin cmdmodule cmdname [options]
 
     @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 def run():
--- a/MoinMoin/script/old/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/old/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,6 +2,6 @@
     MoinMoin - misc example Scripts
 
     @copyright: 2004 by Thomas Waldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
--- a/MoinMoin/script/old/print_stats.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/script/old/print_stats.py	Sun Feb 27 01:12:24 2011 +0100
@@ -15,7 +15,7 @@
     Currently CGI and twisted also have a hotshot profiler integration.
 
     @copyright: 2005 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 def run():
     import sys
--- a/MoinMoin/search/Xapian/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/Xapian/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2006-2009 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.search.Xapian.indexing import XapianIndex, Query, MoinSearchConnection, MoinIndexerConnection, XapianDatabaseLockError
--- a/MoinMoin/search/Xapian/indexing.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/Xapian/indexing.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     @copyright: 2006-2009 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz,
                 2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, re
--- a/MoinMoin/search/Xapian/search.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/Xapian/search.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
                 2005 MoinMoin:AlexanderSchremmer,
                 2006-2009 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/search/Xapian/tokenizer.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/Xapian/tokenizer.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2006-2008 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/search/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
                 2005 MoinMoin:AlexanderSchremmer,
                 2006 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/search/_tests/test_search.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/_tests/test_search.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
     @copyright: 2005 by Nir Soffer <nirs@freeshell.org>,
                 2007-2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/search/_tests/test_wiki_analyzer.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/_tests/test_wiki_analyzer.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.search.Xapian.tokenizer Tests
 
     @copyright: 2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/search/builtin.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/builtin.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
                 2005 MoinMoin:AlexanderSchremmer,
                 2006-2009 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import sys, os, time, errno, codecs
--- a/MoinMoin/search/queryparser/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/queryparser/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
                 2005 MoinMoin:AlexanderSchremmer,
                 2006-2008 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/search/queryparser/expressions.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/queryparser/expressions.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
                 2006-2008 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz,
                 2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/search/results.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/results.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
                 2005 MoinMoin:AlexanderSchremmer,
                 2006 MoinMoin:ThomasWaldmann,
                 2006 MoinMoin:FranzPletz
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import StringIO, time
--- a/MoinMoin/search/term.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/search/term.py	Sun Feb 27 01:12:24 2011 +0100
@@ -21,7 +21,7 @@
           like that?
 
     @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/security/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/security/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -15,7 +15,7 @@
                 2003 Gustavo Niemeyer,
                 2005 Oliver Graf,
                 2007 Alexander Schremmer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import current_app as app
--- a/MoinMoin/security/_tests/test_security.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/security/_tests/test_security.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
                 2007 by MoinMoin:ReimarBauer,
                 2007,2009 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/security/_tests/test_ticket.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/security/_tests/test_ticket.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.security.ticket Tests
 
     @copyright: 2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/security/textcha.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/security/textcha.py	Sun Feb 27 01:12:24 2011 +0100
@@ -16,7 +16,7 @@
     * make similar changes to GUI editor
 
     @copyright: 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/security/ticket.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/security/ticket.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     are in response to a form the same user got from moin.
 
     @copyright: 2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import time
--- a/MoinMoin/signalling/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/signalling/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     to signals.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 # import all signals so they can be imported from here:
--- a/MoinMoin/signalling/log.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/signalling/log.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - logging signal handlers
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from signals import *
--- a/MoinMoin/signalling/signals.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/signalling/signals.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     We define all signals here to avoid typos/conflicts in the signal name.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from blinker import Namespace, ANY
--- a/MoinMoin/storage/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -35,7 +35,7 @@
     @copyright: 2008 MoinMoin:ChristopherDenter,
                 2008 MoinMoin:JohannesBerg,
                 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/storage/_tests/test_backends.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends.py	Sun Feb 27 01:12:24 2011 +0100
@@ -12,7 +12,7 @@
     @copyright: 2008 MoinMoin:PawelPacana,
                 2008 MoinMoin:ChristopherDenter,
                 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test, re
--- a/MoinMoin/storage/_tests/test_backends_flatfile.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_flatfile.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - Test - FlatFileBackend
 
     @copyright: 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/storage/_tests/test_backends_fs.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_fs.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 
     @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py, os, tempfile, shutil
--- a/MoinMoin/storage/_tests/test_backends_fs19.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_fs19.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     MoinMoin - fs19 read-only backend tests
 
     @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, re, tempfile, shutil
--- a/MoinMoin/storage/_tests/test_backends_fs2.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_fs2.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 
     @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py, os, tempfile, shutil
--- a/MoinMoin/storage/_tests/test_backends_hg.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_hg.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
     of Mercurial.
 
     @copyright: 2008 MoinMoin:PawelPacana
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 from tempfile import mkdtemp, mkstemp, gettempdir
 import shutil
--- a/MoinMoin/storage/_tests/test_backends_memory.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_memory.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     @copyright: 2008 MoinMoin:ChristopherDenter,
                 2008 MoinMoin:JohannesBerg,
                 2008 MoinMoin:AlexanderSchremmer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.storage._tests.test_backends import BackendTest
--- a/MoinMoin/storage/_tests/test_backends_router.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_router.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This defines tests for the RouterBackend
 
     @copyright: 2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/storage/_tests/test_backends_sqla.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_sqla.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This defines tests for the SQLAlchemyBackend.
 
     @copyright: 2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from StringIO import StringIO
--- a/MoinMoin/storage/_tests/test_middleware_acl.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_middleware_acl.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This defines tests for the ACLMiddleWare
 
     @copyright: 2009 MoinMoin:ChristopherDenter,
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/storage/_tests/test_serialization.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/test_serialization.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
           keys does not matter)
 
     @copyright: 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/storage/_tests/tests_backend_api.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/_tests/tests_backend_api.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
 
     @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 import py
 
--- a/MoinMoin/storage/backends/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
                 2008 MoinMoin:PawelPacana,
                 2009 MoinMoin:ChristopherDenter,
                 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import flaskg
--- a/MoinMoin/storage/backends/_flatutils.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/_flatutils.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - helpers for flatfile meta/data stores
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/storage/backends/_fsutils.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/_fsutils.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - helper for fs based backends
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/storage/backends/acl.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/acl.py	Sun Feb 27 01:12:24 2011 +0100
@@ -38,7 +38,7 @@
                 2005 Oliver Graf,
                 2007 Alexander Schremmer,
                 2009 Christopher Denter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from UserDict import DictMixin
--- a/MoinMoin/storage/backends/fileserver.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/fileserver.py	Sun Feb 27 01:12:24 2011 +0100
@@ -8,7 +8,7 @@
           e.g. in the router backend, to be useful.
 
     @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, stat
--- a/MoinMoin/storage/backends/flatfile.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/flatfile.py	Sun Feb 27 01:12:24 2011 +0100
@@ -17,7 +17,7 @@
 
     @copyright: 2008 MoinMoin:JohannesBerg,
                 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, re, errno
--- a/MoinMoin/storage/backends/fs.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/fs.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
 
     @copyright: 2008 MoinMoin:JohannesBerg,
                 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, struct, tempfile, random, errno, shutil
--- a/MoinMoin/storage/backends/fs19.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/fs19.py	Sun Feb 27 01:12:24 2011 +0100
@@ -11,7 +11,7 @@
 
     @copyright: 2008 MoinMoin:JohannesBerg,
                 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/storage/backends/fs19_logfile.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/fs19_logfile.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     This module supports buffered log reads, iterating forward and backward line-by-line, etc.
 
     @copyright: 2005-2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/storage/backends/fs2.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/fs2.py	Sun Feb 27 01:12:24 2011 +0100
@@ -9,7 +9,7 @@
 
     @copyright: 2008 MoinMoin:JohannesBerg ("fs2" is originally based on "fs" from JB),
                 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, tempfile, errno, shutil
--- a/MoinMoin/storage/backends/hg.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/hg.py	Sun Feb 27 01:12:24 2011 +0100
@@ -17,7 +17,7 @@
           If you'ld like to work on it, pull it from repo history.
 
     @copyright: 2008 MoinMoin:PawelPacana
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 from __future__ import with_statement
 
--- a/MoinMoin/storage/backends/indexing.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/indexing.py	Sun Feb 27 01:12:24 2011 +0100
@@ -15,7 +15,7 @@
     (new) name in its revision metadata.
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/storage/backends/memory.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/memory.py	Sun Feb 27 01:12:24 2011 +0100
@@ -16,7 +16,7 @@
     @copyright: 2008 MoinMoin:ChristopherDenter,
                 2008 MoinMoin:JohannesBerg,
                 2008 MoinMoin:AlexanderSchremmer
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import StringIO
--- a/MoinMoin/storage/backends/router.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/router.py	Sun Feb 27 01:12:24 2011 +0100
@@ -11,7 +11,7 @@
 
     @copyright: 2008-2010 MoinMoin:ThomasWaldmann,
                 2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re
--- a/MoinMoin/storage/backends/sqla.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/backends/sqla.py	Sun Feb 27 01:12:24 2011 +0100
@@ -63,7 +63,7 @@
 
     @copyright: 2009 MoinMoin:ChristopherDenter,
                 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from threading import Lock
--- a/MoinMoin/storage/error.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/error.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     @copyright: 2007 MoinMoin:HeinrichWendel,
                 2008 MoinMoin:ChristopherDenter,
                 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.i18n import _, L_, N_
--- a/MoinMoin/storage/serialization.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/storage/serialization.py	Sun Feb 27 01:12:24 2011 +0100
@@ -22,7 +22,7 @@
     serialize(backend, 'some_items.xml', ItemNameList, some_items)
 
     @copyright: 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import log
--- a/MoinMoin/themes/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/themes/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
     @copyright: 2003-2010 MoinMoin:ThomasWaldmann,
                 2008 MoinMoin:RadomirDopieralski,
                 2010 MoinMoin:DiogenesAugusto
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os
--- a/MoinMoin/themes/_tests/test_navi_bar.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/themes/_tests/test_navi_bar.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2010 MoinMoin:DiogenesAugusto,
                 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from flask import current_app as app
--- a/MoinMoin/user.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/user.py	Sun Feb 27 01:12:24 2011 +0100
@@ -13,7 +13,7 @@
                 2007 MoinMoin:HeinrichWendel,
                 2008 MoinMoin:ChristopherDenter,
                 2010 MoinMoin:DiogenesAugusto
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import time, base64
--- a/MoinMoin/util/__init__.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/__init__.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     General helper functions that are not directly wiki related.
 
     @copyright: 2004 Juergen Hermann, Thomas Waldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import re, random
--- a/MoinMoin/util/_tests/test_diff3.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_diff3.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.util.diff3 Tests
 
     @copyright: 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import diff3
--- a/MoinMoin/util/_tests/test_diff_text.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_diff_text.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.util.diff_text Tests
 
     @copyright: 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util import diff_text
--- a/MoinMoin/util/_tests/test_filesys.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_filesys.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.util.filesys Tests
 
     @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 import sys, os, time
 import shutil, tempfile
--- a/MoinMoin/util/_tests/test_interwiki.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_interwiki.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2010 MoinMoin:ThomasWaldmann,
                 2010 MoinMoin:MicheleOrru
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from __future__ import with_statement
--- a/MoinMoin/util/_tests/test_iri.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_iri.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 MoinMoin - Tests for MoinMoin.util.iri
 
 @copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/util/_tests/test_lock.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_lock.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2005 by Florian Festi,
                 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import tempfile, os, time, shutil
--- a/MoinMoin/util/_tests/test_mime.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_mime.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.util.mime
 
 @copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/util/_tests/test_paramparser.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_paramparser.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.util.paramparser Tests
 
     @copyright:2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py
--- a/MoinMoin/util/_tests/test_pysupport.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_pysupport.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2004 Oliver Graf <ograf@bitart.de>,
                 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, errno
--- a/MoinMoin/util/_tests/test_registry.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_registry.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.util.registry
 
 @copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/util/_tests/test_tree.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_tree.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tests for MoinMoin.util.tree
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import py.test
--- a/MoinMoin/util/_tests/test_util.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_util.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.util Tests
 
     @copyright: 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin import util
--- a/MoinMoin/util/_tests/test_version.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/_tests/test_version.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - MoinMoin.version Tests
 
     @copyright: 2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.util.version import Version
--- a/MoinMoin/util/chartypes_create.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/chartypes_create.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
     UCS-2 character types (upper/lower/digits/spaces).
 
     @copyright: 2004 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 uppercase = []
--- a/MoinMoin/util/clock.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/clock.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import time
--- a/MoinMoin/util/diff3.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/diff3.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - diff3 algorithm
 
     @copyright: 2002 Florian Festi
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 default_markers = ('<<<<<<<<<<<<<<<<<<<<<<<<<\n',
--- a/MoinMoin/util/diff_html.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/diff_html.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2002 Juergen Hermann <jh@web.de>,
                 2002 Scott Moonen <smoonen@andstuff.org>
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import difflib
--- a/MoinMoin/util/diff_text.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/diff_text.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - simple text diff (uses difflib)
 
     @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import difflib
--- a/MoinMoin/util/filesys.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/filesys.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2002 Juergen Hermann <jh@web.de>,
                 2006-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import sys, os, shutil, time, errno
--- a/MoinMoin/util/interwiki.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/interwiki.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2010 MoinMoin:ThomasWaldmann,
                 2010 MoinMoin:MicheleOrru
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 from __future__ import with_statement
 
--- a/MoinMoin/util/iri.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/iri.py	Sun Feb 27 01:12:24 2011 +0100
@@ -4,7 +4,7 @@
 Implements the generic IRI form as defined in RFC 3987.
 
 @copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import codecs
--- a/MoinMoin/util/lock.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/lock.py	Sun Feb 27 01:12:24 2011 +0100
@@ -3,7 +3,7 @@
 
     @copyright: 2005 Florian Festi, Nir Soffer,
                 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, sys, tempfile, time, errno
--- a/MoinMoin/util/mime.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/mime.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - MIME helpers
 
 @copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/util/paramparser.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/paramparser.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - parameter parsing and invoking of extension functions
 
     @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from MoinMoin.i18n import _, L_, N_
--- a/MoinMoin/util/plugins.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/plugins.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
                 2005-2010 MoinMoin:ThomasWaldmann,
                 2007 MoinMoin:ReimarBauer,
                 2008 MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, sys
--- a/MoinMoin/util/profile.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/profile.py	Sun Feb 27 01:12:24 2011 +0100
@@ -34,7 +34,7 @@
 Based on code by Oliver Graf
 
 @copyright: 2004 Nir Soffer
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os, time, gc
--- a/MoinMoin/util/pysupport.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/pysupport.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - Supporting function for Python magic
 
     @copyright: 2002 Juergen Hermann <jh@web.de>
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 #############################################################################
--- a/MoinMoin/util/python_compatibility.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/python_compatibility.py	Sun Feb 27 01:12:24 2011 +0100
@@ -5,7 +5,7 @@
 
     @copyright: 2007 Heinrich Wendel <heinrich.wendel@gmail.com>,
                 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 min_req_exc = Exception("Minimum requirement for MoinMoin is Python 2.6.")
--- a/MoinMoin/util/registry.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/registry.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
 can return a callable to consider itself as a match.
 
 @copyright: 2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/util/thread_monitor.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/thread_monitor.py	Sun Feb 27 01:12:24 2011 +0100
@@ -6,7 +6,7 @@
     by calling trigger_dump().
 
     @copyright: 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
-    @license: GNU GPL Version 2
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
--- a/MoinMoin/util/tree.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/tree.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
 MoinMoin - Tree name and element generator
 
 @copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL, see COPYING for details.
+@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 from emeraldtree import ElementTree as ET
--- a/MoinMoin/util/version.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/util/version.py	Sun Feb 27 01:12:24 2011 +0100
@@ -2,7 +2,7 @@
     MoinMoin - dealing with version numbers
 
     @copyright: 2011 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 # see MoinMoin/_tests/test_version.py for examples how to use this:
--- a/MoinMoin/wikiutil.py	Sun Feb 27 00:09:32 2011 +0100
+++ b/MoinMoin/wikiutil.py	Sun Feb 27 01:12:24 2011 +0100
@@ -7,7 +7,7 @@
                 2005-2010 MoinMoin:ThomasWaldmann,
                 2007 MoinMoin:ReimarBauer,
                 2008 MoinMoin:ChristopherDenter
-    @license: GNU GPL, see COPYING for details.
+    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 import os