Commit 28605a9c authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Whitespace fix to [9896]. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1b9bbb54

docs/releases/1.1-alpha-1.txt

+4 −2
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ Aggregate support 


.. currentmodule:: django.db.models



It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``, ``MIN()``, etc.) from within Django's ORM. You can choose to either return

the results of the aggregate directly, or else annotate the objects in a :class:`QuerySet` with the results of the aggregate query.

It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``,

``MIN()``, etc.) from within Django's ORM. You can choose to either return the

results of the aggregate directly, or else annotate the objects in a

:class:`QuerySet` with the results of the aggregate query.



This feature is available as new :meth:`QuerySet.aggregate()`` and

:meth:`QuerySet.annotate()`` methods, and is covered in detail in :ref:`the ORM