aboutsummaryrefslogtreecommitdiff
path: root/doc/features.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-10-08 23:57:37 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-10-08 23:57:37 +0000
commitbe55f6fd7cf1a251c3977f857a44ee2769e39d8b (patch)
tree36c09168ec20798e5fd5d1e0725cb8577d816928 /doc/features.mdwn
parentbf4e6716cc57eb6d0dfca43ce92b64934950513e (diff)
downloadikiwiki-be55f6fd7cf1a251c3977f857a44ee2769e39d8b.tar
ikiwiki-be55f6fd7cf1a251c3977f857a44ee2769e39d8b.tar.gz
* Atom feed support based on a patch by Clint Adams.
* Add feeds=no option to inline preprocessor directive to turn off all types of feeds. feeds=rss will still work, and feeds=atom was also added, for fine control. * $IkiWiki::version now holds the program version, and is accessible to plugins.
Diffstat (limited to 'doc/features.mdwn')
-rw-r--r--doc/features.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3890bc5dc..5eafcbfbd 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -50,7 +50,7 @@ program, or other special file and link to it from your wiki pages.
You can turn any page in the wiki into a [[blog]]. Pages matching a
specified [[PageSpec]] will be displayed as a weblog within the blog
-page. And an RSS feed can be generated to follow the blog.
+page. And RSS or Atom feeds can be generated to follow the blog.
Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples
of some of the flexible ways that this can be used.
@@ -90,7 +90,7 @@ incomplete list of some of them.
You can tag pages and use these tags in various ways. Tags will show
up in the ways you'd expect, like at the bottom of pages, in blogs, and
-in rss feeds.
+in RSS and Atom feeds.
### [[SubPages|SubPage]]