From f5322fa912250cb2859bb63aeae419a405f74544 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Sat, 1 Aug 2009 12:31:53 +0100
Subject: Mark todo/source_link as done
---
doc/todo/source_link.mdwn | 2 ++
1 file changed, 2 insertions(+)
(limited to 'doc/todo/source_link.mdwn')
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 9d9ec9697..a7203d06c 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -107,3 +107,5 @@ I just implemented this. There is one [[patch]] to the default page template, a
}
1
+
+[[done]] --[[smcv]]
--
cgit v1.2.3
From c0c1e05daba09ce9c73c6c2f1ceca02b488613ba Mon Sep 17 00:00:00 2001
From: Joey Hess
Date: Sat, 8 Aug 2009 12:32:39 -0400
Subject: finish merging getsource
---
debian/copyright | 2 +-
doc/plugins/getsource.mdwn | 4 ++--
doc/todo/source_link.mdwn | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'doc/todo/source_link.mdwn')
diff --git a/debian/copyright b/debian/copyright
index 762f9f445..b06d27f19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -136,7 +136,7 @@ Files: 404.pm
Copyright: © 2009 Simon McVittie
License: GPL-2+
-Files: wmd.pm
+Files: wmd.pm, getsource.pm
Copyright: © 2009 William Uther
License: GPL-2+
diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn
index 4fbf4be98..20040ccee 100644
--- a/doc/plugins/getsource.mdwn
+++ b/doc/plugins/getsource.mdwn
@@ -1,7 +1,7 @@
[[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]]
-This plugin adds a `getsource` action to the IkiWiki CGI, and a "Source" link
-that uses it to display pages' source.
+This plugin adds a "Source" link to the top of each page that uses
+the CGI to display the page's source.
Configuration for this plugin in the setup file:
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 0c639a314..dfc2766cc 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -13,6 +13,7 @@ All of this code is licensed under the GPLv2+. -- [[Will]]
[[!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,
>> and also fixed a couple of other issues I noticed:
--
cgit v1.2.3
From 904c16a68b07078750e5906ffb2c568d22d955e3 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Tue, 1 Sep 2009 14:17:51 +0100
Subject: Remove references to merged-and-deleted git branches
---
doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 2 --
doc/todo/backlinks_result_is_lossy.mdwn | 1 -
doc/todo/generated_po_stuff_not_ignored_by_git.mdwn | 1 -
doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 2 --
doc/todo/optimize_simple_dependencies.mdwn | 2 --
doc/todo/pagestats_among_a_subset_of_pages.mdwn | 1 -
doc/todo/should_optimise_pagespecs.mdwn | 4 ----
doc/todo/source_link.mdwn | 2 --
8 files changed, 15 deletions(-)
(limited to 'doc/todo/source_link.mdwn')
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,
--
cgit v1.2.3