Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 1099045b54f861146f8a723a13f3dfc48574df30..067938f87118f4816e0954d78ae4d7314f5c9483 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -26,7 +26,7 @@ There is a backport of a recent version of ikiwiki for Debian 4.0 at
 
 Fedora versions 8 and newer have RPMs of ikiwiki available.
 
-There is also an unofficial backport of ikiwiki for Ubuntu Hardy, provided by
+There is also an unofficial backport of ikiwiki for Ubuntu Intrepid, provided by
 [[Paweł_Tęcza|users/ptecza]],
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 

diff --git a/doc/todo/need_global_renamepage_hook.mdwn b/doc/todo/need_global_renamepage_hook.mdwn
index 8265497ae8c9651afc97a11782709f32eb78cf70..f4e18baa210f406a441cfe657e2417cfde79b175 100644 (file)
--- a/doc/todo/need_global_renamepage_hook.mdwn
+++ b/doc/todo/need_global_renamepage_hook.mdwn
@@ -25,7 +25,7 @@ It may seem like a corner case, but I want to be very careful when
 deleting files automatically in `srcdir`, which is not always under
 version control.
 
-As an sad workaround, I can still disable any deletion in `srcdir`
+As a sad workaround, I can still disable any deletion in `srcdir`
 when it is not under version control. But I think ikiwiki deserves
 a global `renamepage` hook that would be run once per rename
 operation.
@@ -51,3 +51,7 @@ would solve my problem. Hmmm? --[[intrigeri]]
 > It might make sense to rename `renamepage` to `renamelink` to make it
 > clearer what it does. (I'm not very worried about this breaking things, at
 > this point.) --[[Joey]]
+
+>> In my `po` branch, I renamed `renamepage` to `renamelink`, and
+>> created a `rename` hook that is passed a reference to `@torename`.
+>> --[[intrigeri]]