summaryrefslogtreecommitdiff
path: root/docs/ref/models
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-11-03 12:30:48 +0200
committerTim Graham <timograham@gmail.com>2014-11-03 21:43:21 -0500
commitc3b101fae5fb1218ebad78b3439a4b5ae1f05142 (patch)
tree5f69c3b26f726e5008f7c780e661796c8f6daf17 /docs/ref/models
parent6b32adda5935baa7cf99886c6c41a4eda358d2ef (diff)
[1.7.x] Fixed versionchanged indentation in docs/.
Backport of 5c517ec218 from master
Diffstat (limited to 'docs/ref/models')
-rw-r--r--docs/ref/models/instances.txt8
-rw-r--r--docs/ref/models/options.txt4
-rw-r--r--docs/ref/models/querysets.txt10
3 files changed, 12 insertions, 10 deletions
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 8116fab3b5..e444067820 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -536,8 +536,8 @@ For example::
.. versionchanged:: 1.7
- In previous versions only instances of the exact same class and same
- primary key value were considered equal.
+ In previous versions only instances of the exact same class and same
+ primary key value were considered equal.
``__hash__``
------------
@@ -553,8 +553,8 @@ in Python`_).
.. versionchanged:: 1.7
- In previous versions instance's without primary key value were
- hashable.
+ In previous versions instance's without primary key value were
+ hashable.
.. _is forbidden in Python: http://docs.python.org/reference/datamodel.html#object.__hash__
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index ef56b251a0..6b0a931e69 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -323,8 +323,8 @@ Django quotes column and table names behind the scenes.
.. versionchanged:: 1.7
- The ``ValidationError`` raised during model validation when the
- constraint is violated has the ``unique_together`` error code.
+ The ``ValidationError`` raised during model validation when the
+ constraint is violated has the ``unique_together`` error code.
``index_together``
------------------
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 9fe3b61eec..d3f6653be2 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -825,12 +825,14 @@ If you need to clear the list of related fields added by past calls of
>>> without_relations = queryset.select_related(None)
+Chaining ``select_related`` calls works in a similar way to other methods -
+that is that ``select_related('foo', 'bar')`` is equivalent to
+``select_related('foo').select_related('bar')``.
+
.. versionchanged:: 1.7
-Chaining ``select_related`` calls now works in a similar way to other methods -
-that is that ``select_related('foo', 'bar')`` is equivalent to
-``select_related('foo').select_related('bar')``. Previously the latter would
-have been equivalent to ``select_related('bar')``.
+ Previously the latter would have been equivalent to
+ ``select_related('bar')``.
prefetch_related
~~~~~~~~~~~~~~~~