Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index 255f13f670c0701b97c504f4463a0b49be226b8b..527568208913e1c379c1ae31b79e2202173dab58 100644 (file)
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -1,27 +1,19 @@
 Most of ikiwiki's [[features]] are implemented as plugins. Many of these 
 plugins are included with ikiwiki.
 
 Most of ikiwiki's [[features]] are implemented as plugins. Many of these 
 plugins are included with ikiwiki.
 

-[[pagestats pages="plugins/type/* and !plugins/type/slow"]]
+[[!pagestats pages="plugins/type/* and !plugins/type/slow"]]

 
 There's documentation if you want to [[write]] your own plugins, or you can
 
 There's documentation if you want to [[write]] your own plugins, or you can

-install and use plugins [[contributed|contrib]] by others.
+[[install]] plugins [[contributed|contrib]] by others.

 
 

-To enable plugins, use the `--plugin` switch described in
-[[usage]], or the equivalent `add_plugins` line in [[ikiwiki.setup]].
+To enable a plugin, use the `--plugin` switch described in
+[[usage]], or the equivalent `add_plugins` line in ikiwiki.setup.

 Enable the [[goodstuff]] plugin to get a nice selection of plugins that
 will fit most uses of ikiwiki.
 
 Enable the [[goodstuff]] plugin to get a nice selection of plugins that
 will fit most uses of ikiwiki.
 

-Without administrator access, you can add some custom plugins by storing 
-yourcustomplugin.pm in /home/user/.ikiwiki/IkiWiki/Plugins (or any other
-place, keeping the "IkiWiki/Plugins" part of the path) and adding this
-line at the begining of your ikiwiki.setup file:
-
-    BEGIN { push @INC, "/home/user/.ikiwiki" } 
-
-

 ## Plugin directory
 
 ## Plugin directory
 

-[[inline pages="plugins/* and !plugins/type/* and !plugins/write and
-!plugins/contrib and !*/Discussion"
-feedpages="created_after(plugins/graphviz)" archive="yes"
+[[!inline pages="plugins/* and !plugins/type/* and !plugins/write and 
+!plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"
+feedpages="created_after(plugins/graphviz)" archive="yes" sort=title

 rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]
 rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]