summaryrefslogtreecommitdiff
path: root/ikiwiki/pagespec
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-30 06:17:15 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-30 06:17:15 +0200
commit0f935cae8775f5d94dfdc6c50c753eded796abfc (patch)
treed7769dcc2bac98eafca69063d6f1c0a1c5329252 /ikiwiki/pagespec
parent7a34ab14c1c817bc9ac43197c002c7b95e6ad1cc (diff)
parent70090d29241b365d5532360afed8782d3c7dfd2e (diff)
Merge branch 'master' into clean + drop ikiwiki/preprocessordirective.mdwn
Diffstat (limited to 'ikiwiki/pagespec')
-rw-r--r--ikiwiki/pagespec/attachment.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn
index 2a1f8aa..6b86c51 100644
--- a/ikiwiki/pagespec/attachment.mdwn
+++ b/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)