merge: DOCS-637

Sam Kleinman · Sam Kleinman · commit cbab8b4a8299 · 2012-10-23T19:39:45.000-04:00
diff --git a/draft/administration/production-notes.txt b/draft/administration/production-notes.txt
@@ -29,7 +29,7 @@ components.
 This section contains notes on specific network configurations
 relevant to production deployments of MongoDB.
 
-.. TODO link to MongDB security section when available.
+.. TODO link to MongoDB security section when available.
 
 Default Port Numbers used by MongoDB
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,7 +58,7 @@ lists the default ports that MongoDB components use.
      - :option:`mongod --shardsvr`
      - 27018
    * - :ref:`Config Server <sharding-config-server>` (used in sharding)
-     - :option:`mongod --configsrv`
+     - :option:`mongod --configsvr`
      - 27019
    * - :ref:`HTTP REST interface <rest-interface>`
      - :option:`mongod --rest`
@@ -91,7 +91,7 @@ MongoDB uses the firewall rules listed here.
    * - :program:`mongod`
      - Outgoing
      - */27017
-     - Repilca set members, Shard routers (:program:`mongos` instances)
+     - Replica set members, Shard routers (:program:`mongos` instances)
    * - :program:`mongos`
      - Incoming
      - 27017/*
diff --git a/draft/applications/geospatial-indexes.txt b/draft/applications/geospatial-indexes.txt
@@ -340,7 +340,7 @@ queries for a particular distance around a certain point.
 Spherical
 ~~~~~~~~~
 
-By default, MongoDB uses flat geometry to calculate distances betwen
+By default, MongoDB uses flat geometry to calculate distances between
 points. MongoDB also supports distance calculations using spherical
 geometry to provide accurate distances for geospatial information
 based on a sphere or earth.
@@ -371,7 +371,7 @@ spherical geometry is the ``{ spherical: true }`` option.
      sphere (e.g. the Earth) in the same units as the distance
      measurement.
 
-   - *radians to distance*: multiply the radian measure by the radius
+   - *radians to distance*: multiply the rad ian measure by the radius
      of the sphere (e.g. the Earth) in the units system that you want to
      convert the distance to.
 
diff --git a/draft/core/read-operations.txt b/draft/core/read-operations.txt
@@ -484,7 +484,7 @@ the following resources:
 
 - :ref:`An Introduction to Shard Keys <sharding-shard-key>`
 - :ref:`Shard Key Internals and Operations <sharding-internals-shard-keys>`
-- :ref:`Quering Sharded Clusters <sharding-internals-querying>`
+- :ref:`Querying Sharded Clusters <sharding-internals-querying>`
 - :ref:`sharding-mongos`
 
 Replica Sets
diff --git a/draft/use-cases/gaming-user-state.txt b/draft/use-cases/gaming-user-state.txt
@@ -327,7 +327,7 @@ To display the armor, then, you would use the following code:
 
    >>> item_index = get_item_index(
    ...     character['inventory'] + character['location']['inventory'])
-   >>> armor = get_armor_for_dislay(character, item_index)
+   >>> armor = get_armor_for_display(character, item_index)
 
 This operation builds an index for the items the character is actually
 carrying in inventory in addition to the items that the player might
diff --git a/source/administration/backups.txt b/source/administration/backups.txt
@@ -253,7 +253,7 @@ The above command sequence:
 - Ensures that the ``/dev/vg0/mdb-snap01`` device is not mounted.
 
 - Does a block level copy of the entire snapshot image using the ``dd``
-  command, and compresses the result in a gziped tar archive in the
+  command, and compresses the result in a gzipped tar archive in the
   current working directory.
 
   .. warning::
diff --git a/source/administration/replica-sets.txt b/source/administration/replica-sets.txt
@@ -662,7 +662,7 @@ To check the current length of replication lag:
          syncedTo: Tue Oct 02 2012 11:33:40 GMT-0400 (EDT)
              = 7475 secs ago (2.08hrs)
 
-  .. note:: The :method:`rs.status()` method is a wrapper around hthe
+  .. note:: The :method:`rs.status()` method is a wrapper around the
      :dbcommand:`replSetGetStatus` database command.
 
 - Monitor the rate of replication by watching the oplog time in the
diff --git a/source/administration/sharding.txt b/source/administration/sharding.txt
@@ -747,7 +747,7 @@ to pre-splitting.
 
 .. versionadded:: 2.2
    :dbcommand:`moveChunk` command has the: ``_secondaryThrottle``
-   paramenter. When set to ``true``, MongoDB ensures that
+   parameter. When set to ``true``, MongoDB ensures that
    :term:`secondary` members have replicated operations before allowing
    new chunk migrations.
 
diff --git a/source/applications/database-references.txt b/source/applications/database-references.txt
@@ -29,7 +29,7 @@ MongoDB applications use one of two methods for relating documents:
    must perform additional queries to return the referenced
    documents. Many :doc:`drivers </applications/drivers>` have helper
    methods that form the query for the DBRef automatically. The
-   drivers [#offical-driver]_ do not *automatically* resolve DBRefs
+   drivers [#official-driver]_ do not *automatically* resolve DBRefs
    into documents.
 
    Use a DBRef when you need to embed documents from multiple
@@ -42,7 +42,7 @@ MongoDB applications use one of two methods for relating documents:
 Unless you have a compelling reason for using a DBref use manual
 references.
 
-.. [#offical-driver] Some community supported drivers may have
+.. [#official-driver] Some community supported drivers may have
    alternate behavior and may resolve a DBRef into a document
    automatically.
 
diff --git a/source/applications/replication.txt b/source/applications/replication.txt
@@ -331,7 +331,7 @@ behavior <replica-set-read-preference-behavior>`. See also the
       member's :term:`primary` or :term:`secondary` status.
 
       For :readmode:`nearest`, the client assembles a list of
-      acceptble hosts based on tag set and then narrows that list to
+      acceptable hosts based on tag set and then narrows that list to
       the host with the shortest ping time and all other members of
       the set that are within the "local threshold," or acceptable
       latency. See :ref:`replica-set-read-preference-behavior-nearest`
diff --git a/source/core/sharding-internals.txt b/source/core/sharding-internals.txt
@@ -212,9 +212,9 @@ Furthermore:
   entire shard is unreachable or fails for some reason, that data will
   be unavailable.
 
-- If the shaqrd key allows the :program:`mongos` to isolate most
-  operations to a single shard, then the failure of a single will
-  only render *some* data unavailable.
+- If the shard key allows the :program:`mongos` to isolate most
+  operations to a single shard, then the failure of a single shard
+  will only render *some* data unavailable.
 
 - If your shard key distributes data required for every operation
   throughout the cluster, then the failure of the entire shard will
@@ -484,7 +484,7 @@ evenly among shards. Migrations may be either:
 
 All chunk migrations use the following procedure:
 
-#. The balancer process sends the :dbCommand:`moveChunk` command to
+#. The balancer process sends the :dbcommand:`moveChunk` command to
    the source shard for the chunk. In this operation the balancer
    passes the name of the destination shard to the source shard.
 
diff --git a/source/faq/sharding.txt b/source/faq/sharding.txt
@@ -375,7 +375,7 @@ Consider the following error message:
 
    ERROR: moveChunk commit failed: version is at <n>|<nn> instead of <N>|<NN>" and "ERROR: TERMINATING"
 
-:program:`mongod` procudes this message if, during a :ref:`chunk
+:program:`mongod` issues this message if, during a :ref:`chunk
 migration <sharding-chunk-migration>`, the :term:`shard` could not
 connect to the :term:`config database` to update chunk information at
 the end of the migration process. If
diff --git a/source/reference/aggregation/substr.txt b/source/reference/aggregation/substr.txt
@@ -14,5 +14,5 @@ $substr (aggregation)
    .. note::
 
       :expression:`$substr` is not encoding aware and if used
-      improperly may produce a result string containing an invalid utf-8
+      improperly may produce a result string containing an invalid UTF-8
       character sequence.
diff --git a/source/reference/command/replSetGetRBID.txt b/source/reference/command/replSetGetRBID.txt
@@ -1,5 +1,5 @@
 =========================
-replSetGetRIBD (internal)
+replSetGetRBID (internal)
 =========================
 
 .. default-domain:: mongodb
diff --git a/source/reference/command/shardCollection.txt b/source/reference/command/shardCollection.txt
@@ -13,7 +13,7 @@ shardCollection
 
    .. code-block:: javascript
 
-      { shardcollection: "<db>.<collection>", key: { "<shardkey>": 1 } }
+      { shardCollection: "<db>.<collection>", key: { "<shardkey>": 1 } }
 
    This enables sharding for the collection specified by
    ``<collection>`` in the database named ``<db>``, using the key
@@ -28,7 +28,7 @@ shardCollection
 
    .. warning::
 
-      There's no easy way to disable sharding after running :dbcommand:`shardcollection`. In addition,
+      There's no easy way to disable sharding after running :dbcommand:`shardCollection`. In addition,
       you cannot change shard keys once set. If you must convert a sharded cluster to a :term:`standalone`
       node or :term:`replica set`, you must make a single backup of the entire cluster
       and then restore the backup to the standalone :program:`mongod`
diff --git a/source/reference/components.txt b/source/reference/components.txt
@@ -77,7 +77,7 @@ Diagnostic Tools
 provide diagnostic information related to the current operation of a
 :program:`mongod` instance. 
 
-.. note:: Because :program:`mongostniff` depends on :term:`libpcap
+.. note:: Because :program:`mongosniff` depends on :term:`libpcap
    <pcap>`, most distributions of MongoDB do *not* include
    :program:`mongosniff`. 
 
diff --git a/source/reference/config-database.txt b/source/reference/config-database.txt
@@ -134,7 +134,7 @@ Collections
 
    The :data:`mongos` collection stores a document for each
    :program:`mongos` instance affiliated with the
-   culster. :program:`mongos` instances send pings to all members of
+   cluster. :program:`mongos` instances send pings to all members of
    the cluster every 30 seconds so the cluster can verify that the
    :program:`mongos` is active. The ``ping`` field shows the time of
    the last ping. The cluster maintains this collection for reporting
diff --git a/source/reference/server-status.txt b/source/reference/server-status.txt
@@ -1123,9 +1123,9 @@ recordStats
    accessing data for *all* databases managed by this
    :program:`mongod` instance.
 
-.. status:: recordStats.local.accessNotInMemory
+.. status:: recordStats.local.accessesNotInMemory
 
-   :status:`recordStats.local.accessNotInMemory` reflects the number of
+   :status:`recordStats.local.accessesNotInMemory` reflects the number of
    times :program:`mongod` needed to access a memory page that was
    *not* resident in memory for the ``local`` database.
 
@@ -1135,9 +1135,9 @@ recordStats
    number of page fault exceptions thrown by :program:`mongod` when
    accessing data for the ``local`` database.
 
-.. status:: recordStats.admin.accessNotInMemory
+.. status:: recordStats.admin.accessesNotInMemory
 
-   :status:`recordStats.admin.accessNotInMemory` reflects the number of
+   :status:`recordStats.admin.accessesNotInMemory` reflects the number of
    times :program:`mongod` needed to access a memory page that was
    *not* resident in memory for the :term:`admin database`.
 
@@ -1147,9 +1147,9 @@ recordStats
    number of page fault exceptions thrown by :program:`mongod` when
    accessing data for the :term:`admin database`.
 
-.. status:: recordStats.<database>.accessNotInMemory
+.. status:: recordStats.<database>.accessesNotInMemory
 
-   :status:`recordStats.<database>.accessNotInMemory` reflects the number of
+   :status:`recordStats.<database>.accessesNotInMemory` reflects the number of
    times :program:`mongod` needed to access a memory page that was
    *not* resident in memory for the ``<database>`` database.
 
diff --git a/source/release-notes/2.0.txt b/source/release-notes/2.0.txt
@@ -404,7 +404,7 @@ commands.
 
 - :dbcommand:`ping`
 
-- :dbcommand:`isdbGrid`
+- :dbcommand:`isdbgrid`
 
 Resources
 ---------
diff --git a/source/release-notes/2.2.txt b/source/release-notes/2.2.txt
@@ -628,7 +628,7 @@ See the documentation of the :dbcommand:`compact` and the
 Added Build Flag to Use System Libraries
 ````````````````````````````````````````
 
-The Boost library, version 1.49, is now embeded in the MongoDB
+The Boost library, version 1.49, is now embedded in the MongoDB
 code base.
 
 If you want to build MongoDB binaries using system Boost libraries,
diff --git a/source/tutorial/convert-replica-set-to-replicated-shard-cluster.txt b/source/tutorial/convert-replica-set-to-replicated-shard-cluster.txt
@@ -376,7 +376,7 @@ Issue the following command:
 .. code-block:: javascript
 
    use admin
-   db.runCommand( { shardcollection : "test.test_collection", key : {"number":1} })
+   db.runCommand( { shardCollection : "test.test_collection", key : {"number":1} })
    { "collectionsharded" : "test.test_collection", "ok" : 1 }
 
 The collection ``test_collection`` is now sharded!
diff --git a/source/tutorial/enforce-unique-keys-for-sharded-collections.txt b/source/tutorial/enforce-unique-keys-for-sharded-collections.txt
@@ -62,7 +62,7 @@ using the ``unique`` constraint, specify the :dbcommand:`shardCollection` comman
 
 .. code-block:: javascript
 
-   db.runCommand( { shardcollection : "test.users" , key : { email : 1 } , unique : true } );
+   db.runCommand( { shardCollection : "test.users" , key : { email : 1 } , unique : true } );
 
 Remember that the ``_id`` field index is always unique. By default, MongoDB
 inserts an ``ObjectId`` into the ``_id`` field. However,
diff --git a/source/tutorial/write-a-tumblelog-application-with-django-mongodb-engine.txt b/source/tutorial/write-a-tumblelog-application-with-django-mongodb-engine.txt
@@ -375,8 +375,8 @@ tumblelog to comment on posts. This a requires custom form and view to
 handle the form, and data. You will also update the template to
 include the form.
 
-Creat the Comments Form
-~~~~~~~~~~~~~~~~~~~~~~~
+Create the Comments Form
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 You must customize form handling to deal with embedded comments.  By
 extending :class:`ModelForm`, it is possible to append the comment to
diff --git a/source/use-cases/category-hierarchy.txt b/source/use-cases/category-hierarchy.txt
@@ -262,7 +262,7 @@ following operation in the Python/PyMongo console.
 
 .. code-block:: python
 
-    >>> db.command('shardcollection', 'categories', {
+    >>> db.command('shardCollection', 'categories', {
     ...     'key': {'_id': 1} })
     { "collectionsharded" : "categories", "ok" : 1 }
 
diff --git a/source/use-cases/hierarchical-aggregation.txt b/source/use-cases/hierarchical-aggregation.txt
@@ -468,7 +468,7 @@ timestamp) on the events collection. Consider the following:
 
 .. code-block:: pycon
 
-   >>> db.command('shardcollection','events', {
+   >>> db.command('shardCollection','events', {
    ... 'key' : { 'userid': 1, 'ts' : 1} } )
    { "collectionsharded": "events", "ok" : 1 }
 
@@ -477,13 +477,13 @@ issue the following group of shard operations in the Python/PyMongo shell:
 
 .. code-block:: python
 
-   db.command('shardcollection', 'stats.daily', {
+   db.command('shardCollection', 'stats.daily', {
         'key': { '_id': 1 } })
-   db.command('shardcollection', 'stats.weekly', {
+   db.command('shardCollection', 'stats.weekly', {
         'key': { '_id': 1 } })
-   db.command('shardcollection', 'stats.monthly', {
+   db.command('shardCollection', 'stats.monthly', {
         'key': { '_id': 1 } })
-   db.command('shardcollection', 'stats.yearly', {
+   db.command('shardCollection', 'stats.yearly', {
         'key': { '_id': 1 } })
 
 You should also update the ``h_aggregate``  map-reduce wrapper to
diff --git a/source/use-cases/inventory-management.txt b/source/use-cases/inventory-management.txt
@@ -454,9 +454,9 @@ cart and inventory collections:
 
 .. code-block:: pycon
 
-   >>> db.command('shardcollection', 'inventory'
+   >>> db.command('shardCollection', 'inventory'
    ...            'key': { '_id': 1 } )
    { "collectionsharded" : "inventory", "ok" : 1 }
-   >>> db.command('shardcollection', 'cart')
+   >>> db.command('shardCollection', 'cart')
    ...            'key': { '_id': 1 } )
    { "collectionsharded" : "cart", "ok" : 1 }
diff --git a/source/use-cases/metadata-and-asset-management.txt b/source/use-cases/metadata-and-asset-management.txt
@@ -471,10 +471,10 @@ Use the following operation at the Python/PyMongo shell:
 
 .. code-block:: pycon
 
-   >>> db.command('shardcollection', 'cms.nodes', {
+   >>> db.command('shardCollection', 'cms.nodes', {
    ...     key : { 'metadata.section': 1, 'metadata.slug' : 1 } })
    { "collectionsharded": "cms.nodes", "ok": 1}
-   >>> db.command('shardcollection', 'cms.assets.files', {
+   >>> db.command('shardCollection', 'cms.assets.files', {
    ...     key : { 'metadata.section': 1, 'metadata.slug' : 1 } })
    { "collectionsharded": "cms.assets.files", "ok": 1}
 
@@ -484,7 +484,7 @@ shard the collection
 
 .. code-block:: pycon
 
-   >>> db.command('shardcollection', 'cms.assets.chunks', {
+   >>> db.command('shardCollection', 'cms.assets.chunks', {
    ...     key : { 'files_id': 1 } })
    { "collectionsharded": "cms.assets.chunks", "ok": 1}
 
diff --git a/source/use-cases/storing-comments.txt b/source/use-cases/storing-comments.txt
@@ -700,7 +700,7 @@ at the Python/PyMongo console:
 
 .. code-block:: pycon
 
-   >>> db.command('shardcollection', 'comments', {
+   >>> db.command('shardCollection', 'comments', {
    ...     'key' : { 'discussion_id' : 1, 'full_slug': 1 } })
 
 This will return the following response:
@@ -721,7 +721,7 @@ at the Python/PyMongo console:
 
 .. code-block:: python
 
-   >>> db.command('shardcollection', 'comment_pages', {
+   >>> db.command('shardCollection', 'comment_pages', {
    ...     key : { 'discussion_id' : 1, 'page': 1 } })
    { "collectionsharded" : "comment_pages", "ok" : 1 }
 
