goodstuff update

* goodstuff: Remove otl plugin from the bundle since it needs a significant
  external dependency and is not commonly used. If you use otl, make sure
  you explicitly enable it now.
* goodstuff: Add more, progress, and table plugins to the bundle.

5 files changed, 14 insertions, 4 deletions

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index df928f222..08ed960b4 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -11,16 +11,18 @@ my @bundle=qw{
 	img
 	map
 	meta
+	more
 	orphans
 	pagecount
 	pagestats
+	progress
 	shortcut
 	smiley
 	tag
+	table
 	template
 	toc
 	toggle
-	otl
 };
 
 sub import { #{{{
diff --git a/debian/changelog b/debian/changelog
index dd0bed151..423ce12ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ ikiwiki (2.64) UNRELEASED; urgency=low
   * progress: New plugin to generate progress bars (willu)
   * Add allow_symlinks_before_srcdir to config so websetup doesn't eat it.
   * img: Support sizes like 200x. Closes: #475149
+  * goodstuff: Remove otl plugin from the bundle since it needs a significant
+    external dependency and is not commonly used. If you use otl, make sure
+    you explicitly enable it now.
+  * goodstuff: Add more, progress, and table plugins to the bundle.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 08 Sep 2008 19:21:20 -0400
 
diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index adf2b0a5b..83b60f4fa 100644
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -13,15 +13,17 @@ Currently included:
 * [[img]]
 * [[map]]
 * [[meta]]
+* [[more]]
 * [[orphans]]
 * [[pagecount]]
 * [[pagestats]]
+* [[progress]]
 * [[shortcut]]
 * [[smiley]]
 * [[tag]]
+* [[table]]
 * [[template]]
 * [[toc]]
 * [[toggle]]
-* [[otl]]
 
 New plugins will be added to this bundle from time to time.
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 08e4c48bc..029099143 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -45,13 +45,13 @@ Version 3.0 will be an opportunity to make significant transitions.
 * Default to using `aggregateinternal`.
 * Remove deprecated prefs form settings for `allowed_attachments` and
   `locked_pages`.
-* [[todo/Adjust_goodstuff]]
 
 ----
 
 # future goals
 
-* More documentation in the basewiki, including documentation for all enabled plugins.
+* More documentation in the basewiki, including documentation for all enabled
+  plugins.
 * Conversion support for existing other wikis.
   (Being worked on for MoinMoin and TWiki by [[Josh_Triplett|JoshTriplett]]
   and Jamey Sharp; support for other wikis should fit into the same
diff --git a/doc/todo/Adjust_goodstuff.mdwn b/doc/todo/Adjust_goodstuff.mdwn
index 78764c8c6..8a9b5c3b1 100644
--- a/doc/todo/Adjust_goodstuff.mdwn
+++ b/doc/todo/Adjust_goodstuff.mdwn
@@ -8,3 +8,5 @@ Alternatively, if including items that have minor external dependencies:
 * Possibly add [[plugins/table]].
 
 --[[JoshTriplett]]
+
+[[done]]