changeset 1918:bb2e053067fb

fixing copyright headers: remove umlauts (encoding troubles), make epydoc compatible, reformat
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 27 Mar 2007 21:07:33 +0200
parents eb68960b1dfb
children 5abc7d1528d5
files MoinMoin/Page.py MoinMoin/PageEditor.py MoinMoin/PageGraphicalEditor.py MoinMoin/__init__.py MoinMoin/_template.py MoinMoin/_tests/__init__.py MoinMoin/_tests/_test_template.py MoinMoin/_tests/broken/test_converter_text_html_text_moin_wiki.py MoinMoin/_tests/broken/test_parser_text_moin_wiki.py MoinMoin/_tests/test_Page.py MoinMoin/_tests/test_PageEditor.py MoinMoin/_tests/test_error.py MoinMoin/_tests/test_i18n.py MoinMoin/_tests/test_macro.py MoinMoin/_tests/test_mail_sendmail.py MoinMoin/_tests/test_packages.py MoinMoin/_tests/test_pysupport.py MoinMoin/_tests/test_request.py MoinMoin/_tests/test_search.py MoinMoin/_tests/test_security.py MoinMoin/_tests/test_user.py MoinMoin/_tests/test_util_web.py MoinMoin/_tests/test_widget_html.py MoinMoin/_tests/test_wikidicts.py MoinMoin/_tests/test_wikisync.py MoinMoin/_tests/test_wikiutil.py MoinMoin/_tests/test_wikixml_marshal.py MoinMoin/action/AttachFile.py MoinMoin/action/DeletePage.py MoinMoin/action/LikePages.py MoinMoin/action/Load.py MoinMoin/action/LocalSiteMap.py MoinMoin/action/MyPages.py MoinMoin/action/RenamePage.py MoinMoin/action/Save.py MoinMoin/action/SpellCheck.py MoinMoin/action/SubscribeUser.py MoinMoin/action/__init__.py MoinMoin/action/bookmark.py MoinMoin/action/chart.py MoinMoin/action/diff.py MoinMoin/action/dumpform.py MoinMoin/action/edit.py MoinMoin/action/fckdialog.py MoinMoin/action/fullsearch.py MoinMoin/action/info.py MoinMoin/action/links.py MoinMoin/action/login.py MoinMoin/action/logout.py MoinMoin/action/newpage.py MoinMoin/action/pollsistersites.py MoinMoin/action/quicklink.py MoinMoin/action/refresh.py MoinMoin/action/revert.py MoinMoin/action/rss_rc.py MoinMoin/action/showtags.py MoinMoin/action/sisterpages.py MoinMoin/action/sitemap.py MoinMoin/action/subscribe.py MoinMoin/action/test.py MoinMoin/action/thread_monitor.py MoinMoin/action/titleindex.py MoinMoin/action/userprefs.py MoinMoin/auth/_PHPsessionParser.py MoinMoin/auth/http.py MoinMoin/auth/ldap_login.py MoinMoin/auth/log.py MoinMoin/auth/mysql_group.py MoinMoin/auth/php_session.py MoinMoin/auth/smb_mount.py MoinMoin/auth/sslclientcert.py MoinMoin/caching.py MoinMoin/config/__init__.py MoinMoin/config/multiconfig.py MoinMoin/converter/text_html_text_moin_wiki.py MoinMoin/error.py MoinMoin/failure.py MoinMoin/filter/__init__.py MoinMoin/filter/application_msword.py MoinMoin/filter/application_octet_stream.py MoinMoin/filter/application_pdf.py MoinMoin/filter/application_vnd_ms_excel.py MoinMoin/filter/application_vnd_oasis_opendocument.py MoinMoin/filter/application_vnd_oasis_opendocument_presentation.py MoinMoin/filter/application_vnd_oasis_opendocument_spreadsheet.py MoinMoin/filter/application_vnd_oasis_opendocument_text.py MoinMoin/filter/application_vnd_sun_xml.py MoinMoin/filter/application_vnd_sun_xml_calc.py MoinMoin/filter/application_vnd_sun_xml_writer.py MoinMoin/filter/audio.py MoinMoin/filter/image.py MoinMoin/filter/image_jpeg.py MoinMoin/filter/text.py MoinMoin/filter/text_html.py MoinMoin/filter/text_rtf.py MoinMoin/filter/text_xml.py MoinMoin/filter/video.py MoinMoin/formatter/__init__.py MoinMoin/formatter/dom_xml.py MoinMoin/formatter/text_gedit.py MoinMoin/formatter/text_html.py MoinMoin/formatter/text_plain.py MoinMoin/formatter/text_python.py MoinMoin/formatter/text_xml.py MoinMoin/i18n/__init__.py MoinMoin/logfile/__init__.py MoinMoin/logfile/editlog.py MoinMoin/logfile/eventlog.py MoinMoin/macro/AbandonedPages.py MoinMoin/macro/Action.py MoinMoin/macro/AdvancedSearch.py MoinMoin/macro/AttachList.py MoinMoin/macro/BR.py MoinMoin/macro/EditTemplates.py MoinMoin/macro/EmbedObject.py MoinMoin/macro/FootNote.py MoinMoin/macro/FullSearch.py MoinMoin/macro/FullSearchCached.py MoinMoin/macro/GetText.py MoinMoin/macro/GetText2.py MoinMoin/macro/Include.py MoinMoin/macro/LikePages.py MoinMoin/macro/Login.py MoinMoin/macro/MonthCalendar.py MoinMoin/macro/Navigation.py MoinMoin/macro/NewPage.py MoinMoin/macro/OrphanedPages.py MoinMoin/macro/PageHits.py MoinMoin/macro/PageSize.py MoinMoin/macro/RandomPage.py MoinMoin/macro/RandomQuote.py MoinMoin/macro/RecentChanges.py MoinMoin/macro/ShowSmileys.py MoinMoin/macro/StatsChart.py MoinMoin/macro/SystemAdmin.py MoinMoin/macro/SystemInfo.py MoinMoin/macro/TableOfContents.py MoinMoin/macro/TeudView.py MoinMoin/macro/Verbatim.py MoinMoin/macro/WantedPages.py MoinMoin/macro/__init__.py MoinMoin/mail/__init__.py MoinMoin/mail/mailimport.py MoinMoin/mail/sendmail.py MoinMoin/packages.py MoinMoin/parser/__init__.py MoinMoin/parser/text.py MoinMoin/parser/text_cplusplus.py MoinMoin/parser/text_csv.py MoinMoin/parser/text_diff.py MoinMoin/parser/text_docbook.py MoinMoin/parser/text_html.py MoinMoin/parser/text_irssi.py MoinMoin/parser/text_java.py MoinMoin/parser/text_moin_wiki.py MoinMoin/parser/text_pascal.py MoinMoin/parser/text_python.py MoinMoin/parser/text_rst.py MoinMoin/parser/text_xslt.py MoinMoin/request/CGI.py MoinMoin/request/CLI.py MoinMoin/request/FCGI.py MoinMoin/request/MODPYTHON.py MoinMoin/request/STANDALONE.py MoinMoin/request/TWISTED.py MoinMoin/request/WSGI.py MoinMoin/request/__init__.py MoinMoin/script/__init__.py MoinMoin/script/account/__init__.py MoinMoin/script/account/check.py MoinMoin/script/account/create.py MoinMoin/script/account/disable.py MoinMoin/script/cli/__init__.py MoinMoin/script/cli/show.py MoinMoin/script/export/__init__.py MoinMoin/script/export/dump.py MoinMoin/script/import/__init__.py MoinMoin/script/import/irclog.py MoinMoin/script/index/__init__.py MoinMoin/script/index/build.py MoinMoin/script/maint/__init__.py MoinMoin/script/maint/cleancache.py MoinMoin/script/maint/cleanpage.py MoinMoin/script/maint/globaledit.py MoinMoin/script/maint/mkpagepacks.py MoinMoin/script/maint/reducewiki.py MoinMoin/script/migration/1050300.py MoinMoin/script/migration/1050301.py MoinMoin/script/migration/1050400.py MoinMoin/script/migration/__init__.py MoinMoin/script/migration/data.py MoinMoin/script/migration/migutil.py MoinMoin/script/moin.py MoinMoin/script/xmlrpc/__init__.py MoinMoin/script/xmlrpc/mailimport.py MoinMoin/script/xmlrpc/remote.py MoinMoin/security/__init__.py MoinMoin/security/antispam.py MoinMoin/security/autoadmin.py MoinMoin/server/STANDALONE.py MoinMoin/server/TWISTED.py MoinMoin/server/WSGI.py MoinMoin/server/__init__.py MoinMoin/stats/__init__.py MoinMoin/stats/chart.py MoinMoin/stats/hitcounts.py MoinMoin/stats/pagesize.py MoinMoin/stats/useragents.py MoinMoin/support/__init__.py MoinMoin/theme/__init__.py MoinMoin/theme/classic.py MoinMoin/theme/modern.py MoinMoin/theme/rightsidebar.py MoinMoin/user.py MoinMoin/userform.py MoinMoin/util/bdiff.py MoinMoin/util/chartypes_create.py MoinMoin/util/dataset.py MoinMoin/util/diff3.py MoinMoin/util/diff_html.py MoinMoin/util/diff_text.py MoinMoin/util/filesys.py MoinMoin/util/lock.py MoinMoin/util/pysupport.py MoinMoin/util/rpc_aggregator.py MoinMoin/util/thread_monitor.py MoinMoin/util/timefuncs.py MoinMoin/util/web.py MoinMoin/version.py MoinMoin/widget/__init__.py MoinMoin/widget/base.py MoinMoin/widget/browser.py MoinMoin/widget/dialog.py MoinMoin/widget/html.py MoinMoin/wikidicts.py MoinMoin/wikisync.py MoinMoin/wikiutil.py MoinMoin/wikixml/__init__.py MoinMoin/wikixml/marshal.py MoinMoin/wikixml/util.py MoinMoin/xmlrpc/HelloWorld.py MoinMoin/xmlrpc/ProcessMail.py MoinMoin/xmlrpc/RemoteScript.py MoinMoin/xmlrpc/UpdateGroup.py MoinMoin/xmlrpc/WhoAmI.py MoinMoin/xmlrpc/__init__.py MoinMoin/xmlrpc/putClientInfo.py
diffstat 247 files changed, 325 insertions(+), 315 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/Page.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/Page.py	Tue Mar 27 21:07:33 2007 +0200
@@ -9,7 +9,7 @@
     The RootPage is some virtual page located at / and is mainly used to do namespace
     operations like getting the page list. 
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>,
                 2005-2007 by MoinMoin:ThomasWaldmann,
                 2006 by MoinMoin:FlorianFesti.
                 2007 by ReimarBauer
--- a/MoinMoin/PageEditor.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/PageEditor.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,8 +4,8 @@
     
     PageEditor is used for r/w access to a wiki page (edit, rename, delete operations).
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
-                2005-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>,
+                2005-2007 by MoinMoin:ThomasWaldmann,
                 2007 by ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/PageGraphicalEditor.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/PageGraphicalEditor.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,8 @@
 
     Same as PageEditor, but we use the HTML based GUI editor here.
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann
+    @copyright: 2006 Bastian Blank, Florian Festi,
+                2006-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,8 +1,9 @@
 # -*- coding: iso-8859-1 -*-
 """
-MoinMoin Version 1.6.0alpha b27d720fbc8e tip
+MoinMoin Version 1.6.0alpha eb68960b1dfb+ tip
 
-@copyright: 2000-2006 by Jürgen Hermann <jh@web.de>
+@copyright: 2000-2006 by Juergen Hermann <jh@web.de>,
+            2002-2007 MoinMoin:ThomasWaldmann
 @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_template.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_template.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     <what this stuff does ... - verbose enough>
 
-    @copyright: 2006 by MoinMoin:YourNameHere 
+    @copyright: 2006 MoinMoin:YourNameHere 
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -37,7 +37,7 @@
 
     run(request, names=['test_this', 'test_that'])
 
-@copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+@copyright: 2002-2004 by Juergen Hermann <jh@web.de>
 @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/_test_template.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/_test_template.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Module names must start with 'test_' to be included in the tests.
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/broken/test_converter_text_html_text_moin_wiki.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/broken/test_converter_text_html_text_moin_wiki.py	Tue Mar 27 21:07:33 2007 +0200
@@ -14,7 +14,7 @@
 from MoinMoin.parser.text_moin_wiki import Parser
 from MoinMoin.formatter.text_gedit import Formatter
 from MoinMoin.request import Clock
-from MoinMoin.error import import ConvertError
+from MoinMoin.error import ConvertError
 
 convert = converter.convert
 error = ConvertError
--- a/MoinMoin/_tests/broken/test_parser_text_moin_wiki.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/broken/test_parser_text_moin_wiki.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     TODO: these are actually parser+formatter tests. We should have
     parser only tests here.
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_Page.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_Page.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.Page Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_PageEditor.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_PageEditor.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.PageEditor Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_error.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_error.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - MoinMoin.error Tests
 
-@copyright: 2003-2004 by Nir Soffer <nirs AT freeshell DOT org>
-@license: GNU GPL, see COPYING for details.
+    @copyright: 2003-2004 by Nir Soffer <nirs AT freeshell DOT org>
+    @license: GNU GPL, see COPYING for details.
 """
 
 import unittest
--- a/MoinMoin/_tests/test_i18n.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_i18n.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.i18n Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_macro.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_macro.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.macro Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
                 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/_tests/test_mail_sendmail.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_mail_sendmail.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.mail.sendmail Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_packages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_packages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,9 +1,9 @@
 # -*- coding: iso-8859-1 -*-
 """
-MoinMoin - MoinMoin.packages tests
+    MoinMoin - MoinMoin.packages tests
 
-@copyright: 2005 MoinMoin:AlexanderSchremmer
-@license: GNU GPL, see COPYING for details.
+    @copyright: 2005 MoinMoin:AlexanderSchremmer
+    @license: GNU GPL, see COPYING for details.
 """
 
 from unittest import TestCase
--- a/MoinMoin/_tests/test_pysupport.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_pysupport.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.util.pysupport Tests
 
-    @copyright: 2004 by Jürgen Hermann <ograf@bitart.de>
+    @copyright: 2004 Oliver Graf <ograf@bitart.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_request.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_request.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Module names must start with 'test_' to be included in the tests.
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_search.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_search.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,9 +1,9 @@
 # -*- coding: iso-8859-1 -*-
 """
-MoinMoin - MoinMoin.search Tests
+    MoinMoin - MoinMoin.search Tests
 
-@copyright: 2005 by Nir Soffer <nirs@freeshell.org>
-@license: GNU GPL, see COPYING for details.
+    @copyright: 2005 by Nir Soffer <nirs@freeshell.org>
+    @license: GNU GPL, see COPYING for details.
 """
 
 import unittest
--- a/MoinMoin/_tests/test_security.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_security.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.security Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_user.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_user.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.user Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_util_web.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_util_web.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.util.web Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_widget_html.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_widget_html.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.widget.html Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_wikidicts.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_wikidicts.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.wikidicts tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_wikisync.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_wikisync.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,9 +1,9 @@
 # -*- coding: iso-8859-1 -*-
 """
-MoinMoin - MoinMoin.wikisync tests
+    MoinMoin - MoinMoin.wikisync tests
 
-@copyright: 2006 MoinMoin:AlexanderSchremmer
-@license: GNU GPL, see COPYING for details.
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
+    @license: GNU GPL, see COPYING for details.
 """
 
 from unittest import TestCase
--- a/MoinMoin/_tests/test_wikiutil.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_wikiutil.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.wikiutil Tests
 
-    @copyright: 2003-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/_tests/test_wikixml_marshal.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/_tests/test_wikixml_marshal.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin.wikixml.marshal Tests
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/AttachFile.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/AttachFile.py	Tue Mar 27 21:07:33 2007 +0200
@@ -18,7 +18,7 @@
     To insert an attachment into the page, use the "attachment:" pseudo schema.
 
     @copyright: 2001 by Ken Sugino (sugino@mediaone.net),
-                2001-2004 by Jürgen Hermann <jh@web.de>,
+                2001-2004 by Juergen Hermann <jh@web.de>,
                 2005 MoinMoin:AlexanderSchremmer,
                 2005 DiegoOngaro at ETSZONE (diego@etszone.com),
                 2005-2006 MoinMoin:ReimarBauer,
--- a/MoinMoin/action/DeletePage.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/DeletePage.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This action allows you to delete a page.
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann,
                 2007 ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/action/LikePages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/LikePages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,8 +6,8 @@
     with the same word as the current pagename. If only one matching
     page is found, that page is displayed directly.
 
-    @copyright: (c) 2001 by Richard Jones <richard@bizarsoftware.com.au>
-    @copyright: (c) 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Richard Jones <richard@bizarsoftware.com.au>,
+                2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/Load.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/Load.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,9 +2,8 @@
 """
     MoinMoin - Action macro for page creation from file or attach file to current page
 
-    MODIFICATION HISTORY:
-        @copyright: 2007 by Reimar Bauer 
-        @license: GNU GPL, see COPYING for details.
+    @copyright: 2007 Reimar Bauer 
+    @license: GNU GPL, see COPYING for details.
 """
 import os
 from MoinMoin import wikiutil, config
--- a/MoinMoin/action/LocalSiteMap.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/LocalSiteMap.py	Tue Mar 27 21:07:33 2007 +0200
@@ -18,8 +18,8 @@
               WikiWiki
                    OriginalWiki
 
-    @copyright: 2001 by Steve Howell <showell@zipcon.com>
-    @copyright: 2001-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Steve Howell <showell@zipcon.com>,
+                2001-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/MyPages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/MyPages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MyPages - assisting creation of Homepage subpages
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann
+    @copyright: 2005-2006 Bastian Blank, Florian Festi, Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/RenamePage.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/RenamePage.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     This action allows you to rename a page.
 
     @copyright: 2002-2004 Michael Reinsch <mr@uue.org>,
-                2006 MoinMoin:ThomasWaldmann
+                2006 MoinMoin:ThomasWaldmann,
                 2007 ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/action/Save.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/Save.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Action for saving a page
 
-    @copyright: 2007 by Reimar Bauer 
+    @copyright: 2007 Reimar Bauer 
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/SpellCheck.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/SpellCheck.py	Tue Mar 27 21:07:33 2007 +0200
@@ -15,8 +15,8 @@
     Additionally, all words on the page "LocalSpellingWords" are added to
     the list of valid words, if that page exists.
 
-    @copyright: 2001 by Richard Jones <richard@bizarsoftware.com.au>  
-    @copyright: 2001-2004 by Jürgen Hermann <jh@web.de>  
+    @copyright: 2001 Richard Jones <richard@bizarsoftware.com.au>,
+                2001-2004 Juergen Hermann <jh@web.de>  
     @license: GNU GPL, see COPYING for details.  
 """
 
--- a/MoinMoin/action/SubscribeUser.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/SubscribeUser.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,9 +2,8 @@
    MoinMoin - Subscribeuser - Action
    Subscribe a user to a page
 
-   @copyright: Daniela Nicklas <nicklas@informatik.uni-stuttgart.de>, 2003
-   @copyright: 2005 MoinMoin:AlexanderSchremmer
-   
+   @copyright: 2003 Daniela Nicklas <nicklas@informatik.uni-stuttgart.de>,
+               2005 MoinMoin:AlexanderSchremmer
    @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -20,7 +20,7 @@
     actions_excluded, making and checking tickets, rendering some form,
     displaying errors and doing stuff after an action.
     
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/action/bookmark.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/bookmark.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - set or delete bookmarks (in time) for RecentChanges
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>,
                 2006 by MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/action/chart.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/chart.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - show some statistics chart
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.util import pysupport
--- a/MoinMoin/action/diff.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/diff.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - show diff between 2 page revisions
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/dumpform.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/dumpform.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - dump form data we received (debugging)
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin import util
--- a/MoinMoin/action/edit.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/edit.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,8 +4,8 @@
 
     This either calls the text or the GUI page editor.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin import wikiutil
--- a/MoinMoin/action/fckdialog.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/fckdialog.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - feed some FCKeditor dialogues
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann
+    @copyright: 2005-2006 Bastian Blank, Florian Festi, Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/fullsearch.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/fullsearch.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This is the backend of the search form. Search pages and print results.
     
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/info.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/info.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,8 +4,8 @@
 
     Displays page history, some general page infos and statistics.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/links.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/links.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Generate a link database like MeatBall:LinkDatabase.
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin import config, wikiutil
--- a/MoinMoin/action/login.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/login.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,8 +5,8 @@
     The real login is done in MoinMoin.request.
     Here is only some user notification in case something went wrong.
 
-    @copyright: 2005-2006 by Radomirs Cirskis <nad2000@gmail.com>
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2005-2006 Radomirs Cirskis <nad2000@gmail.com>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/logout.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/logout.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     The real logout is done in MoinMoin.request.
     Here is just some stuff to notify the user.
 
-    @copyright: 2005-2006 by Radomirs Cirskis <nad2000@gmail.com>
+    @copyright: 2005-2006 Radomirs Cirskis <nad2000@gmail.com>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/newpage.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/newpage.py	Tue Mar 27 21:07:33 2007 +0200
@@ -3,9 +3,9 @@
 
     Create a new page with optional template. Can be used with NewPage.py macro.
 
-    @copyright: 2004 Vito Miliano (vito_moinnewpagewithtemplate@perilith.com)
-    @copyright: 2004 by Nir Soffer <nirs@freeshell.org>
-    @copyright: 2004 Alexander Schremmer <alex AT alexanderweb DOT de>
+    @copyright: 2004 Vito Miliano (vito_moinnewpagewithtemplate@perilith.com),
+                2004 Nir Soffer <nirs@freeshell.org>,
+                2004 Alexander Schremmer <alex AT alexanderweb DOT de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/pollsistersites.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/pollsistersites.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     so we can implement SisterWiki functionality.
     See: http://usemod.com/cgi-bin/mb.pl?SisterSitesImplementationGuide
     
-    @copyright: 2007 by MoinMoin:ThomasWaldmann
+    @copyright: 2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/quicklink.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/quicklink.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - add a quicklink to the user's quicklinks
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.Page import Page
--- a/MoinMoin/action/refresh.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/refresh.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - refresh cache of a page
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.Page import Page
--- a/MoinMoin/action/revert.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/revert.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - revert a page to a previous revision
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.Page import Page
--- a/MoinMoin/action/rss_rc.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/rss_rc.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,6 +5,7 @@
 
     http://feedvalidator.org/
 
+    @copyright: 2006-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import StringIO, re, time
--- a/MoinMoin/action/showtags.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/showtags.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This action shows all sync tags related to a specific page.
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/sisterpages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/sisterpages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     can implement SisterWiki functionality easily.
     See: http://usemod.com/cgi-bin/mb.pl?SisterSitesImplementationGuide
     
-    @copyright: 2007 by MoinMoin:ThomasWaldmann
+    @copyright: 2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/sitemap.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/sitemap.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Generate a URL list of all your pages (using google's sitemap XML format).
 
-    @copyright: 2006 by Thomas Waldmann, MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import time
--- a/MoinMoin/action/subscribe.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/subscribe.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - subscribe to a page to get notified when it changes
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.Page import Page
--- a/MoinMoin/action/test.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/test.py	Tue Mar 27 21:07:33 2007 +0200
@@ -9,7 +9,7 @@
 
     actions_excluded = ["test"]
     
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/action/thread_monitor.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/thread_monitor.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Shows the current traceback of all threads.
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 import os, time
--- a/MoinMoin/action/titleindex.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/titleindex.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     can implement http://www.usemod.com/cgi-bin/mb.pl?MetaWiki more
     easily.
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/userprefs.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/action/userprefs.py	Tue Mar 27 21:07:33 2007 +0200
@@ -11,7 +11,7 @@
     changed. After submitting the form, the user is presented the
     same page he/she was seeing before, and the trail is not modified.
 
-    @copyright: 2006 by Radomir Dopieralski
+    @copyright: 2006 Radomir Dopieralski
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/auth/_PHPsessionParser.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/_PHPsessionParser.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,8 +1,7 @@
 """
     MoinMoin - Parsing of PHP session files
 
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer
-        - Thanks to Spreadshirt
+    @copyright: 2005 MoinMoin:AlexanderSchremmer (Thanks to Spreadshirt)
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/auth/http.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/http.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     reading some .htpasswd file) or Twisted (will accept HTTP auth against
     password stored in moin user profile, but currently will NOT ask for auth).
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin import config, user
--- a/MoinMoin/auth/ldap_login.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/ldap_login.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     This code only creates a user object, the session has to be established by
     the auth.moin_session auth plugin.
     
-    @copyright: 2006 by MoinMoin:ThomasWaldmann, Nick Phillips
+    @copyright: 2006 MoinMoin:ThomasWaldmann, Nick Phillips
     @license: GNU GPL, see COPYING for details.
 """
 import sys
--- a/MoinMoin/auth/log.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/log.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     This does nothing except logging the auth parameters (the password is NOT
     logged, of course).
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/auth/mysql_group.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/mysql_group.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - auth plugin doing a check against MySQL group db
 
-    @copyright: 2006 by Nick Phillips
+    @copyright: 2006 Nick Phillips
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/auth/php_session.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/php_session.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,7 +8,7 @@
          * You need to configure eGroupware in the "header setup" to use
            "php sessions plus restore"
 
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer (Thanks to Spreadshirt)
+    @copyright: 2005 MoinMoin:AlexanderSchremmer (Thanks to Spreadshirt)
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/auth/smb_mount.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/smb_mount.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     authentication at the SMB server). This can be used if you need access
     to files on some share via the wiki, but needs more code to be useful.
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/auth/sslclientcert.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/auth/sslclientcert.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,8 +5,8 @@
     Currently not supported for Twisted web server, but only for web servers
     setting SSL_CLIENT_* environment (e.g. Apache).
     
-    @copyright: 2006 by MoinMoin:ThomasWaldmann,
-                2003 by Martin v. Löwis
+    @copyright: 2003 Martin v. Loewis,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/caching.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/caching.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,8 @@
 """
     MoinMoin caching module
 
-    @copyright: 2001-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001-2004 by Juergen Hermann <jh@web.de>,
+                2006-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/config/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/config/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - site-wide configuration defaults (NOT per single wiki!)
 
-    @copyright: 2005-2006 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2005-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/config/multiconfig.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/config/multiconfig.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Multiple configuration handler and Configuration defaults class
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2005-2006 by MoinMoin:ThomasWaldmann.
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2005-2006 MoinMoin:ThomasWaldmann.
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/converter/text_html_text_moin_wiki.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/converter/text_html_text_moin_wiki.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,7 +1,7 @@
 """
     MoinMoin - convert from html to wiki markup
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann, Reimar Bauer
+    @copyright: 2005-2006 Bastian Blank, Florian Festi, Thomas Waldmann, Reimar Bauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/error.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/error.py	Tue Mar 27 21:07:33 2007 +0200
@@ -3,7 +3,7 @@
 
     Supply Error class and sub classes used to raise various errors
 
-    @copyright: 2004, 2005 by Nir Soffer <nirs@freeshell.org>
+    @copyright: 2004-2005 Nir Soffer <nirs@freeshell.org>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/failure.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/failure.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,10 +1,10 @@
 # -*- coding: iso-8859-1 -*-
 """ MoinMoin failure
 
-Handle fatal errors by showing a message and debugging information.
+    Handle fatal errors by showing a message and debugging information.
 
-@copyright: 2004, 2005 by Nir Soffer <nirs@freeshell.org>
-@license: GNU GPL, see COPYING for details.
+    @copyright: 2004-2005 Nir Soffer <nirs@freeshell.org>
+    @license: GNU GPL, see COPYING for details.
 """
 import sys, os, logging
 
--- a/MoinMoin/filter/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Filter Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_msword.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_msword.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: antiword command from antiword package
     
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_octet_stream.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_octet_stream.py	Tue Mar 27 21:07:33 2007 +0200
@@ -14,7 +14,7 @@
     
     Depends on: nothing (pure python)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_pdf.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_pdf.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: pdftotext command from xpdf-utils package
     
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_ms_excel.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_ms_excel.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: "xls2csv" command from "catdoc" package
     
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_oasis_opendocument.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_oasis_opendocument.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_oasis_opendocument_presentation.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_oasis_opendocument_presentation.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_oasis_opendocument_spreadsheet.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_oasis_opendocument_spreadsheet.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_oasis_opendocument_text.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_oasis_opendocument_text.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_sun_xml.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_sun_xml.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_sun_xml_calc.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_sun_xml_calc.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/application_vnd_sun_xml_writer.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/application_vnd_sun_xml_writer.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: nothing (only python with zlib)
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/audio.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/audio.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - audio/* file Filter
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/image.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/image.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - image/* file Filter
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/image_jpeg.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/image_jpeg.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - image/jpeg Filter
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import EXIF
--- a/MoinMoin/filter/text.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/text.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     We try to support more than ASCII here.
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/text_html.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/text_html.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - text/xml file Filter
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/text_rtf.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/text_rtf.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Depends on: catdoc command from catdoc package
     
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/text_xml.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/text_xml.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - text/xml file Filter
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/filter/video.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/filter/video.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - video/* file Filter
 
-    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/formatter/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     See "base.py" for the formatter interface.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/formatter/dom_xml.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/dom_xml.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - DOM XML Formatter
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/formatter/text_gedit.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/text_gedit.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - "text/html+css" Formatter for feeding the GUI editor
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann, Reimar Bauer
+    @copyright: 2005-2006 Bastian Blank, Florian Festi, Thomas Waldmann, Reimar Bauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/formatter/text_html.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/text_html.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - "text/html+css" Formatter
 
-    @copyright: 2000 - 2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 import os.path, re
--- a/MoinMoin/formatter/text_plain.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/text_plain.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - "text/plain" Formatter
 
-    @copyright: 2000, 2001, 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/formatter/text_python.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/text_python.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Compiles pages to executable python code.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 by Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/formatter/text_xml.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/formatter/text_xml.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - "text/xml" Formatter
 
-    @copyright: 2000, 2001, 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/i18n/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/i18n/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -20,8 +20,8 @@
     TODO: as soon as we have some "farm / server plugin dir", extend this to
           load translations from there, too.
 
-    @copyright: 2001-2004 by Jürgen Hermann <jh@web.de>,
-                2005-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2001-2004 Juergen Hermann <jh@web.de>,
+                2005-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 debug = 0
--- a/MoinMoin/logfile/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/logfile/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This module supports buffered log reads, iterating forward and backward line-by-line, etc.
 
-    @copyright: 2005-2007 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2005-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import logging
--- a/MoinMoin/logfile/editlog.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/logfile/editlog.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,6 +4,7 @@
     This is used for accessing the global edit-log (e.g. by RecentChanges) as
     well as for the local edit-log (e.g. PageEditor, info action).
 
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/logfile/eventlog.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/logfile/eventlog.py	Tue Mar 27 21:07:33 2007 +0200
@@ -3,6 +3,7 @@
     
     The global event-log is mainly used for statistics (e.g. EventStats).
 
+    @copyright: 2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/AbandonedPages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/AbandonedPages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     according to the edit log; if you shortened the log, the displayed
     information may not be what you expect.
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/Action.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/Action.py	Tue Mar 27 21:07:33 2007 +0200
@@ -12,7 +12,7 @@
 
         Same with custom text.
 
-    @copyright: 2004 by Johannes Berg <johannes@sipsolutions.de>
+    @copyright: 2004 Johannes Berg <johannes@sipsolutions.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/AdvancedSearch.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/AdvancedSearch.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,6 +4,8 @@
 
     [[AdvancedSearch]]
         displays advanced search dialog.
+
+    @license: GNU GPL, see COPYING for details.
 """
 
 from MoinMoin.i18n import languages
--- a/MoinMoin/macro/AttachList.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/AttachList.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,8 +8,8 @@
     If pagename isn't set, the current pagename is used.
     If mime_type isn't given, all files are listed.
 
-    @copyright: 2004 Jacob Cohen, Nigel Metheringham
-    @copyright: 2006 Reimar Bauer
+    @copyright: 2004 Jacob Cohen, Nigel Metheringham,
+                2006 Reimar Bauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/BR.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/BR.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This very complicated macro produces a line break.
 
-    @copyright: 2000 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
@@ -12,3 +12,4 @@
 
 def execute(macro, args):
     return macro.formatter.linebreak(0)
+
--- a/MoinMoin/macro/EditTemplates.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/EditTemplates.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Create an action link
 
-    @copyright: 2004 by Johannes Berg <johannes@sipsolutions.de>
+    @copyright: 2004 Johannes Berg <johannes@sipsolutions.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/EmbedObject.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/EmbedObject.py	Tue Mar 27 21:07:33 2007 +0200
@@ -105,8 +105,6 @@
 
 
     MODIFICATION HISTORY:
-        @copyright: 2006 by Reimar Bauer (R.Bauer@fz-juelich.de)      
-        @license: GNU GPL, see COPYING for details.
         initial version: 1.5.0-1
         svg was added by AndrewArmstrong
         2006-05-04 TomSi: added mp3 support
@@ -118,6 +116,9 @@
         2006-10-08 RB type is needed on some platforms, some more keywords added
         2007-02-10 OliverSiemoneit: alt and noembed tags added for AccessibleMoin; fixed
                    output abstraction violation.
+
+    @copyright: 2006 Reimar Bauer (R.Bauer@fz-juelich.de)      
+    @license: GNU GPL, see COPYING for details.
 """
 import mimetypes
 
--- a/MoinMoin/macro/FootNote.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/FootNote.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,9 +5,9 @@
     Collect and emit footnotes. Note that currently footnote
     text cannot contain wiki markup.
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
-                2007 Reimar Bauer
-                2007 by Johannes Berg
+    @copyright: 2002 Juergen Hermann <jh@web.de>,
+                2007 Reimar Bauer,
+                2007 Johannes Berg
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/FullSearch.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/FullSearch.py	Tue Mar 27 21:07:33 2007 +0200
@@ -22,8 +22,8 @@
     TODO: If we need to have context for some cases, either we add a context argument,
           or make another macro that uses context, which may be easier to use.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
-                2005 MoinMoin:FranzPletz
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:FranzPletz
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/FullSearchCached.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/FullSearchCached.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     Refer to the FullSearch documentation for details.
     This macro is cached regardless of the validity of the data.
 
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer
+    @copyright: 2005 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/GetText.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/GetText.py	Tue Mar 27 21:07:33 2007 +0200
@@ -7,7 +7,7 @@
     the description of the related features (which otherwise could
     get very confusing).
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/GetText2.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/GetText2.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     This macro has the main purpose of being used by extensions that write
     data to wiki pages but want to ensure that it is properly translated.
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/Include.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/Include.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,8 +8,8 @@
 
     for detailed docs.
     
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
-    @copyright: 2000-2001 by Richard Jones <richard@bizarsoftware.com.au>
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2000-2001 Richard Jones <richard@bizarsoftware.com.au>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/LikePages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/LikePages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Create list of LikePages
 
-    @copyright: 2004 by Johannes Berg <johannes@sipsolutions.de>
+    @copyright: 2004 Johannes Berg <johannes@sipsolutions.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/Login.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/Login.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - login and sendmail form
 
-    @copyright: 2005-2006 by Radomirs Cirskis <nad2000@gmail.com>
-    @copyright: 2007 Reimar Bauer, Oliver Siemoneit
+    @copyright: 2005-2006 Radomirs Cirskis <nad2000@gmail.com>,
+                2007 Reimar Bauer, Oliver Siemoneit
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.widget import html
--- a/MoinMoin/macro/MonthCalendar.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/MonthCalendar.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,8 +6,8 @@
     The days are links to Wiki pages following this naming convention:
     BasePageName/year-month-day
 
-    @copyright: 2002-2005 by Thomas Waldmann <ThomasWaldmann@gmx.de>
-    @license: GNU GPL - see COPYING for details.
+    @copyright: 2002-2005 MoinMoin:ThomasWaldmann
+    @license: GNU GPL, see COPYING for details.
 
     Revisions:
     * first revision without a number (=1.0):
--- a/MoinMoin/macro/Navigation.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/Navigation.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Navigation Macro
 
-    @copyright: 2003 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/NewPage.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/NewPage.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,10 +6,10 @@
     giving me the pieces I needed to figure all this stuff out:
     http://moinmoin.wikiwikiweb.de/JosYule
 
-    @copyright: 2004 Vito Miliano (vito_moinnewpagewithtemplate@perilith.com)
-    @copyright: 2004 by Nir Soffer <nirs@freeshell.org>
-    @copyright: 2004 Alexander Schremmer <alex AT alexanderweb DOT de>
-    @copyright: 2006 MoinMoin:ReimarBauer
+    @copyright: 2004 Vito Miliano (vito_moinnewpagewithtemplate@perilith.com),
+                2004 by Nir Soffer <nirs@freeshell.org>,
+                2004 Alexander Schremmer <alex AT alexanderweb DOT de>,
+                2006 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/OrphanedPages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/OrphanedPages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - OrphanedPages Macro
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/PageHits.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/PageHits.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - per page hit statistics
 
-    @copyright: 2004-2005 ThomasWaldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2004-2005 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details
 
 """
--- a/MoinMoin/macro/PageSize.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/PageSize.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - PageSize Macro
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/RandomPage.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/RandomPage.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - RandomPage Macro
 
-    @copyright: 2000 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/RandomQuote.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/RandomQuote.py	Tue Mar 27 21:07:33 2007 +0200
@@ -12,7 +12,7 @@
         It will look for list delimiters on the page in question.
         It will ignore anything that is not in an "*" list.
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
     
     Originally written by Thomas Waldmann.
--- a/MoinMoin/macro/RecentChanges.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/RecentChanges.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Parameter "ddiffs" by Ralf Zosel <ralf@zosel.com>, 04.12.2003.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 import time
--- a/MoinMoin/macro/ShowSmileys.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/ShowSmileys.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
 
     Based on code by Nick Trout <trout@users.sf.net>
 
-    @copyright: 2003 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/StatsChart.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/StatsChart.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This macro creates charts from the data in "event.log".
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/SystemAdmin.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/SystemAdmin.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Web interface to do MoinMoin system administration tasks.
 
-    @copyright: 2001, 2003 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/SystemInfo.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/SystemInfo.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This macro shows some info about your wiki, wiki software and your system.
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann,
                 2007 ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/macro/TableOfContents.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/TableOfContents.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Optional integer argument: maximal depth of listing.
 
-    @copyright: 2000, 2001, 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/TeudView.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/TeudView.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,7 +8,7 @@
     Teud: http://purl.net/wiki/python/TeudProject
     4XSLT: http://4suite.org/
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/Verbatim.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/Verbatim.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     Outputs the text verbatimly.
 
-    @copyright: 2005 by Thomas Waldmann
+    @copyright: 2005 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details
 """
 
--- a/MoinMoin/macro/WantedPages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/WantedPages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - WantedPages Macro
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/macro/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -11,7 +11,7 @@
 
     Using "form" directly is deprecated and should be replaced by "request.form".
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/mail/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/mail/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Subpackage containing e-mail support code.
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/mail/mailimport.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/mail/mailimport.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,8 +4,8 @@
     Just call this script with the URL of the wiki as a single argument
     and feed the mail into stdin.
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:AlexanderSchremmer,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/mail/sendmail.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/mail/sendmail.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - email helper functions
 
-    @copyright: 2003 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/packages.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/packages.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Package Installer
 
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer
-                2007 by ReimarBauer
+    @copyright: 2005 MoinMoin:AlexanderSchremmer,
+                2007 ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     See "plain.py" for the most simple parser that also
     defines the parser interface.
 
-    @copyright: 2000 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Plain Text Parser, fallback for text/*
 
-    @copyright: 2000, 2001, 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_cplusplus.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_cplusplus.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
 	MoinMoin - C++ Source Parser
 
-    @copyright: 2002 by Taesu Pyo <bigflood@hitel.net>
+    @copyright: 2002 Taesu Pyo <bigflood@hitel.net>
     @license: GNU GPL, see COPYING for details.
 
 css:
--- a/MoinMoin/parser/text_csv.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_csv.py	Tue Mar 27 21:07:33 2007 +0200
@@ -7,7 +7,7 @@
     Perhaps this should be rewritten using another CSV lib
     because the standard module csv does not support unicode.
 
-    @copyright: 2004 by Oliver Graf <ograf@bitart.de>, Alexander Schremmer
+    @copyright: 2004 Oliver Graf <ograf@bitart.de>, Alexander Schremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_diff.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_diff.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Diff Parser - highlights diff tool output
 
-    @copyright: 2006 by Emilio Lopes, inspired by previous work
-                done by Fabien Ninoles and Jürgen Hermann
+    @copyright: 2006 Emilio Lopes, inspired by previous work
+                done by Fabien Ninoles and Juergen Hermann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_docbook.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_docbook.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,8 +4,8 @@
 
     This code was tested with 4Suite 1.0a4 and 1.0b1
 
-    @copyright: 2005 by Henry Ho <henryho167 AT hotmail DOT com>
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer
+    @copyright: 2005 Henry Ho <henryho167 AT hotmail DOT com>,
+                2005 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 
     DOCBOOK Parser:
--- a/MoinMoin/parser/text_html.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_html.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - HTML Parser
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_irssi.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_irssi.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - IRC Log Parser (irssi style logs)
 
-    @copyright: 2004 by Thomas Waldmann
-    @copyright: 2006 by Georg Brandl (support for /actions)
+    @copyright: 2004 Thomas Waldmann,
+                2006 Georg Brandl (support for /actions)
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_java.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_java.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
 	MoinMoin - Java Source Parser
 
-    @copyright: 2002 by Taesu Pyo <bigflood@hitel.net>
+    @copyright: 2002 Taesu Pyo <bigflood@hitel.net>
     @license: GNU GPL, see COPYING for details.
 
 """
--- a/MoinMoin/parser/text_moin_wiki.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_moin_wiki.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - MoinMoin Wiki Markup Parser
 
-    @copyright: 2000, 2001, 2002 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2000-2002 Juergen Hermann <jh@web.de>,
                 2006 by MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/parser/text_pascal.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_pascal.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
 	MoinMoin - Pascal Source Parser
 
-    @copyright: 2004-2005 by Johannes Berg <johannes@sipsolutions.net>
+    @copyright: 2004-2005 Johannes Berg <johannes@sipsolutions.net>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_python.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_python.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - highlighting Python Source Parser
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/parser/text_rst.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_rst.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - ReStructured Text Parser
 
-    @copyright: 2004 by Matthew Gilbert <gilbert AT voxmea DOT net>
-        and by Alexander Schremmer <alex AT alexanderweb DOT de>
+    @copyright: 2004 Matthew Gilbert <gilbert AT voxmea DOT net>,
+                2004 Alexander Schremmer <alex AT alexanderweb DOT de>
     @license: GNU GPL, see COPYING for details.
 
     REQUIRES docutils 0.3.10 or later (must be later than December 30th, 2005)
--- a/MoinMoin/parser/text_xslt.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/parser/text_xslt.py	Tue Mar 27 21:07:33 2007 +0200
@@ -9,9 +9,9 @@
     * stylesheet can be extended to support other format:
         e.g. Docbook parser using docbook->html .xsl stylesheet
 
-    @copyright: 2001, 2003 by Jürgen Hermann <jh@web.de>
-    @copyright: 2005 by Henry Ho <henryho167@hotmail.com>
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
+                2005 Henry Ho <henryho167@hotmail.com>,
+                2005 by MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/request/CGI.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/CGI.py	Tue Mar 27 21:07:33 2007 +0200
@@ -3,7 +3,7 @@
     MoinMoin - CGI Request Implementation for std. CGI web servers
     like Apache or IIS or others.
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 by Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/CLI.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/CLI.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - CLI Request Implementation for commandline usage.
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/FCGI.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/FCGI.py	Tue Mar 27 21:07:33 2007 +0200
@@ -3,7 +3,7 @@
     MoinMoin - FastCGI Request Implementation for fastcgi and Apache
     (and maybe others).
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/MODPYTHON.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/MODPYTHON.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - mod_python Request Implementation for Apache and mod_python.
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/STANDALONE.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/STANDALONE.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Standalone Moin Server Request Implementation
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/TWISTED.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/TWISTED.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Twisted Request Implementation
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/WSGI.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/WSGI.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - WSGI Request Implementation for std. WSGI web servers.
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/request/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/request/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - RequestBase Implementation
 
-    @copyright: 2001-2003 by Jürgen Hermann <jh@web.de>,
+    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
                 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/script/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Extension Script Package
 
-    @copyright: 2000-2002 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2000-2002 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/account/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/account/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - User Accounts Script Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/account/check.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/account/check.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - check / process user accounts
 
-    @copyright: 2003-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 
     Why is this needed?
--- a/MoinMoin/script/account/create.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/account/create.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - create a user account
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/account/disable.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/account/disable.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - disable a user account
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/cli/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/cli/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - CLI usage Script Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/cli/show.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/cli/show.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Just run a CLI request and show the output.
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/export/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/export/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Export Script Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/export/dump.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/export/dump.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,8 +5,8 @@
     You must run this script as owner of the wiki files, usually this is the
     web server user.
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>,
-                2005-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>,
+                2005-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 
 """
--- a/MoinMoin/script/import/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/import/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Import Script Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/import/irclog.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/import/irclog.py	Tue Mar 27 21:07:33 2007 +0200
@@ -10,8 +10,8 @@
     Usage:
     moin --config-dir=... --wiki-url=... import irclog --author=IrcLogImporter --file-dir=.
     
-    @copyright: 2005 by MoinMoin:AlexanderSchremmer
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2005 MoinMoin:AlexanderSchremmer,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/index/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/index/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     TODO: rename this module back to xapian when script framework is
     fixed to not confuse it with the xapian.org "xapian" module.
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/index/build.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/index/build.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     You must run this script as owner of the wiki files, usually this is the
     web server user.
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/maint/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/maint/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Maintenance Script Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/maint/cleancache.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/maint/cleancache.py	Tue Mar 27 21:07:33 2007 +0200
@@ -12,7 +12,7 @@
     text_html is the name of the cache file used for compiled pages formatted
     by the wiki text to html formatter,
 
-    @copyright: 2005-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2005-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/maint/cleanpage.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/maint/cleanpage.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
     
     Then please review the output before running it!
 
-    @copyright: 2005-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2005-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/maint/globaledit.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/maint/globaledit.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     As it is, this script is mostly useful for the MoinMoin release maintainer
     using: moin ... --wiki-url=moinmaster.wikiwikiweb.de/ maint globaledit
     
-    @copyright: 2004-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2004-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 debug = False
--- a/MoinMoin/script/maint/mkpagepacks.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/maint/mkpagepacks.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Package Generator
 
-    @copyright: 2005 by Alexander Schremmer,
-                2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2005 Alexander Schremmer,
+                2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/maint/reducewiki.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/maint/reducewiki.py	Tue Mar 27 21:07:33 2007 +0200
@@ -20,7 +20,7 @@
         * data/pages/PageName/attachments/*
           -> just copy
 
-    @copyright: 2005-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2005-2006 MoinMoin:ThomasWaldmann
     @license: GPL, see COPYING for details
 """
 
--- a/MoinMoin/script/migration/1050300.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/migration/1050300.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     We add a filter plugin dir here.
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.script.migration.migutil import opj, listdir, copy_file, move_file, copy_dir, makedir
--- a/MoinMoin/script/migration/1050301.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/migration/1050301.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Nothing to do, we just return the new data dir revision.
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/migration/1050400.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/migration/1050400.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Nothing to do, we just return the new data dir revision.
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/migration/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/migration/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Migration Script Package
 
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/migration/data.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/migration/data.py	Tue Mar 27 21:07:33 2007 +0200
@@ -13,7 +13,7 @@
                mig scripts ONCE and in correct order manually before attempting
                to use the new style migration stuff.
                
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/migration/migutil.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/migration/migutil.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - utility functions used by the migration scripts
 
-    @copyright: 2005 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2005 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import os, sys, shutil
--- a/MoinMoin/script/moin.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/moin.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
 
     Usage: moin cmdmodule cmdname [options]
                
-    @copyright: 2006 by Thomas Waldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/xmlrpc/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/xmlrpc/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - XMLRPC CLI Scripts
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/xmlrpc/mailimport.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/xmlrpc/mailimport.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Imports a mail into the wiki.
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/xmlrpc/remote.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/script/xmlrpc/remote.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This can be used as client to execute moin scripts remotely.
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/security/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/security/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -10,7 +10,7 @@
     Then assign your new class to "SecurityPolicy" in wikiconfig;
     and I mean the class, not an instance of it!
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/security/antispam.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/security/antispam.py	Tue Mar 27 21:07:33 2007 +0200
@@ -6,7 +6,7 @@
     If started from commandline, it prints a merged list (moinmaster + MT) on
     stdout, and what it got additionally from MT on stderr.
     
-    @copyright: 2005 by Thomas Waldmann
+    @copyright: 2005 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details
 """
 
--- a/MoinMoin/security/autoadmin.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/security/autoadmin.py	Tue Mar 27 21:07:33 2007 +0200
@@ -52,7 +52,7 @@
        Use <ProjectName>/ReadWriteGroup and /ReadGroup etc. as you would do for
        a homepage (see above).
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann
+    @copyright: 2005-2006 Bastian Blank, Florian Festi, Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/server/STANDALONE.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/server/STANDALONE.py	Tue Mar 27 21:07:33 2007 +0200
@@ -28,9 +28,9 @@
 
     Significant contributions to this module by R. Church <rc@ghostbitch.org>
 
-    @copyright: 2001-2004 MoinMoin:JürgenHermann
-    @copyright: 2005      MoinMoin:AlexanderSchremmer
-    @copyright: 2005      MoinMoin:NirSoffer
+    @copyright: 2001-2004 MoinMoin:JuergenHermann,
+                2005 MoinMoin:AlexanderSchremmer,
+                2005 MoinMoin:NirSoffer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/server/TWISTED.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/server/TWISTED.py	Tue Mar 27 21:07:33 2007 +0200
@@ -17,7 +17,7 @@
 
     Then run this code with twistd -y yourcode.py. See moin_twisted script.
 
-    @copyright: 2004 by Thomas Waldmann, Oliver Graf, Nir Soffer
+    @copyright: 2004 Thomas Waldmann, Oliver Graf, Nir Soffer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/server/WSGI.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/server/WSGI.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,7 +1,7 @@
 """
     MoinMoin - WSGI application
 
-    @copyright: 2005 by Anakim Border <akborder@gmail.com>
+    @copyright: 2005 Anakim Border <akborder@gmail.com>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/server/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/server/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Supply common server utilities.
 
-    @copyright: 2004 by Nir Soffer
+    @copyright: 2004 Nir Soffer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/stats/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/stats/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Statistics
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/stats/chart.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/stats/chart.py	Tue Mar 27 21:07:33 2007 +0200
@@ -11,7 +11,7 @@
         c.option(title = 'gdchart Demo')
         c.draw(Chart.GDC_LINE, (600, 300), 'test.gif')
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/stats/hitcounts.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/stats/hitcounts.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,7 +8,7 @@
           A lot of code here is duplicated in stats.useragents.
           Maybe both can use same base class, maybe some parts are useful to other code.
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/stats/pagesize.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/stats/pagesize.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     This macro creates a bar graph of page size classes.
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/stats/useragents.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/stats/useragents.py	Tue Mar 27 21:07:33 2007 +0200
@@ -7,7 +7,7 @@
     
     TODO: should be refactored after hitcounts.
 
-    @copyright: 2002-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/support/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/support/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -7,7 +7,7 @@
     source file is copyrighted by its respective author. We've done
     our best to assure those files are freely redistributable.
 
-    @copyright: 2001-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001-2004 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/theme/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/theme/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Theme Package
 
-    @copyright: 2003-2007 by MoinMoin:ThomasWaldmann
+    @copyright: 2003-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/theme/classic.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/theme/classic.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,7 +8,7 @@
     If you want modified behaviour, just override the stuff you
     want to change in the child class.
 
-    @copyright: 2003-2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2003-2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/theme/modern.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/theme/modern.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - modern theme
 
-    @copyright: 2003-2005 by Nir Soffer, Thomas Waldmann
+    @copyright: 2003-2005 Nir Soffer, Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/theme/rightsidebar.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/theme/rightsidebar.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     Created by and for crw.
     Later it was rewritten by Nir Soffer for MoinMoin release 1.3.
 
-    @copyright: 2005 by Nir Soffer
+    @copyright: 2005 Nir Soffer
     @license: GNU GPL, see COPYING for details.  
 """
 
--- a/MoinMoin/user.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/user.py	Tue Mar 27 21:07:33 2007 +0200
@@ -8,7 +8,8 @@
 
     The UserPreferences form support stuff is in module userform.
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2003-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/userform.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/userform.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,8 @@
 """
     MoinMoin - UserPreferences Form and User Browser
 
-    @copyright: 2001-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001-2004 Juergen Hermann <jh@web.de>,
+                2003-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/bdiff.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/bdiff.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,8 +1,8 @@
 """
     MoinMoin - Binary patching and diffing
 
-    @copyright: 2005 Matt Mackall <mpm@selenic.com>
-    @copyright: 2006 MoinMoin:AlexanderSchremmer
+    @copyright: 2005 Matt Mackall <mpm@selenic.com>,
+                2006 MoinMoin:AlexanderSchremmer
     
     Algorithm taken from mercurial's mdiff.py
     
--- a/MoinMoin/util/chartypes_create.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/chartypes_create.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
     Build MoinMoin/util/chartypes.py with
     UCS-2 character types (upper/lower/digits/spaces).
     
-    @copyright: 2004 Thomas Waldmann
+    @copyright: 2004 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details
 """
 
--- a/MoinMoin/util/dataset.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/dataset.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     Datasets are used by the DataBrowserWidget, and with the
     statistics code.
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/diff3.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/diff3.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - diff3 algorithm
     
-    @copyright: 2002 by Florian Festi
+    @copyright: 2002 Florian Festi
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/diff_html.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/diff_html.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Side by side diffs
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
-    @copyright: 2002 by Scott Moonen <smoonen@andstuff.org>
+    @copyright: 2002 Juergen Hermann <jh@web.de>,
+                2002 Scott Moonen <smoonen@andstuff.org>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/diff_text.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/diff_text.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - simple text diff (uses difflib)
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.support import difflib
--- a/MoinMoin/util/filesys.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/filesys.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - File System Utilities
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/lock.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/lock.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - locking functions
 
-    @copyright: 2005 by Florian Festi, Nir Soffer
+    @copyright: 2005 Florian Festi, Nir Soffer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/pysupport.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/pysupport.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Supporting function for Python magic
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/rpc_aggregator.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/rpc_aggregator.py	Tue Mar 27 21:07:33 2007 +0200
@@ -5,7 +5,7 @@
     Aggregates RPC calls into MultiCall batches in order to increase
     the speed.
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/thread_monitor.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/thread_monitor.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,16 +1,16 @@
 # -*- coding: ascii -*-
 """
-Thread monitor - Check the state of all threads.
+    Thread monitor - Check the state of all threads.
 
-Just call activate_hook() as early as possible in program execution.
-Then you can trigger the output of tracebacks of all threads
-by calling trigger_dump().
+    Just call activate_hook() as early as possible in program execution.
+    Then you can trigger the output of tracebacks of all threads
+    by calling trigger_dump().
 
-Usage of Python 2.5 is recommended because it allows for a much safer
-and faster frame extraction.
+    Usage of Python 2.5 is recommended because it allows for a much safer
+    and faster frame extraction.
 
-@copyright: 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
-@license: GNU GPL Version 2
+    @copyright: 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
+    @license: GNU GPL Version 2
 """
 
 
--- a/MoinMoin/util/timefuncs.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/timefuncs.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Date & Time Utilities
 
-    @copyright: 2003 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/util/web.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/util/web.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Helper functions for WWW stuff
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/version.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/version.py	Tue Mar 27 21:07:33 2007 +0200
@@ -3,7 +3,8 @@
 """
     MoinMoin - Version Information
 
-    @copyright: 2000-2006 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2006 Juergen Hermann <jh@web.de>,
+                2003-2007 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import sys
--- a/MoinMoin/widget/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/widget/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Interface Widgets
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/widget/base.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/widget/base.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Widget base class
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/widget/browser.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/widget/browser.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - DataBrowserWidget
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/widget/dialog.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/widget/dialog.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - dialog
 
-    @copyright: 2004 by Nir Soffer <nirs@freeshell.org>
+    @copyright: 2004 Nir Soffer <nirs@freeshell.org>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/widget/html.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/widget/html.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - HTML Widgets
 
-    @copyright: 2003 by Jürgen Hermann <jh@web.de>
+    @copyright: 2003 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/wikidicts.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/wikidicts.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,8 @@
 """
     MoinMoin - Dictionary / Group Functions
 
-    @copyright: 2003-2006 by Thomas Waldmann, MoinMoin:ThomasWaldmann
-    @copyright: 2003 by Gustavo Niemeyer, http://moin.conectiva.com.br/GustavoNiemeyer
+    @copyright: 2003-2006 MoinMoin:ThomasWaldmann,
+                2003 by Gustavo Niemeyer, http://moin.conectiva.com.br/GustavoNiemeyer
     @license: GNU GPL, see COPYING for details.
 """
 import re, time
--- a/MoinMoin/wikisync.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/wikisync.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Wiki Synchronisation
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/wikiutil.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/wikiutil.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,8 +2,9 @@
 """
     MoinMoin - Wiki Utility Functions
 
-    @copyright: 2000 - 2004 by Jürgen Hermann <jh@web.de>
-                2007 by Reimar Bauer
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2005-2007 MoinMoin:ThomasWaldmann,
+                2007 Reimar Bauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/wikixml/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/wikixml/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
 
     Subpackage containing XML support code.
 
-    @copyright: 2001, 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001-2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/wikixml/marshal.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/wikixml/marshal.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - XML Serialization
 
-    @copyright: 2002 by Jürgen Hermann <jh@web.de>
+    @copyright: 2002 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/wikixml/util.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/wikixml/util.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - XML Utilities
 
-    @copyright: 2001 by Jürgen Hermann <jh@web.de>
+    @copyright: 2001 Juergen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/HelloWorld.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/HelloWorld.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - This is just a sample for a xmlrpc plugin
 
-    @copyright: 2005 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2005 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/ProcessMail.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/ProcessMail.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - This plugin is used for multi-tier mail processing
 
-    @copyright: 2006 by MoinMoin:AlexanderSchremmer
+    @copyright: 2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/RemoteScript.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/RemoteScript.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Remote Script Execution Server part
 
-    @copyright: 2006 by MoinMoin:ThomasWaldmann
+    @copyright: 2006 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/UpdateGroup.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/UpdateGroup.py	Tue Mar 27 21:07:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Wiki XMLRPC group creation
 
-    @copyright: (c) Bastian Blank, Florian Festi, Thomas Waldmann
+    @copyright: 2005-2006 Bastian Blank, Florian Festi, Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/WhoAmI.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/WhoAmI.py	Tue Mar 27 21:07:33 2007 +0200
@@ -1,9 +1,8 @@
 # -*- coding: iso-8859-1 -*-
 """
     MoinMoin - Tells who you are and whether the wiki trusts you.
-               
 
-    @copyright: 2005 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2005 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/__init__.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/__init__.py	Tue Mar 27 21:07:33 2007 +0200
@@ -20,8 +20,8 @@
     when really necessary (like for transferring binary files like
     attachments maybe).
 
-    @copyright: 2003-2006 MoinMoin:ThomasWaldmann
-    @copyright: 2004-2006 MoinMoin:AlexanderSchremmer
+    @copyright: 2003-2006 MoinMoin:ThomasWaldmann,
+                2004-2006 MoinMoin:AlexanderSchremmer
     @license: GNU GPL, see COPYING for details
 """
 from MoinMoin.util import pysupport
--- a/MoinMoin/xmlrpc/putClientInfo.py	Mon Mar 26 01:24:53 2007 +0200
+++ b/MoinMoin/xmlrpc/putClientInfo.py	Tue Mar 27 21:07:33 2007 +0200
@@ -4,7 +4,7 @@
     It also helps MoinMoin development team  to improve xmlrpc stuff and get
     some statistics about MoinMoin usage.
 
-    @copyright: 2004 Thomas Waldmann
+    @copyright: 2004 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.    
 """