summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.4.txt23
-rw-r--r--docs/releases/index.txt8
2 files changed, 31 insertions, 0 deletions
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
new file mode 100644
index 0000000000..30c24ca2e2
--- /dev/null
+++ b/docs/releases/1.4.txt
@@ -0,0 +1,23 @@
+============================================
+Django 1.4 release notes - UNDER DEVELOPMENT
+============================================
+
+This page documents release notes for the as-yet-unreleased Django
+1.4. As such, it's tentative and subject to change. It provides
+up-to-date information for those who are following trunk.
+
+Django 1.4 includes various `new features`_ and some minor `backwards
+incompatible changes`_. There are also some features that have been dropped,
+which are detailed in :doc:`our deprecation plan </internals/deprecation>`.
+
+.. _new features: `What's new in Django 1.4`_
+.. _backwards incompatible changes: backwards-incompatible-changes-1.4_
+
+
+What's new in Django 1.4
+========================
+
+.. _backwards-incompatible-changes-1.4:
+
+Backwards incompatible changes in 1.4
+=====================================
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 8d23c28fc8..b1ef19b32c 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -14,6 +14,14 @@ up to and including the new version.
Final releases
==============
+
+1.4 release
+-----------
+.. toctree::
+ :maxdepth: 1
+
+ 1.4
+
1.3 release
-----------
.. toctree::