From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 29 Jul 2008 19:54:45 +0000 (-0400)
Subject: Merge branch 'tova' into autoconfig
X-Git-Tag: 2.60~145
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/12c5786df4e74c143f24398b8d0028000b61daba?hp=--cc
Merge branch 'tova' into autoconfig
Conflicts:
debian/changelog
---
12c5786df4e74c143f24398b8d0028000b61daba
diff --cc IkiWiki/Plugin/skeleton.pm.example
index 49c4d88f2,10c7002e4..bbf11e603
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@@ -10,8 -10,8 +10,9 @@@ use IkiWiki 2.00
sub import { #{{{
hook(type => "getopt", id => "skeleton", call => \&getopt);
+ hook(type => "getsetup", id => "skeleton", call => \&getsetup);
hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+ hook(type => "refresh", id => "skeleton", call => \&refresh);
hook(type => "needsbuild", id => "skeleton", call => \&needsbuild);
hook(type => "preprocess", id => "skeleton", call => \&preprocess);
hook(type => "filter", id => "skeleton", call => \&filter);
diff --cc debian/changelog
index 7b4bc4215,7fd135700..c4e4b7f48
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,26 @@@
+ikiwiki (2.60) UNRELEASED; urgency=low
+
+ * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
+ can be used set up a new wiki in seconds.
+ * Add getsetup hook, all plugins that add fields to %config should use it.
+ * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
+ current configuration.
+ * Large amounts of internal config data reorg.
+ * The way wrappers are defined in the setup file has changed. Old setup
+ files will continue to work, for now.
+ * Version control backends promoted to first-class plugins.
+ * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
+ always to add.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
+
+ ikiwiki (2.56) UNRELEASED; urgency=low
+
+ * autoindex: New plugin that generates missing index pages.
+ (Sponsored by The TOVA Company.)
+
+ -- Joey Hess <joeyh@debian.org> Tue, 29 Jul 2008 15:53:26 -0400
+
ikiwiki (2.55) unstable; urgency=low
* remove: New plugin that adds the ability to remove pages via the web.