changelog, close bug

diff --git a/debian/changelog b/debian/changelog
index 07b4339e59b8a1ad8f37a039e5eb9af92c856539..4356a7aedec70d2c919296bcd66d25b839c3368d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium
     non-system-wide installation of IkiWiki.
     Thanks, Lafayette Chamber Singers Webmaster
   * filecheck: accept MIME types not containing ';'
+  * autoindex: index files in underlays if the resulting pages aren't
+    going to be committed. Closes: #611068
 
  -- Simon McVittie <smcv@debian.org>  Fri, 12 Sep 2014 21:23:58 +0100
 

diff --git a/doc/bugs/transient_autocreated_tagbase_is_not_transient_autoindexed.mdwn b/doc/bugs/transient_autocreated_tagbase_is_not_transient_autoindexed.mdwn
index 0673aa6740dfb900eb395f4a95140b6434a34ffd..a52b31c252dc23747ee5fab87c45f1f0332eb607 100644 (file)
--- a/doc/bugs/transient_autocreated_tagbase_is_not_transient_autoindexed.mdwn
+++ b/doc/bugs/transient_autocreated_tagbase_is_not_transient_autoindexed.mdwn
@@ -72,3 +72,5 @@ Shouldn't `ikiwiki-tag-test/raw/.ikiwiki/transient/tag.mdwn` and `ikiwiki-tag-te
 >>>> and *something* when there is ambiguity is ok for now; especially, it's
 >>>> not up to the autoindex branch to come up with a solution to the general
 >>>> problem. --[[chrysn]]
+
+>>>>> [[Merged|done]] --[[smcv]]