* 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.

2 files changed, 3 insertions, 7 deletions

diff --git a/basewiki/blog.mdwn b/basewiki/blog.mdwn
index 4b4e376b1..b1c2b9b33 100644
--- a/basewiki/blog.mdwn
+++ b/basewiki/blog.mdwn
@@ -11,10 +11,6 @@ The optional `rootpage` parameter tells the wiki that new posts to this blog
 should default to being [[SubPage]]s of "blog", and enables a form at the
 top of the blog that can be used to add new items.
 
-There is also an optional `rss` parameter that can control whether an RSS
-feed is generated. The default is to generate an RSS feed, if the wiki is
-globally configured to do so, but you can set `rss=no` to disable this.
-
 If you want your blog to have an archive page listing every post ever made
 to it, you can accomplish that like this:
 
diff --git a/basewiki/style.css b/basewiki/style.css
index 6ec6f8950..2947851f4 100644
--- a/basewiki/style.css
+++ b/basewiki/style.css
@@ -113,8 +113,8 @@ td.changelog {
 	font-weight: bold;
 }
 
-/* RSS button. */
-.rssbutton {
+/* Orange feed button. */
+.feedbutton {
 	background: #ff6600;
 	color: white !important;
 	border-left: 1px solid #cc9966;
@@ -128,7 +128,7 @@ td.changelog {
 	text-decoration: none;
 	margin-top: 1em;
 }
-.rssbutton:hover {
+.feedbutton:hover {
 	color: white !important;
 	background: #ff9900;
 }