summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-01 00:59:19 -0400
committerChris McDonough <chrism@plope.com>2011-07-01 00:59:19 -0400
commit34ff72bdbf7ab819ef3b46d12a6e6e9eba7be7a2 (patch)
tree739c34ad0d22a860702dd962e7a8d8e2e58539ee
parentc1f3d0fd89eb7f62a7de365ca5c0ef5600ffd900 (diff)
parentc1ca091144bb7c12b1003f448072630e24b1cf0a (diff)
downloadpyramid-34ff72bdbf7ab819ef3b46d12a6e6e9eba7be7a2.tar.gz
pyramid-34ff72bdbf7ab819ef3b46d12a6e6e9eba7be7a2.tar.bz2
pyramid-34ff72bdbf7ab819ef3b46d12a6e6e9eba7be7a2.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/config.py b/pyramid/config.py
index 3681e48ee..d27d35464 100644
--- a/pyramid/config.py
+++ b/pyramid/config.py
@@ -1157,7 +1157,7 @@ class Configurator(object):
request_method
- This value can either be one of the strings ``GET``,
+ This value can be one of the strings ``GET``,
``POST``, ``PUT``, ``DELETE``, or ``HEAD`` representing an
HTTP ``REQUEST_METHOD``. A view declaration with this
argument ensures that the view will only be called when the