summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-12 00:17:52 -0400
committerChris McDonough <chrism@plope.com>2011-08-12 00:17:52 -0400
commit47369747d8050faddd8b98f4cad9f5d0bb263130 (patch)
treed7a3dddc32d31e843a4c3ae8239e54df6f469585 /CHANGES.txt
parentbe46dacfd3b197ce3d8cb907532daa49c93fb8df (diff)
downloadpyramid-47369747d8050faddd8b98f4cad9f5d0bb263130.tar.gz
pyramid-47369747d8050faddd8b98f4cad9f5d0bb263130.tar.bz2
pyramid-47369747d8050faddd8b98f4cad9f5d0bb263130.zip
garden changes; fix docs rendering
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index c64582e02..65dcf11fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Next release
Features
--------
+- A new configuration setting named ``pyramid.includes`` is now available.
+ It is described in the "Environment Variables and ``.ini`` Files Settings"
+ narrative documentation chapter.
+
- Added a ``route_prefix`` argument to the
``pyramid.config.Configurator.include`` method. This argument allows you
to compose URL dispatch applications together. See the section entitled
@@ -90,6 +94,10 @@ Documentation
- Added a "Displaying Tweens" section to the "Command-Line Pyramid" narrative
chapter.
+- Added documentation for the ``pyramid.tweens`` and ``pyramid.includes``
+ configuration settings to the "Environment Variables and ``.ini`` Files
+ Settings" chapter.
+
Bug Fixes
---------