From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 16:15:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2615b92fd43e588bc401d328a1fbf8435e028528?hp=75f538faf434474c522a3ae2e954aa032297033d

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 6b381f138..a7e86a7ed 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -162,14 +162,13 @@ Supported fields:
 
 * guid
 
-  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
+  Specifies a globally unique ID for a page. This guid should be a URI,
+  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.
 
   This is mostly useful when a page has moved, to keep the guids for
-  pages unchanged and avoid_flooding_aggregators
+  pages unchanged and avoid flooding aggregators
   (see [[!iki tips/howto_avoid_flooding_aggregators]]).
 
 * updated