diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-07 12:42:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-07 12:42:38 -0400 |
| commit | 3adb47ec4f7374128d18a88cff54269104fc21fe (patch) | |
| tree | dd1ac2c19cece5de41a9b557d76b14ce40687a23 /doc/plugins | |
| parent | d9d910f6765de6ba07508ab56a5a0f93edb4c8ad (diff) | |
| parent | 25033d91145d0f102c6f6889f04e80e31b218684 (diff) | |
Merge branch 'master' into commentreorg
Conflicts:
debian/changelog
Diffstat (limited to 'doc/plugins')
| -rw-r--r-- | doc/plugins/po/discussion.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/write.mdwn | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn index ab822e76c..27683f1ea 100644 --- a/doc/plugins/po/discussion.mdwn +++ b/doc/plugins/po/discussion.mdwn @@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]] >>>> >>>>> Done. --[[intrigeri]] >>> -> * I'm very fearful of the `add_depends` in `postscan`. +> * I'm very fearful of the `add_depends` in `indexhtml`. > Does this make every page depend on every page that links > to it? Won't this absurdly bloat the dependency pagespecs > and slow everything down? And since nicepagetitle is given diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 3b1d770eb..193005565 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -39,7 +39,7 @@ built. Now that it knows what pages it needs to build, ikiwiki runs two compile passes. First, it runs `scan` hooks, which collect metadata about the pages. Then it runs a page rendering pipeline, by calling in turn these -hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`, +hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `indexhtml`, `pagetemplate`, `sanitize`, `format`. After all necessary pages are built, it calls the `change` hook. Finally, @@ -282,16 +282,16 @@ like `Makefile` that have no extension. If `hook` is passed an optional "longname" parameter, this value is used when prompting a user to choose a page type on the edit page form. -### postscan +### indexhtml - hook(type => "postscan", id => "foo", call => \&postscan); + hook(type => "indexhtml", id => "foo", call => \&indexhtml); This hook is called once the page has been converted to html (but before the generated html is put in a template). The most common use is to update search indexes. Added in ikiwiki 2.54. -The function is passed named parameters "page" and "content". Its return -value is ignored. +The function is passed named parameters "page", "destpage", and "content". +Its return value is ignored. ### pagetemplate |