From 530f7a21b3d28ddb24da036e0af6fd7b0a9a2304 Mon Sep 17 00:00:00 2001
From: Brent O'Connor
Date: Wed, 17 Dec 2014 10:19:15 -0600
Subject: Fixed a typo

---
 docs/tutorial/1-serialization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/tutorial/1-serialization.md')

diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index dea43cc0..20b9d889 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -200,7 +200,7 @@ Open the file `snippets/serializers.py` again, and edit the `SnippetSerializer`
             model = Snippet
             fields = ('id', 'title', 'code', 'linenos', 'language', 'style')
 
-One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manange.py shell`, then try the following:
+One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manage.py shell`, then try the following:
 
     >>> from snippets.serializers import SnippetSerializer
     >>> serializer = SnippetSerializer()
-- 
cgit v1.2.3


From 90b8f9221e633797c5ab6a25e6c2a14805d459af Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 17 Dec 2014 16:23:00 +0000
Subject: Use six.BytesIO in tutorial. Closes #2296.

---
 docs/tutorial/1-serialization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/tutorial/1-serialization.md')

diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index dea43cc0..aab5ce71 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -163,7 +163,7 @@ Deserialization is similar.  First we parse a stream into Python native datatype
 
     # This import will use either `StringIO.StringIO` or `io.BytesIO`
     # as appropriate, depending on if we're running Python 2 or Python 3.
-    from rest_framework.compat import BytesIO
+    from django.utils.six import BytesIO
 
     stream = BytesIO(content)
     data = JSONParser().parse(stream)
-- 
cgit v1.2.3


From eeb6e340644eba70b2fd41100db34b159ae6f091 Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin
Date: Wed, 17 Dec 2014 17:28:11 +0100
Subject: Docs/tutorial import fixes. Refs #2296

---
 docs/tutorial/1-serialization.md | 2 --
 1 file changed, 2 deletions(-)

(limited to 'docs/tutorial/1-serialization.md')

diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index b1baf0dd..ff507a2b 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -161,8 +161,6 @@ At this point we've translated the model instance into Python native datatypes.
 
 Deserialization is similar.  First we parse a stream into Python native datatypes...
 
-    # This import will use either `StringIO.StringIO` or `io.BytesIO`
-    # as appropriate, depending on if we're running Python 2 or Python 3.
     from django.utils.six import BytesIO
 
     stream = BytesIO(content)
-- 
cgit v1.2.3