Mercurial > moin > 1.9

changeset 3095:cde8093bbb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed the quickhelp shown when editing RST markup (port from 1.6)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 23 Feb 2008 01:42:26 +0100
parents 92e5cf67842f
children 8d21b13482e3
files MoinMoin/config/multiconfig.py
diffstat 1 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Sat Feb 23 01:27:27 2008 +0100
+++ b/MoinMoin/config/multiconfig.py	Sat Feb 23 01:42:26 2008 +0100
@@ -273,7 +273,9 @@
     editor_default = 'text' # which editor is called when nothing is specified
     editor_ui = 'freechoice' # which editor links are shown on user interface
     editor_force = False
-    editor_quickhelp = {# editor markup hints quickhelp
+    editor_quickhelp = {
+        # editor markup hints quickhelp
+        # MUST be in wiki markup, even if the help is not for the wiki parser!
         'wiki': _("""\
  Emphasis:: <<Verbatim('')>>''italics''<<Verbatim('')>>; <<Verbatim(''')>>'''bold'''<<Verbatim(''')>>; <<Verbatim(''''')>>'''''bold italics'''''<<Verbatim(''''')>>; <<Verbatim('')>>''mixed ''<<Verbatim(''')>>'''''bold'''<<Verbatim(''')>> and italics''<<Verbatim('')>>; <<Verbatim(----)>> horizontal rule.
  Headings:: <<Verbatim(=)>> Title 1 <<Verbatim(=)>>; <<Verbatim(==)>> Title 2 <<Verbatim(==)>>; <<Verbatim(===)>> Title 3 <<Verbatim(===)>>;   <<Verbatim(====)>> Title 4 <<Verbatim(====)>>; <<Verbatim(=====)>> Title 5 <<Verbatim(=====)>>.
@@ -284,23 +286,22 @@
 (!) For more help, see HelpOnEditing or SyntaxReference.
 """),
         'rst': _("""\
-Emphasis: <i>*italic*</i> <b>**bold**</b> ``monospace``<br/>
-<br/><pre>
+{{{
+Emphasis: *italic* **bold** ``monospace``
+
 Headings: Heading 1  Heading 2  Heading 3
           =========  ---------  ~~~~~~~~~
 
-Horizontal rule: ----
-Links: TrailingUnderscore_ `multi word with backticks`_ external_
+Horizontal rule: ---- 
 
-.. _external: http://external-site.net/foo/
+Links: TrailingUnderscore_ `multi word with backticks`_ external_ 
+
+.. _external: http://external-site.example.org/foo/
 
 Lists: * bullets; 1., a. numbered items.
-</pre>
-<br/>
-(!) For more help, see the
-<a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">
-reStructuredText Quick Reference
-</a>.
+}}}
+(!) For more help, see the 
+[[http://docutils.sourceforge.net/docs/user/rst/quickref.html|reStructuredText Quick Reference]].
 """),
     }
     edit_locking = 'warn 10' # None, 'warn <timeout mins>', 'lock <timeout mins>'