From a4df6577df57e72858c7ebe86373f14ee30d5503 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 25 Jul 2016 06:21:39 -0400
Subject: [PATCH] [1.10.x] Fixed #26925 -- Linked aggregation ordering topic
from Meta.ordering docs.
Backport of 3aaf6cf0f3288986c4ce56defea26420f8a48534 from master
---
docs/ref/models/options.txt | 3 +++
docs/topics/db/aggregation.txt | 2 ++
2 files changed, 5 insertions(+)
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index e240a4e1e6..57519ddd8e 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -302,6 +302,9 @@ Django quotes column and table names behind the scenes.
ordering = ['-pub_date', 'author']
+ Default ordering also affects :ref:`aggregation queries
+ <aggregation-ordering-interaction>`.
+
.. warning::
Ordering is not a free operation. Each field you add to the ordering
diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt
index 47563338d6..aa56a8b4eb 100644
--- a/docs/topics/db/aggregation.txt
+++ b/docs/topics/db/aggregation.txt
@@ -479,6 +479,8 @@ will be automatically added to the result set. However, if the ``values()``
clause is applied after the ``annotate()`` clause, you need to explicitly
include the aggregate column.
+.. _aggregation-ordering-interaction:
+
Interaction with default ordering or ``order_by()``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~