Update doc. to reflect new feature of :do_of

(allow to specify group name in values of :_of variables)
icy · Aug 13, 2013 · c7dd8ff · c7dd8ff
1 parent f36d9d5
commit c7dd8ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/doc/icy_acl.zml.sample b/doc/icy_acl.zml.sample
@@ -47,6 +47,7 @@ example_user2: @example_user1
 # 'Friends' and 'Authors' are groups in Piwigo administrator menu.
 # If a user belongs to these two groups, they can upload images to
 # two albums 56 and 46, and to all children of these two albums.
+# Any user in 'Authors' group can edit image of users from 'Friends' group.
 
 Friends:
   edit_image_of: owner
@@ -55,6 +56,7 @@ Friends:
 
 Authors:
   upload_image_to: 56, 46, sub
+  edit_image_of: Friends
 
 # Even if the user 'example_user3' doesn't belong to group 'Friends',
 # you can use reference to load all settings from that group

diff --git a/doc/zaml.md b/doc/zaml.md
@@ -106,12 +106,12 @@
   The following variables are known
 
   * `edit_image_of`:      Default: *owner*.
-                          Array of authors whose images are editable by the current user
+                          Array of authors/groups whose images are editable by the current user
   * `replace_image_of`:   Default: *owner*.
-                          Array of authors whose images can be replaced by a new version
+                          Array of authors/groups whose images can be replaced by a new version
                             by the current user.
   * `delete_image_of`:    Default: *empty array*.
-                          Array of authors whose images are deletable by the current user
+                          Array of authors/groups whose images are deletable by the current user
 
   * `upload_image_to`:    Default: *empty array*.
                           Array of albums to which the current user can upload new image
@@ -249,17 +249,18 @@ example_user2: @example_user1
   Any user in this group can edit their own image, but they can not
   present their images to any albums.
 
-  'Authors' is another group: user in this group can edit any image,
-  and can upload image to the album 15 and its sub-albums, and they can
-  also present images to those albums.
+  'Authors' is another group: user in this group can edit any image of
+  their own, or image of any user belongs to the 'Friends' group; and
+  they can upload image to the album 15 and its sub-albums, and can also
+  present images to those albums.
 
 ```
 Friends:
   edit_image_of: owner
   present_image_to: no
 
 Authors:
-  edit_image_of: any
+  edit_image_of: Friends, owner
   upload_image_to: sub, 15
   present_image_to: 15, sub
 ```