aboutsummaryrefslogtreecommitdiffstats
path: root/docs/tutorial/1-serialization.md
diff options
context:
space:
mode:
authorTom Christie2013-06-14 12:44:04 +0100
committerTom Christie2013-06-14 12:44:04 +0100
commit702ec128ba2880aba14a1d55b87b83deaa11055d (patch)
treec35a3e4cf4c17e31671cc484b3322e94f22cfe49 /docs/tutorial/1-serialization.md
parent34f34f40b89080936ac8881ba9e77836a2641153 (diff)
parent982411e6f44e4135e837e4896d902a01f543dec4 (diff)
downloaddjango-rest-framework-702ec128ba2880aba14a1d55b87b83deaa11055d.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/tutorial/1-serialization.md')
-rw-r--r--docs/tutorial/1-serialization.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index bbb9b73c..bc31d234 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -175,13 +175,13 @@ We've now got a few snippet instances to play with. Let's take a look at serial
serializer.data
# {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'}
-At this point we've translated the model instance into python native datatypes. To finalize the serialization process we render the data into `json`.
+At this point we've translated the model instance into Python native datatypes. To finalize the serialization process we render the data into `json`.
content = JSONRenderer().render(serializer.data)
content
# '{"pk": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}'
-Deserialization is similar. First we parse a stream into python native datatypes...
+Deserialization is similar. First we parse a stream into Python native datatypes...
import StringIO