summaryrefslogtreecommitdiff
path: root/docs/ref/contrib
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-08-02 10:27:01 -0400
committerTim Graham <timograham@gmail.com>2014-08-02 10:27:26 -0400
commit2ff2809c73e2b88c7ca8c236c48211b0570406f2 (patch)
tree05c056e0c09f5093972e94585e47d60e2c156bc2 /docs/ref/contrib
parent893f188386cf156ce90cafbc136e335da16f8247 (diff)
[1.7.x] Updated MySQL links to version 5.6.
Backport of fb4f3e04b1 from master
Diffstat (limited to 'docs/ref/contrib')
-rw-r--r--docs/ref/contrib/gis/db-api.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index be413c9df8..00eac2d5be 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -29,7 +29,8 @@ MySQL Spatial Limitations
MySQL's spatial extensions only support bounding box operations
(what MySQL calls minimum bounding rectangles, or MBR). Specifically,
-`MySQL does not conform to the OGC standard <http://dev.mysql.com/doc/refman/5.1/en/functions-for-testing-spatial-relations-between-geometric-objects.html>`_:
+`MySQL does not conform to the OGC standard
+<http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions.html>`_:
Currently, MySQL does not implement these functions
[``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``,
@@ -52,6 +53,7 @@ on a different spatial backend.
Creating and Saving Geographic Models
=====================================
+
Here is an example of how to create a geometry object (assuming the ``Zipcode``
model)::
@@ -313,8 +315,8 @@ Method PostGIS Oracle SpatiaLite
.. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <http://geojson.org/geojson-spec.html>`_, Revision 1.0 (June 16, 2008).
.. [#fndistsphere14] *See* `PostGIS 1.4 documentation <http://postgis.refractions.net/documentation/manual-1.4/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
.. [#fndistsphere15] *See* `PostGIS 1.5 documentation <http://postgis.refractions.net/documentation/manual-1.5/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
-.. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.1/en/creating-spatial-indexes.html>`_
- in the MySQL 5.1 Reference Manual:
+.. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_
+ in the MySQL Reference Manual:
For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage
engines that support nonspatial indexing of spatial columns, the engine