merged localurl branch; changelog

diff --git a/debian/changelog b/debian/changelog
index fd271dab103e7164c120bc9ab8acad1818133abe..ec995a08aaa731d599badc17b720d8bbe59ca4f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ikiwiki (3.20101130) 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.
+    (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).
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
+

 ikiwiki (3.20101129) unstable; urgency=low
 
   * websetup: Fix encoding problem when restoring old setup file.
 ikiwiki (3.20101129) unstable; urgency=low
 
   * websetup: Fix encoding problem when restoring old setup file.

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 264eb968844d6f766794cc8f737f68299a052de8..f7938b0615cc68174c393c0c07e3a4fc774f67f4 100644 (file)
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -319,3 +319,5 @@ Potential future things:
   >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
   >> and 5 in plugins, since I used it for things like redirection back
   >> to the top of the wiki --[[smcv]]
   >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
   >> and 5 in plugins, since I used it for things like redirection back
   >> to the top of the wiki --[[smcv]]

+
+[[merged|done]] --[[Joey]]