Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0

docs/topics/3.0-announcement.md

@@ -748,7 +748,7 @@ You can revert this behavior, and display filenames in the representation by usi
 
 You can also modify serializer fields individually, using the `use_url` argument:
 
-    uploaded_file = serializers.FileField(user_url=False)
+    uploaded_file = serializers.FileField(use_url=False)
 
 Also note that you should pass the `request` object to the serializer as context when instantiating it, so that a fully qualified URL can be returned. Returned URLs will then be of the form `https://example.com/url_path/filename.txt`. For example:
 
@@ -790,7 +790,7 @@ You can modify this behavior globally by using the `COERCE_DECIMAL_TO_STRING` se
         'COERCE_DECIMAL_TO_STRING': False
     }
 
-Or modify it on an individual serializer field, using the `corece_to_string` keyword argument.
+Or modify it on an individual serializer field, using the `coerce_to_string` keyword argument.
 
     # Return `Decimal` instances in `serializer.data`, not strings.
     amount = serializers.DecimalField(