Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / todo / pedigree_plugin.mdwn

diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index bb84063448ad9ab41934a2b218bc867aad0213b0..1977c3d4dc1b9dc4a2caa6feabe531c40ed1e8b2 100644 (file)
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -156,9 +156,9 @@ Any opinions on the idea/design/implementation?
 >>>>> with only `PEDIGREE`, `DEPTH`, `HEIGHT`, `DEPTH_n` and
 >>>>> `HEIGHT_n`. -- intrigeri
 
->>>>>> Done, and pushed in my pedigree branch. I'm going to start
->>>>>> preparing the rename + move of parentlinks from the core.
->>>>>> --[[intrigeri]]
+>>>>>> Done, and pushed in my pedigree branch. Update: I've also done and
+>>>>>> pushed two commits that rename the plugin and replace 
+>>>>>> the core parentlinks with this one. --[[intrigeri]]
 
 (I'll try never to rebase this branch, but writing this plugin has
 been a pretext for me to start learning Git, so...)
@@ -180,3 +180,15 @@ 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]] 
+
+> Thanks. If the testsuite reveals itself to be harder to maintain than
+> the plugin, my ego won't be offended to see it removed. It's been
+> nice to find a way, step by step, to work with you on this small
+> plugin thing. I'm starting to feel a bit at home in ikiwiki
+> sourcetree, which is great since I may have to start working on some
+> more ambitious ikiwiki stuff, such as the ~multilingual wiki
+> (master language + translations) support. Expect news from me on
+> this front in the next weeks. --[[intrigeri]]
+
+[[!tag patch done]]