summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/querysets.txt5
-rw-r--r--docs/releases/2.2.txt6
2 files changed, 6 insertions, 5 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index a80528220c..3ddd516eaf 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -3419,12 +3419,13 @@ by the aggregate.
``Variance``
~~~~~~~~~~~~
-.. class:: Variance(expression, sample=False, filter=None, **extra)
+.. class:: Variance(expression, output_field=None, sample=False, filter=None, **extra)
Returns the variance of the data in the provided expression.
* Default alias: ``<field>__variance``
- * Return type: ``float``
+ * Return type: ``float`` if input is ``int``, otherwise same as input
+ field, or ``output_field`` if supplied
Has one optional argument:
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 7323fd6e42..5d1333ad95 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -493,9 +493,9 @@ Miscellaneous
* :djadmin:`runserver` no longer supports `pyinotify` (replaced by Watchman).
-* The :class:`~django.db.models.Avg` and :class:`~django.db.models.StdDev`
- aggregate functions now return a ``Decimal`` instead of a ``float`` when the
- input is ``Decimal``.
+* The :class:`~django.db.models.Avg`, :class:`~django.db.models.StdDev`, and
+ :class:`~django.db.models.Variance` aggregate functions now return a
+ ``Decimal`` instead of a ``float`` when the input is ``Decimal``.
.. _deprecated-features-2.2: