diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-24 13:30:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-24 13:30:29 -0400 |
| commit | dfef51e10ed46419ce361411a0fd27966d84e21e (patch) | |
| tree | ce925c4ffad3e49b7423fc992da1282cbda5ee0a /doc | |
| parent | 0196e1f9fcfebbf904e59c029e494cb2186793e6 (diff) | |
| parent | 7a89dbb8225b00ec7f1ee559f2b8daad8e0ae404 (diff) | |
| download | ikiwiki-dfef51e10ed46419ce361411a0fd27966d84e21e.tar ikiwiki-dfef51e10ed46419ce361411a0fd27966d84e21e.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/plugins/write.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/applydiff_plugin.mdwn | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 7fbe4bd57..5ee4acb53 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -823,7 +823,7 @@ It's ok if this is not implemented, and throws an error. #### `rcs_receive()` This is called when ikiwiki is running as a pre-receive hook (or -equivilant), and is testing if changes pushed into the RCS from an +equivalent), and is testing if changes pushed into the RCS from an untrusted user should be accepted. This is optional, and doesn't make sense to implement for all RCSs. diff --git a/doc/todo/applydiff_plugin.mdwn b/doc/todo/applydiff_plugin.mdwn index 5f6333691..feb68a808 100644 --- a/doc/todo/applydiff_plugin.mdwn +++ b/doc/todo/applydiff_plugin.mdwn @@ -1,4 +1,4 @@ -[[!tag wishlist]] +[[!tag wishlist done]] [[!toc ]] @@ -100,3 +100,9 @@ Also see [[joey]]'s idea on [[users/xma/discussion]], to allow (filtered) anonym >> I think it makes more sense than using diffs, and so think this todo >> could probably be closed. >> --[[Joey]] + +>>> I agree, closing this. I really prefer this solution to the one I was +>>> initially proposing. +>>> Is this pre-receive hook already enabled on ikiwiki.info? +>>> If not, do you plan to enable it at some point? +>>> --[[intrigeri]] |