diff --git a/wiki/formatter/text_plain.py b/wiki/formatter/text_plain.py
index c0719239..15553d03 100644
--- a/wiki/formatter/text_plain.py
+++ b/wiki/formatter/text_plain.py
@@ -48,14 +48,12 @@ class Formatter(FormatterBase):
             return u''
         else:
             if "".join(self._text) == self._url:
-                self._url = None
-                self._text = None
-                return ''
+                res = u''
             else:
-                self._url = None
-                self._text = None
-                return u' [%s]' % (self._url)
-            
+                res = u' [lien wiki]'                
+            self._url = None
+            self._text = None
+            return res
 
     def url(self, on, url='', css=None, **kw):
         if on:
@@ -64,13 +62,12 @@ class Formatter(FormatterBase):
             return u''
         else:
             if "".join(self._text) == self._url:
-                self._url = None
-                self._text = None
-                return ''
+                res = u''
             else:
-                self._url = None
-                self._text = None
-                return u' [%s]' % (self._url)
+                res = u' [cf wiki]'                
+            self._url = None
+            self._text = None
+            return res
 
     def text(self, text):
         self._did_para = False
@@ -120,13 +117,13 @@ class Formatter(FormatterBase):
             if self._nested_lists:
                 number = self._nested_lists[-1]
                 if number:
-                    bullet = '%d.' % number
+                    bullet = u'%d. ' % number
                     self._nested_lists[-1] = number + 1
                 else:
-                    bullet = '*'
-                return ' %s%s ' % ('  ' * (len(self._nested_lists)-1), bullet)
+                    bullet = u'-'
+                return u' %s%s' % (u'  ' * (len(self._nested_lists)-1), bullet)
             else:
-                return u' * '
+                return u' - '
         else:
             if self._did_para:
                 return u''