Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / goodstuff.mdwn

diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index 3402c7edcc17c96ca7469b179a9ac60844a53440..83b60f4fa554f28cba4db953bb5db004c1a343cf 100644 (file)
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=goodstuff included=1 author="[[Joey]]"]]
-[[tag type/bundle]]
+[[!template id=plugin name=goodstuff 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
@@ -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.