From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sat, 10 Aug 2013 08:53:23 +0000 (-0400)
Subject: Rebased onto a new branch.
X-Git-Tag: 3.20130904~33
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b56e6f07060a6236c616092b49f97a8c5fa5e2c3?ds=sidebyside

Rebased onto a new branch.
---

diff --git a/doc/plugins/contrib/wc.mdwn b/doc/plugins/contrib/wc.mdwn
deleted file mode 100644
index fb5a7320e..000000000
--- a/doc/plugins/contrib/wc.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!template id=plugin name=wc author="[[schmonz]]"]]
-[[!template id=gitbranch branch=schmonz/wc author="[[schmonz]]"]]
-[[!tag type/meta]]
-[[!tag patch]]
-
-This plugin counts words in a page. For a single page, write a
-`\[[!wc]]` directive and the word count will be interpolated there.
-For a site, add `<TMPL_VAR WORDCOUNT>` to your [[templates]].
-
-If [[!cpan HTML::Strip]] is installed, the wordcount will be slightly
-more accurate.
-
-Possible enhancements:
-
-* Optimize: count words iff the result will be displayed. `sanitize()`
-  seems like the right place to count. Since it's called well after
-  `preprocess()`, I can tell whether a directive needs the result,
-  but since it appears to be called before `pagetemplate()`, I can't
-  tell whether a template wants to know and possibly skip the
-  computation. (In other words, if I add `$needed_for_template`
-  like `$needed_for_directive`, it gets set too late for `sanitize()`
-  to see.)
diff --git a/doc/plugins/contrib/wordcount.mdwn b/doc/plugins/contrib/wordcount.mdwn
new file mode 100644
index 000000000..6a90d0ec5
--- /dev/null
+++ b/doc/plugins/contrib/wordcount.mdwn
@@ -0,0 +1,22 @@
+[[!template id=plugin name=wordcount author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/wordcount author="[[schmonz]]"]]
+[[!tag type/meta]]
+[[!tag patch]]
+
+This plugin counts words in a page. For a single page, write a
+`\[[!wordcount]]` directive and the word count will be interpolated there.
+For a site, add `<TMPL_VAR WORDCOUNT>` to your [[templates]].
+
+If [[!cpan HTML::Strip]] is installed, the wordcount will be slightly
+more accurate.
+
+Possible enhancements:
+
+* Optimize: count words iff the result will be displayed. `sanitize()`
+  seems like the right place to count. Since it's called well after
+  `preprocess()`, I can tell whether a directive needs the result,
+  but since it appears to be called before `pagetemplate()`, I can't
+  tell whether a template wants to know and possibly skip the
+  computation. (In other words, if I add `$needed_for_template`
+  like `$needed_for_directive`, it gets set too late for `sanitize()`
+  to see.)