Merge commit 'origin/master' into aggregateinternal

[git.ikiwiki.info.git] / docwiki.setup

diff --git a/docwiki.setup b/docwiki.setup
index 64e5e4ac66fc1a63868208cc633880de609e1c01..ba3dd680d409d8afcf9e0e4019e618e6884acde2 100644 (file)
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -9,12 +9,11 @@ use IkiWiki::Setup::Standard {
        underlaydir => "underlays/basewiki",
        wrappers => [],
        discussion => 0,
-       exclude => qr/\/discussion/,
+       exclude => qr/\/discussion|bugs\/*|todo\/*/,
        locale => '',
        verbose => 1,
        syslog => 0,
        userdir => "users",
        usedirs => 0,
-       multimarkdown => 1,
        add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }