Skip to content

Commit 9b2ccbf

Browse files
committed
Updates to the documentation for ACLs and Attributes
1 parent e58516b commit 9b2ccbf

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

AclOps/GET_ACL.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ On success, a JSON response will be returned with the following elements:
7676

7777
acl
7878
^^^
79-
A JSON object that describe a users acces permisions. Subkeys of acl are:
79+
A JSON object that describes a user's access permissions. Subkeys of acl are:
8080

8181
userName: the userid of the requested user
8282

83-
create: A boolean flag that indicated if the user is authorized to create new resources
83+
create: A boolean flag that indicates if the user is authorized to create new resources
8484

85-
delete: A boolean flag that indicated if the user is authorized to delete resources
85+
delete: A boolean flag that indicates if the user is authorized to delete resources
8686

87-
read: A boolean flag that indicated if the user is authorized to read (GET) resources
87+
read: A boolean flag that indicates if the user is authorized to read (GET) resources
8888

89-
update: A boolean flag that indicated if the user is authorized to update resources
89+
update: A boolean flag that indicates if the user is authorized to update resources
9090

91-
readACL: A boolean flag that indicated if the user is authorized to read the object's ACL
91+
readACL: A boolean flag that indicates if the user is authorized to read the object's ACL
9292

93-
updateACL: A boolean flag that indicated if the user is authorized to update the object's ACL
93+
updateACL: A boolean flag that indicates if the user is authorized to update the object's ACL
9494

9595

9696
hrefs
@@ -100,7 +100,7 @@ An array of hypertext links to related resources. See :doc:`../Hypermedia`.
100100
Special Errors
101101
--------------
102102

103-
The implementation of the operation does not return special errors. For general
103+
This implementation of the operation does not return special errors. For general
104104
information on standard error codes, see :doc:`../CommonErrorResponses`.
105105

106106
Examples

AclOps/GET_ACLs.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,22 @@ On success, a JSON response will be returned with the following elements:
7878
acls
7979
^^^^
8080
A JSON list that contains one element for each user specified in the ACL.
81-
The elements will be JSON object that describe the users acces permisions.
82-
Subkeys of the element are are:
81+
The elements will be JSON objects that describe each user's access permissions.
82+
The subkeys of each element are:
8383

8484
userName: the userid of the user ('default' for the default access)
8585

86-
create: A boolean flag that indicated if the user is authorized to create new resources
86+
create: A boolean flag that indicates if the user is authorized to create new resources
8787

88-
delete: A boolean flag that indicated if the user is authorized to delete resources
88+
delete: A boolean flag that indicates if the user is authorized to delete resources
8989

90-
read: A boolean flag that indicated if the user is authorized to read (GET) resources
90+
read: A boolean flag that indicates if the user is authorized to read (GET) resources
9191

92-
update: A boolean flag that indicated if the user is authorized to update resources
92+
update: A boolean flag that indicates if the user is authorized to update resources
9393

94-
readACL: A boolean flag that indicated if the user is authorized to read the object's ACL
94+
readACL: A boolean flag that indicates if the user is authorized to read the object's ACL
9595

96-
updateACL: A boolean flag that indicated if the user is authorized to update the object's ACL
96+
updateACL: A boolean flag that indicates if the user is authorized to update the object's ACL
9797

9898

9999
hrefs
@@ -103,7 +103,7 @@ An array of hypertext links to related resources. See :doc:`../Hypermedia`.
103103
Special Errors
104104
--------------
105105

106-
The implementation of the operation does not return special errors. For general
106+
This implementation of the operation does not return special errors. For general
107107
information on standard error codes, see :doc:`../CommonErrorResponses`.
108108

109109
Examples

AclOps/PUT_ACL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ An array of hypertext links to related resources. See :doc:`../Hypermedia`.
102102
Special Errors
103103
--------------
104104

105-
The implementation of the operation does not return special errors. For general
105+
This implementation of the operation does not return special errors. For general
106106
information on standard error codes, see :doc:`../CommonErrorResponses`.
107107

108108
Examples

AclOps/index.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
Access Control List
33
####################
44

5-
Access Control List (ACL) are key-value stores that can be used to manage what operations can
5+
An Access Control List (ACL) is a key-value store that can be used to manage what operations can
66
be performed by which user on group, dataset, or committed type objects. Operations on other
77
objects (e.g. links, dataspace, or attributes) use the ACL of the object they belong to.
88

99
Each ACL consists of 1 or more items in the form:
1010

1111
(username, read, create, update, delete, readACL, updateACL)
1212

13-
where username is a string, and read, create, update, delete, readACL, updateACL are booleans.
14-
There flags have the following semantics when the given username is provided in the http
13+
where username is a string, and read, create, update, delete, readACL and updateACL are booleans.
14+
These flags have the following semantics when the given username is provided in the http
1515
Authorization header:
1616

1717
* read: The given user is authorized for read access to the resource (generally all GET requests)
@@ -22,7 +22,7 @@ Authorization header:
2222
* updateACL: The given user is authorized to modify the ACLs of a resource
2323

2424
A special username 'default' is used to denote the access permission for all other users who
25-
or not list in the ACL (including un-authenticated requests that don't provide a username).
25+
are not listed in the ACL (including un-authenticated requests that don't provide a username).
2626

2727
Example
2828
-------
@@ -67,7 +67,7 @@ Finally the same set of requests are sent with 'ann' as the user:
6767
* PUT /datasets/<id>/attributes/<name> - denied (returns HTTP Status 201 - Created)
6868
* DELETE /datasets/<id> - denied (returns HTTP Status 200 - OK)
6969

70-
Note: HTTP Status 401 basically says: "you can't have access until you tell me who your are",
70+
Note: HTTP Status 401 basically says: "you can't have access until you tell me who you are",
7171
while HTTP Status 403 says: "I know who you are, but you don't have permissions to access this
7272
resource."
7373

@@ -76,7 +76,7 @@ Root ACL Inheritance
7676

7777
In many cases it will be desired to have a default ACL that applies to each resource in the domain.
7878
This can be accomplished by defining an ACL for the root group. This will control the access
79-
rights for any resource unless of ACL is present in that resource for the requesting user.
79+
rights for any resource unless an ACL is present in that resource for the requesting user.
8080

8181
The default ACL can be read or updated by forming a request with a uri that includes the root group id,
8282
i.e.: "/groups/<root_id>/acls", or by using the uri path for the domain, i.e. "/acls".

AttrOps/DELETE_Attribute.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ An array of links to related resources. See :doc:`../Hypermedia`.
5151
Special Errors
5252
--------------
5353

54-
The implementation of the operation does not return special errors. For general
54+
This implementation of the operation does not return special errors. For general
5555
information on standard error codes, see :doc:`../CommonErrorResponses`.
5656

5757
Examples

AttrOps/GET_Attribute.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ A JSON object that represents the dataspace of the attribute. Subkeys of shape
7777
class: A string with one of the following values:
7878

7979
* H5S_NULL: A null dataspace, which has no elements
80-
* H5S_SCALAR: A dataspace with a single element (although possibly of a complext datatype)
80+
* H5S_SCALAR: A dataspace with a single element (although possibly of a complex datatype)
8181
* H5S_SIMPLE: A dataspace that consists of a regular array of elements
8282

8383
dims: An integer array whose length is equal to the number of dimensions (rank) of the
84-
dataspace. The value of each element gives the the current size of each dimension. Dims
84+
dataspace. The value of each element gives the current size of each dimension. Dims
8585
is not returned for H5S_NULL or H5S_SCALAR dataspaces.
8686

8787
value
8888
^^^^^
89-
A json array (or string or number for scalar datasets) giving the values of the requested
89+
A JSON array (or string or number for scalar datasets) giving the values of the requested
9090
attribute.
9191

9292
hrefs
@@ -96,7 +96,7 @@ An array of links to related resources. See :doc:`../Hypermedia`.
9696
Special Errors
9797
--------------
9898

99-
The implementation of the operation does not return special errors. For general
99+
This implementation of the operation does not return special errors. For general
100100
information on standard error codes, see :doc:`../CommonErrorResponses`.
101101

102102
Examples
@@ -105,7 +105,7 @@ Examples
105105
Sample Request
106106
--------------
107107

108-
Get an attribute named "attr1" from a group with UUID: "45a882e1-...".
108+
Get an attribute named "attr1" from a group with UUID: "1a956e54-...".
109109

110110
.. code-block:: http
111111

AttrOps/GET_Attributes.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GET Attributes
55
Description
66
===========
77
Gets all the attributes of a dataset, group, or committed datatype.
8-
For each attribute the request returns the attributes name, type, and shape. To get
8+
For each attribute the request returns the attribute's name, type, and shape. To get
99
the attribute data use :doc:`GET_Attribute`.
1010

1111
Requests
@@ -91,7 +91,7 @@ An array of links to related resources. See :doc:`../Hypermedia`.
9191
Special Errors
9292
--------------
9393

94-
The implementation of the operation does not return special errors. For general
94+
This implementation of the operation does not return special errors. For general
9595
information on standard error codes, see :doc:`../CommonErrorResponses`.
9696

9797
Examples
@@ -100,7 +100,7 @@ Examples
100100
Sample Request
101101
--------------
102102

103-
Get attributes of a group with UUID: "45a882e1-...".
103+
Get attributes of a group with UUID: "1a956e54-...".
104104

105105
.. code-block:: http
106106
@@ -164,8 +164,8 @@ Sample Response
164164
Sample Request - get Batch
165165
---------------------------
166166

167-
Get 5 the five attributes that occur after attribute "a0004" from a of a group with UUID:
168-
"45a882e1-...".
167+
Get the five attributes that occur after attribute "a0004" from a group with UUID:
168+
"4cecd4dc-...".
169169

170170
.. code-block:: http
171171

AttrOps/PUT_Attribute.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ Request Elements
5454
----------------
5555

5656
The request body must include a JSON object with "type" key. Optionally a "shape"
57-
key can be provide to make a non-scalar attribute.
57+
key can be provided to make a non-scalar attribute.
5858

5959

6060
type
6161
^^^^
6262

63-
Specify's the desired type of the attribute. Either a string that is one of the
63+
Specifies the desired type of the attribute. Either a string that is one of the
6464
predefined type values, a uuid of a committed type, or a JSON object describing the type.
6565
See :doc:`../Types/index` for details of the type specification.
6666

@@ -102,7 +102,7 @@ An array of links to related resources. See :doc:`../Hypermedia`.
102102
Special Errors
103103
--------------
104104

105-
The implementation of the operation does not return special errors. For general
105+
This implementation of the operation does not return special errors. For general
106106
information on standard error codes, see :doc:`../CommonErrorResponses`.
107107

108108
Examples
@@ -205,7 +205,7 @@ Sample Response - string attribute
205205
Sample Request - compound type
206206
----------------------------------
207207

208-
Create a two-element, attribute of group with UUID of
208+
Create a two-element, attribute in the group with UUID of
209209
"be319519-" named "attr_compound". The attribute has a compound type with an integer
210210
and a floating point element.
211211

AttrOps/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Attributes
44

55
Like datasets (see :doc:`../DatasetOps/index`), attributes are objects that contain a
66
homogeneous collection of elements
7-
and have associatted type information. Attributes are typically small metadata objects
7+
and have associated type information. Attributes are typically small metadata objects
88
that describe some aspect of the object (dataset, group, or committed datatype) that
99
contains the attribute.
1010

@@ -20,8 +20,8 @@ attributes) is included in the request.
2020

2121
Reading and Writing Data
2222
-------------------------
23-
Unlike datasets, attribute's data can not be
24-
read or written partially. Data can only be written as part of the PUT requests.
23+
Unlike datasets, an attribute's data can not be
24+
read or written partially. Data can only be written as part of the PUT request.
2525
Reading the data of an attribute is done by :doc:`GET_Attribute`.
2626

2727
Listing attributes

0 commit comments

Comments
 (0)