bug closures and changelog since smcv's ready branch didn't include them

Which would really make my merging rock if they did in the future.</hint>

diff --git a/debian/changelog b/debian/changelog
index aa14939600b7bd0a3674b63197ad72ad8685467b..11a03c993dc147c72bf79ccc3f0325760403a904 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ ikiwiki (3.15) UNRELEASED; urgency=low
     the po file, for use by wikis whose primary language is not English.
   * Add Danish basewiki translation by Jonas Smedegaard.
   * img: Fix adding of dependency from page to the image.
+  * pagestats: add `among` parameter, which only counts links from specified
+    pages (smcv)
+  * pagestats: when making a tag cloud, don't emit links where the tag is
+    unused (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 

diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
index 02e5b244037c36af3ce38c1f9ad15cac801b5a55..11b5fbcaeb8e41db3ebebf049366b3076c033e66 100644 (file)
--- a/doc/todo/backlinks_result_is_lossy.mdwn
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -9,3 +9,5 @@ A commit on my `among` branch splits it into IkiWiki::backlink_pages
 (which returns the keys of $backlinks{$page}, and might be suitable for
 exporting) and IkiWiki::backlinks (which calls backlink_pages, then performs
 the same lossy transformation as before on the result).
+
+[[done]] --[[Joey]]

diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index 446e5cc1b54f683e4e2c4f736c730ba9335925b4..fd15d6a4224b869a6af4fc325486f42cc9050d65 100644 (file)
--- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -25,3 +25,5 @@ I use this on my tag pages on one site, with the following template:
       archive="yes" quick="yes" reverse="yes" timeformat="%x"]]
 
 --[[smcv]]
+
+> [[merged|done]] thanks --[[Joey]]