diff options
| -rw-r--r-- | doc/features.mdwn | 8 | ||||
| -rw-r--r-- | doc/news/email_subscriptions.mdwn | 2 | ||||
| -rw-r--r-- | doc/templates.mdwn | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn index 3b3b8ff9b..a4f577f8f 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -44,7 +44,8 @@ Currently implemented: matching a specified [[GlobList]] will be displayed as a weblog within the blog page. And an RSS feed can be generated to follow the blog. - Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of the flexible ways that this can be used. + Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of + the flexible ways that this can be used. * Fast compiler @@ -107,6 +108,11 @@ Currently implemented: ikiwiki can use the [[HyperEstraier]] search engine to add powerful full text search capabilities to your wiki. +* Commit mails + + ikiwiki can be configured to send you commits mails with diffs of changes + of selected pages. + ---- It also has some [[TODO]] items and [[Bugs]]. diff --git a/doc/news/email_subscriptions.mdwn b/doc/news/email_subscriptions.mdwn index c89bcf161..7d242c0ce 100644 --- a/doc/news/email_subscriptions.mdwn +++ b/doc/news/email_subscriptions.mdwn @@ -1,8 +1,6 @@ ikiwiki now supports subscribing to pages on wikis with a subversion backend. Subscribers will be mailed commit diffs. -(Support for editing subscriptions in the web UI will be implemented RSN. I got a tad ahead of myself with commits here.. --[[Joey]]) - Some changes are needed to ikiwiki configs to support this: * A new `--adminemail` config option has been added, that is used for both diff --git a/doc/templates.mdwn b/doc/templates.mdwn index e27a00a89..4aa6ff210 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -11,6 +11,9 @@ It ships with some basic templates which can be customised: have a custom template. * `templates/recentchanges.tmpl` - Used for the RecentChanges page. * `templates/editpage.tmpl` - Create/edit page. +* `templates/notifymail.tmpl` - Not a html template, this is used to + generate change notification mails for users who have subscribed to + changes to a page. * `templates/passwordmail.tmpl` - Not a html template, this is used to generate the mail with the user's password in it. * `templates/rsspage.tmpl` - Used for generating rss feeds for [[blog]]s. |