From 4d1c420e006bbb625873de49664e2b7c0f6ca78f Mon Sep 17 00:00:00 2001
From: jgeskens <jef.geskens@gmail.com>
Date: Sat, 18 May 2013 12:41:01 +0200
Subject: [PATCH 1/2] Add aggregate suggestion to distinct notes #19842

---
 docs/ref/models/querysets.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index ffada19..9d68cc7 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -368,6 +368,8 @@ query spans multiple tables, it's possible to get duplicate results when a
     otherwise duplicate rows appear to be distinct. Since the extra columns
     don't appear in the returned results (they are only there to support
     ordering), it sometimes looks like non-distinct results are being returned.
+    In this case, it may be possible to get distinct results using 
+    :meth:`aggregate` instead.
 
     Similarly, if you use a :meth:`values()` query to restrict the columns
     selected, the columns used in any :meth:`order_by()` (or default model
-- 
1.7.6.1


From 25e8e5ee81892af24749c7bedeaddab3d916c9ba Mon Sep 17 00:00:00 2001
From: jgeskens <jef.geskens@gmail.com>
Date: Sat, 18 May 2013 18:10:05 +0200
Subject: [PATCH 2/2] Fixed typo

---
 docs/ref/models/querysets.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 9d68cc7..287c1e4 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -369,7 +369,7 @@ query spans multiple tables, it's possible to get duplicate results when a
     don't appear in the returned results (they are only there to support
     ordering), it sometimes looks like non-distinct results are being returned.
     In this case, it may be possible to get distinct results using 
-    :meth:`aggregate` instead.
+    :meth:`annotate` instead.
 
     Similarly, if you use a :meth:`values()` query to restrict the columns
     selected, the columns used in any :meth:`order_by()` (or default model
-- 
1.7.6.1

