summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-16 17:49:24 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-16 17:49:24 -0400
commitdc1cbf2c8ccc45841b0319bf0279b79b2e6dbcc2 (patch)
tree80419364ac3e8149e321fb7a6c5490823e1e3ab9
parent67d8f7f209a5494bec611ff4e5476d68cf653857 (diff)
merged intrigeri's parentlinks plugin, close todo
-rw-r--r--debian/changelog4
-rw-r--r--doc/todo/pedigree_plugin.mdwn3
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8d1c4f0fc..070f92a04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,8 @@ ikiwiki (2.54) UNRELEASED; urgency=low
to be inserted into the page.
* Cut the size of the binary package in half by excluding pages for bugs
and todo items from the html shipped in it.
- * parentlinks: New plugin, split out of ikiwiki core, and several new
- fields added to allow for advanced styling. (intrigeri)
+ * parentlinks: New plugin, split out of ikiwiki core and enabled by default,
+ and several new fields added to allow for advanced styling. (intrigeri)
[ Simon McVittie ]
* meta, inline: Support guid options, to allow forcing a particular url or
diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index 9504a964b..05c3597a1 100644
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -180,3 +180,6 @@ default templates do use parentlinks ;).
>> Just commited a testsuite for this plugin, BTW. It's nearly twice
>> big as the plugin itself, I'm wondering... -- intrigeri
+Merged, nice work. (Overkill having a test suite. ;-) --[[Joey]]
+
+[[tag patch done]]