tested and seems to work

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 8b0501041379278330dbdb52c3232dc26fef5d2c..264eb968844d6f766794cc8f737f68299a052de8 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
@@ -147,7 +147,7 @@ you don't like my approach:
 
 ----
 
 
 ----
 

-[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]

 [[!tag patch]]
 
 OK, here's an alternative approach, closer in spirit to what was initially
 [[!tag patch]]
 
 OK, here's an alternative approach, closer in spirit to what was initially


@@ -171,10 +171,10 @@ support that.
 fully relative nor fully absolute, and there doesn't seem to be a good name
 for them...
 
 fully relative nor fully absolute, and there doesn't seem to be a good name
 for them...
 

-I tested an earlier version on a demo website with the CGI enabled, and it seemed to
+I've tested this on a demo website with the CGI enabled, and it seemed to

 work nicely (there might be bugs in some plugins, I didn't try all of them).
 work nicely (there might be bugs in some plugins, I didn't try all of them).

-I haven't yet re-tested with my updated branch, which is why it's not `ready/`
-yet.
+The branch at [[todo/use secure cookies for SSL logins]] goes well with
+this one.

 
 The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
 `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
 
 The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
 `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log