aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2009-09-01 14:17:51 +0100
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2009-09-01 14:18:12 +0100
commit904c16a68b07078750e5906ffb2c568d22d955e3 (patch)
tree9a01796d901b444bae4e6a19be7c4bf9f781b3df /doc
parent9e195018a2a7ba315ee947bd367fca33b704ef2c (diff)
downloadikiwiki-904c16a68b07078750e5906ffb2c568d22d955e3.tar
ikiwiki-904c16a68b07078750e5906ffb2c568d22d955e3.tar.gz
Remove references to merged-and-deleted git branches
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn2
-rw-r--r--doc/todo/backlinks_result_is_lossy.mdwn1
-rw-r--r--doc/todo/generated_po_stuff_not_ignored_by_git.mdwn1
-rw-r--r--doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn2
-rw-r--r--doc/todo/optimize_simple_dependencies.mdwn2
-rw-r--r--doc/todo/pagestats_among_a_subset_of_pages.mdwn1
-rw-r--r--doc/todo/should_optimise_pagespecs.mdwn4
-rw-r--r--doc/todo/source_link.mdwn2
8 files changed, 0 insertions, 15 deletions
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 5e842ca7f..ad0f506f2 100644
--- 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]]
-[[!template id=gitbranch author="[[harishcm]]" branch=smcv/ready/harishcm-map-fix]]
-
> [[merged|done]] --[[Joey]]
Patch:
diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
index 11b5fbcae..2a9fc4a0a 100644
--- a/doc/todo/backlinks_result_is_lossy.mdwn
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -1,5 +1,4 @@
[[!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
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 1d24fd385..29c017c5d 100644
--- 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.
diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
index bbde04f83..85bb4ff5a 100644
--- 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:
diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 91e184c29..6f6284303 100644
--- 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
diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index fd15d6a42..33f9258fd 100644
--- 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]]
-[[!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
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 4b4e267f0..728ab8994 100644
--- 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]]
-[[!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
@@ -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]]
-[[!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
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index dfc2766cc..cf3e69487 100644
--- 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]]
-[[!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,