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

diff --git a/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn b/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn
index fe4d7209e9c31a0fc986ab8f23b781009306fbda..470647100340df3e5500085bcb06e0792883afcf 100644 (file)
--- a/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn
+++ b/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn
@@ -7,7 +7,7 @@ ikiwiki can keep track of lines in `hgrc` for which it is responsible by adding
 
 Two ways follow below. I prefer the long one. --[[Daniel Andersson]]
 
-> I comment myself: this can probably be solved without adding ad-hoc hooks and stuff (maybe not as "correct" as changing the config file only directly after wrappers have been generated, but good enough). I have a large rewrite of `mercurial.pm` ready, currently under local testing before I upload it for comments here, trying to make it equal in function to `git.pm`. Comments below are of course welcome, but I will look into other ways of solving it later. --[[Daniel Andersson]]
+> I comment myself: this can probably be solved without adding ad-hoc hooks and stuff (maybe not as "correct" as changing the config file only directly after wrappers have been generated, but good enough). I have a large rewrite of `mercurial.pm` ready, currently under local testing before I upload it for comments, trying to make it equal in function to `git.pm`. Comments below are of course welcome, but I will look into other ways of solving it later. Maybe `rcs_checkconfig` or `rcs_genwrapper` should host the `hgrc`-changing code. --[[Daniel Andersson]]
 
 Compact way (addresses only point 1)
 ------------------------------------