Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn
index 3c3b03275a471dc572ba68e6e129b077170ee5c2..c84a6218e37334c540174a47f1f0e2ab0996fc51 100644 (file)
--- a/doc/plugins/rst/discussion.mdwn
+++ b/doc/plugins/rst/discussion.mdwn
@@ -71,3 +71,11 @@ I need help on a couple of points
 * Can we include this in ikiwiki's rst if it is not too hairy?
 
 --ulrik
+
+
+----
+
+> The main problem with more sophisticated RST support is that ikiwiki turns 
+preprocessor directives into raw HTML and reST hates inline HTML.
+
+Is it possible for ikiwiki to store preprocessor directives in memory, and replace them with place holders, then do the rst process.  After the rst processing, process the preprocessor directives and replace place holders.  --[[weakish]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 691f20ffe782f010823455a2eba0ce0b739e679e..cbef5394ea9edd74bd958ebe751b357a6a8222d7 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,10 +1,10 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-> This is a blockerquote.
+> This is a blockquote.
 >
 > This is the first level of quoting.
 >
-> > This is nested blockquote.
+> > This is a nested blockquote.
 >
 >> Without a space works too.
 >>> to three levels