Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / plugins / install.mdwn

diff --git a/doc/plugins/install.mdwn b/doc/plugins/install.mdwn
index 8ae1c8bde45ffad5eb56985f2b2e204f2dad7b7c..e810d8777d1abe90e416dbaa51c8440c820e06bf 100644 (file)
--- a/doc/plugins/install.mdwn
+++ b/doc/plugins/install.mdwn
@@ -8,14 +8,14 @@ inside the perl search path. For example, if your perl looks in
 `/usr/local/lib/site_perl` for modules, you can locally install ikiwiki
 plugins to `/usr/local/lib/site_perl/IkiWiki/Plugin`
 
 `/usr/local/lib/site_perl` for modules, you can locally install ikiwiki
 plugins to `/usr/local/lib/site_perl/IkiWiki/Plugin`
 

-You can use the `libdir` configuration option to add directories to the
+You can use the `libdirs` and/or `libdir` configuration options to add
+directories to the

 search path. For example, if you set `libdir` to `/home/you/.ikiwiki/`,
 search path. For example, if you set `libdir` to `/home/you/.ikiwiki/`,

-then ikiwiki will look for plugins in `/home/you/.ikiwiki/IkiWiki/Plugin`. This
-configuration option can be either a string (for backward compatibility) or a
-list of strings (to add several directories to the search path).
+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
 
 Ikiwiki also supports plugins that are external programs. These are
 typically written in some other language than perl. Ikiwiki searches for

-these in `/usr/lib/ikiwiki/plugins` by default. If `libdir` is set, it will
-also look under that directory, for example in `/home/you/.ikiwiki/plugins`.
+these in `/usr/lib/ikiwiki/plugins` by default. If `libdirs` or `libdir` are
+set, it will also look under those directories, for example in
+`/home/you/.ikiwiki/plugins`.

 Note that this type of plugin has to be executable for ikiwiki to use it.
 Note that this type of plugin has to be executable for ikiwiki to use it.