summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2015-01-11 00:30:47 +0100
committerMarkus Holtermann <info@markusholtermann.eu>2015-01-11 00:30:47 +0100
commitbe158e36251df0b07556657da47cdaf10913c57a (patch)
tree8177569c6e5c9975884ebe7f2caba569e132db38
parentfdc2cc948725866212a9bcc97b9b7cf21bb49b90 (diff)
Refs #24110 -- Added a more descriptive release note and fixed a spelling mistake.
-rw-r--r--django/db/migrations/migration.py2
-rw-r--r--docs/releases/1.7.3.txt3
2 files changed, 3 insertions, 2 deletions
diff --git a/django/db/migrations/migration.py b/django/db/migrations/migration.py
index 061f37c391..71e662db67 100644
--- a/django/db/migrations/migration.py
+++ b/django/db/migrations/migration.py
@@ -119,7 +119,7 @@ class Migration(object):
The backwards migration process consists of two phases:
1. The intermediate states from right before the first until right
- after the last opertion inside this migration are preserved.
+ after the last operation inside this migration are preserved.
2. The operations are applied in reverse order using the states
recorded in step 1.
"""
diff --git a/docs/releases/1.7.3.txt b/docs/releases/1.7.3.txt
index 3b748b636a..cc824b0ef6 100644
--- a/docs/releases/1.7.3.txt
+++ b/docs/releases/1.7.3.txt
@@ -27,4 +27,5 @@ Bugfixes
* Added correct formats for Greek (``el``) (:ticket:`23967`).
-* Fixed a migration crash when unapplying a migration (:ticket:`24110`).
+* Fixed a migration crash when unapplying a migration where multiple operations
+ interact with the same model (:ticket:`24110`).