diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-26 13:59:45 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-26 13:59:45 -0500 |
| commit | efde1442ca30428818309e1db7925317a6cebe49 (patch) | |
| tree | 04d921becb71e2dc932ceb5436ceea9b8f1d2129 /docs | |
| parent | b5304ca1f9ffc23d08016d348a93d16d8c1283ac (diff) | |
| parent | 07965cded9e91cd4ebeceff15043ce1005261fa2 (diff) | |
| download | pyramid-efde1442ca30428818309e1db7925317a6cebe49.tar.gz pyramid-efde1442ca30428818309e1db7925317a6cebe49.tar.bz2 pyramid-efde1442ca30428818309e1db7925317a6cebe49.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/request.rst | 4 | ||||
| -rw-r--r-- | docs/narr/urldispatch.rst | 6 | ||||
| -rw-r--r-- | docs/narr/webob.rst | 4 | ||||
| -rw-r--r-- | docs/whatsnew-1.3.rst | 8 |
4 files changed, 10 insertions, 12 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst index e1b233fbc..1112ea069 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -145,10 +145,6 @@ ``request.session`` attribute will cause a :class:`pyramid.exceptions.ConfigurationError` to be raised. - .. attribute:: tmpl_context - - The template context for Pylons-style applications. - .. attribute:: matchdict If a :term:`route` has matched during this request, this attribute will diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index 7c0b437c1..f036ce94e 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -785,12 +785,6 @@ already end in a slash, and if the value of ``PATH_INFO`` *plus* a slash matches any route's pattern. In this case it does an HTTP redirect to the slash-appended ``PATH_INFO``. -To configure the slash-appending not found view in your application, change -the application's startup configuration, adding the following stanza: - -.. code-block:: python - :linenos: - Let's use an example. If the following routes are configured in your application: diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst index 21c368350..a8c11acec 100644 --- a/docs/narr/webob.rst +++ b/docs/narr/webob.rst @@ -117,8 +117,8 @@ Special Attributes Added to the Request by :app:`Pyramid` In addition to the standard :term:`WebOb` attributes, :app:`Pyramid` adds special attributes to every request: ``context``, ``registry``, ``root``, ``subpath``, ``traversed``, ``view_name``, ``virtual_root``, -``virtual_root_path``, ``session``, and ``tmpl_context``, ``matchdict``, and -``matched_route``. These attributes are documented further within the +``virtual_root_path``, ``session``, ``matchdict``, and ``matched_route``. +These attributes are documented further within the :class:`pyramid.request.Request` API documentation. .. index:: diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index daa1ffdec..ac01bb140 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -476,6 +476,14 @@ Deprecations Configurator were removed from the documentation. They have been deprecated since Pyramid 1.1. +- All references to the ``tmpl_context`` request variable were removed from + the docs. Its existence in Pyramid is confusing for people who were never + Pylons users. It was added as a porting convenience for Pylons users in + Pyramid 1.0, but it never caught on because the Pyramid rendering system is + a lot different than Pylons' was, and alternate ways exist to do what it + was designed to offer in Pylons. It will continue to exist "forever" but + it will not be recommended or mentioned in the docs. + Documentation Enhancements -------------------------- |