changeset 1691:d29448b5771d

mailimport: use freelink syntax to extract target page from subject, fix some comments/docs
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 02 Dec 2006 14:38:34 +0100
parents 6fe30ca971e7
children 73f12c0dda0d
files MoinMoin/config/multiconfig.py MoinMoin/script/xmlrpc/mailimport.py docs/CHANGES
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Sat Dec 02 13:31:38 2006 +0100
+++ b/MoinMoin/config/multiconfig.py	Sat Dec 02 14:38:34 2006 +0100
@@ -312,7 +312,7 @@
     mail_import_subpage_template = u"$from-$date-$subject" # used for mail import
     mail_import_pagename_search = ['subject', 'to', ] # where to look for target pagename (and in which order)
     mail_import_pagename_envelope = u"%s" # use u"+ %s/" to add "+ " and "/" automatically
-    mail_import_pagename_regex = r"\[([^\]]*)\]" # how to find/extract the pagename from the subject
+    mail_import_pagename_regex = r'\["([^"]*)"\]' # how to find/extract the pagename from the subject
     mail_import_wiki_addrs = [] # the e-mail addresses for e-mails that should go into the wiki
     mail_import_secret = ""
 
--- a/MoinMoin/script/xmlrpc/mailimport.py	Sat Dec 02 13:31:38 2006 +0100
+++ b/MoinMoin/script/xmlrpc/mailimport.py	Sat Dec 02 14:38:34 2006 +0100
@@ -25,7 +25,7 @@
         try:
             import mailimportconf
         except ImportError:
-            fatal("Could not find the file mailimportconf.py. Maybe you want to use the config param?")
+            fatal("Could not find the file mailimportconf.py. Maybe you want to use the --config-dir=... option?")
 
         secret = mailimportconf.mail_import_secret
         url = mailimportconf.mail_import_url
--- a/docs/CHANGES	Sat Dec 02 13:31:38 2006 +0100
+++ b/docs/CHANGES	Sat Dec 02 14:38:34 2006 +0100
@@ -198,7 +198,7 @@
       * [wiki:MoinMoin:"Page with blanks" different link text]
       * attachment:"blanks are evil.txt"
 
-    * FeatureRequests/WikiEmailIntegration TODO:make some help page when stable
+    * FeatureRequests/WikiEmailIntegration, HelpOnConfiguration/EmailSupport
     * HTML parser (called "html") that allows you to use HTML on the page.
       Thanks to the trac team for the nice code.
     * You can have a common cache_dir for your farm (will save a bit space