Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / todo / directive_docs.mdwn

diff --git a/doc/todo/directive_docs.mdwn b/doc/todo/directive_docs.mdwn
index b130e3d371ee0845c863ccfd02f3710b156ab89c..2baa61b402bd89ff357c97feac0be688491a5aa9 100644 (file)
--- a/doc/todo/directive_docs.mdwn
+++ b/doc/todo/directive_docs.mdwn
@@ -1,4 +1,4 @@
-The current basewiki is not self-documenting. In particular, if
+The current basewiki is not [[self-documenting|todo/basewiki_should_be_self_documenting]]. In particular, if

 [[plugins/listdirectives]] is used, it creates a list with a bunch of
 broken links to directives/*, pages that do not currently exist in the
 docwiki or basewiki.
 [[plugins/listdirectives]] is used, it creates a list with a bunch of
 broken links to directives/*, pages that do not currently exist in the
 docwiki or basewiki.


@@ -24,6 +24,8 @@ include examples of the plugin in use, which are sometimes rather expensive
 Either way requires a lot of reorganisation/doc work, and an onging
 maintenance load.
 
 Either way requires a lot of reorganisation/doc work, and an onging
 maintenance load.
 

+> Which has now been [[done]].  -- [[Will]]
+

 BTW, this patch would be needed for the second approach, to allow
 listdirectives to map from preprocessor directives back to the plugin that
 defined them:  --[[Joey]]
 BTW, this patch would be needed for the second approach, to allow
 listdirectives to map from preprocessor directives back to the plugin that
 defined them:  --[[Joey]]


@@ -38,15 +40,15 @@ defined them:  --[[Joey]]
     index e476521..afe982a 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
     index e476521..afe982a 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm

-    @@ -493,6 +493,7 @@ sub loadplugins () { #{{{
+    @@ -493,6 +493,7 @@ sub loadplugins () {

        return 1;
        return 1;

-     } #}}}
+     }

      
     +my $loading_plugin;
      
     +my $loading_plugin;

-     sub loadplugin ($) { #{{{
+     sub loadplugin ($) {

        my $plugin=shift;
      
        my $plugin=shift;
      

-    @@ -502,14 +503,18 @@ sub loadplugin ($) { #{{{
+    @@ -502,14 +503,18 @@ sub loadplugin ($) {

                         "$installdir/lib/ikiwiki") {
                if (defined $dir && -x "$dir/plugins/$plugin") {
                        require IkiWiki::Plugin::external;
                         "$installdir/lib/ikiwiki") {
                if (defined $dir && -x "$dir/plugins/$plugin") {
                        require IkiWiki::Plugin::external;


@@ -65,7 +67,7 @@ defined them:  --[[Joey]]
        if ($@) {
                error("Failed to load plugin $mod: $@");
        }
        if ($@) {
                error("Failed to load plugin $mod: $@");
        }

-    @@ -1429,6 +1434,9 @@ sub hook (@) { # {{{
+    @@ -1429,6 +1434,9 @@ sub hook (@) {

      
        return if $param{no_override} && exists $hooks{$param{type}}{$param{id}};
        
      
        return if $param{no_override} && exists $hooks{$param{type}}{$param{id}};
        


@@ -74,4 +76,4 @@ defined them:  --[[Joey]]
     +
        $hooks{$param{type}}{$param{id}}=\%param;
        return 1;
     +
        $hooks{$param{type}}{$param{id}}=\%param;
        return 1;

-     } # }}}
+     }