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

Proofed the 1.6 release notes

parent b00c6371

docs/ref/class-based-views/mixins-editing.txt

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ ModelFormMixin 


        This is a required attribute if you are generating the form class

        automatically (e.g. using ``model``). Omitting this attribute will

        result in all fields being used, but this behaviour is deprecated

        result in all fields being used, but this behavior is deprecated

        and will be removed in Django 1.8.



    .. attribute:: success_url

docs/ref/contrib/admin/index.txt

+3 −2
Original line number Diff line number Diff line
@@ -1026,8 +1026,9 @@ subclass:: 
        Performs a full-text match. This is like the default search method but

        uses an index. Currently this is only available for MySQL.



    If you need to customize search you can use :meth:`ModelAdmin.get_search_results` to provide additional or alternate

    search behaviour.

    If you need to customize search you can use

    :meth:`ModelAdmin.get_search_results` to provide additional or alternate

    search behavior.



Custom template options

~~~~~~~~~~~~~~~~~~~~~~~

docs/ref/contrib/syndication.txt

+19 −15
Original line number Diff line number Diff line
@@ -137,10 +137,14 @@ into those elements. 


  See `a complex example`_ below that uses a description template.



  .. method:: Feed.get_context_data(self, **kwargs)



    .. versionadded:: 1.6



      There is also a way to pass additional information to title and description

      templates, if you need to supply more than the two variables mentioned

      before. You can provide your implementation of ``get_context_data`` method

  in your Feed subclass. For example::

      in your ``Feed`` subclass. For example::



        from mysite.models import Article

        from django.contrib.syndication.views import Feed

docs/ref/databases.txt

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ configuration in :setting:`DATABASES`:: 
Since Django 1.6, autocommit is turned on by default. This configuration is

ignored and can be safely removed.



.. _database-isolation-level:



Isolation level

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

docs/ref/forms/models.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Model Form Functions 
    ``fields`` or ``exclude``, or the corresponding attributes on the form's

    inner ``Meta`` class. See :ref:`modelforms-selecting-fields` for more

    information. Omitting any definition of the fields to use will result in all

    fields being used, but this behaviour is deprecated.

    fields being used, but this behavior is deprecated.



    The ``localized_fields`` parameter was added.