diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-23 14:02:53 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-23 14:02:53 -0400 |
| commit | 3835781dab5791282073252d2cee685668bc7b1e (patch) | |
| tree | e19be2ec32d516b85e2e5a89e7e8935caf517b4a /docs/narr | |
| parent | 070bfdbaa6f3cffbda3a0bfe86534e24ea01142c (diff) | |
| parent | 566a276a37fad8073206b46ec77b27498a126f02 (diff) | |
| download | pyramid-3835781dab5791282073252d2cee685668bc7b1e.tar.gz pyramid-3835781dab5791282073252d2cee685668bc7b1e.tar.bz2 pyramid-3835781dab5791282073252d2cee685668bc7b1e.zip | |
Merge branch 'master' into wrapviews
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/hooks.rst | 3 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index 2a6414e1f..985934736 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -601,6 +601,9 @@ to make sure the object implements every attribute and method outlined in :class:`pyramid.interfaces.IResponse` and you'll have to ensure that it's marked up with ``zope.interface.implements(IResponse)``: +.. code-block:: python + :linenos: + from pyramid.interfaces import IResponse from zope.interface import implements diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 6cc5a87e5..63c31d340 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -30,7 +30,7 @@ create web applications. own via a set of libraries if the framework provides a set of facilities that fits your application requirements. -Pyramid attempts to follow follow these design and engineering principles: +Pyramid attempts to follow these design and engineering principles: Simplicity :app:`Pyramid` takes a *"pay only for what you eat"* approach. You can get |