From fc779fe55aec84994e7e761c743716ba03484bcc Mon Sep 17 00:00:00 2001 From: Jeremy Dunck Date: Mon, 25 Jun 2007 19:33:37 +0000 Subject: gis: Merged revisions 5491-5539 via svnmerge from http://code.djangoproject.com/svn/django/trunk git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5540 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/faq.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/faq.txt') diff --git a/docs/faq.txt b/docs/faq.txt index bdd8c5360e..67ed8a49a5 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -104,7 +104,7 @@ Lawrence, Kansas, USA. `Wilson Miner`_ Wilson's design-fu makes us all look like rock stars. By day, he's an - interactive designer for `Apple`. Don't ask him what he's working on, or + interactive designer for `Apple`_. Don't ask him what he's working on, or he'll have to kill you. He lives in San Francisco. On IRC, Wilson goes by ``wilsonian``. @@ -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? ---------------------------------------------------------------------------------------- -- cgit v1.3