Merge commit 'origin/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Plugin / calendar.pm

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index b808c9d1d64bbc5adf226335e14b31d7b5c67085..6d536a91bb63a6e0a32f399844115e52208d5bdf 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -30,16 +30,20 @@ my $time=time;
 my @now=localtime($time);
 
 sub import { #{{{
 my @now=localtime($time);
 
 sub import { #{{{

-       hook(type => "getsetup", id => "version", call => \&getsetup);
-       hook(type => "needsbuild", id => "version", call => \&needsbuild);
+       hook(type => "getsetup", id => "calendar", call => \&getsetup);
+       hook(type => "needsbuild", id => "calendar", call => \&needsbuild);

        hook(type => "preprocess", id => "calendar", call => \&preprocess);
 } #}}}
 
 sub getsetup () { #{{{
        return
        hook(type => "preprocess", id => "calendar", call => \&preprocess);
 } #}}}
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },

                archivebase => {
                        type => "string",
                archivebase => {
                        type => "string",

-                       default => "archives",
+                       example => "archives",

                        description => "base of the archives hierarchy",
                        safe => 1,
                        rebuild => 1,
                        description => "base of the archives hierarchy",
                        safe => 1,
                        rebuild => 1,