summaryrefslogtreecommitdiff
path: root/docs/install.txt
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-01 05:55:01 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-01 05:55:01 +0000
commita61d4ebd5f4b49b296063eae603faa3c456d26e5 (patch)
tree3b88cfd1865e4a77400ec2becddaf93851f27f57 /docs/install.txt
parentb89d409bf7ed7f9d6248c1ec188e241bdf5d4aa2 (diff)
downloaddjango-a61d4ebd5f4b49b296063eae603faa3c456d26e5.tar.gz
unicode: Merged changes from trunk up to [5579].
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/install.txt')
-rw-r--r--docs/install.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/install.txt b/docs/install.txt
index 99aad4e52d..e850e48955 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -48,7 +48,8 @@ Get your database running
If you plan to use Django's database API functionality, you'll need to
make sure a database server is running. Django works with PostgreSQL_,
-MySQL_ and SQLite_.
+MySQL_, Oracle_ and SQLite_ (the latter doesn't require a separate server to
+be running).
Additionally, you'll need to make sure your Python database bindings are
installed.
@@ -76,6 +77,7 @@ installed.
.. _pysqlite: http://initd.org/tracker/pysqlite
.. _MySQL backend: ../databases/
.. _cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/
+.. _Oracle: http://www.oracle.com/
Remove any old versions of Django
=================================