diff options
| author | Tom Christie | 2014-10-15 13:35:23 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-10-15 13:35:23 +0100 |
| commit | 22b27cbdc46a24c454c2fb7803c489aa65d9f9ba (patch) | |
| tree | 352e2a6c31dbcec28d9e461ac7c8523418f72e66 | |
| parent | 36fbc7678c3437dfe2d70380ab1b153429641bb5 (diff) | |
| parent | 9ffa97d24d6ced167fc9814f5c60ff52ece31f58 (diff) | |
| download | django-rest-framework-22b27cbdc46a24c454c2fb7803c489aa65d9f9ba.tar.bz2 | |
Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0
| -rw-r--r-- | docs/topics/3.0-announcement.md | 2 |
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. |