Merge "Document access control lists (ACLs)"

2 files changed, 41 insertions, 8 deletions

diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index 8140c9fff..b1ae69be5 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -259,6 +259,31 @@ Transfer-Encoding:
   in: header
   required: false
   type: string
+X-Account-Access-Control_req:
+  description: |
+    **Note**: `X-Account-Access-Control` is not supported by Keystone auth.
+
+    Sets an account access control list (ACL) that grants access to
+    containers and objects in the account.
+    See `Account ACLs
+    <http://docs.openstack.org/developer/swift/overview_acl.html#account-acls>`_
+    for more information.
+  in: header
+  required: false
+  type: string
+X-Account-Access-Control_resp:
+  description: |
+    **Note**: `X-Account-Access-Control` is not supported by Keystone auth.
+
+    The account access control list (ACL) that grants access to
+    containers and objects in the account.
+    If there is no ACL, this header is not returned by this operation.
+    See `Account ACLs
+    <http://docs.openstack.org/developer/swift/overview_acl.html#account-acls>`_
+    for more information.
+  in: header
+  required: false
+  type: string
 X-Account-Bytes-Used:
   description: |
     The total number of bytes that are stored in
@@ -528,7 +553,9 @@ X-Container-Read:
     or to perform a GET or HEAD operation on the container itself.
 
     The format and scope of the ACL is dependent on the authorization system
-    used by the Object Storage service.
+    used by the Object Storage service. See `Container ACLs
+    <http://docs.openstack.org/developer/swift/overview_acl.html#container-acls>`_
+    for more information.
   in: header
   required: false
   type: string
@@ -536,6 +563,9 @@ X-Container-Read_resp:
   description: |
     The ACL that grants read access. If there is no ACL, this
     header is not returned by this operation.
+    See `Container ACLs
+    <http://docs.openstack.org/developer/swift/overview_acl.html#container-acls>`_
+    for more information.
   in: header
   required: false
   type: string
@@ -583,7 +613,9 @@ X-Container-Write:
     metadata.
 
     The format of the ACL is dependent on the authorization system
-    used by the Object Storage service.
+    used by the Object Storage service.  See `Container ACLs
+    <http://docs.openstack.org/developer/swift/overview_acl.html#container-acls>`_
+    for more information.
 
   in: header
   required: false
@@ -592,6 +624,9 @@ X-Container-Write_resp:
   description:
     The ACL that grants write access. If there is no ACL,
     this header is not returned by this operation.
+    See `Container ACLs
+    <http://docs.openstack.org/developer/swift/overview_acl.html#container-acls>`_
+    for more information.
   in: header
   required: false
   type: string
diff --git a/api-ref/source/storage-account-services.inc b/api-ref/source/storage-account-services.inc
index 8834c1a6d..b3c19b765 100644
--- a/api-ref/source/storage-account-services.inc
+++ b/api-ref/source/storage-account-services.inc
@@ -109,6 +109,7 @@ Response Parameters
    - X-Account-Storage-Policy-name-Container-Count: X-Account-Storage-Policy-name-Container-Count
    - X-Account-Storage-Policy-name-Object-Count: X-Account-Storage-Policy-name-Object-Count
    - X-Account-Meta-Quota-Bytes: X-Account-Meta-Quota-Bytes_resp
+   - X-Account-Access-Control: X-Account-Access-Control_resp
    - Content-Type: Content-Type_listing_resp
    - count: count
    - bytes: bytes
@@ -257,6 +258,7 @@ Request
    - X-Account-Meta-Temp-URL-Key-2: X-Account-Meta-Temp-URL-Key-2_req
    - X-Account-Meta-name: X-Account-Meta-name_req
    - X-Remove-Account-name: X-Remove-Account-name
+   - X-Account-Access-Control: X-Account-Access-Control_req
    - X-Trans-Id-Extra: X-Trans-Id-Extra
 
 
@@ -359,9 +361,5 @@ Response Parameters
    - X-Account-Storage-Policy-name-Container-Count: X-Account-Storage-Policy-name-Container-Count
    - X-Account-Storage-Policy-name-Object-Count: X-Account-Storage-Policy-name-Object-Count
    - X-Account-Meta-Quota-Bytes: X-Account-Meta-Quota-Bytes_resp
-   - Content-Type: Content-Type_cud_resp
-
-
-
-
-
+   - X-Account-Access-Control: X-Account-Access-Control_resp
+   - Content-Type: Content-Type_cud_resp
\ No newline at end of file