summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt2
-rw-r--r--docs/releases/1.8.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index cc1495efee..c2d92fd866 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -250,7 +250,7 @@ details on these changes.
will be removed.
* ``GeoQuerySet`` aggregate methods ``collect()``, ``extent()``, ``extent3d()``,
- ``makeline()``, and ``union()`` will be removed.
+ ``make_line()``, and ``unionagg()`` will be removed.
* Ability to specify ``ContentType.name`` when creating a content type instance
will be removed.
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 59fd064288..a6fa2785fc 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -1672,10 +1672,10 @@ will be removed in Django 1.10.
``GeoQuerySet`` aggregate methods
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ``collect()``, ``extent()``, ``extent3d()``, ``makeline()``, and ``union()``
-aggregate methods are deprecated and should be replaced by their function-based
-aggregate equivalents (``Collect``, ``Extent``, ``Extent3D``, ``MakeLine``, and
-``Union``).
+The ``collect()``, ``extent()``, ``extent3d()``, ``make_line()``, and
+``unionagg()`` aggregate methods are deprecated and should be replaced by their
+function-based aggregate equivalents (``Collect``, ``Extent``, ``Extent3D``,
+``MakeLine``, and ``Union``).
.. _deprecated-signature-of-allow-migrate: