Revert "comments" (stupid commit)

This reverts commit bb8b8787ef9477c027b9e5d8b7b5e1addfd1ca32.

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b872f0962a2b410f7c2cc35cc8c9d82df94a98a1..57bff20ff32ba57ce3e19ff9c2e5ec5d01bcb927 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -10,8 +10,7 @@ use Encode;
 
 sub import {
        hook(type => "getsetup", id => "template", call => \&getsetup);
-       hook(type => "preprocess", id => "template", call => \&preprocess,
-               scan => 1);
+       hook(type => "preprocess", id => "template", call => \&preprocess);
 }
 
 sub getsetup () {

diff --git a/debian/changelog b/debian/changelog
index c28d36c844abeef37556e889d868524f6dcecb33..62374d2dc6aa1737509b3671e1e59e441ddc2009 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
 ikiwiki (3.05) UNRELEASED; urgency=low
 
   * debhelper v7.2; rules file minimisation.
-  * template: Load templates in scan mode.
-    This is potentially expensive, but is necessary so that meta and tag
-    directives, and other links on templates affect the page using the
-    template reliably.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 

diff --git a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
index de6c227f62f0afb147cf02907acb61a9da21c38e..48288a2b3561021016ca49048593f54d9b867f3a 100644 (file)
--- a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
+++ b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
@@ -14,5 +14,3 @@ scan pass, every page containing a template will cause the template to be
 loaded and filled out. This can be some serious additional overhead.
 
 --[[Joey]] 
-
-[[done]]

diff --git a/doc/bugs/tags__44___backlinks_and_3.x.mdwn b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
index 4fe9a47230d1844c02ecd4b85707409825d381e9..ea0eecc80f4f5f1c1cf0839351ec7e9f16276545 100644 (file)
--- a/doc/bugs/tags__44___backlinks_and_3.x.mdwn
+++ b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
@@ -30,5 +30,3 @@ time, so went ahead and migrated live, spamming planet debian in the process
 > [[cannot_reliably_use_meta_in_template]]. AFAIK, this has never worked
 > reliably, although the linked page has a simple, though potentially
 > expensive fix. --[[Joey]] 
-
-> fix made, [[done]] --[[Joey]] 

diff --git a/doc/todo/tag_pagespec_function.mdwn b/doc/todo/tag_pagespec_function.mdwn
index 060368179342bfae1846080706ffe81e01900948..0a51c722053b4072c6fdc5694270c8dc8d86992e 100644 (file)
--- a/doc/todo/tag_pagespec_function.mdwn
+++ b/doc/todo/tag_pagespec_function.mdwn
@@ -8,13 +8,6 @@ match tagged pages independent of whatever the tagbase is set to.
 
  -- [[users/Jon]] 2009/02/17
 
-> So, this looks good, appreciate the patch.
-> 
-> The only problem I see is it could be confusing if `tag(foo)` matched
-> a page that just linked to the tag via a wikilink, w/o actually tagging it.
->
-> One other thing, perhaps it should be called `tagged()`? --[[Joey]] 
-
 [[!tag patch]]
 
     --- a/plugins/IkiWiki/Plugin/tag.pm        2009-02-16 11:30:11.000000000 +0000