From 9e6d32eddeb11cfaf9b817f105633a3f3779a80c Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 3 Mar 2009 01:44:26 +0000 Subject: [PATCH] [1.0.X] Minor update to documentation for many-to-many filter() calls. Removed a potential ambiguity when describing how multiple conditions in one filter() call are handled. Backport of r9958 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9959 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/topics/db/queries.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt index 43daff4a3e..25308fc0f4 100644 --- a/docs/topics/db/queries.txt +++ b/docs/topics/db/queries.txt @@ -460,8 +460,9 @@ the primary model, not necessarily those objects that were selected by an earlier ``filter()`` call. That may sound a bit confusing, so hopefully an example will clarify. To -select all blogs that contains entries with *"Lennon"* in the headline and -were published in 2008, we would write:: +select all blogs that contain entries with both *"Lennon"* in the headline +and that were published in 2008 (the same entry satisfying both conditions), +we would write:: Blog.objects.filter(entry__headline__contains='Lennon', entry__pub_date__year=2008)