Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / format_escape.mdwn

diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn
index 315b2d88f1631d11b32349fa7ea602192352e7f9..8dfe05581fcb3492bcf627100745ff98386a387f 100644 (file)
--- a/doc/todo/format_escape.mdwn
+++ b/doc/todo/format_escape.mdwn
@@ -219,7 +219,7 @@ Index: doc/plugins/rst.mdwn
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including
 -  [[WikiLinks|ikiwiki/WikiLink]] and many
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including
 -  [[WikiLinks|ikiwiki/WikiLink]] and many

--  [[PreprocessorDirectives|ikiwiki/PreprocessorDirective]].
+-  [[Directives|ikiwiki/Directive]].

 +* Some bits of ikiwiki may still assume that markdown is used or embed html
 +  in ways that break reStructuredText. (Report bugs if you find any.)
  * It's slow; it forks a copy of python for each page. While there is a
 +* Some bits of ikiwiki may still assume that markdown is used or embed html
 +  in ways that break reStructuredText. (Report bugs if you find any.)
  * It's slow; it forks a copy of python for each page. While there is a