Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / blog.mdwn

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index 1593278d1aa3aa77af322b58c703a41aaa9c5221..6e5eec4aada473f6b10c94d2bdffec6d1e56fb75 100644 (file)
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -90,4 +90,8 @@ directive:
   matches by that value are included, but some of those can be excluded by
   specifying a tighter [[PageSpec]] here.
 * `feedshow` - Specify the maximum number of matching pages to include in
   matches by that value are included, but some of those can be excluded by
   specifying a tighter [[PageSpec]] here.
 * `feedshow` - Specify the maximum number of matching pages to include in

-  the rss/atom feeds. The default is the same as the `show` value above,
+  the rss/atom feeds. The default is the same as the `show` value above.
+* `feedonly` - Only generate the feed, do not display the pages inline on
+  the page.
+* `timeformat` - Use this to specify how to display the time or date for pages
+  in the blog. The format string is passed to the strftime(3) function.