diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-04-19 18:56:51 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-04-19 18:56:51 +0000 |
| commit | 31b1e3aa0436b0debd67013269211391cb435d8b (patch) | |
| tree | ada3048c6b85b875c5695f6f4f2750ab2988302b /docs | |
| parent | 3f549ca61d347d7513d4d6bf4ffb4aecedf2336c (diff) | |
boulder-oracle-sprint: Updated docs to mention Oracle and cx_Oracle where needed.
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/faq.txt | 3 | ||||
| -rw-r--r-- | docs/install.txt | 3 | ||||
| -rw-r--r-- | docs/settings.txt | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/faq.txt b/docs/faq.txt index 202b73c6be..ac6773d296 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -301,7 +301,7 @@ means it can run on a variety of server platforms. If you want to use Django with a database, which is probably the case, you'll also need a database engine. PostgreSQL_ is recommended, because we're -PostgreSQL fans, and MySQL_ and `SQLite 3`_ are also supported. +PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported. .. _Python: http://www.python.org/ .. _Apache 2: http://httpd.apache.org/ @@ -310,6 +310,7 @@ PostgreSQL fans, and MySQL_ and `SQLite 3`_ are also supported. .. _PostgreSQL: http://www.postgresql.org/ .. _MySQL: http://www.mysql.com/ .. _`SQLite 3`: http://www.sqlite.org/ +.. _Oracle: http://www.oracle.com/ Do I lose anything by using Python 2.3 versus newer Python versions, such as Python 2.5? ---------------------------------------------------------------------------------------- diff --git a/docs/install.txt b/docs/install.txt index 4650fd746b..c337be404b 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -62,6 +62,8 @@ installed. * If you're using SQLite, you'll need pysqlite_. Use version 2.0.3 or higher. +* If you're using Oracle, you'll need cx_Oracle_, version 4.3.1 or higher. + .. _PostgreSQL: http://www.postgresql.org/ .. _MySQL: http://www.mysql.com/ .. _Django's ticket system: http://code.djangoproject.com/report/1 @@ -71,6 +73,7 @@ installed. .. _SQLite: http://www.sqlite.org/ .. _pysqlite: http://initd.org/tracker/pysqlite .. _MySQL backend: ../databases/ +.. _cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/ Remove any old versions of Django ================================= diff --git a/docs/settings.txt b/docs/settings.txt index 63b5cceef9..95549d40be 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -245,8 +245,8 @@ DATABASE_ENGINE Default: ``''`` (Empty string) Which database backend to use. Either ``'postgresql_psycopg2'``, -``'postgresql'``, ``'mysql'``, ``'mysql_old'``, ``'sqlite3'`` or -``'ado_mssql'``. +``'postgresql'``, ``'mysql'``, ``'mysql_old'``, ``'sqlite3'``, +``'oracle'``, or ``'ado_mssql'``. DATABASE_HOST ------------- |