Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / w3mmode / ikiwiki.setup

diff --git a/doc/w3mmode/ikiwiki.setup b/doc/w3mmode/ikiwiki.setup
index 216e066c8ec431e7b8e2fc800184b76fa48e6f78..5f5cbbff927476d1ca85d74657d26f9560d8c5e4 100644 (file)
--- a/doc/w3mmode/ikiwiki.setup
+++ b/doc/w3mmode/ikiwiki.setup
@@ -17,16 +17,14 @@ use IkiWiki::Setup::Standard {
        cgiurl => 'ikiwiki.cgi',
        rcs => "",
 
        cgiurl => 'ikiwiki.cgi',
        rcs => "",
 

-       wrappers => [
-               {
-                       # The cgi wrapper.
-                       cgi => 1,
-                       wrapper => "$ENV{HOME}/.ikiwiki/wrappers/ikiwiki.cgi",
-                       wrappermode => "0755",
-               },
-       ],
-       
-       anonok => 1,
+       # The wrapper must be put in ~/.ikiwiki/wrappers/, since
+       # ikiwiki-w3m.cgi only looks in this one location.
+       # The wrapper can be given any name as long as it's 
+       # in that directory.
+       cgi_wrapper => "$ENV{HOME}/.ikiwiki/wrappers/ikiwiki.cgi",
+       cgi_wrappermode => "0755",
+
+       add_plugins => [qw{anonok}],

        rss => 1,
        atom => 1,
        discussion => 1,
        rss => 1,
        atom => 1,
        discussion => 1,