aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTom Christie2014-10-15 13:31:55 +0100
committerTom Christie2014-10-15 13:31:55 +0100
commit9ffa97d24d6ced167fc9814f5c60ff52ece31f58 (patch)
treeeb9ee737ed96a1ffd08dd5fe4339b1f32f1d2020 /docs
parentcc1c4232554153ac6a24b6b4f89ecaac80b28bfd (diff)
parentf8f101268e1d3ff0621c61299c13d78914874a2b (diff)
downloaddjango-rest-framework-9ffa97d24d6ced167fc9814f5c60ff52ece31f58.tar.bz2
Merge pull request #1956 from wolfe/patch-1
Update 3.0-announcement.md
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/3.0-announcement.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md
index aa0e0c7e..dcd6d90c 100644
--- a/docs/topics/3.0-announcement.md
+++ b/docs/topics/3.0-announcement.md
@@ -518,7 +518,7 @@ The `MultipleChoiceField` class has been added. This field acts like `ChoiceFiel
#### Changes to the custom field API.
-The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_representation(self, value)` and `to_internal_value(self, data)`.
+The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_internal_value(self, data)` and `to_representation(self, value)`.
The `field_from_native()` and `field_to_native()` methods are removed.