update

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3b3b8ff9b902d77a54ee892c5d6e9a2a47f82d82..a4f577f8f877b3ed28a535a2361d0ee9b6b72348 100644 (file)
--- 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 c89bcf161ebeaa43284db8eacf92b61ec28c4829..7d242c0ce626746c4f8e4770e878f2dbbe14550e 100644 (file)
--- 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 e27a00a8971a04803c216cad63ec25fda5f9f88f..4aa6ff210eaa2cd3506b30bf6ba827b279c0b2c9 100644 (file)
--- 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.