aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
diff options
context:
space:
mode:
authorTom Christie2012-11-06 12:01:31 -0800
committerTom Christie2012-11-06 12:01:31 -0800
commita49285fe9a3711bba04ecabb4ad43a262eab3de3 (patch)
tree064d14f48d065ea6a1cac601ec142e8b67a29bfb /docs/topics
parent6d3bb67aa654d5f4c555746655a312000422d474 (diff)
parent62fc5b80ef7a9a9f60961929be471fb60f295daf (diff)
downloaddjango-rest-framework-a49285fe9a3711bba04ecabb4ad43a262eab3de3.tar.bz2
Merge pull request #379 from minddust/master
added changelog entry and fixed old one
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/release-notes.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 7eaf4f79..c878144a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -7,6 +7,7 @@
## Master
* Support use of HTML exception templates. Eg. `403.html`
+* HyperlinkedIdentityField optionally take `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments.
## 2.1.0
@@ -16,7 +17,7 @@
* **Serializer `instance` and `data` keyword args have their position swapped.**
* `queryset` argument is now optional on writable model fields.
-* Hyperlinked related fields optionally take `slug_field` and `slug_field_kwarg` arguments.
+* Hyperlinked related fields optionally take `slug_field` and `slug_url_kwarg` arguments.
* Support Django's cache framework.
* Minor field improvements. (Don't stringify dicts, more robust many-pk fields.)
* Bugfix: Support choice field in Browseable API.