summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-22 12:37:35 -0500
committerChris McDonough <chrism@plope.com>2010-12-22 12:37:35 -0500
commitd9419fb90c161b9b05e87bca175909a28d93cc28 (patch)
tree9a16e7c66aa9c3aa4dc5c4177679bc83f805ac35 /docs
parent3283ef07b21a0095f665f719212f74a190a5bcff (diff)
parent37c485e9055343828751b197cafa4d1b90aefe1c (diff)
downloadpyramid-d9419fb90c161b9b05e87bca175909a28d93cc28.tar.gz
pyramid-d9419fb90c161b9b05e87bca175909a28d93cc28.tar.bz2
pyramid-d9419fb90c161b9b05e87bca175909a28d93cc28.zip
Merge branch 'master' of github.com:Pylons/pyramid
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 5aa149824..a3c533e7e 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -1250,7 +1250,7 @@ The contents of ``config.py``:
If we cd to the directory that holds these files and we run ``python
app.py`` given the directory structure and code above, what happens?
-Presuably, our ``decorator`` decorator will be used twice, once by the
+Presumably, our ``decorator`` decorator will be used twice, once by the
decorated function ``foo`` in ``app.py`` and once by the decorated
function ``bar`` in ``app2.py``. Since each time the decorator is
used, the list ``L`` in ``config.py`` is appended to, we'd expect a