Merge commit 'a547d2685866898665fad221939b0b820a42a088' into sipb

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index dcee376ee0776609827d8ddfb508d692f685688d..1e11d34e23542b79cdc87e0cd1cb7bef0aa984da 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,7 +5,6 @@ package IkiWiki;
 use warnings;
 use strict;
 use Encode;
-use HTML::Entities;
 use URI::Escape q{uri_escape_utf8};
 use POSIX ();
 use Storable;
@@ -235,6 +234,13 @@ sub getsetup () {
                safe => 1,
                rebuild => 1,
        },
+       html5 => {
+               type => "boolean",
+               default => 0,
+               description => "generate HTML5? (experimental)",
+               safe => 1,
+               rebuild => 1,
+       },
        sslcookie => {
                type => "boolean",
                default => 0,
@@ -1726,6 +1732,7 @@ sub misctemplate ($$;@) {
                wikiname => $config{wikiname},
                pagebody => $pagebody,
                baseurl => baseurl(),
+               html5 => $config{html5},
                @_,
        );
        run_hooks(pagetemplate => sub {