From 81b55fb90078788bfdc064550f2ff9da2c79d3b6 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 29 Oct 2015 16:41:26 -0400
Subject: [PATCH] Fixed #25100 -- Documented an upgrade caveat for contenttypes
 migration.

---
 docs/releases/1.8.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index eb2260aa91a..6df9edd6e6e 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -1179,6 +1179,12 @@ Miscellaneous
   has been removed by a migration and replaced by a property. That means it's
   not possible to query or filter a ``ContentType`` by this field any longer.
 
+  Be careful if you upgrade to Django 1.8 and skip Django 1.7. If you run
+  ``manage.py migrate --fake``, this migration will be skipped and you'll see
+  a ``RuntimeError: Error creating new content types.`` exception because the
+  ``name`` column won't be dropped from the database. Use ``migrate.py migrate
+  --fake-initial`` to fake only the initial migration instead.
+
 * :djadmin:`migrate` now accepts the :djadminopt:`--fake-initial` option to
   allow faking initial migrations. In 1.7 initial migrations were always
   automatically faked if all tables created in an initial migration already