summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/checks.txt2
-rw-r--r--docs/releases/1.9.txt3
2 files changed, 5 insertions, 0 deletions
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index 9ba3c492f7..eb6fa688a2 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -63,6 +63,8 @@ Models
``<M2M field>``. Maximum length is ``<maximum length>`` for database
``<alias>``.
* **models.E020**: The ``<model>.check()`` class method is currently overridden.
+* **models.E021**: ``ordering`` and ``order_with_respect_to`` cannot be used
+ together.
Fields
~~~~~~
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 6ec8a3f455..3fa068c97f 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -164,6 +164,9 @@ Models
<django.db.models.Model.delete>` to allow deleting only a child's data in a
model that uses multi-table inheritance.
+* Added a system check to prevent defining both ``Meta.ordering`` and
+ ``order_with_respect_to`` on the same model.
+
CSRF
^^^^