diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-14 04:15:09 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-14 04:15:09 -0500 |
| commit | 0dd383d5c160460a66cef5fce46a4d4e7c6fe167 (patch) | |
| tree | fe7c2a0f7516e1c8b59adfa747441e0d8db30061 /docs | |
| parent | ad3c25bac043e9d14ce8ffe1b03ae6d0e92b3b0e (diff) | |
| parent | 9ed1e0ba957c36f6ae29c25ffeaa6c2c02f716a9 (diff) | |
| download | pyramid-0dd383d5c160460a66cef5fce46a4d4e7c6fe167.tar.gz pyramid-0dd383d5c160460a66cef5fce46a4d4e7c6fe167.tar.bz2 pyramid-0dd383d5c160460a66cef5fce46a4d4e7c6fe167.zip | |
Merge branch 'master' into 1.3-branch
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/designdefense.rst | 4 | ||||
| -rw-r--r-- | docs/narr/views.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst index 59b0e5a2d..84b6be907 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -219,7 +219,7 @@ is this: Using such wrappers, we strive to always hide the ZCA API from application developers. Application developers should just never know about the ZCA API: they should call a Python function with some object germane to the domain as -an argument, and it should returns a result. A corollary that follows is +an argument, and it should return a result. A corollary that follows is that any reader of an application that has been written using :app:`Pyramid` needn't understand the ZCA API either. @@ -720,7 +720,7 @@ microframeworks and Django boast. The :mod:`zope.component`, package on which :app:`Pyramid` depends has transitive dependencies on several other packages (:mod:`zope.event`, and :mod:`zope.interface`). :app:`Pyramid` also has its own direct dependencies, -such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako` :term:`WebOb`, +such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako`, :term:`WebOb`, :mod:`zope.deprecation` and some of these in turn have their own transitive dependencies. diff --git a/docs/narr/views.rst b/docs/narr/views.rst index fa34cca61..dbc702de8 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -30,7 +30,7 @@ View Callables View callables are, at the risk of sounding obvious, callable Python objects. Specifically, view callables can be functions, classes, or instances -that implement an ``__call__`` method (making the instance callable). +that implement a ``__call__`` method (making the instance callable). View callables must, at a minimum, accept a single argument named ``request``. This argument represents a :app:`Pyramid` :term:`Request` |