Merge remote-tracking branch 'origin/master'

diff --git a/doc/todo/Option_linktext_for_pagestats_directive.mdwn b/doc/todo/Option_linktext_for_pagestats_directive.mdwn
index ab5eb229b0eae766826b9ac50c2c1a5034c5a0c9..f85529980028b7af3a1cd6d016620b9bc87468b9 100644 (file)
--- a/doc/todo/Option_linktext_for_pagestats_directive.mdwn
+++ b/doc/todo/Option_linktext_for_pagestats_directive.mdwn
@@ -201,3 +201,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/pagest
 >> 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]]

diff --git a/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn b/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
index 4e70f81798d6e810d02131a358d0530bdacdfe02..875402ec0e43c2e4b27c9bef6628eef08957ec37 100644 (file)
--- a/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
+++ b/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
@@ -42,3 +42,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/
 
 I personally prefer `\[[!inline limit=10]]` so I have put that in a branch.
 Agreement/objections/better ideas welcome. --[[smcv]]
+
+> In the absence of any feedback I've applied that branch. [[done]] --[[smcv]]