Merge branch 'tova'

diff --git a/doc/bugs/broken_page_after_buggy_remove.mdwn b/doc/bugs/broken_page_after_buggy_remove.mdwn
new file mode 100644 (file)
index 0000000..c85d22c
--- /dev/null
+++ b/doc/bugs/broken_page_after_buggy_remove.mdwn
@@ -0,0 +1,4 @@
+Hi, I created \[[sandbox/subpage]] then I deleted it with the "remove" button.
+After confirmation there was a message about a xapian error (My bad, I did not write down the exact error message).
+Now, accessing [[sandbox/subpage|sandbox/subpage]] leads my browser complains about a redirect loop. [[JeanPrivat]]
+>Uh. Now the bug of redirect loop seems to have solved itself. However, I don't know if the xapian error need to be investigated. But I found another [[bug|cannot revert page deletion]]. [[JeanPrivat]]

diff --git a/doc/bugs/cannot_revert_page_deletion.mdwn b/doc/bugs/cannot_revert_page_deletion.mdwn
new file mode 100644 (file)
index 0000000..5292906
--- /dev/null
+++ b/doc/bugs/cannot_revert_page_deletion.mdwn
@@ -0,0 +1,2 @@
+After deleting a page with the "remove" button, it seems that the page deletion cannot be reverted using the "revert" icon in [[RecentChanges]]. 
+It ironically says that "Error: ?$pagename does not exist". See [[http://ikiwiki.info/ikiwiki.cgi?rev=860c2c84d98ea0a38a4f91dacef6d4e09f6e6c2e&do=revert]]. [[JeanPrivat]]

diff --git a/doc/bugs/emails_should_not_be_considered_as_broken_links.mdwn b/doc/bugs/emails_should_not_be_considered_as_broken_links.mdwn
new file mode 100644 (file)
index 0000000..90d9fce
--- /dev/null
+++ b/doc/bugs/emails_should_not_be_considered_as_broken_links.mdwn
@@ -0,0 +1,5 @@
+The [[ikiwiki/directive/brokenlinks]] directive lists emails when used inside [[ikiwiki/wikilink]]s: \[[john.doo@example.com\]] -> [[john.doo@example.com]]. Obviously its is a bug since 1) there is a link generated in the page; 2) "fixing" the broken link in the brokenlinks page may yield to stange results [[http://ikiwiki.info/ikiwiki.cgi?page=john.doo__64__example.com&do=create]]. [[JeanPrivat]]
+
+[[!brokenlinks pages="*@* and !recentchanges"]]
+
+> Weird.  The bug, imho, is that `\[[email-address]]` results in a marked-up email address. I think marking up email addresses into hyperlinks should be handled by a markup plugin (e.g. markdown), not by the wikilink parser. I feel the same way for external links, but it appears [this is all by design](http://source.ikiwiki.branchable.com/?p=source.git;a=commitdiff;h=07a08122d926ab6b7741c94bc6c0038ffe0113fb). — [[Jon]]

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/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 715482ae57c7388eda5d58a828a7ba159173568a..558d3cd699dbfbd7c5f9f6ea03072f6a20372251 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -188,3 +188,4 @@ Personal sites and blogs
 * [Jonas Smedegaard](http://dr.jones.dk/) multilingual "classic" website w/ blog
 * [Siri Reiter](http://sirireiter.dk/) portfolio website with a blog (in danish)
 * [L'Altro Wiki](http://laltromondo.dynalias.net/~iki/) Tutorials, reviews, miscellaneus articles in English and Italian, from the IRC network syrolnet.org
+* [STUPiD](http://lhzhang.com/)

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

diff --git a/doc/tips/laptop_wiki_with_git_extended/discussion.mdwn b/doc/tips/laptop_wiki_with_git_extended/discussion.mdwn
new file mode 100644 (file)
index 0000000..8213e96
--- /dev/null
+++ b/doc/tips/laptop_wiki_with_git_extended/discussion.mdwn
@@ -0,0 +1 @@
+It appears that this is no longer necessary with git_wrapper_background_command.