summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-02-06 19:25:04 +0100
committerGitHub <noreply@github.com>2019-02-06 19:25:04 +0100
commit21bb71ef0dcb86798edb0d8b21138bcc4b947590 (patch)
tree4cb610f1c9e05f39f140bc2faf31e0f10270b0e4 /docs
parent10b0fd15763a8f4ac08633f7b4c091d6340faf3a (diff)
Fixed #30157 -- Dropped support for Oracle 12.1.
Thanks Tim Graham for the review.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/install/index.txt2
-rw-r--r--docs/ref/databases.txt2
-rw-r--r--docs/releases/3.0.txt6
3 files changed, 8 insertions, 2 deletions
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index be4f036d40..7adf85c8ce 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -60,7 +60,7 @@ Database Library Requirements Supported Versions Notes
================== ============================== ================== =========================================
PostgreSQL GEOS, GDAL, PROJ.4, PostGIS 9.5+ Requires PostGIS.
MySQL GEOS, GDAL 5.6+ Not OGC-compliant; :ref:`limited functionality <mysql-spatial-limitations>`.
-Oracle GEOS, GDAL 12.1+ XE not supported.
+Oracle GEOS, GDAL 12.2+ XE not supported.
SQLite GEOS, GDAL, PROJ.4, SpatiaLite 3.8.3+ Requires SpatiaLite 4.3+
================== ============================== ================== =========================================
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index d8f0257617..97e354fad9 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -730,7 +730,7 @@ iterator. Your code must handle this.
Oracle notes
============
-Django supports `Oracle Database Server`_ versions 12.1 and higher. Version
+Django supports `Oracle Database Server`_ versions 12.2 and higher. Version
6.0 or higher of the `cx_Oracle`_ Python driver is required.
.. _`Oracle Database Server`: https://www.oracle.com/
diff --git a/docs/releases/3.0.txt b/docs/releases/3.0.txt
index a657a4b0a0..eb02f19121 100644
--- a/docs/releases/3.0.txt
+++ b/docs/releases/3.0.txt
@@ -235,6 +235,12 @@ Dropped support for PostgreSQL 9.4
Upstream support for PostgreSQL 9.4 ends in December 2019. Django 3.0 supports
PostgreSQL 9.5 and higher.
+Dropped support for Oracle 12.1
+-------------------------------
+
+Upstream support for Oracle 12.1 ends in July 2021. Django 2.2 will be
+supported until April 2022. Django 3.0 officially supports Oracle 12.2 and 18c.
+
Removed private Python 2 compatibility APIs
-------------------------------------------