You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2017/03/08 02:48:42 UTC

[1/3] documentation commit: updated refs/heads/master to 96ccc37

Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 3a2eadb2c -> 96ccc37f1


clarify $db/_security section

 - point out that values are optional
 - add curl example
 - language fixes


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/6d3f68d3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/6d3f68d3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/6d3f68d3

Branch: refs/heads/master
Commit: 6d3f68d3108c1babde1c0872d99b68fc08b95e81
Parents: 3a2eadb
Author: Robert Kowalski <ro...@apache.org>
Authored: Thu Dec 1 03:08:08 2016 +0100
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Tue Mar 7 21:21:57 2017 -0500

----------------------------------------------------------------------
 src/api/database/security.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/6d3f68d3/src/api/database/security.rst
----------------------------------------------------------------------
diff --git a/src/api/database/security.rst b/src/api/database/security.rst
index 116010f..96dc507 100644
--- a/src/api/database/security.rst
+++ b/src/api/database/security.rst
@@ -45,8 +45,8 @@
     functionality.
 
     If both the names and roles fields of either the admins or members
-    properties are empty arrays, it means the database has no admins or
-    members.
+    properties are empty arrays, or are not existent, it means the database
+    has no admins or members.
 
     Having no admins, only server admins (with the reserved ``_admin`` role)
     are able to update design document and make other admin level changes.
@@ -138,6 +138,10 @@
 
     **Request**:
 
+    .. code-block:: bash
+
+    shell> curl http://localhost:5984/pineapple/_security -X PUT -H 'content-type: application/json' -H 'accept: application/json' -d '{"admins":{"names":["superuser"],"roles":["admins"]},"members":{"names": ["user1","user2"],"roles": ["developers"]}}'
+
     .. code-block:: http
 
         PUT /db/_security HTTP/1.1


[2/3] documentation commit: updated refs/heads/master to 96ccc37

Posted by va...@apache.org.
Indent shell line so it renderes correctly


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/f558ec21
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/f558ec21
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/f558ec21

Branch: refs/heads/master
Commit: f558ec21ebc66c7668c2dece765394443fa17063
Parents: 6d3f68d
Author: Nick Vatamaniuc <va...@apache.org>
Authored: Tue Mar 7 21:45:12 2017 -0500
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Tue Mar 7 21:45:12 2017 -0500

----------------------------------------------------------------------
 src/api/database/security.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f558ec21/src/api/database/security.rst
----------------------------------------------------------------------
diff --git a/src/api/database/security.rst b/src/api/database/security.rst
index 96dc507..372510a 100644
--- a/src/api/database/security.rst
+++ b/src/api/database/security.rst
@@ -140,7 +140,7 @@
 
     .. code-block:: bash
 
-    shell> curl http://localhost:5984/pineapple/_security -X PUT -H 'content-type: application/json' -H 'accept: application/json' -d '{"admins":{"names":["superuser"],"roles":["admins"]},"members":{"names": ["user1","user2"],"roles": ["developers"]}}'
+        shell> curl http://localhost:5984/pineapple/_security -X PUT -H 'content-type: application/json' -H 'accept: application/json' -d '{"admins":{"names":["superuser"],"roles":["admins"]},"members":{"names": ["user1","user2"],"roles": ["developers"]}}'
 
     .. code-block:: http
 


[3/3] documentation commit: updated refs/heads/master to 96ccc37

Posted by va...@apache.org.
Merge branch 'pr/91'

Closes #91


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/96ccc37f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/96ccc37f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/96ccc37f

Branch: refs/heads/master
Commit: 96ccc37f15eecbc27df34c098e5098bea04b29d3
Parents: 3a2eadb f558ec2
Author: Nick Vatamaniuc <va...@apache.org>
Authored: Tue Mar 7 21:48:25 2017 -0500
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Tue Mar 7 21:48:25 2017 -0500

----------------------------------------------------------------------
 src/api/database/security.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------