changeset 1059:0d32e92fbfe1

Merge with main. Hopefully it didn't break the CHANGES file ...
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Tue, 25 Jul 2006 23:00:30 +0200
parents 91e8f75b006b (current diff) 4d1d491c3631 (diff)
children 9d13bc34ac0a
files docs/CHANGES
diffstat 4 files changed, 37 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jul 25 22:58:54 2006 +0200
+++ b/Makefile	Tue Jul 25 23:00:30 2006 +0200
@@ -33,7 +33,7 @@
 
 # Create documentation
 epydoc: patchlevel
-	@epydoc -o ../html -n MoinMoin -u http://moinmoin.wikiwikiweb.de MoinMoin
+	@epydoc -o ../html-1.6 -n MoinMoin -u http://moinmoin.wikiwikiweb.de MoinMoin
 
 # Create new underlay directory from MoinMaster
 # Should be used only on TW machine
--- a/MoinMoin/__init__.py	Tue Jul 25 22:58:54 2006 +0200
+++ b/MoinMoin/__init__.py	Tue Jul 25 23:00:30 2006 +0200
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 """
-MoinMoin Version 1.6.0alpha bf18e19e618d+ tip
+MoinMoin Version 1.6.0alpha 61142a50c41b+ tip
 
 @copyright: 2000-2006 by Jürgen Hermann <jh@web.de>
 @license: GNU GPL, see COPYING for details.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/multiconfig.py	Tue Jul 25 23:00:30 2006 +0200
@@ -0,0 +1,28 @@
+""" This is just a dummy file to overwrite MoinMoin/multiconfig.py(c) from a
+    previous moin installation.
+
+    The file moved to MoinMoin/config/multiconfig.py and you have to fix your
+    imports as shown below.
+
+    Alternatively, you can temporarily set show_configuration_error = False,
+    so some compatibility code will get activated.
+    But this compatibility code will get removed soon, so you really should
+    update your config as soon as possible.
+"""
+show_configuration_error = True
+
+if show_configuration_error:
+    from MoinMoin.error import ConfigurationError
+    raise ConfigurationError("""\
+Please edit your wikiconfig/farmconfig and fix your DefaultConfig import:\r\n
+\r\n
+Old:   from MoinMoin.multiconfig import DefaultConfig\r\n
+New:   from MoinMoin.config.multiconfig import DefaultConfig\r\n
+\r\n
+If you can't do that, but if you can change the MoinMoin code, see the file
+MoinMoin/multiconfig.py for an alternative, but temporary workaround.
+""")
+
+else:
+    from MoinMoin.config.multiconfig import *
+
--- a/docs/CHANGES	Tue Jul 25 22:58:54 2006 +0200
+++ b/docs/CHANGES	Tue Jul 25 23:00:30 2006 +0200
@@ -165,7 +165,7 @@
     * The i18n system no loads *.po files directly (no *.py or *.mo any more)
       and caches the results (farm wide cache/i18n/*).
     * added the diff parser from ParserMarket, thanks to Emilio Lopes, Fabien
-      Ninoles and Jürgen Hermann.
+      Ninoles and Jrgen Hermann.
 
   Bugfixes:
     * on action "info" page, "revert" link will not be displayed for empty page
@@ -195,7 +195,8 @@
       at FCKeditor development or browser development.
     * HINT: instead of "from MoinMoin.multiconfig import DefaultConfig" you
       need to use "from MoinMoin.config.multiconfig import DefaultConfig" now.
-      You need to change this in you wikiconfig.py or farmconfig.py file.
+      You need to change this in your wikiconfig.py or farmconfig.py file.
+      See MoinMoin/multiconfig.py for an alternative way if you can't do that.
 
 Version 1.5.4-current:
     * increased maxlength of some input fields from 80 to 200
@@ -860,7 +861,7 @@
 
   International support:    
     * mail_from can be now a unicode name-address 
-      e.g u'Jürgen wiki <noreply@jhwiki.org>'
+      e.g u'Jrgen wiki <noreply@jhwiki.org>'
 
   Theme changes:
     * logo_string is now should be really only the logo (img).
@@ -2353,8 +2354,7 @@
         || {{{ ;)) }}} || ;)) || lol.gif    ||
     * AbandonedPages macro
     * Added definition list markup: {{{<whitespace>term:: definition}}}
-    * Added email notification features contributed by Daniel Saß
-    * SystemInfo: show "Entries in edit log"
+    * Added email notification features contributed by Daniel Sa�    * SystemInfo: show "Entries in edit log"
     * Added "RSS" icon to RecentChanges macro and code to generate a
       RecentChanges RSS channel, see
           http://www.usemod.com/cgi-bin/mb.pl?UnifiedRecentChanges
@@ -2627,7 +2627,7 @@
       there before a new version is written to disk
     * Removed the "Reset" button from EditPage
     * Added "Reduce editor size" link
-    * Added Latin-1 WikiNames (JürgenHermann ;)
+    * Added Latin-1 WikiNames (JrgenHermann ;)
     * Speeded up RecentChanges by looking up hostnames ONCE while saving
     * Show at most 14 (distinct) days in RecentChanges
     * Added icons for common functions, at the top of the page
@@ -2640,7 +2640,7 @@
     * Grey background for code sections
     * Added handling for numbered lists
     * the edit textarea now grows in width with the browser window
-      (thanks to Sebastian Dauß for that idea)
+      (thanks to Sebastian Dau�for that idea)
     * Added page info (revision history) and viewing of old revisions
     * Added page diff, and diff links on page info
     * Added InterWiki support (use "wiki:WikiServer/theirlocalname"; the list