diff options
| author | Markus Törnqvist | 2013-05-18 18:13:31 +0300 |
|---|---|---|
| committer | Markus Törnqvist | 2013-05-18 18:13:31 +0300 |
| commit | 48c1b2233bbfb242b68d495f51f0f177b40aa7c4 (patch) | |
| tree | 86a1630fe959518b53fcd21ccacabb43cb41ff04 /docs/api-guide/renderers.md | |
| parent | 2795e842d60c4f1759129ab46bad6ba3e62195aa (diff) | |
| parent | 3f47eb7a77fcc735782dd1bf8e8e053e26417ea1 (diff) | |
| download | django-rest-framework-48c1b2233bbfb242b68d495f51f0f177b40aa7c4.tar.bz2 | |
Merge branch 'master' into mjtorn-master
Conflicts:
rest_framework/serializers.py
rest_framework/tests/serializer.py
Fixed conflicts
Diffstat (limited to 'docs/api-guide/renderers.md')
| -rw-r--r-- | docs/api-guide/renderers.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index ed733c65..b9a9fd7a 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -274,6 +274,8 @@ Exceptions raised and handled by an HTML renderer will attempt to render using o Templates will render with a `RequestContext` which includes the `status_code` and `details` keys. +**Note**: If `DEBUG=True`, Django's standard traceback error page will be displayed instead of rendering the HTTP status code and text. + --- # Third party packages |