changeset 3115:cd6cfc715261

replace wikiwikiweb.de by moinmo.in, replace contact Juergen Hermann by Thomas Waldmann, cleanup wikiconfig (ported from 1.6)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 25 Feb 2008 23:53:55 +0100
parents 338ad6aee6da
children 240d1d367018
files MoinMoin/config/multiconfig.py MoinMoin/failure.py MoinMoin/i18n/README MoinMoin/i18n/tools/mail_i18n-maintainers2.txt MoinMoin/i18n/tools/po2wiki.py MoinMoin/i18n/tools/wiki2po.py MoinMoin/macro/NewPage.py MoinMoin/script/old/xmlrpc-tools/HelloWorld.py MoinMoin/script/old/xmlrpc-tools/UpdateGroupTest.py MoinMoin/script/old/xmlrpc-tools/WhoAmI.py MoinMoin/script/old/xmlrpc-tools/getmasterpages2.py MoinMoin/script/old/xmlrpc-tools/getsystempages.py MoinMoin/script/old/xmlrpc-tools/getsystempages2.py MoinMoin/search/_tests/test_search.py contrib/DesktopEdition/package_desktop.cmd contrib/TWikiDrawPlugin/README moin.spec setup.py wiki/config/more_samples/ldap_smb_farmconfig.py wiki/config/wikiconfig.py wiki/config/wikifarm/farmconfig.py wikiconfig.py
diffstat 22 files changed, 34 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/config/multiconfig.py	Mon Feb 25 23:53:55 2008 +0100
@@ -224,7 +224,7 @@
 
     actions_excluded = ['xmlrpc'] # ['DeletePage', 'AttachFile', 'RenamePage', 'test', ]
     allow_xslt = False
-    antispam_master_url = "http://moinmaster.wikiwikiweb.de:8000/?action=xmlrpc2"
+    antispam_master_url = "http://master.moinmo.in/?action=xmlrpc2"
     attachments = None # {'dir': path, 'url': url-prefix}
     auth = [authmodule.MoinLogin()]
     # default to http and xmlrpc_applytoken to get old semantics
@@ -445,7 +445,7 @@
     page_credits = [
         # Feel free to add other credits, but PLEASE do NOT change or remove
         # the following links - you help us by keeping them "as is":
-        '<a href="http://moinmoin.wikiwikiweb.de/" title="This site uses the MoinMoin Wiki software.">MoinMoin Powered</a>',
+        '<a href="http://moinmo.in/" title="This site uses the MoinMoin Wiki software.">MoinMoin Powered</a>',
         '<a href="http://moinmo.in/Python" title="MoinMoin is written in Python.">Python Powered</a>',
 
         # Optional credits:
--- a/MoinMoin/failure.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/failure.py	Mon Feb 25 23:53:55 2008 +0100
@@ -86,10 +86,10 @@
                           'Show debugging information')]
         if self.info[0] != ConfigurationError:
             buttons.append(
-                   f.link('http://moinmoin.wikiwikiweb.de/MoinMoinBugs',
+                   f.link('http://moinmo.in/MoinMoinBugs',
                           'Report bug'))
             buttons.append(
-                   f.link('http://moinmoin.wikiwikiweb.de/FrontPage',
+                   f.link('http://moinmo.in/FrontPage',
                           'Visit MoinMoin wiki'))
         return f.list(buttons, {'class': 'buttons'})
 
--- a/MoinMoin/i18n/README	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/i18n/README	Mon Feb 25 23:53:55 2008 +0100
@@ -1,7 +1,7 @@
 Translators and Developers,
 
 Translators need to deal with the *.po files ONLY - they should do this on
-http://moinmaster.wikiwikiweb.de/MoinI18n/<language-code>, please do not
+http://master.moinmo.in/MoinI18n/<language-code>, please do not
 send po updates via email, the stuff from the moinmaster wiki gets processed
 automatically.
 
--- a/MoinMoin/i18n/tools/mail_i18n-maintainers2.txt	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/i18n/tools/mail_i18n-maintainers2.txt	Mon Feb 25 23:53:55 2008 +0100
@@ -13,7 +13,7 @@
 be there when we release next version.
 
 Please also don't forget to update status here:
-http://moinmoin.wikiwikiweb.de/MoinDev/Translation
+http://moinmo.in/MoinDev/Translation
 
 Thanks,
 
--- a/MoinMoin/i18n/tools/po2wiki.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/i18n/tools/po2wiki.py	Mon Feb 25 23:53:55 2008 +0100
@@ -48,7 +48,7 @@
     pagedata = data.encode('utf-8')
 
     authtrans = BasicAuthTransport(user, password)
-    wiki = xmlrpclib.ServerProxy("http://moinmaster.wikiwikiweb.de/?action=xmlrpc2", transport=authtrans)
+    wiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2", transport=authtrans)
 
     rc = wiki.putPage(pagename, pagedata)
     print "Page: %s rc=%s" % (pagename, rc)
--- a/MoinMoin/i18n/tools/wiki2po.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/i18n/tools/wiki2po.py	Mon Feb 25 23:53:55 2008 +0100
@@ -13,7 +13,7 @@
     lang = sys.argv[1]
 
     if not lang in excluded:
-        wiki = xmlrpclib.ServerProxy("http://moinmaster.wikiwikiweb.de/?action=xmlrpc2")
+        wiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2")
 
         pagename = "MoinI18n/%s" % lang
         print pagename
--- a/MoinMoin/macro/NewPage.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/macro/NewPage.py	Mon Feb 25 23:53:55 2008 +0100
@@ -3,8 +3,7 @@
     MoinMoin - New Page macro
 
     Thanks to Jos Yule's "blogpost" action and his modified Form for
-    giving me the pieces I needed to figure all this stuff out:
-    http://moinmoin.wikiwikiweb.de/JosYule
+    giving me the pieces I needed to figure all this stuff out: MoinMoin:JosYule
 
     @copyright: 2004 Vito Miliano (vito_moinnewpagewithtemplate@perilith.com),
                 2004 by Nir Soffer <nirs@freeshell.org>,
--- a/MoinMoin/script/old/xmlrpc-tools/HelloWorld.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/script/old/xmlrpc-tools/HelloWorld.py	Mon Feb 25 23:53:55 2008 +0100
@@ -9,7 +9,7 @@
 
 def run():
     import xmlrpclib
-    srcwiki = xmlrpclib.ServerProxy("http://moinmaster.wikiwikiweb.de:8000/?action=xmlrpc2")
+    srcwiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2")
     print srcwiki.HelloWorld("Hello Wiki User!\n")
 
 if __name__ == "__main__":
--- a/MoinMoin/script/old/xmlrpc-tools/UpdateGroupTest.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/script/old/xmlrpc-tools/UpdateGroupTest.py	Mon Feb 25 23:53:55 2008 +0100
@@ -15,7 +15,7 @@
     user = "XmlRpc"
     password = "wrong"
     dsttrans = BasicAuthTransport(user, password)
-    mywiki = xmlrpclib.ServerProxy("http://enterprise.wikiwikiweb.de:8888/?action=xmlrpc2", transport=dsttrans)
+    mywiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2", transport=dsttrans)
 
     groupname = "TestGroup"
     groupdesc = "This is just a test."
@@ -33,7 +33,7 @@
     user = "XmlRpc"
     password = "completelywrong"
     dsttrans = BasicAuthTransport(user, password)
-    mywiki = xmlrpclib.ServerProxy("http://enterprise.wikiwikiweb.de:8888/?action=xmlrpc2", transport=dsttrans)
+    mywiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2", transport=dsttrans)
 
     groupname = "TestGroup"
     groupdesc = "This is just a test."
--- a/MoinMoin/script/old/xmlrpc-tools/WhoAmI.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/script/old/xmlrpc-tools/WhoAmI.py	Mon Feb 25 23:53:55 2008 +0100
@@ -17,7 +17,7 @@
     from MoinMoin.support.BasicAuthTransport import BasicAuthTransport
 
     srctrans = BasicAuthTransport(user, password)
-    srcwiki = xmlrpclib.ServerProxy("http://moinmaster.wikiwikiweb.de/?action=xmlrpc2", transport=srctrans)
+    srcwiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2", transport=srctrans)
 
     print srcwiki.WhoAmI()
 
--- a/MoinMoin/script/old/xmlrpc-tools/getmasterpages2.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/script/old/xmlrpc-tools/getmasterpages2.py	Mon Feb 25 23:53:55 2008 +0100
@@ -13,10 +13,10 @@
 from MoinMoin import wikiutil
 from MoinMoin.support.BasicAuthTransport import BasicAuthTransport
 
-srcurlformat = "http://moinmaster.wikiwikiweb.de/%s?action=raw"
+srcurlformat = "http://master.moinmo.in/%s?action=raw"
 user = "YourWikiName"
 password = "yourbasicauthpassword"
-srcwiki = xmlrpclib.ServerProxy("http://moinmaster.wikiwikiweb.de/?action=xmlrpc2")
+srcwiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc2")
 dsttrans = BasicAuthTransport(user, password)
 dstwiki = xmlrpclib.ServerProxy("http://devel.linuxwiki.org/moin--main/__xmlrpc/?action=xmlrpc2", transport=dsttrans)
 
--- a/MoinMoin/script/old/xmlrpc-tools/getsystempages.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/script/old/xmlrpc-tools/getsystempages.py	Mon Feb 25 23:53:55 2008 +0100
@@ -10,8 +10,8 @@
 
 from xmlrpclib import *
 
-srcwiki = ServerProxy("http://moinmaster.wikiwikiweb.de/?action=xmlrpc")
-#srcwiki = ServerProxy("http://moinmaster.wikiwikiweb.de/?action=xmlrpc")
+srcwiki = ServerProxy("http://master.moinmo.in/?action=xmlrpc")
+#srcwiki = ServerProxy("http://master.moinmo.in/?action=xmlrpc")
 dstwiki = ServerProxy("http://devel.linuxwiki.org/moin--cvs?action=xmlrpc")
 
 def transferpage(srcwiki, dstwiki, pagename):
--- a/MoinMoin/script/old/xmlrpc-tools/getsystempages2.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/script/old/xmlrpc-tools/getsystempages2.py	Mon Feb 25 23:53:55 2008 +0100
@@ -9,7 +9,7 @@
 import xmlrpclib
 from MoinMoin.support.BasicAuthTransport import BasicAuthTransport
 
-#srcwiki = xmlrpclib.ServerProxy("http://moinmaster.wikiwikiweb.de/FrontPage?action=xmlrpc")
+#srcwiki = xmlrpclib.ServerProxy("http://master.moinmo.in/?action=xmlrpc")
 user = "YourWikiName"
 password = "yourbasicauthpassword"
 srctrans = BasicAuthTransport(user, password)
--- a/MoinMoin/search/_tests/test_search.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/MoinMoin/search/_tests/test_search.py	Mon Feb 25 23:53:55 2008 +0100
@@ -15,7 +15,7 @@
 class TestQuotingBug:
     """search: quoting bug tests
 
-    http://moinmoin.wikiwikiweb.de/MoinMoinBugs/SearchOneCharString
+       MoinMoin:MoinMoinBugs/SearchOneCharString
     """
 
     def testIsQuoted(self):
--- a/contrib/DesktopEdition/package_desktop.cmd	Sat Jan 05 01:30:48 2008 +0100
+++ b/contrib/DesktopEdition/package_desktop.cmd	Mon Feb 25 23:53:55 2008 +0100
@@ -62,7 +62,7 @@
 	echo licensed under GNU GPL, see COPYING>> moin-desktop\readme_desktop.txt
 	echo %version%, see the page SystemInfo for exact revision>> moin-desktop\readme_desktop.txt
 	echo.>> moin-desktop\readme_desktop.txt
-	echo See http://moinmoin.wikiwikiweb.de/DesktopEdition for current information.>> moin-desktop\readme_desktop.txt
+	echo See http://moinmo.in/DesktopEdition for current information.>> moin-desktop\readme_desktop.txt
 	echo.>> moin-desktop\readme_desktop.txt
 	echo MoinMoin needs Python in order to run. You can download it here: http://www.python.org/download/>> moin-desktop\readme_desktop.txt
 	echo Python 2.4.3 is recommended, Python 2.3 is required. Nothing else is needed.>> moin-desktop\readme_desktop.txt
--- a/contrib/TWikiDrawPlugin/README	Sat Jan 05 01:30:48 2008 +0100
+++ b/contrib/TWikiDrawPlugin/README	Mon Feb 25 23:53:55 2008 +0100
@@ -21,7 +21,7 @@
 and creates a twikidraw.jar in /contrib/TWikiDrawPlugin/build directory.
 
 TODO:
- * look at http://moinmoin.wikiwikiweb.de/MoinMoinTodo/Release_1.5 - see
+ * look at http://moinmo.in/MoinMoinTodo/Release%201.5 - see
    the "Unfinished" section for more todo stuff relating to TWikiDraw
  * make some bash script that invokes the build process and puts the resulting
    applet into wiki/htdocs/applets/TWikiDrawPlugin
@@ -33,4 +33,4 @@
 
 References:
  - Original site: http://twiki.org/cgi-bin/view/Plugins/TWikiDrawPlugin
- - Moin changes: http://moinmoin.wikiwikiweb.de/OliverGraf/TWikiDrawPlugin
+ - Moin changes: http://moinmo.in/OliverGraf/TWikiDrawPlugin
--- a/moin.spec	Sat Jan 05 01:30:48 2008 +0100
+++ b/moin.spec	Mon Feb 25 23:53:55 2008 +0100
@@ -28,7 +28,7 @@
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://moinmoin.wikiwikiweb.de
+URL:            http://moinmo.in/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArchitectures: noarch
--- a/setup.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/setup.py	Mon Feb 25 23:53:55 2008 +0100
@@ -4,7 +4,7 @@
     MoinMoin installer
 
     @copyright: 2001-2005 by Jürgen Hermann <jh@web.de>,
-                2006 by MoinMoin:ThomasWaldmann
+                2006-2007 by MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 
@@ -204,9 +204,9 @@
     'name': "moin",
     'version': release,
     'description': "MoinMoin %s.%s is a Python clone of WikiWiki" % (release, revision),
-    'author': "Jürgen Hermann",
-    'author_email': "jh@web.de",
-    'url': "http://moinmoin.wikiwikiweb.de/",
+    'author': "Thomas Waldmann",
+    'author_email': "tw-public@gmx.de",
+    'url': "http://moinmo.in/",
     'license': "GNU GPL",
     'long_description': """
 A WikiWikiWeb is a collaborative hypertext environment, with an
--- a/wiki/config/more_samples/ldap_smb_farmconfig.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/wiki/config/more_samples/ldap_smb_farmconfig.py	Mon Feb 25 23:53:55 2008 +0100
@@ -231,7 +231,7 @@
 
     # Language options --------------------------------------------------
 
-    # See http://moinmoin.wikiwikiweb.de/ConfigMarket for configuration in
+    # See http://moinmo.in/ConfigMarket for configuration in
     # YOUR language that other people contributed.
 
     # The main wiki language, set the direction of the wiki pages
--- a/wiki/config/wikiconfig.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/wiki/config/wikiconfig.py	Mon Feb 25 23:53:55 2008 +0100
@@ -18,7 +18,7 @@
     the module MoinMoin.config.multiconfig for a full list of names and their
     default values.
 
-    Also, the URL http://moinmoin.wikiwikiweb.de/HelpOnConfiguration has
+    Also, the URL http://moinmo.in/HelpOnConfiguration has
     a list of config options.
 
     ** Please do not use this file for a wiki farm. Use the sample file
@@ -142,7 +142,7 @@
 
     # Language options --------------------------------------------------
 
-    # See http://moinmoin.wikiwikiweb.de/ConfigMarket for configuration in
+    # See http://moinmo.in/ConfigMarket for configuration in
     # YOUR language that other people contributed.
 
     # The main wiki language, set the direction of the wiki pages
--- a/wiki/config/wikifarm/farmconfig.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/wiki/config/wikifarm/farmconfig.py	Mon Feb 25 23:53:55 2008 +0100
@@ -17,7 +17,7 @@
     the module MoinMoin.config.multiconfig for a full list of names and their
     default values.
 
-    Also, the URL http://moinmoin.wikiwikiweb.de/HelpOnConfiguration has
+    Also, the URL http://moinmo.in/HelpOnConfiguration has
     a list of config options.
 """
 
@@ -48,8 +48,8 @@
     ("mywiki", r".*"),   # this is ok for a single wiki
 
     # for multiple wikis, do something like this:
-    #("moinmoin",    r"^moinmoin.wikiwikiweb.de/.*$"),
-    #("moinmaster",  r"^moinmaster.wikiwikiweb.de/.*$"),
+    #("moinmoin",    r"^moinmo.in/.*$"),
+    #("moinmaster",  r"^master.moinmo.in/.*$"),
 ]
 
 
@@ -154,7 +154,7 @@
 
     # Language options --------------------------------------------------
 
-    # See http://moinmoin.wikiwikiweb.de/ConfigMarket for configuration in
+    # See http://moinmo.in/ConfigMarket for configuration in
     # YOUR language that other people contributed.
 
     # The main wiki language, set the direction of the wiki pages
--- a/wikiconfig.py	Sat Jan 05 01:30:48 2008 +0100
+++ b/wikiconfig.py	Mon Feb 25 23:53:55 2008 +0100
@@ -21,10 +21,6 @@
     sitename = u'MoinMoin DesktopEdition'
     logo_string = u'<img src="/moin_static170/common/moinmoin.png" alt="MoinMoin Logo">'
     page_front_page = u'FrontPage' # change to some better value
-    page_credits = [
-        '<a href="http://moinmoin.wikiwikiweb.de/">MoinMoin DesktopEdition Powered</a>',
-        '<a href="http://www.python.org/">Python Powered</a>',
-    ]
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
 
     # developers, add your testing config values in this file