Merge branch 'master' into cvs

[ikiwiki.git] / docwiki.setup

diff --git a/docwiki.setup b/docwiki.setup
index bb9616d0497f2b1d812a53567af430e44ca35e0c..52421e50111ff7045504c442ffde3c7b3b1a5dc5 100644 (file)
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -6,6 +6,7 @@ use IkiWiki::Setup::Standard {
        srcdir => "doc",
        destdir => "html",
        templatedir => "templates",
+       underlaydirbase => "underlays",
        underlaydir => "underlays/basewiki",
        discussion => 0,
        exclude => qr/\/discussion|bugs\/*|todo\/*/,
@@ -15,5 +16,5 @@ use IkiWiki::Setup::Standard {
        userdir => "users",
        usedirs => 0,
        prefix_directives => 1,
-       add_plugins => [qw{goodstuff version haiku polygen fortune txt}],
+       add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }