summaryrefslogtreecommitdiff
path: root/docs/ref/contrib
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2011-09-09 17:14:47 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2011-09-09 17:14:47 +0000
commitd036b87126eadb3d76a4e4c5daea1bfb767db912 (patch)
tree07d4cad828482c0ac7a7f4221cdd70439ef2a748 /docs/ref/contrib
parent4584069c8aa43a10bef8d0711fc4451599bb4dcf (diff)
Remove no-longer-valid references to the DATABASE_* settings, the legacy code for them was already removed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/contrib')
-rw-r--r--docs/ref/contrib/gis/db-api.txt24
-rw-r--r--docs/ref/contrib/gis/install.txt2
2 files changed, 1 insertions, 25 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index fbced8e6e1..9bd5eccf14 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -23,30 +23,6 @@ its functionality into full-fledged spatial database backends:
* :mod:`django.contrib.gis.db.backends.oracle`
* :mod:`django.contrib.gis.db.backends.spatialite`
-Database Settings Backwards-Compatibility
------------------------------------------
-
-In :doc:`Django 1.2 </releases/1.2>`, the way
-to :ref:`specify databases <specifying-databases>` in your settings was changed.
-The old database settings format (e.g., the ``DATABASE_*`` settings)
-is backwards compatible with GeoDjango, and will automatically use the
-appropriate spatial backend as long as :mod:`django.contrib.gis` is in
-your :setting:`INSTALLED_APPS`. For example, if you have the following in
-your settings::
-
- DATABASE_ENGINE='postgresql_psycopg2'
-
- ...
-
- INSTALLED_APPS = (
- ...
- 'django.contrib.gis',
- ...
- )
-
-Then, :mod:`django.contrib.gis.db.backends.postgis` is automatically used as your
-spatial backend.
-
.. _mysql-spatial-limitations:
MySQL Spatial Limitations
diff --git a/docs/ref/contrib/gis/install.txt b/docs/ref/contrib/gis/install.txt
index f15b55499e..caaeb013be 100644
--- a/docs/ref/contrib/gis/install.txt
+++ b/docs/ref/contrib/gis/install.txt
@@ -573,7 +573,7 @@ Now, the ``spatialite`` command can be used to initialize a spatial database::
.. note::
The parameter ``geodjango.db`` is the *filename* of the SQLite database
- you want to use. Use the same in the :setting:`DATABASE_NAME`
+ you want to use. Use the same in the :setting:`DATABASES` ``"name"`` key
inside your ``settings.py``.