Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / doc / plugins / meta.mdwn

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index fa37a82464e64dbc9a8dbbe25b859aae2da7dd05..506ac84a80038a7d8d52db7a543ac3e538d4dcd3 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -123,18 +123,17 @@ Supported fields:
   contents. In particular, it does not check the values against the set of
   valid values but serves whatever you pass it.
 
   contents. In particular, it does not check the values against the set of
   valid values but serves whatever you pass it.
 

-* uuid
+* guid

 
 

-  Specifies a globally unique ID for a page. This ID will be used,
-  rather than the page url, in RSS and Atom feeds.
+  Specifies a globally unique ID for a page. This guid should be a URI
+  (in particular, it can be `urn:uuid:` followed by a UUID, as per
+  [[!rfc 4122]]), and it will be used to identify the page's entry in RSS
+  and Atom feeds. If not given, the default is to use the page's URL as its
+  guid.

 
 

-  The uuid can either be a literal uuid (ie,
-  "ec248d04-f347-4eb8-92b6-671b15d36980"), or it can be an alternative URl
-  for the page.
-
-  This is mostly useful when a page's feed has moved, to keep the IDs for
+  This is mostly useful when a page has moved, to keep the guids for

   pages unchanged and
   pages unchanged and

-  [[avoid_flooding_aggregators|howto_avoid_flooding_aggregators]].
+  [[avoid_flooding_aggregators|tips/howto_avoid_flooding_aggregators]].

 
 If the field is not one of the above predefined fields, the metadata will be
 written to the generated html page as a <meta> header. However, this
 
 If the field is not one of the above predefined fields, the metadata will be
 written to the generated html page as a <meta> header. However, this