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

6 files changed, 48 insertions, 3 deletions

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 1883394ea..b2f64ca59 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -27,6 +27,7 @@ Projects
 * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/))
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
 * The [awesome window manager homepage](http://awesome.naquadah.org/)
+* [Enemies of Carlotta](http://www.e-o-c.org/)
 
 Personal sites and blogs
 ========================
diff --git a/doc/plugins/install.mdwn b/doc/plugins/install.mdwn
index aa1c932bc..3efcb4c4b 100644
--- a/doc/plugins/install.mdwn
+++ b/doc/plugins/install.mdwn
@@ -10,7 +10,7 @@ plugins to `/usr/local/lib/site_perl/IkiWiki/Plugin`
 
 You can use the `libdir` configuration option to add a directory to the
 search path. For example, if you set `libdir` to `/home/you/.ikiwiki/`,
-then ikiwiki will look for plugins in `/home/you/.ikiwiki/IkiWiki/Plugins`.
+then ikiwiki will look for plugins in `/home/you/.ikiwiki/IkiWiki/Plugin`.
 
 Ikiwiki also supports plugins that are external programs. These are
 typically written in some other language than perl. Ikiwiki searches for
diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index f0ebb6d94..79a89d8a7 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -5,3 +5,22 @@ Interesting that you chose to use CSV format. Seems there are advantages
 (standardisation) and disadvantages (limited to simple tables).
 
 --[[Joey]]
+
+# Patch for new header options
+
+I have written a small patch for this plugin to enable the first column as a header instead of just the first row or no header.
+
+In my version, there is three options for the header field :
+
++ **no**: no header;
++ **col**: the first column as header;
++ **row**: the first row as header (for compatibility reason, **yes** is an alternate value for this option). 
+
+Here is the links to the patch and to a patched version of the plugin :
+
++ [table.pm.patch](http://lohrun.free.fr/ikiwiki/table.pm.patch)
++ [table.pm](http://lohrun.free.fr/ikiwiki/table.pm)
+
+I hope this might be intresting for some ikiwiki user's.
+
+--[[AlexandreDupas]]
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b7e1862d4..305c2ad99 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -97,7 +97,7 @@ Bulleted list
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
-
+* <a href="http://www.google.com/>do html links work?</a>
 -----
 
 <div class="whatever">
diff --git a/doc/todo/Support_preprocessing_CSS.mdwn b/doc/todo/Support_preprocessing_CSS.mdwn
index bee9ad91f..9aafc2449 100644
--- a/doc/todo/Support_preprocessing_CSS.mdwn
+++ b/doc/todo/Support_preprocessing_CSS.mdwn
@@ -1 +1 @@
-Inspired by [this blog post](http://eikke.com/2007/12/23/css-preprocessor/), I think ikiwiki could support preprocessing CSS files.  Templates, conditionals, and raw inlines could all prove useful in CSS. --[[JoshTriplett]]
+Inspired by [this blog post](http://eikke.com/css-preprocessor/), I think ikiwiki could support preprocessing CSS files.  Templates, conditionals, and raw inlines could all prove useful in CSS. --[[JoshTriplett]]
diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn
new file mode 100644
index 000000000..0ae413413
--- /dev/null
+++ b/doc/todo/passwordauth:_sendmail_interface.mdwn
@@ -0,0 +1,25 @@
+[[tag wishlist]]
+
+For sending out password reminder emails, the [[plugins/passwordauth]] plugin currently uses
+the *[Mail::Sendmail](http://search.cpan.org/perldoc?Mail::Sendmail)* module.
+This module, however, has the limitation that it can only talk *SMPT*,
+but can't use the standard Unix *sendmail* (command-line) interface.
+I don't want to have an MTA with a SMTPd running on my web server system.
+Would it be possible to switch to using one of the existing Perl modules that support
+the *sendmail* interface?
+
+From doing a quick search, these might be some candidates:
+
+  * <http://search.cpan.org/perldoc?Mail::Transport::Sendmail>
+  * <http://search.cpan.org/perldoc?Email::Send::Sendmail>
+  * <http://search.cpan.org/perldoc?Mail::SendVarious>
+  * <http://search.cpan.org/perldoc?EasyMail>
+
+None of them are packaged for Debian so far, but that should be doable easily, as far as I know.
+
+ikiwiki might perhaps even try to use all of them in turn until it finds a working one.
+
+I'd offer to work on a patch for the [[plugins/passwordauth]] plugin and other places
+in the ikiwiki source code, where emailing is done.
+
+--[[tschwinge]]