diff options
| author | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
| commit | 21add7ffa87a5e622d18bdbb24c638c15bdb3800 (patch) | |
| tree | 6780aa6dbee71f18db64e44b012e789fc8197d4b /doc/ikiwiki/pagespec | |
| parent | 3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (diff) | |
| parent | 3032909090711c86c5056987043eeff5a1f6aec2 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/ikiwiki/pagespec')
| -rw-r--r-- | doc/ikiwiki/pagespec/attachment.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn index 2d33db748..344a4a734 100644 --- a/doc/ikiwiki/pagespec/attachment.mdwn +++ b/doc/ikiwiki/pagespec/attachment.mdwn @@ -9,7 +9,7 @@ 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: +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))) |