merged intrigeri's parentlinks plugin, close todo

diff --git a/debian/changelog b/debian/changelog
index 8d1c4f0fc5320f50b8c0d23c39bf479f3bfe9d5d..070f92a04fb31b596d752d01e88715d62a354dbf 100644 (file)
--- 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.
     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
 
   [ 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 9504a964b1a3c7eaf11ed890eb1ec0a4fdd5b71f..05c3597a128a46961e1e9770cf97e3cc6ee54ca3 100644 (file)
--- 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
 
 >> 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]]