aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorDoğan Çeçen2013-11-11 11:54:30 +0200
committerDoğan Çeçen2013-11-11 11:54:30 +0200
commitfd2c291c4d9243937a31e0e6f523016067824b83 (patch)
tree5540ddc17ccaa44eda8d8944d64bf71ab0b81383 /rest_framework/serializers.py
parent470134ae9bbfcba71ccc07451b2485fba314723d (diff)
downloaddjango-rest-framework-fd2c291c4d9243937a31e0e6f523016067824b83.tar.bz2
Typo on api-guide/fields.md and serializers.py
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 16095452..163abf4f 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -6,8 +6,8 @@ form encoded input.
Serialization in REST framework is a two-phase process:
1. Serializers marshal between complex types like model instances, and
-python primatives.
-2. The process of marshalling between python primatives and request and
+python primitives.
+2. The process of marshalling between python primitives and request and
response content is handled by parsers and renderers.
"""
from __future__ import unicode_literals