Merge remote branch 'origin/dev' into dev

This commit is contained in:
Ross Lawley 2011-07-11 09:23:38 +01:00
commit 147e33c3ca

View File

@ -5,8 +5,8 @@ Querying the database
is used for accessing the objects in the database associated with the class.
The :attr:`objects` attribute is actually a
:class:`~mongoengine.queryset.QuerySetManager`, which creates and returns a new
a new :class:`~mongoengine.queryset.QuerySet` object on access. The
:class:`~mongoengine.queryset.QuerySet` object may may be iterated over to
:class:`~mongoengine.queryset.QuerySet` object on access. The
:class:`~mongoengine.queryset.QuerySet` object may be iterated over to
fetch documents from the database::
# Prints out the names of all the users in the database
@ -498,4 +498,4 @@ cannot use the `$` syntax in keyword arguments it has been mapped to `S`::
.. note ::
Currently only top level lists are handled, future versions of mongodb /
pymongo plan to support nested positional operators. See `The $ positional
operator <http://www.mongodb.org/display/DOCS/Updating#Updating-The%24positionaloperator>`_.
operator <http://www.mongodb.org/display/DOCS/Updating#Updating-The%24positionaloperator>`_.