From 966a29c2b83fed2fc7c2b5b09de80cbebc94ac74 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Tue, 17 Mar 2015 07:42:53 -0700
Subject: Fixed #24479 -- Added system check to prevent both ordering and
 order_wrt.

---
 docs/ref/checks.txt   | 2 ++
 docs/releases/1.9.txt | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'docs')

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
 ^^^^
 
-- 
cgit v1.3