Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn
index 2a1f8aaab2642f5b1f4aec10231a974275dcdfcf..234fcdf02ef18a7223c1c21529962425bed3d44c 100644 (file)
--- a/doc/ikiwiki/pagespec/attachment.mdwn
+++ b/doc/ikiwiki/pagespec/attachment.mdwn
@@ -4,8 +4,8 @@
      else="This wiki has attachments **disabled**."]]
 
 If attachments are enabled, the wiki admin can control what types of
-attachments will be accepted, by entering a [[ikiwiki/PageSpec]] in the
-"Allowed Attachments" field of their preferences page.
+attachments will be accepted, via the `allowed_attachments`
+configuration setting.
 
 For example, to limit arbitrary files to 50 kilobytes, but allow
 larger mp3 files to be uploaded by joey into a specific directory, and
@@ -13,7 +13,7 @@ check all attachments for virii, something like this could be used:
   
        virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))
 
-The regular [[ikiwiki/PageSpec]] syntax is expanded with thw following
+The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
 
 * maxsize(size)
@@ -41,6 +41,10 @@ additional tests:
   Tests whether the attachment is being uploaded by a user with the
   specified username. If openid is enabled, an openid can also be put here.
 
+* adminuser()
+
+  Tests whether the attachment is being uploded by one of the wiki admins.
+
 * ip(address)
 
   Tests whether the attacment is being uploaded from the specified IP