[1.8.x] Fixed #24335 -- Bumped required psycopg2 version to 2.4.5 (2.5 for contrib.postgres).

Backport of 3adc5f1ee6618a615db07d4a868b366a15c39f82 from master

2 files changed, 9 insertions, 2 deletions

diff --git a/docs/ref/contrib/postgres/index.txt b/docs/ref/contrib/postgres/index.txt
index 307b9befd5..c97a61d123 100644
--- a/docs/ref/contrib/postgres/index.txt
+++ b/docs/ref/contrib/postgres/index.txt
@@ -1,12 +1,17 @@
 ``django.contrib.postgres``
 ===========================
 
+.. module:: django.contrib.postgres
+    :synopsis: PostgreSQL-specific fields and features
+
 .. versionadded:: 1.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.
+
 .. note::
     Django is, and will continue to be, a database-agnostic web framework. We
     would encourage those writing reusable applications for the Django
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index ae4c588788..5fda5589e1 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -92,8 +92,10 @@ below for information on how to set up your database correctly.
 PostgreSQL notes
 ================
 
-Django supports PostgreSQL 9.0 and higher. It requires the use of Psycopg2
-2.0.9 or higher.
+Django supports PostgreSQL 9.0 and higher. It requires the use of `psycopg2`_
+2.4.5 or higher (or 2.5+ if you want to use :mod:`django.contrib.postgres`).
+
+.. _psycopg2: http://initd.org/psycopg/
 
 If you're on Windows, check out the unofficial `compiled Windows version`_
 of psycopg2.