test

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 82f9ece19b12078c491c5b36b8556f023a2006df..fae2f15b4f7f83d4cfeec1a629d3e5782cebe79c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
-ikiwiki (3.20101130) UNRELEASED; urgency=low
+ikiwiki (3.20101202) UNRELEASED; urgency=low
 
-  * Better support for serving the same site by both http and https.
-    Links generated by the CGI will now remain on https if it was accessed
-    via https.
+  * Better support for serving the same site on multiple urls. (Such as
+    a http and a https url, or a ipv4 and an ipv6 url.)
     (Thanks, smcv)
   * API: urlto without a defined second parameter now generates an url
     that starts with "/" (when possible; eg when the site's url and cgiurl
@@ -10,9 +9,19 @@ ikiwiki (3.20101130) UNRELEASED; urgency=low
   * Now when users log in via https, ikiwiki sends a secure cookie, that can
     only be used over https. If the user switches to using http, they will
     need to re-login. (smcv)
+  * inline: Display feed buttons for nested inlines, linking to the inlined
+    page's feed. (Giuseppe Bilotta)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
 
+ikiwiki (3.20101201) unstable; urgency=low
+
+  * meta: Fix calling of htmlscrubber to pass the page parameter.
+    The change of the htmlscrubber to look at page rather than destpage
+    caused htmlscrubber_skip to not work for meta directives.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 01 Dec 2010 20:28:01 -0400
+
 ikiwiki (3.20101129) unstable; urgency=low
 
   * websetup: Fix encoding problem when restoring old setup file.