Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / todo / source_link.mdwn

diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 6abfea55cc678a9fb767e1cff896be4a805a07b7..cf3e69487ad3f19367eeff6c6b3d232f656a1c84 100644 (file)
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -4,13 +4,14 @@ How about a direct link from the page header to the source of the latest version
 
 I just implemented this.  There is one [[patch]] to the default page template, and a new plugin.  -- [[Will]]
 
+All of this code is licensed under the GPLv2+. -- [[Will]]
+
 > The use of sessioncgi here seems undesirable: on wikis where anonymity is
 > not allowed, you'll be asked to log in. Couldn't you achieve the same thing
 > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
 > --[[smcv]]
 
-[[!template id=gitbranch branch=smcv/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:
@@ -24,9 +25,14 @@ I just implemented this.  There is one [[patch]] to the default page template, a
 >>
 >> --[[smcv]]
 
+>>> I need a copyright&license statement, so debian/copyright can be updated for
+>>> the plugin, before I can merge this. Otherwise ready. --[[Joey]]
+
 >>> That looks like a nice set of fixes.  One more that might be worthwhile: instead of reading the page source into a var, and then writing it out later, it might be nice to just
 >>>  `print readfile(srcfile(pagesources{$page}));` at the appropriate point. -- [[Will]]
 
+>>>> OK, I've committed that. --[[smcv]]
+
 ----
 
     diff --git a/templates/page.tmpl b/templates/page.tmpl
@@ -125,3 +131,5 @@ I just implemented this.  There is one [[patch]] to the default page template, a
     }
     
     1
+
+[[done]] --[[smcv]]