Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index dc8423e4605c47db70036589a68608edd7eacbff..b7ae76aeb30ac1a4697d976719d16d3986da9639 100644 (file)
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -61,3 +61,20 @@ Brian May
 >> Use $ua->env_proxy() to get it to read the environment variables. Then http:// does work.
 >>
 >> Unfortunately this breaks https:// even more - but nothing I do seems to make https:// work anymore.
+
+
+>>> LWP::UserAgent defaults to not caring about proxy settings in
+>>> the environment. (To give control over the result, I guess?) 
+>>> To get it to care, pass `env_proxy => 1` to the constructor. Affected
+>>> plugins: aggregate, openid, pinger. This probably wants to be on
+>>> by default, and might not need to be configurable. --[[schmonz]]
+
+>>>> Okay, in a real-world scenario it does need to be 
+>>>> configurable. A working implementation (tested with aggregate,
+>>>> not tested with the other two plugins) is in my git, commit
+>>>> 91c46819dee237a281909b0c7e65718eb43f4119. --[[schmonz]]
+
+>>>>> Oh, and according to the LWPx::ParanoidAgent docs, "proxy support is 
+>>>>> explicitly removed", so if ikiwiki can preferentially find that 
+>>>>> installed, even with the above commit, `openid` won't be able to 
+>>>>> traverse a proxy. --[[schmonz]]

diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
index a3087c9e036138994df7107933771f8a9df47b68..a51aabf481e4473b4d3325dcd9aa967c2e19f069 100644 (file)
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -5,8 +5,8 @@ This plugin makes ikiwiki treat files with names ending in ".txt"
 as wiki pages.
 
 Unlike other [[type/format]] plugins, no formatting of markup in 
-txt files is done; the file contents is displayed to the user as-is,
-with html markup characters such as ">" escaped.
+txt files is done; the file contents is displayed to the user as
+pre-formatted text, with html markup characters such as ">" escaped.
 
 The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and
 [[directives|ikiwiki/directive]] are still expanded by