aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-12-09 09:55:42 +0000
committerTom Christie2013-12-09 09:55:42 +0000
commit124e996b53512c93f3bfbee7c5cd5e01b0f1979f (patch)
tree002edd3c54c5ffc50bac1b84f356ff77869a207e
parente9dbffb602cf925ce126840db8be6e13277e7b83 (diff)
downloaddjango-rest-framework-124e996b53512c93f3bfbee7c5cd5e01b0f1979f.tar.bz2
Update release notes
-rw-r--r--api-guide/serializers.html2
-rw-r--r--topics/release-notes.html4
2 files changed, 5 insertions, 1 deletions
diff --git a/api-guide/serializers.html b/api-guide/serializers.html
index f9ecb9f0..ce04b3f3 100644
--- a/api-guide/serializers.html
+++ b/api-guide/serializers.html
@@ -548,7 +548,7 @@ The <code>ModelSerializer</code> class lets you automatically create a Serialize
fields = ('url', 'account_name', 'users', 'created')
lookup_field = 'slug'
</code></pre>
-<p>Not that the <code>lookup_field</code> will be used as the default on <em>all</em> hyperlinked fields, including both the URL identity, and any hyperlinked relationships.</p>
+<p>Note that the <code>lookup_field</code> will be used as the default on <em>all</em> hyperlinked fields, including both the URL identity, and any hyperlinked relationships.</p>
<p>For more specific requirements such as specifying a different lookup for each field, you'll want to set the fields on the serializer explicitly. For example:</p>
<pre class="prettyprint lang-py"><code>class AccountSerializer(serializers.HyperlinkedModelSerializer):
url = serializers.HyperlinkedIdentityField(
diff --git a/topics/release-notes.html b/topics/release-notes.html
index 6a920566..2f8fe69c 100644
--- a/topics/release-notes.html
+++ b/topics/release-notes.html
@@ -244,6 +244,10 @@
</code></pre>
<hr />
<h2 id="23x-series">2.3.x series</h2>
+<h3 id="master">Master</h3>
+<ul>
+<li>JSON renderer now deals with objects that implement a dict-like interface.</li>
+</ul>
<h3 id="2310">2.3.10</h3>
<p><strong>Date</strong>: 6th December 2013</p>
<ul>