summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-02-24 16:15:36 -0500
committerTim Graham <timograham@gmail.com>2017-02-24 16:16:24 -0500
commite298ec4e947c3d300f4ef21019e59f4bc05ceabf (patch)
treecf2759011c1c0e45d5418d791370bcb386851ac4
parenteff483ff3209b09dbcfbb4a8a137825186c267b1 (diff)
downloaddjango-e298ec4e947c3d300f4ef21019e59f4bc05ceabf.tar.gz
[1.10.x] Fixed #27875 -- Doc'd manager_inheritance_from_future in manager docs.
Backport of 22eb15a18c16b93496f6e88ebe3a306daad492b1 from stable/1.11.x
-rw-r--r--docs/topics/db/managers.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/topics/db/managers.txt b/docs/topics/db/managers.txt
index 2867db02d9..28eb32fbd6 100644
--- a/docs/topics/db/managers.txt
+++ b/docs/topics/db/managers.txt
@@ -369,8 +369,10 @@ Here's how Django handles custom managers and :ref:`model inheritance
.. versionchanged:: 1.10
- In older versions, manager inheritance varied depending on the type of
- model inheritance (i.e. :ref:`abstract-base-classes`,
+ Some inheritance behaviors described above don't apply unless you set
+ ``manager_inheritance_from_future = True`` on the model's ``Meta`` class.
+ In older versions and if you don't set that attribute, manager inheritance
+ varies depending on the type of model inheritance (:ref:`abstract-base-classes`,
:ref:`multi-table-inheritance`, or :ref:`proxy-models`), especially
with regards to electing the default manager.