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 7c9a7f1ecadf5d7e1e10425a08b84cb2ef810a3c..8dfe05581fcb3492bcf627100745ff98386a387f 100644 (file)
--- a/doc/todo/format_escape.mdwn
+++ b/doc/todo/format_escape.mdwn
@@ -97,7 +97,7 @@ I've created an updated [patch](http://www.idletheme.org/code/patches/ikiwiki-fo
 --Ryan Koppenhaver
 
 ## Original patch
 --Ryan Koppenhaver
 
 ## Original patch

-[[tag patch]]
+[[!tag patch]]

 
 <pre>
 Index: debian/changelog
 
 <pre>
 Index: debian/changelog


@@ -218,8 +218,8 @@ Index: doc/plugins/rst.mdwn
  
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including
  
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including

--  [[WikiLinks|WikiLink]] and many
--  [[PreprocessorDirectives|PreprocessorDirective]].
+-  [[WikiLinks|ikiwiki/WikiLink]] and many
+-  [[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