Updated Oracle docs links to Oracle 18c.

5 files changed, 19 insertions, 12 deletions

diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
index 03e8411c25..b1f07ff745 100644
--- a/docs/ref/contrib/gis/functions.txt
+++ b/docs/ref/contrib/gis/functions.txt
@@ -181,7 +181,8 @@ south = ``π``; west = ``3π/2``.
 .. class:: BoundingCircle(expression, num_seg=48, **extra)
 
 *Availability*: `PostGIS <https://postgis.net/docs/ST_MinimumBoundingCircle.html>`__,
-`Oracle <https://docs.oracle.com/database/121/SPATL/sdo_geom-sdo_mbc.htm#SPATL1554>`_
+`Oracle <https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
+SDO_GEOM-reference.html#GUID-82A61626-BB64-4793-B53D-A0DBEC91831A>`_
 
 Accepts a single geographic field or expression and returns the smallest circle
 polygon that can fully contain the geometry.
@@ -266,8 +267,8 @@ queryset is calculated::
 
 *Availability*: `MySQL
 <https://dev.mysql.com/doc/refman/en/gis-general-property-functions.html#function_st-envelope>`__,
-`Oracle
-<https://docs.oracle.com/database/121/SPATL/sdo_geom-sdo_mbr.htm#GUID-646638D0-2C5F-490A-AF63-DE9B7A4C97C1__CHDJCEIH>`__,
+`Oracle <https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
+SDO_GEOM-reference.html#GUID-646638D0-2C5F-490A-AF63-DE9B7A4C97C1__CHDJCEIH>`__,
 `PostGIS <https://postgis.net/docs/ST_Envelope.html>`__, SpatiaLite
 
 Accepts a single geographic field or expression and returns the geometry
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index d88454ed28..e4eae2ad99 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -788,7 +788,8 @@ Keyword Argument       Description
                        details.
 =====================  =====================================================
 
-__ https://docs.oracle.com/database/121/SPATL/GUID-3BD00273-E74F-4830-9444-A3BB15AA0AC4.htm#SPATL466
+__ https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
+   spatial-concepts.html#GUID-CE10AB14-D5EA-43BA-A647-DAC9EEF41EE6
 
 Example::
 
@@ -885,5 +886,8 @@ Example::
 
 .. rubric:: Footnotes
 .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
-.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/database/121/SPATL/sdo_relate.htm#SPATL1039>`_, from the Oracle Spatial and Graph Developer's Guide.
+.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/en/
+   database/oracle/oracle-database/18/spatl/spatial-operators-reference.html#
+   GUID-97C17C18-F05E-49B4-BE11-E89B972E2A02>`_, from the Oracle Spatial and
+   Graph Developer's Guide.
 .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <https://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer).
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 2bd347701b..c0ea1133bc 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -789,7 +789,9 @@ object. If it's ``None``, Django uses the :ref:`current time zone
 
     .. _pytz: http://pytz.sourceforge.net/
     .. _Time Zones: https://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES
-    .. _Choosing a Time Zone File: https://docs.oracle.com/database/121/NLSPG/ch4datetime.htm#NLSPG258
+    .. _Choosing a Time Zone File: https://docs.oracle.com/en/database/oracle/
+       oracle-database/18/nlspg/datetime-data-types-and-time-zone-support.html
+       #GUID-805AB986-DE12-4FEA-AF56-5AABCD2132DF
     .. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/en/mysql-tzinfo-to-sql.html
 
 ``none()``
diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt
index 177ada4ef1..f98952c931 100644
--- a/docs/ref/unicode.txt
+++ b/docs/ref/unicode.txt
@@ -29,9 +29,9 @@ able to store certain characters in the database, and information will be lost.
 
 .. _MySQL manual: https://dev.mysql.com/doc/refman/en/charset-database.html
 .. _PostgreSQL manual: https://www.postgresql.org/docs/current/static/multibyte.html
-.. _Oracle manual: https://docs.oracle.com/database/121/NLSPG/toc.htm
-.. _section 2: https://docs.oracle.com/database/121/NLSPG/ch2charset.htm#NLSPG002
-.. _section 11: https://docs.oracle.com/database/121/NLSPG/ch11charsetmig.htm#NLSPG011
+.. _Oracle manual: https://docs.oracle.com/en/database/oracle/oracle-database/18/nlspg/index.html
+.. _section 2: https://docs.oracle.com/en/database/oracle/oracle-database/18/nlspg/choosing-character-set.html
+.. _section 11: https://docs.oracle.com/en/database/oracle/oracle-database/18/nlspg/character-set-migration.html
 
 All of Django's database backends automatically convert strings into
 the appropriate encoding for talking to the database. They also automatically
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index eab181bfe1..c085f65447 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -237,9 +237,9 @@ Models
   finds the starting index of a string inside another string.
 
 * On Oracle, ``AutoField`` and ``BigAutoField`` are now created as `identity
-  columns`_.
-
-  .. _`identity columns`: https://docs.oracle.com/database/121/DRDAA/migr_tools_feat.htm#DRDAA109
+  columns <https://docs.oracle.com/en/database/oracle/oracle-database/18/drdaa/
+  intro-to-tools-and-products-supporting-migraiton.html#GUID-14E4817B-F3BC-4D99
+  -B471-A0ACDC303CC9>`__.
 
 * The new ``chunk_size`` parameter of :meth:`.QuerySet.iterator` controls the
   number of rows fetched by the Python database client when streaming results