aboutsummaryrefslogtreecommitdiffstats
path: root/docs/tutorial
diff options
context:
space:
mode:
authorPhilip Douglas2013-08-16 07:15:09 -0700
committerPhilip Douglas2013-08-16 07:15:09 -0700
commitef7ce344865938bea285a408a7cc415a7b90a83c (patch)
tree1bfa78c86e422f81cf836319d91c626c763d5b24 /docs/tutorial
parentc058ab36b13a6979c57760d9af2eb21ec3165e7d (diff)
parentc1ccd8b5b5aef1bd209862f9431c9c03e25ae755 (diff)
downloaddjango-rest-framework-ef7ce344865938bea285a408a7cc415a7b90a83c.tar.bz2
Merge pull request #3 from tomchristie/master
Update to latest
Diffstat (limited to 'docs/tutorial')
-rw-r--r--docs/tutorial/1-serialization.md2
-rw-r--r--docs/tutorial/3-class-based-views.md2
-rw-r--r--docs/tutorial/6-viewsets-and-routers.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index 2b214d6a..22d29285 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -236,7 +236,7 @@ Edit the `snippet/views.py` file, and add the following.
class JSONResponse(HttpResponse):
"""
- An HttpResponse that renders it's content into JSON.
+ An HttpResponse that renders its content into JSON.
"""
def __init__(self, data, **kwargs):
content = JSONRenderer().render(data)
diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md
index c1b3d8f2..9fc424fe 100644
--- a/docs/tutorial/3-class-based-views.md
+++ b/docs/tutorial/3-class-based-views.md
@@ -81,7 +81,7 @@ Okay, we're done. If you run the development server everything should be workin
One of the big wins of using class based views is that it allows us to easily compose reusable bits of behaviour.
-The create/retrieve/update/delete operations that we've been using so far are going to be pretty simliar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes.
+The create/retrieve/update/delete operations that we've been using so far are going to be pretty similar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes.
Let's take a look at how we can compose our views by using the mixin classes.
diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md
index f16add39..8a1a1ae0 100644
--- a/docs/tutorial/6-viewsets-and-routers.md
+++ b/docs/tutorial/6-viewsets-and-routers.md
@@ -10,7 +10,7 @@ A `ViewSet` class is only bound to a set of method handlers at the last moment,
Let's take our current set of views, and refactor them into view sets.
-First of all let's refactor our `UserList` and `UserDetail` views into a single `UserViewSet`. We can remove the two views, and replace then with a single class:
+First of all let's refactor our `UserList` and `UserDetail` views into a single `UserViewSet`. We can remove the two views, and replace them with a single class:
from rest_framework import viewsets