summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2018-11-24 01:36:18 -0500
committerTim Graham <timograham@gmail.com>2018-11-27 09:22:24 -0500
commit9a7d336c3866c5226ed11868be0234c7e2fa47fa (patch)
tree7c295de7327af3ca28a1bbb5ab955f315cf2bbe8 /docs
parent193c109327c5216cab1d4eed6bfdff24629b09a3 (diff)
Corrected Aggregate docs to reflect that it accepts multiple expressions.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/expressions.txt8
-rw-r--r--docs/ref/models/querysets.txt6
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt
index 2f2629cc69..7a358a5ce8 100644
--- a/docs/ref/models/expressions.txt
+++ b/docs/ref/models/expressions.txt
@@ -373,7 +373,7 @@ some complex computations::
The ``Aggregate`` API is as follows:
-.. class:: Aggregate(expression, output_field=None, filter=None, **extra)
+.. class:: Aggregate(*expressions, output_field=None, filter=None, **extra)
.. attribute:: template
@@ -392,9 +392,9 @@ The ``Aggregate`` API is as follows:
Defaults to ``True`` since most aggregate functions can be used as the
source expression in :class:`~django.db.models.expressions.Window`.
-The ``expression`` argument can be the name of a field on the model, or another
-expression. It will be converted to a string and used as the ``expressions``
-placeholder within the ``template``.
+The ``expressions`` positional arguments can include expressions or the names
+of model fields. They will be converted to a string and used as the
+``expressions`` placeholder within the ``template``.
The ``output_field`` argument requires a model field instance, like
``IntegerField()`` or ``BooleanField()``, into which Django will load the value
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index d24ac8a859..6492ba8685 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -3297,10 +3297,10 @@ documentation to learn how to create your aggregates.
All aggregates have the following parameters in common:
-``expression``
-~~~~~~~~~~~~~~
+``expressions``
+~~~~~~~~~~~~~~~
-A string that references a field on the model, or a :doc:`query expression
+Strings that reference fields on the model, or :doc:`query expressions
</ref/models/expressions>`.
``output_field``