From: Joey Hess Date: Mon, 13 Feb 2012 15:43:39 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20120203~165 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/021521ffc82497b2c8148bb948e6b682f85d2bce?hp=2717d9774a2214f936af4e9e74f10181e6a9c027 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/git.mdwn b/doc/git.mdwn index c9f16a214..b8bf501c6 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -74,7 +74,7 @@ think about merging them. This is recommended. :-) * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` * [[yds]] `git://github.com/yds/ikiwiki.git` * [[pelle]] `git://github.com/hemmop/ikiwiki.git` -* [[cgray]] `git://github.com/chrismgray/ikiwiki.git` +* [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git` ## branches diff --git a/doc/ikiwiki-calendar/discussion.mdwn b/doc/ikiwiki-calendar/discussion.mdwn new file mode 100644 index 000000000..0fa062413 --- /dev/null +++ b/doc/ikiwiki-calendar/discussion.mdwn @@ -0,0 +1,11 @@ +Suggestion to change + + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" + +to + + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup 'posts/* and !*/Discussion' + +I ran into (for me) unexpected behaviour with double quotes, since when I tried it in the interactive shell, the "!" made it fail ([history expansion](http://mywiki.wooledge.org/BashPitfalls#echo_.22Hello_World.21.22)). I thought "aha, it should be escaped!", did so, and did not get any error messages, but it no longer functioned as intended (as per the earlier linked page). + +The latter line will work everywhere, not just in environments without history expansion. I think trying a command manually before putting it into crontab is common, and this would avoid the possible user issue I ran into. diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 96b94a163..4d7df7501 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -172,3 +172,4 @@ Personal sites and blogs * [SolderPad Documentation](http://docs.solderpad.com) * various sub-domains at kisikew.org ([example](https://portal.kisikew.org/)) * [Paul Elms](http://paul.elms.pro) Personal site and blog in russian. +* [James' Tech Notes](http://jamestechnotes.com) My technical notes, blog, wiki, personal site. diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn new file mode 100644 index 000000000..8c47d4e5f --- /dev/null +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -0,0 +1,30 @@ +[[!template id=gitbranch branch=chrismgray/exclusive-hooks author="[[chrismgray]]"]] + +Sometimes plugins register a function with `hook`, but they only want +the function called with the content that they know how to deal with. +Normally, this means that they call `pagetype` first thing in the +function, determine if they know how to deal with the content, and +only do anything if they do. + +This is a bit wasteful in itself, but for external plugins, it's +really bad. For functions like `scan` and `linkify`, where the entire +page is sent back and forth over `stdout` and `stdin`, it really slows +things down. + +Thus, I propose that there be a new optional parameter to `hook` that +tells it that the function should only be called for files whose type +is the same as the id of the plugin calling `hook`. I have called +this parameter `exclusive` in my branch, but this might not be the +best name. + +[[!tag patch]] + +> It's an interesting idea, but it might be more useful if it was more generalized, say, by making it a filter, where the parameter is a regexp. +> +> --[[KathrynAndersen]] + +>> Would it make more sense as a pagespec? That might be a bit more hard to implement, but would certainly fix the naming issue. +>> +>> --[[chrismgray]] + +>>> Considering where it would be called, a pagespec might be overkill. --[[KathrynAndersen]] diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index b6495194a..e19ceaa8f 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -55,3 +55,7 @@ href="http://jaspervdj.be/hakyll">Hakyll? >> dependency stuff. -- [[tychoish]] >>> (nods) Which is why I suggested it. I'm not sure whether it would be easier to "bolt on" those things than static compilation, but it could be worth looking at, at least. -- [[KathrynAndersen]] + +----- + +Rather than coding plugins for the Perl ikiwiki in Haskell, I wonder how easily a Haskell ikiwiki could still support plugins written in Perl? The (old and apparently stale) [HsPerl5](http://hackage.haskell.org/package/HsPerl5) package might provide a helpful starting point there. -- [[JoshTriplett]] diff --git a/doc/users/chrismgray.mdwn b/doc/users/chrismgray.mdwn new file mode 100644 index 000000000..b0084830d --- /dev/null +++ b/doc/users/chrismgray.mdwn @@ -0,0 +1,4 @@ +I'm Chris Gray. I have an ikiwiki-based blog at +[[http://chrismgray.github.com]]. I wrote a plugin for +[[org-mode|todo/org_mode]] files that is probably the first ikiwiki +plugin written mostly in emacs lisp.