Merge branch 'master' of git://github.com/joeyh/ikiwiki

3 files changed, 12 insertions, 2 deletions

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 1c43fb272..fcf5b936f 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -5,8 +5,8 @@
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
 ### Usage
-7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]],
-[[!cpan String::ShellQuote]], [[!cpan File::ReadBackwards]], and
+7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan
+File::ReadBackwards]], and
 [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
 7. Adjust CVS-related parameters in your setup file.
 
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index b5f03ac6f..1f0ce0102 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -122,3 +122,6 @@ to run the command, with stderr temporarily sent to /dev/null:
 `cvs_runcvs` should not take an array reference. It's
 usual for this type of function to take a list of parameters
 to pass to the command.
+
+> Thanks for reading carefully. I've tested your suggestions and
+> applied them on my branch. --[[schmonz]]
diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 16e5a5a56..86572c935 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -64,3 +64,10 @@ Do you like it? Can you implement the same in Ikiwiki? :) --[[Paweł|ptecza]]
 >> was written rather for simple usage. However cell alignment is very
 >> helpful feature, so I think the plugin should be able to do it.
 >> --[[Paweł|ptecza]]
+
+-----
+
+If you see `[[!table\ Error: ]]` you probably need to `sudo apt-get install libtext-csv-perl`.
+
+> Perhaps more helpfully, ikiwiki 3.1415926 fixes display of such errors to
+> actualy include the error message. --[[Joey]]