Remove references to merged-and-deleted git branches

diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
index 5e842ca7f98710d94ca387003440b2d17b9899bb..ad0f506f208d1a5f81c272726f33e785cabae325 100644 (file)
--- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
+++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
@@ -66,8 +66,6 @@ Patch:
 
 >>>>>> The current arrangement looks fine to me. Thanks. --[[harishcm]]
 
 
 >>>>>> The current arrangement looks fine to me. Thanks. --[[harishcm]]
 

-[[!template id=gitbranch author="[[harishcm]]" branch=smcv/ready/harishcm-map-fix]]
-

 > [[merged|done]] --[[Joey]] 
 
 Patch:
 > [[merged|done]] --[[Joey]] 
 
 Patch:

diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
index 11b5fbcaeb8e41db3ebebf049366b3076c033e66..2a9fc4a0a8ef727c3312e354faf4c2d840269da4 100644 (file)
--- a/doc/todo/backlinks_result_is_lossy.mdwn
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -1,5 +1,4 @@
 [[!tag patch patch/core]]
 [[!tag patch patch/core]]

-[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]

 
 IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a
 lossy transformation (to get it in the form that page templates want), making
 
 IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a
 lossy transformation (to get it in the form that page templates want), making

diff --git a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
index 1d24fd3856b51952ce28a6b9acb33d5b3664e71f..29c017c5d1becde67990550957a52250f10ce642 100644 (file)
--- a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
+++ b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
@@ -1,4 +1,3 @@
-[[!template id=gitbranch branch=smcv/gitignore author="[[smcv]]"]]

 [[!tag patch]]
 
 The recent merge of the po branch didn't come with a .gitignore.
 [[!tag patch]]
 
 The recent merge of the po branch didn't come with a .gitignore.

diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
index bbde04f838d7c7091f835421d99a294107d916f9..85bb4ff5aec28d0e06407d8ed23058f6a1b8eb0d 100644 (file)
--- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
+++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
@@ -1,5 +1,3 @@
-[[!template id=gitbranch branch=smcv/ready/inline-pagenames author="[[smcv]]"]]
-

 A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
 the following parameter to the [[ikiwiki/directive/inline]] directive:
 
 A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
 the following parameter to the [[ikiwiki/directive/inline]] directive:
 

diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 91e184c292309154db69fef6379a42c2b671aa0f..6f6284303a1f51fb0534ccfe3b444400ffb0bb57 100644 (file)
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -1,5 +1,3 @@
-[[!template id=gitbranch branch=smcv/ready/depends-exact author="[[smcv]]"]]
-

 I'm still trying to optimize ikiwiki for a site using
 [[plugins/contrib/album]], and checking which pages depend on which pages
 is still taking too long. Here's another go at fixing that, using [[Will]]'s
 I'm still trying to optimize ikiwiki for a site using
 [[plugins/contrib/album]], and checking which pages depend on which pages
 is still taking too long. Here's another go at fixing that, using [[Will]]'s

diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index fd15d6a4224b869a6af4fc325486f42cc9050d65..33f9258fd7499dd8f1ebc0e0550c1e6b7a2e0ab2 100644 (file)
--- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -1,5 +1,4 @@
 [[!tag patch plugins/pagestats]]
 [[!tag patch plugins/pagestats]]

-[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]

 
 My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that
 to provide pagestats for links from a subset of pages. From the docs included
 
 My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that
 to provide pagestats for links from a subset of pages. From the docs included

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 4b4e267f0030df6ab86a8e3cac8c26a6613a50fb..728ab89943488e0656b13c7c2947b0d379a3475d 100644 (file)
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -79,8 +79,6 @@ I can think about reducung the size of my wiki source and making it available on
 > 
 > --[[Joey]]
 
 > 
 > --[[Joey]]
 

-[[!template id=gitbranch branch=smcv/ready/optimize-depends author="[[smcv]]"]]
-

 >> I've been looking at optimizing ikiwiki for a site using
 >> [[plugins/contrib/album]] (which produces a lot of pages) and it seems
 >> that checking which pages depend on which pages does take a significant
 >> I've been looking at optimizing ikiwiki for a site using
 >> [[plugins/contrib/album]] (which produces a lot of pages) and it seems
 >> that checking which pages depend on which pages does take a significant


@@ -100,8 +98,6 @@ I can think about reducung the size of my wiki source and making it available on
 >>>> I haven't actually deleted it), because the "or" operation is now done in
 >>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]]
 
 >>>> I haven't actually deleted it), because the "or" operation is now done in
 >>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]]
 

-[[!template id=gitbranch branch=smcv/ready/remove-pagespec-merge author="[[smcv]]"]]
-

 >>>>> I've now added a patch to the end of that branch that deletes
 >>>>> `pagespec_merge` almost entirely (we do need to keep a copy around, in
 >>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support
 >>>>> I've now added a patch to the end of that branch that deletes
 >>>>> `pagespec_merge` almost entirely (we do need to keep a copy around, in
 >>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support

diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index dfc2766cc73f673aab9fb9b208d5157db22fbf40..cf3e69487ad3f19367eeff6c6b3d232f656a1c84 100644 (file)
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -11,8 +11,6 @@ All of this code is licensed under the GPLv2+. -- [[Will]]
 > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
 > --[[smcv]]
 
 > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
 > --[[smcv]]
 

-[[!template id=gitbranch branch=smcv/ready/getsource
-  author="[[Will]]/[[smcv]]"]]

 [[done]]
 
 >> I've applied the patch below in a git branch, fixed my earlier criticism,
 [[done]]
 
 >> I've applied the patch below in a git branch, fixed my earlier criticism,