1.1 --- a/docs/wiki/Preferences	Sun Jan 31 00:45:26 2016 +0100
     1.2 +++ b/docs/wiki/Preferences	Sun Jan 31 00:46:29 2016 +0100
     1.3 @@ -51,6 +51,49 @@
     1.4  
     1.5  The default time zone/regime for calendars, new events and local times.
     1.6  
     1.7 +=== acl ===
     1.8 +
     1.9 + Default:: (none)
    1.10 + Alternatives:: (see below)
    1.11 +
    1.12 +Provides an access control list for the `access_control_list` scheduling
    1.13 +function, invoked using the `scheduling_functions` setting. An access control
    1.14 +list consists of a collection of lines of text describing the handling policy
    1.15 +for an incoming invitation.
    1.16 +
    1.17 +{{{#!table
    1.18 +`accept` || indicates that if no rule matches, the invitation will be accepted
    1.19 +         .. (provisionally)
    1.20 +==
    1.21 +`decline` ||<rowspan="2"> indicates that if no rule matches, the invitation
    1.22 +                       .. will be declined (provisionally)
    1.23 +==
    1.24 +`reject`
    1.25 +==
    1.26 +`accept` ''`role`'' ''`identity`'' || indicates that where the given
    1.27 +                                   .. ''`identity`'' exists in the given
    1.28 +         .. ''`role`'' in the event, and unless a subsequent rule contradicts
    1.29 +         .. this result, the invitation will be accepted (provisionally)
    1.30 +==
    1.31 +`decline` ''`role`'' ''`identity`'' ||<rowspan="2"> indicates that where the
    1.32 +                                                 .. given ''`identity`'' exists
    1.33 +         .. in the given ''`role`'' in the event, and unless a subsequent rule
    1.34 +         .. contradicts this result, the invitation will be declined
    1.35 +         .. (provisionally)
    1.36 +
    1.37 +==
    1.38 +`reject` ''`role`'' ''`identity`''
    1.39 +}}}
    1.40 +
    1.41 +In the above, `role` is either `organiser` (or `organizer`) or `attendee`;
    1.42 +`identity` is an address or URL.
    1.43 +
    1.44 +Note that even if an accepted result is returned by the `access_control_list`
    1.45 +scheduling function, other functions that follow it in the list of functions
    1.46 +may overturn this result.
    1.47 +
    1.48 +See the [[../Resources|resources guide]] for examples and more information.
    1.49 +
    1.50  === add_method_response ===
    1.51  
    1.52   Default:: `refresh`
    1.53 @@ -229,16 +272,22 @@
    1.54   Default:: `schedule_in_freebusy`
    1.55   Alternatives:: (see below)
    1.56  
    1.57 -Indicates the scheduling functions used by resources to find an appropriate
    1.58 -period for an event, with each function to be applied to a scheduling request
    1.59 -appearing on a separate line.
    1.60 +Indicates the scheduling functions used by [[../Resources|resources]] to find
    1.61 +an appropriate period for an event, with each function to be applied to a
    1.62 +scheduling request appearing on a separate line, optionally accompanied by
    1.63 +arguments controlling the behaviour of the function.
    1.64  
    1.65  The imiptools.handlers.scheduling module contains the built-in scheduling
    1.66  functions which include the following:
    1.67  
    1.68  {{{#!table
    1.69 -`same_domain_only` || accept an invitation only if the organiser employs an
    1.70 -                   .. address in the same domain as the resource
    1.71 +`access_control_list`  || use an access control list provided by a file whose
    1.72 +                       .. name is given as an argument, accepting or declining
    1.73 +                       .. the invitation according to the indicated rules
    1.74 +                       .. (described in the [[../Resources|resources guide]])
    1.75 +==
    1.76 +`same_domain_only`     || accept an invitation only if the organiser employs an
    1.77 +                       .. address in the same domain as the resource
    1.78  ==
    1.79  `schedule_in_freebusy` || accept an invitation if the event periods are free
    1.80                         .. according to the free/busy records for the resource;