From 153848a2bb079cd68eeba6900d332721548ff076 Mon Sep 17 00:00:00 2001
From: "Tim Slavin (MongoDB)" <tim.slavin@10gen.com>
Date: Tue, 20 May 2014 14:50:54 -0400
Subject: [PATCH] DOCS-3105: add security-related glossary terms

---
 source/reference/glossary.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/source/reference/glossary.txt b/source/reference/glossary.txt
index cf6d3fa9f8b..120c7e28c26 100644
--- a/source/reference/glossary.txt
+++ b/source/reference/glossary.txt
@@ -29,6 +29,11 @@ Glossary
       :term:`pipeline`. For a list of accumulator operations, see
       :pipeline:`$group`.
 
+   action
+      An operation the user can perform on a resource. Actions and
+      :term:`resources <resource>` combine to create :term:`privileges
+      <privilege>`. See :doc:`action </reference/privilege-actions>`.
+
    admin database
       A privileged database. Users
       must have access to the ``admin`` database to run certain
@@ -623,6 +628,12 @@ Glossary
       a :term:`replica set` are most likely to become :term:`primary`.
       See :data:`~local.system.replset.members[n].priority`.
 
+   privilege
+      A combination of specified :term:`resources <resource>` and
+      :term:`actions <action>` permitted on the resource. For example, a
+      privilege might be the ability to configure a replica set. See
+      :ref:`privilege <privileges>`.
+
    projection
       A document given to a :term:`query` that specifies which fields
       MongoDB returns in the result set. See :ref:`projection`. For a
@@ -712,6 +723,11 @@ Glossary
       physical RAM. Resident memory is a subset of :term:`virtual memory`,
       which includes memory mapped to physical RAM and to disk.
 
+   resource
+     A database, collection, set of collections, or cluster. A
+     :term:`privilege` permits :term:`actions <action>` on a specified
+     resource. See :ref:`resource <resource-document>`.
+
    REST
      An API design pattern centered around the idea of resources and the
      :term:`CRUD` operations that apply to them. Typically REST is
@@ -719,6 +735,11 @@ Glossary
      interface that allows HTTP clients to run commands against the
      server. See :ref:`rest-interface` and :ref:`rest-api`.
 
+   role
+     A set of privileges that permit :term:`actions <action>` on specified
+     :term:`resources <resource>`. Users have roles assigned to them. See
+     :doc:`/core/security-introduction`.
+
    rollback
       A process that reverts writes operations to ensure the consistency
       of all replica set members. See :ref:`replica-set-rollback`.