From 452847a6591596313b29b8cf290216047980ea30 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Thu, 31 Aug 2006 04:08:25 +0000
Subject: [PATCH] Fixed #2609 -- Improved docs/sites.txt CurrentSiteManager to
 explain gotcha with models.Manager

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/sites.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/sites.txt b/docs/sites.txt
index cca9f14f31..8c5f1fc64b 100644
--- a/docs/sites.txt
+++ b/docs/sites.txt
@@ -266,7 +266,18 @@ this::
 If you attempt to use ``CurrentSiteManager`` and pass a field name that doesn't
 exist, Django will raise a ``ValueError``.
 
+Finally, note that you'll probably want to keep a normal (non-site-specific)
+``Manager`` on your model, even if you use ``CurrentSiteManager``. As explained
+in the `manager documentation`_, if you define a manager manually, then Django
+won't create the automatic ``objects = models.Manager()`` manager for you.
+Also, note that certain parts of Django -- namely, the Django admin site and
+generic views -- use whichever manager is defined *first* in the model, so if
+you want your admin site to have access to all objects (not just site-specific
+ones), put ``objects = models.Manager()`` in your model, before you define
+``CurrentSiteManager``.
+
 .. _manager: http://www.djangoproject.com/documentation/model_api/#managers
+.. _manager documentation: http://www.djangoproject.com/documentation/model_api/#managers
 
 How Django uses the sites framework
 ===================================