Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast

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

diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn
index 2d33db748ad2a5f9a35378194e0c0b497285eb08..fa2bc58679afd9044bdab4c4b8bf1a5b16702770 100644 (file)
--- a/doc/ikiwiki/pagespec/attachment.mdwn
+++ b/doc/ikiwiki/pagespec/attachment.mdwn
@@ -7,23 +7,24 @@ If attachments are enabled, the wiki admin can control what types of
 attachments will be accepted, via the `allowed_attachments`
 configuration setting.
 
 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
-check all attachments for virii, something like this could be used:
+For example, to limit most users to uploading small images, and nothing else,
+while allowing larger mp3 files to be uploaded by joey into a specific
+directory, and check all attachments for viruses, 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)))
+       virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))

 
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
 
 
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
 

-* "`maxsize(size)`" - Tests whether the attachment is no larger than the
+* "`maxsize(size)`" - tests whether the attachment is no larger than the

   specified size. The size defaults to being in bytes, but "kb", "mb", "gb"
   etc can be used to specify the units.
   
   specified size. The size defaults to being in bytes, but "kb", "mb", "gb"
   etc can be used to specify the units.
   

-* "`minsize(size)`" - Tests whether the attachment is no smaller than the
+* "`minsize(size)`" - tests whether the attachment is no smaller than the

   specified size.
 
   specified size.
 

-* "`ispage()`" - Tests whether the attachment will be treated by ikiwiki as a
+* "`ispage()`" - tests whether the attachment will be treated by ikiwiki as a

   wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled
   page format).
 
   wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled
   page format).
 


@@ -31,7 +32,7 @@ additional tests:
   use `!ispage()` ; if you only want to allow wiki pages to be uploaded
   as attachments, use `ispage()`.
 
   use `!ispage()` ; if you only want to allow wiki pages to be uploaded
   as attachments, use `ispage()`.
 

-* "`mimetype(foo/bar)`" - This checks the MIME type of the attachment. You can
+* "`mimetype(foo/bar)`" - checks the MIME type of the attachment. You can

   include a glob in the type, for example `mimetype(image/*)`.
 
   include a glob in the type, for example `mimetype(image/*)`.
 

-* "`virusfree()`" - Checks the attachment with an antiviral program.
+* "`virusfree()`" - checks the attachment with an antiviral program.