diff -r c68058eaa6be MoinMoin/formatter/text_docbook.py
--- a/MoinMoin/formatter/text_docbook.py	Thu Feb 25 16:52:28 2010 +0100
+++ b/MoinMoin/formatter/text_docbook.py	Fri Mar 12 11:17:20 2010 +0100
@@ -9,7 +9,7 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os
+import os,re
 
 from xml.dom import getDOMImplementation
 from xml.dom.ext.reader import Sax
@@ -612,7 +612,13 @@
             was_in_para = self.cur.nodeName == "para"
             if was_in_para:
                 self.paragraph(0)
-            text = FormatterBase.macro(self, macro_obj, name, args)
+            
+            #Regular Expression to match editlink arg
+            _arg_editlink = r'(,\s*(?P<editlink>editlink))?'
+            #And remove it
+            macro_args = re.sub(_arg_editlink, '', args)
+        
+            text = FormatterBase.macro(self, macro_obj, name, macro_args)
             if text.strip():
                 self._copyExternalNodes(Sax.FromXml(text).documentElement.childNodes, exclude=excludes)
             if was_in_para: