Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / todo / Option_linktext_for_pagestats_directive.mdwn

diff --git a/doc/todo/Option_linktext_for_pagestats_directive.mdwn b/doc/todo/Option_linktext_for_pagestats_directive.mdwn
index 8bbb7c2cf912bbb7cd26d0dc0ed9eef747fbbe72..f85529980028b7af3a1cd6d016620b9bc87468b9 100644 (file)
--- a/doc/todo/Option_linktext_for_pagestats_directive.mdwn
+++ b/doc/todo/Option_linktext_for_pagestats_directive.mdwn
@@ -194,3 +194,12 @@ Regards,
 > like `limit` (by analogy with SQL) or `max` as the canonical name for the
 > "number of things to match" parameter, at which point a non-numeric
 > `show` could mean this thing. --[[smcv]]
 > like `limit` (by analogy with SQL) or `max` as the canonical name for the
 > "number of things to match" parameter, at which point a non-numeric
 > `show` could mean this thing. --[[smcv]]

+
+>> [[!template id=gitbranch branch=smcv/pagestats-show
+author="[[Louis|spalax]], [[smcv]]"
+browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/pagestats-show]]
+>> Here's a branch. It depends on my `ready/limit` branch
+>> from [[todo/pick a new canonical name for equivalent of SQL limit]].
+>> --[[smcv]]
+
+>>> [[Merged|done]] --[[smcv]]