diff options
| author | Tom Christie | 2014-12-03 23:24:32 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-03 23:24:32 +0000 |
| commit | 5e6052811716a494e995a84c497579867ee6acaa (patch) | |
| tree | ee3b2a12ee552daac3a49862ae2fc6e934975b34 /docs/api-guide/settings.md | |
| parent | cd4d8660211e7af3b06986b68a9281be0b8ffacf (diff) | |
| parent | 3d6620c72a9cbaedecc37cc76e591a79409de305 (diff) | |
| download | django-rest-framework-5e6052811716a494e995a84c497579867ee6acaa.tar.bz2 | |
Merge branch 'jpadilla-yaml' into version-3.1
Diffstat (limited to 'docs/api-guide/settings.md')
| -rw-r--r-- | docs/api-guide/settings.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 9005511b..623d89fb 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -12,10 +12,10 @@ For example your project's `settings.py` file might include something like this: REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': ( - 'rest_framework.renderers.YAMLRenderer', + 'rest_framework.renderers.JSONRenderer', ), 'DEFAULT_PARSER_CLASSES': ( - 'rest_framework.parsers.YAMLParser', + 'rest_framework.parsers.JSONParser', ) } |