diff options
| author | Chris McDonough <chrism@plope.com> | 2012-04-13 04:49:11 -0700 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-04-13 04:49:11 -0700 |
| commit | 1a122e32ffe5f51abd5a5fb173226a5d86d6daf0 (patch) | |
| tree | 2079075b3280d8e9016b6e75288caee9f7570eb9 /docs | |
| parent | c74f15bbc40384d9ea25ef72a8a5cd8c4efded7c (diff) | |
| parent | 6751531f0eb874cb70f5f7decc129f592359311c (diff) | |
| download | pyramid-1a122e32ffe5f51abd5a5fb173226a5d86d6daf0.tar.gz pyramid-1a122e32ffe5f51abd5a5fb173226a5d86d6daf0.tar.bz2 pyramid-1a122e32ffe5f51abd5a5fb173226a5d86d6daf0.zip | |
Merge pull request #532 from ppaez/typos
Fix some typos
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/glossary.rst | 4 | ||||
| -rw-r--r-- | docs/narr/hooks.rst | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 60920a73a..88598354a 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -290,7 +290,7 @@ Glossary :term:`principal` (or principals) associated with a request. WSGI - `Web Server Gateway Interface <http://wsgi.org/>`_. This is a + `Web Server Gateway Interface <http://www.wsgi.org/>`_. This is a Python standard for connecting web applications to web servers, similar to the concept of Java Servlets. :app:`Pyramid` requires that your application be served as a WSGI application. @@ -299,7 +299,7 @@ Glossary *Middleware* is a :term:`WSGI` concept. It is a WSGI component that acts both as a server and an application. Interesting uses for middleware exist, such as caching, content-transport - encoding, and other functions. See `WSGI.org <http://wsgi.org>`_ + encoding, and other functions. See `WSGI.org <http://www.wsgi.org>`_ or `PyPI <http://python.org/pypi>`_ to find middleware for your application. diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index b6e3dd163..a2143b3c5 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -145,7 +145,7 @@ the view which generates it can be overridden as necessary. The :term:`forbidden view` callable is a view callable like any other. The :term:`view configuration` which causes it to be a "forbidden" view consists -of using the meth:`pyramid.config.Configurator.add_forbidden_view` API or the +of using the :meth:`pyramid.config.Configurator.add_forbidden_view` API or the :class:`pyramid.view.forbidden_view_config` decorator. For example, you can add a forbidden view by using the @@ -171,7 +171,7 @@ as a forbidden view: from pyramid.view import forbidden_view_config - forbidden_view_config() + @forbidden_view_config() def forbidden(request): return Response('forbidden') @@ -625,7 +625,7 @@ converts the arbitrary return value into something that implements :class:`~pyramid.interfaces.IResponse`. For example, if you'd like to allow view callables to return bare string -objects (without requiring a a :term:`renderer` to convert a string to a +objects (without requiring a :term:`renderer` to convert a string to a response object), you can register an adapter which converts the string to a Response: |
