Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[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
  • Loading branch information...
commit b24bb6864938cdf32239e4dcfce0d89aaad8f8de 1 parent fa5ff29
Russell Keith-Magee authored November 23, 2009
4  docs/index.txt
@@ -201,7 +201,5 @@ The Django open-source project
201 201
 
202 202
     * **Django over time:**
203 203
       :ref:`API stability <misc-api-stability>` |
204  
-      :ref:`Archive of release notes <releases-index>` | `Backwards-incompatible changes`_ |
  204
+      :ref:`Release notes and upgrading instructions <releases-index>` |
205 205
       :ref:`Deprecation Timeline <internals-deprecation>`
206  
-
207  
-.. _Backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
4  docs/ref/templates/builtins.txt
@@ -51,7 +51,7 @@ comment
51 51
 
52 52
 Ignore everything between ``{% comment %}`` and ``{% endcomment %}``
53 53
 
54  
-.. templatetag:: cycle
  54
+.. templatetag:: csrf_token
55 55
 
56 56
 csrf_token
57 57
 ~~~~~~~~~~
@@ -62,6 +62,8 @@ In the Django 1.1.X series, this is a no-op tag that returns an empty string.
62 62
 It exists to ease the transition to Django 1.2, in which it is used for CSRF
63 63
 protection.
64 64
 
  65
+.. templatetag:: cycle
  66
+
65 67
 cycle
66 68
 ~~~~~
67 69
 
36  docs/releases/1.1.2.txt
... ...
@@ -0,0 +1,36 @@
  1
+.. _releases-1.1.2:
  2
+
  3
+==============================================
  4
+Django 1.1.2 release notes — UNDER DEVELOPMENT
  5
+==============================================
  6
+
  7
+This page documents release notes for the as-yet-unreleased Django
  8
+1.1.2. As such it is tentative and subject to change. It provides
  9
+up-to-date information for those who are following the 1.1.X branch.
  10
+
  11
+This is the second "bugfix" release in the Django 1.1 series,
  12
+improving the stability and performance of the Django 1.1 codebase.
  13
+
  14
+Django 1.1.2 maintains backwards compatibility with Django
  15
+1.1.0, but contain a number of fixes and other
  16
+improvements. Django 1.1.2 is a recommended upgrade for any
  17
+development or deployment currently using or targeting Django 1.1.
  18
+
  19
+For full details on the new features, backwards incompatibilities, and
  20
+deprecated features in the 1.1 branch, see the :ref:`releases-1.1`.
  21
+
  22
+One new feature
  23
+---------------
  24
+
  25
+Ordinarily, a point release would not include new features, but in the
  26
+case of Django 1.1.2, we have made an exception to this rule. Django
  27
+1.2 (the next major release of Django) will contain a feature that
  28
+will improve protection against Cross-Site Request Forgery (CSRF)
  29
+attacks. This feature requires the use of a new :ttag:`csrf_token`
  30
+template tag in all forms that Django renders.
  31
+
  32
+To make it easier to support both 1.1.X and 1.2.X versions of Django with
  33
+the same templates, we have decided to introduce the :ttag:`csrf_token` template
  34
+tag to the 1.1.X branch. In the 1.1.X branch, :ttag:`csrf_token` does nothing -
  35
+it has no effect on templates or form processing. However, it means that the
  36
+same template will work with Django 1.2.
62  docs/releases/index.txt
... ...
@@ -1,5 +1,6 @@
1 1
 .. _releases-index:
2 2
 
  3
+=============
3 4
 Release notes
4 5
 =============
5 6
 
@@ -7,28 +8,53 @@ Release notes for the official Django releases. Each release note will tell you
7 8
 what's new in each version, and will also describe any backwards-incompatible
8 9
 changes made in that version.
9 10
 
  11
+For those upgrading to a new version of Django, you will need to check
  12
+all the backwards-incompatible changes and deprecated features for
  13
+each 'final' release from the one after your current Django version,
  14
+up to and including the new version.
  15
+
  16
+Final releases
  17
+==============
  18
+
  19
+1.1 release
  20
+-----------
10 21
 .. toctree::
11 22
    :maxdepth: 1
12 23
 
13  
-   0.95
14  
-   0.96
15  
-   1.0-alpha-1
16  
-   1.0-alpha-2
17  
-   1.0-beta
18  
-   1.0-beta-2
19  
-   1.0
20  
-   1.0.1
21  
-   1.0.2
22  
-   1.1-alpha-1
23  
-   1.1-beta-1
24  
-   1.1-rc-1
  24
+   1.1.2
25 25
    1.1
26 26
 
27  
-.. seealso::
  27
+1.0 release
  28
+-----------
  29
+.. toctree::
  30
+   :maxdepth: 1
  31
+
  32
+   1.0.2
  33
+   1.0.1
  34
+   1.0
  35
+
  36
+Pre-1.0 releases
  37
+----------------
  38
+.. toctree::
  39
+   :maxdepth: 1
  40
+
  41
+   0.96
  42
+   0.95
28 43
 
29  
-    The list of `backwards-incompatible changes`_ made in the current
30  
-    development "trunk". If you're running versions of Django newer than an
31  
-    official release, you should keep track of new pieces pointed there. It's
32  
-    also fun reading if you're looking forward to new versions of Django.
  44
+Development releases
  45
+====================
33 46
 
34  
-.. _backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
  47
+These notes are retained for historical purposes. If you are upgrading
  48
+between formal Django releases, you don't need to worry about these
  49
+notes.
  50
+
  51
+.. toctree::
  52
+   :maxdepth: 1
  53
+
  54
+   1.1-rc-1
  55
+   1.1-beta-1
  56
+   1.1-alpha-1
  57
+   1.0-beta-2
  58
+   1.0-beta
  59
+   1.0-alpha-2
  60
+   1.0-alpha-1

0 notes on commit b24bb68

Please sign in to comment.
Something went wrong with that request. Please try again.