Merge bug reports.

diff --git a/doc/bugs/Syntax_looking_like_an_Ikiwiki_link_should_be_ignored_on_indented_lines.mdwn b/doc/bugs/Syntax_looking_like_an_Ikiwiki_link_should_be_ignored_on_indented_lines.mdwn
deleted file mode 100644 (file)
index f78ebd0..0000000
--- a/doc/bugs/Syntax_looking_like_an_Ikiwiki_link_should_be_ignored_on_indented_lines.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-Indented lines provide a good way to escape a block of text containing
-markdown syntax, but ikiwiki links like \[[this]] are still
-interpreted within such a block. I think that intepretation should not
-be happening. That is I should be able to write:
-
-       [[this]]
-
-and have it render like:
-
-       \[[this]]
-

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 d26e725b0a1c0dbce6b89918d67255954c2498db..881cf96a45e5a99d42fa8478ae65eb6d1999670e 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 +1,14 @@
-In [[markdown]] syntax, none of the other special characters get processed inside a code block.  However, in ikiwiki, [[wiki links|wikilink]] and [[preprocessor directives|preprocessordirective]] still get processed inside a code block, requiring additional escaping.  For example, `[links don't work](#here)`, but `a [[wikilink]] becomes HTML`.
\ No newline at end of file
+In [[markdown]] syntax, none of the other special characters get processed inside a code block.  However, in ikiwiki, [[wiki links|wikilink]] and [[preprocessor directives|preprocessordirective]] still get processed inside a code block, requiring additional escaping.  For example, `[links don't work](#here)`, but `a [[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
+interpreted within such a block. I think that intepretation should not
+be happening. That is I should be able to write:
+
+       [[this]]
+
+and have it render like:
+
+       \[[this]]
+
+--[[cworth]]