Stop prepending urn:uuid: to guids that look like UUIDs

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

diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn
index 8a9c50d0bf4bbea887e4bee4ec50897320f4eba1..90159e939640187a754d200edde99ba84ebc46cc 100644 (file)
--- a/doc/ikiwiki/blog.mdwn
+++ b/doc/ikiwiki/blog.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]

 [[!if test="enabled(inline)"
      then="This wiki has the inline plugin **enabled**."
      else="This wiki has the inline plugin **disabled**."]]
 [[!if test="enabled(inline)"
      then="This wiki has the inline plugin **enabled**."
      else="This wiki has the inline plugin **disabled**."]]


@@ -52,10 +53,12 @@ directive:
   Set to 0 to show all matching pages.
 * `skip` - Specify a number of pages to skip displaying. Can be useful
   to produce a feed that only shows archived pages.
   Set to 0 to show all matching pages.
 * `skip` - Specify a number of pages to skip displaying. Can be useful
   to produce a feed that only shows archived pages.

-* `rss` - controls generation of an rss feed. On by default if the wiki is
-  configured to use rss feeds, set to "no" to disable.
-* `atom` - controls generation of an atom feed. On by default if the wiki is
-  configured to use atom feeds, set to "no" to disable.
+* `rss` - controls generation of an rss feed. If the wiki is configured to
+  generate rss feeds by default, set to "no" to disable. If the wiki is
+  configured to `allowrss`, set to "yes" to enable.
+* `atom` - controls generation of an atom feed. If the wiki is configured to
+  generate atom feeds by default, set to "no" to disable. If the wiki is
+  configured to `allowatom`, set to "yes" to enable.

 * `feeds` - controls generation of all types of feeds. Set to "no" to
   disable generating any feeds.
 * `postform` - Set to "yes" to enables a form to post new pages to a [[blog]].
 * `feeds` - controls generation of all types of feeds. Set to "no" to
   disable generating any feeds.
 * `postform` - Set to "yes" to enables a form to post new pages to a [[blog]].


@@ -95,3 +98,6 @@ directive:
   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.
   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.

+* `guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`),
+  the Atom feed will have this as its `<id>`. The default is to use the URL
+  of the page containing the `inline` directive.