      DATABASE_ENGINE = 'postgresql_psycopg2'
      DATABASE_USER = 'myusername'
      DATABASE_PASSWORD = 's3krit'
  
  These settings are now in a dictionary named :setting:`DATABASES`. Each item in
  the dictionary corresponds to a single database connection, with the name
  ``'default'`` describing the default database connection. The setting names
  have also been shortened. The previous sample settings would now look like this::
  
      DATABASES = {
          'default': {
              'NAME': 'test_db',
              'ENGINE': 'django.db.backends.postgresql_psycopg2',
 
</s> remove In the old-style (pre 1.2) format, you had a number of ``DATABASE_`` settings
in your settings file. For example::
 </s> add In the old-style (pre 1.2) format, you had a number of ``DATABASE_``
settings in your settings file. For example:: </s> remove Any existing Django settings file will continue to work as expected until
Django 1.4. Until then, old-style database settings will be automatically
translated to the new-style format.
 </s> add Any existing Django settings file will continue to work as expected
until Django 1.4. Until then, old-style database settings will be
automatically translated to the new-style format. </s> remove Prior to Django 1.1, Django used a number of settings to control access to a
single database. Django 1.2 introduces support for multiple databases, and as
a result, the way you define database settings has changed.
 </s> add Prior to Django 1.1, Django used a number of settings to control
access to a single database. Django 1.2 introduces support for
multiple databases, and as a result the way you define database
settings has changed. </s> remove ``LazyObject`` is an undocumented utility class used for lazily wrapping other
objects of unknown type. In Django 1.1 and earlier, it handled introspection in
a non-standard way, depending on wrapped objects implementing a public method
``get_all_members()``. Since this could easily lead to name clashes, it has been
changed to use the standard method, involving ``__members__`` and ``__dir__()``.
If you used ``LazyObject`` in your own code and implemented the
``get_all_members()`` method for wrapped objects, you need to make the following
changes:
 </s> add ``LazyObject`` is an undocumented utility class used for lazily
wrapping other objects of unknown type. In Django 1.1 and earlier, it
handled introspection in a non-standard way, depending on wrapped
objects implementing a public method named
``get_all_members()``. Since this could easily lead to name clashes,
it has been changed to use the standard Python introspection method,
involving ``__members__`` and ``__dir__()``.  If you used
``LazyObject`` in your own code and implemented the
``get_all_members()`` method for wrapped objects, you need to make the
following changes: </s> remove  * If you have more complex requirements for introspection, first rename the
   ``get_all_members()`` method to ``__dir__()``. This is the standard method,
   from Python 2.6 onwards, for supporting introspection. If you require
   support for Python < 2.6, add the following code to the class::
 </s> add  * If you have more complex requirements for introspection, first
   rename the ``get_all_members()`` method to ``__dir__()``. This is
   the standard method, from Python 2.6 onwards, for supporting
   introspection. If you require support for Python versions earlier
   than 2.6, add the following code to the class::
These settings are now in a dictionary named
:setting:`DATABASES`. Each item in the dictionary corresponds to a
single database connection, with the name ``'default'`` describing the
default database connection. The setting names have also been
shortened. The previous sample settings would now look like this::
      DATABASE_ENGINE = 'postgresql_psycopg2'
      DATABASE_USER = 'myusername'
      DATABASE_PASSWORD = 's3krit'
  
These settings are now in a dictionary named
:setting:`DATABASES`. Each item in the dictionary corresponds to a
single database connection, with the name ``'default'`` describing the
default database connection. The setting names have also been
shortened. The previous sample settings would now look like this::
These settings are now in a dictionary named
:setting:`DATABASES`. Each item in the dictionary corresponds to a
single database connection, with the name ``'default'`` describing the
default database connection. The setting names have also been
shortened. The previous sample settings would now look like this::
These settings are now in a dictionary named
:setting:`DATABASES`. Each item in the dictionary corresponds to a
single database connection, with the name ``'default'`` describing the
default database connection. The setting names have also been
shortened. The previous sample settings would now look like this::
These settings are now in a dictionary named
:setting:`DATABASES`. Each item in the dictionary corresponds to a
single database connection, with the name ``'default'`` describing the
default database connection. The setting names have also been
shortened. The previous sample settings would now look like this::
  
      DATABASES = {
          'default': {
              'NAME': 'test_db',
              'ENGINE': 'django.db.backends.postgresql_psycopg2',
keep keep keep keep replace replace replace replace keep keep keep keep keep
 Update 1.2 release notes in anticipation of final release.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13259 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
docs/releases/1.2.txt