From 35f0cae19de226d9d7771304fc8dd2619e644998 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 16 Feb 2015 14:22:22 -0500 Subject: [PATCH] Fixed #24350 -- Freshened up database install topic section. --- docs/ref/databases.txt | 5 +++++ docs/topics/install.txt | 26 ++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index ae2f7bc310..ae4c588788 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -95,6 +95,11 @@ PostgreSQL notes Django supports PostgreSQL 9.0 and higher. It requires the use of Psycopg2 2.0.9 or higher. +If you're on Windows, check out the unofficial `compiled Windows version`_ +of psycopg2. + +.. _compiled Windows version: http://stickpeople.com/projects/python/win-psycopg/ + PostgreSQL connection settings ------------------------------- diff --git a/docs/topics/install.txt b/docs/topics/install.txt index 7ab9eabf35..fb46caf189 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -86,23 +86,19 @@ databases with Django. In addition to a database backend, you'll need to make sure your Python database bindings are installed. -* If you're using PostgreSQL, you'll need the `postgresql_psycopg2`_ package. - You might want to refer to our :ref:`PostgreSQL notes ` for - further technical details specific to this database. +* If you're using PostgreSQL, you'll need the `psycopg2`_ package. Refer to the + :ref:`PostgreSQL notes ` for further details. - If you're on Windows, check out the unofficial `compiled Windows version`_. - -* If you're using MySQL, you'll need the ``MySQL-python`` package, version - 1.2.1p2 or higher. You will also want to read the database-specific - :ref:`notes for the MySQL backend `. +* If you're using MySQL, you'll need a :ref:`DB API driver + ` like ``mysqlclient``. See :ref:`notes for the MySQL + backend ` for details. * If you're using SQLite you might want to read the :ref:`SQLite backend notes `. * If you're using Oracle, you'll need a copy of cx_Oracle_, but please - read the database-specific :ref:`notes for the Oracle backend ` - for important information regarding supported versions of both Oracle and - ``cx_Oracle``. + read the :ref:`notes for the Oracle backend ` for details + regarding supported versions of both Oracle and ``cx_Oracle``. * If you're using an unofficial 3rd party backend, please consult the documentation provided for any additional requirements. @@ -121,17 +117,11 @@ database queries, Django will need permission to create a test database. .. _PostgreSQL: http://www.postgresql.org/ .. _MySQL: http://www.mysql.com/ -.. _postgresql_psycopg2: http://initd.org/psycopg/ -.. _compiled Windows version: http://stickpeople.com/projects/python/win-psycopg/ +.. _psycopg2: http://initd.org/psycopg/ .. _SQLite: http://www.sqlite.org/ .. _pysqlite: http://trac.edgewall.org/wiki/PySqlite .. _cx_Oracle: http://cx-oracle.sourceforge.net/ .. _Oracle: http://www.oracle.com/ -.. _Sybase SQL Anywhere: http://code.google.com/p/sqlany-django/ -.. _IBM DB2: http://code.google.com/p/ibm-db/ -.. _Microsoft SQL Server 2005: https://bitbucket.org/Manfre/django-mssql/ -.. _Firebird: http://code.google.com/p/django-firebird/ -.. _ODBC: http://code.google.com/p/django-pyodbc/ .. _removing-old-versions-of-django: Remove any old versions of Django