Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37

5 files changed, 11 insertions, 14 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 8209afd366..59f99fb2e9 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -143,7 +143,7 @@ SEND_BROKEN_LINK_EMAILS = False
 
 # Database connection info.
 # Legacy format
-DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index 9d05ac2c8f..b74408ace8 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -11,7 +11,7 @@ MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': '',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index dd6a099b9d..dbb5b61d0a 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -136,18 +136,18 @@ Database-backend-specific SQL data
 ----------------------------------
 
 There's also a hook for backend-specific SQL data. For example, you
-can have separate initial-data files for PostgreSQL and MySQL. For
+can have separate initial-data files for PostgreSQL and SQLite. For
 each app, Django looks for a file called
 ``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is
 your app directory, ``<modelname>`` is the model's name in lowercase
 and ``<backend>`` is the last part of the module name provided for the
 :setting:`ENGINE` in your settings file (e.g., if you have defined a
 database with an :setting:`ENGINE` value of
-``django.db.backends.postgresql``, Django will look for
-``<appname>/sql/<modelname>.postgresql.sql``).
+``django.db.backends.sqlite3``, Django will look for
+``<appname>/sql/<modelname>.sqlite3.sql``).
 
 Backend-specific SQL data is executed before non-backend-specific SQL
 data. For example, if your app contains the files ``sql/person.sql``
-and ``sql/person.postgresql.sql`` and you're installing the app on
-PostgreSQL, Django will execute the contents of
-``sql/person.postgresql.sql`` first, then ``sql/person.sql``.
+and ``sql/person.sqlite3.sql`` and you're installing the app on
+SQLite, Django will execute the contents of
+``sql/person.sqlite.sql`` first, then ``sql/person.sql``.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 325b009fe4..76005f04e0 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -394,7 +394,6 @@ Default: ``''`` (Empty string)
 The database backend to use. The built-in database backends are:
 
     * ``'django.db.backends.postgresql_psycopg2'``
-    * ``'django.db.backends.postgresql'``
     * ``'django.db.backends.mysql'``
     * ``'django.db.backends.sqlite3'``
     * ``'django.db.backends.oracle'``
@@ -498,8 +497,8 @@ The character set encoding used to create the test database. The value of this
 string is passed directly through to the database, so its format is
 backend-specific.
 
-Supported for the PostgreSQL_ (``postgresql``, ``postgresql_psycopg2``) and
-MySQL_ (``mysql``) backends.
+Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
+backends.
 
 .. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
 .. _MySQL: http://dev.mysql.com/doc/refman/5.0/en/charset-database.html
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 9bbb21491b..ffa445f358 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -92,9 +92,7 @@ support channels provided by each 3rd party project.
 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 psycopg_ package. Django supports
-  both version 1 and 2. (When you configure Django's database layer, specify
-  either ``postgresql`` [for version 1] or ``postgresql_psycopg2`` [for version 2].)
+* 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.