Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / bugs / editing_gitbranch_template_is_really_slow.mdwn

diff --git a/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn b/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn
index 057a50f0c93d8d4891877df0f53c5b10efe96cb1..22733e6fee541487a49e7fdc8185db2949c1acc2 100644 (file)
--- a/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn
+++ b/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn
@@ -33,7 +33,7 @@ of the problem is that it evaluates the pagespec
 > [[!template id=gitbranch branch=smcv/ready/perf
 author="[[Simon McVittie|smcv]]"
 browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/perf]]
-> [[!tag patch]]
+> [[!tag patch users/smcv/ready]]
 >
 > Previously, if a page like `plugins/trail` contained a conditional like
 >
@@ -63,3 +63,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/
 > `bestlink` is still the single most expensive function in this refresh
 > at ~ 9.5s, with `match_glob` at ~ 5.2s as the runner-up.
 > --[[smcv]]
+
+>> [[merged|done]] --[[smcv]]