From ceb2aaf1d427ac592a9f2bb969454af3d0f729d1 Mon Sep 17 00:00:00 2001
From: Andrew Godwin <andrew@aeracode.org>
Date: Thu, 10 Jul 2014 10:00:09 -0700
Subject: [PATCH] Add south upgrade note to 1.7 release notes

---
 docs/releases/1.7.txt      | 6 ++++++
 docs/topics/migrations.txt | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 2df702c7a7..21be552081 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -72,6 +72,12 @@ but a few of the key features are:
   :ref:`ForeignKey <ref-foreignkey>` or :ref:`ManyToManyField <ref-manytomany>` to) apps with migrations. Read the
   :ref:`dependencies documentation <unmigrated-dependencies>` for more.
 
+
+* If you are upgrading from South, see our :ref:`upgrading-from-south`
+  documentation, and third-party app authors should read the
+  `South 1.0 release notes <http://south.readthedocs.org/en/latest/releasenotes/1.0.html#library-migration-path>`_
+  for details on how to support South and Django migrations simultaneously.
+
 .. _app-loading-refactor-17-release-note:
 
 App-loading refactor
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index b63ab48ecf..80a86dee20 100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -576,6 +576,8 @@ The decorator adds logic to capture and preserve the arguments on their
 way into your constructor, and then returns those arguments exactly when
 deconstruct() is called.
 
+.. _upgrading-from-south:
+
 Upgrading from South
 --------------------