summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbahoo <jon.c.culver@gmail.com>2014-10-27 14:16:39 -0700
committerTim Graham <timograham@gmail.com>2014-10-27 17:53:34 -0400
commitdea3eefa728df4c3919e7d5115af351ba28c6e7f (patch)
tree394c1adc16171706ac9b938c9879ee57f7ce24ed
parenta0cfd77971dc0e61427ca468e9b6ea9a548c796e (diff)
[1.7.x] Fixed typo in squashing migrations documentation
Backport of af7d66b4f2 from master
-rwxr-xr-xdocs/topics/migrations.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index dd5f5e7d1f..c43b256eff 100755
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -459,7 +459,7 @@ 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 them write it back out into a new set of
+be optimized through) - Django will then write it back out into a new set of
initial migration files.
These files are marked to say they replace the previously-squashed migrations,