changelog, close bug

diff --git a/debian/changelog b/debian/changelog
index afe3bb57837273bd9097c8db91739612118a0ea6..824a0061c454d178008a4bf2dee3d37264aa4ef7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,11 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium
   * style.css, actiontabs, blueview, goldtype, monochrome: adjust layout
     below 600px ("responsive layout") so that horizontal scrolling is not
     needed on smartphone browsers or other small viewports.
+  * core: new libdirs option alongside libdir. Thanks, Louis Paternault
+
+  [ Amitai Schlair ]
+  * core: log a debug message before waiting for the lock.
+    Thanks, Mark Jason Dominus
 
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
 

diff --git a/doc/todo/support_multiple_perl_libraries.mdwn b/doc/todo/support_multiple_perl_libraries.mdwn
index 6e3fe22a4673b6799e8cc08f299baa4047925166..89bef406abf387ca36f4c58ba9532e16eaf67df4 100644 (file)
--- a/doc/todo/support_multiple_perl_libraries.mdwn
+++ b/doc/todo/support_multiple_perl_libraries.mdwn
@@ -43,5 +43,10 @@ I think the change is a one-liner, but I put this here for discussion before att
 >>> efficient in Python) feel free to improve my [[!taglink patch]].
 >>> [[!template  id=gitbranch branch=spalax/paternal/libdirs browse="https://github.com/paternal/ikiwiki/tree/paternal/libdirs" author="[[Louis|spalax]]"]]
 
+>>>> While reviewing and applying your patch I decided the new
+>>>> "sometimes a list, sometimes not" behaviour of `libdir` was
+>>>> too confusing in documentation, so I made it work like underlaydir(s)
+>>>> instead: ikiwiki will now search each item of `$config{libdirs}`, then
+>>>> `$config{libdir}`. [[done]] --[[smcv]]
 
 [[!taglink wishlist]]