diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-15 15:40:53 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-15 15:40:53 -0400 |
| commit | 7a5f5612791210081db430aa707ed146a8e2c0e9 (patch) | |
| tree | 9f948b31b4aa014d121c9b49de0a16b171ef202a | |
| parent | 330c330655d5120b6556025765f3343b7a47ea87 (diff) | |
| download | pyramid-7a5f5612791210081db430aa707ed146a8e2c0e9.tar.gz pyramid-7a5f5612791210081db430aa707ed146a8e2c0e9.tar.bz2 pyramid-7a5f5612791210081db430aa707ed146a8e2c0e9.zip | |
remove bogus information about route_name, refer to the right method of Configurator when describing global_registries, add http_cache newness warning
| -rw-r--r-- | docs/api/config.rst | 6 | ||||
| -rw-r--r-- | pyramid/config.py | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 2c394ac41..96e955388 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -90,9 +90,9 @@ The set of registries that have been created for :app:`Pyramid` applications, one per each call to - :meth:`pyramid.config.Configurator.make_app` in the current process. The - object itself supports iteration and has a ``last`` property containing - the last registry loaded. + :meth:`pyramid.config.Configurator.make_wsgi_app` in the current + process. The object itself supports iteration and has a ``last`` + property containing the last registry loaded. The registries contained in this object are stored as weakrefs, thus they will only exist for the lifetime of the actual diff --git a/pyramid/config.py b/pyramid/config.py index bc4d4e689..057282838 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -1094,6 +1094,8 @@ class Configurator(object): http_cache + .. note:: This feature is new as of Pyramid 1.1. + When you supply an ``http_cache`` value to a view configuration, the ``Expires`` and ``Cache-Control`` headers of a response generated by the associated view callable are modified. The value @@ -1213,18 +1215,7 @@ class Configurator(object): This value must match the ``name`` of a :term:`route configuration` declaration (see :ref:`urldispatch_chapter`) - that must match before this view will be called. Note that - the ``route`` configuration referred to by ``route_name`` - usually has a ``*traverse`` token in the value of its - ``path``, representing a part of the path that will be used - by :term:`traversal` against the result of the route's - :term:`root factory`. - - .. warning:: Using this argument services an advanced - feature that isn't often used unless you want to perform - traversal *after* a route has matched. See - :ref:`hybrid_chapter` for more information on using this - advanced feature. + that must match before this view will be called. request_type |