rename

diff --git a/IkiWiki/Plugin/goodstuff.mdwn b/IkiWiki/Plugin/goodstuff.mdwn
new file mode 100644 (file)
index 0000000..384123f
--- /dev/null
+++ b/IkiWiki/Plugin/goodstuff.mdwn
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+# Bundle of good stuff.
+package IkiWiki::Plugin::goodstuff;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+my @bundle=qw{
+       brokenlinks
+       img
+       map
+       meta
+       orphans
+       pagecount
+       pagestats
+       shortcut
+       smiley
+       tag
+       template
+       toc
+       toggle
+       otl
+};
+
+sub import { #{{{
+       IkiWiki::loadplugin($_) foreach @bundle;
+} # }}}
+
+1

diff --git a/IkiWiki/Plugin/nicebundle.pm b/IkiWiki/Plugin/nicebundle.pm
deleted file mode 100644 (file)
index 7139a2a..0000000
--- a/IkiWiki/Plugin/nicebundle.pm
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-package IkiWiki::Plugin::nicebundle;
-
-use warnings;
-use strict;
-use IkiWiki;
-
-my @bundle=qw{
-       brokenlinks
-       img
-       map
-       meta
-       orphans
-       pagecount
-       pagestats
-       shortcut
-       smiley
-       tag
-       template
-       toc
-       toggle
-       otl
-};
-
-sub import { #{{{
-       IkiWiki::loadplugin($_) foreach @bundle;
-} # }}}
-
-1

diff --git a/Makefile.PL b/Makefile.PL
index b02eb15b04495c90892eee5916f448c51157ae9b..8aba79ccb32abaf7a0d24be78f1d4c2ed1ffff1a 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,7 +27,7 @@ extra_build:
        ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \
                --wikiname="ikiwiki" --verbose --no-rcs \
                --exclude=/discussion --no-discussion \
        ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \
                --wikiname="ikiwiki" --verbose --no-rcs \
                --exclude=/discussion --no-discussion \

-               --plugin=nicebundle \
+               --plugin=goodstuff \

                --plugin=haiku --plugin=polygen --plugin=fortune
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
                --plugin=haiku --plugin=polygen --plugin=fortune
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man

diff --git a/debian/changelog b/debian/changelog
index 3ef8c7160de3d109bc7a46b30be8e758f55c80fe..02ea0b7b19c5e9bcf37aaac0379162b59efe5c6b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,10 @@ ikiwiki (1.34) UNRELEASED; urgency=low
   * Make the openid plugin support the callbacks from myopenid.com via its
     affiliate program.
   * Add toggle plugin.
   * Make the openid plugin support the callbacks from myopenid.com via its
     affiliate program.
   * Add toggle plugin.

-  * Introduce the nicebundle. This is a kind of plugin, that just enables
+  * Introduce the goodstuff bundle. This is a kind of plugin, that just enables

     many other plugins. It's an easy way to boost ikiwiki from its default,
     basic wiki, to a full-featured wiki, without manually picking the right
     many other plugins. It's an easy way to boost ikiwiki from its default,
     basic wiki, to a full-featured wiki, without manually picking the right

-    set of plugins. New plugins will be added to the nicebundle from time to
+    set of plugins. New plugins will be added to goodstuff from time to

     time.
   * Change how post signin actions are propigated through the signin process;
     they're now stored in the session.
     time.
   * Change how post signin actions are propigated through the signin process;
     they're now stored in the session.

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 7f0975f5dc828d3720284dffef6bd3e87424d0d9..f7bf81bc91375a0088683f3d6dee314298971f3b 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -93,7 +93,7 @@ use IkiWiki::Setup::Standard {
        syslog => 0,
        
        # To add plugins, list them here.
        syslog => 0,
        
        # To add plugins, list them here.

-       #add_plugins => [qw{nicebundle openid search wikitext camelcase
+       #add_plugins => [qw{goodstuff openid search wikitext camelcase

        #                   htmltidy fortune sidebar map rst}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth}],
        #                   htmltidy fortune sidebar map rst}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth}],

diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
new file mode 100644 (file)
index 0000000..3402c7e
--- /dev/null
+++ b/doc/plugins/goodstuff.mdwn
@@ -0,0 +1,27 @@
+[[template id=plugin name=goodstuff included=1 author="[[Joey]]"]]
+[[tag type/bundle]]
+
+This plugin enables a bunch of other plugins -- basically all the ones that
+are not too intrusive, work well with little configuration, and are nice to
+have on any capable wiki. The plugins in this bundle are not enabled by
+default in ikiwiki, so that by default ikiwiki is limited to a few core
+wiki features. If you want a more capable wiki, enable this plugin bundle.
+
+Currently included:
+
+* [[brokenlinks]]
+* [[img]]
+* [[map]]
+* [[meta]]
+* [[orphans]]
+* [[pagecount]]
+* [[pagestats]]
+* [[shortcut]]
+* [[smiley]]
+* [[tag]]
+* [[template]]
+* [[toc]]
+* [[toggle]]
+* [[otl]]
+
+New plugins will be added to this bundle from time to time.

diff --git a/doc/plugins/nicebundle.mdwn b/doc/plugins/nicebundle.mdwn
deleted file mode 100644 (file)
index 6a38298..0000000
--- a/doc/plugins/nicebundle.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-[[template id=plugin name=nicebundle included=1 author="[[Joey]]"]]
-[[tag type/bundle]]
-
-This plugin enables a bunch of other plugins -- basically all the ones that
-are not too intrusive, work well with little configuration, and are nice to
-have on any capable wiki. The plugins in this bundle are not enabled by
-default in ikiwiki, so that by default ikiwiki is limited to a few core
-wiki features. If you want a more capable wiki, enable this plugin bundle.
-
-Currently included:
-
-* [[brokenlinks]]
-* [[img]]
-* [[map]]
-* [[meta]]
-* [[orphans]]
-* [[pagecount]]
-* [[pagestats]]
-* [[shortcut]]
-* [[smiley]]
-* [[tag]]
-* [[template]]
-* [[toc]]
-* [[toggle]]
-* [[otl]]
-
-New plugins will be added to this bundle from time to time.