From e9f1f5046147fc0d1a9f3a24bfa6607ef0742e80 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Sun, 14 Oct 2007 02:13:13 +0000
Subject: [PATCH] queryset-refactor: Re-added a docs change that was
 accidentally lost in the merge in [6466].

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/db-api.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/db-api.txt b/docs/db-api.txt
index adca8b4d5c..518e170407 100644
--- a/docs/db-api.txt
+++ b/docs/db-api.txt
@@ -1371,6 +1371,11 @@ equivalent::
     Entry.objects.filter(blog__id=3) # __exact is implied
     Entry.objects.filter(blog__pk=3) # __pk implies __id__exact
 
+.. note::
+    Because of this shortcut, you cannot have a field called ``pk`` that is not
+    the primary key of the model. It will always be replaced by the name of the
+    model's primary key in queries.
+
 Lookups that span relationships
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~