Merge branch 'master' into po

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

diff --git a/doc/todo/natural_sorting.mdwn b/doc/todo/natural_sorting.mdwn
index 2215d533ebf08e7e5105b9aeb40d40f2dbe78fad..5df17e95b1147f733283be7721fddf9671e0ecd1 100644 (file)
--- a/doc/todo/natural_sorting.mdwn
+++ b/doc/todo/natural_sorting.mdwn
@@ -7,7 +7,7 @@ page titles if they have numeric components. the
 provides an algorithm for that.
 
 there is a
 provides an algorithm for that.
 
 there is a

-[patch](http://github.com/github076986099/ikiwiki/commit/25617577746dc1e4ab5ab69aa70d633daddcc01b)
+[patch](http://git.ikiwiki.info/?p=ikiwiki;a=commit;h=55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed)

 attached that makes the [[plugins/inline]] plugin use Sort::Naturally if sort
 is set to "title_natural".
 
 attached that makes the [[plugins/inline]] plugin use Sort::Naturally if sort
 is set to "title_natural".
 


@@ -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]]