From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Mon, 28 Jan 2013 03:38:22 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.20130212~7^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c37e440564c8ab192838b7b51a8ec688d5d6d74b?hp=b30cacdf8da07f40af03f1b26021d8ec4d8b8b4c

Merge branch 'master' into cvs
---

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 2f61f38a0..25a360efd 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -75,6 +75,7 @@ think about merging them. This is recommended. :-)
 * [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git`
 * [[ttw]] `git://github.com/ttw/ikiwiki.git`
 * [[anarcat]] `git://src.anarcat.ath.cx/ikiwiki`
+* anderbubble `git://civilfritz.net/ikiwiki.git`
 
 ## branches
 
diff --git a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
new file mode 100644
index 000000000..066485276
--- /dev/null
+++ b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
@@ -0,0 +1,17 @@
+[[!tag wishlist patch]]
+
+I use a default template for all new pages:
+
+    \[[!meta title="<TMPL_VAR name>"]]
+    \[[!meta author=]]
+    \[[!meta date="<TMPL_VAR time>"]]
+    \[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]
+    \[[!tag ]]
+
+This encourages me to include useful metadata on the page.  In particular, though, I've modified the `edittemplate` plugin to generate a uuid for use in the guid, for use in `inline`.  Importantly, this keeps `inline` from flooding aggregators when I rename these pages.
+
+I've also noticed that IkiWiki seems to use the creation time for the generated page for the page date.  This means that when I do a rebuild, `inline`d pages get shuffled.  The inclusion of a `time` variable in `edittemplate` (and in a `meta` declaration for all such pages) prevents the date from changing unexpectedly.
+
+I've already made these changes in my installation, and have made my patches available in the `edittemplate` branch of my repository, which [[I've posted|git]].
+
+Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagespec}` mean that a `cgi` rebuild is necessary (for reasons I don't entirely understand); but I think that's preferable to creating an entirely separate `$pagestate` namespace for storing parameters.  That said, I'm not really a perl programmer, so corrections are welcome.