summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@rd.io>2012-11-04 15:41:33 -0800
committerAlex Gaynor <alex.gaynor@rd.io>2012-11-04 15:41:58 -0800
commit32d5f03f10069311b4f2c87d3cd38e968df74365 (patch)
treeaaca784603551d722765b2f38e27958225c61a41
parent69a0c91c90a3c8f8d5913874aca918aecbe69410 (diff)
[1.5.x] Added multi-column indexes to the 1.5 release notes. Backport of 957787ace0a14fa2ee2539d47a64b266bc93b6bd.
-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
=====================================