summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geoquerysets.txt4
-rw-r--r--docs/ref/contrib/gis/install/geolibs.txt8
-rw-r--r--docs/ref/contrib/gis/install/spatialite.txt4
-rw-r--r--docs/ref/contrib/gis/model-api.txt2
-rw-r--r--docs/releases/1.5.2.txt2
-rw-r--r--docs/releases/1.8.txt4
6 files changed, 12 insertions, 12 deletions
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 1c9d13df85..7d2bcbdd6e 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1329,7 +1329,7 @@ Example::
.. class:: Collect(geo_field)
-*Availability*: PostGIS, Spatialite
+*Availability*: PostGIS, SpatiaLite
Returns a ``GEOMETRYCOLLECTION`` or a ``MULTI`` geometry object from the geometry
column. This is analogous to a simplified version of the :class:`Union`
@@ -1342,7 +1342,7 @@ not caring about dissolving boundaries.
.. class:: Extent(geo_field)
-*Availability*: PostGIS, Oracle, Spatialite
+*Availability*: PostGIS, Oracle, SpatiaLite
Returns the extent of all ``geo_field`` in the ``QuerySet`` as a four-tuple,
comprising the lower left coordinate and the upper right coordinate.
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 8598fcaca2..98b907e657 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -37,10 +37,10 @@ totally fine with GeoDjango. Your mileage may vary.
GDAL 2.1.0 2016-04
PostGIS 2.1.0 2013-08-17
PostGIS 2.2.0 2015-10-17
- Spatialite 4.0.0 2012-11-25
- Spatialite 4.1.0 2013-06-04
- Spatialite 4.2.0 2014-07-25
- Spatialite 4.3.0 2015-09-07
+ SpatiaLite 4.0.0 2012-11-25
+ SpatiaLite 4.1.0 2013-06-04
+ SpatiaLite 4.2.0 2014-07-25
+ SpatiaLite 4.3.0 2015-09-07
.. note::
diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt
index 13735d6d43..dd1dc5dddb 100644
--- a/docs/ref/contrib/gis/install/spatialite.txt
+++ b/docs/ref/contrib/gis/install/spatialite.txt
@@ -1,11 +1,11 @@
=====================
-Installing Spatialite
+Installing SpatiaLite
=====================
`SpatiaLite`__ adds spatial support to SQLite, turning it into a full-featured
spatial database.
-First, check if you can install Spatialite from system packages or binaries.
+First, check if you can install SpatiaLite from system packages or binaries.
For example, on Debian-based distributions, try to install the
``spatialite-bin`` package. For distributions that package SpatiaLite 4.2+,
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 99688c2a0a..743fda8590 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -115,7 +115,7 @@ a flat surface is a straight line, the shortest path between two points on a cur
surface (such as the earth) is an *arc* of a `great circle`__. [#fnthematic]_ Thus,
additional computation is required to obtain distances in planar units (e.g.,
kilometers and miles). Using a geographic coordinate system may introduce
-complications for the developer later on. For example, Spatialite does not have
+complications for the developer later on. For example, SpatiaLite does not have
the capability to perform distance calculations between geometries using
geographic coordinate systems, e.g. constructing a query to find all points
within 5 miles of a county boundary stored as WGS84.
diff --git a/docs/releases/1.5.2.txt b/docs/releases/1.5.2.txt
index 22a415274a..9a53ced78c 100644
--- a/docs/releases/1.5.2.txt
+++ b/docs/releases/1.5.2.txt
@@ -49,7 +49,7 @@ Bugfixes
exceptions recursed infinitely (#20278).
* :djadmin:`makemessages` no longer crashes with ``UnicodeDecodeError``
(#20354).
-* Fixed ``geojson`` detection with Spatialite.
+* Fixed ``geojson`` detection with SpatiaLite.
* :meth:`~django.test.SimpleTestCase.assertContains` once again works with
binary content (#20237).
* Fixed :class:`~django.db.models.ManyToManyField` if it has a unicode ``name``
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index a9732af208..d0f115db6e 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -225,10 +225,10 @@ Minor features
* It is now allowed to include a subquery as a geographic lookup argument, for
example ``City.objects.filter(point__within=Country.objects.filter(continent='Africa').values('mpoly'))``.
-* The Spatialite backend now supports ``Collect`` and ``Extent`` aggregates
+* The SpatiaLite backend now supports ``Collect`` and ``Extent`` aggregates
when the database version is 3.0 or later.
-* The PostGIS 2 ``CREATE EXTENSION postgis`` and the Spatialite
+* The PostGIS 2 ``CREATE EXTENSION postgis`` and the SpatiaLite
``SELECT InitSpatialMetaData`` initialization commands are now automatically
run by :djadmin:`migrate`.