Commit b24bb686 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes. 

Backport of r11760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent fa5ff296

docs/index.txt

+1 −3
Original line number Diff line number Diff line
@@ -201,7 +201,5 @@ The Django open-source project 


    * **Django over time:**

      :ref:`API stability <misc-api-stability>` |

      :ref:`Archive of release notes <releases-index>` | `Backwards-incompatible changes`_ |

      :ref:`Release notes and upgrading instructions <releases-index>` |

      :ref:`Deprecation Timeline <internals-deprecation>`
 


.. _Backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges

docs/ref/templates/builtins.txt

+3 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ comment 


Ignore everything between ``{% comment %}`` and ``{% endcomment %}``



.. templatetag:: cycle

.. templatetag:: csrf_token



csrf_token

~~~~~~~~~~
@@ -62,6 +62,8 @@ In the Django 1.1.X series, this is a no-op tag that returns an empty string. 
It exists to ease the transition to Django 1.2, in which it is used for CSRF

protection.



.. templatetag:: cycle



cycle

~~~~~

docs/releases/1.1.2.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
.. _releases-1.1.2:



==============================================

Django 1.1.2 release notes — UNDER DEVELOPMENT

==============================================



This page documents release notes for the as-yet-unreleased Django

1.1.2. As such it is tentative and subject to change. It provides

up-to-date information for those who are following the 1.1.X branch.



This is the second "bugfix" release in the Django 1.1 series,

improving the stability and performance of the Django 1.1 codebase.



Django 1.1.2 maintains backwards compatibility with Django

1.1.0, but contain a number of fixes and other

improvements. Django 1.1.2 is a recommended upgrade for any

development or deployment currently using or targeting Django 1.1.



For full details on the new features, backwards incompatibilities, and

deprecated features in the 1.1 branch, see the :ref:`releases-1.1`.



One new feature

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



Ordinarily, a point release would not include new features, but in the

case of Django 1.1.2, we have made an exception to this rule. Django

1.2 (the next major release of Django) will contain a feature that

will improve protection against Cross-Site Request Forgery (CSRF)

attacks. This feature requires the use of a new :ttag:`csrf_token`

template tag in all forms that Django renders.



To make it easier to support both 1.1.X and 1.2.X versions of Django with

the same templates, we have decided to introduce the :ttag:`csrf_token` template

tag to the 1.1.X branch. In the 1.1.X branch, :ttag:`csrf_token` does nothing -

it has no effect on templates or form processing. However, it means that the

same template will work with Django 1.2.

docs/releases/index.txt

+44 −18
Original line number Diff line number Diff line 
.. _releases-index:



=============

Release notes

=============
@@ -7,28 +8,53 @@ Release notes for the official Django releases. Each release note will tell you 
what's new in each version, and will also describe any backwards-incompatible

changes made in that version.



For those upgrading to a new version of Django, you will need to check

all the backwards-incompatible changes and deprecated features for

each 'final' release from the one after your current Django version,

up to and including the new version.



Final releases

==============



1.1 release

-----------

.. toctree::

   :maxdepth: 1



   0.95

   0.96

   1.0-alpha-1

   1.0-alpha-2

   1.0-beta

   1.0-beta-2

   1.0

   1.0.1

   1.0.2

   1.1-alpha-1

   1.1-beta-1

   1.1-rc-1

   1.1.2

   1.1



.. seealso::

1.0 release

-----------

.. toctree::

   :maxdepth: 1



   1.0.2

   1.0.1

   1.0



Pre-1.0 releases

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

.. toctree::

   :maxdepth: 1



   0.96

   0.95



    The list of `backwards-incompatible changes`_ made in the current

    development "trunk". If you're running versions of Django newer than an

    official release, you should keep track of new pieces pointed there. It's

    also fun reading if you're looking forward to new versions of Django.

Development releases

====================



.. _backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
 
These notes are retained for historical purposes. If you are upgrading

between formal Django releases, you don't need to worry about these

notes.



.. toctree::

   :maxdepth: 1



   1.1-rc-1

   1.1-beta-1

   1.1-alpha-1

   1.0-beta-2

   1.0-beta

   1.0-alpha-2

   1.0-alpha-1