meta: Plugin is now enabled by default since the basewiki uses it.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bab7b707aa6c485338fb3b863760e8019cd65e1c..91d2e6082a9291a24ffd17681bb8fc2b00470c2f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -120,7 +120,7 @@ sub getsetup () { #{{{
        },
        default_plugins => {
                type => "internal",
-               default => [qw{mdwn link inline htmlscrubber passwordauth
+               default => [qw{mdwn link inline meta htmlscrubber passwordauth
                                openid signinedit lockedit conditional
                                recentchanges parentlinks editpage}],
                description => "plugins to enable by default",

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index ed1f4ddfc6cab5d88604be3fbe409ba3a573f642..a18e626d4c94b037d8a05c3c971ab9600f0f6e95 100644 (file)
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -10,7 +10,6 @@ my @bundle=qw{
        brokenlinks
        img
        map
-       meta
        more
        orphans
        pagecount

diff --git a/debian/changelog b/debian/changelog
index cd8ecba7c2b27d30d1472de5d588af1c77e54b5f..a197369cc80fd9b51876c485321a7807ce5342c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (2.69) UNRELEASED; urgency=low
     links. Since this needs the just released XML::Feed 0.3, as well 
     as a not yet released XML::RSS, it will fall back to the old method
     if no xml:base info is available.
+  * meta: Plugin is now enabled by default since the basewiki uses it.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
 

diff --git a/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn b/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn
index a90227b7ac5b335f186f7955ac8f1ae0ea87c9e1..62931d8bc877697f6a94794c94dab1614a300857 100644 (file)
--- a/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn
+++ b/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn
@@ -1,3 +1,5 @@
 [[plugins/meta]] is not enabled by default, yet some pages in the default basewiki include [[the_meta_directive|ikiwiki/directive/meta]], notably the [[ikiwiki]] heirarchy.
 
 This means that the default output of "ikiwiki src dest", for two empty directories src and dest, result in the meta directive being displayed inline with the page text.
+
+> [[done]], meta now enabled by default.

diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index 83b60f4fa554f28cba4db953bb5db004c1a343cf..ed57c0f01336622eb9d53ebb339598dfca78080b 100644 (file)
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -12,7 +12,6 @@ Currently included:
 * [[brokenlinks]]
 * [[img]]
 * [[map]]
-* [[meta]]
 * [[more]]
 * [[orphans]]
 * [[pagecount]]

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index afd55499303f42dd4284c457623bb543fd09003c..e49bdcc501bb0f3bfa91f6d18b79b0a0a2fb925b 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=meta author="[[Joey]]"]]
+[[!template id=plugin name=meta core=1 author="[[Joey]]"]]
 [[!tag type/meta]]
 
 This plugin provides the [[ikiwiki/directive/meta]] [[ikiwiki/directive]],