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

19 files changed, 132 insertions, 6 deletions

diff --git a/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn b/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn
index 93d0aaf9f..e754868cc 100644
--- a/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn
+++ b/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn
@@ -12,3 +12,10 @@ If I then edit the blog post, **then** the file gets commited and I can see the
 > For mercurial, these run respectively `hg add` and `hg commit`. If the
 > add or commit fails, it will print a warning to stderr, you might check
 > apache's error.log to see if there's anything there. --[[Joey]]
+
+>>The problem was using accented characters (é, í) on the change comments. I didn't have
+>>an UTF-8 locale enabled in my setup file. By coincidence this happened for the first time
+>>in a couple of consecutive blog posts, so I was mistaken about the root of the problem. I don't know if
+>>you will consider this behavior a bug, since it's strictly speaking a misconfiguration but it
+>>still causes ikiwiki's mercurial backend to fail. A quick note in the docs might be a good idea. For my part, please
+>>close this bug, and thanks for the help.  --[[buo]]
diff --git a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn
new file mode 100644
index 000000000..163f01750
--- /dev/null
+++ b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn
@@ -0,0 +1,11 @@
+The htmltidy plugin as in the Backports.org version 2.32.3~bpo40+1 of ikiwiki does not play well with other usages of HTML Tidy since it has no possibility to use an alternative config file.
+
+E.g. since I usually use HTML Tidy manually only to check and not to fix HTML, I have "write-back: no" in my $HOME/.tidyrc which throws an awful lot of Perl warnings and renders all ikiwiki pages empty as soon as I enable htmltidy.
+
+I see two possibilities how to fix this:
+
+1) Replace "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes -
+-show-warnings no --tidy-mark no');" by "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes -
+-show-warnings no --tidy-mark no --write-back yes');" -- This is the fastest fix, but not very elegant, since it doesn't solve the general problem.
+
+2) Make it configurable via ikiwiki.setup as e.g.with the tags plugin. Haven't looked into this code yet.
diff --git a/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn b/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn
new file mode 100644
index 000000000..63c5b5e08
--- /dev/null
+++ b/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn
@@ -0,0 +1,3 @@
+[[plugins/lockedit]] adds the form fields for a [[pagespec]] to preferences. This pagespec should be supplied "raw"; i.e., without quotes around it. Inexperienced users (such as [[myself|jondowland]]) may provide an invalid pagespec, such as one with quotes on it. This will be merrily accepted by the form, but will cause no locking to take place.
+
+Perhaps some validation should be performed on the pagespec and the form-submission return include "warning: this pagespec is invalid" or "warning: this pagespec does not match any existing pages" or similar.
diff --git a/doc/bugs/openid_user_filtering.mdwn b/doc/bugs/openid_user_filtering.mdwn
new file mode 100644
index 000000000..8b2d0082e
--- /dev/null
+++ b/doc/bugs/openid_user_filtering.mdwn
@@ -0,0 +1,9 @@
+As mentioned on IRC, I think a cheap form of [[todo/ACL]] can be maintained using [OpenID in ikiwiki](http://packages.qa.debian.org/libn/libnet-openid-consumer-perl.html).
+
+Say I want to limit edits to [wiki.webvm.net](http://wiki.webvm.net/) to users of that machine. For the user 'hendry' I create a http://hendry.webvm.net/ OpenID (which actually delegates to http://hendry.myopenid.com/). And likewise for other users.
+
+So I suggest an ikiwiki configuration like:
+
+     users => ["*.webvm.net"],
+
+Would only allow edits from openIDs of that form.
diff --git a/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn b/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn
index ea473ac75..5872275b5 100644
--- a/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn
+++ b/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn
@@ -12,3 +12,14 @@ This is reproducible, but I cannot provide the source code.
 > ikiwiki on some files that are just large, and cannot reproduce any
 > problems, so it must be something in the specific file. (A perl bug is
 > also clearly involved here.) --[[Joey]]
+
+The tarball is at http://scratch.madduck.net/__tmp__recentchanges-segfault.tgz - unpack it in `/tmp` and `chdir()` to /tmp/cdt.taF18912, then run
+
+    ikiwiki --setup ikiwiki.setup
+    # segfaults
+    git checkout HEAD^
+    ikiwiki --setup ikiwiki.setup
+    # segfaults
+    rm -rf wc/recentchanges
+    ikiwiki --setup ikiwiki.setup
+    # works
diff --git a/doc/contact/discussion.mdwn b/doc/contact/discussion.mdwn
index 3c38abd27..7bc479463 100644
--- a/doc/contact/discussion.mdwn
+++ b/doc/contact/discussion.mdwn
@@ -8,3 +8,7 @@ a big opportunity to build community. -- AdamMegacz
 
 > If you want to gate ikiwiki's various rss feeds to email, that's
 > [trivial](http://rss2email.infogami.com/) --[[Joey]]
+
+Also see [[this_wishlist_request|todo/provide_a_mailing_list]]. Sure, you can
+collaborate with RSS and a wiki, but the ikiwiki community is not only made up
+of developers.
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 72cacf95f..597950724 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[poll 44 "Accept only OpenID for logins" 17 "Accept only password logins" 32 "Accept both"]]
+[[poll 45 "Accept only OpenID for logins" 17 "Accept only password logins" 33 "Accept both"]]
diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn
index 1199d3ee7..308fddbb8 100644
--- a/doc/news/server_speed.mdwn
+++ b/doc/news/server_speed.mdwn
@@ -1,7 +1,7 @@
 Quick poll: Do you feel that ikiwiki is fast enough on this server, or
 should I move it to my much beefier auxiliary server?
 
-[[poll 41 "It's fast enough" 5 "It's too slow!" 4 "No opinion"]]
+[[poll 40 "It's fast enough" 6 "It's too slow!" 4 "No opinion"]]
 
 If you have specifics on performance issues, you might mention them on the
 [[discussion]] page.
diff --git a/doc/plugins/contrib/hnb.mdwn b/doc/plugins/contrib/hnb.mdwn
new file mode 100644
index 000000000..59af76316
--- /dev/null
+++ b/doc/plugins/contrib/hnb.mdwn
@@ -0,0 +1,12 @@
+[[template id=plugin name=hnb author="[[XTaran]]"]]
+[[tag type/format]]
+
+This plugin allows ikiwiki to process `.hnb` XML files, as created by 
+the Hierachical Notebook [hnb](http://hnb.sourceforge.net/). To use it, you need to have 
+hnb installed, since it uses the commandline interface of `hnb` program.
+
+It is roughly based on the `otl` plugin but uses `mktemp` to create temporary files since `hnb` has no "quiet" switch and otherwise the hnb version number and other as well as the output file name always would be in the output itself.
+
+For now it's available for download at [http://noone.org/hnb/hnb.pm](http://noone.org/hnb/hnb.pm)
+
+TODO: Make a switch to allow both HTML export routines of hnb (`export_html` and `export_htmlcss`) to be used.
diff --git a/doc/plugins/contrib/tex4ht.mdwn b/doc/plugins/contrib/tex4ht.mdwn
new file mode 100644
index 000000000..5ea13ac60
--- /dev/null
+++ b/doc/plugins/contrib/tex4ht.mdwn
@@ -0,0 +1,9 @@
+[[!template id=plugin name=tex4ht core=0 author="[[DavidBremner]]"]]
+
+I have written a simple wrapper around tex4ht to convert tex files to html. This is slow, and currently noisy. I do not recommend it for running from cgi.  But for interactive conversion of 
+my old tex4ht based home page, it seems to work OK. 
+
+The current version is available from 
+[git](http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/tex4ht.pm;hb=HEAD)
+
+[[!tag type/slow]]
diff --git a/doc/plugins/tag/discussion.mdwn b/doc/plugins/tag/discussion.mdwn
index 87edf2ab8..7e830fc13 100644
--- a/doc/plugins/tag/discussion.mdwn
+++ b/doc/plugins/tag/discussion.mdwn
@@ -18,5 +18,7 @@ Thanks. That works fine.
 
 --David Riebenbauer <davrieb@htu.tugraz.at>
 
--- AOLMODE=true echo "I too would really like this feature, which would make cgi free life much 
+AOLMODE=true echo "I too would really like this feature, which would make cgi free life much 
 better" --[[DavidBremner]]
+
+Please make the actual text used a template some way or another. I may want `map` instead of `inline`. --[[madduck]]
diff --git a/doc/plugins/teximg/discussion.mdwn b/doc/plugins/teximg/discussion.mdwn
new file mode 100644
index 000000000..17f677c21
--- /dev/null
+++ b/doc/plugins/teximg/discussion.mdwn
@@ -0,0 +1,2 @@
+
+A minor nitpick: if, while editing, you preview your page two times without changing anything, the second time produces an error. --[[buo]]
diff --git a/doc/tips/vim_syntax_highlighting/discussion.mdwn b/doc/tips/vim_syntax_highlighting/discussion.mdwn
index f8d2317ad..b1637e758 100644
--- a/doc/tips/vim_syntax_highlighting/discussion.mdwn
+++ b/doc/tips/vim_syntax_highlighting/discussion.mdwn
@@ -1 +1 @@
-I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[users/JonDowland]]
+I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[JonDowland]]
diff --git a/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn b/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn
index c33b81308..3e596656d 100644
--- a/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn
+++ b/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn
@@ -6,6 +6,8 @@ subpage: `<current>/$tagbase/<tagname>`.
 > footer, or is added with a taglink directive. Think that's good enough?
 > --[[Joey]]
 
+>> yes, that would be better! --[[madduck]]
+
 See also: [[bugs/tags_base_dir_not_used_when_creating_new_tags]]
 
 [[tag wishlist]]
diff --git a/doc/todo/provide_a_mailing_list.mdwn b/doc/todo/provide_a_mailing_list.mdwn
new file mode 100644
index 000000000..f34ed77c6
--- /dev/null
+++ b/doc/todo/provide_a_mailing_list.mdwn
@@ -0,0 +1,40 @@
+I am aware that you (Joey) [[made_a_choice_against_a_mailing_list|contact]],
+but I would like to see you reconsider.
+
+The wiki works well for bugs and
+collaborating on the software, but not for simple user support issues. For
+instance, I spent the last three days waiting for any form of reply to my
+question on IRC (none so far):
+
+    09 15:49 < madduck> any ideas how to implement a two-level menu
+    09 15:40 < madduck> like http://www.abacons.ch/leistungen/treuhand.html ?
+    09 15:50 < madduck> the top bar are the main sections
+    09 15:50 < madduck> and then i might need subsections (further down) under each
+    09 15:50 < madduck> i'd like to do this without hardcoding sections in the template
+    09 15:50 < madduck> but at least the main sections are to appear on all pages
+    09 15:50 < madduck> so the template needs a slot, i just wonder how best to fill it
+    09 15:51 < madduck> i can only ever use one navbar it seems
+    09 15:51 < madduck> and i already need the sidebar for something else
+
+I would not know where to take this question on the wiki itself.
+
+A mailing list is made for these kind of questions, and as we pick up even
+more users, the number of such requests will also increase. --[[madduck]]
+
+> I wouldn't mind a mailing list myself. For many people, e-mail is more
+> efficient to process, particularly offline, than wiki pages. Also,
+> ikiwiki's discussion pages require a fair amount of discipline from
+> users to make it easy to follow a long discussion. On the other hand,
+> it would be interesting to make improvements to ikiwiki
+> (read: plugins) to to see if it's possible to accomodate both
+> mail people and online people.
+> --[liw](http://liw.fi)
+
+>> The [Zwiki](http://zwiki.org) project has ideas to mine in this area. We explored various permutations of wiki and mail list.
+>> Currently Zwiki's [email features](http://zwiki.org/Mail) are good enough that we use it as the mail list and don't run separate
+>> ml software. This is simple and mostly satisfying. Now and then we miss the familiarity and industrial
+>> strength of a standard mail list and its simple time-based archive. We do gateway with [gmane](http://news.gmane.org/gmane.comp.web.zope.zwiki) so people 
+>> can use that as an alternative. I'm happy to chat about this, ping me..
+>> --[sm](http://joyful.com)
+
+[[tag wishlist]]
diff --git a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
new file mode 100644
index 000000000..43700337d
--- /dev/null
+++ b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
@@ -0,0 +1,3 @@
+It would rock if I could view diffs from the web without going via feeds. I envision toggle-style buttons on the recentchanges page, or just links to the CGI, which then displays the diff... --[[madduck]]
+
+[[tag wishlist]]
diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn
index fae384d39..d5aa6d0be 100644
--- a/doc/users/jondowland.mdwn
+++ b/doc/users/jondowland.mdwn
@@ -1,3 +1,4 @@
 A new ikiwiki user, looking at ikiwiki both for his personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins.
 
-(currently non-ikiwiki) Homepage: http://alcopop.org/
+* (currently non-ikiwiki) Homepage: <http://alcopop.org/>
+* potential future (ikiwiki) Homepage: <http://jmtd.net/>
diff --git a/doc/users/madduck.mdwn b/doc/users/madduck.mdwn
index 8acf07912..08cdad3e0 100644
--- a/doc/users/madduck.mdwn
+++ b/doc/users/madduck.mdwn
@@ -1 +1,6 @@
-<http://people.debian.org/~madduck>
\ No newline at end of file
+<http://people.debian.org/~madduck>
+
+I track this site with the following feed:
+
+[[inline pages="internal(recentchanges/change_*) and !author(http://madduck.net/)" 
+feedonly=yes atom=no]]
diff --git a/doc/users/xtaran.mdwn b/doc/users/xtaran.mdwn
new file mode 100644
index 000000000..fd39bde13
--- /dev/null
+++ b/doc/users/xtaran.mdwn
@@ -0,0 +1,5 @@
+[Homepage](http://noone.org/abe/), [Blog](http://noone.org/blog)
+
+Currently only use it to play around (so no link to any ikiwiki yet), but I really like it and [I see it as a potential WML killer](http://noone.org/blog/English/Computer/Web/WML/Is%20ikiwiki%20a%20WML%20killer%3f.futile). It also reminds me to Blosxom somehow although I think it won't be a Blosxom killer. OTOH I know of people who moved from Blosxom to Ikiwiki as blogging engine. :)
+
+Probably will use it for some parts of my website revamp and for wikiizing my [[/plugins/contrib/hnb]] note files.