diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-13 17:59:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-13 17:59:51 -0400 |
| commit | fc5b26dd326932c6f3493983ad65f2783d6170e1 (patch) | |
| tree | 6aed8ecc775f8b124bc3b2073188307e7792ba23 | |
| parent | d03e691c506e18a2e93ca653e6821b2fa02caa9f (diff) | |
| parent | 6e905e21a81223d64f759c9753f936e4b2a46064 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/plugins/rst/discussion.mdwn | 8 | ||||
| -rw-r--r-- | doc/sandbox.mdwn | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn index 3c3b03275..c84a6218e 100644 --- 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 691f20ffe..cbef5394e 100644 --- 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 |