smcv/ready/glob-cache merged

diff --git a/debian/changelog b/debian/changelog
index 0edb780046983fdca7ac9a5ed9ee4a5b3c187bef..65c2353171dada06ea295218088c26ae2a2011e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
     and support all elements that HTML::Tagset knows about. 
     (Which doesn't include html5 just yet, but then the old version
     didn't either.) Bonus: 4 times faster than old regexp method.
+  * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
 

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 4fe14540fa3c543fb3240acdb63aa057e259bcfb..4e1df338196381a47e03c1a1767bd98ccb6e530d 100644 (file)
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -57,6 +57,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>>>>>> representative.
 >>>>>>> --[[smcv]]
 
+[[done]] --[[Joey]] 
+
 --------------------------------------------------------------
 
 [[!toggle id="smcv-benchmark" text="current benchmarks"]]