Commit fcaf2e13 authored by Tim Graham's avatar Tim Graham
Browse files

[1.7.x] Fixed #24350 -- Freshened up database install topic section. 

Backport of 35f0cae1 from master
parent e3849912

docs/ref/databases.txt

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ PostgreSQL notes 


Django supports PostgreSQL 8.4 and 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

-------------------------------

docs/topics/install.txt

+8 −18
Original line number Diff line number Diff line
@@ -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 <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 <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 <mysql-notes>`.

* If you're using MySQL, you'll need a :ref:`DB API driver

  <mysql-db-api-drivers>` like ``mysqlclient``. See :ref:`notes for the MySQL

  backend <mysql-notes>` for details.



* If you're using SQLite you might want to read the :ref:`SQLite backend notes

  <sqlite-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 <oracle-notes>`

  for important information regarding supported versions of both Oracle and

  ``cx_Oracle``.

  read the :ref:`notes for the Oracle backend <oracle-notes>` 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