Author: ikelly Date: 2009-01-06 12:25:52 -0600 (Tue, 06 Jan 2009) New Revision: 9710
Modified: django/branches/releases/1.0.X/ django/branches/releases/1.0.X/docs/ref/databases.txt django/branches/releases/1.0.X/docs/topics/install.txt Log: [1.0.X] Refs #9935: Added a note in the documentation to the effect that Django currently requires a 4.X release of cx_Oracle. Backport of [9709] from trunk. Property changes on: django/branches/releases/1.0.X ___________________________________________________________________ Name: svnmerge-integrated - /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691,9695-9696,9698 + /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691,9695-9696,9698,9709 Modified: django/branches/releases/1.0.X/docs/ref/databases.txt =================================================================== --- django/branches/releases/1.0.X/docs/ref/databases.txt 2009-01-06 18:22:07 UTC (rev 9709) +++ django/branches/releases/1.0.X/docs/ref/databases.txt 2009-01-06 18:25:52 UTC (rev 9710) @@ -335,7 +335,8 @@ 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/ Modified: django/branches/releases/1.0.X/docs/topics/install.txt =================================================================== --- django/branches/releases/1.0.X/docs/topics/install.txt 2009-01-06 18:22:07 UTC (rev 9709) +++ django/branches/releases/1.0.X/docs/topics/install.txt 2009-01-06 18:25:52 UTC (rev 9710) @@ -82,9 +82,9 @@ 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 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
