Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Tweaked SpatiaLite GeoDjango docs.

  • Loading branch information...
commit 26e0ba07aef4dcd6c57e1b03f2000c28672985e5 1 parent 3631db8
Ramiro Morales authored August 19, 2012
18  docs/ref/contrib/gis/install.txt
@@ -60,14 +60,14 @@ The geospatial libraries required for a GeoDjango installation depends
60 60
 on the spatial database used.  The following lists the library requirements,
61 61
 supported versions, and any notes for each of the supported database backends:
62 62
 
63  
-==================  ==============================  ==================  ==========================================================
  63
+==================  ==============================  ==================  =========================================
64 64
 Database            Library Requirements            Supported Versions  Notes
65  
-==================  ==============================  ==================  ==========================================================
  65
+==================  ==============================  ==================  =========================================
66 66
 PostgreSQL          GEOS, PROJ.4, PostGIS           8.1+                Requires PostGIS.
67 67
 MySQL               GEOS                            5.x                 Not OGC-compliant; limited functionality.
68 68
 Oracle              GEOS                            10.2, 11            XE not supported; not tested with 9.
69  
-SQLite              GEOS, GDAL, PROJ.4, SpatiaLite  3.6.+               Requires SpatiaLite 2.3+, pysqlite2 2.5+, and Django 1.1.
70  
-==================  ==============================  ==================  ==========================================================
  69
+SQLite              GEOS, GDAL, PROJ.4, SpatiaLite  3.6.+               Requires SpatiaLite 2.3+, pysqlite2 2.5+
  70
+==================  ==============================  ==================  =========================================
71 71
 
72 72
 .. _geospatial_libs:
73 73
 
@@ -467,8 +467,8 @@ pysqlite2
467 467
 ^^^^^^^^^
468 468
 
469 469
 Because SpatiaLite must be loaded as an external extension, it requires the
470  
-``enable_load_extension`` method, which is only available in versions 2.5+.
471  
-Thus, download pysqlite2 2.6, and untar::
  470
+``enable_load_extension`` method, which is only available in versions 2.5+ of
  471
+pysqlite2. Thus, download pysqlite2 2.6, and untar::
472 472
 
473 473
     $ wget http://pysqlite.googlecode.com/files/pysqlite-2.6.0.tar.gz
474 474
     $ tar xzf pysqlite-2.6.0.tar.gz
@@ -583,7 +583,7 @@ After you've installed SpatiaLite, you'll need to create a number of spatial
583 583
 metadata tables in your database in order to perform spatial queries.
584 584
 
585 585
 If you're using SpatiaLite 3.0 or newer, use the ``spatialite`` utility to
586  
-call the ``InitSpatiaMetaData()`` function, like this::
  586
+call the ``InitSpatialMetaData()`` function, like this::
587 587
 
588 588
    $ spatialite geodjango.db "SELECT InitSpatialMetaData();"
589 589
    the SPATIAL_REF_SYS table already contains some row(s)
@@ -643,10 +643,6 @@ Invoke the Django shell from your project and execute the
643 643
     >>> from django.contrib.gis.utils import add_srs_entry
644 644
     >>> add_srs_entry(900913)
645 645
 
646  
-.. note::
647  
-
648  
-    In Django 1.1 the name of this function is ``add_postgis_srs``.
649  
-
650 646
 This adds an entry for the 900913 SRID to the ``spatial_ref_sys`` (or equivalent)
651 647
 table, making it possible for the spatial database to transform coordinates in
652 648
 this projection.  You only need to execute this command *once* per spatial database.
3  docs/ref/contrib/gis/testing.txt
@@ -121,7 +121,8 @@ Settings
121 121
 
122 122
 Only relevant when using a SpatiaLite version older than 3.0.
123 123
 
124  
-By default, the GeoDjango test runner looks for the SpatiaLite SQL in the
  124
+By default, the GeoDjango test runner looks for the :ref:`file containing the
  125
+SpatiaLite dababase-initialization SQL code <create_spatialite_db>` in the
125 126
 same directory where it was invoked (by default the same directory where
126 127
 ``manage.py`` is located). To use a different location, add the following to
127 128
 your settings::

0 notes on commit 26e0ba0

Please sign in to comment.
Something went wrong with that request. Please try again.