Merge branch 'master' into tova

[git.ikiwiki.info.git] / doc / bugs / wiki_links_still_processed_inside_code_blocks.mdwn

diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
index 2bda0cc0f66929e04ba3152de1540203970e1322..ede16a0292eec5c90033c9258ca9bf2a12538aa3 100644 (file)
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -1,8 +1,8 @@
 In [[ikiwiki/markdown]] syntax, none of the other special characters get processed
-inside a code block.  However, in ikiwiki, [[wiki_links|wikilink]] and
+inside a code block.  However, in ikiwiki, [[wiki_links|ikiwiki/wikilink]] and
 [[preprocessor_directives|ikiwiki/preprocessordirective]] still get processed
 inside a code block, requiring additional escaping.  For example, `[links
-don't work](#here)`, but `a [[wikilink]] becomes HTML`. --[[JoshTriplett]]
+don't work](#here)`, but `a [[ikiwiki/wikilink]] becomes HTML`. --[[JoshTriplett]]
 
 Indented lines provide a good way to escape a block of text containing
 markdown syntax, but ikiwiki links like \[[this]] are still
@@ -41,3 +41,9 @@ and have it render like:
 > 
 > In the case of either bug, no, I don't have an idea of a solution yet.
 > --[[Joey]]
+
+> I've now solved a similar bug involving the smiley plugin. The code used
+> there should give some strong hints how to fix this bug, though I haven't
+> tried to apply the method yet. --[[Joey]]
+
+[[!debbug 487397]]