Refs #29548 -- Doc'd MariaDB support for GIS database functions.

2 files changed, 44 insertions, 44 deletions

diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index d158f274b8..14c0d9522f 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -356,40 +356,40 @@ functions are available on each spatial backend.
 
 .. currentmodule:: django.contrib.gis.db.models.functions
 
-====================================  =======  ==============  ===========  ==========
-Function                              PostGIS  Oracle          MySQL        SpatiaLite
-====================================  =======  ==============  ===========  ==========
-:class:`Area`                         X        X               X            X
-:class:`AsGeoJSON`                    X                        X (≥ 5.7.5)  X
-:class:`AsGML`                        X        X                            X
-:class:`AsKML`                        X                                     X
-:class:`AsSVG`                        X                                     X
-:class:`Azimuth`                      X                                     X (LWGEOM)
+====================================  =======  ============== ============ =========== ==========
+Function                              PostGIS  Oracle         MariaDB      MySQL       SpatiaLite
+====================================  =======  ============== ============ =========== ==========
+:class:`Area`                         X        X              X            X           X
+:class:`AsGeoJSON`                    X                       X (≥ 10.2.4) X (≥ 5.7.5) X
+:class:`AsGML`                        X        X                                       X
+:class:`AsKML`                        X                                                X
+:class:`AsSVG`                        X                                                X
+:class:`Azimuth`                      X                                                X (LWGEOM)
 :class:`BoundingCircle`               X        X
-:class:`Centroid`                     X        X               X            X
-:class:`Difference`                   X        X               X            X
-:class:`Distance`                     X        X               X            X
-:class:`Envelope`                     X        X               X            X
-:class:`ForcePolygonCW`               X                                     X
-:class:`GeoHash`                      X                        X (≥ 5.7.5)  X (LWGEOM)
-:class:`Intersection`                 X        X               X            X
-:class:`IsValid`                      X        X               X (≥ 5.7.5)  X (LWGEOM)
-:class:`Length`                       X        X               X            X
-:class:`LineLocatePoint`              X                                     X
-:class:`MakeValid`                    X                                     X (LWGEOM)
+:class:`Centroid`                     X        X              X            X           X
+:class:`Difference`                   X        X              X            X           X
+:class:`Distance`                     X        X              X            X           X
+:class:`Envelope`                     X        X              X            X           X
+:class:`ForcePolygonCW`               X                                                X
+:class:`GeoHash`                      X                                    X (≥ 5.7.5) X (LWGEOM)
+:class:`Intersection`                 X        X              X            X           X
+:class:`IsValid`                      X        X                           X (≥ 5.7.5) X (LWGEOM)
+:class:`Length`                       X        X              X            X           X
+:class:`LineLocatePoint`              X                                                X
+:class:`MakeValid`                    X                                                X (LWGEOM)
 :class:`MemSize`                      X
-:class:`NumGeometries`                X        X               X            X
-:class:`NumPoints`                    X        X               X            X
-:class:`Perimeter`                    X        X                            X
-:class:`PointOnSurface`               X        X                            X
-:class:`Reverse`                      X        X                            X
-:class:`Scale`                        X                                     X
-:class:`SnapToGrid`                   X                                     X
-:class:`SymDifference`                X        X               X            X
-:class:`Transform`                    X        X                            X
-:class:`Translate`                    X                                     X
-:class:`Union`                        X        X               X            X
-====================================  =======  ==============  ===========  ==========
+:class:`NumGeometries`                X        X              X            X           X
+:class:`NumPoints`                    X        X              X            X           X
+:class:`Perimeter`                    X        X                                       X
+:class:`PointOnSurface`               X        X              X                        X
+:class:`Reverse`                      X        X                                       X
+:class:`Scale`                        X                                                X
+:class:`SnapToGrid`                   X                                                X
+:class:`SymDifference`                X        X              X            X           X
+:class:`Transform`                    X        X                                       X
+:class:`Translate`                    X                                                X
+:class:`Union`                        X        X              X            X           X
+====================================  =======  ============== ============ =========== ==========
 
 Aggregate Functions
 -------------------
diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
index 15434fdd6c..0f50344ea4 100644
--- a/docs/ref/contrib/gis/functions.txt
+++ b/docs/ref/contrib/gis/functions.txt
@@ -37,7 +37,7 @@ Measurement                Relationships             Operations              Edi
 
 .. class:: Area(expression, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-polygon-property-functions.html#function_area>`__,
 Oracle, `PostGIS <https://postgis.net/docs/ST_Area.html>`__, SpatiaLite
 
@@ -52,7 +52,7 @@ geographic SRSes.
 
 .. class:: AsGeoJSON(expression, bbox=False, crs=False, precision=8, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB (≥ 10.2.4), `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-geojson-functions.html#function_st-asgeojson>`__ (≥ 5.7.5),
 `PostGIS <https://postgis.net/docs/ST_AsGeoJSON.html>`__, SpatiaLite
 
@@ -194,7 +194,7 @@ The ``num_seg`` parameter is used only on PostGIS.
 
 .. class:: Centroid(expression, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-polygon-property-functions.html#function_st-centroid>`__,
 `PostGIS <https://postgis.net/docs/ST_Centroid.html>`__, Oracle, SpatiaLite
 
@@ -206,7 +206,7 @@ value of the geometry.
 
 .. class:: Difference(expr1, expr2, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-operator-functions.html#function_st-difference>`__,
 `PostGIS <https://postgis.net/docs/ST_Difference.html>`__, Oracle, SpatiaLite
 
@@ -219,7 +219,7 @@ geometry B.
 
 .. class:: Distance(expr1, expr2, spheroid=None, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-relation-functions-object-shapes.html#function_st-distance>`__,
 `PostGIS <https://postgis.net/docs/ST_Distance.html>`__, Oracle, SpatiaLite
 
@@ -265,7 +265,7 @@ queryset is calculated::
 
 .. class:: Envelope(expression, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-general-property-functions.html#function_st-envelope>`__,
 `Oracle <https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
 SDO_GEOM-reference.html#GUID-646638D0-2C5F-490A-AF63-DE9B7A4C97C1__CHDJCEIH>`__,
@@ -326,7 +326,7 @@ it provides index-assisted nearest-neighbor result sets.
 
 .. class:: Intersection(expr1, expr2, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-operator-functions.html#function_st-intersection>`__,
 `PostGIS <https://postgis.net/docs/ST_Intersection.html>`__, Oracle, SpatiaLite
 
@@ -350,7 +350,7 @@ Returns ``True`` if its value is a valid geometry and ``False`` otherwise.
 
 .. class:: Length(expression, spheroid=True, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-linestring-property-functions.html#function_st-length>`__,
 Oracle, `PostGIS <https://postgis.net/docs/ST_Length.html>`__, SpatiaLite
 
@@ -404,7 +404,7 @@ Accepts a single geographic field or expression and returns the memory size
 
 .. class:: NumGeometries(expression, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-geometrycollection-property-functions.html#function_st-numgeometries>`__,
 `PostGIS <https://postgis.net/docs/ST_NumGeometries.html>`__, Oracle,
 SpatiaLite
@@ -420,7 +420,7 @@ On MySQL, returns ``None`` for single geometries.
 
 .. class:: NumPoints(expression, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-linestring-property-functions.html#function_st-numpoints>`__,
 `PostGIS <https://postgis.net/docs/ST_NPoints.html>`__, Oracle, SpatiaLite
 
@@ -499,7 +499,7 @@ Number of Arguments  Description
 
 .. class:: SymDifference(expr1, expr2, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-operator-functions.html#function_st-symdifference>`__,
 `PostGIS <https://postgis.net/docs/ST_SymDifference.html>`__, Oracle,
 SpatiaLite
@@ -543,7 +543,7 @@ parameters.
 
 .. class:: Union(expr1, expr2, **extra)
 
-*Availability*: `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-operator-functions.html#function_st-union>`__,
 `PostGIS <https://postgis.net/docs/ST_Union.html>`__, Oracle, SpatiaLite