Commits

Thomas Waldmann  committed 335d748

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.

  • Participants
  • Parent commits 74eecd2

Comments (0)

Files changed (233)

File MoinMoin/__init__.py

 
 @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

File MoinMoin/_template.py

     <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.
 """
 
 

File MoinMoin/_tests/__init__.py

     @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

File MoinMoin/_tests/_test_template.py

     @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:

File MoinMoin/_tests/ldap_testbase.py

     # /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

File MoinMoin/_tests/maketestwiki.py

     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

File MoinMoin/_tests/test_error.py

 
     @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

File MoinMoin/_tests/test_test_environ.py

     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

File MoinMoin/_tests/test_user.py

 
     @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

File MoinMoin/_tests/test_wikiutil.py

 
     @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

File MoinMoin/_tests/wikiconfig.py

 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

File MoinMoin/app.py

             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
 

File MoinMoin/apps/admin/__init__.py

     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

File MoinMoin/apps/admin/views.py

                 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

File MoinMoin/apps/feed/__init__.py

     (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

File MoinMoin/apps/feed/_tests/test_feed.py

     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):

File MoinMoin/apps/feed/views.py

 
     @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

File MoinMoin/apps/frontend/__init__.py

     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

File MoinMoin/apps/frontend/_tests/test_frontend.py

     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

File MoinMoin/apps/frontend/views.py

     @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
 
     @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()

File MoinMoin/apps/misc/__init__.py

     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

File MoinMoin/apps/misc/_tests/test_misc.py

     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):

File MoinMoin/apps/misc/views.py

     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

File MoinMoin/apps/serve/__init__.py

     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

File MoinMoin/apps/serve/views.py

     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

File MoinMoin/auth/__init__.py

                 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

File MoinMoin/auth/_tests/test_ldap_login.py

     @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

File MoinMoin/auth/http.py

     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

File MoinMoin/auth/ldap_login.py

 
     @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__)

File MoinMoin/auth/log.py

     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

File MoinMoin/auth/openidrp.py

     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

File MoinMoin/auth/smb_mount.py

 
     @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

File MoinMoin/config/__init__.py

     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
 

File MoinMoin/config/_tests/test_defaultconfig.py

     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

File MoinMoin/config/default.py

                 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

File MoinMoin/conftest.py

 @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

File MoinMoin/converter/__init__.py

 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

File MoinMoin/converter/_args.py

 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.
 """
 
 

File MoinMoin/converter/_args_wiki.py

 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

File MoinMoin/converter/_table.py

 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

File MoinMoin/converter/_tests/test__args.py

 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

File MoinMoin/converter/_tests/test__args_wiki.py

 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

File MoinMoin/converter/_tests/test__wiki_macro.py

 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

File MoinMoin/converter/_tests/test_creole_in.py

 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

File MoinMoin/converter/_tests/test_docbook_in.py

 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

File MoinMoin/converter/_tests/test_docbook_out.py

 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

File MoinMoin/converter/_tests/test_html_in.py

 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

File MoinMoin/converter/_tests/test_html_in_out.py

            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

File MoinMoin/converter/_tests/test_html_out.py

 
 @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

File MoinMoin/converter/_tests/test_include.py

 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

File MoinMoin/converter/_tests/test_link.py

 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

File MoinMoin/converter/_tests/test_mediawiki_in.py

 
 @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

File MoinMoin/converter/_tests/test_moinwiki19_in.py

 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

File MoinMoin/converter/_tests/test_moinwiki_in.py

 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

File MoinMoin/converter/_tests/test_moinwiki_in_out.py

 
 @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

File MoinMoin/converter/_tests/test_moinwiki_out.py

 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

File MoinMoin/converter/_tests/test_rst_in.py

 
 @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

File MoinMoin/converter/_tests/test_rst_out.py

 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

File MoinMoin/converter/_tests/test_smiley.py

 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

File MoinMoin/converter/_wiki_macro.py

 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

File MoinMoin/converter/archive_in.py

 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

File MoinMoin/converter/audio_video_in.py

 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

File MoinMoin/converter/creole_in.py

     @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

File MoinMoin/converter/docbook_in.py

   * 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

File MoinMoin/converter/docbook_out.py

 
 @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

File MoinMoin/converter/everything.py

 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

File MoinMoin/converter/highlight.py

 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

File MoinMoin/converter/html_in.py

 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

File MoinMoin/converter/html_out.py

 
 @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

File MoinMoin/converter/image_in.py

 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

File MoinMoin/converter/include.py

 
 @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

File MoinMoin/converter/link.py

 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

File MoinMoin/converter/macro.py

 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

File MoinMoin/converter/mediawiki_in.py

             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

File MoinMoin/converter/moinwiki19_in.py

             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

File MoinMoin/converter/moinwiki_in.py

             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

File MoinMoin/converter/moinwiki_out.py

 
 @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

File MoinMoin/converter/nonexistent_in.py

 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

File MoinMoin/converter/pygments_in.py

 
 @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

File MoinMoin/converter/rst_in.py

             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

File MoinMoin/converter/rst_out.py

 
 @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

File MoinMoin/converter/smiley.py

 
 @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

File MoinMoin/converter/text_csv_in.py

 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

File MoinMoin/converter/text_in.py

 
 @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

File MoinMoin/datastruct/__init__.py

 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

File MoinMoin/datastruct/backends/__init__.py

 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

File MoinMoin/datastruct/backends/_tests/__init__.py

                 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.
 
 """
 

File MoinMoin/datastruct/backends/_tests/test_composite_dicts.py

 
 @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

File MoinMoin/datastruct/backends/_tests/test_composite_groups.py

 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

File MoinMoin/datastruct/backends/_tests/test_config_dicts.py

     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

File MoinMoin/datastruct/backends/_tests/test_config_groups.py

     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

File MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py

     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

File MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py

                 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

File MoinMoin/datastruct/backends/_tests/test_wiki_groups.py

             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

File MoinMoin/datastruct/backends/composite_dicts.py

 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

File MoinMoin/datastruct/backends/composite_groups.py

 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

File MoinMoin/datastruct/backends/config_dicts.py

 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

File MoinMoin/datastruct/backends/config_groups.py

 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

File MoinMoin/datastruct/backends/config_lazy_groups.py

     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

File MoinMoin/datastruct/backends/wiki_dicts.py

                 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

File MoinMoin/datastruct/backends/wiki_groups.py

 @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

File MoinMoin/error.py

     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

File MoinMoin/i18n/__init__.py

 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

File MoinMoin/items/__init__.py

                 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

File MoinMoin/items/_tests/test_Item.py

     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

File MoinMoin/log.py

 
     @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

File MoinMoin/macro/Anchor.py

     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

File MoinMoin/macro/Date.py

     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

File MoinMoin/macro/DateTime.py

     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

File MoinMoin/macro/EditedSystemPages.py

 
     @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

File MoinMoin/macro/GetText.py

 
     @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_

File MoinMoin/macro/GetVal.py

     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

File MoinMoin/macro/GoTo.py

 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

File MoinMoin/macro/HighlighterList.py

 
     @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

File MoinMoin/macro/InterWiki.py

     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

File MoinMoin/macro/MailTo.py

     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

File MoinMoin/macro/PageCount.py

 
     @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

File MoinMoin/macro/PageSize.py

 
     @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

File MoinMoin/macro/PagenameList.py

     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

File MoinMoin/macro/RandomItem.py

 
     @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

File MoinMoin/macro/TemplateList.py

     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

File MoinMoin/macro/Verbatim.py

     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

File MoinMoin/macro/WikiConfig.py

 
     @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

File MoinMoin/macro/WikiConfigHelp.py

 
     @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_

File MoinMoin/macro/__init__.py

 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

File MoinMoin/macro/_base.py

 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

File MoinMoin/macro/_tests/test__base.py

 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

File MoinMoin/mail/__init__.py

     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.
 """
 

File MoinMoin/mail/_tests/test_sendmail.py

     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

File MoinMoin/mail/sendmail.py

 
     @copyright: 2003 Juergen Hermann <jh@web.de>,
                 2008-2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL, see COPYING for details.