summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-25 00:48:03 -0500
committerChris McDonough <chrism@plope.com>2011-01-25 00:48:03 -0500
commit2b529a0d2099b45cf79d2794c0f1375ceab49e0e (patch)
treed48df141d5d76057e67e3b0cde274035d96fdc28 /docs
parent6482f7bc2891d51916237f763c80b6f50f5039a1 (diff)
parent522c236157016f416c122060f52efda275a38a5d (diff)
downloadpyramid-2b529a0d2099b45cf79d2794c0f1375ceab49e0e.tar.gz
pyramid-2b529a0d2099b45cf79d2794c0f1375ceab49e0e.tar.bz2
pyramid-2b529a0d2099b45cf79d2794c0f1375ceab49e0e.zip
Merge branch 'michr-master'
Diffstat (limited to 'docs')
-rw-r--r--docs/designdefense.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 740313486..c37ae61ce 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -599,7 +599,7 @@ the method is called (if possible) with its argument list filled with values
mentioned therein. TurboGears and Pylons 1.X operate similarly.
Out of the box, :app:`Pyramid` is configured to have none of these features.
-By default, :mod:`pyramid` view callables always accept only ``reqest`` and
+By default, :mod:`pyramid` view callables always accept only ``request`` and
no other arguments. The rationale: this argument specification matching done
aggressively can be costly, and :app:`Pyramid` has performance as one of its
main goals, so we've decided to make people, by default, obtain information