summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-12-18 07:53:57 -0500
committerTim Graham <timograham@gmail.com>2015-12-19 07:25:28 -0500
commit571f7b759ef90669d756774dd328cdc60f0fa8fe (patch)
tree008876c041d605d9bb149f72d18225ff65baf298 /docs
parent24ebf17f04ee0ed157c430ff7d10ec0728abd48e (diff)
[1.9.x] Fixed #25949 -- Documented Psycopg2 version requirement for JSONField.
Backport of b26d147259202455ce356755b729c3dcb16ae9e6 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/postgres/fields.txt3
-rw-r--r--docs/ref/contrib/postgres/index.txt3
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/contrib/postgres/fields.txt b/docs/ref/contrib/postgres/fields.txt
index 9989969651..aa80b6ce1c 100644
--- a/docs/ref/contrib/postgres/fields.txt
+++ b/docs/ref/contrib/postgres/fields.txt
@@ -483,8 +483,7 @@ JSONField
of the JSON which allows indexing. The trade-off is a small additional cost
on writing to the ``jsonb`` field. ``JSONField`` uses ``jsonb``.
- **As a result, the usage of this field is only supported on PostgreSQL
- versions at least 9.4**.
+ **As a result, this field requires PostgreSQL ≥ 9.4 and Psycopg2 ≥ 2.5.4**.
Querying JSONField
^^^^^^^^^^^^^^^^^^
diff --git a/docs/ref/contrib/postgres/index.txt b/docs/ref/contrib/postgres/index.txt
index a1536680c7..cc453aff65 100644
--- a/docs/ref/contrib/postgres/index.txt
+++ b/docs/ref/contrib/postgres/index.txt
@@ -10,7 +10,8 @@ PostgreSQL has a number of features which are not shared by the other databases
Django supports. This optional module contains model fields and form fields for
a number of PostgreSQL specific data types.
-Psycopg2 2.5 or higher is required.
+Psycopg2 2.5 or higher is required, though we highly recommend using the latest
+release. Some fields require higher versions.
.. note::
Django is, and will continue to be, a database-agnostic web framework. We