Merge commit 'remotes/smcv/ready/remove-pagespec-merge'

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

diff --git a/docwiki.setup b/docwiki.setup
index 64e5e4ac66fc1a63868208cc633880de609e1c01..52421e50111ff7045504c442ffde3c7b3b1a5dc5 100644 (file)
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -6,15 +6,15 @@ use IkiWiki::Setup::Standard {
        srcdir => "doc",
        destdir => "html",
        templatedir => "templates",
        srcdir => "doc",
        destdir => "html",
        templatedir => "templates",

+       underlaydirbase => "underlays",

        underlaydir => "underlays/basewiki",
        underlaydir => "underlays/basewiki",

-       wrappers => [],

        discussion => 0,
        discussion => 0,

-       exclude => qr/\/discussion/,
+       exclude => qr/\/discussion|bugs\/*|todo\/*/,

        locale => '',
        verbose => 1,
        syslog => 0,
        userdir => "users",
        usedirs => 0,
        locale => '',
        verbose => 1,
        syslog => 0,
        userdir => "users",
        usedirs => 0,

-       multimarkdown => 1,
+       prefix_directives => 1,

        add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }
        add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }