aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/todo/friendly_markup_names.mdwn3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d8c67b5a6..c2819d0c5 100644
--- 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 f2789ea28..f88e3c1c7 100644
--- 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]]