Merge branch 'master' into po

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

diff --git a/doc/w3mmode/ikiwiki.setup b/doc/w3mmode/ikiwiki.setup
index ed65e0f919dfc1dd24652e5f0120d5b9a3008003..5f5cbbff927476d1ca85d74657d26f9560d8c5e4 100644 (file)
--- a/doc/w3mmode/ikiwiki.setup
+++ b/doc/w3mmode/ikiwiki.setup
@@ -7,8 +7,6 @@
 
 use IkiWiki::Setup::Standard {
        wikiname => "ikiwiki",
-       #adminuser => ["yourname", ],
-       #adminemail => 'me@myhost',
        
        # Be sure to customise these..
        srcdir => "doc",
@@ -16,66 +14,18 @@ use IkiWiki::Setup::Standard {
        
        # Enable w3m mode.
        w3mmode => 1,
-
        cgiurl => 'ikiwiki.cgi',
-       #templatedir => "/usr/share/ikiwiki/templates",
-       
        rcs => "",
 
-       # Subversion stuff.
-       #rcs => "svn",
-       #historyurl => "http://svn.myhost/trunk/[[file]]",
-       #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-       #svnrepo => "/svn/wiki",
-       #svnpath => "trunk",
-
-       # Git stuff.
-       #rcs => "git",
-       #historyurl => "http://git.host/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
-       #diffurl => "http://git.host/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+       # 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",
 
-       wrappers => [
-               {
-                       # The cgi wrapper.
-                       cgi => 1,
-                       wrapper => "$ENV{HOME}/.ikiwiki/wrappers/ikiwiki.cgi",
-                       wrappermode => "0755",
-               },
-               #{
-               #       # The svn post-commit wrapper.
-               #       # Note that this will overwrite any existing
-               #       # post-commit hook script, which may not be
-               #       # what you want.
-               #       wrapper => "/svn/wikirepo/hooks/post-commit",
-               #       wrappermode => "04755",
-               #       # Enable mail notifications of commits.
-               #       notify => 1,
-               #},
-               #{
-               #       # The git post-update wrapper.
-               #       # Note that this will overwrite any existing
-               #       # post-update hook script, which may not be
-               #       # what you want.
-               #       wrapper => "/git/wikirepo/.git/hooks/post-update",
-               #       wrappermode => "04755",
-               #       # Enable mail notifications of commits.
-               #       notify => 1,
-               #},
-       ],
-       
-       # Can anonymous web users edit pages?
-       anonok => 1,
-       # Generate rss feeds for pages?
+       add_plugins => [qw{anonok}],
        rss => 1,
-       # Urls to ping with XML-RPC when rss feeds are updated
-       #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
-       # Include discussion links on all pages?
+       atom => 1,
        discussion => 1,
-       # Time format (for strftime)
-       #timeformat => '%c',
-       
-       # To add plugins, list them here.
-       #add_plugins => [qw{pagecount brokenlinks search smiley wikitext}],
-       # If you want to disable any of the default plugins, list them here.
-       #disable_plugins => [qw{inline htmlscrubber}],
 }