From 0aff35459db46a1d4d4383f379416565ff2fce9e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 7 Feb 2019 09:59:47 +0100 Subject: [2.2.x] Updated Oracle docs links to Oracle 18c. Backport of 759a9b710c0e5a6009cfba406ff562919fa70ef0 from master --- docs/ref/contrib/gis/functions.txt | 7 ++++--- docs/ref/contrib/gis/geoquerysets.txt | 8 ++++++-- docs/ref/models/querysets.txt | 4 +++- docs/ref/unicode.txt | 6 +++--- docs/releases/2.0.txt | 6 +++--- 5 files changed, 19 insertions(+), 12 deletions(-) (limited to 'docs') diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt index 60476902bb..e6f0ad8fae 100644 --- a/docs/ref/contrib/gis/functions.txt +++ b/docs/ref/contrib/gis/functions.txt @@ -182,7 +182,8 @@ south = ``π``; west = ``3π/2``. .. class:: BoundingCircle(expression, num_seg=48, **extra) *Availability*: `PostGIS `__, -`Oracle `_ +`Oracle `_ Accepts a single geographic field or expression and returns the smallest circle polygon that can fully contain the geometry. @@ -267,8 +268,8 @@ queryset is calculated:: *Availability*: `MySQL `__, -`Oracle -`__, +`Oracle `__, `PostGIS `__, 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 `_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model). -.. [#fnsdorelate] *See* `SDO_RELATE documentation `_, from the Oracle Spatial and Graph Developer's Guide. +.. [#fnsdorelate] *See* `SDO_RELATE documentation `_, from the Oracle Spatial and + Graph Developer's Guide. .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate `_ by Martin Davis (a PostGIS developer). diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 8cadd73879..444c428583 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -801,7 +801,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 9d0311deef..7ad5cac095 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 `__. * The new ``chunk_size`` parameter of :meth:`.QuerySet.iterator` controls the number of rows fetched by the Python database client when streaming results -- cgit v1.3