editing save

Author: Andrew Leung

draft/applications/geospatial-indexes.txt

@@ -120,57 +120,43 @@ in the previous example:
 
 Limit
 `````
-
-.. TODO double check with greg... will limit really stop 100 documents
-.. being searched for (i.e. if only 99 documents are found,  limit(98)
-.. will return sooner? )
-
 The :func:`limit() <cursor.limit()>` method can be used with
-:func:`find() <db.collection.find()>` to limit the 
-
-By default, geospatial queries with :func:`find()
-<db.collection.find()>` return 100 documents sorted by distance. To limit
-on the result set, use the :func:`limit() <cursor.limit()>` method
-with :func:`find() <db.collection.find()>` operator.  The following is
-the prototype operation:
+:func:`find() <db.collection.find()>` to limit the number of results.
+By default, geospatial queries with the :func:`find()
+<db.collection.find()>` method  return 100 documents sorted by
+distance. The following is the prototype operation:
 
 .. code-block:: javascript
 
    db.collection.find( { <location field>: { $near: [ x, y ] } } ).limit(n)
 
-To  the ``num`` option with the :dbcommand:`geoNear`
-command and the ``near`` parameter, as in the following prototype:
+To limit the result set using the :dbcommand:`geoNear` command, use
+the ``num`` option to limit results. The following is a prototype of
+the command:
 
 .. code-block:: javascript
 
    db.runCommand( { geoNear: "collection", near: [ x, y ], num: z } )
 
-The following command returns the same results as the :operator:`near`
-in the previous example:
-
-.. code-block:: javascript
-
-   db.runCommand( { geoNear: "collection", near: [ -74, 40.74 ], num: 20 } )
-
-The :func:`limit() <cursor.limit()>` method and ``near`` parameter do not limit
-geospatial query results by distance, only the number of returned
-:term:`document`. To limit geospatial search results by distance,
-please see the :ref:`geospatial-query-distance` section.
+The :func:`limit() <cursor.limit()>` method and ``near`` parameter do
+not limit geospatial query results by distance, only the number of
+results. To limit geospatial search results by distance, please see
+the :ref:`geospatial-query-distance` section.
 
 .. note::
 
    The :func:`limit() <cursor.limit()>` method and ``num`` option have
-   different performance characteristics. Geospatial queries with
-   :func:`limit() <cursor.limit()>` method will return 100 documents,
-   sort them, and finally the limit method is applied. Geospatial
-   queries with ``num`` option will only return the specified number
-   of documents unsorted.
+   different performance characteristics. Geospatial queries using
+   :func:`limit() <cursor.limit()>` method are slower than using
+   :dbcommand:`geoNear`. 
 
-.. note::
+   Geospatial queries with the :func:`find() <db.collection.find()>`
+   method will return 100 documents, sort them, and finally limit the
+   result set. Geospatial queries with the :dbcommand:`geoNear` and
+   ``num`` option will only return the specified number of unsorted
+   documents.
 
-   Limits in geospatial queries are always applied to the geospatial
-   component first. This will affect the results if you specify
-   additional sort operations.
+.. TODO double check with greg...
 
 .. index:: geospatial queries; distance limit
 
@@ -179,15 +165,19 @@ please see the :ref:`geospatial-query-distance` section.
 Distance
 ````````
 
-To limit the result set by a distance from the query point, MongoDB
-provides the :operator:`$maxDistance` operator that you can use in
-:func:`find() <db.collection.find()>` queries with the
-:operator:`$near` operator, as in the following prototype:
+To query geospatial data by distance, use the :operator:`$maxDistance` operator
+with :func:`find() <db.collection.find()>`. Results with this operator
+will not exceed the distance specified.
 
 .. code-block:: javascript
 
    db.collection.find( { <location field>: { $near: [ x, y ] } , $maxDistance : z } )
 
+To limit the result set by a distance from the query point, MongoDB
+provides the :operator:`$maxDistance` operator that you can use in
+:func:`find() <db.collection.find()>` queries with the
+:operator:`$near` operator, as in the following prototype:
+
 :dbcommand:`geoNear` provides equivalent functionality with the
 ``maxDistance`` option, as in the following prototype: