summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-10-30 14:02:54 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-10-30 21:35:23 +0100
commit43d7cee86e05dc267d66c3a308746fc1ac58271e (patch)
tree65c95d150d7f4522afbb53483be9c8b216be21c7 /docs
parent5dc4437dfad8241a5830e4d2ab59635b814281d6 (diff)
Added release notes for 1.6.
Since 1.5 is feature-frozen, we need them to document new features.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.6.txt32
-rw-r--r--docs/releases/index.txt7
2 files changed, 39 insertions, 0 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
new file mode 100644
index 0000000000..ef162a8de3
--- /dev/null
+++ b/docs/releases/1.6.txt
@@ -0,0 +1,32 @@
+============================================
+Django 1.6 release notes - UNDER DEVELOPMENT
+============================================
+
+Welcome to Django 1.6!
+
+These release notes cover the `new features`_, as well as some `backwards
+incompatible changes`_ you'll want to be aware of when upgrading from Django
+1.5 or older versions. We've also dropped some features, which are detailed in
+:doc:`our deprecation plan </internals/deprecation>`, and we've `begun the
+deprecation process for some features`_.
+
+.. _`new features`: `What's new in Django 1.6`_
+.. _`backwards incompatible changes`: `Backwards incompatible changes in 1.6`_
+.. _`begun the deprecation process for some features`: `Features deprecated in 1.6`_
+
+What's new in Django 1.6
+========================
+
+Backwards incompatible changes in 1.6
+=====================================
+
+.. warning::
+
+ In addition to the changes outlined in this section, be sure to review the
+ :doc:`deprecation plan </internals/deprecation>` for any features that
+ have been removed. If you haven't updated your code within the
+ deprecation timeline for a given feature, its removal may appear as a
+ backwards incompatible change.
+
+Features deprecated in 1.6
+==========================
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 6df9821f56..e71376447d 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -16,6 +16,13 @@ Final releases
.. _development_release_notes:
+1.6 release
+-----------
+.. toctree::
+ :maxdepth: 1
+
+ 1.6
+
1.5 release
-----------
.. toctree::