diff options
| author | Tim Graham <timograham@gmail.com> | 2015-09-02 19:57:08 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-02 19:59:27 -0400 |
| commit | 6acf0df86255ef4d2097f24cbfa39fdb44de19e3 (patch) | |
| tree | 0411251a2da6fd6a4ceef12ce6947a3bb5252bcd /docs | |
| parent | 2b08b364889d47502a121cd07c69937b94003904 (diff) | |
[1.8.x] Refs #24152 -- Fixed typos in deprecated GeoQuerySet aggregate names.
Backport of a8eb715b663ff836e54f04c0e4fcafa2ee468b4e from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.8.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 7374029256..ab8e58c515 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -163,7 +163,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 9f91d46340..3200e81f46 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: |