summaryrefslogtreecommitdiff
path: root/docs/narr/webob.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-08-06 11:59:45 -0500
committerMichael Merickel <michael@merickel.org>2014-08-06 11:59:45 -0500
commit9279468d0e4d411652a735e28839bd8a5504ced6 (patch)
tree580c1efc1044325a20a242a212d647b81cde6088 /docs/narr/webob.rst
parent407b335ed9954c042377fd2e060c36edcd07cf60 (diff)
parent3587a53dc28b8f6411816ccd7fd8fdee0d88acb4 (diff)
downloadpyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.gz
pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.bz2
pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to 'docs/narr/webob.rst')
-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