diff --git a/TODO.txt b/TODO.txt
index 590599df46..af26b64242 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,15 +5,7 @@ The follow is a list, more or less in the order I intend to do them of things
 that need to be done.  I'm trying to be as granular as possible.
 
 
-1)  Update all old references to ``settings.DATABASE_*`` to reference
-    ``settings.DATABASES``.  This includes the following locations
-
-    * ref/settings -- needs to be upddated for TEST_*
-
-    The remaining items will be fixed as the code for them enters the code base.
-
-    Replace old instances of :setting:`DATABASE_` with a new tag or something.
-
+1)  Replace old instances of :setting:`DATABASE_` with a new tag or something.
 
 2)  Update all management commands in the following way:
 
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ba95351e80..8ebf75f342 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -234,6 +234,53 @@ Default: ``''`` (Empty string)
 
 The username to use when connecting to the database. Not used with SQLite.
 
+
+TEST_DATABASE_CHARSET
+~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 1.0
+
+Default: ``None``
+
+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.
+
+.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
+.. _MySQL: http://www.mysql.org/doc/refman/5.0/en/charset-database.html
+
+
+TEST_DATABASE_COLLATION
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 1.0
+
+Default: ``None``
+
+The collation order to use when creating the test database. This value is
+passed directly to the backend, so its format is backend-specific.
+
+Only supported for the ``mysql`` backend (see `section 10.3.2`_ of the MySQL
+manual for details).
+
+.. _section 10.3.2: http://www.mysql.org/doc/refman/5.0/en/charset-database.html
+
+TEST_DATABASE_NAME
+~~~~~~~~~~~~~~~~~~
+
+Default: ``None``
+
+The name of database to use when running the test suite.
+
+If the default value (``None``) is used with the SQLite database engine, the
+tests will use a memory resident database. For all other database engines the
+test database will use the name ``'test_' + DATABASE_NAME``.
+
+See :ref:`topics-testing`.
+
 .. setting:: DATE_FORMAT
 
 DATE_FORMAT
@@ -1046,56 +1093,6 @@ Default: ``''`` (Empty string)
 Output, as a string, that the template system should use for invalid (e.g.
 misspelled) variables. See :ref:`invalid-template-variables`..
 
-.. setting:: TEST_DATABASE_CHARSET
-
-TEST_DATABASE_CHARSET
----------------------
-
-.. versionadded:: 1.0
-
-Default: ``None``
-
-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.
-
-.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
-.. _MySQL: http://www.mysql.org/doc/refman/5.0/en/charset-database.html
-
-.. setting:: TEST_DATABASE_COLLATION
-
-TEST_DATABASE_COLLATION
-------------------------
-
-.. versionadded:: 1.0
-
-Default: ``None``
-
-The collation order to use when creating the test database. This value is
-passed directly to the backend, so its format is backend-specific.
-
-Only supported for the ``mysql`` backend (see `section 10.3.2`_ of the MySQL
-manual for details).
-
-.. _section 10.3.2: http://www.mysql.org/doc/refman/5.0/en/charset-database.html
-
-.. setting:: TEST_DATABASE_NAME
-
-TEST_DATABASE_NAME
-------------------
-
-Default: ``None``
-
-The name of database to use when running the test suite.
-
-If the default value (``None``) is used with the SQLite database engine, the
-tests will use a memory resident database. For all other database engines the
-test database will use the name ``'test_' + settings.DATABASE_NAME``.
-
-See :ref:`topics-testing`.
-
 .. setting:: TEST_RUNNER
 
 TEST_RUNNER