From 1f67b9ba9c4ede9b3fa93ba798c5ec777ff3ad69 Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Tue, 6 Nov 2012 20:53:09 +0100
Subject: added changelog entry and fixed old one

---
 docs/topics/release-notes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 7eaf4f79..e7007aab 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`
+* Hyperlinked related fields 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.
-- 
cgit v1.2.3


From 62fc5b80ef7a9a9f60961929be471fb60f295daf Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Tue, 6 Nov 2012 20:54:48 +0100
Subject: fixed field name

---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index e7007aab..c878144a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -7,7 +7,7 @@
 ## Master
 
 * Support use of HTML exception templates.  Eg. `403.html`
-* Hyperlinked related fields optionally take `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments.
+* HyperlinkedIdentityField optionally take `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments.
 
 ## 2.1.0
 
-- 
cgit v1.2.3


From 4136b7e44b85c7c887ab0c4379288512aa67fc64 Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Tue, 6 Nov 2012 21:11:05 +0100
Subject: fixed typo in html status code

---
 docs/api-guide/status-codes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md
index 401f45ce..b50c96ae 100644
--- a/docs/api-guide/status-codes.md
+++ b/docs/api-guide/status-codes.md
@@ -87,7 +87,7 @@ Response status codes beginning with the digit "5" indicate cases in which the s
     HTTP_503_SERVICE_UNAVAILABLE
     HTTP_504_GATEWAY_TIMEOUT
     HTTP_505_HTTP_VERSION_NOT_SUPPORTED
-    HTTP_511_NETWORD_AUTHENTICATION_REQUIRED
+    HTTP_511_NETWORK_AUTHENTICATION_REQUIRED
 
 
 [rfc2324]: http://www.ietf.org/rfc/rfc2324.txt
-- 
cgit v1.2.3


From e02a8470e8d32348a9bd7714e1f27cf6e55b5cda Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Tue, 6 Nov 2012 21:18:49 +0100
Subject: fixed typo

---
 docs/api-guide/serializers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index ee7f72dd..0cdae1ce 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -190,7 +190,7 @@ As an example, let's create a field that can be used represent the class name of
 # ModelSerializers
 
 Often you'll want serializer classes that map closely to model definitions.
-The `ModelSerializer` class lets you automatically create a Serializer class with fields that corrospond to the Model fields.
+The `ModelSerializer` class lets you automatically create a Serializer class with fields that correspond to the Model fields.
 
     class AccountSerializer(serializers.ModelSerializer):
         class Meta:
-- 
cgit v1.2.3


From 0356c5dca49a13d2c6487ea9e300accf9f0bac59 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 7 Nov 2012 11:34:31 +0000
Subject: Update release notes

---
 docs/topics/release-notes.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index c878144a..ecb6c91a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -4,10 +4,15 @@
 >
 > — Eric S. Raymond, [The Cathedral and the Bazaar][cite].
 
-## Master
+## 2.1.1
+
+**Date**: 7th Nov 2012
 
 * Support use of HTML exception templates.  Eg. `403.html`
-* HyperlinkedIdentityField optionally take `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments.
+* Hyperlinked fields take optional `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments.
+* Bugfix: Deal with optional trailing slashs properly when generating breadcrumbs.
+* Bugfix: Make textareas same width as other fields in browsable API.
+* Private API change: `.get_serializer` now uses same `instance` and `data` ordering as serializer initialization.
 
 ## 2.1.0
 
-- 
cgit v1.2.3