summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Kelly <ian.g.kelly@gmail.com>2009-01-06 18:22:07 +0000
committerIan Kelly <ian.g.kelly@gmail.com>2009-01-06 18:22:07 +0000
commitbde7e79fb3a98c6ec0f86e1d4bb088e390c00355 (patch)
tree32b17f6246f65ab76e9b801d817865b14b30a4dd
parente77c4cca26050ee599dfdd78c600b10b0d0b74ec (diff)
Refs #9935: Added a note in the documentation to the effect that Django currently requires a 4.X release of cx_Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/ref/databases.txt3
-rw-r--r--docs/topics/install.txt6
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index e553651ef3..f544ef68f1 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -335,7 +335,8 @@ Oracle notes
Django supports `Oracle Database Server`_ versions 9i and higher. Oracle
version 10g or later is required to use Django's ``regex`` and ``iregex`` query
-operators. You will also need the `cx_Oracle`_ driver, version 4.3.1 or newer.
+operators. You will also need a 4.X release of the `cx_Oracle`_ driver,
+version 4.3.1 or newer.
.. _`Oracle Database Server`: http://www.oracle.com/
.. _`cx_Oracle`: http://cx-oracle.sourceforge.net/
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 766a106d99..7965b96834 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -82,9 +82,9 @@ installed.
wrapper in the standard library, so you don't need to install anything extra
in that case.
-* If you're using Oracle, you'll need cx_Oracle_, version 4.3.1 or higher. You
- will also want to read the database-specific notes for the :ref:`Oracle
- backend <oracle-notes>`.
+* If you're using Oracle, you'll need a 4.X release of cx_Oracle_, version
+ 4.3.1 or higher. You will also want to read the database-specific notes for
+ the :ref:`Oracle backend <oracle-notes>`.
If you plan to use Django's ``manage.py syncdb`` command to
automatically create database tables for your models, you'll need to