summaryrefslogtreecommitdiff
path: root/docs/narr/webob.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-05 23:56:09 -0400
committerChris McDonough <chrism@plope.com>2014-05-05 23:56:09 -0400
commit7423971bf8aaa5fd205778820d91a6c7e3cea1bd (patch)
tree35130316c871ff0d8c41c3ad57a5f5cc1d876c7c /docs/narr/webob.rst
parent7a6bf6f0ff1b85d0158ad49fc21037db4999c1cf (diff)
parentf9bc568657f316f20b5f576085472b80dec15cba (diff)
downloadpyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.gz
pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.bz2
pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.zip
fix merge conflicts
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