summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-08-01 12:53:18 -0400
committerTim Graham <timograham@gmail.com>2014-08-01 19:32:00 -0400
commit8f9d6e83a005901bc2a368a28017ee52a8c081f8 (patch)
tree0cdd6b7269cb380cb1ddf41acd357e75f12d5a7d /docs/ref
parenta2479f46f3d05b37254ad701b6b76f84624d3cb5 (diff)
Fixed #23145 -- Dropped support for Oracle < 11.1
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/gis/install/index.txt2
-rw-r--r--docs/ref/databases.txt7
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index d96dbe80e9..8b7f9a0cf4 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -63,7 +63,7 @@ Database Library Requirements Supported Versions Notes
================== ============================== ================== =========================================
PostgreSQL GEOS, PROJ.4, PostGIS 9.0+ Requires PostGIS.
MySQL GEOS 5.x Not OGC-compliant; :ref:`limited functionality <mysql-spatial-limitations>`.
-Oracle GEOS 10.2, 11 XE not supported; not tested with 9.
+Oracle GEOS 11.1+ XE not supported.
SQLite GEOS, GDAL, PROJ.4, SpatiaLite 3.6.+ Requires SpatiaLite 2.3+, pysqlite2 2.5+
================== ============================== ================== =========================================
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 8fae1138fe..a4d5eb2deb 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -695,10 +695,9 @@ you add quotes where necessary before copying a query into an SQLite shell.
Oracle notes
============
-Django supports `Oracle Database Server`_ versions 9i and
-higher. Oracle version 10g or later is required to use Django's
-``regex`` and ``iregex`` query operators. You will also need at least
-version 4.3.1 of the `cx_Oracle`_ Python driver.
+Django supports `Oracle Database Server`_ versions 11.1 and higher. Version
+4.3.1 or higher of the `cx_Oracle`_ Python driver is required, although we
+recommend version 5.1.3 or later as these versions support Python 3.
Note that due to a Unicode-corruption bug in ``cx_Oracle`` 5.0, that
version of the driver should **not** be used with Django;