summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-01-15 23:15:32 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-01-15 23:15:32 +0000
commitb3dd0b5dccc7f9c230fd0b78cbf60483b010bc3e (patch)
tree052d005c24ae9a3b7e3292e49b406b5e8dd5f753 /docs
parentbf710bd005688e0d6615ec758124b0f914741b51 (diff)
Fixed #10039 -- More typos in aggregation docs. Seriously, people, now you're just making me look bad :-) Thanks to ElliottM, and to Erich Holscher for a separate report that I've piggybacked on this checkin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/db/aggregation.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt
index 45eb16ddbf..41832743bc 100644
--- a/docs/topics/db/aggregation.txt
+++ b/docs/topics/db/aggregation.txt
@@ -105,7 +105,7 @@ When an ``annotate()`` clause is specified, each object in the ``QuerySet``
will be annotated with the specified values.
The syntax for these annotations is identical to that used for the
-``aggregate()`` clause. Each argument to ``annotate()`` describes and
+``aggregate()`` clause. Each argument to ``annotate()`` describes an
aggregate that is to be calculated. For example, to annotate Books with
the number of authors::
@@ -155,7 +155,7 @@ related value.
For example, to find the price range of books offered in each store,
you could use the annotation::
- >>> Store.objects.annotate(min_price=Min('books__price'), max_price=Min('books__price'))
+ >>> Store.objects.annotate(min_price=Min('books__price'), max_price=Max('books__price'))
This tells Django to retrieve the Store model, join (through the
many-to-many relationship) with the Book model, and aggregate on the