title_natural patch merged

diff --git a/debian/changelog b/debian/changelog
index a8f47bfc74bbf882e00c95b45afa600c90af516f..8266afa0968e13cc09a399c6286dfa314a0393fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.09) UNRELEASED; urgency=low
+
+  * inline: Add title_natural sort order, using Sort::Naturally
+    (chrysn)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400
+

 ikiwiki (3.08) unstable; urgency=low
 
   * git: Fix utf-8 encoding of author names.
 ikiwiki (3.08) unstable; urgency=low
 
   * git: Fix utf-8 encoding of author names.

diff --git a/doc/todo/inline:_numerical_ordering_by_title.mdwn b/doc/todo/inline:_numerical_ordering_by_title.mdwn
index 3f6c8b5986b6dd3e43823c77a734b7dbad89b17f..3d7424b3f606a21b3318b8e19dc11544815392b1 100644 (file)
--- a/doc/todo/inline:_numerical_ordering_by_title.mdwn
+++ b/doc/todo/inline:_numerical_ordering_by_title.mdwn
@@ -1,6 +1,8 @@
 Could you please add numerical ordering by title to [[inline|plugins/inline]]
 plugin? Now I can do only alphabetical order by title, but sometime it's not enough.
 
 Could you please add numerical ordering by title to [[inline|plugins/inline]]
 plugin? Now I can do only alphabetical order by title, but sometime it's not enough.
 

+> Implemented, see [[natural_sorting]] [[!tag done]] --[[Joey]] 
+

 BTW, it seems that ordering by title is rather ordering by filename of page.
 For me "title" means title of page I can set using `title` parameter
 of [[meta|plugins/meta]] plugin :)
 BTW, it seems that ordering by title is rather ordering by filename of page.
 For me "title" means title of page I can set using `title` parameter
 of [[meta|plugins/meta]] plugin :)

diff --git a/doc/todo/natural_sorting.mdwn b/doc/todo/natural_sorting.mdwn
index 2215d533ebf08e7e5105b9aeb40d40f2dbe78fad..faa52304343dd82eb5ac9426012c565cefd6341f 100644 (file)
--- a/doc/todo/natural_sorting.mdwn
+++ b/doc/todo/natural_sorting.mdwn
@@ -15,8 +15,7 @@ the current patch uses `require Sort::Naturally`, so
 [libsort-naturally-perl](http://packages.debian.org/libsort-naturally-perl)
 does not become a dependency; it might be worth suggesting, though.
 
 [libsort-naturally-perl](http://packages.debian.org/libsort-naturally-perl)
 does not become a dependency; it might be worth suggesting, though.
 

-> Great, but all I get from the github link is a server error page, so I
-> have not figured out how to merge the patch. --[[Joey]] 
-> 

 > See also: [[inline:_numerical_ordering_by_title]] (I probably prefer your
 > approach..) --[[Joey]] 
 > See also: [[inline:_numerical_ordering_by_title]] (I probably prefer your
 > approach..) --[[Joey]] 

+
+> [[applied|done]]