summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/releases/1.10.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 9b2304137d..97534185b2 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -160,6 +160,9 @@ details on these changes.
* The ``django.contrib.gis.utils.precision_wkt()`` function will be removed.
+* In multi-table inheritance, implicit promotion of a ``OneToOneField`` to a
+ ``parent_link`` will be removed.
+
.. _deprecation-removed-in-1.10:
1.10
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index e63b3bf42b..137fe9720e 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -980,6 +980,9 @@ Miscellaneous
favor of class-based views :class:`~django.views.i18n.JavaScriptCatalog`
and :class:`~django.views.i18n.JSONCatalog`.
+* In multi-table inheritance, implicit promotion of a ``OneToOneField`` to a
+ ``parent_link`` is deprecated. Add ``parent_link=True`` to such fields.
+
.. _removed-features-1.10:
Features removed in 1.10