summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-01-28 08:19:47 -0500
committerGitHub <noreply@github.com>2017-01-28 08:19:47 -0500
commit0de0699d94ccd078c83eadef296a0d9ccd65a62f (patch)
tree920b38dbe28f0110743a799078e648735ff3e1cf /docs
parenta6755b29e9335723c9347a36d4000a3157b05441 (diff)
Fixed #27788 -- Dropped support for Oracle < 12.1.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/db-api.txt2
-rw-r--r--docs/ref/contrib/gis/functions.txt2
-rw-r--r--docs/ref/databases.txt2
-rw-r--r--docs/releases/2.0.txt7
4 files changed, 10 insertions, 3 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index daa32d75ec..768c478835 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -376,7 +376,7 @@ Function PostGIS Oracle MySQL Spat
:class:`AsGML` X X X
:class:`AsKML` X X
:class:`AsSVG` X X
-:class:`BoundingCircle` X X (≥ 12.1.0.2)
+:class:`BoundingCircle` X X
:class:`Centroid` X X X X
:class:`Difference` X X X (≥ 5.6.1) X
:class:`Distance` X X X (≥ 5.6.1) X
diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
index f60c3f3f6e..c26e1ca9ae 100644
--- a/docs/ref/contrib/gis/functions.txt
+++ b/docs/ref/contrib/gis/functions.txt
@@ -170,7 +170,7 @@ __ http://www.w3.org/Graphics/SVG/
.. class:: BoundingCircle(expression, num_seg=48, **extra)
*Availability*: `PostGIS <http://postgis.net/docs/ST_MinimumBoundingCircle.html>`__,
-`Oracle (≥ 12.1.0.2) <https://docs.oracle.com/database/121/SPATL/GUID-82A61626-BB64-4793-B53D-A0DBEC91831A.htm#SPATL1554>`_
+`Oracle <https://docs.oracle.com/database/121/SPATL/GUID-82A61626-BB64-4793-B53D-A0DBEC91831A.htm#SPATL1554>`_
Accepts a single geographic field or expression and returns the smallest circle
polygon that can fully contain the geometry.
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 0628cef2e1..26351314de 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -676,7 +676,7 @@ rather than a list. SQLite does not support this.
Oracle notes
============
-Django supports `Oracle Database Server`_ versions 11.2 and higher. Version
+Django supports `Oracle Database Server`_ versions 12.1 and higher. Version
5.2 or higher of the `cx_Oracle`_ Python driver is required.
.. _`Oracle Database Server`: http://www.oracle.com/
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index ca914118ca..2ef6ba9be1 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -210,6 +210,13 @@ Database backend API
* ...
+Dropped support for Oracle 11.2
+-------------------------------
+
+The end of upstream support for Oracle 11.2 is Dec. 2020. Django 1.11 will be
+supported until April 2020 which almost reaches this date. Django 2.0
+officially supports Oracle 12.1+.
+
Miscellaneous
-------------