summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-10-19 04:02:29 -0700
committerSteve Piercy <web@stevepiercy.com>2015-10-19 04:02:29 -0700
commitb8735932b92dd255b5dba467d8f52b9014e06544 (patch)
tree63fcb1a7976e5aa421bdc884af1f890f8ae6493d
parent3f1e0c7e4eee73af6c58bd7b8b42560754090d29 (diff)
parentf016cdfdb7a6b8ac20784bdab8f9fcff13a634e1 (diff)
downloadpyramid-b8735932b92dd255b5dba467d8f52b9014e06544.tar.gz
pyramid-b8735932b92dd255b5dba467d8f52b9014e06544.tar.bz2
pyramid-b8735932b92dd255b5dba467d8f52b9014e06544.zip
Merge pull request #2010 from stevepiercy/master
resolve whitespace diff between master and 1.6-branch
-rw-r--r--docs/narr/viewconfig.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index a7d0848ca..0bd52b6e2 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -311,7 +311,7 @@ configured view.
view declaration with this argument ensures that the view will only be called
when the ``method`` attribute of the request (i.e., the ``REQUEST_METHOD`` of
the WSGI environment) matches a supplied value.
-
+
.. versionchanged:: 1.4
The use of ``"GET"`` also implies that the view will respond to ``"HEAD"``.
@@ -972,7 +972,7 @@ responses when they occur unexpectedly due to an application registry
misconfiguration. To debug these errors, use the ``PYRAMID_DEBUG_NOTFOUND``
environment variable or the ``pyramid.debug_notfound`` configuration file
setting. Details of why a view was not found will be printed to ``stderr``,
-and the browser representation of the error will include the same information.
+and the browser representation of the error will include the same information.
See :ref:`environment_chapter` for more information about how, and where to set
these values.