aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlton Gibson2014-08-18 13:48:46 +0200
committerCarlton Gibson2014-08-18 13:48:46 +0200
commitae2ab496c2fa42ed60d325df4579b1ba38d3bfb5 (patch)
tree2e89be5fad16af07df16230b871c59b36f73c968
parentd98245ac2234c2377a6243f8314b31fd68c902af (diff)
downloaddjango-rest-framework-ae2ab496c2fa42ed60d325df4579b1ba38d3bfb5.tar.bz2
Updated docs for South v1.0
-rwxr-xr-xdocs/api-guide/authentication.md11
-rw-r--r--docs/topics/release-notes.md7
2 files changed, 4 insertions, 14 deletions
diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index ad6257dd..ee59b375 100755
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -204,18 +204,11 @@ Note that the default `obtain_auth_token` view explicitly uses JSON requests and
#### Schema migrations
-The `rest_framework.authtoken` app includes both a Django native migration (for Django versions >1.7) and a south migration that will create the authtoken table.
+The `rest_framework.authtoken` app includes both Django native migrations (for Django versions >1.7) and South migrations (for Django versions <1.7) that will create the authtoken table.
----
-**Note** By default both Django (>1.7) and South will look for a module named `migrations`. To avoid a collision here, in order to use South you **must** provide the `SOUTH_MIGRATION_MODULES` option in your `settings.py`:
-
-
- SOUTH_MIGRATION_MODULES = {
- 'authtoken': 'rest_framework.authtoken.south_migrations',
- }
-
-This tells South to look in the `south_migrations` module for the `authtoken` app.
+**Note**: From REST Framework v2.4.0 using South with Django <1.7 requires upgrading South v1.0+
----
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 9c87c6c1..b0e5b198 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -42,12 +42,9 @@ You can determine your currently installed version using `pip freeze`:
* Added compatibility with Django 1.7's native migrations.
- **IMPORTANT**: In order to continue to use south with Django <1.7 you **must** provide
- the `SOUTH_MIGRATION_MODULES` option in your `settings.py`:
+ **IMPORTANT**: In order to continue to use South with Django <1.7 you **must** upgrade to
+ South v1.0.
- SOUTH_MIGRATION_MODULES = {
- 'authtoken': 'rest_framework.authtoken.south_migrations',
- }
* Use py.test
* `@detail_route` and `@list_route` decorators replace `@action` and `@link`.
* `six` no longer bundled. For Django <= 1.4.1, install `six` package.