rename uuid to guid

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2226e5723d3fb1905140ea88861406480ec42f3f..2dcd1a90ae340bc9ec764fcb4296b63cb19c33a1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -443,8 +443,8 @@ sub genfeed ($$$$@) { #{{{
                );
 
                if (exists $pagestate{$p} &&
-                   exists $pagestate{$p}{meta}{uuid}) {
-                       $itemtemplate->param(uuid => $pagestate{$p}{meta}{uuid});
+                   exists $pagestate{$p}{meta}{guid}) {
+                       $itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
                }
 
                if ($itemtemplate->query(name => "enclosure")) {

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 02c99e9f67db1e62327d7a8108f6c570f5e17fb5..d7f56a8bd112712f38dfa9d8e73801427d772f4c 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -84,14 +84,14 @@ sub preprocess (@) { #{{{
                $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
                # fallthrough
        }
-       elsif ($key eq 'uuid') {
+       elsif ($key eq 'guid') {
                my $abs = $value;
 
                if ($abs =~ m/^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$/) {
                        $abs = lc "urn:uuid:$abs";
                }
 
-               $pagestate{$page}{meta}{uuid}=HTML::Entities::encode_numeric($abs);
+               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($abs);
                # fallthrough
        }
        elsif ($key eq 'license') {

diff --git a/debian/changelog b/debian/changelog
index f2ead8bad3cc97e3680a40122968f6642ae3b06f..e1d5ccb80fb711656749b32998f89635ba68dbb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,8 @@ ikiwiki (2.54) UNRELEASED; urgency=low
   * Change deb dependencies to list Text::Markdown before markdown, since
     the former, while slower, has a much better html parser that avoids
     numerous bugs.
-  * meta: Support a uuid option, to allow forcing a particular uuid
-    in feeds.
+  * meta: Support a guid option, to allow forcing a particular url or
+    uuid in feeds.
 
  -- Josh Triplett <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700
 

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index fa37a82464e64dbc9a8dbbe25b859aae2da7dd05..12240422dbabfa40339d2dabfef609f2ce7455c3 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -123,16 +123,16 @@ Supported fields:
   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 will be used,
+  rather than the page url, to identify the page in RSS and Atom feeds.
 
-  The uuid can either be a literal uuid (ie,
-  "ec248d04-f347-4eb8-92b6-671b15d36980"), or it can be an alternative URl
+  The guid can either be a 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's feed has moved, to keep the guids for
   pages unchanged and
   [[avoid_flooding_aggregators|howto_avoid_flooding_aggregators]].
 

diff --git a/doc/tips/howto_avoid_flooding_aggregators.mdwn b/doc/tips/howto_avoid_flooding_aggregators.mdwn
index 0f7906b1ee115e6bd12950b5b6a36cd0828e4830..71077859f09993ba412a50405e07b264aa5ae9a4 100644 (file)
--- a/doc/tips/howto_avoid_flooding_aggregators.mdwn
+++ b/doc/tips/howto_avoid_flooding_aggregators.mdwn
@@ -24,5 +24,5 @@ Where "old_post" is the name of the last post you made to the blog before
 making the change. This will limit the feed to only newer posts, while stil
 displaying the old posts in the blog page.
 
-Alternatively, you can add the [[plugins/meta]] uuid directives to pages,
+Alternatively, you can add the [[plugins/meta]] guid directives to pages,
 to force the old url to be used.

diff --git a/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn b/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn
index d8f7c99abe40a9b777ae74915b8a39e2072abfff..9ee670f842995fd82202fe4c7d7864e19625ab88 100644 (file)
--- a/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn
+++ b/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn
@@ -16,5 +16,9 @@ Perhaps ikiwiki's blogging functionality could be hooked up to the [meta plugin]
 
 > [[merged|done]], thank you!
 > 
+> I chose to use the term guid, since it's both a generic term that fits
+> very well and describes both using a uuid and an url, and also happens
+> to be the term rss uses. ;-)
+> 
 > Of course I'm happy if you can improve the feeds. They do already
 > use some meta information (author, copyright). --[[Joey]]

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index fdc629e39027ce0002e28a82f209974ee9f6b9be..19c557f305401e800037ad97d96a561d32fa4261 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,7 +1,7 @@
 <entry>
        <title><TMPL_VAR TITLE></title>
-       <TMPL_IF NAME="UUID">
-         <id><TMPL_VAR UUID></id>
+       <TMPL_IF NAME="GUID">
+         <id><TMPL_VAR GUID></id>
        <TMPL_ELSE>
          <id><TMPL_VAR URL></id>
        </TMPL_IF>

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 4e202026910005ce740c889b0555961a29ad3a34..1144cd5e2b940ac2acd35b85c7ba50dde2b77f68 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -5,8 +5,8 @@
        <TMPL_ELSE>
        <title><TMPL_VAR TITLE></title>
        </TMPL_IF>
-       <TMPL_IF NAME="UUID">
-         <guid isPermaLink="no"><TMPL_VAR UUID></guid>
+       <TMPL_IF NAME="GUID">
+         <guid isPermaLink="no"><TMPL_VAR GUID></guid>
        <TMPL_ELSE>
          <guid><TMPL_VAR URL></guid>
        </TMPL_IF>