diff options
| author | Tom Christie | 2013-11-11 01:58:43 -0800 |
|---|---|---|
| committer | Tom Christie | 2013-11-11 01:58:43 -0800 |
| commit | b65b43c7326ce3ee236ac11da60673232fcf7ebe (patch) | |
| tree | 5540ddc17ccaa44eda8d8944d64bf71ab0b81383 /rest_framework/serializers.py | |
| parent | 470134ae9bbfcba71ccc07451b2485fba314723d (diff) | |
| parent | fd2c291c4d9243937a31e0e6f523016067824b83 (diff) | |
| download | django-rest-framework-b65b43c7326ce3ee236ac11da60673232fcf7ebe.tar.bz2 | |
Merge pull request #1219 from sepeth/fix-documentation-typo
Typo on api-guide/fields.md and serializers.py
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 4 |
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 |