Version 2.1.12.1.1

6 files changed, 16 insertions, 5 deletions

diff --git a/README.md b/README.md
index 7275761c..5d3e884d 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,16 @@ To run the tests.
 
 # Changelog
 
+## 2.1.1
+
+**Date**: 7th Nov 2012
+
+* Support use of HTML exception templates.  Eg. `403.html`
+* 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
 
 **Date**: 5th Nov 2012
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:
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
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 2115c252..ecb6c91a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -9,6 +9,7 @@
 **Date**: 7th Nov 2012
 
 * Support use of HTML exception templates.  Eg. `403.html`
+* 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.
@@ -21,7 +22,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.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 5aa2b889..fc99b879 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'
 
 VERSION = __version__  # synonym
diff --git a/rest_framework/status.py b/rest_framework/status.py
index f3a5e481..a1eb48da 100644
--- a/rest_framework/status.py
+++ b/rest_framework/status.py
@@ -49,4 +49,4 @@ HTTP_502_BAD_GATEWAY = 502
 HTTP_503_SERVICE_UNAVAILABLE = 503
 HTTP_504_GATEWAY_TIMEOUT = 504
 HTTP_505_HTTP_VERSION_NOT_SUPPORTED = 505
-HTTP_511_NETWORD_AUTHENTICATION_REQUIRED = 511
+HTTP_511_NETWORK_AUTHENTICATION_REQUIRED = 511