DOCS-504 Port Aggregation wiki page

Author: kay-kim

source/reference/command/count.txt

@@ -42,31 +42,31 @@ count
 
         db.runCommand( { count: 'orders' } )
 
-     The result displays the count ``n`` of ``26`` and the command
-     status ``ok`` as ``1``:
+     In the result, the ``n``, which represents the count, is ``26``
+     and the command status ``ok`` is ``1``:
 
      .. code-block:: javascript
 
         { "n" : 26, "ok" : 1 }
 
    - Count the number of the documents in the ``orders`` collection
-     with the field ``ord_dt`` greater than ``new Date('01\01\2012')``:
+     with the field ``ord_dt`` greater than ``new Date('01/01/2012')``:
 
      .. code-block:: javascript
 
         db.runCommand( { count:'orders', 
                          query: { ord_dt: { $gt: new Date('01/01/2012') } } 
                        } )
 
-     The result displays the count ``n`` of ``13`` and the command
-     status ``ok`` as ``1``:
+     In the result, the ``n``, which represents the count, is ``13``
+     and the command status ``ok`` is ``1``:
 
      .. code-block:: javascript
 
         { "n" : 13, "ok" : 1 }
 
    - Count the number of the documents in the ``orders`` collection
-     with the field ``ord_dt`` greater than ``new Date('01\01\2012')``
+     with the field ``ord_dt`` greater than ``new Date('01/01/2012')``
      skipping the first ``10`` matching records:
 
      .. code-block:: javascript
@@ -75,8 +75,8 @@ count
                          query: { ord_dt: { $gt: new Date('01/01/2012') } },
                          skip: 10 }  )
 
-     The result displays the count ``n`` of ``3`` and the command
-     status ``ok`` as ``1``:
+     In the result, the ``n``, which represents the count, is ``3`` and
+     the command status ``ok`` is ``1``:
 
      .. code-block:: javascript
 

source/reference/command/distinct.txt

@@ -51,13 +51,13 @@ distinct
 
    - Return an array of the distinct values of the field ``ord_dt``
      from the documents in the ``orders`` collection where the
-     ``ord_dt`` is greater than ``new Date('01\01\2012')``:
+     ``price`` is greater than ``10``:
 
      .. code-block:: javascript
 
         db.runCommand ( { distinct: 'orders', 
                           key: 'ord_dt',
-                          query: { ord_dt: { $gt: new Date('01/01/2012') } }
+                          query: { price: { $gt: 10 } }
                         } )
 
    .. note::

source/reference/command/group.txt

@@ -15,23 +15,24 @@ group
    The :dbcommand:`group` command takes the following prototype
    form:
 
-   .. code-block:: javascript
+   .. code-block:: none
 
       { group: { ns: <namespace>, 
                  key: <key>, 
                  $reduce: <reduce function>, 
                  $keyf: <key function>,
                  cond: <query>,
-                 finalize: <finalize fundtion> } }
+                 finalize: <finalize function> } }
 
    The command fields are as follows:
-   
+
    :field ns: 
 
           Specifies the collection from which to perform the group by
           operation.
 
-   :field key: Specifies one or more document fields to group by.
+   :field key: Specifies one or more document fields to group. Returns
+               a "key object" for use as the grouping key.
 
    :field $reduce: Specifies an aggregation function that operates on
                   the documents during the grouping operation, such as
@@ -41,11 +42,11 @@ group
 
    :field initial: Initializes the aggregation result document.
 
-   :field $keyf: Optional. Alternative to the ``key`` field. Specifies a
-                function that creates a "key object" for use as the
-                grouping key. Use the ``keyf`` instead of ``key`` to
-                group by calculated fields rather than existing
-                document fields.
+   :field $keyf: Optional. Alternative to the ``key`` field. Specifies a 
+                function that creates a "key object" for
+                use as the grouping key. Use the ``keyf`` instead of
+                ``key`` to group by calculated fields rather than
+                existing document fields. 
 
    :field cond: Optional. Specifies the selection criteria to determine
                 which documents in the collection to process. If the
@@ -112,7 +113,7 @@ group
 
    - The following example groups by the ``ord_dt`` and ``item.sku``
      fields those documents that have ``ord_dt`` greater than
-     ``01-01-2011``:
+     ``01/01/2012``:
 
      .. code-block:: javascript
 
@@ -164,7 +165,7 @@ group
 
    - The following example groups by the ``ord_dt`` and ``item.sku``
      fields, those documents that have ``ord_dt`` greater than
-     ``01-01-2011`` and calculates the sum of the ``qty`` field for each
+     ``01/01/2012`` and calculates the sum of the ``qty`` field for each
      grouping:
 
      .. code-block:: javascript
@@ -215,7 +216,7 @@ group
 
 
    - The following example groups by the calculated ``day_of_week`` field,
-     those documents that have ``ord_dt`` greater than ``01-01-2011`` and
+     those documents that have ``ord_dt`` greater than ``01/01/2012`` and
      calculates the sum, count, and average of the ``qty`` field for each
      grouping:
 

source/reference/method/cursor.count.txt

@@ -7,31 +7,34 @@ cursor.count()
 .. method:: cursor.count()
 
    The :method:`count() <cursor.count()>` method counts the number of
-   documents referenced by a cursor. 
-   
-   The :method:`count() <cursor.count()>` can accept the following
-   argument:
+   documents referenced by a cursor. Append the :method:`count()
+   <cursor.count()>` method to a :method:`find()
+   <db.collection.find()>` query to return the number of matching
+   documents, as in the following prototype:
+
+   .. code-block:: javascript
+
+      db.collection.find().count()     
+
+   This operation does not actually perform the :method:`find()
+   <db.collection.find()>`; instead, the operation counts the results
+   that would be returned by the :method:`find()
+   <db.collection.find()>`.
 
-   :param boolean override: 
+   The :method:`count() <cursor.count()>` can accept the following argument:
 
+   :param boolean applySkipLimit:
+          
           Optional. Specifies whether to consider the effects of the
           :method:`cursor.skip()` and :method:`cursor.limit()` methods
           in the count. By default, the :method:`count()
           <cursor.count()>` method ignores the effects of the
           :method:`cursor.skip()` and :method:`cursor.limit()`. Set
-          ``override`` to ``true`` to consider the effect of these
-          methods.
+          ``applySkipLimit`` to ``true`` to consider the effect of
+          these methods. 
 
           .. seealso:: :method:`cursor.size()`
-
-   Append the :method:`count() <cursor.count()>` method to a
-   :method:`find() <db.collection.find()>` query to return the number
-   of matching documents, as in the following prototype:
-
-   .. code-block:: javascript
-
-      db.collections.find().count()     
-
+   
    MongoDB also provides the shell wrapper
    :method:`db.collection.count()` for the
    ``db.collection.find().count()`` construct.
@@ -46,25 +49,16 @@ cursor.count()
         db.orders.find().count()
 
    - Count the number of the documents in the ``orders`` collection
-     with the field ``ord_dt`` greater than ``new Date('01\01\2012')``:
+     with the field ``ord_dt`` greater than ``new Date('01/01/2012')``:
 
      .. code-block:: javascript
 
         db.orders.find( { ord_dt: { $gt: new Date('01/01/2012') } } ).count()
 
    - Count the number of the documents in the ``orders`` collection
-     with the field ``ord_dt`` greater than ``new Date('01\01\2012')``
-     *ignoring* the effect of the ``limit(5)``:
-
-     .. code-block:: javascript
-
-        db.orders.find( { ord_dt: { $gt: new Date('01/01/2012') } } ).limit(5).count()
-
-   - Count the number of the documents in the ``orders`` collection
-     with the field ``ord_dt`` greater than ``new Date('01\01\2012')``
+     with the field ``ord_dt`` greater than ``new Date('01/01/2012')``
      *taking into account* the effect of the ``limit(5)``:
 
      .. code-block:: javascript
 
         db.orders.find( { ord_dt: { $gt: new Date('01/01/2012') } } ).limit(5).count(true)
-

source/reference/method/db.collection.count.txt

@@ -7,15 +7,20 @@ db.collection.count()
 .. method:: db.collection.count( )
 
    The :method:`db.collection.count()` method is a shell wrapper that
-   returns the count of documents from a :method:`find()
+   returns the count of documents that would match a :method:`find()
    <db.collection.find()>` query; i.e., :method:`db.collection.count()`
    method is equivalent to:
 
    .. code-block:: javascript
 
       db.collection.find(<query>).count();
+      
+   This operation does not actually perform the :method:`find()
+   <db.collection.find()>`; instead, the operation counts the results
+   that would be returned by the :method:`find()
+   <db.collection.find()>`.
 
-   The :method:`db.collection.count()` method can accepts the following argument:
+   The :method:`db.collection.count()` method can accept the following argument:
 
    :param document query: Specifies the selection query criteria.
 
@@ -34,7 +39,7 @@ db.collection.count()
         db.orders.find().count()
 
    - Count the number of the documents in the ``orders`` collection
-     with the field ``ord_dt`` greater than ``new Date('01\01\2012')``:
+     with the field ``ord_dt`` greater than ``new Date('01/01/2012')``:
 
      .. code-block:: javascript
 

source/reference/method/db.collection.distinct.txt

@@ -50,10 +50,10 @@ db.collection.distinct()
 
    - Return an array of the distinct values of the field ``ord_dt``
      from the documents in the ``orders`` collection where the
-     ``ord_dt`` is greater than ``new Date('01\01\2012')``:
+     ``price`` is greater than ``10``:
 
      .. code-block:: javascript
 
         db.orders.distinct( 'ord_dt', 
-                            { ord_dt: { $gt: new Date('01/01/2012') } }
+                            { price: { $gt: 10 } }
                           )

source/reference/method/db.collection.group.txt

@@ -90,7 +90,7 @@ following prototype:
 
 - The following example groups by the ``ord_dt`` and ``item.sku``
   fields those documents that have ``ord_dt`` greater than
-  ``01-01-2011``:
+  ``01/01/2011``:
 
   .. code-block:: javascript
 
@@ -128,7 +128,7 @@ following prototype:
 
 - The following example groups by the ``ord_dt`` and ``item.sku``
   fields, those documents that have ``ord_dt`` greater than
-  ``01-01-2011`` and calculates the sum of the ``qty`` field for each
+  ``01/01/2011`` and calculates the sum of the ``qty`` field for each
   grouping:
 
   .. code-block:: javascript
@@ -170,7 +170,7 @@ following prototype:
 
 
 - The following example groups by the calculated ``day_of_week`` field,
-  those documents that have ``ord_dt`` greater than ``01-01-2011`` and
+  those documents that have ``ord_dt`` greater than ``01/01/2011`` and
   calculates the sum, count, and average of the ``qty`` field for each
   grouping: