summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt11
-rw-r--r--docs/index.rst1
-rw-r--r--docs/narr/upgrading.rst2
3 files changed, 7 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 851941ff6..6c210600c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -104,13 +104,13 @@ Features
and ``HTTPMovedPermanently`` exceptions, so these can be caught by the
NotFound view (and other exception views).
-- The Mako renderer now accepts a def name in an asset spect. When the def
+- The Mako renderer now supports a def name in an asset spec. When the def
name is present in the asset spec, the system will render the template def
within the template and will return the result. An example asset spec is
``package:path/to/template#defname.mako``. This will render the def named
- ``defname`` inside the ``template.pt`` package instead of rendering the
- entire template. The old way of returning a tuple from the view is
- supported for backward compatibility, ('defname', {}).
+ ``defname`` inside the ``template.mako`` template instead of rendering the
+ entire template. The old way of returning a tuple in the form
+ ``('defname', {})`` from the view is supported for backward compatibility,
- The Chameleon ZPT renderer now accepts a macro name in an asset spec. When
the macro name is present in the asset spec, the system will render the
@@ -151,9 +151,6 @@ Features
``config.add_request_method`` are now available to tweens.
- Request properties and methods added via ``config.set_request_property`` or
- ``config.add_request_method`` are now available to tweens.
-
-- Request properties and methods added via ``config.set_request_property`` or
``config.add_request_method`` are now available in the request object
returned from ``pyramid.paster.bootstrap``.
diff --git a/docs/index.rst b/docs/index.rst
index 321fe1fed..4a9b3951b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,6 +37,7 @@ What's New
.. toctree::
:maxdepth: 1
+ whatsnew-1.4
whatsnew-1.3
whatsnew-1.2
whatsnew-1.1
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 92f125c0a..839f59c35 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -1,3 +1,5 @@
+.. _upgrading_chapter:
+
Upgrading Pyramid
=================