Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / search.mdwn

diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn
index e53c28c7cb2434f57f472a62a0a51f1ea5bb6e8d..92cc5945a27489c9118e272582bd15651456c3dd 100644 (file)
--- a/doc/plugins/search.mdwn
+++ b/doc/plugins/search.mdwn
@@ -1,11 +1,13 @@
-[[template id=plugin name=search author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=search author="[[Joey]]"]]
+[[!tag type/web]]

 
 This plugin adds full text search to ikiwiki, using the
 [xapian](http://xapian.org/) engine, its
 
 This plugin adds full text search to ikiwiki, using the
 [xapian](http://xapian.org/) engine, its

-[omega](http://xapian.org/docs/omega/overview.html) frontend,
-and the [[cpan Search::Xapian]] perl module. (The [[cpan HTML::Scrubber]]
-perl module will also be used, if available.)
+[omega](http://xapian.org/docs/omega/overview.html) frontend, and the
+[[!cpan Search::Xapian]], [[!cpan Digest::SHA1]], and [[!cpan HTML::Scrubber]]
+perl modules.
+
+The [[ikiwiki/searching]] page describes how to write search queries.

 
 Ikiwiki will handle indexing new and changed page contents. Note that since
 it only indexes page contents, files copied by the [[rawhtml]] plugin will
 
 Ikiwiki will handle indexing new and changed page contents. Note that since
 it only indexes page contents, files copied by the [[rawhtml]] plugin will