aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/fields.md
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 /docs/api-guide/fields.md
parent470134ae9bbfcba71ccc07451b2485fba314723d (diff)
downloaddjango-rest-framework-fd2c291c4d9243937a31e0e6f523016067824b83.tar.bz2
Typo on api-guide/fields.md and serializers.py
Diffstat (limited to 'docs/api-guide/fields.md')
-rw-r--r--docs/api-guide/fields.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 962c49e2..4272c9a7 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -299,9 +299,9 @@ Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files.
# Custom fields
-If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods. These two methods are used to convert between the initial datatype, and a primative, serializable datatype. Primative datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primative objects.
+If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primitive objects.
-The `.to_native()` method is called to convert the initial datatype into a primative, serializable datatype. The `from_native()` method is called to restore a primative datatype into it's initial representation.
+The `.to_native()` method is called to convert the initial datatype into a primitive, serializable datatype. The `from_native()` method is called to restore a primitive datatype into it's initial representation.
## Examples