More friendly display of markdown, textile in edit form selector (jmtd)

diff --git a/debian/changelog b/debian/changelog
index d8c67b5a6763f599d64fb0707e0079e06bc13781..c2819d0c5c3c4e05aa2d7368bad18648410d5f87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.13) UNRELEASED; urgency=low
     containing .ikiwiki, abort with an error rather than creating it.
   * Allow underlaydir to be overridden without messing up inclusion
     of other underlays via add_underlay.
+  * More friendly display of markdown, textile in edit form selector
+    (jmtd)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400
 

diff --git a/doc/todo/friendly_markup_names.mdwn b/doc/todo/friendly_markup_names.mdwn
index f2789ea2840e6a9bcf7c0cfba896e1b7346f7571..f88e3c1c7f1bcd0d86e3d272534a770b3007d973 100644 (file)
--- a/doc/todo/friendly_markup_names.mdwn
+++ b/doc/todo/friendly_markup_names.mdwn
@@ -8,3 +8,6 @@ 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".  [[!tag patch]]
 
 -- [[Jon]]
+
+[[merged|done]], TFTP! (I have not checked if any other format plugins
+would benefit from a longer name) --[[Joey]]