Merge remote branch 'upstream/master' into prv/po

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ec995a08aaa731d599badc17b720d8bbe59ca4f6..ea6356f724145940221eafff66e7905cf90c673d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,28 @@
-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
     are on the same domain).
+  * 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)
+  * goldtype: New theme, based on blueview, contributed by Lars Wirzenius.
 
  -- 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.