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

4 files changed, 6 insertions, 4 deletions

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 859e8d52..784aa585 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -195,9 +195,9 @@ For more details on using filter sets see the [django-filter documentation][djan
 
 ## SearchFilter
 
-The `SearchFilterBackend` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin].
+The `SearchFilter` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin].
 
-The `SearchFilterBackend` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text type fields on the model, such as `CharField` or `TextField`.
+The `SearchFilter` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text type fields on the model, such as `CharField` or `TextField`.
 
     class UserListView(generics.ListAPIView):
         queryset = User.objects.all()
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 4483f170..b5dce504 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -169,6 +169,7 @@ The following people have helped make REST framework great.
 * Edmond Wong - [edmondwong]
 * Ben Reilly - [bwreilly]
 * Tai Lee - [mrmachine]
+* Markus Kaiserswerth - [mkai]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -374,3 +375,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [edmondwong]: https://github.com/edmondwong
 [bwreilly]: https://github.com/bwreilly
 [mrmachine]: https://github.com/mrmachine
+[mkai]: https://github.com/mkai
diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md
index 30966a10..6ff97f37 100644
--- a/docs/tutorial/2-requests-and-responses.md
+++ b/docs/tutorial/2-requests-and-responses.md
@@ -147,7 +147,7 @@ Similarly, we can control the format of the request that we send, using the `Con
     # POST using form data
     curl -X POST http://127.0.0.1:8000/snippets/ -d "code=print 123"
 
-    {"id": 3, "title": "", "code": "123", "linenos": false, "language": "python", "style": "friendly"}
+    {"id": 3, "title": "", "code": "print 123", "linenos": false, "language": "python", "style": "friendly"}
     
     # POST using JSON
     curl -X POST http://127.0.0.1:8000/snippets/ -d '{"code": "print 456"}' -H "Content-Type: application/json"
diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 06eec3c4..80bb9abb 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -85,7 +85,7 @@ Right, we'd better write some views then.  Open `quickstart/views.py` and get ty
         queryset = Group.objects.all()
         serializer_class = GroupSerializer
 
-Rather that write multiple views we're grouping together all the common behavior into classes called `ViewSets`.
+Rather than write multiple views we're grouping together all the common behavior into classes called `ViewSets`.
 
 We can easily break these down into individual views if we need to, but using viewsets keeps the view logic nicely organized as well as being very concise.