diff options
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | doc/todo/outbound_proxy.mdwn | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 81931465a..07ea0c3d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ ikiwiki (3.20130712) UNRELEASED; urgency=low (schmonz) * aggregate: Show author in addition to feedname, if different. (schmonz) + * Consistently configure LWP::UserAgent to allow use of http_proxy + and no_proxy environment variables, as well as ~/.ikiwiki/cookies + (schmonz) -- Joey Hess <joeyh@debian.org> Fri, 19 Jul 2013 18:53:23 -0400 diff --git a/doc/todo/outbound_proxy.mdwn b/doc/todo/outbound_proxy.mdwn index 856a92a12..2af0ae5ca 100644 --- a/doc/todo/outbound_proxy.mdwn +++ b/doc/todo/outbound_proxy.mdwn @@ -53,3 +53,5 @@ know whether its paranoia measures up or whether it supports proxies. > from aggregate to the config setting list in IkiWiki.pm --[[Joey]] >> Indeed, fixed. --[[schmonz]] + +>>> [[merged|done]] --[[Joey]] |