aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
diff options
context:
space:
mode:
authorTom Christie2012-11-05 08:35:54 -0800
committerTom Christie2012-11-05 08:35:54 -0800
commitb87f01aa54739ad82e090da1622e4f711a364402 (patch)
tree3392dd47c9d2186ec9477b2523b685c6349a3376 /docs/topics
parent33217db33e924c6a5d43416edf4e83f50bff7ee3 (diff)
parent6d201c362f030f6b3570247c4f8152a4d9c1e90f (diff)
downloaddjango-rest-framework-b87f01aa54739ad82e090da1622e4f711a364402.tar.bz2
Merge pull request #371 from tomchristie/serializer-fixes
Serializer fixes
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/release-notes.md16
1 files changed, 12 insertions, 4 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 14d910bd..6e7008f1 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -4,11 +4,18 @@
>
> — Eric S. Raymond, [The Cathedral and the Bazaar][cite].
-## Master
+## 2.1.0
+**Date**: 5th Nov 2012
+
+**Warning**: Please read [this thread][2.1.0-notes] regarding the `instance` and `data` keyword args before updating to 2.1.0.
+
+* **Serializer `instance` and `data` keyword args have their position swapped.**
+* `queryset` argument is now optional on writable model fields.
* Support Django's cache framework.
* Minor field improvements. (Don't stringify dicts, more robust many-pk fields.)
-* Bugfixes (Support choice field in Browseable API)
+* Bugfix: Support choice field in Browseable API.
+* Bugfix: Related fields with `read_only=True` do not require a `queryset` argument.
## 2.0.2
@@ -29,7 +36,7 @@
**Date**: 30th Oct 2012
* **Fix all of the things.** (Well, almost.)
-* For more information please see the [2.0 migration guide][migration].
+* For more information please see the [2.0 announcement][announcement].
---
@@ -135,4 +142,5 @@
* Initial release.
[cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html
-[migration]: migration.md \ No newline at end of file
+[2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion
+[announcement]: rest-framework-2-announcement.md \ No newline at end of file