summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2014-04-15 10:14:00 -0400
committerTres Seaver <tseaver@palladion.com>2014-04-15 10:14:00 -0400
commit133e75fe04e587a6d11e3a501b5e34793ef440bc (patch)
tree0b75a2df134cf89fb1d4770577e96b92f57c5266 /docs
parent7e795061639c1cebef68204ae49c5f19b8a50bc3 (diff)
parentac16ec2f722dcdaa45d0389ad87952bd6be6e389 (diff)
downloadpyramid-133e75fe04e587a6d11e3a501b5e34793ef440bc.tar.gz
pyramid-133e75fe04e587a6d11e3a501b5e34793ef440bc.tar.bz2
pyramid-133e75fe04e587a6d11e3a501b5e34793ef440bc.zip
Merge pull request #1295 from westurner/1181_default_response_content_type
DOC: Response.content_type defaults to text/html (#1181)
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/webob.rst11
1 files changed, 8 insertions, 3 deletions
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index f0a4b5a0b..6a331e4bf 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -408,6 +408,8 @@ Here are some highlights:
The content type *not* including the ``charset`` parameter.
Typical use: ``response.content_type = 'text/html'``.
+ Default value: ``response.content_type = 'text/html'``.
+
``response.charset``:
The ``charset`` parameter of the content-type, it also informs
encoding in ``response.unicode_body``.
@@ -466,9 +468,12 @@ argument to the class; e.g.:
from pyramid.response import Response
response = Response(body='hello world!', content_type='text/plain')
-The status defaults to ``'200 OK'``. The content_type does not default to
-anything, though if you subclass :class:`pyramid.response.Response` and set
-``default_content_type`` you can override this behavior.
+The status defaults to ``'200 OK'``.
+
+The value of content_type defaults to
+``webob.response.Response.default_content_type``; which is `text/html`.
+You can subclass :class:`pyramid.response.Response` and set
+``default_content_type`` to override this behavior.
.. index::
single: exception responses