diff options
| author | Tom Christie | 2012-09-07 10:17:47 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-09-07 10:17:47 +0100 |
| commit | 215de9af81007e81def7ee9f9590e0c12dfec272 (patch) | |
| tree | 4252f0a8d95876bb1b62f24064a9725c15ae3058 | |
| parent | da5a6243f30b274441bed9a6736566ca68c40e67 (diff) | |
| download | django-rest-framework-215de9af81007e81def7ee9f9590e0c12dfec272.tar.bz2 | |
Tidy up
| -rw-r--r-- | djangorestframework/settings.py | 5 | ||||
| -rw-r--r-- | docs/topics/contributing.md | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/djangorestframework/settings.py b/djangorestframework/settings.py index e0b6a5d5..8bb03555 100644 --- a/djangorestframework/settings.py +++ b/djangorestframework/settings.py @@ -25,6 +25,7 @@ DEFAULTS = { 'DEFAULT_RENDERERS': ( 'djangorestframework.renderers.JSONRenderer', 'djangorestframework.renderers.JSONPRenderer', + 'djangorestframework.renderers.DocumentingHTMLRenderer', 'djangorestframework.renderers.DocumentingPlainTextRenderer', ), 'DEFAULT_PARSERS': ( @@ -44,7 +45,9 @@ DEFAULTS = { 'FORM_METHOD_OVERRIDE': '_method', 'FORM_CONTENT_OVERRIDE': '_content', 'FORM_CONTENTTYPE_OVERRIDE': '_content_type', - 'URL_ACCEPT_OVERRIDE': '_accept' + 'URL_ACCEPT_OVERRIDE': '_accept', + + 'FORMAT_SUFFIX_KWARG': 'format' } diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index cbb41f2a..8e8b98ac 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -1,9 +1,5 @@ # Contributing to REST framework -## Accessing settings - -**Describe api_settings** - ## Managing compatibility issues **Describe compat module** |