DOCS-2238 grantRolesToUser grantRolesTRole revokeRolesFromUser revokeRolesFromRole

Signed-off-by: Sam Kleinman <samk@10gen.com>

Author: Bob Grabar

bin/builddata/htaccess-next.yaml

@@ -525,10 +525,49 @@ outputs:
   - 'manual'
   - 'before-v2.4'
 ---
+redirect-path: '/reference/method/db.grantRolesToUser'
+url-base: '/reference/security'
+type: 'redirect'
+code: 303
+outputs:
+  - 'manual'
+  - 'before-v2.4'
+---
 redirect-path: '/reference/method/db.dropUser'
 url-base: '/reference/security'
 type: 'redirect'
 code: 303
+outputs:
+  - 'manual'
+  - 'before-v2.4'
+---
+redirect-path: '/reference/method/db.grantRolesToRole'
+url-base: '/reference/security'
+type: 'redirect'
+code: 303
+outputs:
+  - 'manual'
+  - 'before-v2.4'
+---
+redirect-path: '/reference/method/db.revokeRolesFromUser'
+url-base: '/reference/security'
+type: 'redirect'
+code: 303
+outputs:
+  - 'manual'
+  - 'before-v2.4'
+---
+redirect-path: '/reference/method/db.revokeRolesFromRole'
+url-base: '/reference/security'
+type: 'redirect'
+code: 303
+outputs:
+  - 'manual'
+  - 'before-v2.4'
+---
+url-base: '/reference/security'
+type: 'redirect'
+code: 303
 outputs:
   - 'manual'
   - 'before-v2.4'

source/includes/access-grant-role-to-user.rst

@@ -0,0 +1,2 @@
+A user must have privileges that includes the :authaction:`grantRole` action on a
+database to grant a role on the database.

source/includes/access-grant-roles.rst

@@ -0,0 +1,2 @@
+A user must have privileges that includes the :authaction:`revokeRole` action on
+a database to revoke a role on that database.

source/includes/access-revoke-role-from-user.rst

@@ -28,15 +28,15 @@
 # description: |
 #   Removes the specified privileges from a user-defined role.
 # ---
-# name: :method:`db.grantRolesToRole()`
-# file: /reference/method/db.grantRolesToRole
-# description: |
-#   Specifies roles from which a user-defined role inherits privileges.
-# ---
-# name: :method:`db.revokeRolesFromRole()`
-# file: /reference/method/db.revokeRolesFromRole
-# description: |
-#   Removes a role from a user.
+name: :method:`db.grantRolesToRole()`
+file: /reference/method/db.grantRolesToRole
+description: |
+  Specifies roles from which a user-defined role inherits privileges.
+---
+name: :method:`db.revokeRolesFromRole()`
+file: /reference/method/db.revokeRolesFromRole
+description: |
+  Removes a role from a user.
 # ---
 # name: :method:`db.getRole()`
 # file: /reference/method/db.getRole
@@ -47,4 +47,4 @@
 # file: /reference/method/db.getRoles
 # description: |
 #   Returns information for all the user-defined roles in a database.
-#...
+...

source/includes/access-revoke-roles.rst

@@ -3,11 +3,11 @@ file: /reference/method/db.createUser
 description: |
   Creates a new user.
 ---
-# name: :method:`db.updateUser()`
-# file: /reference/method/db.updateUser
-# description: |
-#   Updates user data.
-# ---
+name: :method:`db.updateUser()`
+file: /reference/method/db.updateUser
+description: |
+  Updates user data.
+---
 name: :method:`db.dropAllUsers()`
 file: /reference/method/db.dropAllUsers
 description: |
@@ -18,16 +18,16 @@ file: /reference/method/db.dropUser
 description: |
   Removes a single user.
 ---
-# name: :method:`db.grantRolesToUser()`
-# file: /reference/method/db.grantRolesToUser
-# description: |
-#   Grants a role and its privileges to a user.
-# ---
-# name: :method:`db.revokeRolesFromUser()`
-# file: /reference/method/db.revokeRolesFromUser
-# description: |
-#   Removes a role from a user.
-# ---
+name: :method:`db.grantRolesToUser()`
+file: /reference/method/db.grantRolesToUser
+description: |
+  Grants a role and its privileges to a user.
+---
+name: :method:`db.revokeRolesFromUser()`
+file: /reference/method/db.revokeRolesFromUser
+description: |
+  Removes a role from a user.
+---
 name: :method:`db.getUser()`
 file: /reference/method/db.getUser
 description: |

source/includes/ref-toc-method-role-management.yaml

@@ -1,3 +1,4 @@
+#content from this page is included in /reference/method/db.grantRolesToRole-param.yaml
 object:
   name: grantRolesToRole
   type: dbcommand

source/includes/ref-toc-method-user-management.yaml

@@ -9,8 +9,7 @@ Definition
 
 .. dbcommand:: grantRolesToRole
 
-   Add additional roles to a :ref:`user-defined <user-defined-roles>`
-   role.
+   Grants roles to a :ref:`user-defined role <user-defined-roles>`.
 
    The :dbcommand:`grantRolesToRole` command affects roles on the
    database where the command runs. :dbcommand:`grantRolesToRole` has
@@ -36,8 +35,7 @@ Definition
 Required Access
 ---------------
 
-To grant a role, a user must have access that includes the
-:authaction:`grantRole` action on the relevant database.
+.. include:: /includes/access-grant-roles.rst
 
 Example
 -------

source/reference/command/grantRolesToRole-field.yaml

@@ -1,3 +1,4 @@
+#content from this page is included in /reference/method/db.grantRolesToUser-param.yaml
 object:
   name: grantRolesToUser
   type: dbcommand