Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

3 files changed, 3 insertions, 3 deletions

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 71f0abb7..9b6a547f 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -39,7 +39,7 @@ Declaring a serializer looks very similar to declaring a form:
             an existing model instance, or create a new model instance.
             """
             if instance is not None:
-                instance.title = attrs.get('title', instance.title)
+                instance.email = attrs.get('email', instance.email)
                 instance.content = attrs.get('content', instance.content)
                 instance.created = attrs.get('created', instance.created)
                 return instance
diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 2783da98..79257e2a 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -209,8 +209,6 @@ To create a base viewset class that provides `create`, `list` and `retrieve` ope
                                     mixins.ListMixin,
                                     mixins.RetrieveMixin,
                                     viewsets.GenericViewSet):
-        pass
-
         """
         A viewset that provides `retrieve`, `update`, and `list` actions.
         
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index db522922..b4bd3561 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -140,6 +140,7 @@ The following people have helped make REST framework great.
 * Alex Burgel - [aburgel]
 * David Medina - [copitux]
 * Areski Belaid - [areski]
+* Ethan Freman - [mindlace]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -316,3 +317,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [aburgel]: https://github.com/aburgel
 [copitux]: https://github.com/copitux
 [areski]: https://github.com/areski
+[mindlace]: https://github.com/mindlace