aboutsummaryrefslogtreecommitdiff
path: root/doc/usage.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-04 18:36:50 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-04 18:36:50 -0500
commitbf522a347f9749522a4f575cb48000123b79978a (patch)
treebf3502292e72a9767da7a1661a433b6668e415e0 /doc/usage.mdwn
parentf7c575bd30b2b4a66ca73dedec1984872fdf8372 (diff)
downloadikiwiki-bf522a347f9749522a4f575cb48000123b79978a.tar
ikiwiki-bf522a347f9749522a4f575cb48000123b79978a.tar.gz
* inline: Add new `allowrss` and `allowatom` config options. These can be
used if you want a wiki that doesn't default to generating rss or atom feeds, but that does allow them to be turned on for specific blogs.
Diffstat (limited to 'doc/usage.mdwn')
-rw-r--r--doc/usage.mdwn20
1 files changed, 16 insertions, 4 deletions
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index f34d5bad6..cd8f0542c 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -153,13 +153,25 @@ configuration options of their own.
* --rss, --norss
- If rss is set, ikiwiki will generate RSS feeds for pages that inline
- a [[ikiwiki/blog]].
+ If rss is set, ikiwiki will default to generating RSS feeds for pages
+ that inline a [[ikiwiki/blog]].
+
+* --allowrss
+
+ If allowrss is set, and rss is not set, ikiwiki will not default to
+ generating RSS feeds, but setting `rss=yes` in the blog can override
+ this default and generate a feed.
* --atom, --noatom
- If atom is set, ikiwiki will generate Atom feeds for pages that inline
- a [[ikiwiki/blog]].
+ If atom is set, ikiwiki will default to generating Atom feeds for pages
+ that inline a [[ikiwiki/blog]].
+
+* --allowatom
+
+ If allowatom is set, and rss is not set, ikiwiki will not default to
+ generating Atom feeds, but setting `atom=yes` in the blog can override
+ this default and generate a feed.
* --pingurl URL