summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/options.txt4
-rw-r--r--docs/releases/1.5.txt4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index ab944d7dda..a577135271 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -263,10 +263,10 @@ Django quotes column and table names behind the scenes.
``index_together``
-.. versionadded:: 1.5
-
.. attribute:: Options.index_together
+ .. versionadded:: 1.5
+
Sets of field names that, taken together, are indexed::
index_together = [
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 154f711560..a8024424bd 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -302,6 +302,10 @@ Django 1.5 also includes several smaller improvements worth noting:
* The :ref:`cache-based session backend <cached-sessions-backend>` can store
session data in a non-default cache.
+* Multi-column indexes can now be created on models. Read the
+ :attr:`~django.db.models.Options.index_together` documentation for more
+ infomration.
+
Backwards incompatible changes in 1.5
=====================================