--- moin-1.6-260907-unpatched/lib/python2.5/site-packages/MoinMoin/action/fckdialog.py	2007-09-28 21:11:07.000000000 +0200
+++ moin-1.6-260907/lib/python2.5/site-packages/MoinMoin/action/fckdialog.py	2007-09-28 22:04:40.000000000 +0200
@@ -119,7 +119,7 @@
             helptext = ""
         helptexts.append(
             '''<div id="%s" style="DISPLAY: none">
-               <b><<%s>></b>
+               <b>&lt;&lt;%s&gt;&gt;</b>
                <br/>
                <textarea style="color:#000000" cols="37" rows="10" disabled="disabled">%s</textarea>
                </div>'''
@@ -151,10 +151,11 @@
         r"\|\|(<.*?>)?\{\{\{\[\[" +
         r"(?P<prototype>(?P<macro>\w*).*)" +
         r"\]\]\}\}\}\s*\|\|" +
-        r"\s*(?P<help>.*?)\s*\|\|\s*(?P<example>.*?)\s*\|\|$", re.U + re.M)
+        r"[^|]*\|\|[^|]*\|\|<[^>]*>" +
+        r"\s*(?P<help>.*?)\s*\|\|\s*(?P<example>.*?)\s*(<<[^>]*>>)*\s*\|\|$", re.U + re.M)
     help = {}
     for match in macro_re.finditer(content):
-        help[match.group('macro')] = match
+        help[match.group('macro')] = match        
     return help
 
 ##############################################################################