Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/plugins/attachment.mdwn b/doc/plugins/attachment.mdwn
index dedc4162e050d87c1e4d4e39c809e9bc511258b6..4fcd714f8b806bee88365ff129a9e28f8ca85e9d 100644 (file)
--- a/doc/plugins/attachment.mdwn
+++ b/doc/plugins/attachment.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=conditional core=1 author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=attachment core=0 author="[[Joey]]"]]
+[[!tag type/web]]

 
 This plugin allows files to be uploaded to the wiki over the web.
 
 
 This plugin allows files to be uploaded to the wiki over the web.
 


@@ -20,15 +20,8 @@ Bear in mind that if you let anyone upload a particular kind of file
    contains html as a web page; including running any malicious javascript
    embedded in that page.
 
    contains html as a web page; including running any malicious javascript
    embedded in that page.
 

-If you enable this plugin, be sure to lock that down, by entering an
-[[enhanced_PageSpec|ikiwiki/pagespec/attachment]] in the "Allowed
-Attachments" field of the wiki admin's preferences page.
-
-This plugin will use the [[cpan File::MimeInfo::Magic]] perl module, if
-available, for mimetype checking.
-
-The `virusfree` [[PageSpec|ikiwiki/pagespec/attachment]] requires that
-ikiwiki be configured with a virus scanner program via the `virus_checker`
-option in the setup file. If using `clamav`, with `clamd`, set it to
-"clamdscan -". Or to use clamav without the `clamd` daemon, you
-could set it to "clamscan -".
+If you enable this plugin, be sure to lock it down, via the
+`allowed_attachments` setup file option. This is a special 
+[[enhanced_PageSpec|ikiwiki/pagespec/attachment]] using tests provided by
+the [[filecheck]] plugin. That plugin will be automatically enabled when
+this plugin is enabled.