Merge commit 'remotes/jmtd/friendly_markup_names'

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 87b1aaae6d9b40b6b89c22820b380e4f8d055163..8aa7250a7e543b7ef658e1d79981813740544e1b 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -38,6 +38,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
 * [[hendry]] `git://webconverger.org/git/ikiwiki`
+* [[jon]] `git://github.com/jmtd/ikiwiki.git`
 
 ## branches
 

diff --git a/doc/todo/friendly_markup_names.mdwn b/doc/todo/friendly_markup_names.mdwn
new file mode 100644 (file)
index 0000000..f2789ea
--- /dev/null
+++ b/doc/todo/friendly_markup_names.mdwn
@@ -0,0 +1,10 @@
+On the edit form when you are creating a new page, you are given an option of
+page types that can be used. The string presented to the user here is not
+particularly friendly: e.g., mdwn, txtl... it would be nice if the drop-down
+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".  [[!tag patch]]
+
+-- [[Jon]]