DOCS-144: glossary changes editing and refactoring

Author: Sam Kleinman

source/administration/configuration.rst

@@ -99,7 +99,7 @@ following explanation:
 - :setting:`journal` is ``true``, which enables
   :doc:`journaling </core/journaling>` which ensures single instance
   write-durability. 64-bit builds of :program:`mongod` enable
-  :term:`journaling` by default. Thus, this setting may be redundant.
+  :term:`journaling <journal>` by default. Thus, this setting may be redundant.
 
 Given the default configuration, some of these values may be
 redundant. However, in many situations explicitly stating the

source/core/replication.rst

@@ -435,7 +435,7 @@ the existing members.
 
 .. note::
 
-   :term:`Journaling`, provides single-instance
+   :term:`Journaling <journal>`, provides single-instance
    write durability. The journaling greatly improves the reliability
    and durability of a database. Unless MongoDB runs with journaling, when a
    MongoDB instance terminates ungracefully, the database can loose up to 60 seconds of data,

source/reference/commands.rst

@@ -328,8 +328,8 @@ Aggregation
 
       :func:`group()` does not work in :term:`shard environments
       <shard cluster>`. Use the :term:`aggregation framework` or
-      :term:`map/reduce` (i.e. :db;command:`mapReduce` in
-      :term:`sharded environments <sharding>`.
+      :term:`map-reduce` (i.e. :command:`mapReduce` in :term:`sharded
+      environments <sharding>`.
 
    .. read-lock
 
@@ -1331,7 +1331,7 @@ Administration
 
    .. note::
 
-      When using :term:`journaling`, there is almost never any need to
+      When using :term:`journaling <journal>`, there is almost never any need to
       run :dbcommand:`repairDatabase`. In the event of an unclean
       shutdown, the server will be able restore the data files to a
       pristine state automatically.
@@ -1837,7 +1837,6 @@ Diagnostics
       .. versionadded:: 2.1.1
 
       Returns the local server time for the current system.
-      
 
 .. dbcommand:: ping
 

source/reference/glossary.rst

@@ -10,17 +10,19 @@ Glossary
    BSON
       A serialization format used to store documents and make remote
       procedure calls in MongoDB. "BSON" is a a portmanteau of the words
-      "binary" and "JSON". BSON can be thought of as a binary representation
+      "binary" and "JSON". Think of BSON as a binary representation
       of JSON (JavaScript Object Notation) documents. For a detailed spec,
       see `bsonspec.org <http://bsonspec.org/>`_.
 
    database command
       Any MongoDB operation other than an insert, update, remove,
       or query. MongoDB exposes commands as queries
-      query against the special ":term:`$cmd`" collection. For example,
-      ``count`` is run as a command.
+      query against the special ":term:`$cmd`" collection. For
+      example, the implementation of :dbcommand:`count` for MongoDB is
+      a command.
 
-      .. seealso:: ":doc:`/reference/commands`" for a
+      .. seealso:: ":doc:`/reference/commands`" for a full list of
+         database commands in MongoDB
 
    operator
       A keyword beginning with a ``$`` used to express a complex
@@ -36,13 +38,13 @@ Glossary
 
    document
       A record in a MongoDB collection, and the basic unit of data
-      in MongoDB. Documents are analogous to JSON object, but are
-      stored in a more type-rich format known as BSON.
+      in MongoDB. Documents are analogous to JSON object, but exist in
+      the Database in a more type-rich format known as :term:`BSON`.
 
    field
       A name-value pair in a term:`document`. Documents have zero
-      or more fields. Fields are analogous to
-      columns in relational databases.
+      or more fields. Fields are analogous to columns in relational
+      databases.
 
    database
       A physical container for :term:`collections <collection>`.
@@ -66,15 +68,18 @@ Glossary
 
    JSON
       JavaScript Object Notation. A human-readable, plain text format
-      for expressing structured data.
+      for expressing structured data with support in many programming
+      languages.
 
    JSON document
-      A :term:`JSON` documents are collections of fields and values in a
-      structured format. The following is a sample JSON document with
-      two fields::
+      A :term:`JSON` document is a collection of fields and values in a
+      structured format. The following is a sample :term:`JSON
+      document` with two fields:
+
+      .. code-block:: javascript
 
-          { name: "MongoDB",
-            type: "database" }
+         { name: "MongoDB",
+           type: "database" }
 
    admin database
       A privileged database named "``admin``". Users must have access
@@ -114,7 +119,7 @@ Glossary
    shard cluster
       The set of nodes comprising a :term:`sharded <sharding>` MongoDB deployment. A shard cluster
       consists of three config processes, one or more replica sets, and one or more
-      ``mongos`` routing processes.
+      :program:`mongos` routing processes.
 
       .. seealso:: ":doc:`/core/sharding`."
 
@@ -180,10 +185,10 @@ Glossary
 
    capped collection
       A fixed-sized :term:`collection <collection>`. Once they reach
-      their fixed size, capped collections
-      automatically overwrite their oldest entries. These collections
-      are used to implement replication, but they may also be created
-      by application developers.
+      their fixed size, capped collections automatically overwrite
+      their oldest entries. MongoDB's replication mechanism depends on
+      capped collections, but developers may also use them in their
+      applications.
 
       .. seealso:: ":doc:`/core/capped-collections`."
 
@@ -216,16 +221,16 @@ Glossary
 
    master
       In conventional master/:term:`slave` replication, the master
-      database receives all writes. The
-      :term:`slave` instances replicate from the master instance
-      in real time.
+      database receives all writes. The :term:`slave` instances
+      replicate from the master instance in real time.
 
    slave
-      In conventional :term:`master`/slave replication, the `slave`s
+      In conventional :term:`master`/slave replication, slaves
       are read-only instances that replicate operations from the
       :term:`master` database. Data read from slave instances may
-      not be completely consistent with the master. Therefore, applications
-      requiring consistent reads must read from the master database instance.
+      not be completely consistent with the master. Therefore,
+      applications requiring consistent reads must read from the
+      master database instance.
 
    primary
       In a :term:`replica set`, the primary member is the current
@@ -260,8 +265,8 @@ Glossary
 
    write-lock
       A lock on the database for a given writer.
-      When a process writes to the database, it takes an exlcusive write-lock
-      to prevent other processes from writing or reading.
+      When a process writes to the database, it takes an exclusive
+      write-lock to prevent other processes from writing or reading.
 
    index
       A data structure that optimizes queries.
@@ -275,7 +280,7 @@ Glossary
 
    btree
       A data structure used by most database management systems
-      for to store indexes. MongoDB also uses b-trees for its indexes.
+      for to store indexes. MongoDB uses b-trees for its indexes.
 
    ISODate
      The international date format used by the MongoDB JavaScript shell

source/reference/javascript.rst

@@ -409,7 +409,7 @@ Data Aggregation
 
       :func:`group()` does not work in :term:`shard environments
       <shard cluster>`. Use the :term:`aggregation framework` or
-      :term:`map/reduce` in :term:`sharded environments <sharding>`.
+      :term:`map-reduce` in :term:`sharded environments <sharding>`.
 
    .. note::
 

source/reference/mongodump.rst

@@ -108,7 +108,7 @@ Options
 .. option:: --journal
 
    Allows :program:`mongodump` operations to use the durability
-   :term:`journal <journaling>` to ensure that the export is in a
+   :term:`journal` to ensure that the export is in a
    consistent state. This option is only relevant when specifying the
    :option:`--dbpath` option.
 
@@ -190,7 +190,7 @@ functionality.
 The following command, creates a dump file that contains only the
 collection named "``collection``" in the database named "``test``". In
 this case the database is running on the local interface on port
-27017:
+``27017``:
 
 .. code-block:: sh
 

source/reference/mongoexport.rst

@@ -112,7 +112,7 @@ Options
 .. option:: --journal
 
    Allows :program:`mongoexport` operations to access the durability
-   :term:`journal <journaling>` to ensure that the export is in a
+   :term:`journal` to ensure that the export is in a
    consistent state. This option is only relevant when specifying the
    :option:`--dbpath` option.
 

source/reference/mongofiles.rst

@@ -164,7 +164,7 @@ Options
 .. option:: --journal
 
    Allows :program:`mongofiles` operations to use the durability
-   :term:`journal <journaling>` when running with :option:`--dbpath`
+   :term:`journal` when running with :option:`--dbpath`
    to ensure that the database maintains a recoverable state. This
    forces :program:`mongofiles` to record all data on disk regularly.
 

source/reference/mongooplog.rst

@@ -141,7 +141,7 @@ Options
 .. option:: --journal
 
    Allows :program:`mongooplog` operations to use the durability
-   :term:`journal <journaling>` to ensure that the data files will
+   :term:`journal` to ensure that the data files will
    remain in a consistent state during the writing process. This
    option is only relevant when specifying the :option:`--dbpath`
    option.

source/reference/server-status.rst

@@ -197,7 +197,7 @@ mem
    significantly (i.e. gigabytes) larger than :status:`mem.mapped`,
    this could indicate a memory leak.
 
-   With :term:`journaling` enabled the value of :status:`mem.virtual`
+   With :term:`journaling <journal>` enabled, the value of :status:`mem.virtual`
    is twice the value of :status:`mem.mapped`.
 
 .. status:: mem.supported
@@ -603,7 +603,7 @@ dur
 Durability
 ~~~~~~~~~~
 
-Durability refers to :term:`journaling`.
+Durability refers to :term:`journaling <journal>`.
 
 .. status:: dur
 
@@ -650,7 +650,7 @@ Durability refers to :term:`journaling`.
    .. versionadded:: 2.0
 
    The :status:`dur.compression` represents the compression ratio of
-   the :term:`journal <journaling>`.
+   :term:`journal`.
 
 .. status:: dur.commitsInWriteLock