Merge "merge msg script now detects extensions main files"

[lhc/web/wiklou.git] / includes / filerepo / backend / SwiftFileBackend.php

diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filerepo/backend/SwiftFileBackend.php
index 4420c22..d2f26e9 100644 (file)
--- a/includes/filerepo/backend/SwiftFileBackend.php
+++ b/includes/filerepo/backend/SwiftFileBackend.php
@@ -1051,16 +1051,16 @@ class SwiftFileBackend extends FileBackendStore {
         * Set read/write permissions for a Swift container.
         *
         * $readGrps is a list of the possible criteria for a request to have
-        * access to write to a container. Each item is of the following format:
-        *   account:user       - Grants access if the request is by this user
-        *
-        * $writeGrps is a list of the possible criteria for a request to have
         * access to read a container. Each item is one of the following formats:
+        *   account:user       - Grants access if the request is by the given user
         *   .r:<regex>         - Grants access if the request is from a referrer host that
         *                        matches the expression and the request is not for a listing.
         *                        Setting this to '*' effectively makes a container public.
         *   .rlistings:<regex> - Grants access if the request is from a referrer host that
         *                        matches the expression and the request for a listing.
+        * $writeGrps is a list of the possible criteria for a request to have
+        * access to write to a container. Each item is of the following format:
+        *   account:user       - Grants access if the request is by the given user
         *
         * @see http://swift.openstack.org/misc.html#acls
         *