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 ` or :ref:`ManyToManyField ` to) apps with migrations. Read the :ref:`dependencies documentation ` 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 `_ + 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 --------------------