From 47369747d8050faddd8b98f4cad9f5d0bb263130 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 12 Aug 2011 00:17:52 -0400
Subject: garden changes; fix docs rendering

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGES.txt')

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
 ---------
 
-- 
cgit v1.2.3