Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / todo / outbound_proxy.mdwn

diff --git a/doc/todo/outbound_proxy.mdwn b/doc/todo/outbound_proxy.mdwn
index 99b564828280c64c4162040762ca114a888a80b7..2af0ae5ca6c51eda366a0357919ccf0df5e2f347 100644 (file)
--- a/doc/todo/outbound_proxy.mdwn
+++ b/doc/todo/outbound_proxy.mdwn
@@ -48,3 +48,10 @@ know whether its paranoia measures up or whether it supports proxies.
 
 * [[bugs/http_proxy_for_openid]]
 * [[forum/Setting_http__95__proxy]]
+
+> This looks fine, but you forgot to move the config entry for cookiejar
+> from aggregate to the config setting list in IkiWiki.pm --[[Joey]] 
+
+>> Indeed, fixed. --[[schmonz]]
+
+>>> [[merged|done]] --[[Joey]]