summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Morley <emorley@mozilla.com>2017-01-17 13:43:21 +0000
committerTim Graham <timograham@gmail.com>2017-01-17 13:02:58 -0500
commitd1eda9b4ad47c7773e65d90fd882e9d07759fe41 (patch)
treefa8fe37d85d9ee2b4cba872244d50b67cd600045
parentf01ad1cb6a27669fd44b2079089e14f9dc4d3ca3 (diff)
Refs #24109 -- Doc'd the elidable feature in squashing migrations docs.
-rw-r--r--docs/topics/migrations.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index 0e1aaa7642..2be05903ae 100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -582,8 +582,8 @@ Once the operation sequence has been reduced as much as possible - the amount
possible depends on how closely intertwined your models are and if you have
any :class:`~django.db.migrations.operations.RunSQL`
or :class:`~django.db.migrations.operations.RunPython` operations (which can't
-be optimized through) - Django will then write it back out into a new set of
-migration files.
+be optimized through unless they are marked as ``elidable``) - Django will then
+write it back out into a new set of migration files.
These files are marked to say they replace the previously-squashed migrations,
so they can coexist with the old migration files, and Django will intelligently