Merge branch 'master' into dependency-types

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

diff --git a/doc/todo/friendly_markup_names.mdwn b/doc/todo/friendly_markup_names.mdwn
index 2b54cababc0537e74959472f2f60ca1d9e9962de..f88e3c1c7f1bcd0d86e3d272534a770b3007d973 100644 (file)
--- a/doc/todo/friendly_markup_names.mdwn
+++ b/doc/todo/friendly_markup_names.mdwn
@@ -5,6 +5,9 @@ contents were "Markdown", "Textile", etc. (the values in the option tags can
 remain the same).
 
 I've written a first-take set of patches for this. They are in
-git://github.com/jmtd/ikiwiki.git in the branch "friendly_markup_names".
+git://github.com/jmtd/ikiwiki.git in the branch "friendly_markup_names".  [[!tag patch]]
 
 -- [[Jon]]
+
+[[merged|done]], TFTP! (I have not checked if any other format plugins
+would benefit from a longer name) --[[Joey]]