diff options
| author | Chris McDonough <chrism@plope.com> | 2013-01-01 21:05:48 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-01-01 21:05:48 -0500 |
| commit | 1a19bf74afc768db45c77604c2cd33cc26af34c1 (patch) | |
| tree | ce6cfba28f4ad75a89e34f51c3ba363e34e873a4 /docs/narr | |
| parent | 96ab9f26990423f67045e5639a29579a1a76a71e (diff) | |
| parent | e0062294430dd1d30d31b9f8c0a2e6e9060bcb76 (diff) | |
| download | pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.gz pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.bz2 pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/firstapp.rst | 2 | ||||
| -rw-r--r-- | docs/narr/urldispatch.rst | 2 | ||||
| -rw-r--r-- | docs/narr/viewconfig.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst index ccaa6e9e2..0b85d68d3 100644 --- a/docs/narr/firstapp.rst +++ b/docs/narr/firstapp.rst @@ -228,7 +228,7 @@ listens only on the ``127.0.0.1`` interface, which is problematic if you're running the server on a remote system and you wish to access it with a web browser from a local system. We also specify a TCP port number to listen on, which is 8080, passing it as the second argument. The final argument is the -``app`` object (a :term:`router`), which is the the application we wish to +``app`` object (a :term:`router`), which is the application we wish to serve. Finally, we call the server's ``serve_forever`` method, which starts the main loop in which it will wait for requests from the outside world. diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index ecf3d026a..480b0e0cc 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -86,7 +86,7 @@ setup code. However, the above :term:`scan` execution ``config.scan('mypackage')`` will pick up all :term:`configuration decoration`, including any objects decorated with the :class:`pyramid.view.view_config` decorator in the ``mypackage`` Python -pakage. For example, if you have a ``views.py`` in your package, a scan will +package. For example, if you have a ``views.py`` in your package, a scan will pick up any of its configuration decorators, so we can add one there that that references ``myroute`` as a ``route_name`` parameter: diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index 6373a8d26..799de768f 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -986,7 +986,7 @@ there's a ``should_cache`` GET or POST variable: Note that the ``http_cache`` machinery will overwrite or add to caching headers you set within the view itself unless you use ``prevent_auto``. -You can also turn of the effect of ``http_cache`` entirely for the duration +You can also turn off the effect of ``http_cache`` entirely for the duration of a Pyramid application lifetime. To do so, set the ``PYRAMID_PREVENT_HTTP_CACHE`` environment variable or the ``pyramid.prevent_http_cache`` configuration value setting to a true value. |
