Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 9d21fe3676e1f6e322139f2d43290127373751b5..2be983693d7d2d67f5cbd39a93b19c0885f6cfa6 100644 (file)
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -12,12 +12,15 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
                anonok_pagespec => {
                        type => "pagespec",
                        example => "*/discussion",
                        description => "PageSpec to limit which pages anonymous users can edit",
-                       description_html => htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).
-                               " to limit which pages anonymous users can edit",
+                       link => "ikiwiki/PageSpec",
                        safe => 1,
                        rebuild => 0,
                },